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

设备报修 设备维保页面调整

Browse Source
prod
wangwei 2 years ago
parent 1c899faeae
commit e24b326931
9 changed files with 641 additions and 526 deletions
Show Stats Download Patch File Download Diff File

8
src/api/inventory/InspectionPlan.js
Unescape Escape View File

@ -8,13 +8,7 @@ export function filterList(params) {
}); });
} }
export function getRepairList(params) {
return axios({
url: "/udiwms/inv/device/repair/order/filter",
method: "get",
params: params
});
}
export function getMaintenanceList(params) { export function getMaintenanceList(params) {
return axios({ return axios({

55
src/api/inventory/deviceInspectOrder.js
Unescape Escape View File

@ -0,0 +1,55 @@
import axios from "../../utils/request";
export function getMaintenanceList(params) {
return axios({
url: "/udiwms/inv/device/inspect/order/filter",
method: "get",
params: params
});
}
export function addDeviceInspectOrder(params) {
return axios({
url: "/udiwms/inv/device/inspect/order/add",
method: "get",
data: params
});
}
export function updateDeviceInspectOrder(params) {
return axios({
url: "/udiwms/inv/device/inspect/order/update",
method: "get",
data: params
});
}
export function submitAudit(params) {
return axios({
url: "/udiwms/inv/device/inspect/order/submitAudit",
method: "get",
data: params
});
}
export function updateStatus(params) {
return axios({
url: "/udiwms/inv/device/inspect/order/updateStatus",
method: "get",
data: params
});
}
export function deleteDeviceInspectOrder(params) {
return axios({
url: "/udiwms/inv/device/inspect/order/delete",
method: "get",
data: params
});
}

57
src/api/inventory/deviceRepairOrder.js
Unescape Escape View File

@ -0,0 +1,57 @@
import axios from "../../utils/request";
export function getRepairList(params) {
return axios({
url: "/udiwms/inv/device/repair/order/filter",
method: "get",
params: params
});
}
export function addDeviceRepairOrder(params) {
return axios({
url: "/udiwms/inv/device/repair/order/addDeviceRepairOrder",
method: "post",
data: params
});
}
export function updateDeviceRepairOrder(params) {
return axios({
url: "/udiwms/inv/device/repair/order/updateDeviceRepairOrder",
method: "post",
data: params
});
}
export function submitAudit(params) {
return axios({
url: "/udiwms/inv/device/repair/order/submitAudit",
method: "post",
data: params
});
}
export function updateStatus(params) {
return axios({
url: "/udiwms/inv/device/repair/order/updateStatus",
method: "post",
data: params
});
}
export function deleteRepairOrder(params) {
return axios({
url: "/udiwms/inv/device/repair/order/deleteRepairOrder",
method: "post",
data: params
});
}

209
src/views/inventory/DeviceInspectOrderAudit.vue
Unescape Escape View File

@ -1,68 +1,117 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true"> <el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号" <el-row>
clearable="true"></el-input> <el-col :span="6">
</el-form-item> <el-form-item class="query-form-item" label="维保记录号:">
<el-form-item class="query-form-item" label="领用部门:"> <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
<el-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true" clearable="true"></el-input>
@change="deptChange" </el-form-item>
> </el-col>
<el-option
v-for="item in deptList" <el-col :span="6">
:key="item.name" <el-form-item class="query-form-item" label="领用部门:">
:label="item.name" <el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
:value="item.code"> @change="deptChange"
<span style="float: left">{{ item.name }}</span> >
</el-option> <el-option
</el-select> v-for="item in deptList"
</el-form-item> :key="item.name"
<el-form-item class="query-form-item" label="领用仓库:"> :label="item.name"
<el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true" :value="item.code">
> <span style="float: left">{{ item.name }}</span>
<el-option </el-option>
v-for="item in invList" </el-select>
:key="item.name" </el-form-item>
:label="item.name" </el-col>
:value="item.code"> <el-col :span="6">
<span style="float: left">{{ item.name }}</span> <el-form-item class="query-form-item" label="维保类型:">
</el-option> <el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择维保类型" clearable="true"
</el-select> >
</el-form-item> <el-option :value="1" label="报修"/>
<!-- <el-form-item class="query-form-item" label="领用货位:"> <el-option :value="2" label="计划"/>
<el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true" </el-select>
> </el-form-item>
<el-option </el-col>
v-for="item in spaceList"
:key="item.name" <el-col :span="6">
:label="item.name" <el-form-item class="query-form-item" label="上级单号:">
:value="item.code"> <el-input v-model="filterQuery.lastOrderId" style="width: 90%" placeholder="请输入上级单号"
<span style="float: left">{{ item.name }}</span> clearable="true"></el-input>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item>-->
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;"> </el-row>
<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-row>
</el-button-group> <el-col :span="6">
</el-form-item> <el-form-item class="query-form-item" label="出库仓库:">
<el-select v-model="filterQuery.fromInvCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
>
<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-col :span="6">
<el-form-item class="query-form-item" label="资产编码:">
<el-input v-model="filterQuery.code" 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.deviceStatus" style="width: 90%" placeholder="请选择设备状态" clearable="true"
>
<el-option :value="0" label="异常"/>
<el-option :value="2" label="正常"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="top-right-btn">
<el-button-group style="margin-left: 10px;display:flex;">
<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>
</div>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@current-change="handleChange"
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"></el-table-column> <el-table-column label="设备维保记录号" prop="orderId"></el-table-column>
<el-table-column label="领用部门" prop="fromDeptName"></el-table-column> <el-table-column label="设备名称" prop="deviceName"></el-table-column>
<el-table-column label="领用仓库" prop="fromInvName"></el-table-column> <el-table-column label="规格型号" prop="ggxh"></el-table-column>
<!-- <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>--> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="领用日期" prop="createTime"></el-table-column> <el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="领用人" prop="receiveUserName"></el-table-column> <el-table-column label="上级单号" prop="lastOrderId"></el-table-column>
<el-table-column label="创建人" prop="createUser"></el-table-column> <el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="仓库" prop="invName"></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>
</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"> <template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template> </template>
@ -95,31 +144,6 @@
></pagination> ></pagination>
</el-card> </el-card>
<el-card>
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="200"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="getDetailList"
></pagination>
</el-card>
</div> </div>
</template> </template>
@ -133,7 +157,7 @@ import {
deleteDeviceReceiveOrder, deleteDeviceReceiveOrder,
getDeviceReceiveOrderList getDeviceReceiveOrderList
} from "@/api/inventory/deviceReceiveOrder"; } from "@/api/inventory/deviceReceiveOrder";
import {getMaintenanceList} from "@/api/inventory/InspectionPlan"; import {getMaintenanceList,submitAudit,deleteDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder";
export default { export default {
name: "DeviceReceiveOrderAudit", name: "DeviceReceiveOrderAudit",
@ -290,25 +314,6 @@ export default {
} }
}); });
}, },
handleChange(row) {
this.detailQuery.orderIdFk = row.orderId;
this.detailQuery.page = 1;
this.getDetailList();
},
getDetailList() {
getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => {
if (res.code === 20000) {
this.detailList = res.data.list || [];
this.detailTotal = res.data.total || 0;
} else {
this.detailList = [];
this.detailTotal = 0;
}
}).catch(() => {
this.detailList = [];
this.detailTotal = 0;
});
},
deleteDialog(rowId) { deleteDialog(rowId) {
this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', { this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',

209
src/views/inventory/DeviceInspectOrderCompleted.vue
Unescape Escape View File

@ -1,68 +1,117 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true"> <el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号" <el-row>
clearable="true"></el-input> <el-col :span="6">
</el-form-item> <el-form-item class="query-form-item" label="维保记录号:">
<el-form-item class="query-form-item" label="领用部门:"> <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
<el-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true" clearable="true"></el-input>
@change="deptChange" </el-form-item>
> </el-col>
<el-option
v-for="item in deptList" <el-col :span="6">
:key="item.name" <el-form-item class="query-form-item" label="领用部门:">
:label="item.name" <el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
:value="item.code"> @change="deptChange"
<span style="float: left">{{ item.name }}</span> >
</el-option> <el-option
</el-select> v-for="item in deptList"
</el-form-item> :key="item.name"
<el-form-item class="query-form-item" label="领用仓库:"> :label="item.name"
<el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true" :value="item.code">
> <span style="float: left">{{ item.name }}</span>
<el-option </el-option>
v-for="item in invList" </el-select>
:key="item.name" </el-form-item>
:label="item.name" </el-col>
:value="item.code"> <el-col :span="6">
<span style="float: left">{{ item.name }}</span> <el-form-item class="query-form-item" label="维保类型:">
</el-option> <el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择维保类型" clearable="true"
</el-select> >
</el-form-item> <el-option :value="1" label="报修"/>
<!-- <el-form-item class="query-form-item" label="领用货位:"> <el-option :value="2" label="计划"/>
<el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true" </el-select>
> </el-form-item>
<el-option </el-col>
v-for="item in spaceList"
:key="item.name" <el-col :span="6">
:label="item.name" <el-form-item class="query-form-item" label="上级单号:">
:value="item.code"> <el-input v-model="filterQuery.lastOrderId" style="width: 90%" placeholder="请输入上级单号"
<span style="float: left">{{ item.name }}</span> clearable="true"></el-input>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item>-->
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;"> </el-row>
<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-row>
</el-button-group> <el-col :span="6">
</el-form-item> <el-form-item class="query-form-item" label="出库仓库:">
<el-select v-model="filterQuery.fromInvCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
>
<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-col :span="6">
<el-form-item class="query-form-item" label="资产编码:">
<el-input v-model="filterQuery.code" 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.deviceStatus" style="width: 90%" placeholder="请选择设备状态" clearable="true"
>
<el-option :value="0" label="异常"/>
<el-option :value="2" label="正常"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="top-right-btn">
<el-button-group style="margin-left: 10px;display:flex;">
<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>
</div>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@current-change="handleChange"
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"></el-table-column> <el-table-column label="设备维保记录号" prop="orderId"></el-table-column>
<el-table-column label="领用部门" prop="fromDeptName"></el-table-column> <el-table-column label="设备名称" prop="deviceName"></el-table-column>
<el-table-column label="领用仓库" prop="fromInvName"></el-table-column> <el-table-column label="规格型号" prop="ggxh"></el-table-column>
<!-- <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>--> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="领用日期" prop="createTime"></el-table-column> <el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="领用人" prop="receiveUserName"></el-table-column> <el-table-column label="上级单号" prop="lastOrderId"></el-table-column>
<el-table-column label="创建人" prop="createUser"></el-table-column> <el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="仓库" prop="invName"></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>
</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"> <template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template> </template>
@ -77,31 +126,6 @@
></pagination> ></pagination>
</el-card> </el-card>
<el-card>
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="200"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="getDetailList"
></pagination>
</el-card>
</div> </div>
</template> </template>
@ -113,7 +137,7 @@ import {
getDeviceReceiveOrderDetailList, getDeviceReceiveOrderDetailList,
getDeviceReceiveOrderList getDeviceReceiveOrderList
} from "@/api/inventory/deviceReceiveOrder"; } from "@/api/inventory/deviceReceiveOrder";
import {getMaintenanceList} from "@/api/inventory/InspectionPlan"; import {getMaintenanceList,submitAudit,deleteDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder";
export default { export default {
name: "DeviceReceiveOrderCompleted", name: "DeviceReceiveOrderCompleted",
@ -231,25 +255,6 @@ export default {
this.getList(); this.getList();
}) })
}, },
handleChange(row) {
this.detailQuery.orderIdFk = row.orderId;
this.detailQuery.page = 1;
this.getDetailList();
},
getDetailList() {
getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => {
if (res.code === 20000) {
this.detailList = res.data.list || [];
this.detailTotal = res.data.total || 0;
} else {
this.detailList = [];
this.detailTotal = 0;
}
}).catch(() => {
this.detailList = [];
this.detailTotal = 0;
});
},
closeDialog() { closeDialog() {
this.formVisible = false; this.formVisible = false;
this.getList(); this.getList();

183
src/views/inventory/DeviceInspectOrderNew.vue
Unescape Escape View File

@ -1,68 +1,118 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true"> <el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号" <el-row>
clearable="true"></el-input> <el-col :span="6">
</el-form-item> <el-form-item class="query-form-item" label="维保记录号:">
<el-form-item class="query-form-item" label="领用部门:"> <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
<el-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true" clearable="true"></el-input>
@change="deptChange" </el-form-item>
> </el-col>
<el-option
v-for="item in deptList" <el-col :span="6">
:key="item.name" <el-form-item class="query-form-item" label="领用部门:">
:label="item.name" <el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
:value="item.code"> @change="deptChange"
<span style="float: left">{{ item.name }}</span> >
</el-option> <el-option
</el-select> v-for="item in deptList"
</el-form-item> :key="item.name"
<el-form-item class="query-form-item" label="出库仓库:"> :label="item.name"
<el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true" :value="item.code">
> <span style="float: left">{{ item.name }}</span>
<el-option </el-option>
v-for="item in invList" </el-select>
:key="item.name" </el-form-item>
:label="item.name" </el-col>
:value="item.code"> <el-col :span="6">
<span style="float: left">{{ item.name }}</span> <el-form-item class="query-form-item" label="维保类型:">
</el-option> <el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择维保类型" clearable="true"
</el-select> >
</el-form-item> <el-option :value="1" label="报修"/>
<!--<el-form-item class="query-form-item" label="领用货位:"> <el-option :value="2" label="计划"/>
<el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true" </el-select>
> </el-form-item>
<el-option </el-col>
v-for="item in spaceList"
:key="item.name" <el-col :span="6">
:label="item.name" <el-form-item class="query-form-item" label="上级单号:">
:value="item.code"> <el-input v-model="filterQuery.lastOrderId" style="width: 90%" placeholder="请输入上级单号"
<span style="float: left">{{ item.name }}</span> clearable="true"></el-input>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item>-->
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;"> </el-row>
<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-row>
<el-button type="primary" icon="el-icon-plus" @click="addReceiveOrder">新增领用记录</el-button> <el-col :span="6">
</el-button-group> <el-form-item class="query-form-item" label="出库仓库:">
</el-form-item> <el-select v-model="filterQuery.fromInvCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
>
<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-col :span="6">
<el-form-item class="query-form-item" label="资产编码:">
<el-input v-model="filterQuery.code" 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.deviceStatus" style="width: 90%" placeholder="请选择设备状态" clearable="true"
>
<el-option :value="0" label="异常"/>
<el-option :value="2" label="正常"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="top-right-btn">
<el-button-group style="margin-left: 10px;display:flex;">
<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-group>
</div>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
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"></el-table-column> <el-table-column label="设备维保记录号" prop="orderId"></el-table-column>
<el-table-column label="领用部门" prop="fromDeptName"></el-table-column> <el-table-column label="设备名称" prop="deviceName"></el-table-column>
<el-table-column label="出库仓库" prop="fromInvName"></el-table-column> <el-table-column label="规格型号" prop="ggxh"></el-table-column>
<!-- <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>--> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="领用日期" prop="createTime"></el-table-column> <el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="领用人" prop="receiveUserName"></el-table-column> <el-table-column label="上级单号" prop="lastOrderId"></el-table-column>
<el-table-column label="创建人" prop="createUser"></el-table-column> <el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="仓库" prop="invName"></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>
</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"> <template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template> </template>
@ -124,8 +174,7 @@ import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse"; import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace"; import {getInvSpaceList} from "@/api/inventory/invSpace";
import deviceReceiveOrderModify from "@/views/inventory/DeviceReceiveOrderModify.vue"; import deviceReceiveOrderModify from "@/views/inventory/DeviceReceiveOrderModify.vue";
import {submitAudit, deleteDeviceReceiveOrder, getDeviceReceiveOrderList} from "@/api/inventory/deviceReceiveOrder"; import {getMaintenanceList,submitAudit,deleteDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder";
import {getMaintenanceList} from "@/api/inventory/InspectionPlan";
export default { export default {
name: "DeviceReceiveOrderNew", name: "DeviceReceiveOrderNew",
@ -149,14 +198,18 @@ export default {
formVisible: false, formVisible: false,
codeTableLoading: false, codeTableLoading: false,
statusMap: { statusMap: {
0: "草稿", 0: "异常",
1: "未审核", 2: "已审核 ",
2: "已审核"
}, },
deviceStatusMap: {
1: "报修",
2: "计划",
},
formName: null, formName: null,
formMap: { formMap: {
add: "新增设备领用记录", add: "新增维保记录",
edit: "编辑设备领用记录" edit: "编辑维保记录"
}, },
deviceReceiveOrder: {}, deviceReceiveOrder: {},
}; };
@ -268,7 +321,7 @@ export default {
}).then(() => { }).then(() => {
let params = {id: rowId}; let params = {id: rowId};
this.loading = true; this.loading = true;
deleteDeviceReceiveOrder(params).then((res) => { deleteDeviceInspectOrder(params).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("删除成功！"); this.$message.success("删除成功！");

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

@ -1,72 +1,81 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true"> <el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号" <el-row>
clearable="true"></el-input> <el-col :span="10">
</el-form-item> <el-form-item class="query-form-item" label="报修记录号:">
<el-form-item class="query-form-item" label="领用部门:"> <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
<el-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true" clearable="true"></el-input>
@change="deptChange" </el-form-item>
> </el-col>
<el-option
v-for="item in deptList" <el-col :span="10">
:key="item.name" <el-form-item class="query-form-item" label="领用部门:">
:label="item.name" <el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
:value="item.code"> @change="deptChange"
<span style="float: left">{{ item.name }}</span> >
</el-option> <el-option
</el-select> v-for="item in deptList"
</el-form-item> :key="item.name"
<el-form-item class="query-form-item" label="领用仓库:"> :label="item.name"
<el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true" :value="item.code">
> <span style="float: left">{{ item.name }}</span>
<el-option </el-option>
v-for="item in invList" </el-select>
:key="item.name" </el-form-item>
:label="item.name" </el-col>
:value="item.code"> </el-row>
<span style="float: left">{{ item.name }}</span>
</el-option> <el-row>
</el-select> <el-col :span="10">
</el-form-item> <el-form-item class="query-form-item" label="出库仓库:">
<!-- <el-form-item class="query-form-item" label="领用货位:"> <el-select v-model="filterQuery.fromInvCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
<el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true" >
> <el-option
<el-option v-for="item in invList"
v-for="item in spaceList" :key="item.name"
:key="item.name" :label="item.name"
:label="item.name" :value="item.code">
:value="item.code"> <span style="float: left">{{ item.name }}</span>
<span style="float: left">{{ item.name }}</span> </el-option>
</el-option> </el-select>
</el-select> </el-form-item>
</el-form-item>--> </el-col>
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> <el-col :span="10">
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button> <el-form-item class="query-form-item" label="资产编码:">
</el-button-group> <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
</el-form-item> clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="top-right-btn">
<el-button-group style="margin-left: 10px;display:flex;">
<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>
</div>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@current-change="handleChange"
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"></el-table-column> <el-table-column label="设备报修记录号" prop="orderId"></el-table-column>
<el-table-column label="领用部门" prop="fromDeptName"></el-table-column> <el-table-column label="设备名称" prop="deviceName"></el-table-column>
<el-table-column label="领用仓库" prop="fromInvName"></el-table-column> <el-table-column label="规格型号" prop="ggxh"></el-table-column>
<!-- <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>--> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="领用日期" prop="createTime"></el-table-column> <el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="领用人" prop="receiveUserName"></el-table-column> <el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="创建人" prop="createUser"></el-table-column> <el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="创建日期" prop="createTime"></el-table-column>
<template slot-scope="scope"> <el-table-column label="审核日期" prop="auditTime"></el-table-column>
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-table-column label="创建人" prop="createUserName"></el-table-column>
</template> <el-table-column label="审核人" prop="auditUserName"></el-table-column>
</el-table-column> <el-table-column label="报修说明" prop="msg"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -94,32 +103,6 @@
@pagination="getList" @pagination="getList"
></pagination> ></pagination>
</el-card> </el-card>
<el-card>
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="200"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="getDetailList"
></pagination>
</el-card>
</div> </div>
</template> </template>
@ -133,7 +116,7 @@ import {
deleteDeviceReceiveOrder, deleteDeviceReceiveOrder,
getDeviceReceiveOrderList getDeviceReceiveOrderList
} from "@/api/inventory/deviceReceiveOrder"; } from "@/api/inventory/deviceReceiveOrder";
import {getRepairList} from "@/api/inventory/InspectionPlan"; import {getRepairList} from "@/api/inventory/deviceRepairOrder";
export default { export default {
name: "DeviceReceiveOrderAudit", name: "DeviceReceiveOrderAudit",
@ -290,25 +273,6 @@ export default {
} }
}); });
}, },
handleChange(row) {
this.detailQuery.orderIdFk = row.orderId;
this.detailQuery.page = 1;
this.getDetailList();
},
getDetailList() {
getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => {
if (res.code === 20000) {
this.detailList = res.data.list || [];
this.detailTotal = res.data.total || 0;
} else {
this.detailList = [];
this.detailTotal = 0;
}
}).catch(() => {
this.detailList = [];
this.detailTotal = 0;
});
},
deleteDialog(rowId) { deleteDialog(rowId) {
this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', { this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',

176
src/views/inventory/DeviceRepairOrderCompleted.vue
Unescape Escape View File

@ -1,72 +1,81 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true"> <el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号" <el-row>
clearable="true"></el-input> <el-col :span="10">
</el-form-item> <el-form-item class="query-form-item" label="报修记录号:">
<el-form-item class="query-form-item" label="领用部门:"> <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
<el-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true" clearable="true"></el-input>
@change="deptChange" </el-form-item>
> </el-col>
<el-option
v-for="item in deptList" <el-col :span="10">
:key="item.name" <el-form-item class="query-form-item" label="领用部门:">
:label="item.name" <el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
:value="item.code"> @change="deptChange"
<span style="float: left">{{ item.name }}</span> >
</el-option> <el-option
</el-select> v-for="item in deptList"
</el-form-item> :key="item.name"
<el-form-item class="query-form-item" label="领用仓库:"> :label="item.name"
<el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true" :value="item.code">
> <span style="float: left">{{ item.name }}</span>
<el-option </el-option>
v-for="item in invList" </el-select>
:key="item.name" </el-form-item>
:label="item.name" </el-col>
:value="item.code"> </el-row>
<span style="float: left">{{ item.name }}</span>
</el-option> <el-row>
</el-select> <el-col :span="10">
</el-form-item> <el-form-item class="query-form-item" label="出库仓库:">
<!-- <el-form-item class="query-form-item" label="领用货位:"> <el-select v-model="filterQuery.fromInvCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
<el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true" >
> <el-option
<el-option v-for="item in invList"
v-for="item in spaceList" :key="item.name"
:key="item.name" :label="item.name"
:label="item.name" :value="item.code">
:value="item.code"> <span style="float: left">{{ item.name }}</span>
<span style="float: left">{{ item.name }}</span> </el-option>
</el-option> </el-select>
</el-select> </el-form-item>
</el-form-item>--> </el-col>
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> <el-col :span="10">
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button> <el-form-item class="query-form-item" label="资产编码:">
</el-button-group> <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
</el-form-item> clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="top-right-btn">
<el-button-group style="margin-left: 10px;display:flex;">
<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>
</div>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@current-change="handleChange"
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"></el-table-column> <el-table-column label="设备报修记录号" prop="orderId"></el-table-column>
<el-table-column label="领用部门" prop="fromDeptName"></el-table-column> <el-table-column label="设备名称" prop="deviceName"></el-table-column>
<el-table-column label="领用仓库" prop="fromInvName"></el-table-column> <el-table-column label="规格型号" prop="ggxh"></el-table-column>
<!-- <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>--> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="领用日期" prop="createTime"></el-table-column> <el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="领用人" prop="receiveUserName"></el-table-column> <el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="创建人" prop="createUser"></el-table-column> <el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="创建日期" prop="createTime"></el-table-column>
<template slot-scope="scope"> <el-table-column label="审核日期" prop="auditTime"></el-table-column>
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-table-column label="创建人" prop="createUserName"></el-table-column>
</template> <el-table-column label="审核人" prop="auditUserName"></el-table-column>
</el-table-column> <el-table-column label="报修说明" prop="msg"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -77,30 +86,6 @@
></pagination> ></pagination>
</el-card> </el-card>
<el-card>
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="200"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="getDetailList"
></pagination>
</el-card>
</div> </div>
</template> </template>
@ -113,7 +98,7 @@ import {
getDeviceReceiveOrderDetailList, getDeviceReceiveOrderDetailList,
getDeviceReceiveOrderList getDeviceReceiveOrderList
} from "@/api/inventory/deviceReceiveOrder"; } from "@/api/inventory/deviceReceiveOrder";
import {getRepairList} from "@/api/inventory/InspectionPlan"; import {getRepairList} from "@/api/inventory/deviceRepairOrder";
export default { export default {
name: "DeviceReceiveOrderCompleted", name: "DeviceReceiveOrderCompleted",
@ -231,25 +216,6 @@ export default {
this.getList(); this.getList();
}) })
}, },
handleChange(row) {
this.detailQuery.orderIdFk = row.orderId;
this.detailQuery.page = 1;
this.getDetailList();
},
getDetailList() {
getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => {
if (res.code === 20000) {
this.detailList = res.data.list || [];
this.detailTotal = res.data.total || 0;
} else {
this.detailList = [];
this.detailTotal = 0;
}
}).catch(() => {
this.detailList = [];
this.detailTotal = 0;
});
},
closeDialog() { closeDialog() {
this.formVisible = false; this.formVisible = false;
this.getList(); this.getList();

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

@ -1,13 +1,19 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true"> <el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号" <el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="报修记录号:">
<el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="领用部门:"> <el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true" <el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
@change="deptChange" @change="deptChange"
> >
<el-option <el-option
@ -19,8 +25,13 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="出库仓库:"> <el-form-item class="query-form-item" label="出库仓库:">
<el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true" <el-select v-model="filterQuery.fromInvCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
> >
<el-option <el-option
v-for="item in invList" v-for="item in invList"
@ -31,42 +42,48 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--<el-form-item class="query-form-item" label="领用货位:"> </el-col>
<el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
>
<el-option <el-col :span="10">
v-for="item in spaceList" <el-form-item class="query-form-item" label="资产编码:">
:key="item.name" <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
:label="item.name" clearable="true"></el-input>
:value="item.code"> </el-form-item>
<span style="float: left">{{ item.name }}</span> </el-col>
</el-option> </el-row>
</el-select> </el-form>
</el-form-item>--> <div class="top-right-btn">
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;"> <el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</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-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="addReceiveOrder">新增报修记录</el-button>
</el-button-group> </el-button-group>
</el-form-item> </div>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
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"></el-table-column> <el-table-column label="设备报修记录号" prop="orderId"></el-table-column>
<el-table-column label="领用部门" prop="fromDeptName"></el-table-column> <el-table-column label="设备名称" prop="deviceName"></el-table-column>
<el-table-column label="出库仓库" prop="fromInvName"></el-table-column> <el-table-column label="规格型号" prop="ggxh"></el-table-column>
<!-- <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>--> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="领用日期" prop="createTime"></el-table-column> <el-table-column label="资产编码" prop="code"></el-table-column>
<el-table-column label="领用人" prop="receiveUserName"></el-table-column> <el-table-column label="部门" prop="deptName"></el-table-column>
<el-table-column label="创建人" prop="createUser"></el-table-column> <el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="创建日期" prop="createTime"></el-table-column>
<template slot-scope="scope"> <el-table-column label="审核日期" prop="auditTime"></el-table-column>
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-table-column label="创建人" prop="createUserName"></el-table-column>
</template> <el-table-column label="审核人" prop="auditUserName"></el-table-column>
</el-table-column> <el-table-column label="报修说明" prop="msg"></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.status] }}</el-tag>-->
<!-- </template>-->
<!--</el-table-column>-->
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -124,8 +141,7 @@ import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse"; import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace"; import {getInvSpaceList} from "@/api/inventory/invSpace";
import deviceReceiveOrderModify from "@/views/inventory/DeviceReceiveOrderModify.vue"; import deviceReceiveOrderModify from "@/views/inventory/DeviceReceiveOrderModify.vue";
import {submitAudit, deleteDeviceReceiveOrder, getDeviceReceiveOrderList} from "@/api/inventory/deviceReceiveOrder"; import {getRepairList,submitAudit,deleteRepairOrder } from "@/api/inventory/deviceRepairOrder";
import {getRepairList} from "@/api/inventory/InspectionPlan";
export default { export default {
name: "DeviceReceiveOrderNew", name: "DeviceReceiveOrderNew",
@ -155,8 +171,8 @@ export default {
}, },
formName: null, formName: null,
formMap: { formMap: {
add: "新增设备领用记录", add: "新增设备报修记录",
edit: "编辑设备领用记录" edit: "编辑设备报修记录"
}, },
deviceReceiveOrder: {}, deviceReceiveOrder: {},
}; };
@ -268,7 +284,7 @@ export default {
}).then(() => { }).then(() => {
let params = {id: rowId}; let params = {id: rowId};
this.loading = true; this.loading = true;
deleteDeviceReceiveOrder(params).then((res) => { deleteRepairOrder(params).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("删除成功！"); this.$message.success("删除成功！");

Write Preview
Loading…
Cancel
Save