版本1.4.1 路段巡查修改

src/api/gas/roadSectionInspection.js

@@ -58,3 +58,10 @@ export function delRoadSectionInspection(id) {
     method: 'delete'
   })
 }
+export function getReviewList(data) {
+  return request({
+    url: '/gas/roadSectionInspection/reviewList',
+    method: 'get',
+    params: data
+  })
+}

src/views/gas/courtyardNetworkManagement/index.vue

@@ -399,6 +399,33 @@ export default {
         postNameArias:this.$store.state.user.postName,
         ranks: (Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
+      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]);
+          }
+        }]
+      },
       // 岗位选项
       postOptions: [],
       postName: Cookies.get("postName"),

src/views/gas/patrolTeam/index.vue

@@ -97,18 +97,18 @@
           v-hasPermi="['gas:patrolTeam:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-search"
-          size="mini"
-          :disabled="multiple"
-          @click="openshShow(null,true)"
-          v-hasPermi="['gas:regulatingBoxMaintenance:remove']"
-        >批量审核
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-search"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="openshShow(null,true)"-->
+<!--          v-hasPermi="['gas:regulatingBoxMaintenance:remove']"-->
+<!--        >批量审核-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -170,15 +170,15 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['gas:patrolTeam:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="openshShow(scope.row)"
-            v-show="scope.row.processStatus == null || scope.row.processStatus == '-1' || scope.row.processStatus == ''"
-            v-hasPermi="['gas:courtyardNetworkManagement:edit']"
-          >审核
-          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="openshShow(scope.row)"-->
+<!--            v-show="scope.row.processStatus == null || scope.row.processStatus == '-1' || scope.row.processStatus == ''"-->
+<!--            v-hasPermi="['gas:courtyardNetworkManagement:edit']"-->
+<!--          >审核-->
+<!--          </el-button>-->
           <el-button
             size="mini"
             type="text"

src/views/gas/roadSectionInspection/index.vue

@@ -48,6 +48,17 @@
           />
         </el-select>
       </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>
@@ -199,6 +210,13 @@
           <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:roadSectionInspection:remove']"
@@ -277,7 +295,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input type="textarea" v-model="formSH.remarks"></el-input>
+          <el-input type="textarea" v-model="formSH.processComments"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -381,7 +399,7 @@ import {
 import {listPostAll} from "@/api/system/post";
 import Cookies from "js-cookie";
 import {getWorker} from "@/api/gas/user";
-import {getReviewList} from "@/api/gas/courtyardNetworkManagement";
+import {getReviewList} from "@/api/gas/roadSectionInspection.js";
 
 export default {
   name: "RoadSectionInspection",
@@ -418,6 +436,33 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      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]);
+          }
+        }]
+      },
       // 岗位选项
       postOptions: [],
       // 查询参数
@@ -427,7 +472,9 @@ export default {
         sectionName: undefined,
         samplingMeterCount: undefined,
         findProblem: undefined,
+        processStatus: undefined,
         findTime: undefined,
+        createTimes: [],
         postNameArias:this.$store.state.user.postName,
         ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
@@ -496,7 +543,6 @@ export default {
         uids: [],
         postNameArias: undefined,
         processStatus: undefined,
-        remarks: undefined,
       }
       this.resetForm("formSH");
       this.formSH.uids = this.ids
@@ -549,19 +595,6 @@ export default {
         });
       }
     },
-    openshShow(data, isBatch) {
-      this.shFrom = {
-        id: undefined,
-        uids: [],
-        processStatus: undefined,
-        processComments: undefined,
-      }
-      if (isBatch)
-        this.shFrom.uids = this.ids
-      else
-        this.shFrom.id = data.id
-      this.dialogVisible = true
-    },
     process(data) {
       this.shFrom.id = undefined
       this.shFrom.id = data.id;
@@ -613,6 +646,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.createTimes=[]
       this.handleQuery();
     },
     // 多选框选中数据