|
|
@@ -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 label="审核状态">
|
|
|
<el-select v-model="queryParams.processStatus" placeholder="请选择审核状态" clearable size="small">
|
|
|
<el-option
|
|
|
@@ -97,18 +108,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"
|
|
|
@@ -143,13 +154,12 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="备注" align="center" prop="remark" />
|
|
|
- <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 && scope.row.processStatus != '-1' "/>
|
|
|
- <span v-else></span>
|
|
|
+ v-if="scope.row.processStatus != null"/>
|
|
|
+ <span v-else>未审核</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="照片" align="center">
|
|
|
@@ -170,15 +180,22 @@
|
|
|
@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-if="btnShow(scope.row)"
|
|
|
+ v-hasPermi="['gas:courtyardNetworkManagement: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"
|
|
|
@@ -203,7 +220,7 @@
|
|
|
<el-form-item label="审核状态" prop="processStatus">
|
|
|
<el-select v-model="formSH.processStatus" placeholder="请选择审核状态" :style="{width: '100%'}">
|
|
|
<el-option
|
|
|
- v-for="dict in dict.type.process_status"
|
|
|
+ v-for="dict in dictList"
|
|
|
:key="dict.value"
|
|
|
:label="dict.label"
|
|
|
:value="dict.value"
|
|
|
@@ -258,6 +275,54 @@
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog title="'审核记录'" :visible.sync="reviewListShow" width="800px" append-to-body>
|
|
|
+ <el-table
|
|
|
+ :data="reviewList"
|
|
|
+ style="width: 100%"
|
|
|
+ border
|
|
|
+ :header-cell-style="{'text-align':'center'}"
|
|
|
+ height="500">
|
|
|
+ <el-table-column label="历史审核记录">
|
|
|
+ <el-table-column
|
|
|
+ prop="createBy"
|
|
|
+ label="审核人"
|
|
|
+ width="80">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="userPost"
|
|
|
+ label="岗位"
|
|
|
+ width="65">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.userPost == 'admin'">管理员</span>
|
|
|
+ <span v-if="scope.row.userPost == 'deputyDirector'">副处长</span>
|
|
|
+ <span v-if="scope.row.userPost == 'director'">处长</span>
|
|
|
+ <span v-if="scope.row.userPost.indexOf('xx')>-1">队长</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="processStatus"
|
|
|
+ label="审核状态"
|
|
|
+ width="75">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.processStatus == '0' ? '通过' : '拒绝' }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="createTime"
|
|
|
+ label="审核时间"
|
|
|
+ width="155">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="processComments"
|
|
|
+ label="审核意见"
|
|
|
+ width="384">
|
|
|
+ </el-table-column>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="reviewListShow = false">关 闭</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -266,20 +331,32 @@ import { batchReview,listPatrolTeam, getPatrolTeam, delPatrolTeam, addPatrolTeam
|
|
|
import {listPostAll} from "@/api/system/post";
|
|
|
import Cookies from "js-cookie";
|
|
|
import {getWorker} from "@/api/gas/user";
|
|
|
+import {getReviewList} from "@/api/gas/patrolTeam.js";
|
|
|
|
|
|
export default {
|
|
|
name: "PatrolTeam",
|
|
|
dicts: ['team', 'yes_and_no','process_status'],
|
|
|
data() {
|
|
|
return {
|
|
|
+ dictList:[{label:'通过',value:'0'},{label:'不通过',value:'1'}],
|
|
|
openSH: false,
|
|
|
formSH: {},
|
|
|
+ shFrom:{
|
|
|
+ id: '',
|
|
|
+ processStatus:'',
|
|
|
+ postNameArias:undefined,
|
|
|
+ processComments: ""
|
|
|
+ },
|
|
|
rulesSH: {
|
|
|
processStatus: [
|
|
|
{required: true, message: "审核状态不能为空", trigger: "blur"}
|
|
|
],
|
|
|
},
|
|
|
-
|
|
|
+ //审核记录
|
|
|
+ reviewListShow: false,
|
|
|
+ reviewList: [],
|
|
|
+ // 按钮loading
|
|
|
+ dialogVisible: false,
|
|
|
// 按钮loading
|
|
|
buttonLoading: false,
|
|
|
disabled: false,
|
|
|
@@ -308,6 +385,33 @@ export default {
|
|
|
// 是否显示弹出层
|
|
|
open: false,
|
|
|
workerListSelect:[],
|
|
|
+ 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]);
|
|
|
+ }
|
|
|
+ }]
|
|
|
+ },
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
@@ -315,6 +419,9 @@ export default {
|
|
|
team: undefined,
|
|
|
uploadLocation: undefined,
|
|
|
isNormalInspection: undefined,
|
|
|
+ createTimes: [],
|
|
|
+ processStatus:undefined,
|
|
|
+ postNameArias:this.$store.state.user.postName,
|
|
|
ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
|
|
|
},
|
|
|
// 表单参数
|
|
|
@@ -342,6 +449,24 @@ export default {
|
|
|
this.getList();
|
|
|
},
|
|
|
methods: {
|
|
|
+ btnShow(row){
|
|
|
+ let b = false;
|
|
|
+ if (row.flag==true){
|
|
|
+ b = true;
|
|
|
+ }
|
|
|
+ //主表审核状态通过与不通过都不显示
|
|
|
+ if (row.processStatus=='0' || row.processStatus=='1'){
|
|
|
+ b = false;
|
|
|
+ }
|
|
|
+ return b;
|
|
|
+ },
|
|
|
+ process(data) {
|
|
|
+ this.shFrom.id = undefined
|
|
|
+ this.shFrom.id = data.id;
|
|
|
+ this.shFrom.processStatus = '';
|
|
|
+ this.shFrom.processComments = '';
|
|
|
+ this.dialogVisible = true;
|
|
|
+ },
|
|
|
getUsers(value){
|
|
|
if (!value) return;
|
|
|
getWorker({ranks:value}).then(response => {
|
|
|
@@ -403,6 +528,7 @@ export default {
|
|
|
resetQuery() {
|
|
|
this.resetForm("queryForm");
|
|
|
this.workerListSelect=[]
|
|
|
+ this.queryParams.createTimes=[]
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
@@ -429,22 +555,29 @@ export default {
|
|
|
this.title = "修改巡检车队";
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
+ reviewListOpen(row){
|
|
|
+ this.reviewList = [];
|
|
|
+ this.reviewListShow=true;
|
|
|
+ getReviewList({emrId: row.id}).then(res=>this.reviewList = res.rows);
|
|
|
+ },
|
|
|
openshShow(data, isBatch) {
|
|
|
this.formSH = {
|
|
|
id: undefined,
|
|
|
uids: [],
|
|
|
+ postNameArias: undefined,
|
|
|
processStatus: undefined,
|
|
|
processComments: undefined,
|
|
|
}
|
|
|
if (isBatch)
|
|
|
this.formSH.uids = this.ids
|
|
|
else
|
|
|
- this.formSH.id = data.id
|
|
|
+ this.formSH.uids = [data.id]
|
|
|
this.openSH = true
|
|
|
},
|
|
|
|
|
|
submitFormSH() {
|
|
|
+ const postNameArias = this.$store.state.user.postName;
|
|
|
+ this.formSH.postNameArias = postNameArias
|
|
|
this.$refs["formSH"].validate(valid => {
|
|
|
if (valid) {
|
|
|
this.buttonLoading = true;
|
qinhouyu