From 3df4d4b04b76c6dbec14602aa07ab20659651aa4 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 19 Apr 2022 16:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E7=9A=84?=
 =?UTF-8?q?=E5=90=84=E4=B8=AA=E5=B7=A5=E7=A8=8B=E5=B8=88=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/TaskList.vue | 79 +++----------------
 .../components/listEditModel.vue              | 34 +++++---
 .../components/listOfRegulations.vue          |  3 +-
 3 files changed, 37 insertions(+), 79 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index a6c39e507..f909ade5a 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -8,16 +8,18 @@
               <span>{{$t('standard')}}</span>
             </div>
             <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                     v-model="queryParam.standard"></a-input>
+                     v-model="queryParam.serialNumber"></a-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
-            <div class="title-text" :title="$t('areaOfResponsibility')">
+            <div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
               <span>{{$t('areaOfResponsibility')}}</span>
             </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('areaOfResponsibility')"
-                     v-model="queryParam.title"></a-input>
+            <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                               :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="'region'"/>
           </div>
         </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -164,7 +166,7 @@
             align: 'center',
             dataIndex: 'CurrentProjectStatusEvaluation',
             scopedSlots: { customRender: 'CurrentProjectStatusEvaluation' }
-          },
+          }
         ],
         selectedRowKeys: [],
         queryParam: {},
@@ -188,9 +190,9 @@
       handleExport() {
 
       },
-      CertificationDirectory(){
+      CertificationDirectory() {
 
-      },
+      }
     }
   }
 </script>
@@ -198,66 +200,6 @@
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
 
-  .doc-detail {
-    background: #fff;
-    height: 100%;
-
-    .Virtual-detail-header {
-      width: 100%;
-      height: 68px;
-      line-height: 68px;
-      padding: 0 32px 0 32px;
-      box-sizing: border-box;
-      display: flex;
-      justify-content: space-between;
-      border-bottom: 2px #eff1f3 solid;
-      background: #fff;
-
-      .Virtual-detail-title {
-        display: inline-block;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-        font-size: 20px;
-        font-weight: 400;
-        color: #040B29;
-        line-height: 68px;
-      }
-
-      .doc-detail-right {
-        width: 800px;
-        line-height: 68px;
-        display: flex;
-      }
-    }
-
-    .Virtual-detail-content {
-      padding: 0 38px 0 38px;
-      box-sizing: border-box;
-      font-size: 16px;
-
-      .box-title-text-add {
-        line-height: 1.4;
-      }
-
-      .title-text-add {
-        display: inline-block;
-        font-weight: 500;
-        margin-right: 16px;
-        height: 42px;
-        line-height: 42px;
-      }
-    }
-  }
-
-  .header-text {
-    font-size: 16px;
-    font-weight: 400;
-    height: 60px;
-    color: #000F16;
-    line-height: 40px;
-  }
-
   .box-title-text {
     line-height: 1.4;
     display: flex;
@@ -266,8 +208,7 @@
   }
 
   .title-text {
-    width: 20%;
-    min-width: 110px;
+    width: 32px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 1e939dfed..18a63d9b1 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -198,8 +198,8 @@
                   <a-select-option v-for="(item, key) in regulatoryEngineerList"
                                    :key="key"
                                    :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
-                           {{ item.text || item.label }}
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
                      </span>
                   </a-select-option>
                 </a-select>
@@ -218,11 +218,11 @@
                 <a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.homologationEngineerId">
-                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                  <a-select-option v-for="(item, key) in certificationEngineerList"
                                    :key="key"
                                    :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
-                           {{ item.text || item.label }}
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name}}
                      </span>
                   </a-select-option>
                 </a-select>
@@ -239,11 +239,11 @@
                 <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.engineeringInterfacePerson">
-                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                  <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
                                    :key="key"
                                    :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
-                           {{ item.text || item.label }}
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
                      </span>
                   </a-select-option>
                 </a-select>
@@ -569,14 +569,30 @@
         rules: {},
         formInline: {},
         regulatoryEngineerList: [],
+        engineeringInterfacePersonList: [],
+        certificationEngineerList: [],
         disabled: false
       }
     },
     mounted() {
     },
     methods: {
+      queryPersonByProject(row) {
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: row.dutyTerritory
+        }
+        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
+          }
+        })
+      },
       editModel(item) {
         this.visible = true
+        this.queryPersonByProject(item)
         this.$nextTick(() => {
           this.rules = {}
           this.formInline = item
@@ -680,7 +696,7 @@
       },
       handleSubmit() {
         this.$refs.ruleForm.validate(valid => {
-          if (valid){
+          if (valid) {
             let formInline = JSON.parse(JSON.stringify(this.formInline))
             Object.keys(formInline).forEach(res => {
               if (formInline[res] && formInline[res] instanceof Array) {
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 791bd289f..6da5cb9ae 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -484,7 +484,8 @@
           deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
           deleteOne: '/project/projectLawsInventoryEO/delete',
           updateStatusBatch: '/project/projectLawsInventoryEO/updateStatusBatch',
-          matchRelevantPeople: '/project/projectLawsInventoryEO/matchRelevantPeople'
+          matchRelevantPeople: '/project/projectLawsInventoryEO/matchRelevantPeople',
+          queryPersonByProject: '/project/projectRelatedPersonnel/queryPersonByProjectId'
         },
         loading: false,
         dataSource: []