Explorar o código

版本1.4.1 审核修改

qinhouyu hai 1 ano
pai
achega
74839dc261

+ 52 - 0
src/api/gas/regulatorBoxRelation.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询调压箱目录中间列表
+export function listRegulatorBoxRelation(query) {
+  return request({
+    url: '/gas/regulatorBoxRelation/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询我的调压箱目录
+export function myListRegulatorBox(query) {
+  return request({
+    url: '/gas/pressureRegulatingBox/myList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询调压箱目录中间详细
+export function getRegulatorBoxRelation(id) {
+  return request({
+    url: '/gas/regulatorBoxRelation/' + id,
+    method: 'get'
+  })
+}
+
+// 新增调压箱目录中间
+export function addRegulatorBoxRelation(data) {
+  return request({
+    url: '/gas/regulatorBoxRelation',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改调压箱目录中间
+export function updateRegulatorBoxRelation(data) {
+  return request({
+    url: '/gas/regulatorBoxRelation',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除调压箱目录中间
+export function delRegulatorBoxRelation(id) {
+  return request({
+    url: '/gas/regulatorBoxRelation/' + id,
+    method: 'delete'
+  })
+}

+ 2 - 6
src/views/gas/courtyardNetworkManagement/index.vue

@@ -221,7 +221,7 @@
       @pagination="getList"
     />
 
-    <el-dialog title="'审核记录'" :visible.sync="reviewListShow" width="800px" append-to-body>
+    <el-dialog title="审核记录" :visible.sync="reviewListShow" width="800px" append-to-body>
       <el-table
         :data="reviewList"
         style="width: 100%"
@@ -230,7 +230,7 @@
         height="500">
         <el-table-column label="历史审核记录">
           <el-table-column
-            prop="createBy"
+            prop="createName"
             label="审核人"
             width="80">
           </el-table-column>
@@ -469,10 +469,6 @@ export default {
       if (row.flag==true){
         b = true;
       }
-      //主表审核状态通过与不通过都不显示
-      if (row.processStatus=='0' || row.processStatus=='1'){
-        b = false;
-      }
       return b;
     },
     getUsers(value){

+ 2 - 6
src/views/gas/patrolTeam/index.vue

@@ -275,7 +275,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="'审核记录'" :visible.sync="reviewListShow" width="800px" append-to-body>
+    <el-dialog title="审核记录" :visible.sync="reviewListShow" width="800px" append-to-body>
       <el-table
         :data="reviewList"
         style="width: 100%"
@@ -284,7 +284,7 @@
         height="500">
         <el-table-column label="历史审核记录">
           <el-table-column
-            prop="createBy"
+            prop="createName"
             label="审核人"
             width="80">
           </el-table-column>
@@ -454,10 +454,6 @@ export default {
       if (row.flag==true){
         b = true;
       }
-      //主表审核状态通过与不通过都不显示
-      if (row.processStatus=='0' || row.processStatus=='1'){
-        b = false;
-      }
       return b;
     },
     process(data) {

+ 2 - 6
src/views/gas/regulatingBoxMaintenance/index.vue

@@ -231,7 +231,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog title="'审核记录'" :visible.sync="reviewListShow" width="800px" append-to-body>
+    <el-dialog title="审核记录" :visible.sync="reviewListShow" width="800px" append-to-body>
       <el-table
         :data="reviewList"
         style="width: 100%"
@@ -240,7 +240,7 @@
         height="500">
         <el-table-column label="历史审核记录">
           <el-table-column
-            prop="createBy"
+            prop="createName"
             label="审核人"
             width="80">
           </el-table-column>
@@ -506,10 +506,6 @@ export default {
       if (row.flag==true){
         b = true;
       }
-      //主表审核状态通过与不通过都不显示
-      if (row.processStatus=='0' || row.processStatus=='1'){
-        b = false;
-      }
       return b;
     },
     reviewListOpen(row){

+ 2 - 6
src/views/gas/regulatorBox/index.vue

@@ -219,7 +219,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <el-dialog title="'审核记录'" :visible.sync="reviewListShow" width="800px" append-to-body>
+    <el-dialog title="审核记录" :visible.sync="reviewListShow" width="800px" append-to-body>
       <el-table
         :data="reviewList"
         style="width: 100%"
@@ -228,7 +228,7 @@
         height="500">
         <el-table-column label="历史审核记录">
           <el-table-column
-            prop="createBy"
+            prop="createName"
             label="审核人"
             width="80">
           </el-table-column>
@@ -893,10 +893,6 @@ export default {
       if (row.flag==true){
         b = true;
       }
-      //主表审核状态通过与不通过都不显示
-      if (row.processStatus=='0' || row.processStatus=='1'){
-        b = false;
-      }
       return b;
     },
     reviewListOpen(row){

+ 2 - 6
src/views/gas/roadSectionInspection/index.vue

@@ -232,7 +232,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <el-dialog title="'审核记录'" :visible.sync="reviewListShow" width="800px" append-to-body>
+    <el-dialog title="审核记录" :visible.sync="reviewListShow" width="800px" append-to-body>
       <el-table
         :data="reviewList"
         style="width: 100%"
@@ -241,7 +241,7 @@
         height="500">
         <el-table-column label="历史审核记录">
           <el-table-column
-            prop="createBy"
+            prop="createName"
             label="审核人"
             width="80">
           </el-table-column>
@@ -520,10 +520,6 @@ export default {
       if (row.flag==true){
         b = true;
       }
-      //主表审核状态通过与不通过都不显示
-      if (row.processStatus=='0' || row.processStatus=='1'){
-        b = false;
-      }
       return b;
     },
     reviewListOpen(row){

+ 22 - 2
src/views/gas/user/index.vue

@@ -103,6 +103,13 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-edit"
+            @click="selectYaBox(scope.row)"
+          >选择调压箱目录
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['gas:user:remove']"
@@ -112,6 +119,7 @@
       </el-table-column>
     </el-table>
 
+    <tyx ref="tyx" v-if="tyxShow" @closeE="closeE"></tyx>
     <pagination
       v-show="total>0"
       :total="total"
@@ -119,7 +127,6 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
     <!-- 添加或修改用户对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -193,7 +200,9 @@
 import {listUser, getForPhone, getForJobnum, getUser, delUser, addUser, updateUser} from "@/api/gas/user";
 import {listPostAll} from "@/api/system/post";
 import Cookies from "js-cookie";
+import tyx from "@/views/gas/user/springIoc/tyx.vue";
 export default {
+  components:{tyx},
   name: "User",
   dicts: ['user_type', 'engine_type', 'administrative_office'],
   data() {
@@ -238,6 +247,7 @@ export default {
       }
     };
     return {
+      tyxShow:false,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -256,6 +266,7 @@ export default {
       total: 0,
       // 用户表格数据
       userList: [],
+      list: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -271,7 +282,7 @@ export default {
       postName:Cookies.get("postName"),
       // 岗位选项
       postOptions: [],
-
+      selectIds:[],
       foremanList: [],
       // 表单参数
       form: {},
@@ -302,6 +313,15 @@ export default {
     this.getList();
   },
   methods: {
+    selectYaBox(row){
+      this.tyxShow = true;
+      this.$nextTick(()=>{
+        this.$refs.tyx.init(row)
+      })
+    },
+    closeE(){
+      this.tyxShow = false;
+    },
     //获取岗位列
     getPostList(){
       listPostAll({remark:'ranks'}).then(response => {

+ 256 - 0
src/views/gas/user/springIoc/tyx.vue

@@ -0,0 +1,256 @@
+<template>
+    <el-dialog title="'调压箱目录'" :visible.sync="show" width="1000px" append-to-body>
+      <el-tabs  v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="调压箱目录" name="1">
+          <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+            <el-form-item label="管理所" prop="managementOffice">
+              <el-select v-model="queryParams.managementOffice" placeholder="请输入管理所" style="width: 100%"
+                         @keyup.enter.native="handleQuery">
+                <el-option
+                  v-for="dict in dict.type.administrative_office"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="编号" prop="number">
+              <el-input
+                v-model="queryParams.number"
+                placeholder="请输入编号"
+                clearable
+                size="small"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="名称" prop="name">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入名称"
+                clearable
+                size="small"
+                @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>
+              <el-button @click="getData">选择</el-button>
+            </el-form-item>
+          </el-form>
+          <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column label="序号" width="70">
+              <template slot-scope="scope">
+                {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+              </template>
+            </el-table-column>
+            <el-table-column label="性质" align="center" prop="nature">
+            </el-table-column>
+            <el-table-column label="类型" align="center" prop="type">
+            </el-table-column>
+            <el-table-column label="路数" align="center" prop="numberOfRoutes">
+            </el-table-column>
+            <el-table-column label="管理所" align="center" prop="managementOffice">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.administrative_office" :value="scope.row.managementOffice"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="编号" align="center" prop="number"/>
+            <el-table-column label="名称" align="center" prop="name"/>
+            <el-table-column label="经度" align="center" prop="longitude"/>
+            <el-table-column label="纬度" align="center" prop="latitude"/>
+            <el-table-column label="巡检次数" align="center" prop="inspectionFrequency"/>
+            <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
+          </el-table>
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-tab-pane>
+        <el-tab-pane label="我的" name="2">
+          <el-table v-loading="loading1" :data="myList">
+            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column label="序号" width="70">
+              <template slot-scope="scope">
+                {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+              </template>
+            </el-table-column>
+            <el-table-column label="性质" align="center" prop="nature">
+            </el-table-column>
+            <el-table-column label="类型" align="center" prop="type">
+            </el-table-column>
+            <el-table-column label="路数" align="center" prop="numberOfRoutes">
+            </el-table-column>
+            <el-table-column label="管理所" align="center" prop="managementOffice">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.administrative_office" :value="scope.row.managementOffice"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="编号" align="center" prop="number"/>
+            <el-table-column label="名称" align="center" prop="name"/>
+            <el-table-column label="经度" align="center" prop="longitude"/>
+            <el-table-column label="纬度" align="center" prop="latitude"/>
+            <el-table-column label="巡检次数" align="center" prop="inspectionFrequency"/>
+            <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
+          </el-table>
+          <pagination
+            v-show="total1>0"
+            :total="total1"
+            :page.sync="queryParams1.pageNum"
+            :limit.sync="queryParams1.pageSize"
+            @pagination="getList"
+          />
+        </el-tab-pane>
+      </el-tabs>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="$emit('closeE')">关 闭</el-button>
+      </div>
+    </el-dialog>
+</template>
+
+
+<script>
+import {listPressureRegulatingBox} from "@/api/gas/pressureRegulatingBox";
+import {addRegulatorBoxRelation, listRegulatorBoxRelation, myListRegulatorBox} from "@/api/gas/regulatorBoxRelation";
+export default {
+  name: "tyx",
+  dicts: ['administrative_office'],
+  data() {
+    return {
+      activeName:'1',
+      show:false,
+      // 遮罩层
+      loading: false,
+      loading1: false,
+      total: 0,
+      total1: 0,
+      list: [],
+      myList: [],
+      title: "",
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        nature: undefined,
+        type: undefined,
+        numberOfRoutes: undefined,
+        managementOffice: undefined,
+        number: undefined,
+        name: undefined,
+        longitude: undefined,
+        latitude: undefined,
+        createTimes: []
+      },
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+        jobNum: undefined,
+      },
+      ids:[],
+      jobNum: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]);
+          }
+        }]
+      },
+    };
+  },
+  beforeDestroy() {
+    this.list = []
+    this.ids = []
+  },
+  methods: {
+    handleClick(tab,event){
+      console.log(this.activeName)
+      this.loading1 = true;
+      this.queryParams1.jobNum=this.jobNum
+      this.queryParams1.pageNum=1
+      this.myList=[]
+      myListRegulatorBox(this.queryParams1).then(response => {
+        this.myList = response.rows;
+        this.total1 = response.total;
+        this.loading1 = false;
+      });
+    },
+    getData(){
+      this.loading1=true
+      let entity = {ids:[],jobNum:this.jobNum};
+      entity.ids = this.ids;
+      addRegulatorBoxRelation(entity).then(res=>{
+        if (res.code===200){
+          this.$msgbox.alert('添加成功')
+          this.loading1=false
+        }
+      })
+    },
+    init(user){
+      if (!user) return;
+      console.log(user)
+      this.show=true
+      this.jobNum = user.id
+      this.getList(user)
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.createTimes = [];
+      this.handleQuery();
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      console.log(this.ids
+      )
+    },
+    /** 查询调压箱管理列表 */
+    getList(user) {
+      this.loading = true;
+      listPressureRegulatingBox(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+  }
+};
+</script>

+ 2 - 6
src/views/gas/valveWellInspection/index.vue

@@ -139,7 +139,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-dialog title="'审核记录'" :visible.sync="reviewListShow" width="800px" append-to-body>
+    <el-dialog title="审核记录" :visible.sync="reviewListShow" width="800px" append-to-body>
       <el-table
         :data="reviewList"
         style="width: 100%"
@@ -148,7 +148,7 @@
         height="500">
         <el-table-column label="历史审核记录">
           <el-table-column
-            prop="createBy"
+            prop="createName"
             label="审核人"
             width="80">
           </el-table-column>
@@ -493,10 +493,6 @@ export default {
       if (row.flag==true){
         b = true;
       }
-      //主表审核状态通过与不通过都不显示
-      if (row.processStatus=='0' || row.processStatus=='1'){
-        b = false;
-      }
       return b;
     },
     reviewListOpen(row){