From eb4d6eb4e3a5ce34b02edbe94bf0c499e1eebfee Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Wed, 15 Jun 2022 11:32:26 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../src/components/tableCollection/index.vue  |  4 ++--
 .../ParameterItemCollectionList.vue           | 20 +++++++++++++------
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index a0430f3be..f6aad501e 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -712,6 +712,7 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'Enclosure',
   // 认证
+  Areyousureparameteritems: 'Are you sure to submit the selected parameter items?',
   Theselectedconfiguration: 'The selected item has incomplete data collection, unable to add configuration',
   theCurrent: 'The current status of this data is',
   thisbuttonCompleted: 'This button can only be operated when the status is completed',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index a164de6be..6264a9406 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -723,6 +723,7 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  Areyousureparameteritems: '确认提交所选参数项嘛?',
   Theselectedconfiguration: '所选项目有未完成收集数据，不能添加配置',
   theCurrent: '此数据当前状态为',
   thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮',
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 388442cbb..3e9d42218 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -24,7 +24,7 @@
         </div>
 
         <span slot="operationbtn" slot-scope="record">
-           <span v-if='homo === 1'>
+           <span v-if='currentPersonRole === "homo"'>
 <!--           认证工程师  -->
            <span v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更"'>
              <span
@@ -56,7 +56,7 @@
         <a-row :gutter='24'>
           <a-col :span='24'>
             <a-form-model-item ref='region' :label="$t('engineeringInterfacePerson')" prop='region'>
-              <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')" v-model="Dateline.querySdt">
+              <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')" v-model="Dateline.querySdt">
                 <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 65fe10fe7..665391e07 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -910,6 +910,7 @@ export default {
     },
     // 提交数据
     ishandleSubmit() {
+      let _this = this
       let postDate = []
       this.selectedRowKeysValue.forEach((item, index) => {
         let postDateobj = {}
@@ -932,12 +933,19 @@ export default {
       if(this.selectedRowKeys.length == 0) {
         this.$message.warning(this.$t('selectLeastOne'))
       }else {
-        postAction(this.url.add, configDataList).then((res) => {
-          if (res.success) {
-            this.GetgetTableList()
-            this.$message.success(this.$t('OperationSuccessful'))
-          } else {
-            this.$message.warning(this.$t('operationFailed'))
+        let _configDataListNo = []
+        this.$confirm({
+          content: _this.$t('Areyousureparameteritems'),
+          onOk() {
+            console.log(configDataList,'configDataListconfigDataList')
+            postAction(_this.url.add, configDataList).then((res) => {
+              if (res.success) {
+                _this.GetgetTableList()
+                _this.$message.success(this.$t('OperationSuccessful'))
+              } else {
+                _this.$message.warning(this.$t('operationFailed'))
+              }
+            })
           }
         })
       }