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

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

@@ -1006,6 +1006,7 @@ export default {
         this.$message.warning('请填写不涉及的备注信息')
       }else{
         this.isSubmit = true;
+        this.qdform.currentPerson = this.$store.getters.userInfo.userName;
         this.qdform.commentText = this.commentText;
         this.qdform.dataList = this.dataList
         const json = JSON.stringify(this.qdform);

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

@@ -143,28 +143,12 @@
             width="160px"
             align="center"
             label="标准是否涉及">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.involve"
-                         placeholder="请选择涉不涉及"
-                         max-length="30"
-                         clearable>
-                <el-option value="involve" label="涉及"></el-option>
-                <el-option value="noInvolve" label="不涉及"></el-option>
-              </el-select>
-            </template>
           </el-table-column>
           <el-table-column
             prop="remarks"
             align="center"
             width="180"
             label="备注">
-            <template slot-scope="scope">
-              <el-input
-                v-model.trim="dataList[scope.$index].remarks"
-                placeholder="请输入备注"
-              >
-              </el-input>
-            </template>
           </el-table-column>
 
         </el-table>
@@ -904,7 +888,6 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         if(item.form === undefined){
           this.qdform = JSON.parse(JSON.stringify(item));
@@ -913,8 +896,11 @@ export default {
           this.qdform["id"] = item.id;
           this.dataList = item.dataList
           this.dataList.forEach(item => {
-            this.$set(item, 'involve', 'involve')
-            this.$set(item, 'remarks', '')
+             if(item.involve === 'involve'){
+               item.involve = '涉及'
+             }else if(item.involve === 'noInvolve'){
+               item.involve = '不涉及'
+             }
           })
           // this.projectId = item.projectId;
           // //获取清单id 查询对应清单下的标准

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

@@ -132,32 +132,6 @@
             width="180px"
           >
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            width="180px"
-            align="center"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            width="180px"
-            align="center"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
-          </el-table-column>
         </el-table>
       </div>
       <div>