|
|
|
|
@ -3,7 +3,7 @@
|
|
|
|
|
<el-card style="margin: 5px;margin-top: -20px">
|
|
|
|
|
<el-form :model="inspectTake" ref="formRef" label-width="120px" style="margin-bottom: -15px">
|
|
|
|
|
<el-button-group style="display: flex;margin: 0px 0 10px 90%; height: 35px">
|
|
|
|
|
<el-button type="primary" v-if="type != 3" @click.native="submit(type)">提交</el-button>
|
|
|
|
|
<el-button type="primary" v-if="type != 5" @click.native="submit(type)">提交</el-button>
|
|
|
|
|
</el-button-group>
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
|
@ -53,7 +53,7 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row v-if="type == 3">
|
|
|
|
|
<el-row v-if="type == 5">
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="开始时间:" prop="deviceName">
|
|
|
|
|
<el-input v-model="inspectTake.strartTime" disabled placeholder="请输入开始时间" style="width: 90%"
|
|
|
|
|
@ -69,6 +69,17 @@
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="项目类型:" prop="type">
|
|
|
|
|
<el-select v-model="inspectTake.type" style="width: 90%" disabled placeholder="请选择项目类型" clearable="true">
|
|
|
|
|
<el-option label="巡检" :value="1"></el-option>
|
|
|
|
|
<el-option label="养护" :value="2"></el-option>
|
|
|
|
|
<el-option label="报修" :value="3"></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="巡检人:" prop="inspectUser">
|
|
|
|
|
<el-select v-model="inspectTake.inspectUser" disabled placeholder="委托验收人" clearable
|
|
|
|
|
@ -88,7 +99,7 @@
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
|
|
<el-input type="textarea" :rows="3" :disabled="editType == 2 || type == 3"
|
|
|
|
|
<el-input type="textarea" :rows="3" :disabled="editType == 2 || type == 5"
|
|
|
|
|
v-model="inspectTake.remark"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
@ -100,10 +111,11 @@
|
|
|
|
|
<el-card>
|
|
|
|
|
|
|
|
|
|
<el-row type="flex" justify="end">
|
|
|
|
|
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 10px">
|
|
|
|
|
<el-button type="primary" @click.native.stop="selectPlanFunction(null)" v-if="type != 5" :loading="loading">选入</el-button>
|
|
|
|
|
</el-button-group>
|
|
|
|
|
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
|
|
|
|
|
<el-button type="primary" @click.native.stop="setPlanFunction(null)" :loading="loading" v-if="type != 3">
|
|
|
|
|
新增
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="primary" @click.native.stop="setPlanFunction(null)" :loading="loading" v-if="type != 5">新增</el-button>
|
|
|
|
|
</el-button-group>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
@ -123,7 +135,7 @@
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="操作" width="200">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-button type="text" size="small" v-if="type != 3" @click.native.stop="editDialog(scope.row,'edit')">
|
|
|
|
|
<el-button type="text" size="small" v-if="type != 5" @click.native.stop="editDialog(scope.row,'edit')">
|
|
|
|
|
编辑
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="text" size="small" @click.native.stop="editDialog(scope.row,'detail')">详情</el-button>
|
|
|
|
|
@ -148,6 +160,23 @@
|
|
|
|
|
:closeDialog="inspectTakeSetCloseDialog"
|
|
|
|
|
></DeviceInspectTakeProjectSet>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
|
title="设备选入"
|
|
|
|
|
:visible.sync="inspectSelectPlanSetVisible"
|
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
|
width="80%"
|
|
|
|
|
append-to-body
|
|
|
|
|
v-if="inspectSelectPlanSetVisible"
|
|
|
|
|
>
|
|
|
|
|
<DeviceProjectSelectTake
|
|
|
|
|
:inputQuery="inputQuery"
|
|
|
|
|
:type="inspectTake.type"
|
|
|
|
|
:closeDialog="inspectTakeSetCloseDialog"
|
|
|
|
|
></DeviceProjectSelectTake>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
@ -160,9 +189,14 @@ import {getDeptListByUser} from "@/api/auth/authDept";
|
|
|
|
|
import {getInvListByUser, warehouseUserList} from "@/api/system/invWarehouse";
|
|
|
|
|
import {saveDeviceInspectPlan, updateStatus} from "@/api/inventory/deviceInspectPlan";
|
|
|
|
|
import DeviceInspectTakeProjectSet from "@/views/inventory/DeviceInspectTakeProjectSet"
|
|
|
|
|
import {selectDeviceInspecTakeDetail, uploadDeviceInspecTake} from "@/api/inventory/deviceInspectTake";
|
|
|
|
|
import {
|
|
|
|
|
saveDeviceInspectTake,
|
|
|
|
|
selectDeviceInspecTakeDetail,
|
|
|
|
|
uploadDeviceInspecTake
|
|
|
|
|
} from "@/api/inventory/deviceInspectTake";
|
|
|
|
|
import {previewImage, previewFile} from "@/api/purchase/supCompany";
|
|
|
|
|
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
|
|
|
|
|
import DeviceProjectSelectTake from "@/views/inventory/DeviceProjectSelectTake"
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
props: {
|
|
|
|
|
@ -187,6 +221,7 @@ export default {
|
|
|
|
|
userList: [],
|
|
|
|
|
imgList: [],
|
|
|
|
|
name:'',
|
|
|
|
|
isColse: false,
|
|
|
|
|
BASE_URL: process.env.VUE_APP_BASE_API,
|
|
|
|
|
editType: null,
|
|
|
|
|
deviceDialogVisible: false,
|
|
|
|
|
@ -218,6 +253,7 @@ export default {
|
|
|
|
|
selectRow: null,
|
|
|
|
|
imgViewerVisible: false,
|
|
|
|
|
inspectTakeSetVisible: false,
|
|
|
|
|
inspectSelectPlanSetVisible: false,
|
|
|
|
|
statusMap: {
|
|
|
|
|
1: "未开始",
|
|
|
|
|
2: "已检查",
|
|
|
|
|
@ -250,8 +286,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
submit(status) {
|
|
|
|
|
//判断状态
|
|
|
|
|
var falg = true
|
|
|
|
|
if (this.type == 2) {
|
|
|
|
|
if (this.type == 4) {
|
|
|
|
|
for (var i = 0; i < this.delectList.length; i++) {
|
|
|
|
|
if (this.delectList[i].status != 2) {
|
|
|
|
|
return this.$message.error("还有任务未检查！");
|
|
|
|
|
@ -331,7 +366,30 @@ export default {
|
|
|
|
|
this.inspectTakeSetVisible = true;
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
selectPlanFunction(row){
|
|
|
|
|
if (this.inspectTake.orderId != null) { //edit
|
|
|
|
|
if(isBlank(row)){
|
|
|
|
|
this.inputQuery = {
|
|
|
|
|
id: null,
|
|
|
|
|
projectCode: null,
|
|
|
|
|
projectContent: null,
|
|
|
|
|
status: null,
|
|
|
|
|
result: null,
|
|
|
|
|
inspectImage: null,
|
|
|
|
|
inspectUser: null,
|
|
|
|
|
updateTime: null,
|
|
|
|
|
taskOrderIdFk: null
|
|
|
|
|
},
|
|
|
|
|
this.inputQuery.inspectUser = this.inspectTake.inspectUser
|
|
|
|
|
this.inputQuery.taskOrderIdFk = this.inspectTake.orderId
|
|
|
|
|
}else{
|
|
|
|
|
this.inputQuery = row
|
|
|
|
|
}
|
|
|
|
|
}else{
|
|
|
|
|
this.inputQuery.taskOrderIdFk = this.inspectTake.orderId
|
|
|
|
|
}
|
|
|
|
|
this.inspectSelectPlanSetVisible = true;
|
|
|
|
|
},
|
|
|
|
|
editDialog(row, type) {
|
|
|
|
|
this.inputQuery = row;
|
|
|
|
|
this.inspectTakeSetVisible = true
|
|
|
|
|
@ -376,18 +434,29 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
inspectTakeSetCloseDialog() {
|
|
|
|
|
this.inspectTakeSetVisible = false
|
|
|
|
|
this.inspectSelectPlanSetVisible = false
|
|
|
|
|
var count=0;
|
|
|
|
|
if (this.type == 4) {
|
|
|
|
|
for (var i = 0; i < this.delectList.length; i++) {
|
|
|
|
|
if (this.delectList[i].status != 2) {
|
|
|
|
|
count++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(count == 0){
|
|
|
|
|
return this.$message.success("任务已全部完成")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
,
|
|
|
|
|
components: {
|
|
|
|
|
DeviceInspectTakeProjectSet, ElImageViewer
|
|
|
|
|
DeviceInspectTakeProjectSet, ElImageViewer ,DeviceProjectSelectTake
|
|
|
|
|
}
|
|
|
|
|
,
|
|
|
|
|
created() {
|
|
|
|
|
this.getDeptList();
|
|
|
|
|
this.getUserBus();
|
|
|
|
|
console.log(this.type)
|
|
|
|
|
if (!isBlank(this.inspectTake.id)) {
|
|
|
|
|
this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
|
|
|
|
|
}
|
|
|
|
|
|
郑明梁
2 years ago