From 4f9cf7c244c43e2c01b0e220eedbdf01dcf8a721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 14 Apr 2023 10:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=93=8D=E4=BD=9C=E4=BA=BA?=
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 +
 .../components/batSetting.vue                 | 36 ++++++++++------
 .../components/listOfRegulations.vue          | 42 ++++++++++++++++---
 4 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9d9ee1146..15f2fa326 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1784,4 +1784,5 @@ module.exports = {
   modifyOperator:'Modify Operator',
   onlyDesignComplianceConfirmationSelected:'Only data with a design compliance confirmation process status of task to be confirmed, result to be submitted, or verification compliance confirmation process status of task to be confirmed, result to be submitted can be selected',
   oneThePersonnelMustBeSelected:'One of the personnel must be selected',
+  pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 46ebe9b09..227b81d1a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1886,4 +1886,5 @@ module.exports = {
   modifyOperator:'修改操作人',
   onlyDesignComplianceConfirmationSelected:'只能选择设计符合性确认流程状态为任务待确认、结果待提交或验证符合性确认流程状态为任务待确认、结果待提交的数据',
   oneThePersonnelMustBeSelected:'必须选择其中一个人员',
+  pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue
index e2acfa335..2519d5201 100644
--- a/jero-web/src/views/projectManagement/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/components/batSetting.vue
@@ -113,13 +113,13 @@
                      </span>
                 </a-select-option>
               </a-select>
-<!--              <PersonnelSelection-->
-<!--                :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"-->
-<!--                :isSingleChoice="true"-->
-<!--                :personneQuery="formInline"-->
-<!--                v-if="visible"-->
-<!--                @change="PersonnelSelectionChange"-->
-<!--                v-model="formInline.engineeringInterfacePersonName"/>-->
+              <!--              <PersonnelSelection-->
+              <!--                :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"-->
+              <!--                :isSingleChoice="true"-->
+              <!--                :personneQuery="formInline"-->
+              <!--                v-if="visible"-->
+              <!--                @change="PersonnelSelectionChange"-->
+              <!--                v-model="formInline.engineeringInterfacePersonName"/>-->
               <!--                <j-dict-select-tag class="box-input" v-model="formInline.designDuty"-->
               <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
               <!--                                   @input="handleInput('designDuty')"-->
@@ -361,7 +361,7 @@
         ids: [],
         code: '',
         regulatoryEngineerList: [],
-        engineeringInterfacePersonList:[],
+        engineeringInterfacePersonList: []
       }
     },
     mounted() {
@@ -370,7 +370,7 @@
       dutyTerritoryChange(event) {
         this.formInline.regulationOwnerId = undefined
         this.formInline.engineeringInterfacePerson = undefined
-        this.formInline = {...this.formInline}
+        this.formInline = { ...this.formInline }
         this.queryPersonByProject(event)
       },
       queryPersonByProject(row) {
@@ -380,8 +380,15 @@
         }
         getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
           if (res.success) {
-            this.regulatoryEngineerList = res.result.lawEngineerList //法规工程师
-            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList //工程接口人
+            this.regulatoryEngineerList = res.result.lawEngineerList || [] //法规工程师
+            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
+            if (this.regulatoryEngineerList.length == 1) {
+              this.formInline.regulationOwnerId = this.regulatoryEngineerList[0].value
+            }
+            if (this.engineeringInterfacePersonList.length == 1) {
+              this.formInline.engineeringInterfacePerson = this.engineeringInterfacePersonList[0].value
+            }
+            this.formInline = {...this.formInline}
           }
         })
       },
@@ -389,7 +396,7 @@
         this.formInline[value] = id
         this.formInline = { ...this.formInline }
       },
-      edit(data, code) {
+      edit(data, code, content) {
         this.visible = true
         this.regulatoryEngineerList = []
         this.engineeringInterfacePersonList = []
@@ -398,6 +405,11 @@
         this.$nextTick(() => {
           this.ids = data || []
           this.formInline = {}
+          if (content) {
+            this.formInline.dutyTerritory = content.dutyTerritory
+            this.queryPersonByProject(content)
+          }
+          this.formInline = { ...this.formInline }
         })
       },
       handleOk() {
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index f43f2672d..bf495680b 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -119,7 +119,7 @@
         </div>
         <!--              修改操作人-->
         <div class="operator-text" v-if="this.roleSwitchingCode == '1'"
-             @click="modifyOperatorClick">
+             @click="modifyOperatorClick('法规')">
           <a-icon type="export" :rotate="-90"/>
           {{ $t('modifyOperator') }}
         </div>
@@ -198,7 +198,7 @@
                 {{ $t('compliancereport') }}
               </div>
               <!--              修改操作人-->
-              <div class="operator-text-title" @click="modifyOperatorClick">
+              <div class="operator-text-title" @click="modifyOperatorClick('studio')">
                 <a-icon type="export" :rotate="-90"/>
                 {{ $t('modifyOperator') }}
               </div>
@@ -1467,7 +1467,7 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
-      modifyOperatorClick() {
+      modifyOperatorClick(name) {
         if (this.selectedRowKeys.length == 0) {
           this.$message.warning(this.$t('selectLeastOne'))
         } else if (this.selectedRowKeys.length > 1) {
@@ -1491,8 +1491,15 @@
             || contentList[0].designFlowStatus == 'Results to be submitted') {
             isDesignFlow = true
           }
+          if (name == '法规') {
+            if (contentList[0].regulationOwnerId == this.userInfo().id) {
+            } else {
+              this.$message.warning(this.$t('pleaseSelectRegulatoryCurrentLogin'))
+              return
+            }
+          }
           if (isDesignFlow || isVerifyFlow) {
-            this.$refs.modifyOperatorRef.getData(contentList[0],isDesignFlow, isVerifyFlow)
+            this.$refs.modifyOperatorRef.getData(contentList[0], isDesignFlow, isVerifyFlow)
           } else {
             this.$message.warning(this.$t('onlyDesignComplianceConfirmationSelected'))
           }
@@ -1721,7 +1728,32 @@
       batSettingClick() {
         let code = this.roleSwitchingCode
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code)
+          let content = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < this.selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == this.selectedRowKeys[j]) {
+                content.push(this.dataSource[i])
+              }
+            }
+          }
+          let isTrue = false
+          for (let i = 0; i < content.length; i++) {
+            if (!content[i].dutyTerritory_dictText) {
+              isTrue = true
+              break
+            }
+            for (let j = 1; j < content.length; j++) {
+              if (content[i].dutyTerritory_dictText != content[j].dutyTerritory_dictText) {
+                isTrue = true
+                break
+              }
+            }
+          }
+          if (!isTrue){
+            this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code,content[0])
+          }else{
+            this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code)
+          }
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }