版本1.4.1 阀井目录修改

src/api/gas/regulatingBoxMaintenance.js

@@ -49,3 +49,12 @@ export function delRegulatingBoxMaintenance(id) {
     method: 'delete'
   })
 }
+
+
+export function getReviewList(data) {
+  return request({
+    url: '/gas/regulatingBoxMaintenance/reviewList',
+    method: 'get',
+    params: data
+  })
+}

src/views/gas/regulatingBoxMaintenance/index.vue

@@ -377,7 +377,7 @@ import {
 import Cookies from "js-cookie";
 import {listPostAll} from "@/api/system/post";
 import {getWorker} from "@/api/gas/user";
-import {getReviewList} from "@/api/gas/courtyardNetworkManagement";
+import {getReviewList} from "@/api/gas/regulatingBoxMaintenance.js";
 
 export default {
   name: "RegulatingBoxMaintenance",
@@ -452,6 +452,7 @@ export default {
         administrativeOffice: undefined,
         maintenanceItem: undefined,
         createTimes: [],
+        processStatus: '',
         postNameArias:this.$store.state.user.postName,
         processComments: undefined,
         ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),

src/views/gas/valveWellInspection/index.vue

@@ -199,15 +199,22 @@
           <el-button
             size="mini"
             type="text"
-            v-show="scope.row.processStatus == null || scope.row.processStatus == '-1' || scope.row.processStatus == ''"
             icon="el-icon-edit"
             @click="process(scope.row)"
+            v-if="btnShow(scope.row)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
           >审核
           </el-button>
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-edit"
+            @click="reviewListOpen(scope.row)"
+          >审核记录
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['gas:valveWellInspection:remove']"
@@ -316,7 +323,7 @@ import {
 import {listValveWellPosition} from "@/api/gas/valveWellPosition";
 import Cookies from "js-cookie";
 import {listPostAll} from "@/api/system/post";
-import {updateRegulatingBoxMaintenance} from "@/api/gas/regulatingBoxMaintenance";
+import {getReviewList, updateRegulatingBoxMaintenance} from "@/api/gas/regulatingBoxMaintenance";
 import {getWorker} from "@/api/gas/user";
 
 export default {
@@ -324,10 +331,15 @@ export default {
   dicts: ['find_problem','process_status'],
   data() {
     return {
-      shFrom:{
+      //审核记录
+      reviewListShow: false,
+      reviewList: [],
+      shFrom: {
         id: '',
-        processStatus:'',
-        processComments: ""
+        uids: [],
+        processStatus: '',
+        processComments: "",
+        postNameArias: null,
       },
       pickerOptions: {
         shortcuts: [{
@@ -394,6 +406,8 @@ export default {
         discoverProblems: undefined,
         discoverTime: undefined,
         createTimes:[],
+        processStatus: '',
+        postNameArias:this.$store.state.user.postName,
         ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
       // 表单参数
@@ -424,6 +438,22 @@ export default {
     this.getWorkerList();
   },
   methods: {
+    btnShow(row){
+      let b = false;
+      if (row.flag==true){
+        b = true;
+      }
+      //主表审核状态通过与不通过都不显示
+      if (row.processStatus=='0' || row.processStatus=='1'){
+        b = false;
+      }
+      return b;
+    },
+    reviewListOpen(row){
+      this.reviewList = [];
+      this.reviewListShow=true;
+      getReviewList({emrId: row.id}).then(res=>this.reviewList = res.rows);
+    },
     checkRemark(value){
       if (value=='0'){
         this.$nextTick(() => {
@@ -524,6 +554,8 @@ export default {
       this.title = "添加阀井巡查";
     },
     upprocess(){
+      const postNameArias = this.$store.state.user.postName;
+      this.shFrom.postNameArias = postNameArias
       if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
         this.$message.warning("请选择审核状态")
       }

src/views/gas/valveWellPosition/index.vue

@@ -19,6 +19,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="时间范围" prop="createTimes">
+        <el-date-picker
+          v-model="queryParams.createTimes"
+          type="datetimerange"
+          :picker-options="pickerOptions"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="right">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -292,6 +303,34 @@ export default {
         position: undefined,
         longitude: undefined,
         latitude: undefined,
+        createTimes:[]
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
       },
       // 表单参数
       form: {},
@@ -418,6 +457,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.createTimes=[]
       this.handleQuery();
     },
     // 多选框选中数据