|
@@ -1,24 +1,6 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
- <el-form-item label="从表id" prop="subId">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.subId"
|
|
|
- placeholder="请输入从表id"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="审批id" prop="approveId">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.approveId"
|
|
|
- placeholder="请输入审批id"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="单元号" prop="unit">
|
|
|
<el-input
|
|
|
v-model="queryParams.unit"
|
|
@@ -73,24 +55,7 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="确认人1" prop="confirmer1">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.confirmer1"
|
|
|
- placeholder="请输入确认人1"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="确认人2" prop="confirmer2">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.confirmer2"
|
|
|
- placeholder="请输入确认人2"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="时间" prop="confirmationDate">
|
|
|
<el-date-picker clearable size="small" style="width: 200px"
|
|
|
v-model="queryParams.confirmationDate"
|
|
@@ -99,58 +64,7 @@
|
|
|
placeholder="选择时间">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="创建人" prop="createrCode">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.createrCode"
|
|
|
- placeholder="请输入创建人"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="创建时间" prop="createdate">
|
|
|
- <el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="queryParams.createdate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择创建时间">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="修改人" prop="updaterCode">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.updaterCode"
|
|
|
- placeholder="请输入修改人"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="修改时间" prop="updatedate">
|
|
|
- <el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="queryParams.updatedate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择修改时间">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="部门编号" prop="deptId">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.deptId"
|
|
|
- placeholder="请输入部门编号"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="备注" prop="remarks">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.remarks"
|
|
|
- placeholder="请输入备注"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
+
|
|
|
<el-form-item>
|
|
|
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -204,15 +118,43 @@
|
|
|
@click="handleExport"
|
|
|
v-hasPermi="['pssr:pipe:export']"
|
|
|
>导出</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-plus"
|
|
|
+ size="mini"
|
|
|
+ @click="handleSync"
|
|
|
+ v-hasPermi="['pssr:pipe:add']"
|
|
|
+ >同步特种设备数据</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ icon="el-icon-s-promotion"
|
|
|
+ size="mini"
|
|
|
+ @click="handleApprove"
|
|
|
+ v-if="isApprove==0"
|
|
|
+ v-hasPermi="['pssr:overhaulExchanger:edit']"
|
|
|
+ >发起审批
|
|
|
+ </el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ icon="el-icon-check"
|
|
|
+ size="mini"
|
|
|
+ v-if="isApprove==1"
|
|
|
+ @click="handleConfirmApprove"
|
|
|
+ v-hasPermi="['pssr:overhaulExchanger:edit']"
|
|
|
+ >确认
|
|
|
+ </el-button>
|
|
|
</el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
<el-table v-loading="loading" :data="pipeList" @selection-change="handleSelectionChange" :height="clientHeight" border>
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="从表id" align="center" prop="subId" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="审批id" align="center" prop="approveId" :show-overflow-tooltip="true"/>
|
|
|
<el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true"/>
|
|
|
<el-table-column label="管道名称" align="center" prop="pipelineName" :show-overflow-tooltip="true"/>
|
|
|
<el-table-column label="管道编号" align="center" prop="pipelineNo" :show-overflow-tooltip="true"/>
|
|
@@ -221,24 +163,11 @@
|
|
|
<el-table-column label="在有效期内(是/否)" align="center" prop="validity" :show-overflow-tooltip="true"/>
|
|
|
<el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true"/>
|
|
|
<el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="时间" align="center" prop="confirmationDate" width="100">
|
|
|
+ <el-table-column label="确认时间" align="center" prop="confirmationDate" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="创建时间" align="center" prop="createdate" width="100">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="修改时间" align="center" prop="updatedate" width="100">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>
|
|
|
<el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
|
|
|
<el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
@@ -271,12 +200,6 @@
|
|
|
<!-- 添加或修改管道对话框 -->
|
|
|
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
- <el-form-item label="从表id" prop="subId">
|
|
|
- <el-input v-model="form.subId" placeholder="请输入从表id" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="审批id" prop="approveId">
|
|
|
- <el-input v-model="form.approveId" placeholder="请输入审批id" />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="单元号" prop="unit">
|
|
|
<el-input v-model="form.unit" placeholder="请输入单元号" />
|
|
|
</el-form-item>
|
|
@@ -301,7 +224,7 @@
|
|
|
<el-form-item label="确认人2" prop="confirmer2">
|
|
|
<el-input v-model="form.confirmer2" placeholder="请输入确认人2" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="时间" prop="confirmationDate">
|
|
|
+ <el-form-item label="时间确认" prop="confirmationDate">
|
|
|
<el-date-picker clearable size="small" style="width: 200px"
|
|
|
v-model="form.confirmationDate"
|
|
|
type="date"
|
|
@@ -309,40 +232,9 @@
|
|
|
placeholder="选择时间">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="删除状态" prop="delFlag">
|
|
|
- <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="创建人" prop="createrCode">
|
|
|
- <el-input v-model="form.createrCode" placeholder="请输入创建人" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="创建时间" prop="createdate">
|
|
|
- <el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="form.createdate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择创建时间">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="修改人" prop="updaterCode">
|
|
|
- <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="修改时间" prop="updatedate">
|
|
|
- <el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="form.updatedate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择修改时间">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="部门编号" prop="deptId">
|
|
|
- <el-input v-model="form.deptId" placeholder="请输入部门编号" />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="备注" prop="remarks">
|
|
|
<el-input v-model="form.remarks" placeholder="请输入备注" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="归属部门" prop="deptId">
|
|
|
- <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
|
|
|
- </el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
@@ -383,11 +275,13 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listPipe, getPipe, delPipe, addPipe, updatePipe, exportPipe, importTemplate} from "@/api/pssr/pipe";
|
|
|
+import { listPipe,syncPipe, getPipe, delPipe, addPipe, updatePipe, exportPipe, importTemplate} from "@/api/pssr/pipe";
|
|
|
import { treeselect } from "@/api/system/dept";
|
|
|
import { getToken } from "@/utils/auth";
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
+import {doApprove} from "@/api/pssr/approve";
|
|
|
+import {handleConfirmApprove} from "@/api/pssr/blind";
|
|
|
|
|
|
export default {
|
|
|
dicts:['pssr_approve_status'],
|
|
@@ -477,6 +371,14 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
+ console.log(this.subId)
|
|
|
+ console.log(this.serialNumber)
|
|
|
+ const id = this.$route.params.subId
|
|
|
+ const serialNumber = this.$route.params.serialNumber
|
|
|
+ console.log(id)
|
|
|
+ console.log(serialNumber)
|
|
|
+ console.log(this.$route)
|
|
|
+ this.subId = id
|
|
|
//设置表格高度对应屏幕高度
|
|
|
this.$nextTick(() => {
|
|
|
this.clientHeight = document.body.clientHeight -250
|
|
@@ -552,6 +454,15 @@ export default {
|
|
|
this.open = true;
|
|
|
this.title = "添加管道";
|
|
|
},
|
|
|
+ //同步特种设备数据
|
|
|
+ handleSync(){
|
|
|
+ this.loading = true;
|
|
|
+ syncPipe(this.queryParams).then(response => {
|
|
|
+ this.pipeList = response.rows;
|
|
|
+ this.total = response.total;
|
|
|
+ this.loading = false;
|
|
|
+ });
|
|
|
+ },
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
@@ -596,6 +507,26 @@ export default {
|
|
|
this.msgSuccess("删除成功");
|
|
|
})
|
|
|
},
|
|
|
+ /** 确认按钮操作*/
|
|
|
+ handleApprove() {
|
|
|
+ doApprove(this.subId).then(res => {
|
|
|
+ this.msgSuccess("已发起确认流程");
|
|
|
+ })
|
|
|
+ },
|
|
|
+ checkSelectable(row) {
|
|
|
+ console.log(this.isApprove)
|
|
|
+ return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0
|
|
|
+ },
|
|
|
+ handleConfirmApprove() {
|
|
|
+ let data = {
|
|
|
+ ids: this.ids,
|
|
|
+ subId: this.subId,
|
|
|
+ }
|
|
|
+ handleConfirmApprove(data).then(res => {
|
|
|
+ this.msgSuccess("确认成功");
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
+ },
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
const queryParams = this.queryParams;
|