|
@@ -38,6 +38,16 @@
|
|
:value="item.id"/>
|
|
:value="item.id"/>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item label="审核状态">
|
|
|
|
+ <el-select v-model="queryParams.processStatus" 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>
|
|
<el-form-item>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -88,6 +98,18 @@
|
|
v-hasPermi="['gas:roadSectionInspection:export']"
|
|
v-hasPermi="['gas:roadSectionInspection:export']"
|
|
>导出</el-button>
|
|
>导出</el-button>
|
|
</el-col>
|
|
</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>
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
</el-row>
|
|
</el-row>
|
|
|
|
|
|
@@ -111,7 +133,7 @@
|
|
<el-table-column label="审核状态" align="center" prop="processStatus">
|
|
<el-table-column label="审核状态" align="center" prop="processStatus">
|
|
<template slot-scope="scope">
|
|
<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' "/>
|
|
<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>
|
|
|
|
|
|
+ <span v-else></span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="照片" align="center">
|
|
<el-table-column label="照片" align="center">
|
|
@@ -144,7 +166,7 @@
|
|
<el-button
|
|
<el-button
|
|
size="mini"
|
|
size="mini"
|
|
type="text"
|
|
type="text"
|
|
- v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
|
|
|
|
|
|
+ v-show="scope.row.processStatus == null || scope.row.processStatus == '-1' || scope.row.processStatus == ''"
|
|
icon="el-icon-edit"
|
|
icon="el-icon-edit"
|
|
@click="process(scope.row)"
|
|
@click="process(scope.row)"
|
|
v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
|
|
v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
|
|
@@ -192,7 +214,7 @@
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="备注">
|
|
<el-form-item label="备注">
|
|
- <el-input type="textarea" v-model="shFrom.remarks"></el-input>
|
|
|
|
|
|
+ <el-input type="textarea" v-model="shFrom.processComments"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
<span slot="footer" class="dialog-footer">
|
|
<span slot="footer" class="dialog-footer">
|
|
@@ -248,7 +270,7 @@
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
|
|
<el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
|
|
- <el-input type="textarea" v-model="form.remarks" placeholder=""/>
|
|
|
|
|
|
+ <el-input type="textarea" v-model="form.processComments" placeholder=""/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
</el-form>
|
|
</el-form>
|
|
@@ -261,7 +283,7 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
-import { listRoadSectionInspection, getRoadSectionInspection, delRoadSectionInspection, addRoadSectionInspection, updateRoadSectionInspection } from "@/api/gas/roadSectionInspection";
|
|
|
|
|
|
+import { batchReview,listRoadSectionInspection, getRoadSectionInspection, delRoadSectionInspection, addRoadSectionInspection, updateRoadSectionInspection } from "@/api/gas/roadSectionInspection";
|
|
import fa from "element-ui/src/locale/lang/fa";
|
|
import fa from "element-ui/src/locale/lang/fa";
|
|
import {listPostAll} from "@/api/system/post";
|
|
import {listPostAll} from "@/api/system/post";
|
|
import Cookies from "js-cookie";
|
|
import Cookies from "js-cookie";
|
|
@@ -317,13 +339,10 @@ export default {
|
|
shFrom:{
|
|
shFrom:{
|
|
id: '',
|
|
id: '',
|
|
processStatus:'',
|
|
processStatus:'',
|
|
- remarks: ""
|
|
|
|
|
|
+ processComments: ""
|
|
},
|
|
},
|
|
// 表单校验
|
|
// 表单校验
|
|
rules: {
|
|
rules: {
|
|
- id: [
|
|
|
|
- { required: true, message: "主键id不能为空", trigger: "blur" }
|
|
|
|
- ],
|
|
|
|
sectionName: [
|
|
sectionName: [
|
|
{ required: true, message: "路段名称不能为空", trigger: "blur" }
|
|
{ required: true, message: "路段名称不能为空", trigger: "blur" }
|
|
],
|
|
],
|
|
@@ -363,18 +382,41 @@ export default {
|
|
if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
|
|
if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
|
|
this.$message.warning("请选择审核状态")
|
|
this.$message.warning("请选择审核状态")
|
|
}
|
|
}
|
|
- updateRoadSectionInspection(this.shFrom).then(response => {
|
|
|
|
- this.$modal.msgSuccess("审核成功");
|
|
|
|
- this.getList();
|
|
|
|
- }).finally(() => {
|
|
|
|
- this.dialogVisible = false;
|
|
|
|
- });
|
|
|
|
|
|
+ if (this.shFrom.id != null) {
|
|
|
|
+ updateRoadSectionInspection(this.shFrom).then(response => {
|
|
|
|
+ this.$modal.msgSuccess("审核成功");
|
|
|
|
+ this.getList();
|
|
|
|
+ }).finally(() => {
|
|
|
|
+ this.dialogVisible = false;
|
|
|
|
+ });
|
|
|
|
+ }else if (this.shFrom.uids.length > 0) {
|
|
|
|
+ batchReview(this.shFrom).then(response => {
|
|
|
|
+ this.$modal.msgSuccess("审核成功");
|
|
|
|
+ this.openSH = false;
|
|
|
|
+ this.getList();
|
|
|
|
+ }).finally(() => {
|
|
|
|
+ this.buttonLoading = false;
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ 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) {
|
|
process(data) {
|
|
this.shFrom.id = undefined
|
|
this.shFrom.id = undefined
|
|
this.shFrom.id = data.id;
|
|
this.shFrom.id = data.id;
|
|
this.shFrom.processStatus = '';
|
|
this.shFrom.processStatus = '';
|
|
- this.shFrom.remarks = '';
|
|
|
|
|
|
+ this.shFrom.processComments = '';
|
|
this.dialogVisible = true;
|
|
this.dialogVisible = true;
|
|
},
|
|
},
|
|
getPostList(){
|
|
getPostList(){
|