From 026bbc35d02960a801c7c252b040385c1716bb7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 13 Jan 2022 16:33:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=94=B6=E7=BC=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/mechanismManage/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 7b1054ea3..bd5756b9d 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -30,7 +30,6 @@
           node-key="id"
           :filter-node-method="filterNode"
           highlight-current
-          default-expand-all
           ref="tree"
           :expand-on-click-node="false"
           @node-click="handleNodeClick">

From 61b4125129c2fd2d65154fb9276fad8d88148cdc Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 13 Jan 2022 18:02:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index d143eafea..858741158 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -89,8 +89,8 @@
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
                           <!--                          多个文件时-->
-                          <span v-else-if="child.value && child.value.length > 0">
-                            <div style="margin-left: 19%;margin-top: -60px;line-height: 90px">
+                          <div v-else-if="child.value && child.value.length > 0">
+                            <span style="margin-left: 19%">
                               <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                  :title="file.oldFileName">{{ file.oldFileName }}</a>
@@ -106,9 +106,9 @@
                                 class="icon-download2"
                                 v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
                               />
-                            </div>
+                            </span>
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                          </span>
+                          </div>
                           <el-button
                               v-if="child.attrField === itemNam "
                               v-for="(itemNam,index) in itemExistList"

From 2a24db3bd74c53118a6760df6bdcafd67d9dc557 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 13 Jan 2022 22:01:51 +0800
Subject: [PATCH 3/3] feat: There is no way the,

---
 .../pages/creatProcess/qbrk-product/step13.vue              | 4 ++--
 .../processCenter/pages/creatProcess/qbrk-product/step2.vue | 6 +++---
 .../processCenter/pages/creatProcess/qbrk-product/step3.vue | 6 +++---
 .../processCenter/pages/creatProcess/qbrk-product/step5.vue | 4 ++--
 .../processCenter/pages/creatProcess/qbrk-product/step6.vue | 6 +++---
 .../pages/creatProcess/qbrk-product/stepC3.vue              | 6 +++---
 .../pages/creatProcess/qbrk-product/stepC6.vue              | 6 +++---
 src/pages/processCenter/pages/creatProcess/qbrk/step12.vue  | 4 ++--
 src/pages/processCenter/pages/creatProcess/qbrk/step13.vue  | 4 ++--
 src/pages/processCenter/pages/creatProcess/qbrk/step2.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/qbrk/step3.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/qbrk/step5.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/qbrk/step6.vue   | 4 ++--
 13 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index 51c863827..f927a1b9b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -44,7 +44,7 @@
                 />
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -948,7 +948,7 @@
                     ],
                 },
                 rules:{
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
index c40eb8105..34a58da75 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
@@ -30,7 +30,7 @@
                         :verifySarStandard = "verifySarStandard"></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -906,7 +906,7 @@
                     ],
                 },
                 rules:{
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -2225,7 +2225,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index abed1f0c3..3f73295c7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -86,7 +86,7 @@
                 </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -969,7 +969,7 @@
                     ],
                 },
                 rules:{
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -2375,7 +2375,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
index 9eb9167e8..c3ef7efe7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
@@ -31,7 +31,7 @@
                         :verifySarStandard = "verifySarStandard"></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -1025,7 +1025,7 @@
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
                     reasonNot:[],
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index 3ebbf042d..a56b68c36 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -164,7 +164,7 @@
                 </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -1040,7 +1040,7 @@
                     ],
                 },
                 rules:{
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -2465,7 +2465,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index f32974cd6..a907d9153 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -86,7 +86,7 @@
                 </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -970,7 +970,7 @@
                     ],
                 },
                 rules:{
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -2376,7 +2376,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index 2100bc043..213753891 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -164,7 +164,7 @@
                 </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -1040,7 +1040,7 @@
                     ],
                 },
                 rules:{
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -2464,7 +2464,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 207baf1d3..66b9f495c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -44,7 +44,7 @@
                 />
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -941,7 +941,7 @@
                     ],
                 },
                 rules:{
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index deb70bd49..e7398314c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -45,7 +45,7 @@
                 />
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -942,7 +942,7 @@
                     ],
                 },
                 rules:{
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index 8441255c9..bb90a86e3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -29,7 +29,7 @@
                         :verifySarStandard = "verifySarStandard"></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -917,7 +917,7 @@
                     ],
                 },
                 rules:{
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 7b5ce1fd6..c4f8580c0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -89,7 +89,7 @@
                 </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -983,7 +983,7 @@
                     ],
                 },
                 rules:{
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index 233234fa1..d92a54af7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -115,7 +115,7 @@
                 </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -1195,7 +1195,7 @@
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
                     reasonNot:[],
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 5ad47e123..48a2c285c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -115,7 +115,7 @@
                 </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="审批意见" name = "1">
+                        <el-collapse-item title="回执说明" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -1229,7 +1229,7 @@
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
                     reasonNot:[],
-                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },