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

jero-web/src/common/lang/en-us.js

@@ -569,6 +569,8 @@ module.exports = {
   mergeTerms: 'Determine Merger Terms',
   documentSplitTemplate: 'Document Split Template',
   batSetting: 'Batch Setting',
+  batchSettingInformation:'Batch Setting Information',
+  batchSettingPersonnel:'Batch Setting Personnel',
   selectDirectoryTerms: 'Please Select the directory location to add terms',
   StandardBreakdown: 'Standard Breakdown',
   OnlyWordItem: 'Only the GSO file type can split PDF files. Please re select the file',
@@ -1269,4 +1271,7 @@ module.exports = {
   source:'Source',
   sourceEn:'Source (English)',
   onlyone:'Only one merge delimiter can be entered',
+  theInconsistentSameResponsibility:'The selected data responsibility fields are inconsistent; Please select the same responsibility',
+  taskConfirmedPersonnelCannotBeSetBatch:'When the task confirmation status is to be confirmed, personnel cannot be set in batch',
+  theSelectedDataResponsibilityFieldCannotEmpty:'The selected data responsibility field cannot be empty',
 }

jero-web/src/common/lang/zh-cn.js

@@ -576,6 +576,8 @@ module.exports = {
   mergeTerms: '确定合并条款',
   documentSplitTemplate: '文档拆分模板',
   batSetting: '批量设置',
+  batchSettingInformation:'批量设置信息',
+  batchSettingPersonnel:'批量设置人员',
   selectDirectoryTerms: '请选择添加条款的目录位置',
   selectDirectorylocation: '请选择添加文件夹的目录位置',
   OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件',
@@ -1371,4 +1373,7 @@ module.exports = {
   source: '来源',
   sourceEn: '来源(英文)',
   onlyone:'只能输入一个合并分隔符',
+  theInconsistentSameResponsibility:'所选的数据责任领域不一致；请选择相同的责任领域',
+  taskConfirmedPersonnelCannotBeSetBatch:'任务确认状态为待确认时无法批量设置人员',
+  theSelectedDataResponsibilityFieldCannotEmpty:'所选数据责任领域不能为空',
 }

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

@@ -1,6 +1,6 @@
 <template>
   <a-modal
-    :title="$t('batSetting')"
+    :title="$t('batchSettingInformation')"
     :width="1200"
     :visible="visible"
     :confirm-loading="confirmLoading"
@@ -35,11 +35,11 @@
                                   :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                   :type="'select'"
                                   :triggerChange="false" :dictCode="'attestation_type'"/>
-<!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
-<!--                                 @input="handleInput('attestationType')"-->
+              <!--                                 @input="handleInput('attestationType')"-->
-<!--                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
-<!--                                 :type="'select'"-->
+              <!--                                 :type="'select'"-->
-<!--                                 :triggerChange="false" dictCode="attestation_type"/>-->
+              <!--                                 :triggerChange="false" dictCode="attestation_type"/>-->
             </a-form-model-item>
           </div>
         </a-col>
@@ -69,7 +69,7 @@
                                   :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                   :type="'select'"
                                   :triggerChange="false" :dictCode="'attestation_rank'"/>
-<!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
               <!--                                 @input="handleInput('attestationRank')"-->
               <!--                                 :placeholder="$t('PleaseSelect')+$t('certificationLevel')"-->
               <!--                                 :type="'select'"-->

jero-web/src/views/projectManagement/components/batchSettingPersonnel.vue

@@ -0,0 +1,418 @@
+<template>
+  <a-modal
+    :title="$t('batchSettingPersonnel')"
+    :width="1000"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text"
+                    :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="formInline.regulationOwnerId">
+                <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"
+                        class="box-input"
+                        allowClear
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.homologationEngineerId">
+                <a-select-option v-for="(item, key) in certificationEngineerList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
+              <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                        class="box-input"
+                        allowClear
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.engineeringInterfacePerson">
+                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('confirmationOfDesignConformity')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.designInitiatorId">
+                <a-select-option v-for="(item, key) in designInitiatorList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.designDutyId">
+                <a-select-option v-for="(item, key) in designDutyList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('PrehomoConfirmation')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.prehomoInitiatorId">
+                <a-select-option v-for="(item, key) in prehomoInitiatorList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.prehomoDutyId">
+                <a-select-option v-for="(item, key) in prehomoDutyList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('verificationAndConformityconfirmation')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.verifyInitiatorId">
+                <a-select-option v-for="(item, key) in verifyInitiatorList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.verifyDutyId">
+                <a-select-option v-for="(item, key) in verifyDutyList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+
+  export default {
+    name: 'batchSettingPersonnel',
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        regulatoryEngineerList: [],
+        certificationEngineerList: [],
+        engineeringInterfacePersonList: [],
+        designInitiatorList: [],
+        designDutyList: [],
+        prehomoInitiatorList: [],
+        prehomoDutyList: [],
+        verifyInitiatorList: [],
+        verifyDutyList: [],
+        formInline: {},
+        rules: {},
+        ids: [],
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      edit(data, content) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.ids = data || []
+          this.formInline = {}
+          this.queryPersonByProject(content[0].dutyTerritory)
+        })
+      },
+      queryPersonByProject(row) {
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: row
+        }
+        getAction(this.url.queryPersonByProject, query).then((res) => {
+          if (res.success) {
+            this.regulatoryEngineerList = res.result.lawEngineerList //法规工程师
+            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList //工程接口人
+            this.certificationEngineerList = res.result.certificationEngineerList //认证工程师
+            this.designInitiatorList = res.result.allPersonList || []
+            this.designDutyList = res.result.allPersonList || []
+            this.prehomoInitiatorList = res.result.allPersonList || []
+            this.prehomoDutyList = res.result.allPersonList || []
+            this.verifyInitiatorList = res.result.allPersonList || []
+            this.verifyDutyList = res.result.allPersonList || []
+          }
+        })
+      },
+      handleOk() {
+        let ids = JSON.parse(JSON.stringify(this.ids))
+        let query = {
+          ids: ids.join(','),
+          ...this.formInline
+        }
+        this.confirmLoading = true
+        postAction(this.url.setBatch, query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('batSettingList')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    padding: 4px 30px 4px 11px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 104px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: bold;
+    margin-left: 15px;
+    /*border-bottom: 1px #d9d9d9 dashed;*/
+    height: 30px;
+    margin-bottom: 30px;
+  }
+</style>

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -134,7 +134,11 @@
             </div>
             <div class="operator-text-title" @click="batSettingClick">
               <a-icon type="setting"/>
-              {{ $t('batSetting') }}
+              {{ $t('batchSettingInformation') }}
+            </div>
+            <div class="operator-text-title" @click="batchSettingPersonnelClick">
+              <a-icon type="setting"/>
+              {{ $t('batchSettingPersonnel') }}
             </div>
             <div class="operator-text-title" @click="questionClick">
               <a-icon type="apartment"/>
@@ -184,7 +188,7 @@
         </div>
         <div class="operator-text" @click="batSettingClick" v-if="isRoleSwitching">
           <a-icon type="setting"/>
-          {{ $t('batSetting') }}
+          {{ $t('batchSettingInformation') }}
         </div>
         <div class="operator-text"
              v-if="roleSwitchingList.length > 1"
@@ -432,6 +436,7 @@
     <JLoading :loading="JLoading">{{$t('dataLoading')}}</JLoading>
     <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
     <listOfRegulationsView ref="listOfRegulationsViewRef"/>
+    <batchSettingPersonnel :url="url" ref="batchSettingPersonnelRef" @batchSettingPersonnelForm="addModelList"/>
   </a-card>
 </template>
 
@@ -445,6 +450,7 @@
   import resultReportedUpload from './resultReportedUpload'
   import listOfRegulationsView from './listOfRegulationsView'
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+  import batchSettingPersonnel from './batchSettingPersonnel'
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
   import moment from 'moment'
   import { mapGetters } from 'vuex'
@@ -462,6 +468,7 @@
       globalAdvancedQuery,
       fixedPlate,
       resultReportedUpload,
+      batchSettingPersonnel,
       listOfRegulationsView
     },
     data() {
@@ -1145,6 +1152,47 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
+      batchSettingPersonnelClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let isTrue
+          let content = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == selectedRowKeys[j]) {
+                content.push(this.dataSource[i])
+              }
+            }
+          }
+          for (let i = 0; i < content.length; i++) {
+            if (!content[i].dutyTerritory) {
+              this.$message.warning(this.$t('theSelectedDataResponsibilityFieldCannotEmpty'))
+              return
+            }
+            for (let j = 1; j < content.length; j++) {
+              if (content[i].dutyTerritory != content[j].dutyTerritory || !content[i].dutyTerritory) {
+                this.$message.warning(this.$t('theInconsistentSameResponsibility'))
+                return
+              }
+            }
+          }
+          for (let i = 0; i < content.length; i++) {
+            if (content[i].roleCode == '0' &&
+              content[i].taskAffirmStatus != 'List to confirm') {
+              isTrue = true
+            } else {
+              isTrue = false
+              this.$message.warning(this.$t('taskConfirmedPersonnelCannotBeSetBatch'))
+              return
+            }
+          }
+          if (isTrue) {
+            this.$refs.batchSettingPersonnelRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), content)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
       questionClick() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -2072,19 +2120,27 @@
 
       bringInRelevantPersonnelClick() {
         let _this = this
-        this.$confirm({
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          content: _this.$t('confirmBringInRelevantPersonnel'),
+          this.$confirm({
-          onOk() {
+            content: _this.$t('confirmBringInRelevantPersonnel'),
-            getAction(_this.url.matchRelevantPeople, { projectLibraryId: _this.$route.query.id }).then((res) => {
+            onOk() {
-              if (res.success) {
+              let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-                _this.$message.success(_this.$t('OperationSuccessful'))
+              getAction(_this.url.matchRelevantPeople, {
-                _this.getList()
+                ids: selectedRowKeys.join(','),
-              } else {
+                projectLibraryId: _this.$route.query.id
-                _this.$message.warning(_this.$t('operationFailed'))
+              }).then((res) => {
-              }
+                if (res.success) {
-            })
+                  _this.$message.success(_this.$t('OperationSuccessful'))
-          }
+                  _this.getList()
-        })
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
       },
 
       resultReportedClick(val) {
@@ -2306,12 +2362,13 @@
   ::v-deep .ant-card-body {
     padding: 24px 24px 0 24px;
   }
+
   ::v-deep .ant-table-row:first-child {
-    background: #fff!important;
+    background: #fff !important;
   }
 
   ::v-deep .ant-table-body {
-    background: transparent!important;
+    background: transparent !important;
   }
 </style>
 <style>