From 5df597dd550ca65ee97820f24ba62aaa7a951a70 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 2 Mar 2022 17:20:27 +0800
Subject: [PATCH 1/4] commit

---
 .../processCenter/pages/creatProcess/bzzqyj/step1-9.vue     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index e4d758d0c..f5791462e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode"></template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -381,9 +381,7 @@ export default {
           this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
           data.info.forEach(item => {
-            if (item.state != '3') {
-              arr.push(item)
-            }
+            arr.push(item)
           })
           this.json = data
           this.form.textType = data.textType || data.form.textType

From 46e7265ae813f5e6e73ac0dd661429004b83021a Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 3 Mar 2022 09:19:50 +0800
Subject: [PATCH 2/4] commit

---
 .../processCenter/pages/creatProcess/bzzqyj/step1-9.vue      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index f5791462e..1f8aea227 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -329,12 +329,11 @@ export default {
             reason: "修改理由",
             department: "提出部门",
             responUserName: "提出人",
+            stateText: "处理意见",
+            cause: "原因",
           },
           dataList: []
         };
-        if (title === '上报意见.xls') {
-          params.columnName.stateText = "处理意见"
-        }
         params.dataList = JSON.parse(JSON.stringify(row));
         params.dataList.forEach(item => {
           if (item.state === "1") {

From 6244736bbd95875f3040fc6b1a75aa4eb03b90e2 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, 3 Mar 2022 09:21:21 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index 24c4bc1c9..f6a422859 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -471,7 +471,7 @@ export default {
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.isSubmit = true;
-                  this.listForm.commentText = this.commentText;
+                  qbzxdFrom.commentText = this.commentText;
                   let json = Object.assign(qbzxdFrom, this.roleForm);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,

From f0284555550c6b2afa181f70834c8b14e895d371 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, 3 Mar 2022 09:46:36 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonConfomity/pages/rectificationDatabase.vue            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 10773727f..aead3de33 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -781,9 +781,9 @@ export default {
         standSerialNumber: [
           { required: true, message: "请输入标准号", trigger: "change" }
         ],
-        standName: [
-          { required: true, message: "请输入标准名称", trigger: "change" }
-        ],
+        // standName: [
+        //   { required: true, message: "请输入标准名称", trigger: "change" }
+        // ],
         itemsNum: [
           { required: true, message: "请输入条款号", trigger: "change" }
         ],