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

src/components/ConstructionDetails/index.vue

@@ -241,13 +241,13 @@
 
 
                     <el-form-item
-                      :prop="i.remark + ''"
+                      :prop="e.remark + ''"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="描述"
-                      v-show="((i.remark != null||!currentDicts.some(item=>item.label==='底腿')) && (enginClassification!='pressure_regulating'))"
+                      v-show="((e.remark != null||!currentDicts.some(item=>item.label==='底腿')) && (enginClassification!='pressure_regulating'))"
                       >
                       <div class="block" style="display: inline-block; margin-right: 20px;">
-                        <el-input v-model="i.remark" placeholder="请输入描述" style="width: 100%"  maxlength="100" :disabled="status == 'read-only'"></el-input>
+                        <el-input v-model="e.remark" placeholder="请输入描述" style="width: 100%"  maxlength="100" :disabled="status == 'read-only'"></el-input>
                       </div>
                     </el-form-item>
 

src/views/zdsz/engineeringGasOpening/index.vue

@@ -87,7 +87,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['zdsz:engineeringIndustry:add']"
+          v-hasPermi="['zdsz:engineeringGasOpening:add']"
         >新增
         </el-button>
       </el-col>
@@ -99,7 +99,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['zdsz:engineeringIndustry:edit']"
+          v-hasPermi="['zdsz:engineeringGasOpening:edit']"
         >修改
         </el-button>
       </el-col>
@@ -111,7 +111,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['zdsz:engineeringIndustry:remove']"
+          v-hasPermi="['zdsz:engineeringGasOpening:remove']"
         >删除
         </el-button>
       </el-col>
@@ -148,7 +148,7 @@
             type="text"
             icon="el-icon-view"
             @click="handleview(scope.row)"
-            v-hasPermi="['zdsz:engineeringIndustry:query']"
+            v-hasPermi="['zdsz:engineeringGasOpening:query']"
           >查看
           </el-button>
           <el-button
@@ -157,7 +157,7 @@
             icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-if="scope.row.state != '1'"
-            v-hasPermi="['zdsz:engineeringIndustry:update']"
+            v-hasPermi="['zdsz:engineeringGasOpening:update']"
           >审核
           </el-button>
           <el-button
@@ -165,7 +165,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['zdsz:engineeringIndustry:remove']"
+            v-hasPermi="['zdsz:engineeringGasOpening:remove']"
           >删除
           </el-button>
         </template>
@@ -355,11 +355,14 @@
             <h1>气密测试</h1>
           </el-col>
         </el-row>
-        <el-form-item label="立杠气密测试" prop="verticalBarTest">
-          <el-input v-model="form.verticalBarTest" placeholder="请填写立杠气密测试漆" maxlength="60"></el-input>
-        </el-form-item>
-        <el-form-item label="单户气密测试" prop="householdTest">
-          <el-input v-model="form.householdTest" placeholder="请填写单户气密测试子" maxlength="60"></el-input>
+        <el-form-item label="气密测试" prop="verticalBarTest">
+          <el-checkbox-group v-model="form.verticalBarTest">
+            <el-checkbox
+              v-for="dict in dict.type.vertical_bar"
+              :key="dict.value"
+              :label="dict.label"
+            ></el-checkbox>
+          </el-checkbox-group>
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="24">
@@ -388,10 +391,22 @@
           <el-input v-model="form.gasMeterCount" placeholder="请填写表字" maxlength="60"></el-input>
         </el-form-item>
         <el-form-item label="品牌" prop="gasMeterBrand">
-          <el-input v-model="form.gasMeterBrand" placeholder="请填写品牌" maxlength="60"></el-input>
+          <el-radio-group v-model="form.gasMeterBrand">
+            <el-radio
+              v-for="dict in dict.type.gas_meter_brand"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="型号" prop="gasMeterType">
-          <el-input v-model="form.gasMeterType" placeholder="请填写型号" maxlength="60"></el-input>
+          <el-radio-group v-model="form.gasMeterType">
+            <el-radio
+              v-for="dict in dict.type.gas_meter_type"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="进气方向" prop="gasMeterDirection">
           <el-radio-group v-model="form.gasMeterDirection">
@@ -623,7 +638,9 @@ import {getEnginSpecificationsList} from '@/api/zdsz/enginSpecifications'
 
 export default {
   name: "openrepair",
-  dicts: ['sys_yes_no', 'is_repair', 'industry_engin_type', 'self_closing_valve_type', 'visit_type', 'engin_classification', 'engineering_infrastructure', 'air_wall_node', 'gas_meter_direction', 'gas_change_type', 'district'],
+  dicts: ['sys_yes_no', 'is_repair', 'industry_engin_type', 'self_closing_valve_type', 'visit_type', 'engin_classification',
+    'engineering_infrastructure', 'air_wall_node', 'gas_meter_direction', 'gas_change_type', 'district','vertical_bar',
+    'gas_meter_brand','gas_meter_type'],
   data() {
     // 自定义校验
     const validatePicPass = (rule, value, callback) => {
@@ -688,6 +705,7 @@ export default {
       MaterVisible: false, // 用料信息dialog
       // 表单参数
       form: {
+        verticalBarTest:[],
         isQualified:'',
         gasCylinderPic: [], // 燃气立杠图片
         pressureTestPic: [], // 气密测试图片
@@ -758,12 +776,6 @@ export default {
         isVerticalBarClamp: [
           {required: true, message: "是否有立杠卡子不能为空", trigger: 'blur'}
         ],
-        verticalBarTest: [
-          {required: true, message: "立杠气密测试不能为空", trigger: 'blur'}
-        ],
-        householdTest: [
-          {required: true, message: "单户气密测试不能为空", trigger: "blur"}
-        ],
         gasCylinderPic: [
           {required: true, message: "请上传燃气立杠照片", trigger: "blur"}
         ],
@@ -1228,6 +1240,7 @@ export default {
         this.form[formKey] = null
       }
       this.isQualified='';
+      this.form.verticalBarTest = []
       this.form.gasCylinderPic = [] // 燃气立杠图片
       this.form.pressureTestPic = [] // 气密测试图片
       this.form.gasMeterPic = [] // 燃气表图片
@@ -1294,6 +1307,7 @@ export default {
         this.buildingHasChanged(newData.buildingId, newData.areaId)
         this.unitHasChanged(newData.unitId)
         this.form = response.data;
+        this.form.verticalBarTest = this.form.verticalBarTest != null ? this.form.verticalBarTest.split(","):[];
         this.title = "审核";
         this.currentType = 'put'
         this.open = true;
@@ -1316,6 +1330,7 @@ export default {
         this.buildingHasChanged(newData.buildingId, newData.areaId)
         this.unitHasChanged(newData.unitId)
         this.form = response.data;
+        this.form.verticalBarTest = this.form.verticalBarTest != null ? this.form.verticalBarTest.split(","):[];
         this.title = "查看开栓施工";
         this.open = true;
       });
@@ -1348,6 +1363,7 @@ export default {
             this.$message.warning('必须上传气密测试照片!')
             return
           }
+          this.form.verticalBarTest = this.form.verticalBarTest.join(",");
           if (this.form.id == null) {
             addEngineeEngineeGasOpening(this.form).then(res => {
               this.$modal.msgSuccess("新增成功");