UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报修 页面优化 bug修改

Browse Source
dev
wangwei 2 years ago
parent 0a0b487333
commit 8ed569504c
6 changed files with 309 additions and 85 deletions
Show Stats Download Patch File Download Diff File

2
src/views/inventory/DeviceProjectSet.vue
Unescape Escape View File

@ -77,7 +77,7 @@
<el-table-column label="更新人" prop="updateUserName" show-overflow-tooltip width="140"></el-table-column> <el-table-column label="更新人" prop="updateUserName" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="140"></el-table-column> <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="更新时间" prop="udpateTime" show-overflow-tooltip width="140"></el-table-column> <el-table-column label="更新时间" prop="udpateTime" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip width="140"></el-table-column> <el-table-column label="备注" prop="remak" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="操作" width="140" fixed="right"> <el-table-column label="操作" width="140" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">

98
src/views/inventory/DeviceRepairOrderAudit.vue
Unescape Escape View File

@ -50,6 +50,25 @@
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="维修类型:">
<el-select v-model="filterQuery.repairType" placeholder="请选择维修类型" style="width: 90%" clearable>
<el-option label="自行维修" :value=1></el-option>
<el-option label="外部维修" :value=2></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="紧急程度:">
<el-select v-model="filterQuery.urgencyType" placeholder="请选择紧急程度" style="width: 90%" clearable>
<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-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -72,14 +91,38 @@
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="120"></el-table-column> <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="批次号" prop="batchNo" show-overflow-tooltip width="120"></el-table-column> <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="资产编码" prop="code" show-overflow-tooltip width="120"></el-table-column> <el-table-column label="资产编码" prop="code" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="创建日期" prop="createTime" show-overflow-tooltip width="140"></el-table-column> <!--<el-table-column label="创建日期" prop="createTime" show-overflow-tooltip width="140"></el-table-column>-->
<el-table-column label="创建人" prop="createUserName" show-overflow-tooltip width="120"></el-table-column> <el-table-column label="创建人" prop="createUserName" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="维修类型" prop="repairType" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-tag >
{{ repairType[scope.row.repairType] }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="紧急程度" prop="urgencyType" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-tag>
{{ urgencyType[scope.row.urgencyType] }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="计划完成时间" prop="planTime" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="报修说明" prop="msg" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="报修图片" prop="uploadImage" show-overflow-tooltip width="250">
<template slot-scope="scope">
<div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.uploadImage }}</div>
</template>
</el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报修说明" prop="msg" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="操作"width="120" fixed="right"> <el-table-column label="操作"width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -113,6 +156,7 @@
:visible.sync="formVisible" :visible.sync="formVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:before-close="closeDialog"
width="65%" width="65%"
v-if="formVisible" v-if="formVisible"
> >
@ -122,6 +166,9 @@
></DeviceRepairOrderAduitModify> ></DeviceRepairOrderAduitModify>
</el-dialog> </el-dialog>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
</div> </div>
</template> </template>
@ -130,10 +177,16 @@ import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse"; import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getRepairList, updateStatus, deleteRepairOrder} from "@/api/inventory/deviceRepairOrder"; import {getRepairList, updateStatus, deleteRepairOrder} from "@/api/inventory/deviceRepairOrder";
import DeviceRepairOrderAduitModify from "@/views/inventory/DeviceRepairOrderAuditModify"; import DeviceRepairOrderAduitModify from "@/views/inventory/DeviceRepairOrderAuditModify";
import {previewImage} from "@/api/purchase/supCompany";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
export default { export default {
name: "DeviceRepairOrderAudit", name: "DeviceRepairOrderAudit",
data() { data() {
return { return {
BASE_URL: process.env.VUE_APP_BASE_API,
imgViewerVisible:false,
imgList: [],
filterQuery: { filterQuery: {
orderId: null, orderId: null,
deptCode: this.$store.getters.locDeptCode, deptCode: this.$store.getters.locDeptCode,
@ -155,6 +208,15 @@ export default {
1: "未审核", 1: "未审核",
2: "已审核" 2: "已审核"
}, },
repairType:{
1:"自行维修",
2:"外部维修"
},
urgencyType:{
1:"正常",
2:"较急",
3:"特急"
},
showSearch: true showSearch: true
}; };
}, },
@ -296,8 +358,38 @@ export default {
this.formVisible = false; this.formVisible = false;
this.getList(); this.getList();
}, },
showImgViewer(row){
if(row.uploadImage.substr(-1) == ','){
row.uploadImage=row.uploadImage.slice(0, row.uploadImage.length-1);
}
this.certFileUrl = this.BASE_URL +"/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl + "========");
this.imgList = [];
previewImage({imageUrl: row.uploadImage, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
closeImgViewer() {
this.imgViewerVisible = false;
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
}, },
components: {DeviceRepairOrderAduitModify}, components: {DeviceRepairOrderAduitModify,ElImageViewer},
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
event.preventDefault(); event.preventDefault();

7
src/views/inventory/DeviceRepairOrderAuditModify.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card style="margin: 5px;margin-top: -20px"> <el-card style="margin: 5px;margin-top: -20px">
<el-form :model="repairOrder" ref="dataForm" label-width="100px" style="margin-bottom: -15px"> <el-form :model="repairOrder" ref="dataForm" label-width="100px" :rules="formRules" style="margin-bottom: -15px" >
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px"> <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<!--<el-button--> <!--<el-button-->
<!-- type="primary"--> <!-- type="primary"-->
@ -125,7 +125,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item class="query-form-item" label="维修人:"> <el-form-item class="query-form-item" label="维修人:" prop="repariName">
<el-select v-model="repairOrder.repariName" <el-select v-model="repairOrder.repariName"
placeholder="请选择维修人" placeholder="请选择维修人"
clearable="true" clearable="true"
@ -285,6 +285,9 @@ export default {
headers: {}, headers: {},
fileList: [], fileList: [],
userList:[], userList:[],
formRules:{
repariName:[{required: true, message:"请选择维修人", trigger: 'blur'}]
}
}; };
}, },
methods: { methods: {

193
src/views/inventory/DeviceRepairOrderModify.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card style="margin: 5px;margin-top: -20px"> <el-card style="margin: 5px;margin-top: -20px">
<el-form :model="repairOrder" ref="dataForm" label-width="100px" style="margin-bottom: -15px"> <el-form :model="repairOrder" ref="dataForm" label-width="120px" style="margin-bottom: -15px" :rules="formRules">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px"> <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button <el-button
type="primary" type="primary"
@ -17,10 +17,11 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item class="query-form-item" label="部门:"> <el-form-item class="query-form-item" label="部门:" prop="deptCode">
<el-select v-model="repairOrder.deptCode" <el-select v-model="repairOrder.deptCode"
placeholder="请选择部门" placeholder="请选择部门"
clearable="true" clearable="true"
:disabled="repairOrder.code != null"
@change="deptChange" @change="deptChange"
style="width: 90%" style="width: 90%"
> >
@ -36,10 +37,11 @@
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item class="query-form-item" label="仓库:"> <el-form-item class="query-form-item" label="仓库:" prop="invCode">
<el-select v-model="repairOrder.invCode" <el-select v-model="repairOrder.invCode"
placeholder="请选择仓库" placeholder="请选择仓库"
clearable="true" clearable="true"
:disabled="repairOrder.code != null"
style="width: 90%" style="width: 90%"
> >
<el-option <el-option
@ -56,14 +58,14 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="设备名称:"> <el-form-item class="query-form-item" label="设备名称:" prop="deviceName">
<el-input v-model="repairOrder.deviceName" placeholder="请输入设备名称" style="width: 90%" <el-input v-model="repairOrder.deviceName" placeholder="请输入设备名称" style="width: 90%"
disabled disabled
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="物资编码:"> <el-form-item class="query-form-item" label="物资编码:" prop="code">
<el-input v-model="repairOrder.code" placeholder="请输入编码" style="width: 90%" clearable <el-input v-model="repairOrder.code" placeholder="请输入编码" style="width: 90%" clearable
disabled></el-input> disabled></el-input>
</el-form-item> </el-form-item>
@ -71,7 +73,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="维修类型:"> <el-form-item class="query-form-item" label="维修类型:" prop="repairType">
<el-select v-model="repairOrder.repairType" placeholder="请选择维修类型" style="width: 90%" clearable> <el-select v-model="repairOrder.repairType" placeholder="请选择维修类型" style="width: 90%" clearable>
<el-option label="自行维修" :value=1></el-option> <el-option label="自行维修" :value=1></el-option>
<el-option label="外部维修" :value=2></el-option> <el-option label="外部维修" :value=2></el-option>
@ -80,7 +82,7 @@
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="紧急程度:"> <el-form-item class="query-form-item" label="紧急程度:" prop="urgencyType">
<el-select v-model="repairOrder.urgencyType" placeholder="请选择紧急程度" style="width: 90%" clearable> <el-select v-model="repairOrder.urgencyType" placeholder="请选择紧急程度" style="width: 90%" clearable>
<el-option label="正常" :value=1></el-option> <el-option label="正常" :value=1></el-option>
<el-option label="较急" :value=2></el-option> <el-option label="较急" :value=2></el-option>
@ -91,7 +93,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="计划完成日期:" prop="planTime"> <el-form-item class="query-form-item" label="计划完成日期:" prop="planTime">
<el-date-picker <el-date-picker
v-model="repairOrder.planTime" v-model="repairOrder.planTime"
type="datetime" type="datetime"
@ -147,7 +149,7 @@
<el-dialog <el-dialog
title="选择巡检设备" title="选择报修设备"
:visible.sync="deviceDialogVisible" :visible.sync="deviceDialogVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -155,51 +157,68 @@
v-if="deviceDialogVisible" v-if="deviceDialogVisible"
append-to-body append-to-body
> >
<el-form class="query-form" :model="filterQuery" :inline="true" label-width="100px"> <el-card class="el-card">
<el-form-item class="query-form-item" label="部门:"> <el-form :model="filterQuery" label-width="100px">
<el-input v-model="deptName" disabled></el-input> <el-row>
</el-form-item> <el-col :span="8">
<el-form-item class="query-form-item" label="仓库:"> <el-form-item label="部门:">
<el-input v-model="invName" disabled></el-input> <el-input v-model="deptName" style="width: 90%" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" label="资产编码:"> </el-col>
<el-input v-model="filterQuery.code" clearable></el-input> <el-col :span="8">
</el-form-item> <el-form-item label="仓库:">
<el-form-item> <el-input v-model="invName" style="width: 90%" disabled></el-input>
<el-button-group> </el-form-item>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> </el-col>
<el-button type="primary" icon="search" @click="queryDevice" <el-col :span="8">
>查询 <el-form-item label="资产编码:">
</el-button <el-input v-model="filterQuery.code" style="width: 90%" clearable></el-input>
> </el-form-item>
<el-button type="primary" icon="search" @click="combine">确定</el-button> </el-col>
</el-button-group>
</el-form-item> </el-row>
</el-form>
<el-table v-loading="deviceLoading" :data="deviceList" style="width: 100%"
highlight-current-row <div class="top-right-btn">
@current-change="handleCurrentChange" <el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="queryDevice"
>查询
</el-button
> >
<el-table-column label="序号" type="index"></el-table-column> <el-button type="primary" icon="el-icon-document-add" @click="combine">选入</el-button>
<el-table-column label="设备名称" prop="deviceName" width="200"></el-table-column> </el-button-group>
<el-table-column label="资产编码" prop="code" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="120"></el-table-column> </div>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column> </el-form>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
<el-table-column label="注册证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
</el-table>
<pagination <el-divider style="margin: 15px"></el-divider>
v-show="deviceTotal>0"
:total="deviceTotal" <el-table v-loading="deviceLoading" :data="deviceList" style="width: 100%"
:limit.sync="filterQuery.limit" highlight-current-row border ref="ref"
:page.sync="filterQuery.page" @selection-change="handleCurrentChange"
@pagination="getDeviceList" >
></pagination> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="设备名称" prop="deviceName" width="200"></el-table-column>
<el-table-column label="资产编码" prop="code" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="120"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
<el-table-column label="注册证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
</el-table>
<pagination
v-show="deviceTotal>0"
:total="deviceTotal"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getDeviceList"
></pagination>
</el-card>
</el-dialog> </el-dialog>
</div> </div>
@ -244,11 +263,21 @@ export default {
deptName: null, deptName: null,
invName: null, invName: null,
selectRow: null, selectRow: null,
choiceFile:"选取报修", choiceFile: "选取报修",
uploadUrl: "", uploadUrl: "",
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
headers: {}, headers: {},
fileList: [], fileList: [],
formRules: {
deptCode: [{required: true, message: '请选择部门', trigger: 'blur'}],
invCode: [{required: true, message: '请选择仓库', trigger: 'blur'}],
deviceName: [{required: true, message: '请输入设备名称', trigger: 'blur'}],
code: [{required: true, message: '请输入物资编码', trigger: 'blur'}],
repairType: [{required: true, message: '请选择维修类型', trigger: 'blur'}],
urgencyType: [{required: true, message: '请选择紧急程度', trigger: 'blur'}],
planTime: [{required: true, message: '请选择计划完成日期', trigger: 'blur'}],
},
check: true
}; };
}, },
methods: { methods: {
@ -274,8 +303,32 @@ export default {
}); });
}, },
submit() { submit() {
if (isBlank(this.repairOrder.deptCode) || isBlank(this.repairOrder.invCode) || isBlank(this.repairOrder.code)) { if (isBlank(this.repairOrder.deptCode)) {
this.$message.error("请选择设备相关信息") this.$message.error("请选择部门")
return;
}
if (isBlank(this.repairOrder.invCode)) {
this.$message.error("请选择仓库")
return;
}
if (isBlank(this.repairOrder.deviceName)) {
this.$message.error("请输入设备名称")
return;
}
if (isBlank(this.repairOrder.code)) {
this.$message.error("请输入物资编码")
return;
}
if (isBlank(this.repairOrder.repairType)) {
this.$message.error("请选择维修类型")
return;
}
if (isBlank(this.repairOrder.urgencyType)) {
this.$message.error("请选择紧急程度")
return;
}
if (isBlank(this.repairOrder.planTime)) {
this.$message.error("请选择计划完成日期")
return; return;
} }
let formName = isBlank(this.repairOrder.id) ? "add" : "edit"; let formName = isBlank(this.repairOrder.id) ? "add" : "edit";
@ -347,15 +400,31 @@ export default {
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.getDeviceList(); this.getDeviceList();
}, },
handleCurrentChange(row) { handleCurrentChange(val) {
this.selectRow = row; this.check = !this.check
if (val.length >= 2) {
// 删除索引为0的
// console.log(val.splice(0,val.length-1),'被删除的')
let arrays = val.splice(0, val.length - 1)
arrays.forEach(row => {
this.$refs.ref.toggleRowSelection(row); //除了当前点击的，其他的全部取消选中
})
}
// console.log(val,'最后得到的')
this.selectRow = val[0];
}, },
combine() { combine() {
if (this.check) {
this.$message.error("请勾选设备!")
return;
}
this.deviceDialogVisible = false; this.deviceDialogVisible = false;
this.repairOrder.code = this.selectRow.code; this.repairOrder.code = this.selectRow.code;
this.repairOrder.deviceName = this.selectRow.deviceName; this.repairOrder.deviceName = this.selectRow.deviceName;
}, },
uploadHandlePreview(file) {}, uploadHandlePreview(file) {
},
uploadHandleRemove(file, fileList) { uploadHandleRemove(file, fileList) {
this.repairOrder.uploadImage = null; this.repairOrder.uploadImage = null;
console.log(file, fileList); console.log(file, fileList);
@ -401,11 +470,11 @@ export default {
}, },
uploadHandleSuccess(response, file, fileList) { uploadHandleSuccess(response, file, fileList) {
if (response.code === 20000) { if (response.code === 20000) {
if(this.repairOrder.uploadImage == null){ if (this.repairOrder.uploadImage == null) {
this.repairOrder.uploadImage = response.data.name+","; this.repairOrder.uploadImage = response.data.name + ",";
}else{ } else {
this.repairOrder.uploadImage += response.data.name+","; this.repairOrder.uploadImage += response.data.name + ",";
} }
} else { } else {
this.$message.error("文件上传失败：" + response.message); this.$message.error("文件上传失败：" + response.message);
} }

51
src/views/inventory/DeviceRepairOrderNew.vue
Unescape Escape View File

@ -50,6 +50,25 @@
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="维修类型:">
<el-select v-model="filterQuery.repairType" placeholder="请选择维修类型" style="width: 90%" clearable>
<el-option label="自行维修" :value=1></el-option>
<el-option label="外部维修" :value=2></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="紧急程度:">
<el-select v-model="filterQuery.urgencyType" placeholder="请选择紧急程度" style="width: 90%" clearable>
<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-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -67,7 +86,7 @@
border> border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="报修单号" prop="orderId" show-overflow-tooltip width="140"></el-table-column> <el-table-column label="报修单号" prop="orderId" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="部门" prop="deptName" show-overflow-tooltip width="120"></el-table-column> <el-table-column label="部门" prop="deptName" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="仓库" prop="invName" show-overflow-tooltip width="120"></el-table-column> <el-table-column label="仓库" prop="invName" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="设备名称" prop="deviceName" show-overflow-tooltip width="120"></el-table-column> <el-table-column label="设备名称" prop="deviceName" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="120"></el-table-column> <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="120"></el-table-column>
@ -90,7 +109,7 @@
</el-table-column> </el-table-column>
<el-table-column label="计划完成时间" prop="planTime" show-overflow-tooltip width="140"></el-table-column> <el-table-column label="计划完成时间" prop="planTime" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="报修说明" prop="msg" show-overflow-tooltip width="180"></el-table-column> <el-table-column label="报修说明" prop="msg" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="报修图片" prop="uploadImage" show-overflow-tooltip width="250"> <el-table-column label="报修图片" prop="uploadImage" show-overflow-tooltip width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.uploadImage }}</div> <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.uploadImage }}</div>
</template> </template>
@ -101,7 +120,7 @@
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="200" fixed="right"> <el-table-column label="操作" width="200" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -190,17 +209,17 @@ export default {
1: "未审核", 1: "未审核",
2: "已审核" 2: "已审核"
}, },
repairType:{ repairType: {
1:"自行维修", 1: "自行维修",
2:"外部维修" 2: "外部维修"
}, },
urgencyType:{ urgencyType: {
1:"正常", 1: "正常",
2:"较急", 2: "较急",
3:"特急" 3: "特急"
}, },
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
imgViewerVisible:false, imgViewerVisible: false,
imgList: [], imgList: [],
formName: null, formName: null,
formMap: { formMap: {
@ -345,11 +364,11 @@ export default {
this.formVisible = false; this.formVisible = false;
this.getList(); this.getList();
}, },
showImgViewer(row){ showImgViewer(row) {
if(row.uploadImage.substr(-1) == ','){ if (row.uploadImage.substr(-1) == ',') {
row.uploadImage=row.uploadImage.slice(0, row.uploadImage.length-1); row.uploadImage = row.uploadImage.slice(0, row.uploadImage.length - 1);
} }
this.certFileUrl = this.BASE_URL +"/udiwms/image/register/file/getImage?type=image2&name="; this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl + "========"); console.log(this.certFileUrl + "========");
this.imgList = []; this.imgList = [];
previewImage({imageUrl: row.uploadImage, certFileUrl: this.certFileUrl}).then(response => { previewImage({imageUrl: row.uploadImage, certFileUrl: this.certFileUrl}).then(response => {
@ -377,7 +396,7 @@ export default {
}, },
components: { components: {
deviceRepairOrderModify,ElImageViewer deviceRepairOrderModify, ElImageViewer
}, },
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {

43
src/views/inventory/DeviceRepairOrderhandle.vue
Unescape Escape View File

@ -50,6 +50,38 @@
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="维修人:">
<el-select v-model="filterQuery.repariName"
placeholder="请选择维修人"
clearable="true"
style="width: 90%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.employeeName"
:value="item.userid">
<span style="float: left">{{ item.employeeName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="报修状态:">
<el-select v-model="filterQuery.status"
placeholder="请选择维修人"
clearable="true"
style="width: 90%"
>
<el-option label="已审核" :value="2"></el-option>
<el-option label="维修中" :value="4"></el-option>
<el-option label="已处理" :value="5"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -162,6 +194,7 @@ import {getRepairList, updateStatus, deleteRepairOrder} from "@/api/inventory/de
import {previewImage} from "@/api/purchase/supCompany"; import {previewImage} from "@/api/purchase/supCompany";
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import DeviceRepairOrderStart from "@/views/inventory/DeviceRepairOrderStart"; import DeviceRepairOrderStart from "@/views/inventory/DeviceRepairOrderStart";
import {warehouseUserList} from "@/api/system/invWarehouse";
export default { export default {
name: "DeviceRepairOrderAudit", name: "DeviceRepairOrderAudit",
@ -200,7 +233,8 @@ export default {
repairMap: { repairMap: {
start: "开始任务", start: "开始任务",
end: "结束任务" end: "结束任务"
} },
userList: [],
}; };
}, },
methods: { methods: {
@ -225,6 +259,12 @@ export default {
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.getList(); this.getList();
}, },
getuserList() {
let param = {code: this.$store.getters.locInvCode}
warehouseUserList(param).then((res) => {
this.userList = res.data.list || [];
})
},
getList() { getList() {
this.loading = true; this.loading = true;
getRepairList(this.filterQuery).then((res) => { getRepairList(this.filterQuery).then((res) => {
@ -347,6 +387,7 @@ export default {
}, },
created() { created() {
this.getDeptList(); this.getDeptList();
this.getuserList();
}, },
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save