Merge pull request 'dj' (#259) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/259

src/api/project-manage/index.js

@@ -77,13 +77,11 @@ export const addLedger = (data) => {
   });
 };
 
-export const getTags = (projectId) => {
+export const getTags = (params) => {
   return request({
     url: '/workflow/mosr/project/implementation/option',
     method: "get",
-    params:{
+    params:params
-      projectId:projectId
-    }
   });
 };
 //项目归档

src/components/DetailComponent/CollectionDetail.vue

@@ -7,17 +7,17 @@
             <span>{{ formData.requirementName }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+<!--        <el-col :span="12">-->
-          <el-form-item label="所属公司">
+<!--          <el-form-item label="所属公司">-->
-            <span>{{ formData.companyIds }}</span>
+<!--            <span>{{ formData.companyIds }}</span>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-        </el-col>
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="征集类型">
             <span>{{ formData.collectType }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
@@ -71,13 +71,11 @@
 <script setup lang="jsx">
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
-import {matterTree} from '@/utils/matterTree.js';
 import {downloadFile} from "@/api/project-demand";
 
 const emit = defineEmits(['getInfo',"update:formData"])
 const form = ref()
 const showTable = ref(false)
-const companyNameArray = ref([])
 
 const props = defineProps({
   formData: {
@@ -146,28 +144,11 @@ const handleDownload = (row) => {
     a.click()
   })
 }
-const getCompanyOptionItem = (val) => {
-  if (val instanceof Array) {
-    val.forEach(item => {
-      matterTree(companyNameArray.value, props.companyOption, item)
-    })
-  }
-  let uniqueArr = Array.from(new Set(companyNameArray.value));
-  return uniqueArr.join('，');
-}
 
 watch(() => props.loading, (newVal) => {
   props.loading = newVal
 }, {deep: true})
 
-watch(() => props.companyOption, (newVal) => {
-  props.companyOption = newVal
-}, {deep: true})
-watch(() => props.formData, (newVal) => {
-  if(newVal!=null){
-    props.formData.companyIds = getCompanyOptionItem(newVal.companyIds)
-  }
-}, {deep: true})
 watch(() => props.processViewer, (newVal) => {
   props.processViewer = newVal
 }, {deep: true})

src/components/DetailComponent/SummaryDetail.vue

@@ -8,8 +8,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="专项资金" prop="specialFund">
+          <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.specialFund">
-            <span>{{ localFormData.specialFund }}</span>
+            <span>{{ changeName(fundOption, localFormData.specialFund) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -22,59 +22,54 @@
             <span>{{ formData.endTime }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="所属公司" prop="affiliatedCompanyId">
-            <span>{{ localFormData.affiliatedCompanyId }}</span>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="项目类型" prop="projectType">
-            <span>{{ localFormData.projectType }}</span>
+            <span>{{ filterDict(cacheStore.getDict('project_type'), localFormData.projectType) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="研发主体" prop="rdSubject">
-            <span>{{ localFormData.rdSubject }}</span>
+            <span>{{ filterDict(cacheStore.getDict('rd_subject'), localFormData.rdSubject) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="出资类型" prop="investmentType">
-            <span>{{ localFormData.investmentType }}</span>
+            <span>{{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="项目影响" prop="projectImpact">
-            <span>{{ localFormData.projectImpact }}</span>
+            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="所属业务板块" prop="businessSegment">
-            <span>{{ localFormData.businessSegment }}</span>
+            <span>{{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="预期成果形式" prop="resultForm">
-            <span>{{ localFormData.resultForm }}</span>
+            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="预期技术标准制定" prop="technicalStandard">
-            <span>{{ localFormData.technicalStandard }}</span>
+            <span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard)}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产学研联合" prop="industryUniversityResearch">
-            <span>{{ localFormData.industryUniversityResearch }}</span>
+            <span>{{ filterDict(cacheStore.getDict('industry_university'), localFormData.industryUniversityResearch) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="开展政府申报" prop="governmentDeclaration">
-            <span>{{ localFormData.governmentDeclaration }}</span>
+            <span>{{ filterDict(cacheStore.getDict('government_declaration'), localFormData.governmentDeclaration) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="知识产权状况" prop="intellectualProperty">
-            <span>{{ localFormData.intellectualProperty }}</span>
+            <span>{{ filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -139,32 +134,32 @@
             </fvTable>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <!--        <el-col :span="24">-->
-          <div v-if="data.taskId">
+        <!--          <div v-if="data.taskId">-->
-            <baseTitle title="审核意见"></baseTitle>
+        <!--            <baseTitle title="审核意见"></baseTitle>-->
-            <el-form-item prop="auditOpinion">
+        <!--            <el-form-item prop="auditOpinion">-->
-              <el-input
+        <!--              <el-input-->
-                  v-model="localFormData.auditOpinion"
+        <!--                  v-model="localFormData.auditOpinion"-->
-                  :rows="3"
+        <!--                  :rows="3"-->
-                  type="textarea"
+        <!--                  type="textarea"-->
-                  placeholder="请输入审核意见"
+        <!--                  placeholder="请输入审核意见"-->
-              />
+        <!--              />-->
-            </el-form-item>
+        <!--            </el-form-item>-->
-          </div>
+        <!--          </div>-->
-        </el-col>
+        <!--        </el-col>-->
       </el-row>
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
           <operation-render v-if="processViewer" :operation-list="data.operationList"
                             :state="data.state"/>
-          <process-diagram-viewer  v-if="processViewer" id-name="summaryProcess"/>
+          <process-diagram-viewer v-if="processViewer" id-name="summaryProcess"/>
         </div>
       </div>
-<!--      <div class="oper-page-btn" v-if="data.state === '1' && data.taskId">-->
+      <!--      <div class="oper-page-btn" v-if="data.state === '1' && data.taskId">-->
-<!--        <el-button @click="handleReject(summaryForm)">驳回</el-button>-->
+      <!--        <el-button @click="handleReject(summaryForm)">驳回</el-button>-->
-<!--        <el-button color="#DED0B2" @click="handleAgree">同意</el-button>-->
+      <!--        <el-button color="#DED0B2" @click="handleAgree">同意</el-button>-->
-<!--      </div>-->
+      <!--      </div>-->
     </el-form>
   </div>
 </template>
@@ -173,11 +168,13 @@
 import {downloadFile} from "@/api/project-demand";
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
-import {ElMessage, ElNotification} from "element-plus";
-import {agreeTask, rejectTask} from "@/api/project-demand";
 import {useTagsView} from '@/stores/tagsview.js'
+import {getFundOption} from "@/api/special-fund";
+import {useCacheStore} from '@/stores/cache.js'
+import {getSubCompOpt} from "@/api/user/user";
 
 const tagsViewStore = useTagsView()
+const cacheStore = useCacheStore()
 const props = defineProps({
   formData: {
     type: Object,
@@ -234,52 +231,38 @@ const tableConfig = reactive({
   ]
 })
 const router = useRouter()
-const summaryForm = ref()
+const fundOption = ref([])
+const companyOption = ref([])
+const dictName = ref({})
 const rules = reactive({
   auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
 })
-const handleReject = (instance) => {
+const filterDict = (data, value) => {
-  if (!instance) return
+  if (data === undefined || value === undefined) return;
-  instance.validate(async (valid) => {
+  let label=''
-    if (!valid) return
+  if (data instanceof Array) {
-    let approve = {
+    data.find(item =>{
-      taskId: props.data.taskId,
+      if( item.value == value){
-      auditOpinion: localFormData.value.auditOpinion,
+        label= item.label
-    }
-    rejectTask(approve).then(res => {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: res.code === 1000 ? 'success' : 'error'
-      })
-      if (res.code === 1000) {
-        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-        router.push({
-          name: 'Summary'
-        })
       }
     })
-  })
-}
-const handleAgree = () => {
-  let approve = {
-    taskId: props.data.taskId,
-    auditOpinion: localFormData.value.auditOpinion,
-    formData: localFormData.value
   }
-  agreeTask(approve).then(res => {
+  return label
-    ElNotification({
+}
-      title: '提示',
+const getFundOptions = async () => {
-      message: res.msg,
+  const resFund = await getFundOption()
-      type: res.code === 1000 ? 'success' : 'error'
+  fundOption.value = resFund.data
-    })
+  const res = await getSubCompOpt()
-    if (res.code === 1000) {
+  companyOption.value = res.data
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+}
-      router.push({
+const changeName = (option, value) => {
-        name: 'Summary'
+  let name = ''
-      })
+  option.forEach(item => {
+    if (item.value == value) {
+      name = item.label
     }
   })
+  return name
 }
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
@@ -291,11 +274,6 @@ const handleDownload = (row) => {
   })
 }
 
-watch(
-    () => props.formData,
-    (val) => {
-    }
-)
 watch(() => props.processViewer, (newVal) => {
   props.processViewer = newVal
 }, {deep: true})
@@ -304,8 +282,9 @@ watch(() => props.loading, (newVal) => {
 }, {deep: true})
 
 watchEffect(() => {
-  Object.keys(props.formData).length && (localFormData.value = props.formData)
+  return Object.keys(props.formData).length && (localFormData.value = props.formData)
 })
+getFundOptions()
 </script>
 
 <style scoped>

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

@@ -211,7 +211,7 @@ const getFundOptions = async () => {
   specialFundOption.value = res.data
 }
 
-const getDataSourceOptionItem = (val) => {
+const getCompanyOptionItem = (val) => {
   if (val !== undefined) {
     val.forEach(item => {
       matterTree(companyNameArray.value, companyOption.value, item)
@@ -237,7 +237,7 @@ const init = async () => {
     loading.value = false
     let data = res.data
     formData.value = data.formData;
-    data.formData.companyIds = getDataSourceOptionItem(data.formData.companyIds)
+    data.formData.companyIds = getCompanyOptionItem(data.formData.companyIds)
     if(data.formData.specialFund){
       specialFundOption.value.forEach(item => {
         if(data.formData.specialFund==item.value){

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

@@ -2,7 +2,7 @@
   <steps :active="1" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
-                         :processViewer="summaryProcessViewer" :companyOption="companyOption" :loading="loading"/>
+                         :processViewer="summaryProcessViewer"  :loading="loading"/>
       <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
                       :processViewer="summaryProcessViewer" :loading="loading"/>
       <ApprovalDetail v-show="showActive == '20'" :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer" :loading="loading"></ApprovalDetail>
@@ -21,34 +21,20 @@ import SummaryDetail from '@/components/DetailComponent/SummaryDetail.vue';
 import {useProcessStore} from '@/stores/processStore.js';
 import {getMapProjectStateInfo} from '@/components/steps/api';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
-import {getSubCompOpt} from "@/api/user/user";
 import {ElNotification} from "element-plus";
 
 const route = useRoute()
-const companyOption = ref([])
 const summaryData = ref({})
 const summaryProcessViewer = ref(true)
 const loading = ref(false)
 const processStore = useProcessStore()
 const active = ref(route.query.state)
 const showActive = ref()
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
 const getInfo = async (state) => {
   const projectId = route.query.projectId
-  if(showActive == '00'){
-    await getCompanyOption()
-  }
   summaryProcessViewer.value = false
   loading.value = true
   const {code, data,msg} = await getMapProjectStateInfo(projectId, state)
-  ElNotification({
-    title: '提示',
-    message: msg,
-    type: code === 1000 ? 'success' : 'error'
-  })
   if(data===undefined)return;
   if(code===1000){
     summaryData.value = data;
@@ -62,24 +48,15 @@ const getInfo = async (state) => {
     nextTick(() => {
       summaryProcessViewer.value = true
     })
+  }else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type:  'error'
+    })
   }
 }
-// const back = () => {
+
-//   switch (route.name) {
-//     case 'Summary/detail':
-//       setDetail('1')
-//       break;
-//     case 'Initiation/detail':
-//       setDetail('2')
-//       break;
-//     case 'Implementation/detail':
-//       setDetail('3')
-//       break;
-//     case 'Filing/detail':
-//       setDetail('4')
-//       break;
-//   }
-// }
 const setDetail = (active) => {
   showActive.value = active
   getInfo(active)
@@ -89,7 +66,6 @@ const stepChange = (data) => {
   showActive.value = data.active
   getInfo(data.active)
 }
-// back()
 </script>
 
 <style scoped>

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

@@ -1,23 +1,30 @@
 <template>
-  <el-form :model="attachment" inline class="query-form">
+  <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-form-item label="关键词" prop="tag">
+    <el-tab-pane label="需求征集" name="first">
-      <el-input v-model="attachment.tag" placeholder="请输入" clearable filterable style="width: 200px"/>
+      <el-form :model="attachment" inline class="query-form">
-    </el-form-item>
+        <el-form-item label="关键词" prop="tag">
-    <el-form-item>
+          <el-input v-model="attachment.tag" placeholder="请输入" clearable filterable style="width: 200px"/>
-      <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
+        </el-form-item>
-      <el-button color="#DED0B2" @click="handleUpload">上传附件</el-button>
+        <el-form-item>
-    </el-form-item>
+          <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
-  </el-form>
+          <el-button color="#DED0B2" @click="handleUpload">上传附件</el-button>
-<!--  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>-->
+        </el-form-item>
-  <el-card style="width: 100%">
+      </el-form>
-    <file-upload @getFile="getOtherFile" :showFileList="true"/>
+      <!--  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>-->
-    <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
+      <el-card style="width: 100%">
-             :data="otherFileList" :isSettingCol="false" :pagination="false">
+        <file-upload @getFile="getOtherFile" :showFileList="true"/>
-      <template #empty>
+        <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+                 :data="otherFileList" :isSettingCol="false" :pagination="false">
-      </template>
+          <template #empty>
-    </fvTable>
+            <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-  </el-card>
+          </template>
+        </fvTable>
+      </el-card>
+    </el-tab-pane>
+    <el-tab-pane label="分摊汇总" name="second">
+
+    </el-tab-pane>
+  </el-tabs>
 </template>
 
 <script setup lang="jsx">
@@ -25,6 +32,7 @@ import {downloadFile} from "@/api/project-demand";
 
 const route = useRoute()
 const router = useRouter()
+const activeName = ref('first')
 const attachment = reactive({
   tag: ''
 })
@@ -76,7 +84,7 @@ const tableConfig = reactive({
     }
   ]
 })
-const showTable=ref(true)
+const showTable = ref(true)
 const otherFileList = ref([])
 const handleUpload = () => {
   router.push({
@@ -91,7 +99,7 @@ const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])
     let a = document.createElement('a')
-    a.href=URL.createObjectURL(blob)
+    a.href = URL.createObjectURL(blob)
     a.download = row.originalFileName
     a.click()
   })

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

@@ -5,7 +5,6 @@
           :formData="commonForm.formData"
           :data="commonForm"
           :processViewer="commonProvessViewer"
-          :companyOption="companyOption"
           v-show="showActive == '00'"
           :loading="loading"
       />
@@ -24,52 +23,35 @@
 </template>
 
 <script setup lang="jsx">
-import {getInfo} from "@/api/project-demand/index.js";
-import {getSubCompOpt} from '@/api/user/user.js'
 import {useProcessStore} from '@/stores/processStore.js';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
 import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
 import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
 import {getMapProjectStateInfo} from '@/components/steps/api';
-import {ElLoading} from "element-plus";
+import {ElLoading, ElNotification} from "element-plus";
 
 const route = useRoute()
-const companyOption = ref([])
+const showActive = ref()
 const loading = ref(false)
-
 const processStore = useProcessStore()
 const activeName = ref('first')
-const handleClick = (tab, event) => {
-  console.log(tab, event)
-  if (tab.index.value === 0) {
-
-  }
-}
-
-
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
-
-
 const commonForm = ref({})
 const commonProvessViewer = ref(true)
 
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   try {
-    state == '00' && (await getCompanyOption())
     commonProvessViewer.value = false
     loading.value = true
-    const {data, code} = await getMapProjectStateInfo(route.query.projectId, state)
+    const {data, code,msg} = await getMapProjectStateInfo(route.query.projectId, state)
-    // if(state == '00') {
-    //   collectionData.value = data;
-    // } else if(state == '10') {
-    //   summaryData.value = data;
-    // }
     if(code===1000){
       loading.value = false
+    }else {
+      ElNotification({
+        title: '提示',
+        message: msg,
+        type:  'error'
+      })
     }
     if(data===undefined)return;
     commonForm.value = data
@@ -80,18 +62,14 @@ const getAllInfo = async (state) => {
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
     nextTick(() => {
-      // summaryProcessViewer.value = true
       commonProvessViewer.value = true
     })
     loading.close()
   } catch {
     loading.close()
   }
-
 }
 
-const showActive = ref()
-
 const setDetail = (active) => {
   showActive.value = active
   getAllInfo(active)

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

@@ -208,12 +208,7 @@ const tableConfig = reactive({
           btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("attachments")) {
-          btn.push({
+          btn.push({label: '附件', prem: ['mosr:requirement:resubmit'], func: () => handleAttachment(row), type: 'primary'})
-            label: '附件',
-            prem: ['mosr:requirement:resubmit'],
-            func: () => handleAttachment(row),
-            type: 'primary'
-          })
         }
         if (buttons.has("entry")) {
           btn.push({label: '结项', prem: ['mosr:requirement:del'], func: () => handleConclusion(row), type: 'primary'})

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

@@ -4,9 +4,9 @@
       <el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 200px">
         <el-option
             v-for="item in tagsOption"
-            :key="item.label"
+            :key="item.value"
-            :label="item.value"
+            :label="item.label"
-            :value="item.label"
+            :value="item.value"
         />
       </el-select>
     </el-form-item>
@@ -27,7 +27,7 @@
 
 <script setup lang="jsx">
 import {downloadFile} from "@/api/project-demand";
-import {getImplementationAttachment,getTags} from "@/api/project-manage";
+import {getTags,getImplementationAttachment} from "@/api/project-manage";
 import {ElNotification} from "element-plus";
 
 const route = useRoute()
@@ -80,7 +80,10 @@ const showTable = ref(true)
 const otherFileList = ref([])
 const getTagsOption = () => {
   if (!route.query.id) return
-  getTags(route.query.id).then(res => {
+  let params={
+    projectId: route.query.id
+  }
+  getTags(params).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -94,13 +97,18 @@ const getTagsOption = () => {
 const handleSearch = () => {
   let params
   if (attachment.tag) {
+    tagsOption.value.forEach(item => {
+      if (item.value === attachment.tag) {
+        attachment.tag = item.label
+      }
+    })
     params = {
-      projectId: route.query.id,
+      targetId: route.query.id,
       tag: attachment.tag
     }
   } else {
     params = {
-      projectId: route.query.id
+      targetId: route.query.id
     }
   }
   getImplementationAttachment(params).then(res => {
@@ -111,6 +119,7 @@ const handleSearch = () => {
     })
     showTable.value = false
     if (res.code === 1000) {
+      // tagsOption.value = res.data
       otherFileList.value = res.data
       nextTick(() => {
         showTable.value = true
@@ -136,7 +145,7 @@ const handleDownload = (row) => {
   })
 }
 getTagsOption()
-handleSearch()
+// handleSearch()
 </script>
 
 <style scoped>

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

@@ -5,7 +5,6 @@
         :formData="commonForm.formData"
         :data="commonForm"
         :processViewer="commonProvessViewer"
-        :companyOption="companyOption"
         v-show="showActive == '00'"
         :loading="loading"
       />
@@ -21,65 +20,41 @@
 </template>
 
 <script setup lang="jsx">
-import {getInfo} from "@/api/project-demand/index.js";
-import {getSubCompOpt} from '@/api/user/user.js'
 import {useProcessStore} from '@/stores/processStore.js';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
 import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
 import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
 import { getMapProjectStateInfo } from '@/components/steps/api';
-import { ElLoading } from "element-plus";
+import {ElLoading, ElNotification} from "element-plus";
 import Opinion from "@/components/DetailComponent/Opinion.vue";
 
-// const activeName = ref('first')
-const handleClick = (tab, event) => {
-  console.log(tab, event)
-  if(tab.index.value === 0){
-
-  }
-}
-
-
 const route = useRoute()
 const activeName = ref('first')
-const collectionData = ref({})
-const summaryData = ref({})
 const loading = ref(false)
-const collectionProcessViewer = ref(true)
-const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
-const companyOption = ref([])
 const cuurentStep = ref()
 route.query.step == '10' && (cuurentStep.value = 1)
 route.query.step == '20' && (cuurentStep.value = 2)
 route.query.step == '40' && (cuurentStep.value = 3)
 route.query.step == '50' && (cuurentStep.value = 4)
-const rules = reactive({
+const showActive = ref()
-  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
-})
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
-
-
 const commonForm = ref({})
 const commonProvessViewer = ref(true)
 
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   try {
-    state == '00' && ( await getCompanyOption() )
     commonProvessViewer.value = false
     loading.value = true
-    const { data, code } = await getMapProjectStateInfo(route.query.projectId, state)
+    const { data, code ,msg} = await getMapProjectStateInfo(route.query.projectId, state)
-    if(state == '00') {
-      collectionData.value = data;
-    } else if(state == '10') {
-      summaryData.value = data;
-    }
     if(code===1000){
       loading.value = false
+    }else {
+      ElNotification({
+        title: '提示',
+        message: msg,
+        type:  'error'
+      })
     }
     if(data===undefined)return;
     commonForm.value = data
@@ -90,17 +65,14 @@ const getAllInfo = async (state) => {
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
     nextTick(() => {
-      // summaryProcessViewer.value = true
       commonProvessViewer.value = true
     })
     loading.close()
   } catch {
     loading.close()
   }
-
 }
 
-const showActive = ref()
 
 const setDetail = (active) => {
   showActive.value = active

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

@@ -218,9 +218,9 @@ const tableConfig = reactive({
         if (buttons.has("edit")) {
         btn.push({label: '编辑', prem: ['mosr:requirement:info'], func: () => handleEdit(row), type: 'primary'})
         }
-        // if (buttons.has("standing")) {
+        if (buttons.has("standing")) {
           btn.push({label: '台账', prem: ['mosr:requirement:info'], func: () => handleStandingBook(row), type: 'primary'})
-        // }
+        }
         // if (buttons.has("attachments")) {
         btn.push({label: '附件', prem: ['mosr:requirement:info'], func: () => handleAttachment(row), type: 'primary'})
         // }

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

@@ -2,20 +2,21 @@
   <baseTitle title="标签名称"></baseTitle>
   <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">
     <el-form-item label="标签名称" prop="tagName">
-      <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 400px" v-if="showInput"/>
+      <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px" v-if="showInput"/>
-      <el-select v-model="formData.tagName" placeholder="请选择标签" clearable filterable style="width: 200px" v-else>
+      <el-select v-model="formData.tagName" placeholder="请选择标签名称" clearable filterable style="width: 300px" v-else>
         <el-option
             v-for="item in tagsOption"
-            :key="item.label"
+            :key="item.value"
-            :label="item.value"
+            :label="item.label"
-            :value="item.label"
+            :value="item.value"
         />
       </el-select>
+      <el-button type="primary" link  @click="changeInput">{{showInput? '选择': '输入'}}</el-button>
     </el-form-item>
   </el-form>
   <baseTitle title="其他文件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
-    <file-upload @getFile="getFile"/>
+    <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/>
     <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
@@ -86,9 +87,16 @@ const name = ref(router.currentRoute.value.name)
 const rules = reactive({
   tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
 })
+const changeInput=()=>{
+  showInput.value=!showInput.value;
+  formData.value.tagName='';
+}
 const getTagsOption = () => {
   if (!route.query.id) return
-  getTags(route.query.id).then(res => {
+  let params={
+    projectId: route.query.id
+  }
+  getTags(params).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -102,6 +110,11 @@ const getTagsOption = () => {
 }
 
 const compositeParam = (item) => {
+  tagsOption.value.forEach(item => {
+    if (item.value == formData.value.tagName) {
+      formData.value.tagName = item.label
+    }
+  })
   return {
     fileId: item.id,
     size: item.size,

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

@@ -5,7 +5,6 @@
         :formData="commonForm.formData"
         :data="commonForm"
         :processViewer="commonProvessViewer"
-        :companyOption="companyOption"
         v-show="showActive == '00'"
         :loading="loading"
       />
@@ -22,101 +21,38 @@
 </template>
 
 <script setup lang="jsx">
-import {getInfo} from "@/api/project-demand/index.js";
-import {getSubCompOpt} from '@/api/user/user.js'
 import {useProcessStore} from '@/stores/processStore.js';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
-import {downloadFile} from "@/api/project-demand";
 import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
 import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
 import { getMapProjectStateInfo } from '@/components/steps/api';
-import { ElLoading } from "element-plus";
+import {ElLoading, ElNotification} from "element-plus";
 import Opinion from "@/components/DetailComponent/Opinion.vue";
 
 const route = useRoute()
 const activeName = ref('first')
-const collectionData = ref({})
-const summaryData = ref({})
-const collectionProcessViewer = ref(true)
 const loading = ref(false)
 const active = ref(route.query.state)
-const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
-const companyOption = ref([])
+const showActive = ref()
-const rules = reactive({
-  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
-})
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
-
-const getDemandCollectionInfo = async () => {
-  if (!route.query.id) return
-  await getCompanyOption()
-  collectionProcessViewer.value = false
-  getInfo(route.query.id).then(res => {
-    let data = res.data
-    collectionData.value = data;
-    processStore.setDesign(data)
-    processStore.runningList.value = data.runningList;
-    processStore.endList.value = data.endList;
-    processStore.noTakeList.value = data.noTakeList;
-    processStore.refuseList.value = data.refuseList;
-    processStore.passList.value = data.passList;
-    nextTick(() => {
-      collectionProcessViewer.value = true
-    })
-  })
-}
-const getDemandSummaryInfo = async () => {
-  if (!route.query.id) return
-  // await getCompanyOption()
-  summaryProcessViewer.value = false
-  getInfo(route.query.id).then(res => {
-    let data = res.data
-    summaryData.value = data;
-    processStore.setDesign(data)
-    processStore.runningList.value = data.runningList;
-    processStore.endList.value = data.endList;
-    processStore.noTakeList.value = data.noTakeList;
-    processStore.refuseList.value = data.refuseList;
-    processStore.passList.value = data.passList;
-    nextTick(() => {
-      summaryProcessViewer.value = true
-    })
-  })
-}
-
-const handleClick = (tab, event) => {
-  console.log(tab, event)
-  if (tab.props.name === 'first') {
-    getDemandCollectionInfo()
-  } else if (tab.props.name === 'second') {
-    getDemandSummaryInfo()
-  }
-}
-// getDemandCollectionInfo()
-
 const commonForm = ref({})
 const commonProvessViewer = ref(true)
 
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   try {
-    state == '00' && ( await getCompanyOption() )
     commonProvessViewer.value = false
     loading.value = true
-    const { data, code } = await getMapProjectStateInfo(route.query.projectId, state)
+    const { data, code,msg } = await getMapProjectStateInfo(route.query.projectId, state)
-    if(state == '00') {
-      collectionData.value = data;
-    } else if(state == '10') {
-      summaryData.value = data;
-    }
     if(code===1000){
       loading.value = false
+    }else {
+      ElNotification({
+        title: '提示',
+        message: msg,
+        type:  'error'
+      })
     }
-    console.log(data, 'data--22');
     if(data===undefined)return;
     commonForm.value = data
     processStore.setDesign(data)
@@ -126,17 +62,14 @@ const getAllInfo = async (state) => {
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
     nextTick(() => {
-      // summaryProcessViewer.value = true
       commonProvessViewer.value = true
     })
     loading.close()
   } catch {
     loading.close()
   }
-
 }
 
-const showActive = ref()
 
 const setDetail = (active) => {
   showActive.value = active

src/views/project-management/initiation/index.vue

@@ -212,9 +212,9 @@ const tableConfig = reactive({
         // if (buttons.has("delete")) {
         //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
         // }
-        // if (buttons.has("apply")) {
+        if (buttons.has("apply")) {
           btn.push({label: '申请',prem: ['mosr:requirement:info'], func: () => handleApply(row), type: 'primary'})
-        // }
+        }
         return (
             <div style={{width: '100%'}}>
               {