From 6551fb939c29dbfac87b78ffd39272fabd3c82d2 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 10 四月 2024 11:10:43 +0800
Subject: [PATCH] 富文本上传路径修改

---
 src/views/safetyReview/projectManage/index.vue |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index e07fa65..9168df7 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -111,7 +111,7 @@
       <el-table-column label="缺失要件"  align="center"  width="150">
         <template #default="scope">
           <div style="cursor:pointer;color: #3b82f6;" >
-            <span v-if="scope.row.process === 5" @click="goMenu('toTwelve',scope.row)">{{scope.row.materialCnt}}</span>
+            <span v-if="scope.row.process === 5" @click="goMenu('toTwelve',scope.row)">{{scope.row.missingMaterialCnt}}</span>
             <span v-else></span>
           </div>
         </template>
@@ -119,8 +119,8 @@
       <el-table-column label="归档确认" prop="" align="center"  width="150">
         <template #default="scope">
           <div style="cursor:pointer;color: #3b82f6;" >
-            <span v-if="scope.row.process === 5 && scope.row.personRecognition"  @click="goMenu('toThirteen',scope.row)">{{scope.row.personRecognition.recognitionCnt}}/{{scope.row.personRecognition.personCnt}}</span>
-            <span v-else></span>
+            <span  v-if="scope.row.process === 5" @click="goMenu('toThirteen',scope.row)">{{scope.row.activeConfirm}}</span>
+<!--            <span v-else></span>-->
           </div>
         </template>
       </el-table-column>
@@ -289,6 +289,8 @@
 
 onMounted(() => {
   Cookies.remove('projectId')
+  Cookies.remove('end')
+  Cookies.remove('btn')
   getList();
   getStatistics();
   getArea();
@@ -316,10 +318,12 @@
         ...item,
         process: item.reportProgress <= 4 ? 1 : item.reportProgress > 4 && item.reportProgress <= 6 ? 2 : item.reportProgress > 6 && item.reportProgress <= 9 ? 3 : item.reportProgress > 9 && item.reportProgress <= 11 ? 4 : 5,
         leaderName: item.leader ? item.leader.name : '',
-        area: item.district ? item.province + '/' + item.city + '/' + item.district : item.city?item.province + '/' + item.city:item.province ,
+        area: item.district ? item.province + '/' + item.city + '/' + item.district : item.city != item.province ? item.province + '/' + item.city: item.province ,
         filingDate: item.filingDate ? conversionDays(item.filingDate,item.createTime) : conversionDays('',item.createTime),
         contractMoney: item.contract ? item.contract.contractMoney : '',
-        actualContractMoney: item.contract ? item.contract.actualContractMoney : ''
+        actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
+        activeConfirm: item.personRecognition ? item.personRecognition.recognitionCnt + '/' +  item.personRecognition.personCnt: '',
+        missingMaterialCnt:  3-item.materialCnt
       }
     })
     total.value = res.data.total
@@ -484,11 +488,10 @@
     }
   },
   '项目实施天数': 'filingDate',
-  '项目变更': '',
   '预估金额(万元)': 'contractMoney',
   '归档金额(万元)': 'actualContractMoney',
   '缺失要件': 'materialCnt',
-  '归档确认': ''
+  '归档确认': 'activeConfirm'
 });
 const goMenu = (toPath,val) => {
   console.log("val",val)

--
Gitblit v1.9.2