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

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);
 			}
 

jero-web/src/views/virtualAuthenticationList/components/addModel.vue

@@ -1,4 +1,5 @@
 <template>
+  <div>
     <a-drawer
       :title="$t('add')"
       :maskClosable="false"
@@ -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'"
@@ -148,6 +153,9 @@
         <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'])
+      })
     }
   }
 }

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()
       }
     },

jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-  <a-input allowClear
+<!--  <a-input allowClear-->
-           @click="add"
+<!--           @click="add"-->
-           :placeholder="$t('PleaseSelect')+$t('regulationNo')"
+<!--           :placeholder="$t('PleaseSelect')+$t('regulationNo')"-->
-            v-model="regulation"></a-input>
+<!--            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 = ''
+          let fgid = this.selectedRowList[0].id
-          this.fgid = this.selectedRowList[0].id
+          let regulationIndex = this.selectedRowList[0].serial_number
-          this.regulation = 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

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')
     }
@@ -716,4 +717,7 @@ export default {
   color: #000F16;
 }
 
+::v-deep .ant-table-placeholder {
+  margin-top: 8px!important;
+}
 </style>