From 9617b90429133e5a896817c6a3ee2a569a63ac35 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 11 十二月 2024 17:03:40 +0800
Subject: [PATCH] bug修改

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

diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index b58a644..6aca90d 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -128,8 +128,8 @@
       <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template #default="scope">
           <el-button link type="primary" @click="toProcess('view',scope.row)">查看</el-button>
-          <el-button link type="primary" @click="toProcess('edit',scope.row)">编辑</el-button>
-          <el-button link type="danger" v-if="(isAgency && scope.row.reportProgress !== 14) || !isAgency" @click="del(scope.row)">删除</el-button>
+          <el-button link type="primary" v-if="scope.row.reportProgress !== 14" @click="toProcess('edit',scope.row)">编辑</el-button>
+          <el-button link type="danger" v-if="(isAgency && scope.row.reportProgress !== 14) || (!isAgency && scope.row.reportProgress !== 14)" @click="del(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -171,10 +171,10 @@
             />
           </el-form-item>
           <el-form-item  label="项目名称" >
-            <el-input v-model="search.queryParams.name" placeholder="请输入项目名称"></el-input>
+            <el-input v-model.trim="search.queryParams.name" placeholder="请输入项目名称"></el-input>
           </el-form-item>
           <el-form-item  label="委托单位">
-            <el-input v-model="search.queryParams.client" placeholder="委托单位"></el-input>
+            <el-input v-model.trim="search.queryParams.client" placeholder="委托单位"></el-input>
           </el-form-item>
           <el-form-item  label="业务范围">
             <el-select v-model="search.queryParams.business" class="m-2" size="large" placeholder="请选择" style="width: 100%" >
@@ -325,12 +325,14 @@
         filingDate: item.filingDate ? conversionDays(item.filingDate,item.createTime) : conversionDays('',item.createTime),
         contractMoney: item.contract ? item.contract.contractMoney : '',
         actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
-        activeConfirm: item.personRecognition ? item.personRecognition.recognitionCnt + '/' +  item.personRecognition.personCnt: '',
-        missingMaterialCnt:  3-item.materialCnt
+        activeConfirm: item.personRecognition ?  item.personRecognition.recognitionCnt +  '/' +  item.personRecognition.personCnt: '',
+        missingMaterialCnt:  3-item.materialCnt,
+        activeConfirmOut: item.personRecognition ? "\'" + item.personRecognition.recognitionCnt +  '/' +  item.personRecognition.personCnt: '',
       }
     })
     total.value = res.data.total
     loading.value = false;
+    console.log('11',dataList.value)
   }else{
     ElMessage.warning(res.message)
   }
@@ -493,8 +495,8 @@
   '项目实施天数': 'filingDate',
   '预估金额(万元)': 'contractMoney',
   '归档金额(万元)': 'actualContractMoney',
-  '缺失要件': 'materialCnt',
-  '归档确认': 'activeConfirm'
+  '缺失要件': 'missingMaterialCnt',
+  '归档确认': 'activeConfirmOut'
 });
 const goMenu = (toPath,val) => {
   console.log("val",val)

--
Gitblit v1.9.2