Merge remote-tracking branch 'origin/develop' into develop

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>
@@ -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") {
@@ -381,9 +380,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

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,

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" }
         ],