From 745bcfeffeb6524ea0518961d97cbd726786a94a Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Thu, 16 Jun 2022 17:57:55 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParameterItemCollectionList.vue           | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index ba3912564..9600e1ba0 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -251,11 +251,22 @@
     >
       <a-row :gutter="24">
         <a-col :span="24">
-          <div style='font-size: 20px;margin-bottom: 20px;display: flex;justify-content: center' class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue'>
+<!--          没有工程接口人，导致下发收集失败提示-->
+          <span  v-if='NoEngineer === 0'>
+            NIO编号为
+          </span>
+          <span style='font-size: 16px;margin-bottom: 20px;' v-for='(item,key) in NotSelectedNoEngineerValue' v-if='NoEngineer === 0'>
+            <span style='color: red'>{{ item.nioNumber }}、</span>
+          </span>
+          <span  v-if='NoEngineer === 0'>
+            工程接口人没有填写,请填写完工程接口人再进行下发收集。
+          </span>
+<!--          状态不符合，导致不能操作按钮，没有权限-->
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center' class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue' v-if='NoEngineer === 1'>
             <div>NIO编号为{{ item.nioNumber }},状态为<span style='color: red'>{{ item.state }}</span>,没有此按钮的操作权限。</div>
           </div>
 <!--          认证工程师-提示-->
-          <div style='font-size: 16px;color: red;display: flex;justify-content: center'>
+          <div style='font-size: 16px;color: red;display: flex;justify-content: center' v-if='NoEngineer === 1'>
            {{ currentPersonRole =='homo'? '认证工程师': (currentPersonRole =='sdt'? '工程接口人': '填写人') }}数据状态为
 <!--            下发收集时-->
             <span v-if='jurisdiction === "HOMOZFSJ"'>
@@ -444,6 +455,8 @@ export default {
       },
       RoleType: [ ],// 控件类型
       NotSelectedRowKeysValue: [],
+      NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有
+      NotSelectedNoEngineerValue: []
     }
   },
   props: {
@@ -484,7 +497,9 @@ export default {
     // 认证工程师 下发收集 权限
     // 仅仅状态为 待发起收集 工程接口人退回 变更 可以下发收集
     homodistributionAndCollection() {
+      this.NoEngineer = 1
       this.NotSelectedRowKeysValue = []
+      this.NotSelectedNoEngineerValue = []
       // 定义开关 0为没有权限  1为有权限
       let flag = 1
       if(this.selectedRowKeysValue.length == 0) {
@@ -492,9 +507,15 @@ export default {
         this.$message.warning(this.$t('selectLeastOne'))
       } else {
         this.selectedRowKeysValue.forEach((item, index) => {
+        //  状态不符合，不能下发收集
         if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更') {
           this.NotSelectedRowKeysValue.push(item)
           flag = 0
+        }
+          //  状态符合，但是没有工程接口人 不能下发收集
+        if(item.sdt.dataValue === null && (flag == 1 || flag == 3)) {
+          this.NotSelectedNoEngineerValue.push(item)
+          flag = 3
         }
         })
       }
@@ -699,7 +720,6 @@ export default {
     // 填写人 提交 权限
     // 仅仅状态为 待填写 认证工程师退回 可以提交
     dreJurisdictionSubmit() {
-      console.log(this.selectedRowKeysValue,'this.selectedRowKeysValue')
       // 定义开关 0为没有权限  1为有权限
       this.NotSelectedRowKeysValue = []
       let flag = 1
@@ -782,7 +802,6 @@ export default {
         }
       })
         .then( (res) =>{
-          console.log(res)
           if (res.data.success) {
             _this.$message.success(res.data.result)
             this.areaVisibleFreeze = false
@@ -792,7 +811,6 @@ export default {
           }
         })
         .catch( (error) =>{
-          console.log(error);
         });
     },
     // 冻结配置取消
@@ -819,7 +837,6 @@ export default {
         }
       })
         .then( (res) =>{
-          console.log(res)
           if (res.data.success) {
             this.FreezeList = res.data.result
           }else{
@@ -827,7 +844,6 @@ export default {
           }
         })
         .catch( (error) =>{
-          console.log(error);
         });
     },
     // 下发收集的权限
@@ -838,6 +854,9 @@ export default {
       } else if(homodistributionAndCollection == 0){
         this.visibleoperationFailed = true
         this.jurisdiction = 'HOMOZFSJ'
+      } else if(homodistributionAndCollection == 3) {
+        this.visibleoperationFailed = true
+        this.NoEngineer = 0
       }
     },
     // 下发收集---请求接口
@@ -865,7 +884,6 @@ export default {
         }
       })
         .then( (res) =>{
-          console.log(res)
           if (res.data.success) {
             _this.$message.success(res.data.message)
             _this.areaVisible = false
@@ -875,7 +893,6 @@ export default {
           }
         })
         .catch( (error) =>{
-          console.log(error);
         });
     },
     // 同步上报库 权限
@@ -937,7 +954,6 @@ export default {
         this.$confirm({
           content: _this.$t('Areyousureparameteritems'),
           onOk() {
-            console.log(configDataList,'configDataListconfigDataList')
             postAction(_this.url.add, configDataList).then((res) => {
               if (res.success) {
                 _this.GetgetTableList()
@@ -985,7 +1001,6 @@ export default {
         }
       })
         .then( (res) =>{
-          console.log(res)
           if (res.data.success) {
             _this.$message.success(res.data.result)
             _this.GetgetTableList()
@@ -995,7 +1010,6 @@ export default {
           }
         })
         .catch( (error) =>{
-          console.log(error);
         });
     },
     // 强制撤回权限
@@ -1032,7 +1046,6 @@ export default {
         }
       })
         .then( (res) =>{
-          console.log(res)
           if (res.data.success) {
             _this.$message.success(res.data.result)
             _this.getTableList()
@@ -1042,7 +1055,6 @@ export default {
           }
         })
         .catch( (error) =>{
-          console.log(error);
         });
     },
     // 分配填写人
@@ -1092,7 +1104,6 @@ export default {
 
       },
       handleCody() {
-        console.log(this.paramsManifest, 'paramsManifestparamsManifestparamsManifestparamsManifest')
       },
       searchQuery() {
         this.pageNo = 1
@@ -1147,7 +1158,6 @@ export default {
                   }
                 })
                 .catch((error) => {
-                  console.log(error)
                 })
             }
           })