fix : 修改征集类型为字典、直接上报时详情专项资金回显、项目归档-需求征集文件回显、重大项目前置流程必填

src/views/project-demand/requirement/add.vue

@@ -12,7 +12,7 @@
           <el-form-item label="征集类型" prop="collectType">
             <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
               <el-option
-                  v-for="item in typeOption"
+                  v-for="item in cacheStore.getDict('collect_type')"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -35,9 +35,10 @@
         <el-col :span="24">
           <el-form-item label="所属公司" prop="companyIds" class="tree-select">
             <div>{{ getName(companyList) }}</div>
-            <el-button  color="#DED0B2" @click="showCompany">{{companyList.length===0?'请选择所属公司':'更改'}}</el-button>
-<!--                        <el-tree-select v-model="formData.companyIds" :data="companyOption"-->
-<!--                                        filterable clearable :check-strictly="true" multiple/>-->
+            <el-button color="#DED0B2" @click="showCompany">{{ companyList.length === 0 ? '请选择所属公司' : '更改' }}
+            </el-button>
+            <!--                        <el-tree-select v-model="formData.companyIds" :data="companyOption"-->
+            <!--                                        filterable clearable :check-strictly="true" multiple/>-->
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -119,6 +120,8 @@ import {useTagsView} from '@/stores/tagsview.js'
 import {getFundOption} from "@/api/special-fund";
 import CompanyPicker from "@/components/DetailComponent/CompanyPicker.vue";
 
+import {useCacheStore} from '@/stores/cache.js'
+const cacheStore = useCacheStore()
 const companyRef = ref()
 const companyList = ref([])
 const changeDiagram = ref(false)
@@ -140,12 +143,6 @@ const formData = ref({
 const showTinymce = ref(true)
 const routerName = ref(router.currentRoute.value.name)
 const processDiagramViewer = ref(false)
-const typeOption = ref([
-  {
-    label: "需求征集",
-    value: '需求征集'
-  }
-])
 const companyOption = ref([])
 const specialFundOption = ref([])
 const form = ref(null)
@@ -313,8 +310,8 @@ const init = async () => {
   })
 }
 const submitParam = (item) => {
-  console.log('item..',item.companyIds)
-  if(item.companyIds.length===0){
+  console.log('item..', item.companyIds)
+  if (item.companyIds.length === 0) {
     ElNotification({
       title: '提示',
       message: '请选择所属公司',

src/views/project-demand/summary/add.vue

@@ -482,6 +482,7 @@ const getDetailInfo = async () => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
+      res.data.formData.specialFundId= res.data.formData.specialFundId===0?null:res.data.formData.specialFundId
       formData.value = res.data.formData
       loading.value = false
     }

src/views/project-management/filing/attachment.vue

@@ -43,26 +43,26 @@ const schema = computed(() => {
   ]
 })
 const baseForm = ref()
-const paneList=ref([
+const paneList = ref([
   {
-    label:'需求征集',
-    name:'00'
+    label: '需求征集',
+    name: '00'
   },
   {
-    label:'需求上报',
-    name:'10'
+    label: '需求上报',
+    name: '10'
   },
   {
-    label:'项目立项',
-    name:'20'
+    label: '项目立项',
+    name: '20'
   },
   {
-    label:'项目实施',
-    name:'40'
+    label: '项目实施',
+    name: '40'
   },
   {
-    label:'项目归档',
-    name:'50'
+    label: '项目归档',
+    name: '50'
   }
 ])
 const getBaseInfo = async () => {
@@ -75,16 +75,19 @@ const getBaseInfo = async () => {
 
 getBaseInfo()
 const handleClick = (tab) => {
-  activeName.value=tab.props.name
-  loading.value=true
+  activeName.value = tab.props.name
+  loading.value = true
   search({})
 }
 
 const search = async (param) => {
-  param.targetState = activeName.value
+  if (activeName.value === '00') {
+    param.requirementId = requirementId.value
+  }
   param.targetId = projectId.value
+  param.targetState = activeName.value
   searchFileList(param).then(res => {
-    loading.value=false
+    loading.value = false
     changeFileList(res)
   })
 }

src/views/project-management/implementation/detail.vue

@@ -44,6 +44,7 @@
                      :formData="detailData.formData"/>
     </template>
   </steps>
+  <div style="width: 100%;height: 30px"></div>
   <opinion v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId"
            v-model:value="auditOpinion"/>
 </template>

src/views/system/role/add.vue

@@ -38,7 +38,7 @@ import { useTagsView } from '@/stores/tagsview.js'
 import { useAuthStore } from '@/stores/userstore.js'
 import fvRadio from '@/fvcomponents/fvRadio/index.vue'
 import { ElLoading, ElNotification } from 'element-plus';
-import { getMenuOpt } from '@/api/system/menuman.js'
+import { getMenuOptRole } from '@/api/system/menuman.js'
 import { getRoleDetail, operate, getTemRoleOption } from "@/api/role/role";
 
 const tagsViewStore = useTagsView()
@@ -143,8 +143,9 @@ const init = async () => {
   form.value.setValues({state: '1', template: false})
   const res = await getTemRoleOption()
   localData.tempRoleOpt = res.data
-  const { data } = await getMenuOpt(0)
-  localData.menuData = data
+  const { data } = await getMenuOptRole()
+  localData.menuData = data.menuOption
+  // localData.checked = data.checked
 }
 
 const getInfo = async () => {