Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

src/views/zdsz/enginMaterialQuality/index.vue

@@ -182,7 +182,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="所属工程" prop="enginType">
-          <el-select v-model="form.enginType" placeholder="请选择所属工程" filterable clearable
+          <el-select v-model="form.enginType" placeholder="请选择所属工程" filterable clearable multiple
                      style="width: 100%" @change="form.enginSort = '';form.enginNode = ''">
             <el-option
               v-for="dict in dict.type.engin_type"
@@ -192,7 +192,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="工程类别" prop="enginType" v-if="form.enginType === '民用工程'">
+        <el-form-item label="工程类别" prop="enginType" v-if="form.enginType.includes('民用工程')">
           <el-select v-model="form.enginSort" placeholder="请选择工程类别" filterable clearable
                      style="width: 100%" @change="form.enginNode = ''">
             <el-option
@@ -203,7 +203,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="工程环节" prop="enginType" v-if="form.enginType === '民用工程'">
+        <el-form-item label="工程环节" prop="enginType" v-if="form.enginType.includes('民用工程')">
           <el-select v-model="form.enginNode" placeholder="请选择工程环节" filterable clearable
                      style="width: 100%">
             <el-option
@@ -214,7 +214,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="工程步骤" prop="enginStep" v-if="form.enginType === '民用工程'">
+        <el-form-item label="工程步骤" prop="enginStep" v-if="form.enginType.includes('民用工程')">
           <el-select v-model="form.enginStep" placeholder="请选择工程步骤" filterable clearable
                      style="width: 100%">
             <el-option
@@ -292,7 +292,9 @@ export default {
         name: undefined,
       },
       // 表单参数
-      form: {},
+      form: {
+        enginType:[]
+      },
       // 表单校验
       rules: {
         id: [
@@ -329,7 +331,7 @@ export default {
     reset() {
       this.form = {
         id: undefined,
-        enginType: undefined,
+        enginType: [],
         name: undefined,
         delFlag: undefined,
         createBy: undefined,
@@ -379,7 +381,7 @@ export default {
       getEnginMaterialQuality(id).then(response => {
         this.loading = false;
         this.form = response.data;
-        // this.form.enginType = this.form.enginType.split(",")
+        this.form.enginType = this.form.enginType.split(",")
         this.open = true;
         this.title = "修改工程材质";
       });
@@ -389,9 +391,8 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
-          // let eng = this.form.enginType
           if (this.form.id != null) {
-            // this.form.enginType = this.form.enginType.join()
+            this.form.enginType = this.form.enginType.join(",")
             updateEnginMaterialQuality(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -402,7 +403,7 @@ export default {
               // this.form.enginType = eng
             });
           } else {
-            // this.form.enginType = this.form.enginType.join()
+            this.form.enginType = this.form.enginType.join(",")
             addEnginMaterialQuality(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/zdsz/engineeringIndustry/index.vue

@@ -193,7 +193,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="工程分类" prop="enginClassification" v-if="form.type === '1'">
-          <el-select v-model="form.enginClassification" placeholder="请选择工程分类" style="width: 100%">
+          <el-select v-model="form.enginClassification" placeholder="请选择工程分类" multiple style="width: 100%">
             <el-option
               v-for="e in dict.type.engin_classification"
               :key="e.value"
@@ -408,7 +408,7 @@ export default {
         supervisionUnit: '', // 监理单位
         supervisionHead: '', // 监理负责人
         supervisionPhone: '', // 监理联系电话
-        enginClassification: '', // 工程分类
+        enginClassification: [], // 工程分类
         zEngineeringNodeBo: { // 工程节点
           type: '', // 节点类型
           zEngineeringInfoBo: { // 施工信息
@@ -445,44 +445,18 @@ export default {
       specificationsList: [], // 用料规格List
       // 表单校验
       rules: {
-        sceneHead: [
-          {required: true, message: "现场负责人不能为空", trigger: 'blur'}
-        ],
         enginName: [
           {required: true, message: "工程名称不能为空", trigger: 'blur'}
         ],
         enginClassification: [
           {required: true, message: "工程分类不能为空", trigger: 'blur'}
         ],
-        supervisionUnit: [
-          {required: true, message: "监理单位不能为空", trigger: 'blur'}
-        ],
         enginType: [
           {required: true, message: "工程类型不能为空", trigger: 'blur'}
         ],
-        supervisionPhone: [
-          {required: true, message: "监理联系电话不能为空", trigger: 'blur'},
-          {validator: validPhoneMobile, trigger: 'blur'}
-        ],
         constructUnit: [
           {required: true, message: "建筑单位不能为空", trigger: 'blur'}
         ],
-        projectHead: [
-          {required: true, message: "项目负责人不能为空", trigger: 'blur'}
-        ],
-        designHead: [
-          {required: true, message: "设计负责人不能为空", trigger: 'blur'}
-        ],
-        designUnit: [
-          {required: true, message: "设计单位不能为空", trigger: 'blur'}
-        ],
-        designPhone: [
-          {required: true, message: "联系方式不能为空", trigger: 'blur'},
-          {validator: validPhoneMobile, trigger: 'blur'}
-        ],
-        supervisionHead: [
-          {required: true, message: "监理负责人不能为空", trigger: 'blur'}
-        ],
         type: [
           {required: false, message: "类型不能为空", trigger: "blur"}
         ],
@@ -621,6 +595,9 @@ export default {
         if (this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['number'] == '' || this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['number'] == null) {
           valid = false;
         }
+        if (this.form.enginClassification != [] && this.form.enginClassification.length>0) {
+          this.form.enginClassification = this.form.enginClassification.join(',');
+        }
         if (valid) {
           this.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
           this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
@@ -831,7 +808,7 @@ export default {
             this.zEngineeringNodeBo.zEngineeringInfoBo = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]
           }
         }
-
+        this.form.enginClassification = this.form.enginClassification.split(",");
 
         this.title = (this.form.type === '1' ? "修改工业工程" : "修改市政工程");
         this.currentType = 'put'
@@ -846,7 +823,9 @@ export default {
         this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
         this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
       }
-
+      if (this.form.enginClassification != [] && this.form.enginClassification.length>0) {
+        this.form.enginClassification = this.form.enginClassification.join(',');
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.form.files = this.$refs.obsFileUpload.fileList;