From 1833309308e0f1d44e7c5a7ea0cf76a4a3e2b23a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 27 Mar 2023 13:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8E=E6=9F=A5=E7=9C=8B=EF=BC=8C=E4=B8=8A=E4=BC=A0=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8D=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue |  13 +-
 .../components/editModel.vue                  | 274 +++++++++---------
 2 files changed, 155 insertions(+), 132 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 8417b5850..a3013d2a5 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -179,7 +179,7 @@
                     </div>
                     <a-form-model-item class="itemModel" prop="deliverableTemplate">
                       <a-button type="primary" class="button-text"
-                                @click="clickButtonToUpload('deliverableTemplate',index)">
+                                @click="clickButtonToUpload('deliverableTemplate',index,true)">
                         {{ (item.deliverableTemplate === 'null' || item.deliverableTemplate === ''
                         ||
                         item.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -719,12 +719,19 @@
         }
         this.formInline = { ...this.formInline }
       },
-      clickButtonToUpload(item, index) {
+      clickButtonToUpload(item, index,isTrue) {
         this.numIndex = index
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
         this.uploadName = item
-        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        let ids = ''
+        console.log(index)
+        if (isTrue){
+          ids = this.formInline.dataList[index][item]
+        }else{
+          ids = this.formInline[item]
+        }
+        getAction('sys/common/getFileInfos', { id: ids }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
           } else {
diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
index 3b0869ae9..907e6582d 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
@@ -1,148 +1,153 @@
 <template>
-  <a-drawer
-    :title="$t('edit')"
-    :maskClosable="false"
-    :width="900"
-    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" class="formAdd" :rules="rules" ref="ruleForm">
-        <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('regulationNo')">{{$t('regulationNo')}}</span>
+  <div>
+    <a-drawer
+      :title="$t('edit')"
+      :maskClosable="false"
+      :width="900"
+      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" class="formAdd" :rules="rules" ref="ruleForm">
+          <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('regulationNo')">{{$t('regulationNo')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="serialNumber">
+                  <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-form-model-item class="itemModel" prop="serialNumber">
-                <j-dict-select-tag class="box-input"
-                                   v-model="formInline.serialNumber"
-                                   :disabled="true"
-                                   :placeholder="$t('PleaseSelect')+$t('regulationNo')"
-                                   :type="'select'"
-                                   :triggerChange="false"/>
-              </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>
+            </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"
+                                     :disabled="disabled"
+                                     :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'duty_territory'"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="dutyTerritory">
-                <j-dict-select-tag class="box-input"
-                                   v-model="formInline.dutyTerritory"
-                                   :disabled="disabled"
-                                   :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">
-                <span class="Required">*</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"
-                         v-model="formInline.wvtaId"
-                         :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
+            </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('category')">{{$t('category')}}</span>
+          <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="'WVTA ID'">WVTA ID</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="wvtaId">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="formInline.wvtaId"
+                           :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="category">
-                <a-input class="box-input"
-                         v-model="formInline.category"
-                         :disabled="disabled"
-                         :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-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('category')">{{$t('category')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="category">
+                  <a-input class="box-input"
+                           v-model="formInline.category"
+                           :disabled="disabled"
+                           :placeholder="$t('PleaseEnter')+$t('category')" />
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="inspectionItem">
-                <a-input class="box-input"
-                         v-model="formInline.inspectionItem"
-                         :disabled="disabled"
-                         :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-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="inspectionItem">
+                  <a-input class="box-input"
+                           v-model="formInline.inspectionItem"
+                           :disabled="disabled"
+                           :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="configItem">
-                <a-input class="box-input"
-                         v-model="formInline.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-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="configItem">
+                  <a-input class="box-input"
+                           v-model="formInline.configItem"
+                           :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+                </a-form-model-item>
               </div>
-              <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"
-                  :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-form-model>
-    </a-spin>
-    <div class="drawer-bootom-button">
-      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
-    </div>
-  </a-drawer>
+            </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="deliverableType"
+                                   :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
+                >
+                  <a-tree-select
+                    tree-node-filter-prop="title"
+                    v-model="formInline.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-form-model>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      </div>
+    </a-drawer>
+    <codeNumber ref="codeNumber" @regulation="regulation" />
+  </div>
 </template>
 
 <script>
 import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+import codeNumber from './codeNumber'
 
 export default {
   name:'editModel',
   props: ['url'],
+  components:{
+    codeNumber
+  },
   data() {
     return {
       visible: false,
@@ -215,6 +220,9 @@ export default {
     handleCancel() {
       this.visible = false
     },
+    serialNumberClick(){
+      this.$refs.codeNumber.add()
+    },
     editModel(item) {
       this.visible = true
       this.$nextTick(() => {
@@ -261,6 +269,14 @@ export default {
         }
       })
     },
+    regulation(item,data) {
+      this.formInline.serialNumber = item
+      this.formInline.bussDocumentLibraryId = data
+      this.$nextTick(()=>{
+        this.formInline = {... this.formInline}
+        this.$refs.ruleForm.validateField(['serialNumber'])
+      })
+    }
   }
 }
 </script>