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

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -131,20 +131,20 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="XCXSSRQ"
+            prop="xcxssrqgj"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="ZCCSSRQ"
+            prop="zccssrqgj"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -313,7 +313,7 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="countryArea"
+                prop="countryAreaShow"
                 label="国家/地区"
                 align="center">
               </el-table-column>
@@ -822,14 +822,14 @@ export default {
           code: "", //标准号
           standName: "", //标准名称
           issueTime: "", //发布日期
-          XCXSSRQ: "", //新车型实施日期
-          ZCCSSRQ: "", //在产车实施日期
+          xcxssrqgj: "", //新车型实施日期
+          zccssrqgj: "", //在产车实施日期
           textStatus: "", //文本状态
           id: ""
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      // countryOptions: [], //适用区域下拉框数据
+      countryOptions: [], //国家地区
       standStateOptions: [],
       standardTypeOptions: [
         {
@@ -963,7 +963,22 @@ export default {
         }, {
           _this: this
         }, res => {
-          this.sarAccessListDatas = res.data.records;
+        let arr = res.data.records;
+        //国家地区字段转换
+        arr.forEach(item => {
+          if (item.countryArea !== null || item.countryArea !== "") {
+            let k = (item.countryArea || "").split(',')
+            for (let i in this.countryOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.countryOptions[i].value === k[m]) {
+                  k[m] = this.countryOptions[i].label
+                }
+                item.countryAreaShow = k.join(',')
+              }
+            }
+          }
+        })
+          this.sarAccessListDatas = arr;
           this.total = res.data.total;
         }, e => {
         });
@@ -1292,15 +1307,14 @@ export default {
             }
             this.dataList = res.data.records;
             this.dataList.forEach(item => {
-              if (item.xcxssrqgj === null){
-                this.$set(item, "XCXSSRQ", '');
-                this.$set(item, "ZCCSSRQ", '');
-              }else{
-                this.$set(item, "XCXSSRQ", item.xcxssrqgj);
-                this.$set(item, "ZCCSSRQ", item.zccssrqgj);
-              }
+             if(item.xcxssrqgj === 'undefined'){
+               item.xcxssrqgj = ''
+             }
+             if(item.zccssrqgj === 'undefined'){
+               item.zccssrqgj = ''
+             }
             })
-            this.listForm.dataList = res.data.records;
+            this.listForm.dataList = this.dataList;
             let formId = [];
             this.dataList.map(item => {
               formId.push(item.id);
@@ -1402,7 +1416,7 @@ export default {
       _this: this
     }, res => {
       this.energyKindOptions = res.data.ENERGYTYPES //适用车型
-      this.countryOptions = res.data.COUNTRY;
+      this.countryOptions = res.data.COUNTRY;  //国家/地区
       this.standStateOptions = res.data.WBZTCLASS; // 文本状态
       this.setMap(this.standStateOptions);
     });

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -1488,7 +1488,7 @@
                     ]
                   ,
                     issueTime: [
-                        { required: false, message: '请选择标准发布日期', trigger: 'change' }
+                        { required: true, message: '请选择标准发布日期', trigger: 'change' }
                     ],
                     qcdw: [
                         { required: true, message: '请选择起草单位', trigger: 'change' }

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -1163,7 +1163,7 @@ export default {
           { required: true, message: '请选择文本状态', trigger: 'change' }
         ],
         issueTime: [
-          { required: false, message: '请选择标准发布日期', trigger: 'change' }
+          { required: true, message: '请选择标准发布日期', trigger: 'change' }
         ],
         qcdw: [
           { required: true, message: '请选择起草单位', trigger: 'change' }