1.初步完成维保单页面

prod
x_z 3 years ago
parent f462ffc5a9
commit 665d82c0c7

@ -1,7 +1,7 @@
import axios from "../../utils/request";
export function getMaintenanceList(params) {
export function getDeviceInspectOrderList(params) {
return axios({
url: "/udiwms/inv/device/inspect/order/filter",
method: "get",
@ -9,45 +9,37 @@ export function getMaintenanceList(params) {
});
}
export function addDeviceInspectOrder(params) {
export function saveDeviceInspectOrder(data, formName) {
return axios({
url: "/udiwms/inv/device/inspect/order/add",
method: "get",
data: params
url: formName === "add" ? "/udiwms/inv/device/inspect/order/add" : "/udiwms/inv/device/inspect/order/update",
method: "post",
data: data
});
}
export function updateDeviceInspectOrder(params) {
return axios({
url: "/udiwms/inv/device/inspect/order/update",
method: "get",
data: params
});
}
export function submitAudit(params) {
export function submitAudit(data) {
return axios({
url: "/udiwms/inv/device/inspect/order/submitAudit",
method: "get",
data: params
method: "post",
data: data
});
}
export function updateStatus(params) {
export function updateStatus(data) {
return axios({
url: "/udiwms/inv/device/inspect/order/updateStatus",
method: "get",
data: params
method: "post",
data: data
});
}
export function deleteDeviceInspectOrder(params) {
export function deleteDeviceInspectOrder(data) {
return axios({
url: "/udiwms/inv/device/inspect/order/delete",
method: "get",
data: params
method: "post",
data: data
});
}

@ -1,19 +1,11 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="维保记录号:">
<el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
<el-col :span="8">
<el-form-item class="query-form-item" label="部门:">
<el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
@change="deptChange"
>
<el-option
@ -26,30 +18,10 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="维保类型:">
<el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择维保类型" clearable="true"
>
<el-option :value="1" label="报修"/>
<el-option :value="2" label="计划"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="上级单号:">
<el-input v-model="filterQuery.lastOrderId" style="width: 90%" placeholder="请输入上级单号"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="出库仓库:">
<el-select v-model="filterQuery.fromInvCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
<el-col :span="8">
<el-form-item class="query-form-item" label="仓库:">
<el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
>
<el-option
v-for="item in invList"
@ -62,21 +34,41 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="维保记录号:">
<el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-col :span="6">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="资产编码:">
<el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
<el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="维保类型:">
<el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择维保类型" clearable="true"
>
<el-option :value="1" label="报修"/>
<el-option :value="2" label="计划"/>
<el-option :value="3" label="手动"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="设备状态:">
<el-select v-model="filterQuery.deviceStatus" style="width: 90%" placeholder="请选择设备状态" clearable="true"
<el-select v-model="filterQuery.deviceStatus" style="width: 90%" placeholder="请选择设备状态"
clearable="true"
>
<el-option :value="0" label="异常"/>
<el-option :value="2" label="正常"/>
<el-option :value="0" label="异常"/>
<el-option :value="1" label="正常"/>
</el-select>
</el-form-item>
</el-col>
@ -84,6 +76,7 @@
</el-form>
<div class="top-right-btn">
<el-button-group style="margin-left: 10px;display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
</el-button-group>
@ -93,25 +86,28 @@
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="设备维保记录号" prop="orderId"></el-table-column>
<el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="设备名称" prop="deviceName"></el-table-column>
<el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="上级单号" prop="lastOrderId"></el-table-column>
<el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="创建日期" prop="createTime"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="审核日期" prop="auditTime"></el-table-column>
<el-table-column label="创建人" prop="createUserName"></el-table-column>
<el-table-column label="审核人" prop="auditUserName"></el-table-column>
<el-table-column label="维保类型" prop="type">
<template slot-scope="scope">
<el-tag>{{ deviceStatusMap[scope.row.status] }}</el-tag>
<el-tag>{{ typeMap[scope.row.type] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="养护说明" prop="remark"></el-table-column>
<el-table-column label="设备状态" prop="status" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.deviceStatus] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
@ -151,24 +147,20 @@
import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {
getDeviceReceiveOrderDetailList,
updateDeviceReceiveOrderStatus,
deleteDeviceReceiveOrder,
getDeviceReceiveOrderList
} from "@/api/inventory/deviceReceiveOrder";
import {getMaintenanceList,submitAudit,deleteDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder";
import {getDeviceInspectOrderList, updateStatus, deleteDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder";
export default {
name: "DeviceReceiveOrderAudit",
name: "DeviceReceiveOrderNew",
data() {
return {
filterQuery: {
orderId: null,
deptCode: this.$store.getters.locDeptCode,
fromInvCode: null,
fromInvSpaceCode: null,
invCode: null,
code: null,
status: 1,
type: 1,
deviceStatus: 1,
page: 1,
limit: 20,
},
@ -178,22 +170,33 @@ export default {
invList: [],
spaceList: [],
loading: false,
formVisible: false,
statusMap: {
0: "草稿",
1: "未审核",
2: "已审核"
2: "已审核 ",
},
detailQuery: {
orderIdFk: null,
page: 1,
limit: 20,
deviceStatusMap: {
0: "正常",
1: "异常",
},
typeMap: {
1: "报修",
2: "计划",
3: "手动"
},
formName: null,
formMap: {
add: "新增维保记录",
edit: "编辑维保记录"
},
detailList: [],
detailLoading: false,
detailTotal: 0
showSearch: true
};
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: "",
@ -201,13 +204,12 @@ export default {
this.filterQuery = {
orderId: null,
deptCode: this.$store.getters.locDeptCode,
fromInvCode: null,
fromInvSpaceCode: null,
invCode: null,
code: null,
status: 1,
page: 1,
limit: 20,
};
this.spaceList = [];
this.getList();
},
onSubmit() {
@ -216,7 +218,7 @@ export default {
},
getList() {
this.loading = true;
getMaintenanceList(this.filterQuery).then((res) => {
getDeviceInspectOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
@ -263,12 +265,41 @@ export default {
});
},
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.fromInvCode,invStorageCode:this.filterQuery.fromInvCode.deptCode, status: 1};
let params = {
invWarehouseCode: this.filterQuery.fromInvCode,
invStorageCode: this.filterQuery.fromInvCode.deptCode,
status: 1
};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
this.getList();
})
},
deleteDialog(rowId) {
this.$confirm('此操作将永久删除该维保单, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: rowId};
this.loading = true;
deleteDeviceInspectOrder(params).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.$message.success("删除成功!");
this.getList();
} else {
this.$message.error(res.message);
}
}).catch(() => {
this.loading = false;
});
});
},
closeDialog() {
this.formVisible = false;
this.getList();
},
auditOrder(row) {
this.$confirm('请选择审核意见', '提示', {
confirmButtonText: '通过',
@ -280,10 +311,10 @@ export default {
distinguishCancelAndClose: true,//
}).then(() => {
let params = {
id: row.id,
orderId: row.orderId,
status: 2
};
updateDeviceReceiveOrderStatus(params).then((res) => {
updateStatus(params).then((res) => {
if (res.code === 20000) {
this.$message.success("审核通过!");
this.getList();
@ -296,10 +327,10 @@ export default {
}).catch((action) => {
if (action === "cancel") {
let params = {
id: row.id,
orderId: row.orderId,
status: 0
};
updateDeviceReceiveOrderStatus(params).then((res) => {
updateStatus(params).then((res) => {
if (res.code === 20000) {
this.$message.success("已驳回!")
this.getList();
@ -314,31 +345,8 @@ export default {
}
});
},
deleteDialog(rowId) {
this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: rowId};
this.loading = true;
deleteDeviceReceiveOrder(params).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.$message.success("删除成功!");
this.getList();
} else {
this.$message.error(res.message);
}
}).catch(() => {
this.loading = false;
});
});
},
closeDialog() {
this.formVisible = false;
this.getList();
},
},
components: {
},
mounted() {
document.body.ondrop = function (event) {

@ -1,19 +1,11 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="维保记录号:">
<el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
<el-col :span="8">
<el-form-item class="query-form-item" label="部门:">
<el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
@change="deptChange"
>
<el-option
@ -26,30 +18,10 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="维保类型:">
<el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择维保类型" clearable="true"
>
<el-option :value="1" label="报修"/>
<el-option :value="2" label="计划"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="上级单号:">
<el-input v-model="filterQuery.lastOrderId" style="width: 90%" placeholder="请输入上级单号"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="出库仓库:">
<el-select v-model="filterQuery.fromInvCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
<el-col :span="8">
<el-form-item class="query-form-item" label="仓库:">
<el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
>
<el-option
v-for="item in invList"
@ -62,21 +34,41 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="维保记录号:">
<el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-col :span="6">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="资产编码:">
<el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
<el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="维保类型:">
<el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择维保类型" clearable="true"
>
<el-option :value="1" label="报修"/>
<el-option :value="2" label="计划"/>
<el-option :value="3" label="手动"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="设备状态:">
<el-select v-model="filterQuery.deviceStatus" style="width: 90%" placeholder="请选择设备状态" clearable="true"
<el-select v-model="filterQuery.deviceStatus" style="width: 90%" placeholder="请选择设备状态"
clearable="true"
>
<el-option :value="0" label="异常"/>
<el-option :value="2" label="正常"/>
<el-option :value="0" label="异常"/>
<el-option :value="1" label="正常"/>
</el-select>
</el-form-item>
</el-col>
@ -84,6 +76,7 @@
</el-form>
<div class="top-right-btn">
<el-button-group style="margin-left: 10px;display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
</el-button-group>
@ -93,25 +86,30 @@
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="设备维保记录号" prop="orderId"></el-table-column>
<el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="设备名称" prop="deviceName"></el-table-column>
<el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="上级单号" prop="lastOrderId"></el-table-column>
<el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="创建日期" prop="createTime"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="审核日期" prop="auditTime"></el-table-column>
<el-table-column label="创建人" prop="createUserName"></el-table-column>
<el-table-column label="审核时间" prop="auditTime"></el-table-column>
<el-table-column label="审核人" prop="auditUserName"></el-table-column>
<el-table-column label="维保类型" prop="type">
<template slot-scope="scope">
<el-tag>{{ deviceStatusMap[scope.row.status] }}</el-tag>
<el-tag>{{ typeMap[scope.row.type] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="养护说明" prop="remark"></el-table-column>
<el-table-column label="设备状态" prop="status" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.deviceStatus] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
@ -133,22 +131,20 @@
import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {
getDeviceReceiveOrderDetailList,
getDeviceReceiveOrderList
} from "@/api/inventory/deviceReceiveOrder";
import {getMaintenanceList,submitAudit,deleteDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder";
import {getDeviceInspectOrderList} from "@/api/inventory/deviceInspectOrder";
export default {
name: "DeviceReceiveOrderCompleted",
name: "DeviceReceiveOrderNew",
data() {
return {
filterQuery: {
orderId: null,
deptCode: this.$store.getters.locDeptCode,
fromInvCode: null,
fromInvSpaceCode: null,
status: 2,
invCode: null,
code: null,
status: 1,
type: 1,
deviceStatus: 1,
page: 1,
limit: 20,
},
@ -158,22 +154,33 @@ export default {
invList: [],
spaceList: [],
loading: false,
formVisible: false,
statusMap: {
0: "草稿",
1: "未审核",
2: "已审核"
2: "已审核 ",
},
detailQuery: {
orderIdFk: null,
page: 1,
limit: 20,
deviceStatusMap: {
0: "正常",
1: "异常",
},
typeMap: {
1: "报修",
2: "计划",
3: "手动"
},
detailList: [],
detailLoading: false,
detailTotal: 0
formName: null,
formMap: {
add: "新增维保记录",
edit: "编辑维保记录"
},
showSearch: true
};
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: "",
@ -181,13 +188,12 @@ export default {
this.filterQuery = {
orderId: null,
deptCode: this.$store.getters.locDeptCode,
fromInvCode: null,
fromInvSpaceCode: null,
status: 2,
invCode: null,
code: null,
status: 1,
page: 1,
limit: 20,
};
this.spaceList = [];
this.getList();
},
onSubmit() {
@ -196,9 +202,7 @@ export default {
},
getList() {
this.loading = true;
this.detailList = [];
this.detailTotal = 0;
getMaintenanceList(this.filterQuery).then((res) => {
getDeviceInspectOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
@ -235,7 +239,7 @@ export default {
this.getSpaceList();
},
getInvList() {
let params = {deptCode: this.filterQuery.fromDeptCode};
let params = {deptCode: this.filterQuery.deptCode};
findInvByUser(params)
.then((response) => {
this.invList = response.data || [];
@ -247,7 +251,7 @@ export default {
getSpaceList() {
let params = {
invWarehouseCode: this.filterQuery.fromInvCode,
invStorageCode: this.filterQuery.fromInvCode.fromDeptCode,
invStorageCode: this.filterQuery.fromInvCode.deptCode,
status: 1
};
getInvSpaceList(params).then((res) => {
@ -255,10 +259,8 @@ export default {
this.getList();
})
},
closeDialog() {
this.formVisible = false;
this.getList();
},
},
components: {
},
mounted() {
document.body.ondrop = function (event) {

@ -0,0 +1,326 @@
<template>
<div>
<el-card style="margin: 5px;margin-top: -20px">
<el-form :model="inspectOrder" ref="dataForm" label-width="100px" style="margin-bottom: -15px">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button
type="primary"
v-if="inspectOrder.orderId === null"
@click.native="selectDevice()"
>选择设备
</el-button>
<el-button
type="primary"
@click.native="submit()"
>保存
</el-button>
</el-button-group>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="部门:">
<el-select v-model="inspectOrder.deptCode"
placeholder="请选择部门"
clearable="true"
@change="deptChange"
style="width: 90%"
>
<el-option
v-for="item in deptList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="仓库:">
<el-select v-model="inspectOrder.invCode"
placeholder="请选择仓库"
clearable="true"
style="width: 90%"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="设备名称:">
<el-input v-model="inspectOrder.deviceName" placeholder="请输入设备名称" style="width: 90%"
disabled
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="物资编码:">
<el-input v-model="inspectOrder.code" placeholder="请输入编码" style="width: 90%" clearable
disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="维保类型:">
<el-select v-model="inspectOrder.type"
placeholder="请选择部门"
clearable="true"
disabled
style="width: 90%"
>
<el-option :value="1" label="报修"></el-option>
<el-option :value="2" label="计划"></el-option>
<el-option :value="3" label="手动"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="设备状态:">
<el-select v-model="inspectOrder.deviceStatus"
placeholder="请选择设备状态"
@change="deptChange"
style="width: 90%"
>
<el-option :value="0" label="异常"></el-option>
<el-option :value="1" label="正常"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="18">
<el-form-item class="query-form-item" label="备注:">
<el-input v-model="inspectOrder.remark" type="textarea" style="width: 100%" auto-complete="true" autosize></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-dialog
title="选择维保设备"
:visible.sync="deviceDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="65%"
v-if="deviceDialogVisible"
append-to-body
>
<el-form class="query-form" :model="filterQuery" :inline="true" label-width="100px">
<el-form-item class="query-form-item" label="部门:">
<el-input v-model="deptName" disabled></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="仓库:">
<el-input v-model="invName" disabled></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="资产编码:">
<el-input v-model="filterQuery.code" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="queryDevice"
>查询
</el-button
>
<el-button type="primary" icon="search" @click="combine"></el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="deviceLoading" :data="deviceList" style="width: 100%"
highlight-current-row
@current-change="handleCurrentChange"
>
<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-dialog>
</div>
</template>
<script>
import {isBlank} from "@/utils/strUtil";
import {getDeptListByUser} from "@/api/auth/authDept";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getDeptDeviceList} from "@/api/inventory/deptDevice";
import {saveDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder";
export default {
props: {
inspectOrder: {
type: Object,
required: true
},
closeDialog: {
type: Function,
required: true
}
},
name: "DeviceInspectOrderModify",
data() {
return {
deptList: [],
invList: [],
deviceDialogVisible: false,
deviceLoading: false,
filterQuery: {
code: null,
deptCode: null,
invCode: null,
page: 1,
limit: 10
},
deviceList: [],
deviceTotal: 0,
deptName: null,
invName: null,
selectRow: null,
};
},
methods: {
deptChange() {
this.inspectOrder.invCode = null;
this.invList = [];
this.getInvList();
},
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
this.getInvList();
});
},
getInvList() {
let params = {deptCode: this.inspectOrder.deptCode};
getInvListByUser(params)
.then((response) => {
this.invList = response.data || [];
this.getList();
})
.catch(() => {
});
},
submit() {
if (isBlank(this.inspectOrder.deptCode) || isBlank(this.inspectOrder.invCode) || isBlank(this.inspectOrder.code)) {
this.$message.error("请选择设备相关信息")
return;
}
let formName = isBlank(this.inspectOrder.id) ? "add" : "edit";
saveDeviceInspectOrder(this.inspectOrder, formName).then((res) => {
if (res.code === 20000) {
this.$message.success("添加成功");
this.closeDialog();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
});
},
selectDevice() {
if (isBlank(this.inspectOrder.deptCode) || isBlank(this.inspectOrder.invCode)) {
this.$message.warning("请先选择维保设备所属部门和仓库");
return;
}
this.setDeptAnInvName();
this.deviceDialogVisible = true;
this.filterQuery = {
code: null,
deptCode: this.inspectOrder.deptCode,
invCode: this.inspectOrder.invCode,
page: 1,
limit: 10
}
this.getDeviceList();
},
getDeviceList() {
this.deviceLoading = true;
this.deviceList = [];
getDeptDeviceList(this.filterQuery).then((res) => {
this.deviceLoading = false;
if (res.code === 20000) {
this.deviceList = res.data.list || [];
this.deviceTotal = res.data.total || 0;
} else {
this.$message.error(res.message);
this.deviceList = [];
this.deviceTotal = 0;
}
}).catch((error) => {
this.deviceLoading = false;
this.deviceList = [];
this.deviceTotal = 0;
});
},
setDeptAnInvName() {
this.deptList.forEach((item) => {
if (item.code === this.inspectOrder.deptCode) {
this.deptName = item.name;
}
});
this.invList.forEach((item) => {
if (item.code === this.inspectOrder.invCode) {
this.invName = item.name;
}
})
},
onReset() {
this.filterQuery.code = null;
this.filterQuery.page = 1;
this.getDeviceList();
},
queryDevice() {
this.filterQuery.page = 1;
this.getDeviceList();
},
handleCurrentChange(row) {
this.selectRow = row;
},
combine() {
this.deviceDialogVisible = false;
this.inspectOrder.code = this.selectRow.code;
this.inspectOrder.deviceName = this.selectRow.deviceName;
},
},
created() {
this.getDeptList();
},
}
</script>
<style scoped>
</style>

@ -1,19 +1,11 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="维保记录号:">
<el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
<el-col :span="8">
<el-form-item class="query-form-item" label="部门:">
<el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
@change="deptChange"
>
<el-option
@ -26,30 +18,10 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="维保类型:">
<el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择维保类型" clearable="true"
>
<el-option :value="1" label="报修"/>
<el-option :value="2" label="计划"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="上级单号:">
<el-input v-model="filterQuery.lastOrderId" style="width: 90%" placeholder="请输入上级单号"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="出库仓库:">
<el-select v-model="filterQuery.fromInvCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
<el-col :span="8">
<el-form-item class="query-form-item" label="仓库:">
<el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
>
<el-option
v-for="item in invList"
@ -62,21 +34,41 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="维保记录号:">
<el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="资产编码:">
<el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
<el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="维保类型:">
<el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择维保类型" clearable="true"
>
<el-option :value="1" label="报修"/>
<el-option :value="2" label="计划"/>
<el-option :value="3" label="手动"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="设备状态:">
<el-select v-model="filterQuery.deviceStatus" style="width: 90%" placeholder="请选择设备状态" clearable="true"
<el-select v-model="filterQuery.deviceStatus" style="width: 90%" placeholder="请选择设备状态"
clearable="true"
>
<el-option :value="0" label="异常"/>
<el-option :value="2" label="正常"/>
<el-option :value="0" label="异常"/>
<el-option :value="1" label="正常"/>
</el-select>
</el-form-item>
</el-col>
@ -84,9 +76,10 @@
</el-form>
<div class="top-right-btn">
<el-button-group style="margin-left: 10px;display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addReceiveOrder"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addInspectOrder"></el-button>
</el-button-group>
</div>
@ -94,25 +87,28 @@
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="设备维保记录号" prop="orderId"></el-table-column>
<el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="设备名称" prop="deviceName"></el-table-column>
<el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="上级单号" prop="lastOrderId"></el-table-column>
<el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="创建日期" prop="createTime"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="审核日期" prop="auditTime"></el-table-column>
<el-table-column label="创建人" prop="createUserName"></el-table-column>
<el-table-column label="审核人" prop="auditUserName"></el-table-column>
<el-table-column label="维保类型" prop="type">
<template slot-scope="scope">
<el-tag>{{ deviceStatusMap[scope.row.status] }}</el-tag>
<el-tag>{{ typeMap[scope.row.type] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="养护说明" prop="remark"></el-table-column>
<el-table-column label="设备状态" prop="status" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.deviceStatus] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
@ -157,13 +153,13 @@
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
width="60%"
v-if="formVisible"
>
<deviceReceiveOrderModify
:deviceReceiveOrder="deviceReceiveOrder"
<DeviceInspectOrderModify
:inspectOrder="deviceInspectOrder"
:closeDialog="closeDialog"
></deviceReceiveOrderModify>
></DeviceInspectOrderModify>
</el-dialog>
</div>
@ -173,8 +169,8 @@
import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import deviceReceiveOrderModify from "@/views/inventory/DeviceReceiveOrderModify.vue";
import {getMaintenanceList,submitAudit,deleteDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder";
import {getDeviceInspectOrderList, submitAudit, deleteDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder";
import DeviceInspectOrderModify from "@/views/inventory/DeviceInspectOrderModify.vue";
export default {
name: "DeviceReceiveOrderNew",
@ -183,9 +179,11 @@ export default {
filterQuery: {
orderId: null,
deptCode: this.$store.getters.locDeptCode,
fromInvCode: null,
fromInvSpaceCode: null,
invCode: null,
code: null,
status: 0,
type: 1,
deviceStatus: 1,
page: 1,
limit: 20,
},
@ -196,25 +194,42 @@ export default {
spaceList: [],
loading: false,
formVisible: false,
codeTableLoading: false,
statusMap: {
0: "异常",
0: "草稿",
1: "未审核",
2: "已审核 ",
},
deviceStatusMap: {
0: "正常",
1: "异常",
},
typeMap: {
1: "报修",
2: "计划",
3: "手动"
},
formName: null,
formMap: {
add: "新增维保记录",
edit: "编辑维保记录"
},
deviceReceiveOrder: {},
deviceInspectOrder: {
orderId: null,
deptCode: null,
invCode: null,
code: null,
lastOrderId: null,
type: 3,
deviceStatus: 1,
remark: null
},
showSearch: true
};
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: "",
@ -222,13 +237,12 @@ export default {
this.filterQuery = {
orderId: null,
deptCode: this.$store.getters.locDeptCode,
fromInvCode: null,
fromInvSpaceCode: null,
invCode: null,
code: null,
status: 0,
page: 1,
limit: 20,
};
this.spaceList = [];
this.getList();
},
onSubmit() {
@ -237,7 +251,7 @@ export default {
},
getList() {
this.loading = true;
getMaintenanceList(this.filterQuery).then((res) => {
getDeviceInspectOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
@ -284,21 +298,34 @@ export default {
});
},
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.fromInvCode,invStorageCode:this.filterQuery.fromInvCode.deptCode, status: 1};
let params = {
invWarehouseCode: this.filterQuery.fromInvCode,
invStorageCode: this.filterQuery.fromInvCode.deptCode,
status: 1
};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
this.getList();
})
},
addReceiveOrder() {
addInspectOrder() {
this.formVisible = true;
this.formName = 'add';
this.deviceReceiveOrder = {};
this.deviceInspectOrder = {
orderId: null,
deptCode: this.$store.getters.locDeptCode,
invCode: null,
code: null,
lastOrderId: null,
type: 3,
deviceStatus: 1,
remark: null
};
},
editOrder(row) {
this.formVisible = true;
this.formName = 'edit';
this.deviceReceiveOrder = row;
this.deviceInspectOrder = row;
},
submitAudit(row) {
let params = {id: row.id};
@ -340,7 +367,7 @@ export default {
},
},
components: {
deviceReceiveOrderModify
DeviceInspectOrderModify
},
mounted() {
document.body.ondrop = function (event) {

@ -196,7 +196,7 @@ export default {
},
submit() {
if (isBlank(this.inspectPlan.deptCode) || isBlank(this.inspectPlan.invCode) || isBlank(this.inspectPlan.code)) {
this.$message.error("请设备相关信息")
this.$message.error("请选择设备相关信息")
return;
}
let formName = isBlank(this.inspectPlan.id) ? "add" : "edit";
@ -279,8 +279,6 @@ export default {
},
created() {
this.getDeptList();
if (!isBlank(this.inspectPlan.id)) {
}
},
}
</script>

@ -206,7 +206,7 @@ export default {
},
submit() {
if (isBlank(this.repairOrder.deptCode) || isBlank(this.repairOrder.invCode) || isBlank(this.repairOrder.code)) {
this.$message.error("请设备相关信息")
this.$message.error("请选择设备相关信息")
return;
}
let formName = isBlank(this.repairOrder.id) ? "add" : "edit";

Loading…
Cancel
Save