From 0342f5f0c2b8a465e8b96a2549b80d64d2835e7a Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 13 Apr 2022 17:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=99=9A=E6=8B=9F=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonnelSelection/index.vue   |   2 +-
 .../virtualList/components/addModel.vue       |   1 +
 .../virtualList/components/batSetting.vue     |  46 ++-
 .../virtualList/components/editModel.vue      | 347 +++++++-----------
 .../components/virtualListDetails.vue         |  22 +-
 5 files changed, 192 insertions(+), 226 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index fb9d8359d..d95f44987 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -3,7 +3,7 @@
     <div class="box-title-text">
       <a-input class="box-input" :value="value" @input="indexclick($event)"
                :disabled="true"
-               :placeholder="$t('PleaseEnterOrSelect')+query.db_field_txt"/>
+               :placeholder="$t('PleaseSelect')+query.db_field_txt"/>
       <a-button type="primary" class="button-box" @click="standardClick">
         {{this.$t('PersonnelSelection')}}
       </a-button>
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index 343a75ce7..a513ea4e7 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
@@ -204,6 +204,7 @@
               this.$message.success(this.$t('OperationSuccessful'))
               this.visible = false
               this.selectedRowKeys = []
+              this.$emit('addModelList')
             } else {
               this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false
diff --git a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
index a40d203ff..29dec7ded 100644
--- a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
@@ -16,11 +16,11 @@
               <span class="title-text-text" :title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <j-dict-select-tag class="box-input" v-model="formInline.scopeOfApplication"
-                                 @input="handleInput('scopeOfApplication')"
+              <j-dict-select-tag class="box-input" v-model="formInline.shi4Yong4Fan4Wei2"
+                                 @input="handleInput('shi4Yong4Fan4Wei2')"
                                  :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
                                  :type="'select'"
-                                 :triggerChange="false" dictCode=""/>
+                                 :triggerChange="false" dictCode="apply_scope"/>
             </a-form-model-item>
           </div>
         </a-col>
@@ -30,8 +30,8 @@
               <span class="title-text-text" :title="$t('certificationType')">{{$t('certificationType')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <j-dict-select-tag class="box-input" v-model="formInline.certificationType"
-                                 @input="handleInput('certificationType')"
+              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"
+                                 @input="handleInput('attestationType')"
                                  :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                  :type="'select'"
                                  :triggerChange="false" dictCode=""/>
@@ -44,8 +44,8 @@
               <span class="title-text-text" :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <j-dict-select-tag class="box-input" v-model="formInline.certificationLevel"
-                                 @input="handleInput('certificationLevel')"
+              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"
+                                 @input="handleInput('attestationRank')"
                                  :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                  :type="'select'"
                                  :triggerChange="false" dictCode=""/>
@@ -58,11 +58,11 @@
               <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <j-dict-select-tag class="box-input" v-model="formInline.areaOfResponsibility"
-                                 @input="handleInput('areaOfResponsibility')"
+              <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                 @input="handleInput('dutyTerritory')"
                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                  :type="'select'"
-                                 :triggerChange="false" dictCode=""/>
+                                 :triggerChange="false" dictCode="duty_territory"/>
             </a-form-model-item>
           </div>
         </a-col>
@@ -82,7 +82,8 @@
         visible: false,
         confirmLoading: false,
         formInline: {},
-        rules: {}
+        rules: {},
+        ids: []
       }
     },
     mounted() {
@@ -90,11 +91,32 @@
     methods: {
       edit(data) {
         this.visible = true
+        this.$nextTick(() => {
+          this.ids = data || []
+          this.formInline = {}
+        })
       },
       handleOk() {
-        this.visible = false
+        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('editModelList')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
       },
       handleCancel() {
+        this.formInline = {}
         this.visible = false
       },
       handleInput(value) {
diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index cb8024f18..a05370ded 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -19,7 +19,7 @@
               <a-form-model-item class="itemModel" prop="standard">
                 <a-input class="box-input"
                          :disabled="true"
-                         v-model="formInline.standard"
+                         v-model="formInline.serialNumber"
                          :placeholder="$t('PleaseEnter')+$t('standard')"/>
               </a-form-model-item>
             </div>
@@ -46,7 +46,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="subtitle">
                 <a-input class="box-input"
-                         :disabled="true"
+                         :disabled="false"
                          v-model="formInline.subtitle"
                          :placeholder="$t('PleaseEnter')+$t('subtitle')"/>
               </a-form-model-item>
@@ -60,12 +60,46 @@
               <a-form-model-item class="itemModel" prop="WVTAID">
                 <a-input class="box-input"
                          :disabled="true"
-                         v-model="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="title-text-text"
+                      :title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input" v-model="formInline.shi4Yong4Fan4Wei2"
+                                   :disabled="true"
+                                   @input="handleInput('shi4Yong4Fan4Wei2')"
+                                   :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'apply_scope'"/>
+              </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('status')">{{$t('status')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input" v-model="formInline.state"
+                                   :disabled="true"
+                                   @input="handleInput('state')"
+                                   :placeholder="$t('PleaseSelect')+$t('status')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'state'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
@@ -73,29 +107,27 @@
                 <span class="title-text-text"
                       :title="$t('correspondingStandard')">{{$t('correspondingStandard')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'correspondingStandard'">
-                <Standardselection :query="{db_field_name:'correspondingStandard',
-                                            db_field_txt:$t('correspondingStandard'),}"
-                                   @change="StandardselectionChange"
-                                   :disabled="disabled"
-                                   :standard="formInline"
-                                   v-model="formInline.correspondingStandard"/>
+              <a-form-model-item class="itemModel">
+                <a-input class="box-input"
+                         :disabled="true"
+                         v-model="formInline.correspondingStandard"
+                         :placeholder="$t('PleaseEnter')+$t('correspondingStandard')"/>
               </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('implementationCategory')">{{$t('implementationCategory')}}</span>
+                <span class="title-text-text" :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="implementationCategory">
-                <j-dict-select-tag class="box-input" v-model="formInline.implementationCategory"
-                                   :disabled="disabled"
-                                   @input="handleInput('implementationCategory')"
-                                   :placeholder="$t('PleaseSelect')+$t('implementationCategory')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
+              <a-form-model-item class="itemModel" :prop="'ImplementationDate'">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('ImplementationDate')"
+                               @change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})"
+                               format="YYYY-MM-DD"
+                               v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1"
+                               :disabled="true"
+                               style="width: 100%"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -110,32 +142,14 @@
               <a-form-model-item class="itemModel" :prop="'vehicleInProductionDate'">
                 <a-date-picker class="box-input"
                                :placeholder="$t('PleaseSelect')+$t('vehicleInProductionDate')"
-                               @change="dateChange({db_field_name:'vehicleInProductionDate'})"
+                               @change="dateChange({db_field_name:'implementTime'})"
                                format="YYYY-MM-DD"
-                               v-model="formInline.vehicleInProductionDate"
-                               :disabled="disabled"
+                               v-model="formInline.implementTime"
+                               :disabled="true"
                                style="width: 100%"/>
               </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('ImplementationDate')">{{$t('ImplementationDate')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'ImplementationDate'">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('ImplementationDate')"
-                               @change="dateChange({db_field_name:'ImplementationDate'})"
-                               format="YYYY-MM-DD"
-                               v-model="formInline.ImplementationDate"
-                               :disabled="disabled"
-                               style="width: 100%"/>
-              </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">
@@ -143,33 +157,33 @@
                       :title="$t('certificationType')">{{$t('certificationType')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="certificationType">
-                <j-dict-select-tag class="box-input" v-model="formInline.certificationType"
+                <j-dict-select-tag class="box-input" v-model="formInline.attestationType"
                                    :disabled="disabled"
-                                   @input="handleInput('certificationType')"
+                                   @input="handleInput('attestationType')"
                                    :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'dict_field'"/>
               </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('certificationLevel')">{{$t('certificationLevel')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="certificationLevel">
-                <j-dict-select-tag class="box-input" v-model="formInline.certificationLevel"
-                                   :disabled="disabled"
-                                   @input="handleInput('certificationLevel')"
-                                   :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
-              </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('technicalField')">{{$t('technicalField')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="technologyTerritory">
+                <j-dict-select-tag class="box-input" v-model="formInline.technologyTerritory"
+                                   :disabled="disabled"
+                                   @input="handleInput('technologyTerritory')"
+                                   :placeholder="$t('PleaseSelect')+$t('technicalField')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'technology_territory'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -177,57 +191,11 @@
                       :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="areaOfResponsibility">
-                <j-dict-select-tag class="box-input" v-model="formInline.areaOfResponsibility"
-                                   :disabled="disabled"
-                                   @input="handleInput('areaOfResponsibility')"
-                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'dict_field'"/>
-              </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('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'regulatoryEngineer'">
-                <PersonnelSelection :query="{db_field_name:'regulatoryEngineer',db_field_txt:$t('regulatoryEngineer')}"
-                                    :personneQuery="formInline"
-                                    @change="PersonnelSelectionChange"
+                <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
                                     :disabled="disabled"
-                                    v-model="formInline.regulatoryEngineer"/>
-              </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('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'certifiedEngineer'">
-                <PersonnelSelection :query="{db_field_name:'certifiedEngineer',db_field_txt:$t('certifiedEngineer')}"
-                                    :personneQuery="formInline"
-                                    @change="PersonnelSelectionChange"
-                                    :disabled="disabled"
-                                    v-model="formInline.certifiedEngineer"/>
-              </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('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
-                <PersonnelSelection
-                  :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
-                  :personneQuery="formInline"
-                  @change="PersonnelSelectionChange"
-                  :disabled="disabled"
-                  v-model="formInline.engineeringInterfacePerson"/>
+                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'duty_territory'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -238,11 +206,11 @@
               <div class="title-text">
                 <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'remarks'">
+              <a-form-model-item class="itemModel" :prop="'remark'">
                 <a-textarea
                   :placeholder="$t('PleaseEnter')+$t('remarks')"
                   :disabled="disabled"
-                  v-model="formInline.remarks" :rows="4"/>
+                  v-model="formInline.remark" :rows="4"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -258,9 +226,9 @@
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="typeOfDeliverables">
-                <j-dict-select-tag class="box-input" v-model="formInline.typeOfDeliverables"
+                <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"
                                    :disabled="disabled"
-                                   @input="handleInput('typeOfDeliverables')"
+                                   @input="handleInput('designDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'dict_field'"/>
@@ -273,11 +241,11 @@
                 <span class="title-text-text"
                       :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="deliverableTemplate">
+              <a-form-model-item class="itemModel" prop="designDeliverableTemplate">
                 <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('deliverableTemplate')">
-                  {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' ||
-                  formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                          @click="clickButtonToUpload('designDeliverableTemplate')">
+                  {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
+                  formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                   }}
                 </a-button>
               </a-form-model-item>
@@ -291,10 +259,10 @@
                 <span class="title-text-text"
                       :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="Sponsor">
-                <j-dict-select-tag class="box-input" v-model="formInline.Sponsor"
+              <a-form-model-item class="itemModel" prop="designInitiator">
+                <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"
                                    :disabled="disabled"
-                                   @input="handleInput('Sponsor')"
+                                   @input="handleInput('designInitiator')"
                                    :placeholder="$t('PleaseSelect')+$t('Sponsor')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'dict_field'"/>
@@ -307,10 +275,10 @@
                 <span class="title-text-text"
                       :title="$t('personLiable')">{{$t('personLiable')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="personLiable">
-                <j-dict-select-tag class="box-input" v-model="formInline.personLiable"
+              <a-form-model-item class="itemModel" prop="designDuty">
+                <j-dict-select-tag class="box-input" v-model="formInline.designDuty"
                                    :disabled="disabled"
-                                   @input="handleInput('personLiable')"
+                                   @input="handleInput('designDuty')"
                                    :placeholder="$t('PleaseSelect')+$t('personLiable')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'dict_field'"/>
@@ -318,25 +286,6 @@
             </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('cutoffTime')">{{$t('cutoffTime')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'cutoffTime'">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
-                               @change="dateChange({db_field_name:'cutoffTime'})"
-                               format="YYYY-MM-DD"
-                               v-model="formInline.cutoffTime"
-                               :disabled="disabled"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
         <div class="header-text">
           &nbsp;{{$t('PrehomoConfirmation')}}
         </div>
@@ -347,10 +296,10 @@
                 <span class="title-text-text"
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="typeOfDeliverables">
-                <j-dict-select-tag class="box-input" v-model="formInline.typeOfDeliverables"
+              <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
+                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"
                                    :disabled="disabled"
-                                   @input="handleInput('typeOfDeliverables')"
+                                   @input="handleInput('prehomoDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'dict_field'"/>
@@ -363,11 +312,12 @@
                 <span class="title-text-text"
                       :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="deliverableTemplate">
+              <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">
                 <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('deliverableTemplate')">
-                  {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' ||
-                  formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                          @click="clickButtonToUpload('prehomoDeliverableTemplate')">
+                  {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''
+                  ||
+                  formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                   }}
                 </a-button>
               </a-form-model-item>
@@ -381,10 +331,10 @@
                 <span class="title-text-text"
                       :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="Sponsor">
-                <j-dict-select-tag class="box-input" v-model="formInline.Sponsor"
+              <a-form-model-item class="itemModel" prop="prehomoInitiator">
+                <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"
                                    :disabled="disabled"
-                                   @input="handleInput('Sponsor')"
+                                   @input="handleInput('prehomoInitiator')"
                                    :placeholder="$t('PleaseSelect')+$t('Sponsor')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'dict_field'"/>
@@ -397,10 +347,10 @@
                 <span class="title-text-text"
                       :title="$t('personLiable')">{{$t('personLiable')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="personLiable">
-                <j-dict-select-tag class="box-input" v-model="formInline.personLiable"
+              <a-form-model-item class="itemModel" prop="prehomoDuty">
+                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"
                                    :disabled="disabled"
-                                   @input="handleInput('personLiable')"
+                                   @input="handleInput('prehomoDuty')"
                                    :placeholder="$t('PleaseSelect')+$t('personLiable')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'dict_field'"/>
@@ -408,25 +358,6 @@
             </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('cutoffTime')">{{$t('cutoffTime')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'cutoffTime'">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
-                               @change="dateChange({db_field_name:'cutoffTime'})"
-                               format="YYYY-MM-DD"
-                               v-model="formInline.cutoffTime"
-                               :disabled="disabled"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
         <div class="header-text">
           &nbsp;{{$t('verificationAndConformityconfirmation')}}
         </div>
@@ -437,10 +368,10 @@
                 <span class="title-text-text"
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="typeOfDeliverables">
-                <j-dict-select-tag class="box-input" v-model="formInline.typeOfDeliverables"
+              <a-form-model-item class="itemModel" prop="verifyDeliverableType">
+                <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"
                                    :disabled="disabled"
-                                   @input="handleInput('typeOfDeliverables')"
+                                   @input="handleInput('verifyDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'dict_field'"/>
@@ -453,11 +384,11 @@
                 <span class="title-text-text"
                       :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="deliverableTemplate">
+              <a-form-model-item class="itemModel" prop="verifyDeliverableTemplate">
                 <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('deliverableTemplate')">
-                  {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' ||
-                  formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                          @click="clickButtonToUpload('verifyDeliverableTemplate')">
+                  {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' ||
+                  formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                   }}
                 </a-button>
               </a-form-model-item>
@@ -471,10 +402,10 @@
                 <span class="title-text-text"
                       :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="Sponsor">
-                <j-dict-select-tag class="box-input" v-model="formInline.Sponsor"
+              <a-form-model-item class="itemModel" prop="verifyInitiator">
+                <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"
                                    :disabled="disabled"
-                                   @input="handleInput('Sponsor')"
+                                   @input="handleInput('verifyInitiator')"
                                    :placeholder="$t('PleaseSelect')+$t('Sponsor')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'dict_field'"/>
@@ -487,10 +418,10 @@
                 <span class="title-text-text"
                       :title="$t('personLiable')">{{$t('personLiable')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="personLiable">
-                <j-dict-select-tag class="box-input" v-model="formInline.personLiable"
+              <a-form-model-item class="itemModel" prop="verifyDuty">
+                <j-dict-select-tag class="box-input" v-model="formInline.verifyDuty"
                                    :disabled="disabled"
-                                   @input="handleInput('personLiable')"
+                                   @input="handleInput('verifyDuty')"
                                    :placeholder="$t('PleaseSelect')+$t('personLiable')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'dict_field'"/>
@@ -498,25 +429,6 @@
             </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('cutoffTime')">{{$t('cutoffTime')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'cutoffTime'">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
-                               @change="dateChange({db_field_name:'cutoffTime'})"
-                               format="YYYY-MM-DD"
-                               v-model="formInline.cutoffTime"
-                               :disabled="disabled"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
       </a-form-model>
     </a-spin>
     <div class="drawer-bootom-button">
@@ -536,6 +448,12 @@
 
   export default {
     name: 'editModel',
+    props: {
+      url: {
+        type: Object,
+        default: {}
+      }
+    },
     components: {
       Standardselection,
       PersonnelSelection,
@@ -553,9 +471,11 @@
     mounted() {
     },
     methods: {
-      editModel() {
+      editModel(item) {
         this.visible = true
-        this.formInline = {}
+        this.$nextTick(() => {
+          this.formInline = item || {}
+        })
       },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
@@ -585,7 +505,18 @@
         this.visible = false
       },
       handleSubmit() {
-
+        this.confirmLoading = true
+        postAction(this.url.editModel, this.formInline).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('editModelList')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
       },
       handleInput(value) {
         this.$nextTick(() => {
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 0b5bf7c37..c8afdef2a 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -145,10 +145,10 @@
         </a-card>
       </div>
     </div>
-    <addModel :url="url" ref="addModelRef"/>
-    <editModel :url="url" ref="editModelRef"/>
+    <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+    <editModel :url="url" ref="editModelRef" @editModelList="editModelList"/>
     <UpdateLog :url="url" ref="UpdateLogRef"/>
-    <batSetting :url="url" ref="batSettingRef"/>
+    <batSetting :url="url" ref="batSettingRef" @batSettingList="batSettingList"/>
   </div>
 </template>
 
@@ -389,7 +389,7 @@
           ...this.queryParam,
           id: selectedRowKeys.join(',')
         }
-        downloadFile(this.url.exportData, '文档库.xls', query, this.Deselect)
+        downloadFile(this.url.exportData, '虚拟清单名称.zip', query, this.Deselect)
       },
       Deselect() {
         this.selectedRowKeys = []
@@ -426,6 +426,14 @@
         this.pageSize = pageSize
         this.getList()
       },
+      addModelList() {
+        this.pageNo = 1
+        this.getList()
+      },
+      editModelList() {
+        this.pageNo = 1
+        this.getList()
+      },
       getList() {
         let query = {
           pageNo: this.pageNo,
@@ -448,6 +456,10 @@
           }
         })
       },
+      batSettingList() {
+        this.pageNo = 1
+        this.getList()
+      },
       batSettingClick() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
@@ -486,7 +498,7 @@
       edit(item) {
         this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
       },
-      deleteLib() {
+      deleteLib(val) {
         let _this = this
         this.$confirm({
           content: _this.$t('ConfirmDelete'),