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

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -33,7 +33,7 @@
       </el-form-item>
       <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
-        <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
+        <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人" readonly
                   @click.native="choiceZRRS('1')">
         </el-input>
       </el-form-item>
@@ -209,7 +209,7 @@ export default {
           {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
         ],
         drafterName: [
-          {required: true, message: '请输入起草人', trigger: 'blur'},
+          {required: true, message: '请选择起草人', trigger: 'change'},
         ],
         newReason: [
           {required: true, message: '请输入新增原因', trigger: 'blur'},
@@ -257,8 +257,11 @@ export default {
       this.modalshowflag = true;
     },
     checkedRole(data) {
-      this.qbfsForm.wgLeader = data[0].id;
-      this.qbfsForm.wgLeaderName = data[0].name;
+      this.$set(this.qbfsForm, 'wgLeader', data[0].id)
+      this.$set(this.qbfsForm, 'wgLeaderName', data[0].name)
+      if(this.qbfsForm.wgLeaderName){
+        this.$refs.qbfsForm.validateField('wgLeaderName')
+      }
       this.modalshowflag = false;
     },
     choiceZRRS(type) {
@@ -279,10 +282,9 @@ export default {
       this.modalshowflag2 = true;
     },
     checkedRole2(data) {
-      var idList = "";
-      var nameList = "";
+      let idList = "", nameList = ""
       data.forEach(item => {
-        if (nameList.length > 0) {
+        if (nameList.length) {
           nameList += ",";
           idList += ",";
         }
@@ -290,11 +292,18 @@ export default {
         nameList += item.name;
       });
       if(this.roleType === '1'){
-        this.qbfsForm.drafter = idList;
-        this.qbfsForm.drafterName = nameList;
+        this.$set(this.qbfsForm, 'drafter', idList)
+        this.$set(this.qbfsForm, 'drafterName', nameList)
       }else if(this.roleType === '2'){
-        this.qbfsForm.resPerson = idList;
-        this.qbfsForm.resPersonName = nameList;
+        this.$set(this.qbfsForm, 'resPerson', idList)
+        this.$set(this.qbfsForm, 'resPersonName', nameList)
+      }
+      // === '0' false null undefined都属于false类变量 如果里面有值可以直接判断
+      if(this.qbfsForm.drafterName){
+        this.$refs.qbfsForm.validateField('drafterName');
+      }
+      if(this.qbfsForm.resPersonName){
+        this.$refs.qbfsForm.validateField('resPersonName');
       }
     },
     validateForm () {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -453,8 +453,11 @@ export default {
       this.modalshowflag = true;
     },
     checkedRole(data) {
-        this.qbfsForm.wgLeader = data[0].id;
-        this.qbfsForm.wgLeaderName = data[0].name;
+        this.$set(this.qbfsForm, 'wgLeader', data[0].id)
+        this.$set(this.qbfsForm, 'wgLeaderName', data[0].name)
+        if(this.qbfsForm.wgLeaderName){
+          this.$refs.qbfsForm.validateField('wgLeaderName')
+        }
       this.modalshowflag = false;
     },
     choiceZRRS(type) {
@@ -475,10 +478,10 @@ export default {
       this.modalshowflag2 = true;
     },
     checkedRole2(data) {
-      var idList = "";
-      var nameList = "";
+      let idList = "";
+      let nameList = "";
       data.forEach(item => {
-        if (nameList.length > 0) {
+        if (nameList.length) {
           nameList += ",";
           idList += ",";
         }
@@ -486,11 +489,17 @@ export default {
         nameList += item.name;
       });
       if(this.type === '1'){
-        this.qbfsForm.drafter = idList;
-        this.qbfsForm.drafterName = nameList;
+        this.$set(this.qbfsForm, 'drafter', idList)
+        this.$set(this.qbfsForm, 'drafterName', nameList)
       }else if(this.type === '2'){
-        this.qbfsForm.resPerson = idList;
-        this.qbfsForm.resPersonName = nameList;
+        this.$set(this.qbfsForm, 'resPerson', idList)
+        this.$set(this.qbfsForm, 'resPersonName', nameList)
+      }
+      if(this.qbfsForm.drafterName){
+        this.$refs.qbfsForm.validateField('drafterName');
+      }
+      if(this.qbfsForm.resPersonName){
+        this.$refs.qbfsForm.validateField('resPersonName');
       }
     },
     validateForm () {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -115,35 +115,17 @@
           <el-table-column
             prop="ssrq"
             width="190px"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span>
-                {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
-              </span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="190px"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>
-                {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
-              </span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
-            sortable
             width="190px"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>
-                {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
-              </span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zrbm"