From 9bc9af18310df24c3e73c7518b2b4d62b0e827f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Wed, 15 Mar 2023 11:13:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4-?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/virtualAuthenticationList/components/batSetting.vue   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue
index 06f7d67a3..6b86102b9 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue
@@ -82,8 +82,10 @@ export default {
     },
     handleOk() {
       if (this.formInline.dutyTerritory) {
+        this.formInline.authDummyInventoryBaseId = this.$route.query.id
         this.handleOnTwo()
       } else {
+        this.formInline.authDummyInventoryBaseId = this.$route.query.id
         this.handleOkOne()
       }
     },

From c36ee521e773596697f86600195c7e4e6ca227a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Wed, 15 Mar 2023 11:15:58 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4-=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE-?=
 =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=89=A9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AuthDummyInventoryInfoEOServiceImpl.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
index 0873d3289..795c5c3ef 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
@@ -267,6 +267,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 				if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getBussDocumentLibraryId())){
 					updateAuthDummyEO.setBussDocumentLibraryId(authDummyInventoryInfoEO.getBussDocumentLibraryId());
 				}
+				if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getDeliverableType())){
+					updateAuthDummyEO.setDeliverableType(authDummyInventoryInfoEO.getDeliverableType());
+				}
 				updateList.add(updateAuthDummyEO);
 			}
 

From 519c08e68ff16a70cae10b161ac91baeed971aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Wed, 15 Mar 2023 11:17:28 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4-?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0-=E6=B3=95=E8=A7=84=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addModel.vue                   | 202 ++++++++++--------
 .../components/codeNumber.vue                 |  18 +-
 2 files changed, 122 insertions(+), 98 deletions(-)

diff --git a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
index c04bd5820..e98ef3490 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
@@ -1,14 +1,15 @@
 <template>
-  <a-drawer
-    :title="$t('add')"
-    :maskClosable="false"
-    :width="1000"
-    placement="right"
-    :closable="true"
-    @close="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <a-spin :spinning="confirmLoading">
+  <div>
+    <a-drawer
+      :title="$t('add')"
+      :maskClosable="false"
+      :width="1000"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
         <a-form-model :model="formInline" :rules="rules" ref="ruleForm">
           <a-row :gutter="24">
             <a-col :span="12">
@@ -18,7 +19,10 @@
                   <span class="title-text-text" :title="$t ('regulationNo')">{{$t('regulationNo')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="serialNumber">
-                  <codeNumber @regulation="regulation"/>
+                  <a-input @click.native="serialNumberClick"
+                           class="box-input"
+                           :placeholder="$t('PleaseSelect')+$t('regulationNo')"
+                           v-model="formInline.serialNumber"></a-input>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -31,6 +35,7 @@
                 <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'"
@@ -62,92 +67,95 @@
               <a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)"
                       type="minus-circle"/>
             </div>
-          <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('category')">{{$t('category')}}</span>
-                </div>
-                <a-form-model-item class="itemModel"
-                                   :prop="'dataList.'+index+'.category'"
-                                   :rules="[{ required: true, message: $t('category') + $t('cannotEmpty'), trigger: 'blur'},
+            <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('category')">{{$t('category')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'dataList.'+index+'.category'"
+                                     :rules="[{ required: true, message: $t('category') + $t('cannotEmpty'), trigger: 'blur'},
                                             {max: 300,message: $t('category') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]"
-                >
-                  <a-input class="box-input"
-                           v-model="item.category"
-                           :placeholder="$t('PleaseEnter')+$t('category')"/>
-                </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('inspectionItems')">{{$t('inspectionItems')}}</span>
+                  >
+                    <a-input class="box-input"
+                             v-model="item.category"
+                             :placeholder="$t('PleaseEnter')+$t('category')"/>
+                  </a-form-model-item>
                 </div>
-                <a-form-model-item class="itemModel"
-                                   :prop="'dataList.'+index+'.inspectionItem'"
-                                   :rules="[{ required: true, message: $t('inspectionItems') + $t('cannotEmpty'), trigger: 'blur'},
+              </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('inspectionItems')">{{$t('inspectionItems')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'dataList.'+index+'.inspectionItem'"
+                                     :rules="[{ required: true, message: $t('inspectionItems') + $t('cannotEmpty'), trigger: 'blur'},
                                             {max: 300,message: $t('inspectionItems') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]"
-                >
-                  <a-input class="box-input"
-                           v-model="item.inspectionItem"
-                           :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
-                </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('configurationItem')">{{$t('configurationItem')}}</span>
+                  >
+                    <a-input class="box-input"
+                             v-model="item.inspectionItem"
+                             :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
+                  </a-form-model-item>
                 </div>
-                <a-form-model-item class="itemModel"
-                                   :prop="'dataList.'+index+'.configItem'"
-                                   :rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'},
+              </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('configurationItem')">{{$t('configurationItem')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'dataList.'+index+'.configItem'"
+                                     :rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'},
                                             {max: 300,message: $t('configurationItem') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
                             }]">
-                  <a-input class="box-input"
-                           v-model="item.configItem"
-                           :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
-                </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('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                    <a-input class="box-input"
+                             v-model="item.configItem"
+                             :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+                  </a-form-model-item>
                 </div>
-                <a-form-model-item class="itemModel"
-                                   :prop="'dataList.'+index+'.deliverableType'"
-                                   :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
-                >
-                  <a-tree-select
-                    tree-node-filter-prop="title"
-                    v-model="item.deliverableType"
-                    :maxTagCount="1"
-                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                    class="box-input"
-                    style="width: 100%"
-                    :tree-data="DeliverableTreeList"
-                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                  />
-                </a-form-model-item>
-              </div>
-            </a-col>
-          </a-row>
+              </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('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'dataList.'+index+'.deliverableType'"
+                                     :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
+                  >
+                    <a-tree-select
+                      tree-node-filter-prop="title"
+                      v-model="item.deliverableType"
+                      :maxTagCount="1"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      class="box-input"
+                      style="width: 100%"
+                      :tree-data="DeliverableTreeList"
+                      :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                    />
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
           </div>
         </a-form-model>
-    </a-spin>
-    <div class="drawer-bootom-button">
-      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button type="primary" @click="handleSubmit" :loading="confirmLoading">{{$t('submit')}}</a-button>
-    </div>
-  </a-drawer>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button type="primary" @click="handleSubmit" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      </div>
+    </a-drawer>
+   <codeNumber ref="codeNumber" @regulation="regulation" />
+  </div>
+
 </template>
 
 <script>
@@ -188,7 +196,7 @@ export default {
           {
             required: true,
             message: 'WVTA ID' + this.$t('regulationNo'),
-            trigger: 'change'
+            trigger: 'blur'
           },
           {
             max: 300,
@@ -209,14 +217,21 @@ export default {
       this.visible = true
       this.formInline = {}
       this.formInline.dataList = [{}]
-      this.formInline = { ...this.formInline }
       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) {
@@ -274,9 +289,16 @@ export default {
         }
       })
     },
+    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'])
+      })
     }
   }
 }
diff --git a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
index 3ebb21254..60008065b 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-  <a-input allowClear
-           @click="add"
-           :placeholder="$t('PleaseSelect')+$t('regulationNo')"
-            v-model="regulation"></a-input>
+<!--  <a-input allowClear-->
+<!--           @click="add"-->
+<!--           :placeholder="$t('PleaseSelect')+$t('regulationNo')"-->
+<!--            v-model="regulation"></a-input>-->
   <a-drawer
     :title="$t('regulationNo')"
     :width="1000"
@@ -204,6 +204,9 @@ export default {
       this.replacePage()
       this.queryConditionInventory()
     },
+    // number() {
+    //   this.regulation = ''
+    // },
     searchQuery() {
       this.pageNo = 1
       this.replacePage()
@@ -284,12 +287,11 @@ export default {
         this.confirmLoading = true
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
         if (this.selectedRowKeys.length < 2){
-          let fgid = ''
-          this.fgid = this.selectedRowList[0].id
-          this.regulation = this.selectedRowList[0].serial_number
+          let fgid = this.selectedRowList[0].id
+          let regulationIndex = this.selectedRowList[0].serial_number
           this.confirmLoading = false
           this.visible = false
-          this.$emit('regulation',this.regulation,this.fgid)
+          this.$emit('regulation',regulationIndex,fgid)
         } else {
           this.$message.warning(this.$t('OnlyOneSelected'))
           this.confirmLoading = false

From c224d0bf2291683ae0002a68226bf54ed18748a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Wed, 15 Mar 2023 12:00:36 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E5=8E=BB=E6=8E=89=E6=93=8D=E4=BD=9C=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationListMaintenance.vue                             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index f24b09b7f..89b4b545e 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -400,6 +400,7 @@ export default {
   created() {
     if (this.$route.query.title == '虚拟认证清单详情') {
       document.title = this.$t('virtualAuthenticationListDetails')
+      this.columns.splice(7,1)
     } else {
       document.title = this.$t('certificationListMaintenance')
     }

From 5f101301b708899c4f021ad4451fe8b010ea63a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Wed, 15 Mar 2023 15:26:24 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationListMaintenance.vue                           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 89b4b545e..60133812d 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -717,4 +717,7 @@ export default {
   color: #000F16;
 }
 
+::v-deep .ant-table-placeholder {
+  margin-top: 8px!important;
+}
 </style>
\ No newline at end of file