提交

src/views/gas/regulatorBox/index.vue

@@ -117,16 +117,24 @@
           </el-image>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="110" fixed="right" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="180" fixed="right" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['gas:regulatorBox:edit']"
+            @click="handleUpdate(scope.row,true)"
+            v-hasPermi="['gas:regulatorBox:query']"
           >查看
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row,false)"
+            v-hasPermi="['gas:regulatorBox:edit']"
+          >修改
+          </el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
           <!--            type="text"-->
@@ -437,7 +445,7 @@
             <el-form-item label="放散压力" prop="releasePressure" v-show="form.cutterTested == '1'">
               <el-input type="text" @input="(v)=>(form.releasePressure=v.replace(/[^\d.]/g,''))"
                         v-model="form.releasePressure" placeholder="请输入放散压力">
-                <template slot="append">MPa</template>
+                <template slot="append">KPa</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -488,18 +496,18 @@
 <!--              </el-switch>-->
 <!--            </el-form-item>-->
 <!--          </el-col>-->
-          <el-col :span="8">
-            <el-form-item label="阀井情况" prop="valveWellCondition">
-              <el-select v-model="form.valveWellCondition" placeholder="请选择阀井情况" style="width: 100%">
-                <el-option
-                  v-for="dict in dict.type.valve_well_condition"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="阀井情况" prop="valveWellCondition">-->
+<!--              <el-select v-model="form.valveWellCondition" placeholder="请选择阀井情况" style="width: 100%">-->
+<!--                <el-option-->
+<!--                  v-for="dict in dict.type.valve_well_condition"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.label"-->
+<!--                  :value="dict.value"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="24">
             <el-form-item label="照片" prop="photoList">
               <imageUpload v-model="form.photoList" :disabled="disabled"/>
@@ -587,9 +595,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        areaId: [
-          {required: true, message: "所属小区不能为空", trigger: "blur"}
-        ],
+        // areaId: [
+        //   {required: true, message: "所属小区不能为空", trigger: "blur"}
+        // ],
         // buildingId: [
         //   {required: true, message: "所属楼宇不能为空", trigger: "blur"}
         // ],
@@ -620,9 +628,6 @@ export default {
         pressureGage: [
           {required: true, message: "压力表不能为空", trigger: "change"}
         ],
-        mainRoad: [
-          {required: true, message: "当前主路不能为空", trigger: "change"}
-        ],
         valve: [
           {required: true, message: "阀门不能为空", trigger: "change"}
         ],
@@ -647,6 +652,9 @@ export default {
         closingPressureAccessory: [
           {required: true, message: "关闭压力(副路)不能为空", trigger: "blur"}
         ],
+        isNotXtv: [
+          {required: true, message: "是否开启伴热带不能为空", trigger: "change"}
+        ],
         xtv: [
           {required: true, message: "伴热带不能为空", trigger: "change"}
         ],
@@ -659,39 +667,24 @@ export default {
         cutterTested: [
           {required: true, message: "切断器测试不能为空", trigger: "blur"}
         ],
-        disconnectorTestStatus: [
-          {required: true, message: "切断器(放散阀)测试情况不能为空", trigger: "change"}
-        ],
-        cutOffPressureMain: [
-          {required: true, message: "切断压力(主路)不能为空", trigger: "blur"}
-        ],
-        cutOffPressureAccessory: [
-          {required: true, message: "切断压力(副路)不能为空", trigger: "blur"}
-        ],
-        releasePressure: [
-          {required: true, message: "放散压力不能为空", trigger: "blur"}
-        ],
         manOfAccessoryAlternating: [
           {required: true, message: "主副路交替不能为空", trigger: "blur"}
         ],
         filter: [
           {required: true, message: "过滤器不能为空", trigger: "change"}
         ],
-        specialCaseOfPressureRegulatingFacilities: [
-          {required: true, message: "调压设施特例不能为空", trigger: "change"}
-        ],
-        overdueInspectionDays: [
-          {required: true, message: "超期巡检天数不能为空", trigger: "change"}
-        ],
-        reasonForOverdueInspection: [
-          {required: true, message: "超期巡检原因不能为空", trigger: "change"}
-        ],
+        // specialCaseOfPressureRegulatingFacilities: [
+        //   {required: true, message: "调压设施特例不能为空", trigger: "change"}
+        // ],
+        // overdueInspectionDays: [
+        //   {required: true, message: "超期巡检天数不能为空", trigger: "change"}
+        // ],
         // valveWellTesting: [
         //   {required: true, message: "阀井测试不能为空", trigger: "blur"}
         // ],
-        valveWellCondition: [
-          {required: true, message: "阀井情况不能为空", trigger: "change"}
-        ]
+        // valveWellCondition: [
+        //   {required: true, message: "阀井情况不能为空", trigger: "change"}
+        // ]
       }
     };
   },
@@ -815,9 +808,9 @@ export default {
       this.title = "添加调压箱管理";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(row,disabled) {
       this.loading = true;
-      this.disabled = true;
+      this.disabled = disabled;
       this.reset();
       const id = row.id || this.ids
       getRegulatorBox(id).then(response => {