From c7f58a3e9abf9b816399df81f5aef922a0abdbab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Thu, 6 Apr 2023 16:37:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0-=E6=B3=95=E8=A7=84=E7=BC=96=E5=8F=B7=E6=8A=BD?=
 =?UTF-8?q?=E5=B1=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 66 ++++++++++++-------
 .../components/codeNumber.vue                 |  6 +-
 2 files changed, 45 insertions(+), 27 deletions(-)

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 ca0a3eb54..c4018732d 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -18,29 +18,33 @@
                   <span class="Required" v-if="!this.formInline.id">*</span>
                   <span class="title-text-text" :title="$t('regulationNo')">{{$t('regulationNo')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" :prop="this.formInline.id?'':'serialNumber'">
-                  <a-select :placeholder="$t('PleaseSelect')+$t('regulationNo')"
-                            optionFilterProp="label"
-                            v-if="!this.formInline.id"
-                            @change="serialNumberChange"
-                            :disabled="this.formInline.id?true:false"
-                            showSearch
-                            v-model="formInline.bussDocumentLibraryId">
-                    <a-select-option v-for="(item, key) in projectNameList"
-                                     :label="item.serialNumber"
-                                     :key="key"
-                                     :value="item.standId">
-                     <span style="display: inline-block;width: 100%"
-                           :title=" item.serialNumber ">
-                           {{ item.serialNumber}}
-                     </span>
-                    </a-select-option>
-                  </a-select>
-                  <a-input class="box-input"
-                           :disabled="true"
-                           v-else
-                           v-model.trim="formInline.serialNumber"
-                           :placeholder="$t('PleaseEnter')+this.$t('regulationNo')"/>
+                <a-form-model-item class="itemModel" prop="serialNumber">
+<!--                  <a-select :placeholder="$t('PleaseSelect')+$t('regulationNo')"-->
+<!--                            optionFilterProp="label"-->
+<!--                            v-if="!this.formInline.id"-->
+<!--                            @change="serialNumberChange"-->
+<!--                            :disabled="this.formInline.id?true:false"-->
+<!--                            showSearch-->
+<!--                            v-model="formInline.bussDocumentLibraryId">-->
+<!--                    <a-select-option v-for="(item, key) in projectNameList"-->
+<!--                                     :label="item.serialNumber"-->
+<!--                                     :key="key"-->
+<!--                                     :value="item.standId">-->
+<!--                     <span style="display: inline-block;width: 100%"-->
+<!--                           :title=" item.serialNumber ">-->
+<!--                           {{ item.serialNumber}}-->
+<!--                     </span>-->
+<!--                    </a-select-option>-->
+<!--                  </a-select>-->
+<!--                  <a-input class="box-input"-->
+<!--                           :disabled="true"-->
+<!--                           v-else-->
+<!--                           v-model.trim="formInline.serialNumber"-->
+<!--                           :placeholder="$t('PleaseEnter')+this.$t('regulationNo')"/>-->
+                  <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>
@@ -488,10 +492,12 @@
       </div>
     </a-drawer>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+    <add-code-number ref="addCodeNumber" @regulation="regulation"></add-code-number>
   </div>
 </template>
 
 <script>
+  import addCodeNumber from './addCodeNumber'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import uploadFile from '@/components/uploadFile/file'
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
@@ -502,7 +508,8 @@
     name: 'addModel',
     components: {
       PersonnelSelection,
-      uploadFile
+      uploadFile,
+      addCodeNumber
     },
     data() {
       return {
@@ -608,6 +615,17 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      serialNumberClick(){
+        this.$refs.addCodeNumber.add()
+      },
+      regulation(item,data) {
+        this.formInline.serialNumber = item
+        this.formInline.bussDocumentLibraryId = data
+        this.$nextTick(()=>{
+          this.formInline = {... this.formInline}
+          this.$refs.ruleForm.clearValidate('serialNumber')
+        })
+      },
       disabledDate(current) {
         return current && current < moment().subtract(1, 'day')
       },
diff --git a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
index 4a1c20c10..7d39deb3c 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
@@ -61,12 +61,12 @@
             </template>
             <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                  <a @click="handleToggleSearch">
                             {{ !toggleSearchStatus ? $t('open') : $t('away') }}
                             <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
                   </a>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>
             </span>
           </a-row>