From e4211fca55e0cfb18f97c5b2bd223fdf7aa18102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 14 Jul 2023 13:44:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../virtualList/components/editModel.vue      |  72 ++-
 .../certificationList/components/addModel.vue | 187 ++++--
 .../components/listEditModel.vue              |  49 +-
 .../components/addModel.vue                   | 570 ++++++++++--------
 .../components/editModel.vue                  |  99 ++-
 5 files changed, 624 insertions(+), 353 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index 86c3f38e6..e939d9cf8 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -254,22 +254,26 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
+                <span class="Required" v-if="!disabled">*</span>
                 <span class="title-text-text"
-                      :title="$t('technicalField')">{{$t('technicalField')}}</span>
+                      :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="technologyTerritory">
-                <a-tree-select
-                  tree-node-filter-prop="title"
-                  v-model="formInline.technologyTerritory"
-                  :maxTagCount="1"
-                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                  class="box-input"
-                  style="width: 100%"
-                  :disabled="disabled"
-                  :tree-data="CategoryTreeList"
-                  tree-checkable
-                  :placeholder="$t('PleaseSelect')+$t('technicalField')"
-                />
+              <a-form-model-item class="itemModel-multi" prop="firstLevelDutyTerritory">
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                          class="box-input"
+                          optionFilterProp="label"
+                          mode="multiple"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="formInline.firstLevelDutyTerritory">
+                  <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                   :key="key"
+                                   :label="item.key"
+                                   :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                  </a-select-option>
+                </a-select>
               </a-form-model-item>
             </div>
           </a-col>
@@ -290,6 +294,31 @@
             </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('technicalField')">{{$t('technicalField')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="technologyTerritory">
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="formInline.technologyTerritory"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :disabled="disabled"
+                  :tree-data="CategoryTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('technicalField')"
+                />
+              </a-form-model-item>
+            </div>
+          </a-col>
+
+        </a-row>
         <a-row :gutter="24">
           <a-col :span="24">
             <div class="box-title-text">
@@ -697,14 +726,25 @@
         disabled: false,
         title: '',
         CategoryTreeList: [],
-        DeliverableTreeList: []
+        DeliverableTreeList: [],
+        firstLevelDutyTerritoryList:[],
       }
     },
     mounted() {
       this.getSysCategoryTree()
       this.getDeliverableTree()
+      this.getFirstLevelDutyTerritory()
     },
     methods: {
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
       getSysCategoryTree() {
         getAction(this.url.getSysCategoryTree, {}).then((res) => {
           if (res.success) {
@@ -733,6 +773,7 @@
           this.formInline.designDeliverableType = this.formInline.designDeliverableType ? this.formInline.designDeliverableType.split(',') : []
           this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : []
           this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : []
+          this.formInline.firstLevelDutyTerritory = this.formInline.firstLevelDutyTerritory ? this.formInline.firstLevelDutyTerritory.split(',') : []
           this.$refs.ruleForm.clearValidate()
         })
       },
@@ -746,6 +787,7 @@
           this.formInline.designDeliverableType = this.formInline.designDeliverableType ? this.formInline.designDeliverableType.split(',') : []
           this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : []
           this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : []
+          this.formInline.firstLevelDutyTerritory = this.formInline.firstLevelDutyTerritory ? this.formInline.firstLevelDutyTerritory.split(',') : []
           this.$refs.ruleForm.clearValidate()
         })
       },
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index eb840e41d..1e9c7ae83 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -134,6 +134,56 @@
                     </a-form-model-item>
                   </div>
                 </a-col>
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required">*</span>
+                      <span class="title-text-text"
+                            :title="$t('certificationType')">{{$t('certificationType')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel-multi"
+                                       :prop="'dataList.'+index+'.attestationType'"
+                                       :rules="[{ required: true, message: $t('certificationType') + $t('cannotEmpty'), trigger: 'change'},]"
+                    >
+                      <j-multi-select-tag class="box-input" v-model="item.attestationType"
+                                          :placeholder="$t('PleaseSelect')+$t('certificationType')"
+                                          :type="'select'"
+                                          :triggerChange="false"
+                                          :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
+                    </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="Required">*</span>
+                      <span class="title-text-text"
+                            :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel-multi"
+                                       :prop="'dataList.'+index+'.firstLevelDutyTerritory'"
+                                       :rules="[{ required: true, message: $t('statisticalNodes') + $t('cannotEmpty'), trigger: 'change'},]"
+                    >
+                      <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                                class="box-input"
+                                optionFilterProp="label"
+                                mode="multiple"
+                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                v-model="item.firstLevelDutyTerritory">
+                        <a-select-option v-for="(val, key) in firstLevelDutyTerritoryList"
+                                         :key="key"
+                                         :label="val.key"
+                                         :value="val.key">
+                               <span style="display: inline-block;width: 100%" :title=" val.key ">
+                                     {{ val.key }}
+                               </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">
@@ -155,26 +205,8 @@
                   </div>
                 </a-col>
               </a-row>
+
               <a-row :gutter="24">
-                <a-col :span="12">
-                  <div class="box-title-text">
-                    <div class="title-text">
-                      <span class="Required">*</span>
-                      <span class="title-text-text"
-                            :title="$t('certificationType')">{{$t('certificationType')}}</span>
-                    </div>
-                    <a-form-model-item class="itemModel-multi"
-                                       :prop="'dataList.'+index+'.attestationType'"
-                                       :rules="[{ required: true, message: $t('certificationType') + $t('cannotEmpty'), trigger: 'change'},]"
-                    >
-                      <j-multi-select-tag class="box-input" v-model="item.attestationType"
-                                          :placeholder="$t('PleaseSelect')+$t('certificationType')"
-                                          :type="'select'"
-                                          :triggerChange="false"
-                                          :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
-                    </a-form-model-item>
-                  </div>
-                </a-col>
                 <a-col :span="12">
                   <div class="box-title-text">
                     <div class="title-text">
@@ -203,9 +235,6 @@
                     </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">
@@ -233,6 +262,8 @@
                     </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">
@@ -250,8 +281,6 @@
                     </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">
@@ -355,28 +384,6 @@
                   </a-form-model-item>
                 </div>
               </a-col>
-              <a-col :span="12">
-                <div class="box-title-text">
-                  <div class="title-text">
-                    <span class="Required">*</span>
-                    <span class="title-text-text"
-                          :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
-                  </div>
-                  <a-form-model-item class="itemModel"
-                                     :prop="'dutyTerritory'"
-                  >
-                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                       @input="handleInput('dutyTerritory')"
-                                       @changeQuery="handleChange"
-                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                       :type="'select'"
-                                       :triggerChange="false" :dictCode="'duty_territory'"/>
-                  </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">
@@ -396,6 +403,58 @@
                   </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="Required">*</span>
+                    <span class="title-text-text"
+                          :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel-multi" prop="firstLevelDutyTerritory">
+                    <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                              class="box-input"
+                              optionFilterProp="label"
+                              mode="multiple"
+                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                              v-model="formInline.firstLevelDutyTerritory">
+                      <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                       :key="key"
+                                       :label="item.key"
+                                       :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </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="Required">*</span>
+                    <span class="title-text-text"
+                          :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'dutyTerritory'"
+                  >
+                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                       @input="handleInput('dutyTerritory')"
+                                       @changeQuery="handleChange"
+                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                       :type="'select'"
+                                       :triggerChange="false" :dictCode="'duty_territory'"/>
+                  </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">
@@ -425,9 +484,6 @@
                   </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">
@@ -451,6 +507,10 @@
                   </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">
@@ -468,9 +528,6 @@
                   </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">
@@ -493,6 +550,8 @@
                   </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">
@@ -515,8 +574,6 @@
                   </a-form-model-item>
                 </div>
               </a-col>
-            </a-row>
-            <a-row :gutter="24">
               <a-col :span="12" v-if="formInline.inventoryVerifyEndTime">
                 <div class="box-title-text">
                   <div class="title-text">
@@ -535,6 +592,8 @@
                   </a-form-model-item>
                 </div>
               </a-col>
+            </a-row>
+            <a-row :gutter="24">
               <a-col :span="12" v-if="formInline.taskConfirmEndTime">
                 <div class="box-title-text">
                   <div class="title-text">
@@ -602,6 +661,7 @@
         visible: false,
         personnelVisible: false,
         yearNameDataList: [],
+        firstLevelDutyTerritoryList: [],
         rules: {
           serialNumber: [
             {
@@ -649,6 +709,13 @@
               trigger: 'change'
             }
           ],
+          firstLevelDutyTerritory: [
+            {
+              required: true,
+              message: this.$t('statisticalNodes') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
           configItem: [
             { required: true, message: this.$t('configurationItem') + this.$t('cannotEmpty'), trigger: 'blur' },
             {
@@ -675,9 +742,19 @@
     mounted() {
       this.getDeliverableTree()
       this.getRegulationNo()
+      this.getFirstLevelDutyTerritory()
     },
     methods: {
       ...mapGetters(['userInfo']),
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
       serialNumberClick() {
         this.$refs.addCodeNumber.add()
       },
@@ -727,10 +804,12 @@
         this.formInline = {}
         this.visible = true
         this.personnelVisible = true
+        value.firstLevelDutyTerritory = value.firstLevelDutyTerritory ? value.firstLevelDutyTerritory.split(',') : []
         this.formInline = JSON.parse(JSON.stringify(value))
         // if (this.formInline.deliverableType) {
         //   this.formInline.deliverableType = this.formInline.deliverableType.split(',')
         // }
+
         if (value.dutyTerritory) {
           this.queryPersonByProject(value.dutyTerritory)
         }
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 2c0166d5e..e89383015 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -96,6 +96,32 @@
           </a-col>
         </a-row>
         <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="title-text-text"
+                      :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi" prop="firstLevelDutyTerritory">
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                          class="box-input"
+                          optionFilterProp="label"
+                          mode="multiple"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="formInline.firstLevelDutyTerritory">
+                  <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                   :key="key"
+                                   :label="item.key"
+                                   :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </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">
@@ -113,6 +139,8 @@
               </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">
@@ -137,8 +165,6 @@
               </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">
@@ -564,6 +590,7 @@
         visible: false,
         confirmLoading: false,
         rejectCauseListOne: [],
+        firstLevelDutyTerritoryList: [],
         rules: {
           attestationRank: [
             {
@@ -579,6 +606,13 @@
               trigger: 'change'
             }
           ],
+          firstLevelDutyTerritory:[
+            {
+              required: true,
+              message: this.$t('statisticalNodes') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
           homologationEngineerId: [
             {
               required: true,
@@ -689,9 +723,19 @@
     },
     mounted() {
       this.getDeliverableTree()
+      this.getFirstLevelDutyTerritory()
       this.userInfoQuery = this.userInfo()
     },
     methods: {
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
       isEdit(val) {
         if (val.designFlowStatus == 'Task to be confirmed' || val.designFlowStatus == 'Results to be submitted' ||
           val.designFlowStatus == 'Results to be reviewed') {
@@ -821,6 +865,7 @@
         item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : []
         item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
         item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
+        item.firstLevelDutyTerritory = item.firstLevelDutyTerritory ? item.firstLevelDutyTerritory.split(',') : []
         this.getRejectCause(item.id)
         if (item.dutyTerritory) {
           this.queryPersonByProject(item)
diff --git a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
index 355358a8f..f53d0b938 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
@@ -30,16 +30,13 @@
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                  <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="dutyTerritory">
-                  <j-dict-select-tag class="box-input"
-                                     :disabled="disabled"
-                                     @input="handleInput('dutyTerritory')"
-                                     v-model="formInline.dutyTerritory"
-                                     :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="'duty_territory'"/>
+                <a-form-model-item class="itemModel" prop="wvtaId">
+                  <a-input class="box-input"
+                           v-model='formInline.wvtaId'
+                           :disabled="disabled"
+                           :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -49,13 +46,43 @@
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
-                  <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
+                  <span class="title-text-text"
+                        :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="wvtaId">
-                  <a-input class="box-input"
-                           v-model='formInline.wvtaId'
-                           :disabled="disabled"
-                           :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
+                <a-form-model-item class="itemModel-multi" prop="firstLevelDutyTerritory">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                            class="box-input"
+                            optionFilterProp="label"
+                            mode="multiple"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            v-model="formInline.firstLevelDutyTerritory">
+                    <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                     :key="key"
+                                     :label="item.key"
+                                     :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </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="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="dutyTerritory">
+                  <j-dict-select-tag class="box-input"
+                                     :disabled="disabled"
+                                     @input="handleInput('dutyTerritory')"
+                                     v-model="formInline.dutyTerritory"
+                                     :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'duty_territory'"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -150,8 +177,8 @@
                 <div class="box-title-text">
                   <div class="title-text">
                     <span class="Required">*</span>
-                <span class="title-text-text"
-                      :title="$t('certificationType')">{{$t('certificationType')}}</span>
+                    <span class="title-text-text"
+                          :title="$t('certificationType')">{{$t('certificationType')}}</span>
                   </div>
                   <a-form-model-item class="itemModel attestationType"
                                      :prop="'dataList.'+index+'.attestationType'"
@@ -159,7 +186,8 @@
                     <j-multi-select-tag class="box-input" v-model="item.attestationType"
                                         :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                         :type="'select'"
-                                        :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
+                                        :triggerChange="false"
+                                        :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
                   </a-form-model-item>
                 </div>
               </a-col>
@@ -189,270 +217,296 @@
         <a-button type="primary" @click="handleSubmit" :loading="confirmLoading">{{$t('submit')}}</a-button>
       </div>
     </a-drawer>
-   <codeNumber ref="codeNumber" @regulation="regulation" />
+    <codeNumber ref="codeNumber" @regulation="regulation"/>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
   </div>
 
 </template>
 
 <script>
-import codeNumber from './codeNumber'
-import uploadFile from '@/components/uploadFile/file'
-import { getAction, postAction } from '@/api/manage'
-import { mapGetters } from 'vuex'
+  import codeNumber from './codeNumber'
+  import uploadFile from '@/components/uploadFile/file'
+  import { getAction, postAction } from '@/api/manage'
+  import { mapGetters } from 'vuex'
 
-export default {
-  name:"addModel",
-  props: ['url'],
-  components:{
-    codeNumber,
-    uploadFile
-  },
-  data() {
-    return {
-      visible: false,
-      disabled: false,
-      formInline: {},
-      confirmLoading: false,
-      projectNameList: [],
-      DeliverableTreeList: [],
-      rules: {
-        serialNumber: [
-          {
-            required: true,
-            message: this.$t('entryName') + this.$t('regulationNo'),
-            trigger: 'change'
-          }
-        ],
-        dutyTerritory: [
-          {
-            required: true,
-            message: this.$t('entryName') + this.$t('areaOfResponsibility'),
-            trigger: 'change'
-          }
-        ],
-        wvtaId: [
-          {
-            required: true,
-            message: 'WVTA ID' + this.$t('regulationNo'),
-            trigger: 'blur'
-          },
-          {
-            max: 300,
-            message: 'WVTA ID' + this.$t('cannotExceed') + 300 + this.$t('Characters'),
-            trigger: 'blur'
-          }
-        ],
-      },
-    }
-  },
-  mounted() {
-    this.getDeliverableTree()
-    this.getRegulationNo()
-  },
-  methods: {
-    ...mapGetters(['userInfo']),
-    addModel() {
-      this.visible = true
-      this.formInline = {}
-      this.formInline.dataList = [{}]
-      this.$nextTick(() => {
-        this.formInline = { ...this.formInline }
-        this.$refs.ruleForm.clearValidate()
-        // this.$refs.codeNumber.number()
-      })
+  export default {
+    name: 'addModel',
+    props: ['url'],
+    components: {
+      codeNumber,
+      uploadFile
     },
-    handleCancel() {
-      this.visible = false
-    },
-    handleInput(value) {
-      this.$nextTick(() => {
-        this.formInline = { ...this.formInline }
-        this.$refs.ruleForm.validateField([value])
-      })
-    },
-    handleSubmit() {
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          this.formInline.authDummyInventoryBaseId = this.$route.query.id
-          let query = JSON.parse(JSON.stringify(this.formInline))
-          this.confirmLoading = true
-          postAction(this.url.addModel, query).then((res) => {
-            if (res.success) {
-              this.confirmLoading = false
-              this.$message.success(this.$t('OperationSuccessful'))
-              this.visible = false
-              this.$emit('addModelList')
-            } else {
-              this.$message.warning(res.message)
-              this.confirmLoading = false
+    data() {
+      return {
+        visible: false,
+        disabled: false,
+        formInline: {},
+        confirmLoading: false,
+        projectNameList: [],
+        DeliverableTreeList: [],
+        firstLevelDutyTerritoryList: [],
+        rules: {
+          serialNumber: [
+            {
+              required: true,
+              message: this.$t('entryName') + this.$t('regulationNo'),
+              trigger: 'change'
             }
+          ],
+          dutyTerritory: [
+            {
+              required: true,
+              message: this.$t('entryName') + this.$t('areaOfResponsibility'),
+              trigger: 'change'
+            }
+          ],
+          firstLevelDutyTerritory: [
+            {
+              required: true,
+              message: this.$t('statisticalNodes') + this.$t('areaOfResponsibility'),
+              trigger: 'change'
+            }
+          ],
+          wvtaId: [
+            {
+              required: true,
+              message: 'WVTA ID' + this.$t('regulationNo'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: 'WVTA ID' + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ]
+        }
+      }
+    },
+    mounted() {
+      this.getDeliverableTree()
+      this.getRegulationNo()
+      this.getFirstLevelDutyTerritory()
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
+      addModel() {
+        this.visible = true
+        this.formInline = {}
+        this.formInline.dataList = [{}]
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.clearValidate()
+          // this.$refs.codeNumber.number()
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
+      handleSubmit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.formInline.authDummyInventoryBaseId = this.$route.query.id
+            let query = JSON.parse(JSON.stringify(this.formInline))
+            query.dataList.forEach(val => {
+              Object.keys(val).forEach(res => {
+                if (val[res] && val[res] instanceof Array) {
+                  val[res] = val[res].join(',')
+                }
+              })
+            })
+            this.confirmLoading = true
+            postAction(this.url.addModel, query).then((res) => {
+              if (res.success) {
+                this.confirmLoading = false
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.$emit('addModelList')
+              } else {
+                this.$message.warning(res.message)
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      addClick(index) {
+        this.formInline.dataList.splice(index + 1, 0, {})
+        this.formInline = { ...this.formInline }
+      },
+      deleteClick(index) {
+        this.formInline.dataList.splice(index, 1)
+        this.formInline = { ...this.formInline }
+      },
+      getRegulationNo() {
+        let query = {
+          projectLibraryId: this.$route.query.id,
+          roleCode: 0
+        }
+        getAction(this.url.number, query).then((res) => {
+          if (res.success) {
+            this.projectNameList = res.result || []
+          } else {
+            this.projectNameList = []
+          }
+        })
+      },
+      serialNumberChange(value) {
+        let content = this.projectNameList.filter(res => {
+          return res.id === value
+        })
+        this.formInline.bussDocumentLibraryId = content[0].id
+        this.formInline.serialNumber = content[0].serialNumber
+      },
+      getDeliverableTree() {
+        getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
+      serialNumberClick() {
+        this.$refs.codeNumber.add()
+      },
+      regulation(item, data) {
+        this.formInline.serialNumber = item
+        this.formInline.bussDocumentLibraryId = data
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField(['serialNumber'])
+        })
+      },
+      //交付物模板上传
+      clickButtonToUpload(item, index, isTrue) {
+        this.numIndex = index
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        let ids = ''
+        console.log(index)
+        if (isTrue) {
+          ids = this.formInline.dataList[index][item]
+        } else {
+          ids = this.formInline[item]
+        }
+        console.log(this.formInline, 1111)
+        getAction('sys/common/getFileInfos', { id: ids }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
           })
         }
-        })
-      },
-    addClick(index){
-      this.formInline.dataList.splice(index + 1, 0, {})
-      this.formInline = { ...this.formInline }
-    },
-    deleteClick(index) {
-      this.formInline.dataList.splice(index, 1)
-      this.formInline = { ...this.formInline }
-    },
-    getRegulationNo() {
-      let query = {
-        projectLibraryId: this.$route.query.id,
-        roleCode: 0
-      }
-      getAction(this.url.number, query).then((res) => {
-        if (res.success) {
-          this.projectNameList = res.result || []
+        /** 赋值给当前对应的表单文件 */
+        if (this.formInline.id) {
+          this.formInline[this.uploadName] = attIdList.join(',')
         } else {
-          this.projectNameList = []
+          this.formInline.dataList[this.numIndex][this.uploadName] = attIdList.join(',')
         }
-      })
-    },
-    serialNumberChange(value) {
-      let content = this.projectNameList.filter(res => {
-        return res.id === value
-      })
-      this.formInline.bussDocumentLibraryId = content[0].id
-      this.formInline.serialNumber = content[0].serialNumber
-    },
-    getDeliverableTree() {
-      getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
-        if (res.success) {
-          this.DeliverableTreeList = res.result
-        } else {
-          this.DeliverableTreeList = []
-        }
-      })
-    },
-    serialNumberClick(){
-      this.$refs.codeNumber.add()
-    },
-    regulation(item,data) {
-      this.formInline.serialNumber = item
-      this.formInline.bussDocumentLibraryId = data
-      this.$nextTick(()=>{
-        this.formInline = {... this.formInline}
-        this.$refs.ruleForm.validateField(['serialNumber'])
-      })
-    },
-    //交付物模板上传
-    clickButtonToUpload(item, index,isTrue) {
-      this.numIndex = index
-      this.$refs.uploadFile.perentHandleFunc()
-      this.$refs.uploadFile.visible = true
-      this.uploadName = item
-      let ids = ''
-      console.log(index)
-      if (isTrue){
-        ids = this.formInline.dataList[index][item]
-      }else{
-        ids = this.formInline[item]
+        this.formInline = { ...this.formInline }
       }
-      console.log(this.formInline,1111)
-      getAction('sys/common/getFileInfos', { id: ids }).then((res) => {
-        if (res.success) {
-          this.$refs.uploadFile.perentHandleFunc(res.result)
-        } else {
-          this.$refs.uploadFile.perentHandleFunc()
-        }
-      })
-    },
-    /** 上传文件的回调 */
-    uploadSuccess(data) {
-      let attIdList = []
-      if (data && data.length > 0) {
-        data.map(item => {
-          attIdList.push(item.id || data.name)
-        })
-      }
-      /** 赋值给当前对应的表单文件 */
-      if (this.formInline.id) {
-        this.formInline[this.uploadName] = attIdList.join(',')
-      } else {
-        this.formInline.dataList[this.numIndex][this.uploadName] = attIdList.join(',')
-      }
-      this.formInline = { ...this.formInline }
-    },
+    }
   }
-}
 </script>
 
 <style scoped>
-.box-title-text {
-  line-height: 1.4;
-  display: flex;
-  /*align-items: center;*/
-}
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
 
-.title-text {
-  width: 114px;
-  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: 48px;
-}
+  .title-text {
+    width: 114px;
+    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: 48px;
+  }
 
-.box-input {
-  display: inline-block;
-  height: 38px;
-  width: 100%;
-}
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
 
-.itemModel {
-  width: calc(100% - 130px);
-  display: inline-block;
-  margin-top: 2px;
-  height: 40px;
-  margin-bottom: 24px;
-}
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    height: 40px;
+    margin-bottom: 24px;
+  }
 
-.Required {
-  color: red;
-  margin-right: 4px;
-}
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
 
-.header-text {
-  font-size: 16px;
-  font-weight: 500;
-}
+  .header-text {
+    font-size: 16px;
+    font-weight: 500;
+  }
 
-.drawer-bootom-button {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  z-index: 100;
-  border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
-  text-align: right;
-  left: 0;
-  background: #fff;
-  border-radius: 0 0 2px 2px;
-}
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
 
-.icon-text {
-  font-size: 16px;
-  margin-right: 4px;
-}
+  .icon-text {
+    font-size: 16px;
+    margin-right: 4px;
+  }
 
-.button-text {
-  height: 38px;
-  width: calc(100% - 100px);
-  line-height: 38px;
-  background: #fff;
-  border: 1px #00B3BE solid;
-  color: #00B3BE;
-}
-::v-deep .attestationType .ant-form-explain{
-  margin-top: -16px;
-}
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  ::v-deep .attestationType .ant-form-explain {
+    margin-top: -16px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
index 5e685e787..3f1bd5a95 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
@@ -28,6 +28,50 @@
                 </a-form-model-item>
               </div>
             </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required" v-if="!disabled">*</span>
+                  <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="wvtaId">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           :title="formInline.wvtaId"
+                           v-model="formInline.wvtaId"
+                           :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
+                </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="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
+                </div>
+                <a-form-model-item class="itemModel-multi" prop="firstLevelDutyTerritory">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                            class="box-input"
+                            optionFilterProp="label"
+                            mode="multiple"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            v-model="formInline.firstLevelDutyTerritory">
+                    <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                     :key="key"
+                                     :label="item.key"
+                                     :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </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">
@@ -44,29 +88,15 @@
                 </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="Required" v-if="!disabled">*</span>
-                  <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="wvtaId">
-                  <a-input class="box-input"
-                           :disabled="disabled"
-                           :title="formInline.wvtaId"
-                           v-model="formInline.wvtaId"
-                           :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="!disabled">*</span>
-                <span class="title-text-text"
-                      :title="$t('certificationType')">{{$t('certificationType')}}</span>
+                  <span class="title-text-text"
+                        :title="$t('certificationType')">{{$t('certificationType')}}</span>
                 </div>
                 <a-form-model-item class="itemModel attestationType" prop="attestationType">
                   <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
@@ -77,8 +107,6 @@
                 </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">
@@ -94,6 +122,9 @@
                 </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">
@@ -109,8 +140,6 @@
                 </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">
@@ -127,6 +156,9 @@
                 </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">
@@ -136,7 +168,7 @@
                 <a-form-model-item class="itemModel"
                                    prop="deliverableType"
                                    :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
-                                   >
+                >
                   <a-tree-select
                     tree-node-filter-prop="title"
                     v-model="formInline.deliverableType"
@@ -151,8 +183,6 @@
                 </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">
@@ -205,6 +235,7 @@ export default {
       formInline: {},
       disabled: false,
       DeliverableTreeList: [],
+      firstLevelDutyTerritoryList:[],
       rules: {
         serialNumber: [
           {
@@ -213,6 +244,13 @@ export default {
             trigger: 'change'
           }
         ],
+        firstLevelDutyTerritory: [
+          {
+            required: true,
+            message: this.$t('statisticalNodes') + this.$t('areaOfResponsibility'),
+            trigger: 'change'
+          }
+        ],
         dutyTerritory: [
           {
             required: true,
@@ -272,8 +310,18 @@ export default {
   },
   mounted() {
     this.getDeliverableTree()
+    this.getFirstLevelDutyTerritory()
   },
   methods: {
+    getFirstLevelDutyTerritory() {
+      getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+        if (res.success) {
+          this.firstLevelDutyTerritoryList = res.result
+        } else {
+          this.firstLevelDutyTerritoryList = []
+        }
+      })
+    },
     handleCancel() {
       this.visible = false
     },
@@ -288,6 +336,9 @@ export default {
         if (this.formInline.deliverableType) {
           this.formInline.deliverableType = this.formInline.deliverableType.split(',')
         }
+        if (this.formInline.firstLevelDutyTerritory) {
+          this.formInline.firstLevelDutyTerritory = this.formInline.firstLevelDutyTerritory.split(',')
+        }
       this.$refs.ruleForm.clearValidate()
       })
       if(data == 1) {