Merge pull request 'fix : 修复页面bug' (#596) from dd into master

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

src/components/DetailComponent/AllocationSummaryDetail.vue

@@ -37,20 +37,14 @@
 import {getAllocationSummaryDetails} from "@/api/expense-manage";
 import {shareExportExcel} from "@/api/expense-manage";
 
-const tableData = ref([{
+const props = defineProps({
-  id: '12987122',
+  allocationName :{
-  name: 'Tom',
+    type: String,
-  amount1: '234',
+    default: ''
-  amount2: '3.2',
+  }
-  amount3: 10,
+})
-},
+
-  {
+const tableData = ref()
-    id: '12987123',
-    name: 'Tom',
-    amount1: '165',
-    amount2: '4.43',
-    amount3: 12,
-  }])
 const loading = ref(false)
 const table = ref()
 const route = useRoute()
@@ -91,11 +85,7 @@ const getSummaries = (param) => {
 const exportExcelHandler = () => {
   shareExportExcel(route.query.id).then(res => {
     console.log(res)
-    let reg = /filename=([^&]+)/;
+    let fileName = `科技创新项目费用分摊表-${props.allocationName}.zip`
-    let contentDisposition = decodeURI(res.headers['content-disposition'])
-    let result = reg.exec(contentDisposition)
-    let fileName = result[1]
-    fileName = fileName.replace(/\"/g, '')
     const blob = new Blob([res.data])
     let a = document.createElement('a')
     a.href = URL.createObjectURL(blob)

src/components/DetailComponent/ApprovalDetail.vue

@@ -16,11 +16,11 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
+          <el-button @click="handleSearchImplementationFileList" color="#DED0B2">搜索</el-button>
-<!--          <el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>-->
         </el-form-item>
       </el-form>
-      <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"  :tableConfig="tableConfig"
+      <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"
+               :tableConfig="tableConfig"
                :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
         <template #empty>
           <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
@@ -28,7 +28,7 @@
       </fvTable>
     </el-row>
 
-    <baseTitle :title="getTagName(type)+getTitleInfo(data.taskId)" ></baseTitle>
+    <baseTitle v-if="type!='phase'" :title="getTagName(type)+getTitleInfo(data.taskId)"></baseTitle>
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
     <el-form :model="formData" label-width="auto" style="margin-top: -15px">
       <file-component :title="getTagName(type)+'附件'" :tag="getTagName(type)"
@@ -74,6 +74,7 @@ import {ElLoading, ElNotification} from 'element-plus';
 import {downloadFile} from "@/api/project-demand";
 import {searchImplementationFileList} from "@/api/project-manage/attachment";
 import {getTags} from "@/api/project-manage";
+
 const attachmentParam = reactive({
   tag: ''
 })
@@ -359,7 +360,7 @@ const getTagsOption = () => {
     }
   })
 }
-const handleSearch = () => {
+const handleSearchImplementationFileList = () => {
   let params = {
     targetId: route.query.projectId,
     targetState: "40"
@@ -394,7 +395,6 @@ const getTitleInfo=(taskId)=>{
   if (taskId) {
     return '审批'
   } else {
-
     return '信息'
   }
 }
@@ -423,13 +423,20 @@ const handleDownload = (row) => {
 }
 watchEffect(() => {
   Object.keys(props.formData).length && (form.value?.setValues(props.formData))
-  if(props.formData.mode=='view'&&props.type&&props.type==='execute'){
-    handleSearch()
-    getTagsOption()
-  }
 })
 
+onMounted(() => {
+  // if (props.formData.mode == 'view' && props.type == 'execute') {
+  //   handleSearchImplementationFileList()
+  //   getTagsOption()
+  // }
+})
 
+console.log("propsprops", props.formData, props.type , props)
+if (props.formData.mode == 'view' && props.type == 'execute') {
+  handleSearchImplementationFileList()
+  getTagsOption()
+}
 watch(() => props.loading, (newVal) => {
   props.loading = newVal
 }, {deep: true})

src/components/DetailComponent/ProjectApply.vue

@@ -20,7 +20,8 @@
           <el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>
         </el-form-item>
       </el-form>
-        <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"  :tableConfig="tableConfig"
+      <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"
+               :tableConfig="tableConfig"
                :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
         <template #empty>
           <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
@@ -61,7 +62,9 @@
         <el-col :span="24">
           <el-form-item label="前置流程" :required="preProcessRequired" prop="preProcess" label-width="125">
             <el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
-              {{ localFormData.preProcess&&localFormData.preProcess.length>0 ? '更改' :sessionParams.preProcess&&sessionParams.preProcess.length>0 ? '更改' : '请选择' }}
+              {{
+                localFormData.preProcess && localFormData.preProcess.length > 0 ? '更改' : sessionParams.preProcess && sessionParams.preProcess.length > 0 ? '更改' : '请选择'
+              }}
             </el-button>
             <div v-for="item in getRequestName(localFormData.preProcess)" :key="item.requestId">
               <a :href="item.baseUrl" target="_blank"
@@ -164,6 +167,7 @@ import Paging from "@/components/pagination/index.vue";
 import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 
 import {searchImplementationFileList} from "@/api/project-manage/attachment";
+
 const router = useRouter()
 const route = useRoute()
 const changeDiagram = ref(false)
@@ -398,9 +402,9 @@ const handleUpload = () => {
   router.push({
     name: 'Implementation/upload',
     query: {
-      id:  route.query.requirementId,
+      id: route.query.id,
-      state: route.query.state,
       projectId: route.query.projectId,
+      state: route.query.state,
       step: '40'
     }
   })

src/components/DetailComponent/SummaryDetail.vue

@@ -176,12 +176,12 @@
         <div class="process">
           <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
                             :operation-list="data.operationList"
+                            :step="'report'"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="summaryProcess"/>
         </div>
       </div>
     </el-form>
-
     <div class="oper-page-btn" v-perm="['annual:plan:approve']" v-if="data.state==='4'">
       <el-button type="danger" @click="handleRejectPlan">驳回年度计划</el-button>
       <el-button color="#DED0B2" @click="handleAgreePlan">通过年度计划</el-button>
@@ -212,7 +212,9 @@ const props = defineProps({
   },
   data: {
     type: Object,
-    default: {}
+    default: {
+      state: '1'
+    }
   },
   processViewer: {
     type: Boolean,
@@ -251,7 +253,7 @@ const _value = computed({
 })
 const handleRejectPlan = async () => {
   // const values = form.value.getValues()
-  console.log('route',route.query.projectId)
+  // console.log('route',route.query.projectId)
   if (!_value.value) {
     ElNotification({
       title: '提示',
@@ -265,7 +267,7 @@ const handleRejectPlan = async () => {
     projectId:parseInt(route.query.projectId),
     state:false
   }
-  console.log('params', params)
+  // console.log('params', params)
   const res = await approvePlan(params)
   ElNotification({
     title: '提示',
@@ -283,7 +285,7 @@ const handleAgreePlan = async () => {
     projectId:parseInt(route.query.projectId),
     state:true
   }
-  console.log('params', params)
+  // console.log('params', params)
   const res = await approvePlan(params)
   ElNotification({
     title: '提示',

src/components/SearchFilesByTag.vue

@@ -21,10 +21,10 @@
       </el-form-item>
     </el-form>
     <el-card style="width: 100%">
-      <fvTable style="width: 100%;max-height: 162px" v-if="showTable" height="162"  :tableConfig="tableConfig"
+      <fvTable style="width: 100%;max-height: 300px" v-if="showTable" height="300"  :tableConfig="tableConfig"
                :data="fileList" :isSettingCol="false" :pagination="false">
         <template #empty>
-          <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
+          <el-empty :image-size="99" description="暂无数据" style="padding: 0"/>
         </template>
       </fvTable>
     </el-card>
@@ -154,6 +154,13 @@ watch(() => props.fileList, (val) => {
 if (props.type === '40') {
   getTagsOption()
 }
+
+onActivated(()=>{
+  if (props.type === '40') {
+    getTagsOption()
+  }
+  handleSearch()
+})
 </script>
 
 <style scoped>

src/components/steps/index.vue

@@ -285,7 +285,7 @@ const getBaseInfo = async () => {
   stepsShow.value = false
   try {
     const {code, data} = await getBaseInfoApi(route.query.projectId)
-    console.log('data.procedure', data.procedure, route.query.step)
+    // console.log('data.procedure', data.procedure, route.query.step)
     if (route.query.step === '40') {
       if (data.procedure.indexOf('40') == -1) {
         data.procedure.push('40')

src/fvcomponents/fvTable/index.vue

@@ -221,10 +221,10 @@ const getList = async () => {
     localData.loading = true
     try {
       const {code, data, msg} = await requestList(api, queryParmas).then(res=>{
-        console.log(res)
+        // console.log(res)
         return res
       })
-      console.log(code,data,msg)
+      // console.log(code,data,msg)
       if (code === 1000) {
         if (data.rows) {
           localData.list = data.rows

src/utils/request.js

@@ -25,15 +25,15 @@ serveice.interceptors.request.use(config => {
 })
 serveice.interceptors.response.use(response => {
   axiosCanceler.removePendingRequest(response.config)
-  console.log(response,"response")
+  // console.log(response,"response")
   //二进制数据直接返回
   if (response.request.responseType === 'blob' || response.request.responseType === 'arraybuffer') {
     return response.data
   }
-  console.log("1")
+  // console.log("1")
   return response.data
 }, error => {
-  console.log(error)
+  // console.log(error)
   let response = error.response
   if (!response) {
     return Promise.reject()

src/views/expense-management/share/detail.vue

@@ -15,7 +15,7 @@
   </el-form>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="分摊汇总" name="first" v-loading="loading">
-      <allocation-summary-detail/>
+      <allocation-summary-detail :allocation-name="formData.shareName" />
     </el-tab-pane>
     <el-tab-pane label="分摊明细" name="second">
       <expense-detail/>

src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue

@@ -33,27 +33,20 @@
 </template>
 
 <script setup>
-import {toThousands} from '@/utils/changePrice.js'
-import {exportExcel} from "@/utils/export-excel";
 import {getAllocationSummaryDetails} from "@/api/expense-manage";
+import {shareExportExcel} from "@/api/expense-manage";
 
-const tableData = ref([{
+const tableData = ref([])
-  id: '12987122',
-  name: 'Tom',
-  amount1: '234',
-  amount2: '3.2',
-  amount3: 10,
-},
-  {
-    id: '12987123',
-    name: 'Tom',
-    amount1: '165',
-    amount2: '4.43',
-    amount3: 12,
-  }])
 const loading = ref(false)
 const table = ref()
 const route = useRoute()
+const props = defineProps({
+  allocationName :{
+    type: String,
+    default: ''
+  }
+})
+
 const getSummaries = (param) => {
   const {columns, data} = param
   const sums = []
@@ -71,7 +64,7 @@ const getSummaries = (param) => {
             return prev
           }
         }, 0)}`
-        // sums[index] = toThousands(sums[index])
+        sums[index] = parseFloat(sums[index]).toFixed(2)
       } else {
         sums[index] = '-'
       }
@@ -80,12 +73,15 @@ const getSummaries = (param) => {
   return sums
 }
 const exportTable = () => {
-  const $e = table.value.$el
+  shareExportExcel(route.query.id).then(res => {
-  let $table = $e.querySelector('.el-table__fixed')
+    console.log(res)
-  if (!$table) {
+    let fileName = `科技创新项目费用分摊表-${props.allocationName}.zip`
-    $table = $e
+    const blob = new Blob([res.data])
-  }
+    let a = document.createElement('a')
-  exportExcel($table, (5 + (Object.keys(tableData.value[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目费用分摊表",2)
+    a.href = URL.createObjectURL(blob)
+    a.download = fileName
+    a.click()
+  })
 }
 const init = () => {
   loading.value = true

src/views/expense-management/share/moblieDetail/index.vue

@@ -15,11 +15,11 @@
     </el-row>
   </el-form>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="分摊明细" name="first">
+    <el-tab-pane label="分摊汇总" name="first" v-loading="loading">
-      <ExpenseDetailMoblie/>
+      <allocation-summary-detail-moblie :allocation-name="formData.shareName" />
     </el-tab-pane>
-    <el-tab-pane label="分摊汇总" name="second" v-loading="loading">
+    <el-tab-pane label="分摊明细" name="second">
-      <AllocationSummaryDetailMoblie/>
+      <expense-detail-moblie/>
     </el-tab-pane>
   </el-tabs>
   <div v-if="shareData.taskId">
@@ -52,8 +52,8 @@
       <process-diagram-viewer v-if="shareProcessViewer&&changeDiagram" id-name="shareProcess"/>
     </div>
   </div>
-  <opinion v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"
+  <opinion-moblie v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"
-           v-model:value="auditOpinion"></opinion>
+           v-model:value="auditOpinion"></opinion-moblie>
 </div>
 </template>
 
@@ -65,6 +65,7 @@ import {useProcessStore} from '@/stores/processStore.js';
 import {getAllocationDetail} from "@/api/expense-manage";
 import AllocationSummaryDetailMoblie from './AllocationSummaryDetailMoblie.vue'
 import ExpenseDetailMoblie from './ExpenseDetailMoblie.vue'
+import OpinionMoblie from "@/views/project-demand/requirement/moblieDetail/OpinionMoblie.vue";
 
 const changeDiagram = ref(false)
 const processStore = useProcessStore()

src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue

@@ -17,6 +17,12 @@
             <span>{{ formData.deadline }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="24" v-if="formData.isSpecialFund">
+          <el-form-item label="专项资金名称">
+            <span>{{ formData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="24" v-if="type==='singleDetail'">
           <el-form-item label="征集公司">
             <span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
@@ -27,11 +33,6 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金名称">
-            <span>{{ formData.specialFund }}</span>
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
           <baseTitle title="征集说明"></baseTitle>
           <el-form-item>

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

@@ -121,7 +121,8 @@ const upload = () => {
     router.push({
       name: 'Implementation/upload',
       query: {
-        id: route.query.id,
+        projectId: route.query.id,
+        requirementId: requirementId.value,
         type: '40'
       }
     })
@@ -141,8 +142,10 @@ watchEffect(() => {
     paneList.value = paneList.value.slice(1)
   }
 })
-onMounted(() => {
+search({})
-  if (activeName.value === '50') {
+onActivated(() => {
+  if (route.query.name) {
+    activeName.value = route.query.name
     search({})
   }
 })

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

@@ -4,10 +4,10 @@
   <baseTitle :title="getName()+'-上传附件'"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile" />
-    <fvTable style="width: 100%;max-height: 162px;" v-if="showTable" height="162"  :tableConfig="tableConfig"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300"  :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
-        <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
+        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
       </template>
     </fvTable>
   </el-card>
@@ -177,11 +177,15 @@ const handleSubmit = async () => {
         name: 'Filing/attachment',
         query:{
           id: route.query.id,
+          name:route.query.name,
           requirementId:route.query.requirementId
         }
       })
     }
 }
+onActivated(()=>{
+  fileList.value=[]
+})
 </script>
 
 <style scoped>

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

@@ -288,11 +288,7 @@ const exportExcelHandler = () => {
   }
   exportExcel(data).then(res => {
     console.log(res)
-    let reg = /filename=([^&]+)/;
+    let fileName = `科技创新项目研发费用台账-${basicData.value.projectName}.xlsx`
-    let contentDisposition = decodeURI(res.headers['content-disposition'])
-    let result = reg.exec(contentDisposition)
-    let fileName = result[1]
-    fileName = fileName.replace(/\"/g, '')
     const blob = new Blob([res.data])
     let a = document.createElement('a')
     a.href = URL.createObjectURL(blob)

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

@@ -175,7 +175,8 @@ const handleUpload = () => {
   router.push({
     name: 'Implementation/upload',
     query: {
-      projectId: route.query.id
+      projectId: route.query.id,
+      type:'list'
     }
   })
 }

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

@@ -1,15 +1,15 @@
 <template>
   <steps :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
          :reportType="route.query.id==='-1'?'direct':''">
-    <template #content>
+    <template #content v-if="detailShow">
       <collection-detail :formData="detailData.formData"
                          :data="detailData"
                          :processViewer="commonProvessViewer"
-                         v-show="showActive == '00'"
+                         v-if="showActive == '00'"
                          :fileListShow="fileListShow"
                          v-model:value="auditOpinion"
       />
-      <summary-detail v-show="showActive == '10'"
+      <summary-detail v-if="showActive == '10'"
                       :formData="detailData.formData"
                       :data="detailData"
                       :processViewer="commonProvessViewer"
@@ -30,7 +30,7 @@
                       :fileListShow="fileListShow"
                       v-model:value="auditOpinion"/>
       <ApprovalDetail type="archivist"
-                      v-show="showActive == '50'&&!editShow"
+                      v-if="showActive == '50'&&!editShow"
                       :formData="detailData.formData"
                       :data="detailData"
                       :processViewer="commonProvessViewer"
@@ -73,6 +73,7 @@ route.query.step == '20' && (currentStep.value = 2)
 route.query.step == '40' && (currentStep.value = 3)
 route.query.step == '50' && (currentStep.value = 4)
 const showActive = ref()
+const detailShow = ref(false)
 const detailData = ref({})
 const commonProvessViewer = ref(true)
 localStorage.removeItem('singleFile')
@@ -83,6 +84,7 @@ localStorage.removeItem('projectPersonUserList')
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   try {
+    detailShow.value = false
     fileListShow.value = 'READ'
     commonProvessViewer.value = false
     const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
@@ -98,6 +100,8 @@ const getAllInfo = async (state) => {
       processStore.passList.value = data.passList;
       nextTick(() => {
         commonProvessViewer.value = true
+        detailShow.value = true
+        detailData.value = data
         if (data.formPermMap && data.formPermMap["fileList"]) {
           fileListShow.value = data.formPermMap["fileList"].perm
         }

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

@@ -352,7 +352,6 @@ const handleStandingBook = (row) => {
   })
 }
 const handleAttachment = (row) => {
-  console.log('row',row)
   router.push({
     name: 'Implementation/attachment',
     query: {

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

@@ -23,7 +23,7 @@
   <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300" :tableConfig="tableConfig"
            :data="fileList" :isSettingCol="false" :pagination="false">
     <template #empty>
-      <el-empty :image-size="99" description="暂无数据" style="padding: 0"/>
+      <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
     </template>
   </fvTable>
   <div class="oper-page-btn">
@@ -240,27 +240,29 @@ const handleSubmit = async (instance) => {
     if (res.code === 1000) {
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       if (route.query.type === '40') {
+        console.log('归档实施')
         await router.push({
           name: 'Filing/attachment',
           query: {
-            id: route.query.projectId
+            id: route.query.projectId,
+            requirementId: route.query.requirementId
           }
         })
       } else {
-        if (router.query.type || router.query.type !== '40') {
+        if (route.query.type === 'list') {
           router.push({
             name: 'Implementation/attachment',
             query: {
-              projectId: route.query.projectId
+              id: route.query.projectId
             }
           })
         } else {
           await router.push({
             name: 'Implementation/detail',
             query: {
-              id: route.query.id,
+              id: route.query.requirementId,
-              state: route.query.state,
               projectId: route.query.projectId,
+              state: route.query.state,
               step: '40'
             }
           })

src/views/project-management/mobledetail/ApprovalDetailMoblie.vue

@@ -1,5 +1,33 @@
 <template>
   <div v-loading="loading">
+    <el-row  v-if="type==='execute'">
+      <el-col :span="24">
+        <baseTitle :title="'附件信息'"></baseTitle>
+      </el-col>
+      <el-form :model="attachmentParam" inline style="margin-top: 15px" @submit.prevent>
+        <el-form-item label="标签" prop="tag">
+          <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable style="width: 200px">
+            <el-option
+                v-for="item in tagsOption"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"  :tableConfig="tableConfig"
+               :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
+        <template #empty>
+          <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
+        </template>
+      </fvTable>
+    </el-row>
+    <baseTitle v-if="type!='phase'" :title="getTagName(type)+'信息'" ></baseTitle>
+
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
     <el-form :model="formData" label-width="auto">
       <file-component
@@ -46,10 +74,60 @@
 <script setup lang="jsx">
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {ElLoading} from 'element-plus';
+import {ElLoading, ElNotification} from 'element-plus';
 import {downloadFile} from "@/api/project-demand";
+import {searchImplementationFileList} from "@/api/project-manage/attachment";
+import {getTags} from "@/api/project-manage";
 
+
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: 85,
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      width: 150,
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
+const attachmentParam = reactive({
+  tag: ''
+})
+
+const tagsOption = ref([])
 const changeDiagram = ref(false)
+const showAttachmentTable = ref(true)
 const props = defineProps({
   formData: {
     type: Object,
@@ -90,10 +168,43 @@ const props = defineProps({
   }
 })
 const form = ref()
+const otherAttachmentList = ref([])
 const schema = computed(() => {
   let arr
   if (props.type == 'approval') {
     arr = [
+      {
+        label: '项目负责人',
+        prop: 'projectChargePerson',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.projectChargePerson ?
+                    <span>{props.formData.projectChargePerson.name} </span>
+                    : <span>{'--'}</span>
+              }
+            </div>
+        )
+      },
+      {
+        label: '项目成员',
+        prop: 'projectPersonList',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.projectPersonList ? props.formData.projectPersonList.map(item => {
+                  return <span>{item.name} </span>
+                }) : <span>{'--'}</span>
+              }
+            </div>
+        )
+      },
       {
         label: '前置流程',
         prop: 'preProcess',
@@ -231,6 +342,7 @@ const schema = computed(() => {
 })
 
 const emit = defineEmits(['update:value'])
+const route = useRoute()
 const _value = computed({
   get() {
     return props.value;
@@ -239,7 +351,49 @@ const _value = computed({
     emit("update:value", val);
   }
 })
-
+const getTagsOption = () => {
+  if (!route.query.projectId) return
+  getTags(route.query.projectId).then(res => {
+    if (res.code === 1000) {
+      tagsOption.value = res.data
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
+const handleSearch = () => {
+  let params = {
+    targetId: route.query.projectId,
+    targetState: "40"
+  }
+  if (attachmentParam.tag) {
+    tagsOption.value.forEach(item => {
+      if (item.value === attachmentParam.tag) {
+        attachmentParam.tag = item.label
+      }
+    })
+    params.tag = attachmentParam.tag
+  }
+  searchImplementationFileList(params).then(res => {
+    showAttachmentTable.value = false
+    if (res.code === 1000) {
+      otherAttachmentList.value = res.data.fileList
+      nextTick(() => {
+        showAttachmentTable.value = true
+      })
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
 const getTagName = (type) => {
   switch (type) {
     case 'approval':
@@ -263,6 +417,10 @@ const handleDownload = (row) => {
     loading.close()
   })
 }
+if(props.type&&props.type==='execute'){
+  handleSearch()
+  getTagsOption()
+}
 watchEffect(() => {
   Object.keys(props.formData).length && (form.value?.setValues(props.formData))
 })

src/views/project-management/mobledetail/CollectionDetailMoblie.vue

@@ -17,6 +17,12 @@
             <span>{{ formData.deadline }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="24" v-if="formData.isSpecialFund">
+          <el-form-item label="专项资金名称">
+            <span>{{ formData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="24" v-if="type==='singleDetail'">
           <el-form-item label="征集公司">
             <span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
@@ -27,11 +33,6 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金名称">
-            <span>{{ formData.specialFund }}</span>
-          </el-form-item>
-        </el-col>
         <baseTitle title="征集说明"></baseTitle>
         <el-col :span="24">
           <el-form-item>

src/views/project-management/mobledetail/ShareDetailMobile.vue

@@ -1,4 +1,5 @@
 <template>
+  <div style="padding: 0 10px;">
     <baseTitle title="费用分摊详情"></baseTitle>
     <el-form :model="formData" ref="form" class="query-form" label-width="auto">
       <el-row>
@@ -46,7 +47,8 @@
       </div>
       <div class="process">
         <operation-render
-          v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram"  :isColumn="true"
+            v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram"
+            :isColumn="true"
             :operation-list="shareData.operationList"
             :state="shareData.state"/>
         <process-diagram-viewer v-if="shareProcessViewer&&changeDiagram" id-name="shareProcess"/>
@@ -54,6 +56,7 @@
     </div>
     <opinion-moblie v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"
                     v-model:value="auditOpinion"></opinion-moblie>
+  </div>
 </template>
 
 <script setup lang="jsx">

src/views/project-management/mobledetail/SpecialFundDetailMobile.vue

@@ -114,7 +114,7 @@ const projectTable = reactive({
       type: 'index',
       label: '序号',
       align: 'center',
-      width: '80',
+      width: 120
     },
     {
       prop: 'projectName',

src/views/project-management/mobledetail/StepsMoblie.vue

@@ -21,7 +21,6 @@
 
   <!-- 步骤内容 -->
   <div>
-    <baseTitle title="各流程信息"></baseTitle>
     <slot name="content" :localActive="localActive"></slot>
     <!-- <template v-for="(item, index) in stepList" :key="item.key">
       <component v-if="localActive == index" v-bind="item.props || {}" :is="item.component" />
@@ -97,20 +96,6 @@ const baseForm = ref()
 
 const schema = computed(() => {
   return [
-    {
-      label: '征集名称',
-      prop: 'requirementName',
-      colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '征集描述',
-      prop: 'collectExplain',
-      colProps: {
-        span: 24
-      }
-    },
     {
       label: '项目名称',
       prop: 'projectName',
@@ -125,6 +110,20 @@ const schema = computed(() => {
         span: 24
       }
     },
+    {
+      label: '征集名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 24
+      }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 24
+      }
+    }
   ]
 })
 
@@ -328,4 +327,11 @@ watchEffect(() => {
 .is-end {
   color: #BEA266;
 }
+:deep(.el-step__title.is-success) {
+  color: #A8abb2;
+}
+
+:deep(.el-step__head.is-success) {
+  border-color: #A8abb2;
+}
 </style>

src/views/project-management/mobledetail/SummaryDetailMoblie.vue

@@ -39,11 +39,11 @@
             <span>{{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+<!--        <el-col :span="24">-->
-          <el-form-item label="项目影响" prop="projectImpact">
+<!--          <el-form-item label="项目影响" prop="projectImpact">-->
-            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>
+<!--            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-        </el-col>
+<!--        </el-col>-->
         <el-col :span="24">
           <el-form-item label="所属业务板块" prop="businessSegment">
             <span>{{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }}</span>
@@ -172,11 +172,16 @@
         <div class="process">
           <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :isColumn="true"
                             :operation-list="data.operationList"
+                            :step="'report'"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="summaryProcess"/>
         </div>
       </div>
     </el-form>
+    <div class="oper-page-btn" v-perm="['annual:plan:approve']" v-if="data.state==='4'">
+      <el-button type="danger" @click="handleRejectPlan">驳回年度计划</el-button>
+      <el-button color="#DED0B2" @click="handleAgreePlan">通过年度计划</el-button>
+    </div>
   </div>
 </template>
 
@@ -190,6 +195,8 @@ import {getFundOption} from "@/api/special-fund";
 import {useCacheStore} from '@/stores/cache.js'
 import {getSubCompOpt} from "@/api/user/user";
 import FileComponent from "@/components/DetailComponent/FileComponent.vue";
+import {ElNotification} from "element-plus";
+import {approvePlan} from "@/api/project-demand/summary";
 
 const emit = defineEmits(['update:value'])
 const tagsViewStore = useTagsView()
@@ -201,7 +208,9 @@ const props = defineProps({
   },
   data: {
     type: Object,
-    default: {}
+    default: {
+      state: '1'
+    }
   },
   processViewer: {
     type: Boolean,
@@ -237,12 +246,58 @@ const _value = computed({
     emit("update:value", val);
   }
 })
+const handleRejectPlan = async () => {
+  // const values = form.value.getValues()
+  // console.log('route',route.query.projectId)
+  if (!_value.value) {
+    ElNotification({
+      title: '提示',
+      message: '请填写审核意见',
+      type: 'warning'
+    })
+    return
+  }
+  const params = {
+    auditOpinion:_value.value,
+    projectId:parseInt(route.query.projectId),
+    state:false
+  }
+  console.log('params', params)
+  const res = await approvePlan(params)
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push({
+    name: 'Summary'
+  })
+}
+const handleAgreePlan = async () => {
+  const params = {
+    auditOpinion:_value.value,
+    projectId:parseInt(route.query.projectId),
+    state:true
+  }
+  console.log('params', params)
+  const res = await approvePlan(params)
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push({
+    name: 'Summary'
+  })
+}
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
   let label = ''
   let result = []
-  if (JSON.parse(value) instanceof Array) {
+  if (value instanceof Array) {
-    JSON.parse(value).forEach(item1 => {
+    value.forEach(item1 => {
       data.find(item => {
         if (item.value == item1) {
           result.push(item.label)

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

@@ -1,48 +1,49 @@
 <template>
   <div style="padding: 0 10px;">
-    <StepsMoblie :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
+    <StepsMoblie :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail"
+                 @stepChange="stepChange"
                  :reportType="route.query.id==='-1'?'direct':''">
       <template #content>
         <collection-detail :formData="detailData.formData"
                            :data="detailData"
                            :processViewer="commonProvessViewer"
-                          v-show="showActive == '00'"
+                           v-if="showActive == '00'"
                            :fileListShow="fileListShow"
                            v-model:value="auditOpinion"
         />
-        <summary-detail v-show="showActive == '10'"
+        <summary-detail v-if="showActive == '10'"
                         :formData="detailData.formData"
                         :data="detailData"
                         :processViewer="commonProvessViewer"
                         :fileListShow="fileListShow"
                         v-model:value="auditOpinion"/>
         <ApprovalDetail type="approval"
-                        v-if="showActive == '20'&&!editShow"
+                        v-if="showActive == '20'"
                         :formData="detailData.formData"
                         :data="detailData"
                         :processViewer="commonProvessViewer"
                         :fileListShow="fileListShow"
                         v-model:value="auditOpinion"/>
         <ApprovalDetail type="execute"
-                        v-if="showActive == '40'&&!editShow"
+                        v-if="showActive == '40'"
                         :formData="detailData.formData"
                         :data="detailData"
                         :processViewer="commonProvessViewer"
                         :fileListShow="fileListShow"
                         v-model:value="auditOpinion"/>
         <ApprovalDetail type="archivist"
-                        v-show="showActive == '50'&&!editShow"
+                        v-if="showActive == '50'"
                         :formData="detailData.formData"
                         :data="detailData"
                         :processViewer="commonProvessViewer"
                         :fileListShow="fileListShow"
                         v-model:value="auditOpinion"/>
-        <project-apply-moblie :title="applyTitle"
+        <!--        <project-apply-moblie :title="applyTitle"-->
-                      v-if="editShow"
+        <!--                      v-if="editShow"-->
-                      :mode="mode"
+        <!--                      :mode="mode"-->
-                      :step="showActive"
+        <!--                      :step="showActive"-->
-                      :data="detailData"
+        <!--                      :data="detailData"-->
-                      :formData="detailData.formData"/>
+        <!--                      :formData="detailData.formData"/>-->
       </template>
     </StepsMoblie>
     <opinion-moblie v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId"
@@ -60,7 +61,7 @@ import SummaryDetail from './SummaryDetailMoblie.vue';
 import StepsMoblie from './StepsMoblie.vue';
 import {getMapProjectStateInfo} from "./api";
 import OpinionMoblie from "./OpinionMoblie.vue";
-import ProjectApplyMoblie from "./ProjectApplyMoblie.vue";
+// import ProjectApplyMoblie from "./ProjectApplyMoblie.vue";
 
 
 const route = useRoute()
@@ -82,6 +83,9 @@ const commonProvessViewer = ref(true)
 
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
+  detailData.value = {
+    state: "0"
+  }
   try {
     fileListShow.value = 'READ'
     commonProvessViewer.value = false
@@ -121,9 +125,9 @@ const getAllInfo = async (state) => {
   }
 }
 const changeModel = (active, mode) => {
-  editShow.value = false
+  // editShow.value = false
   nextTick(() => {
-    editShow.value = mode === 'submit' || mode === 'resubmit';
+    // editShow.value = mode === 'submit' || mode === 'resubmit';
     if (route.query.step === '20' && active === '20') {
       applyTitle.value = 'apply'
     } else if (route.query.step === '40' && active === '40') {

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

@@ -3,10 +3,11 @@
     <baseTitle title="基础信息"></baseTitle>
     <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
     <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
-    <div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;width: 84px;text-align: right;margin-right: 14px">抄送人</span>{{copyName}}</div>
+    <div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;width: 82px;text-align: right;margin-right: 14px">抄送人</span>{{copyName?copyName:'--'}}</div>
     <ApprovalDetailMoblie :formData="summaryData.formData" :data="summaryData" type="phase"
                     :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
-    <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>
+    <opinion-moblie v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"
+                    v-model:value="auditOpinion"/>
   </div>
 </template>
 
@@ -17,6 +18,7 @@ import {getPhaseDetail} from "@/api/project-manage";
 import {computed, ref} from "vue";
 import {getBaseInfoApi} from "@/components/steps/api";
 import ApprovalDetailMoblie from './ApprovalDetailMoblie.vue'
+import OpinionMoblie from "../mobledetail/OpinionMoblie.vue";
 
 const route = useRoute()
 const summaryData = ref({})
@@ -28,6 +30,20 @@ const copyName = ref('')
 const fileListShow = ref('READ')
 const schema = computed(() => {
   return [
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 24
+      }
+    },
+     {
+      label: '征集公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 24
+      }
+    },
     {
       label: '征集名称',
       prop: 'requirementName',
@@ -36,12 +52,12 @@ const schema = computed(() => {
       }
     },
     {
-      label: '项目名称',
+      label: '征集描述',
-      prop: 'projectName',
+      prop: 'collectExplain',
       colProps: {
         span: 24
       }
-    }
+    },
   ]
 })
 const baseForm = ref()

src/views/workflow/common/OperationRender.vue

@@ -56,7 +56,6 @@
 </template>
 
 <script setup>
-import {CircleCheckFilled, Close, Loading, MoreFilled} from "@element-plus/icons-vue";
 import NameCircle from "@/components/NameCircle.vue";
 
 const props = defineProps({
@@ -75,10 +74,18 @@ const props = defineProps({
   isColumn: {
     type: Boolean,
     default: false
+  },
+  step: {
+    type: String,
+    default: ""
   }
 })
 
-const timeline = ref()
+const timeline = ref({
+  color: '',
+  icon: '',
+  context: ''
+})
 
 const init = () => {
   switch (props.state) {
@@ -90,11 +97,19 @@ const init = () => {
       }
       break
     case '4':
+      if (props.step != 'report'){
+        timeline.value = {
+          color: '#0bbd87',
+          icon: 'CircleCheckFilled',
+          context: '审批通过'
+        }
+      }else {
         timeline.value = {
           color: '#f78f5f',
           icon: 'MoreFilled',
           context:'年度计划审批中'
         }
+      }
       break
     case '2':
       timeline.value = {
@@ -111,6 +126,7 @@ const init = () => {
       }
       break
     case '5':
+    case '6':
       timeline.value = {
         color: '#0bbd87',
         icon: 'CircleCheckFilled',