From b0574de10e10ec3f6ff5c513a9553cd7a9707cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 24 Mar 2023 11:36:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=BB=B4=E6=8A=A4=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/TaskListModel.vue   | 10 +++++++++-
 .../components/certificationList/index.vue           |  9 +++++----
 .../src/views/virtualAuthenticationList/index.vue    |  2 +-
 .../certificationListMaintenance.vue                 | 12 ++++++------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue
index 31e1cc703..06ca28a16 100644
--- a/jero-web/src/views/projectManagement/components/TaskListModel.vue
+++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue
@@ -176,7 +176,15 @@
     data() {
       return {
         formInline: {},
-        rules: {},
+        rules: {
+          certificationProgressRemark:[
+            {
+              max: 500,
+              message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+        },
         title: this.$t('CertificationProgress'),
         visible: false,
         confirmLoading: false,
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 7f30ea37e..96bec6188 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -70,7 +70,8 @@
 
         <!--        导出-->
         <div @click="handleExport" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 11 ||
-         roleSwitchingCode == 12 || roleSwitchingCode == 13 || roleSwitchingCode == 14"
+         roleSwitchingCode == 12 || roleSwitchingCode == 13 || roleSwitchingCode == 14 ||
+         roleSwitchingCode == 20 || roleSwitchingCode == 21"
              class="operator-text">
           <a-icon type="export" :rotate="-90"/>
           {{ $t('export') }}
@@ -129,7 +130,7 @@
 
               <!--              模板下载-->
               <div @click="handleModule"
-                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"
+                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
                    class="operator-text-title">
                 <a-icon type="download"/>
                 {{ $t('templateDownload') }}
@@ -144,7 +145,7 @@
               </div>
 
               <!--              导入-->
-              <div class="operator-text-title" v-if="roleSwitchingCode != 1">
+              <div class="operator-text-title" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2">
                 <ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'"
                             @getList="getPersonnelList"/>
               </div>
@@ -167,7 +168,7 @@
             </div>
           </template>
           <div class="operator-text" style="position: relative"
-               v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21">
+               v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2">
             <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
           </div>
         </a-popconfirm>
diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue
index 10c635433..4765a055d 100644
--- a/jero-web/src/views/virtualAuthenticationList/index.vue
+++ b/jero-web/src/views/virtualAuthenticationList/index.vue
@@ -409,7 +409,7 @@
             name: item.name,
             useExplain: item.useExplain,
             id: item.id,
-            title: '虚拟认证清单详情'
+            title: '市场认证清单详情'
           }
         })
         window.open(newUrl.href, '_blank')
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 3da9a0222..95301d8a7 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -292,7 +292,7 @@
             title: this.$t('category'),
             align: 'left',
             dataIndex: 'category',
-            width: 150,
+            width: 200,
             fixed: 'left',
             ellipsis: true
           },
@@ -300,7 +300,7 @@
             title: this.$t('inspectionItems'),
             align: 'left',
             dataIndex: 'inspectionItem',
-            width: 150,
+            width: 200,
             ellipsis: true,
             fixed: 'left',
             scopedSlots: { customRender: 'inspectionItems' }
@@ -323,7 +323,7 @@
             title: this.$t('standard'),
             align: 'left',
             dataIndex: 'serialNumber',
-            width: 150,
+            width: 210,
             ellipsis: true
           },
           {
@@ -353,7 +353,7 @@
       }
     },
     created() {
-      if (this.$route.query.title == '虚拟认证清单详情') {
+      if (this.$route.query.title == '市场认证清单详情') {
         document.title = this.$t('virtualAuthenticationListDetails')
         this.columns.splice(7, 1)
       } else {
@@ -362,8 +362,8 @@
     },
     mounted() {
       this.title = this.$route.query.title
-      this.isTrue = this.$route.query.title == '虚拟认证清单详情' ? false : true
-      this.isFalse = this.$route.query.title == '虚拟认证清单详情' ? true : false
+      this.isTrue = this.$route.query.title == '市场认证清单详情' ? false : true
+      this.isFalse = this.$route.query.title == '市场认证清单详情' ? true : false
       this.getList()
     },
     computed: {},