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

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue

@@ -6,7 +6,7 @@
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">流程信息</div>
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
@@ -352,9 +352,9 @@ export default {
       this.$nextTick(() => {
         this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
         this.uploadFileLength = this.ch_pageData.fileTextList.length
-        this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName
+        this.ch_pageData.fillDept = this.$store.getters.userInfo.institutionName
-        this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
+        this.ch_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
-        this.rh_pageData.fillTel = this.$store.getters.userInfo.phone
+        this.ch_pageData.fillTel = this.$store.getters.userInfo.phone
         this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -225,7 +225,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="newData"
-                        width="150"
+                        width="180"
                         label="新车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -239,7 +239,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
-                        width="150"
+                        width="180"
                         label="在产车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -253,17 +253,20 @@
                 </el-table-column>
                 <el-table-column
                         prop="applyArctic"
-                        width="150"
+                        width="200"
                         label="适用车型"
                         align="center">
                     <template slot-scope="scope">
-                        <My-select :disabled="acceptShow" v-model="scope.row.applyArctic" :options="cxList"></My-select>
+                        <el-select multiple v-model.lazy="scope.row.applyArctic">
+                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
+                        </el-select>
+<!--                        <My-select :disabled="acceptShow" v-model="scope.row.applyArctic" :options="cxList"></My-select>-->
                     </template>
                 </el-table-column>
                 <el-table-column
                         prop="unitDeptName"
                         label="责任部门"
-                        width="170"
+                        width="200"
                         align="center">
                 </el-table-column>
                 <el-table-column
@@ -424,7 +427,7 @@
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
-                        <el-select v-model="plForm.applyArctic">
+                        <el-select multiple  v-model="plForm.applyArctic">
                             <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
                         </el-select>
                     </el-form-item>
@@ -567,6 +570,7 @@
                 }, e => {})
             },
             saveUserInfo () {
+                console.log(this.plForm.applyArctic);
                 for( let a = 0; a < this.itemList.length; a++) {
                     for ( let b = 0; b < this.idList.length; b++) {
                         if (this.itemList[a].id === this.idList[b]) {

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

@@ -866,7 +866,7 @@ export default {
     saveBatchEditForm() {
       this.dataList.forEach(item => {
         this.selectList.forEach(items => {
-          if (item.id === items) {
+          if (item.itemNum === items.itemNum) {
             item.complianceReasons = this.batchEditForm.complianceReasons;
             //不合规
             item.noCompliance = this.batchEditForm.noCompliance;
@@ -884,10 +884,10 @@ export default {
     },
     //标准表格选择框改变
     selectStandChange(data) {
-      this.selectList = [];
+      this.selectList = data;
-      for (let i = 0; i < data.length; i++) {
+      // for (let i = 0; i < data.length; i++) {
-        this.selectList.push(data[i].id);
+      //   this.selectList.push(data[i].id);
-      }
+      // }
     },
     selectThree() {
 

src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue

@@ -867,6 +867,7 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         if(item.form === undefined){
           this.qdform = JSON.parse(JSON.stringify(item));
@@ -911,6 +912,8 @@ export default {
           if(item.zrbm === '[]'){
             item.zrbm = ''
           }
+          this.$set(item, 'zccssrq', item.zccssrqgj)
+          this.$set(item, 'xcxssrq', item.xcxssrqgj)
         })
       });
     },