From 5119c970819e31a026206e9f766c26ceec9c0e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 6 Apr 2023 17:13:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E6=94=BE=E5=A4=A7?=
 =?UTF-8?q?=EF=BC=9B=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2=E5=8F=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=8E=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=9C=80=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../virtualList/components/editModel.vue      | 329 +++++++++-------
 .../components/virtualListDetails.vue         |  28 +-
 .../components/taskCirculationHistory.vue     | 189 +++++++--
 .../processForm/processDetails/index.vue      |   5 +-
 .../components/addCodeNumber.vue              | 370 +++++++++---------
 .../certificationList/components/addModel.vue |  15 +-
 6 files changed, 561 insertions(+), 375 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index 06d7311a2..14903e020 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    :title="'编辑'"
+    :title="title"
     :maskClosable="false"
     :width="900"
     placement="right"
@@ -18,7 +18,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="standard">
                 <a-input class="box-input"
-                         :disabled="false"
+                         :disabled="disabled"
+                         :title="formInline.serialNumber"
                          v-model="formInline.serialNumber"
                          :placeholder="$t('PleaseEnter')+$t('standard')"/>
               </a-form-model-item>
@@ -31,7 +32,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="title">
                 <a-input class="box-input"
-                         :disabled="false"
+                         :disabled="disabled"
+                         :title="formInline.title"
                          v-model="formInline.title"
                          :placeholder="$t('PleaseEnter')+$t('title')"/>
               </a-form-model-item>
@@ -46,7 +48,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="subtitle">
                 <a-input class="box-input"
-                         :disabled="false"
+                         :disabled="disabled"
+                         :title="formInline.subtitle"
                          v-model="formInline.subtitle"
                          :placeholder="$t('PleaseEnter')+$t('subtitle')"/>
               </a-form-model-item>
@@ -63,6 +66,7 @@
                 <!--                         :disabled="true"-->
                 <!--                         v-model="formInline.region_dictText"/>-->
                 <j-multi-select-tag class="box-input" v-model="formInline.region"
+                                    :disabled="disabled"
                                     :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
                                     :type="'select'"
                                     :triggerChange="false" :dictCode="'region'"/>
@@ -85,6 +89,7 @@
                                     @input="handleInput('shi4Yong4Fan4Wei2')"
                                     :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
                                     :type="'select'"
+                                    :disabled="disabled"
                                     :triggerChange="false" :dictCode="'apply_scope'"/>
               </a-form-model-item>
             </div>
@@ -116,10 +121,14 @@
               <a-form-model-item class="itemModel" prop="correspondingStandard">
                 <Standardselection :query="{'db_field_txt':$t('correspondingStandard')}"
                                    :standard="formInline"
+                                   v-if="!disabled"
+                                   :disabled="disabled"
                                    v-model="formInline.correspondingStandard"/>
-                <!--                <a-input class="box-input"-->
-                <!--                         v-model="formInline.correspondingStandard"-->
-                <!--                         :placeholder="$t('PleaseEnter')+$t('correspondingStandard')"/>-->
+                <a-input class="box-input"
+                         v-else
+                         v-model="formInline.correspondingStandard"
+                         :disabled="disabled"
+                         :placeholder="$t('PleaseEnter')+$t('correspondingStandard')"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -153,7 +162,7 @@
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
                                v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1"
-                               :disabled="false"
+                               :disabled="disabled"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
@@ -171,7 +180,7 @@
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
                                v-model="formInline.implementTime"
-                               :disabled="false"
+                               :disabled="disabled"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
@@ -185,7 +194,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="wvtaId">
                 <a-input class="box-input"
-                         :disabled="false"
+                         :disabled="disabled"
+                         :title="formInline.wvtaId"
                          v-model="formInline.wvtaId"
                          :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
               </a-form-model-item>
@@ -201,6 +211,7 @@
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
                                     :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                     :type="'select'"
+                                    :disabled="disabled"
                                     :triggerChange="false" :dictCode="'attestation_type'"/>
               </a-form-model-item>
             </div>
@@ -210,7 +221,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required">*</span>
+                <span class="Required" v-if="!disabled">*</span>
                 <span class="title-text-text"
                       :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
               </div>
@@ -218,6 +229,7 @@
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
                                     :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                     :type="'select'"
+                                    :disabled="disabled"
                                     :triggerChange="false" :dictCode="'attestation_rank'"/>
               </a-form-model-item>
             </div>
@@ -230,7 +242,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="applicableSupplement">
                 <a-input class="box-input"
-                         :disabled="false"
+                         :disabled="disabled"
+                         :title="formInline.applicableSupplement"
                          v-model="formInline.applicableSupplement"
                          :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
               </a-form-model-item>
@@ -252,6 +265,7 @@
                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   class="box-input"
                   style="width: 100%"
+                  :disabled="disabled"
                   :tree-data="CategoryTreeList"
                   tree-checkable
                   :placeholder="$t('PleaseSelect')+$t('technicalField')"
@@ -262,7 +276,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required">*</span>
+                <span class="Required" v-if="!disabled">*</span>
                 <span class="title-text-text"
                       :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
               </div>
@@ -284,6 +298,7 @@
               </div>
               <a-form-model-item class="itemModel-text" :prop="'remark'">
                 <a-textarea
+                  :title="formInline.remark"
                   :placeholder="$t('PleaseEnter')+$t('remarks')"
                   :disabled="disabled"
                   v-model="formInline.remark" :rows="4"/>
@@ -295,22 +310,22 @@
           &nbsp;{{$t('confirmationOfDesignConformity')}}
         </div>
         <a-row :gutter="24">
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="designInitiator">-->
-<!--                <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"-->
-<!--                                   :disabled="disabled"-->
-<!--                                   @input="handleInput('designInitiator')"-->
-<!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
-<!--                                   :type="'select'"-->
-<!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
-<!--              </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('Sponsor')">{{$t('Sponsor')}}</span>-->
+          <!--              </div>-->
+          <!--              <a-form-model-item class="itemModel" prop="designInitiator">-->
+          <!--                <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"-->
+          <!--                                   :disabled="disabled"-->
+          <!--                                   @input="handleInput('designInitiator')"-->
+          <!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+          <!--                                   :type="'select'"-->
+          <!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
+          <!--              </a-form-model-item>-->
+          <!--            </div>-->
+          <!--          </a-col>-->
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -343,6 +358,7 @@
                   style="width: 100%"
                   :tree-data="DeliverableTreeList"
                   tree-checkable
+                  :disabled="disabled"
                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                 />
                 <!--                <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"-->
@@ -383,131 +399,133 @@
               <a-form-model-item class="itemModel-text" :prop="'designRemark'">
                 <a-textarea
                   style="width: 100%"
+                  :disabled="disabled"
+                  :title="formInline.designRemark"
                   :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
                   v-model="formInline.designRemark" :rows="4"/>
               </a-form-model-item>
             </div>
           </a-col>
         </a-row>
-<!--        <div class="header-text">-->
-<!--          &nbsp;{{$t('PrehomoConfirmation')}}-->
-<!--        </div>-->
-<!--        <a-row :gutter="24">-->
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="prehomoInitiator">-->
-<!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"-->
-<!--                                   :disabled="disabled"-->
-<!--                                   @input="handleInput('prehomoInitiator')"-->
-<!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
-<!--                                   :type="'select'"-->
-<!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
-<!--              </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('personLiable')">{{$t('personLiable')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="prehomoDuty">-->
-<!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"-->
-<!--                                   :disabled="disabled"-->
-<!--                                   @input="handleInput('prehomoDuty')"-->
-<!--                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
-<!--                                   :type="'select'"-->
-<!--                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
-<!--              </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('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="prehomoDeliverableType">-->
-<!--                <a-tree-select-->
-<!--                  tree-node-filter-prop="title"-->
-<!--                  v-model="formInline.prehomoDeliverableType"-->
-<!--                  :maxTagCount="1"-->
-<!--                  :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-<!--                  class="box-input"-->
-<!--                  style="width: 100%"-->
-<!--                  :tree-data="DeliverableTreeList"-->
-<!--                  tree-checkable-->
-<!--                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
-<!--                />-->
-<!--                &lt;!&ndash;                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"&ndash;&gt;-->
-<!--                &lt;!&ndash;                                   :disabled="disabled"&ndash;&gt;-->
-<!--                &lt;!&ndash;                                   @input="handleInput('prehomoDeliverableType')"&ndash;&gt;-->
-<!--                &lt;!&ndash;                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"&ndash;&gt;-->
-<!--                &lt;!&ndash;                                   :type="'select'"&ndash;&gt;-->
-<!--                &lt;!&ndash;                                   :triggerChange="false" :dictCode="'deliverable_template'"/>&ndash;&gt;-->
-<!--              </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('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">-->
-<!--                <a-button type="primary" class="button-text"-->
-<!--                          @click="clickButtonToUpload('prehomoDeliverableTemplate')">-->
-<!--                  {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''-->
-<!--                  ||-->
-<!--                  formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
-<!--                  }}-->
-<!--                </a-button>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--        </a-row>-->
-<!--        <a-row :gutter="24">-->
-<!--          <a-col :span="24">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">-->
-<!--                <a-textarea-->
-<!--                  style="width: 100%"-->
-<!--                  :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"-->
-<!--                  v-model="formInline.prehomoRemark" :rows="4"/>-->
-<!--              </a-form-model-item>-->
-<!--            </div>-->
-<!--          </a-col>-->
-<!--        </a-row>-->
+        <!--        <div class="header-text">-->
+        <!--          &nbsp;{{$t('PrehomoConfirmation')}}-->
+        <!--        </div>-->
+        <!--        <a-row :gutter="24">-->
+        <!--          <a-col :span="12">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text"-->
+        <!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel" prop="prehomoInitiator">-->
+        <!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"-->
+        <!--                                   :disabled="disabled"-->
+        <!--                                   @input="handleInput('prehomoInitiator')"-->
+        <!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+        <!--                                   :type="'select'"-->
+        <!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
+        <!--              </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('personLiable')">{{$t('personLiable')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel" prop="prehomoDuty">-->
+        <!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"-->
+        <!--                                   :disabled="disabled"-->
+        <!--                                   @input="handleInput('prehomoDuty')"-->
+        <!--                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
+        <!--                                   :type="'select'"-->
+        <!--                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
+        <!--              </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('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel" prop="prehomoDeliverableType">-->
+        <!--                <a-tree-select-->
+        <!--                  tree-node-filter-prop="title"-->
+        <!--                  v-model="formInline.prehomoDeliverableType"-->
+        <!--                  :maxTagCount="1"-->
+        <!--                  :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+        <!--                  class="box-input"-->
+        <!--                  style="width: 100%"-->
+        <!--                  :tree-data="DeliverableTreeList"-->
+        <!--                  tree-checkable-->
+        <!--                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+        <!--                />-->
+        <!--                &lt;!&ndash;                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :disabled="disabled"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   @input="handleInput('prehomoDeliverableType')"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :type="'select'"&ndash;&gt;-->
+        <!--                &lt;!&ndash;                                   :triggerChange="false" :dictCode="'deliverable_template'"/>&ndash;&gt;-->
+        <!--              </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('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">-->
+        <!--                <a-button type="primary" class="button-text"-->
+        <!--                          @click="clickButtonToUpload('prehomoDeliverableTemplate')">-->
+        <!--                  {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''-->
+        <!--                  ||-->
+        <!--                  formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
+        <!--                  }}-->
+        <!--                </a-button>-->
+        <!--              </a-form-model-item>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+        <!--        </a-row>-->
+        <!--        <a-row :gutter="24">-->
+        <!--          <a-col :span="24">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text"-->
+        <!--                      :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">-->
+        <!--                <a-textarea-->
+        <!--                  style="width: 100%"-->
+        <!--                  :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"-->
+        <!--                  v-model="formInline.prehomoRemark" :rows="4"/>-->
+        <!--              </a-form-model-item>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+        <!--        </a-row>-->
         <div class="header-text">
           &nbsp;{{$t('verificationAndConformityconfirmation')}}
         </div>
         <a-row :gutter="24">
-<!--          <a-col :span="12">-->
-<!--            <div class="box-title-text">-->
-<!--              <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
-<!--              </div>-->
-<!--              <a-form-model-item class="itemModel" prop="verifyInitiator">-->
-<!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"-->
-<!--                                   :disabled="disabled"-->
-<!--                                   @input="handleInput('verifyInitiator')"-->
-<!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
-<!--                                   :type="'select'"-->
-<!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
-<!--              </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('Sponsor')">{{$t('Sponsor')}}</span>-->
+          <!--              </div>-->
+          <!--              <a-form-model-item class="itemModel" prop="verifyInitiator">-->
+          <!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"-->
+          <!--                                   :disabled="disabled"-->
+          <!--                                   @input="handleInput('verifyInitiator')"-->
+          <!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+          <!--                                   :type="'select'"-->
+          <!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
+          <!--              </a-form-model-item>-->
+          <!--            </div>-->
+          <!--          </a-col>-->
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -538,6 +556,7 @@
                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   class="box-input"
                   style="width: 100%"
+                  :disabled="disabled"
                   :tree-data="DeliverableTreeList"
                   tree-checkable
                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
@@ -581,6 +600,8 @@
               <a-form-model-item class="itemModel-text" :prop="'verifyRemark'">
                 <a-textarea
                   style="width: 100%"
+                  :disabled="disabled"
+                  :title="formInline.verifyRemark"
                   :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
                   v-model="formInline.verifyRemark" :rows="4"/>
               </a-form-model-item>
@@ -591,9 +612,9 @@
     </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>
+      <a-button @click="handleSubmit" v-if="!disabled" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
     </div>
-    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+    <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"/>
   </a-drawer>
 </template>
 
@@ -674,6 +695,7 @@
         },
         formInline: {},
         disabled: false,
+        title: '',
         CategoryTreeList: [],
         DeliverableTreeList: []
       }
@@ -703,6 +725,21 @@
       },
       editModel(item) {
         this.visible = true
+        this.disabled = false
+        this.title = this.$t('edit')
+        this.$nextTick(() => {
+          this.formInline = item || {}
+          this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : []
+          this.formInline.designDeliverableType = this.formInline.designDeliverableType ? this.formInline.designDeliverableType.split(',') : []
+          this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : []
+          this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : []
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      viewModel(item) {
+        this.visible = true
+        this.disabled = true
+        this.title = this.$t('view')
         this.$nextTick(() => {
           this.formInline = item || {}
           this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : []
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 88826cfab..4f0017e66 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -226,11 +226,16 @@
             >
                <span slot="operation" slot-scope="text,record">
                    <a class="text-operation"
+                      v-if="title === '维护市场清单'"
                       v-has="'dummyInventoryInfo:edit'"
                       @click="edit(record)">{{$t('edit')}}</a>
                    <a class="text-operation"
+                      v-if="title === '维护市场清单'"
                       v-has="'dummyInventoryInfo:deleteBatch'"
                       @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+                 <a class="text-operation"
+                    v-if="title === '市场清单详情'"
+                    @click="viewClick(record)">{{$t('view')}}</a>
               </span>
               <span slot="titleName" slot-scope="text,record" :title="text">
                   <span class="textName">
@@ -994,14 +999,14 @@
     computed: {
       columns() {
         let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
-        if (this.title === '市场清单详情') {
-          for (var i = 0; i < columnResult.length; i++) {
-            if (columnResult[i].title === this.$t('operation')) {
-              columnResult.splice(i, 1)
-              i--
-            }
-          }
-        }
+        // if (this.title === '市场清单详情') {
+        //   for (var i = 0; i < columnResult.length; i++) {
+        //     if (columnResult[i].title === this.$t('operation')) {
+        //       columnResult.splice(i, 1)
+        //       i--
+        //     }
+        //   }
+        // }
         this.isTruee = false
         this.$nextTick(() => {
           this.isTruee = true
@@ -1051,6 +1056,8 @@
         this.isTrue = false
         setTimeout(() => {
           this.isTrue = true
+          this.title = this.$route.query.title
+          this.isTrue = this.$route.query.title == '市场清单详情' ? false : true
         }, 100)
       },
       //导出
@@ -1181,7 +1188,7 @@
               title: this.$t('operation'),
               align: 'left',
               fixed: 'right',
-              width: 240,
+              width: 120,
               scopedSlots: { customRender: 'operation' }
             })
 
@@ -1346,6 +1353,9 @@
       edit(item) {
         this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
       },
+      viewClick(item){
+        this.$refs.editModelRef.viewModel(JSON.parse(JSON.stringify(item)))
+      },
       deleteLib(val) {
         let _this = this
         this.$confirm({
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index 9496a5adc..39ae27588 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -8,23 +8,46 @@
     <div style="width: 100%">
       <a-table
         ref="table"
-        :components="drag(columns,'columns')"
+        size="middle"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%'}"
         :data-source="dataSource"
         :columns="columns"
       >
-        <span slot="reviewResult" :title="text" slot-scope="text,result">
-            {{text}}
+        <span slot="approvalResult" slot-scope="text,result">
+            {{approvalResult[text]}}
+        </span>
+        <span slot="approvalOpinion" slot-scope="text,result">
+      <a-tooltip placement="top">
+        <template slot="title">
+          <span>{{text}}</span>
+        </template>
+        {{text}}
+      </a-tooltip>
+        </span>
+        <span slot="resultofhandling" slot-scope="text,result">
+            <span :class="statusClass[result.operatorResult]" :title="result.operatorResultName">
+                 {{result.operatorResultName}}
+            </span>
+        </span>
+        <span slot="approvalFile" slot-scope="text,result">
+              <span class="viewFile"
+                    @click="viewFileClick(result.approvalFile)"
+                    v-if="result.approvalFile">
+                {{$t('viewFile')}}
+              </span>
+              <span v-else>--</span>
         </span>
       </a-table>
     </div>
+    <viewFileModel ref="viewFileModelRef"/>
   </div>
 </template>
 
 <script>
   import { getAction, postAction, downloadFile } from '@/api/manage'
+  import viewFileModel from '@/components/viewFileModel/index'
   import moment from 'moment'
   import { Base64 } from 'js-base64'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
@@ -32,54 +55,72 @@
   export default {
     name: 'circulationHistory',
     mixins:[ResizeHeader, ResizeColumnProvide],
+    components:{
+      viewFileModel
+    },
     data() {
       return {
         dataSource: [],
         loading: false,
-        reviewResult: {
-          'launch': this.$t('Launch'),
-          'Compliance': this.$t('accord'),
-          'Non-Compliance': this.$t('nonConformity'),
-          'To be tracked': this.$t('Tracked'),
-          'NA': this.$t('notInvolved'),
-          'No rating': this.$t('toBeConfirmed')
+        statusClass: {
+          'Accepted': 'AcceptedClass',
+          'Rejected': 'RejectedClass',
+          'Transfer': 'TransferClass',
+          'Returned': 'ReturnedClass',
+          'Adopt': 'AdoptClass',
+          'Compliance': 'ComplianceClass',
+          'Non-Compliance': 'NonComplianceClass',
+          'To be tracked': 'trackedClass',
+          'NA': 'NAClass'
         },
         columns: [
-          {
-            title: this.$t('OperationNode'),
-            dataIndex: 'name',
-            align: 'left',
-            ellipsis: true,
-            width: 470
-          },
           {
             title: this.$t('Operator'),
             dataIndex: 'assignee',
             align: 'left',
-            ellipsis: true,
-            width: 270
+            width: 120,
+            ellipsis: true
           },
           {
-            title: this.$t('result'),
-            dataIndex: 'reviewResult',
+            title: this.$t('Tasknode'),
+            dataIndex: 'name',
             align: 'left',
-            ellipsis: true,
-            scopedSlots: { customRender: 'reviewResult' },
-            width: 270
+            width: 180,
+            ellipsis: true
           },
           {
-            title: this.$t('opinion'),
+            title: this.$t('feedback'),
             dataIndex: 'approvalOpinion',
             align: 'left',
+            width: 200,
             ellipsis: true,
-            width: 270
+            scopedSlots: { customRender: 'approvalOpinion' }
           },
           {
-            title: this.$t('operationTime'),
+            title: this.$t('resultofhandling'),
+            dataIndex: 'operatorResultName',
+            align: 'left',
+            width: 160,
+            ellipsis: true,
+            scopedSlots: { customRender: 'resultofhandling' }
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'approvalFile',
+            align: 'left',
+            width: 100,
+            ellipsis: true,
+            scopedSlots: { customRender: 'approvalFile' }
+          },
+          {
+            title: this.$t('OperationTime'),
             dataIndex: 'createTime',
             align: 'left',
-            ellipsis: true,
             width: 200,
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           }
         ],
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download'
@@ -103,6 +144,9 @@
             this.loading = false
           }
         })
+      },
+      viewFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
       }
     }
   }
@@ -127,6 +171,95 @@
       color: #000F16;
     }
   }
+  .AcceptedClass {
+    background: #e9f8ed;
+    color: #26BD4B;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .RejectedClass {
+    background: #fdeaea;
+    color: #E83030;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .TransferClass {
+    background: #fff6e8;
+    color: #FDA71C;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .ReturnedClass {
+    background: #fff6e8;
+    color: #FDA71C;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .AdoptClass {
+    background: #e9f8ed;
+    color: #26BD4B;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .ComplianceClass {
+    background: #e9f8ed;
+    color: #26BD4B;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .NonComplianceClass {
+    background: #fdeaea;
+    color: #E83030;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .trackedClass {
+    background: #fff6e8;
+    color: #FDA71C;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .NAClass {
+    background: #f1f1f3;
+    color: #707486;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
   //
   ///deep/.ant-table-column-title{
   //  font-weight: bold!important;
diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
index cec094536..2ef462be0 100644
--- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue
+++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
@@ -8,7 +8,7 @@
         <!--        <span class="flow-chart-title">{{ $route.params.processNumber }}  {{ $route.params.processTypeName }}  流程图</span>-->
       </div>
       <div class="flow-group" style="overflow: auto;text-align: center">
-        <img :src="processStep" class="process-img">
+        <img :src="processStep" @click="processStepClick" class="process-img">
       </div>
     </div>
     <div class="action-bar">
@@ -55,6 +55,9 @@
     methods: {
       back() {
 
+      },
+      processStepClick(){
+         window.open(this.processStep)
       },
       // 请求转换流程图
       processNum() {
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue
index b26bc4fac..bc56236c8 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue
@@ -11,15 +11,15 @@
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
       <div style="margin-bottom: 60px">
         <div class="table-page-search-wrapper">
-          <a-form layout="inline">
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
               <a-col :md="12" :sm="8">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('standard')">
                     <span>{{$t('standard')}}</span>
                   </div>
-                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                           v-model="queryParam.serialNumber"></a-input>
+                  <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                           v-model="queryParam.serialNumber"></j-input>
                 </div>
               </a-col>
               <template v-if="toggleSearchStatus">
@@ -28,8 +28,8 @@
                     <div class="title-text" :title="$t('title')">
                       <span>{{$t('title')}}</span>
                     </div>
-                    <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                             v-model="queryParam.title"></a-input>
+                    <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                             v-model="queryParam.title"></j-input>
                   </div>
                 </a-col>
                 <a-col :md="12" :sm="8">
@@ -62,27 +62,26 @@
         <div style="width: 100%">
           <a-table
             :columns="columns"
-            :components="drag(columns,'columns')"
             rowKey="id"
-            :scroll="{x: '100%'}"
+            :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
             :data-source="dataList"
             :pagination="false"
-            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' ' , type:'radio'}"
             :loading="loading">
           </a-table>
         </div>
-        <div class="page" v-if="dataList.length > 0">
-          <a-pagination
-            :show-total="total => $t('total')+` ${total} `+$t('strip')"
-            show-quick-jumper
-            show-size-changer
-            :page-size.sync="pageSize"
-            :total="total"
-            :current="pageNo"
-            @change="onChange"
-            @showSizeChange="SizeChange"
-          />
-        </div>
+        <!--        <div class="page" v-if="dataList.length > 0">
+                  <a-pagination
+                    :show-total="total => $t('total')+` ${total} `+$t('strip')"
+                    show-quick-jumper
+                    show-size-changer
+                    :page-size.sync="pageSize"
+                    :total="total"
+                    :current="pageNo"
+                    @change="onChange"
+                    @showSizeChange="SizeChange"
+                  />
+                </div>-->
       </div>
 
 
@@ -95,187 +94,190 @@
 </template>
 
 <script>
-import { getAction, postAction } from '@/api/manage'
-import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
-export default {
-  name: 'addCodeNumber',
-  mixins: [ResizeHeader, ResizeColumnProvide],
-  data() {
-    return {
-      url: {
-        addModelList: '/project/projectLawsInventoryEO/page',
-      },
-      visible: false,
-      toggleSearchStatus: false,
-      columns: [
-        {
-          title: this.$t('standard'),
-          dataIndex: 'serialNumber',
-          align: 'left',
-          ellipsis: true,
-          width: 250
+  export default {
+    name: 'addCodeNumber',
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        url: {
+          addModelList: '/project/projectLawsInventoryEO/list'
         },
-        {
-          title: this.$t('title'),
-          dataIndex: 'title',
-          align: 'left',
-          ellipsis: true,
-          width: 250
-        },
-        {
-          title: this.$t('certificationType'),
-          dataIndex: 'attestationType_dictText',
-          align: 'left',
-          ellipsis: true,
-          width: 190
-        },
-        {
-          title: this.$t('areaOfResponsibility'),
-          dataIndex: 'dutyTerritory_dictText',
-          align: 'left',
-          ellipsis: true,
-          width: 190
-        }
-      ],
-      dataList: [],
-      selectedRowKeys: [],
-      loading: false,
-      pageNo: 1,
-      pageSize: 10,
-      total: 0,
-      queryParam: {},
-      confirmLoading: false,
-    }
-  },
-  mounted() {
-
-  },
-  methods: {
-    handleToggleSearch() {
-      this.toggleSearchStatus = !this.toggleSearchStatus
-    },
-    add() {
-      this.visible = true
-      this.replacePage()
-    },
-    handleCancel() {
-      this.visible = false
-    },
-    searchQuery() {
-      this.pageNo = 1
-      this.replacePage()
-    },
-    searchReset() {
-      this.pageNo = 1
-      this.queryParam = {}
-      this.replacePage()
-    },
-    onChange(page, pageSize) {
-      this.pageNo = page
-      this.replacePage()
-    },
-    SizeChange(page, pageSize) {
-      this.pageNo = 1
-      this.pageSize = pageSize
-      this.replacePage()
-    },
-    replacePage() {
-      let query = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        ...this.queryParam,
-        projectLibraryId: this.$route.query.id,
+        visible: false,
+        toggleSearchStatus: false,
+        columns: [
+          {
+            title: this.$t('standard'),
+            dataIndex: 'serialNumber',
+            align: 'left',
+            ellipsis: true,
+            width: 250
+          },
+          {
+            title: this.$t('title'),
+            dataIndex: 'title',
+            align: 'left',
+            ellipsis: true,
+            width: 250
+          },
+          {
+            title: this.$t('certificationType'),
+            dataIndex: 'attestationType_dictText',
+            align: 'left',
+            ellipsis: true,
+            width: 190
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            dataIndex: 'dutyTerritory_dictText',
+            align: 'left',
+            ellipsis: true,
+            width: 190
+          }
+        ],
+        dataList: [],
+        selectedRowKeys: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        queryParam: {},
+        confirmLoading: false
       }
-      this.loading = true
-      getAction(this.url.addModelList, query).then((res) => {
-        if (res.success) {
-          this.dataList = res.result.records || []
-          this.total = res.result.total
-          this.loading = false
-        } else {
-          this.dataList = []
-          this.total = 0
-          this.loading = false
+    },
+    mounted() {
+
+    },
+    methods: {
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      add() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          // pageNo: this.pageNo,
+          // pageSize: this.pageSize,
+          ...this.queryParam,
+          projectLibraryId: this.$route.query.id,
+          roleCode: 0
         }
-      })
-    },
-    onSelectChange(value,row) {
-      this.selectedRowKeys = value
-      this.selectedRowList = row
-    },
-    handleSubmit() {
-      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        this.confirmLoading = true
-        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-        if (this.selectedRowKeys.length < 2){
-          let fgid = this.selectedRowList[0].id
-          let regulationIndex = this.selectedRowList[0].serialNumber
-          this.confirmLoading = false
-          this.visible = false
-          this.$emit('regulation',regulationIndex,fgid)
+        this.loading = true
+        getAction(this.url.addModelList, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result || []
+            // this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value, row) {
+        this.selectedRowKeys = value
+        this.selectedRowList = row
+      },
+      handleSubmit() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          if (this.selectedRowKeys.length < 2) {
+            let fgid = this.selectedRowList[0].standId
+            let regulationIndex = this.selectedRowList[0].serialNumber
+            this.confirmLoading = false
+            this.visible = false
+            this.$emit('regulation', regulationIndex, fgid)
+          } else {
+            this.$message.warning(this.$t('OnlyOneSelected'))
+            this.confirmLoading = false
+          }
         } else {
-          this.$message.warning(this.$t('OnlyOneSelected'))
+          this.$message.warning(this.$t('selectLeastOne'))
           this.confirmLoading = false
         }
-      } else {
-        this.$message.warning(this.$t('selectLeastOne'))
-        this.confirmLoading = false
       }
     }
   }
-}
 </script>
 
 <style lang='less' scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
-.box-title-text {
-  line-height: 1.4;
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
 
-.title-text {
-  width: 110px;
-  color: #000F16;
-  display: inline-block;
-  font-weight: 500;
-  font-size: 14px;
-  margin-right: 16px;
-  margin-top: 3px;
-  text-align: right;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
+  .title-text {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 
-.box-input {
-  display: inline-block;
-  width: 100%;
-  height: 38px;
-}
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+  }
 
-.box-button {
-  height: 38px;
-}
+  .box-button {
+    height: 38px;
+  }
 
-.page {
-  text-align: right;
-  margin-top: 20px;
-}
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
-.drawer-bootom-button {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  z-index: 100;
-  border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
-  text-align: right;
-  left: 0;
-  background: #fff;
-  border-radius: 0 0 2px 2px;
-}
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
 </style>
\ No newline at end of file
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 c4018732d..19b67451e 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -36,15 +36,16 @@
 <!--                     </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"
+                           v-if="!this.formInline.id"
                            :placeholder="$t('PleaseSelect')+$t('regulationNo')"
                            v-model="formInline.serialNumber"></a-input>
+                  <a-input class="box-input"
+                           :disabled="true"
+                           v-else
+                           v-model.trim="formInline.serialNumber"
+                           :placeholder="$t('PleaseEnter')+this.$t('regulationNo')"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -162,7 +163,7 @@
                       <span class="title-text-text"
                             :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
                     </div>
-                    <a-form-model-item class="itemModel-multi"
+                    <a-form-model-item class="itemModel"
                                        style="display: inline-block"
                                        :prop="'dataList.'+index+'.deliverableType'"
                                        :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
@@ -361,7 +362,7 @@
                     <span class="Required">*</span>
                     <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel-multi"
+                  <a-form-model-item class="itemModel"
                                      style="display: inline-block"
                                      :prop="'deliverableType'"
                   >