From 759cb52e5702fd7573979bce96deb3fca3d9ab6b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 23 Jun 2022 16:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../documentManage/subscribtion/index.vue     | 62 ++++++++++---------
 .../documentManage/tags/dialog/DicList.vue    |  2 +-
 .../virtualList/components/batSetting.vue     | 28 ++++++---
 .../virtualList/components/editModel.vue      | 14 ++---
 .../components/engineeringConfirmation.vue    |  5 +-
 .../reviewedByThePersonInCharge.vue           |  7 +++
 .../projectManagement/components/TaskList.vue |  4 +-
 .../components/TaskListModel.vue              | 10 +--
 .../components/batSetting.vue                 | 28 ++++++---
 .../components/listEditModel.vue              | 15 +++--
 .../components/listOfRegulations.vue          |  5 +-
 13 files changed, 105 insertions(+), 77 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 34507c021..98bb069e4 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -939,5 +939,6 @@ module.exports = {
   question: 'Question',
   ConfirmQuestion: 'Confirm Question',
   disableInput: 'Disable input',
+  taskConfirmationDeadline:'Task Confirmation Deadline',
   OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out'
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index b7d2738aa..0fda8e702 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -945,4 +945,5 @@ module.exports = {
   ConfirmQuestion: '确认催办？',
   OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办',
   disableInput:'禁止输入',
+  taskConfirmationDeadline:'任务确认截止时间',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue
index 6e3da1e9d..e0df9d449 100644
--- a/jero-web/src/views/documentManage/subscribtion/index.vue
+++ b/jero-web/src/views/documentManage/subscribtion/index.vue
@@ -5,44 +5,46 @@
         <div class="subscribtion-search-header">
           <!--          <search :url="url" :flag="'1'"></search>-->
           <div class="table-page-search-wrapper">
-            <a-row :gutter="24">
-              <a-col :md="6" :sm="8">
-                <div class="box-title-text">
-                  <div class="title-text" :title="$t('standard')">
-                    <span>{{$t('standard')}}</span>
+            <a-form layout="inline" @keyup.enter.native="searchQuery">
+              <a-row :gutter="24">
+                <a-col :md="6" :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="queryParams.serialNumber"></a-input>
                   </div>
-                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                           v-model="queryParams.serialNumber"></a-input>
-                </div>
-              </a-col>
-              <a-col :md="6" :sm="8">
-                <div class="box-title-text">
-                  <div class="title-text" :title="$t('title')">
-                    <span>{{$t('title')}}</span>
+                </a-col>
+                <a-col :md="6" :sm="8">
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('title')">
+                      <span>{{$t('title')}}</span>
+                    </div>
+                    <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                             v-model="queryParams.title"></a-input>
                   </div>
-                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                           v-model="queryParams.title"></a-input>
-                </div>
-              </a-col>
-              <a-col :md="6" :sm="8">
-                <div class="box-title-text">
-                  <div class="title-text" :title="$t('status')">
-                    <span>{{$t('status')}}</span>
+                </a-col>
+                <a-col :md="6" :sm="8">
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('status')">
+                      <span>{{$t('status')}}</span>
+                    </div>
+                    <j-dict-select-tag class="box-input" v-model="queryParams.state"
+                                       :placeholder="$t('PleaseSelect')+$t('status')"
+                                       :type="'select'"
+                                       :triggerChange="false" :dictCode="'state'"/>
                   </div>
-                  <j-dict-select-tag class="box-input" v-model="queryParams.state"
-                                     :placeholder="$t('PleaseSelect')+$t('status')"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="'state'"/>
-                </div>
-              </a-col>
-              <span style="float: right;overflow: hidden;margin-right: 11px"
-                    class="table-page-search-submitButtons">
+                </a-col>
+                <span style="float: right;overflow: hidden;margin-right: 11px"
+                      class="table-page-search-submitButtons">
                <a-col :md="6" :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-col>
                  </span>
-            </a-row>
+              </a-row>
+            </a-form>
           </div>
         </div>
       </div>
diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
index f06a6d344..4c4114637 100644
--- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
@@ -2,7 +2,7 @@
   <div class="dic-list">
     <div class="dic-list-content">
       <div class="dic-list-header">
-        <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-form :model="queryParams" :label-col="labelCol" @keyup.enter.native="search" :wrapper-col="wrapperCol">
           <a-form-item :label="$t('name')+':'">
             <a-input v-if="dictVal=='tree'" v-model="queryParams.name" :placeholder="$t('enterName')"/>
             <j-input v-if="dictVal=='list'" v-model="queryParams.itemText" :placeholder="$t('enterName')"/>
diff --git a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
index 9b653fe05..58c5fe4fb 100644
--- a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
@@ -31,11 +31,15 @@
               <span class="title-text-text" :title="$t('certificationType')">{{$t('certificationType')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"
-                                 @input="handleInput('attestationType')"
-                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"
-                                 :type="'select'"
-                                 :triggerChange="false" dictCode="attestation_type"/>
+              <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
+                                  :placeholder="$t('PleaseSelect')+$t('certificationType')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'attestation_type'"/>
+<!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
+<!--                                 @input="handleInput('attestationType')"-->
+<!--                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
+<!--                                 :type="'select'"-->
+<!--                                 :triggerChange="false" dictCode="attestation_type"/>-->
             </a-form-model-item>
           </div>
         </a-col>
@@ -47,11 +51,15 @@
               <span class="title-text-text" :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"
-                                 @input="handleInput('attestationRank')"
-                                 :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
-                                 :type="'select'"
-                                 :triggerChange="false" dictCode="attestation_rank"/>
+              <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
+                                  :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'attestation_rank'"/>
+<!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
+<!--                                 @input="handleInput('attestationRank')"-->
+<!--                                 :placeholder="$t('PleaseSelect')+$t('certificationLevel')"-->
+<!--                                 :type="'select'"-->
+<!--                                 :triggerChange="false" dictCode="attestation_rank"/>-->
             </a-form-model-item>
           </div>
         </a-col>
diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index c01ff108f..2a34e491d 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -195,7 +195,7 @@
                 <span class="title-text-text"
                       :title="$t('certificationType')">{{$t('certificationType')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="certificationType">
+              <a-form-model-item class="itemModel-multi" prop="certificationType">
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
                                     :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                     :type="'select'"
@@ -212,13 +212,11 @@
                 <span class="title-text-text"
                       :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="attestationRank">
-                <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"
-                                   :disabled="disabled"
-                                   @input="handleInput('attestationRank')"
-                                   :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'attestation_rank'"/>
+              <a-form-model-item class="itemModel-multi" prop="attestationRank">
+                <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
+                                    :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'attestation_rank'"/>
               </a-form-model-item>
             </div>
           </a-col>
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 7d0dcd78e..b616e146d 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -139,11 +139,12 @@
             <a-col :span="24" v-if="title == $t('addFeedback') || title == $t('edit')">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
                         :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="fileId">
+                <!--                prop="fileId"-->
+                <a-form-model-item class="itemModel">
                   <a-button type="primary" class="button-text"
                             @click="clickButtonToUpload('fileId')">
                     {{ (formInline.fileId === 'null' || formInline.fileId === '' ||
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index 67239e72e..3f55e94af 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -44,6 +44,7 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
+              <span class="Required" v-if="$route.query.isDisplay">*</span>
               <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="approvalOpinion">
@@ -148,6 +149,7 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
+              <span class="Required" v-if="$route.query.isDisplay">*</span>
               <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="approvalOpinion">
@@ -197,6 +199,11 @@
             }
           ],
           approvalOpinion: [
+            {
+              required: true,
+              message: this.$t('feedbackMessage') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 300,
               message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index a8ec04aa5..c8b61dec7 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -197,7 +197,7 @@
             scopedSlots: { customRender: 'CertificationProgress' }
           },
           {
-            title: this.$t('CurrentProjectStatusEvaluation'),
+            title: this.$t('CurrentStatus'),
             align: 'center',
             width: 150,
             dataIndex: 'CurrentProjectStatusEvaluation',
@@ -406,7 +406,7 @@
       },
       CurrentProjectClick(val) {
         let item = JSON.parse(JSON.stringify(val))
-        this.$refs.TaskListModelRef.getData(item, this.$t('CurrentProjectStatusEvaluation'))
+        this.$refs.TaskListModelRef.getData(item, this.$t('CurrentStatus'))
       },
       TaskListModelList() {
         this.getList()
diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue
index 37c718a23..75489baf1 100644
--- a/jero-web/src/views/projectManagement/components/TaskListModel.vue
+++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue
@@ -10,7 +10,7 @@
   >
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
       <a-row :gutter="24">
-        <div class="headerText" v-if="title == $t('CurrentProjectStatusEvaluation')">
+        <div class="headerText" v-if="title == $t('CurrentStatus')">
           {{this.$t('redSchedule')}}<br/>
           {{this.$t('yellowSchedule')}}<br/>
           {{this.$t('greenRequirements')}}<br/>
@@ -47,7 +47,7 @@
           </div>
         </a-col>
 
-        <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation') && this.formInline.roleCode != '0'">
+        <a-col :span="24" v-if="title == $t('CurrentStatus') && this.formInline.roleCode != '0'">
           <div class="box-title-text">
             <div class="title-text">
                       <span class="title-text-text"
@@ -84,7 +84,7 @@
           </div>
         </a-col>
 
-        <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation') && this.formInline.roleCode != '0'">
+        <a-col :span="24" v-if="title == $t('CurrentStatus') && this.formInline.roleCode != '0'">
           <div class="box-title-text">
             <div class="title-text">
                       <span class="title-text-text"
@@ -99,7 +99,7 @@
           </div>
         </a-col>
         <div v-for="item in studioList"
-             v-if="title == $t('CurrentProjectStatusEvaluation') && formInline.roleCode == '0'">
+             v-if="title == $t('CurrentStatus') && formInline.roleCode == '0'">
           <div class="headerText"
                v-if="item.roleCode == 1"
                style="margin-top: 10px">
@@ -196,7 +196,7 @@
       getData(val, title) {
         this.visible = true
         this.title = title
-        if (title == this.$t('CurrentProjectStatusEvaluation')) {
+        if (title == this.$t('CurrentStatus')) {
           val.remark = val.projectStatusAssessRemark || ''
           val.conditionAssessment = val.projectStatusAssess || ''
           if (val.roleCode == '2' || val.roleCode == '4' || val.roleCode == '1') {
diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue
index e5f12d3c9..bea09d067 100644
--- a/jero-web/src/views/projectManagement/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/components/batSetting.vue
@@ -31,11 +31,15 @@
               <span class="title-text-text" :title="$t('certificationType')">{{$t('certificationType')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"
-                                 @input="handleInput('attestationType')"
-                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"
-                                 :type="'select'"
-                                 :triggerChange="false" dictCode="attestation_type"/>
+              <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
+                                  :placeholder="$t('PleaseSelect')+$t('certificationType')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'attestation_type'"/>
+<!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
+<!--                                 @input="handleInput('attestationType')"-->
+<!--                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
+<!--                                 :type="'select'"-->
+<!--                                 :triggerChange="false" dictCode="attestation_type"/>-->
             </a-form-model-item>
           </div>
         </a-col>
@@ -61,11 +65,15 @@
               <span class="title-text-text" :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"
-                                 @input="handleInput('attestationRank')"
-                                 :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
-                                 :type="'select'"
-                                 :triggerChange="false" dictCode="attestation_rank"/>
+              <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
+                                  :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'attestation_rank'"/>
+<!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
+              <!--                                 @input="handleInput('attestationRank')"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('certificationLevel')"-->
+              <!--                                 :type="'select'"-->
+              <!--                                 :triggerChange="false" dictCode="attestation_rank"/>-->
             </a-form-model-item>
           </div>
         </a-col>
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 1026690d9..95a4009af 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -142,7 +142,7 @@
                 <span class="title-text-text"
                       :title="$t('certificationType')">{{$t('certificationType')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="attestationType">
+              <a-form-model-item class="itemModel-multi" prop="attestationType">
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
                                     :disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true"
                                     :placeholder="$t('PleaseSelect')+$t('certificationType')"
@@ -158,13 +158,12 @@
                 <span class="title-text-text"
                       :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="attestationRank">
-                <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"
-                                   :disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true"
-                                   @input="handleInput('attestationRank')"
-                                   :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'attestation_rank'"/>
+              <a-form-model-item class="itemModel-multi" prop="attestationRank">
+                <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
+                                    :disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true"
+                                    :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'attestation_rank'"/>
               </a-form-model-item>
             </div>
           </a-col>
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 96406028c..46cd0c792 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -220,7 +220,7 @@
     <transferList :url="url" @transferListForm="addModelList" ref="transferListRef"/>
     <fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/>
     <a-modal
-      :title="$t('ListConfirmationDeadline')"
+      :title="listTitle"
       :width="500"
       :visible="visible"
       :confirm-loading="confirmLoading"
@@ -391,6 +391,7 @@
     data() {
       return {
         roleSwitchingList: [],
+        listTitle: '',
         columnsAll: [
           {
             title: this.$t('standard'),
@@ -1269,6 +1270,7 @@
         this.getList()
       },
       initiateListConfirmationcClick(name) {
+        this.listTitle = this.$t('ListConfirmationDeadline')
         this.timeName = name
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -1298,6 +1300,7 @@
 
       initiateTaskConfirmationClick(name) {
         this.timeName = name
+        this.listTitle = this.$t('taskConfirmationDeadline')
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           let isTrue = true