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

src/pages/details/otherStandardDetails/index.vue

@@ -461,7 +461,7 @@
                     </p>
                   </template>
                   <template
-                    v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
+                    v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZH' || child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
                   >
                     <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">

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