Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue

@@ -52,7 +52,7 @@
               <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"
                         class="box-input"
                         allowClear
                         optionFilterProp="label"
@@ -187,13 +187,18 @@
           }
         })
       },
-      edit(data, name) {
+      edit(data, name,content) {
         this.visible = true
         this.getDeliverableTree()
         this.$nextTick(() => {
           this.ids = data || []
           this.formInline = {}
           this.name = name
+          if (content && name == this.$t('BatchSetting')) {
+            this.formInline.dutyTerritory = content.dutyTerritory
+            this.queryPersonByProject(content.dutyTerritory)
+          }
+          this.formInline = { ...this.formInline }
         })
       },
       handleOk() {

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -973,7 +973,25 @@
       },
       BatchSettingClick(name) {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name)
+          let isTrue = false
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (!this.selectedRowKeysList[i].dutyTerritoryName) {
+              isTrue = true
+              break
+            }
+            for (let j = 1; j < this.selectedRowKeysList.length; j++) {
+              if (this.selectedRowKeysList[i].dutyTerritoryName != this.selectedRowKeysList[j].dutyTerritoryName) {
+                isTrue = true
+                break
+              }
+            }
+          }
+          if (!isTrue){
+            this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name,this.selectedRowKeysList[0])
+          }else{
+            this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name)
+          }
+
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }