提交代码

src/views/gas/regulatingBoxMaintenance/index.vue

@@ -135,7 +135,8 @@
       <el-table-column label="上传时间" align="center" prop="createTime"/>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus"/>
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null"/>
+          <span v-else>未审核</span>
         </template>
       </el-table-column>
       <el-table-column label="照片" align="center">
@@ -152,8 +153,16 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row,true)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >查看
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleUpdate(scope.row,false)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
           >修改
           </el-button>
@@ -211,7 +220,7 @@
     </el-dialog>
     <!-- 添加或修改调压箱维护对话框 -->
     <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 ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isDisabled">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入名称"/>
         </el-form-item>
@@ -241,6 +250,20 @@
         <el-form-item label="照片" prop="photoList">
           <imageUpload v-model="form.photoList" :disabled="disabled"/>
         </el-form-item>
+        <el-form-item label="审核状态" v-show="isDisabled && form.processStatus!=null">
+          <el-select v-model="form.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
+          <el-option
+            v-for="dict in dict.type.process_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        </el-form-item>
+        <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
+          <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -272,6 +295,7 @@ export default {
       disabled: false,
       // 遮罩层
       loading: true,
+      isDisabled: true,
       // 导出遮罩层
       exportLoading: false,
       // 选中数组
@@ -305,7 +329,11 @@ export default {
       },
       // 表单参数
       form: {},
-      shFrom: {},
+      shFrom:{
+        id: '',
+        processStatus:'',
+        remarks: ""
+      },
       // 表单校验
       rules: {
         id: [
@@ -346,11 +374,11 @@ export default {
       });
     },
     process(data) {
-      this.dialogVisible = true;
       this.shFrom.id = undefined
       this.shFrom.id = data.id;
-      // this.shFrom.processStatus = data.processStatus;
-      // this.shFrom.remarks = data.remarks;
+      this.shFrom.processStatus = '';
+      this.shFrom.remarks = '';
+      this.dialogVisible = true;
     },
     getPostList() {
       listPostAll({remark: 'ranks'}).then(response => {
@@ -411,8 +439,9 @@ export default {
       this.title = "添加调压箱维护";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(row,isDisabled) {
       this.loading = true;
+      this.isDisabled = isDisabled;
       this.reset();
       const id = row.id || this.ids
       getRegulatingBoxMaintenance(id).then(response => {

src/views/gas/regulatorBox/index.vue

@@ -111,6 +111,12 @@
       <el-table-column label="编号" align="center" prop="number"/>
       <el-table-column label="创建人" align="center" prop="createByName"/>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="审核状态" align="center" prop="processStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null"/>
+          <span v-else>未审核</span>
+        </template>
+      </el-table-column>
       <el-table-column label="照片" align="center">
         <template slot-scope="scope">
           <el-image
@@ -138,6 +144,15 @@
             v-hasPermi="['gas:regulatorBox:edit']"
           >修改
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-show="scope.row.processStatus == null"
+            icon="el-icon-edit"
+            @click="process(scope.row)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >审核
+          </el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
           <!--            type="text"-->
@@ -157,14 +172,37 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    <el-dialog
+      title="审核"
+      :visible.sync="dialogVisible"
+      width="30%">
+      <el-form ref="shFrom" :model="shFrom" label-width="80px">
+        <el-form-item label="审核状态" prop="processStatus">
+          <el-select v-model="shFrom.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="upprocess">确 定</el-button>
+  </span>
+    </el-dialog>
     <!-- 添加或修改调压箱管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="180px" :disabled="disabled">
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="调压箱名称" prop="areaId">
-              <el-input v-model="form.areaName" placeholder="请输入调压箱名称"/>
+              <el-input v-model="form.name" placeholder="请输入调压箱名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -518,9 +556,22 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remarks">
-              <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容"/>
-            </el-form-item>
-          </el-col>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-form-item label="审核状态" v-show="isDisabled && form.processStatus!=null">
+            <el-select v-model="form.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
+              <el-option
+                v-for="dict in dict.type.process_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
+            <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+          </el-form-item>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -546,13 +597,14 @@ import el from "element-ui/src/locale/lang/el";
 import {getWorker} from "@/api/gas/user";
 import Cookies from "js-cookie";
 import {listPostAll} from "@/api/system/post";
+import {updateRegulatingBoxMaintenance} from "@/api/gas/regulatingBoxMaintenance";
 
 export default {
   name: "RegulatorBox",
   dicts: ['appearance', 'administrative_office', 'square_brick', 'business_service',
     'yes_and_no','on_off','yes_or_no','cutoff_test_certification','secondary_roads',
     'guardrail', 'foundation', 'pressure_gage', 'valve', 'voltage_regulator', 'xtv',
-    'disconnector_test_status', 'filter', 'special_case_of_pressure_regulating_facilities',
+    'disconnector_test_status', 'filter','process_status', 'special_case_of_pressure_regulating_facilities',
     'overdue_inspection_days', 'reason_for_overdue_inspection', 'valve_well_condition'],
   data() {
     return {
@@ -562,6 +614,7 @@ export default {
       // 按钮loading
       buttonLoading: false,
       disabled: false,
+      isDisabled: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -579,6 +632,12 @@ export default {
       // 调压箱管理表格数据
       regulatorBoxList: [],
       workerList: [],
+      dialogVisible: false,
+      shFrom:{
+        id: '',
+        processStatus:'',
+        remarks: ""
+      },
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -698,6 +757,17 @@ export default {
     this.getList();
   },
   methods: {
+    upprocess(){
+      if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
+        this.$message.warning("请选择审核状态")
+      }
+      updateRegulatorBox(this.shFrom).then(response => {
+        this.$modal.msgSuccess("审核成功");
+        this.getList();
+      }).finally(() => {
+        this.dialogVisible = false;
+      });
+    },
     getPostList(){
       listPostAll({remark:'ranks'}).then(response => {
         this.postOptions = response.data;
@@ -814,6 +884,7 @@ export default {
     handleUpdate(row,disabled) {
       this.loading = true;
       this.disabled = disabled;
+      this.isDisabled = disabled;
       this.reset();
       const id = row.id || this.ids
       getRegulatorBox(id).then(response => {
@@ -829,6 +900,13 @@ export default {
         this.title = "查看调压箱管理";
       });
     },
+    process(data) {
+      this.shFrom.id = undefined
+      this.shFrom.id = data.id;
+      this.shFrom.processStatus = '';
+      this.shFrom.remarks = '';
+      this.dialogVisible = true;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

src/views/gas/roadSectionInspection/index.vue

@@ -100,6 +100,12 @@
       </el-table-column>
       <el-table-column label="上传人" align="center" prop="createByName" width="180">
       </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="processStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null"/>
+          <span v-else>未审核</span>
+        </template>
+      </el-table-column>
       <el-table-column label="照片" align="center">
         <template slot-scope="scope">
           <el-image
@@ -115,13 +121,30 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row,true)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >查看
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleUpdate(scope.row,false)"
             v-hasPermi="['gas:roadSectionInspection:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
+            v-show="scope.row.processStatus == null"
+            icon="el-icon-edit"
+            @click="process(scope.row)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-view"
             @click="views(scope.row)"
             v-hasPermi="['gas:roadSectionInspection:views']"
@@ -145,9 +168,33 @@
       @pagination="getList"
     />
 
+    <el-dialog
+      title="审核"
+      :visible.sync="dialogVisible"
+      width="30%">
+      <el-form ref="shFrom" :model="shFrom" label-width="80px">
+        <el-form-item label="审核状态" prop="processStatus">
+          <el-select v-model="shFrom.processStatus"  @change="$forceUpdate" placeholder="请选择审核状态" clearable size="small">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="upprocess">确 定</el-button>
+  </span>
+    </el-dialog>
     <!-- 添加或修改路段巡查对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="disabled">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isDisabled">
         <el-form-item label="路段名称" prop="sectionName">
           <el-input v-model="form.sectionName" placeholder="请输入路段名称" />
         </el-form-item>
@@ -181,6 +228,21 @@
             <imageUpload v-model="form.photoList" :disabled="disabled"/>
           </el-form-item>
         </el-col>
+
+        <el-form-item label="审核状态" v-show="isDisabled && form.processStatus!=null">
+          <el-select v-model="form.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
+          <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -195,14 +257,17 @@ import { listRoadSectionInspection, getRoadSectionInspection, delRoadSectionInsp
 import fa from "element-ui/src/locale/lang/fa";
 import {listPostAll} from "@/api/system/post";
 import Cookies from "js-cookie";
+import {updateRegulatingBoxMaintenance} from "@/api/gas/regulatingBoxMaintenance";
 
 export default {
   name: "RoadSectionInspection",
-  dicts: ['find_problem'],
+  dicts: ['find_problem','process_status'],
   data() {
     return {
       // 按钮loading
       buttonLoading: false,
+      dialogVisible: false,
+      isDisabled: true,
       disabled: false,
       // 遮罩层
       loading: true,
@@ -238,6 +303,11 @@ export default {
       },
       // 表单参数
       form: {},
+      shFrom:{
+        id: '',
+        processStatus:'',
+        remarks: ""
+      },
       // 表单校验
       rules: {
         id: [
@@ -266,6 +336,24 @@ export default {
     this.getList();
   },
   methods: {
+    upprocess(){
+      if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
+        this.$message.warning("请选择审核状态")
+      }
+      updateRoadSectionInspection(this.shFrom).then(response => {
+        this.$modal.msgSuccess("审核成功");
+        this.getList();
+      }).finally(() => {
+        this.dialogVisible = false;
+      });
+    },
+    process(data) {
+      this.shFrom.id = undefined
+      this.shFrom.id = data.id;
+      this.shFrom.processStatus = '';
+      this.shFrom.remarks = '';
+      this.dialogVisible = true;
+    },
     getPostList(){
       listPostAll({remark:'ranks'}).then(response => {
         this.postOptions = response.data;
@@ -326,8 +414,9 @@ export default {
       this.title = "添加路段巡查";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(row,dis) {
       this.loading = true;
+      this.isDisabled = dis
       this.reset();
       const id = row.id || this.ids
       getRoadSectionInspection(id).then(response => {

src/views/gas/valveWellInspection/index.vue

@@ -116,6 +116,12 @@
       </el-table-column>
       <el-table-column label="上传人" align="center" prop="createByName" width="180">
       </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="processStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null"/>
+          <span v-else>未审核</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="照片" align="center">
         <template slot-scope="scope">
@@ -131,14 +137,31 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row,true)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >查看
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleUpdate(scope.row,false)"
             v-hasPermi="['gas:valveWellInspection:edit']"
           >修改
           </el-button>
           <el-button
             size="mini"
             type="text"
+            v-show="scope.row.processStatus == null"
+            icon="el-icon-edit"
+            @click="process(scope.row)"
+            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['gas:valveWellInspection:remove']"
@@ -155,10 +178,33 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    <el-dialog
+      title="审核"
+      :visible.sync="dialogVisible"
+      width="30%">
+      <el-form ref="shFrom" :model="shFrom" label-width="80px">
+        <el-form-item label="审核状态">
+          <el-select v-model="shFrom.processStatus" placeholder="请选择审核状态" clearable size="small"  @change="$forceUpdate()" >
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="upprocess">确 定</el-button>
+  </span>
+    </el-dialog>
     <!-- 添加或修改阀井巡查对话框 -->
     <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 ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isDisabled">
         <el-form-item label="阀井名称" prop="position">
           <el-select v-model="form.positionId" placeholder="请选择阀井名称" filterable clearable size="small"
                      @change="getPositionName" style="width: 100%">
@@ -190,6 +236,19 @@
             <imageUpload v-model="form.photoList" :disabled="disabled"/>
           </el-form-item>
         </el-col>
+        <el-form-item label="审核状态" v-show="isDisabled && form.processStatus!=null">
+          <el-select v-model="form.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
+          <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -210,12 +269,20 @@ import {
 import {listValveWellPosition} from "@/api/gas/valveWellPosition";
 import Cookies from "js-cookie";
 import {listPostAll} from "@/api/system/post";
+import {updateRegulatingBoxMaintenance} from "@/api/gas/regulatingBoxMaintenance";
 
 export default {
   name: "ValveWellInspection",
-  dicts: ['find_problem'],
+  dicts: ['find_problem','process_status'],
   data() {
     return {
+      shFrom:{
+        id: '',
+        processStatus:'',
+        remarks: ""
+      },
+      isDisabled: false,
+      dialogVisible: false,
       // 按钮loading
       buttonLoading: false,
       disabled: false,
@@ -345,9 +412,28 @@ export default {
       this.weizhi = ''
       this.title = "添加阀井巡查";
     },
+    upprocess(){
+      if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
+        this.$message.warning("请选择审核状态")
+      }
+      updateValveWellInspection(this.shFrom).then(response => {
+        this.$modal.msgSuccess("审核成功");
+        this.getList();
+      }).finally(() => {
+        this.dialogVisible = false;
+      });
+    },
+    process(data) {
+      this.shFrom.id = undefined
+      this.shFrom.id = data.id;
+      this.shFrom.processStatus = '';
+      this.shFrom.remarks = '';
+      this.dialogVisible = true;
+    },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(row,disabled) {
       this.loading = true;
+      this.isDisabled = disabled;
       this.reset();
       const id = row.id || this.ids
       getValveWellInspection(id).then(response => {