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

1.初步完成设备管理功能页面

Browse Source
prod
x_z 2 years ago
parent 423867e026
commit fbb126855e
12 changed files with 1324 additions and 1003 deletions
Show Stats Download Patch File Download Diff File

8
src/api/auth/authDept.js
Unescape Escape View File

@ -31,3 +31,11 @@ export function deleteDept(data) {
data: data data: data
}); });
} }
export function getDeptListByUser(params) {
return axios({
url: "/spms/inv/warehouse/filterByUser",
method: "get",
params: params
});
}

13
src/api/inventory/deviceMAOrder.js
Unescape Escape View File

@ -1,4 +1,4 @@
import axios from "../../utils/axios"; import axios from "../../utils/request";
export function getDeviceMAOrderList(params) { export function getDeviceMAOrderList(params) {
return axios({ return axios({
@ -8,7 +8,7 @@ export function getDeviceMAOrderList(params) {
}); });
} }
export function addMAOrder(data) { export function addDeviceMAOrder(data) {
return axios({ return axios({
url: "/device/MA/order/addMAOrder", url: "/device/MA/order/addMAOrder",
method: "post", method: "post",
@ -64,15 +64,6 @@ export function deleteDeviceMAOrderDetail(data) {
}); });
} }
export function addDeviceMAOrder(data) {
return axios({
url: "/device/MA/order/addDeviceMAOrder",
method: "post",
data: data
});
}
export function verifyTemplateFile(data) { export function verifyTemplateFile(data) {
return axios({ return axios({
url: "/device/MA/order/verifyTemplateFile", url: "/device/MA/order/verifyTemplateFile",

20
src/api/inventory/deviceReceiveOrder.js
Unescape Escape View File

@ -1,6 +1,6 @@
import axios from "../../utils/axios"; import axios from "../../utils/request";
export function getReceiveOrderList(params) { export function getDeviceReceiveOrderList(params) {
return axios({ return axios({
url: "/device/receive/order/filterList", url: "/device/receive/order/filterList",
method: "get", method: "get",
@ -8,7 +8,7 @@ export function getReceiveOrderList(params) {
}); });
} }
export function addReceiveOrder(data) { export function addDeviceReceiveOrder(data) {
return axios({ return axios({
url: "/device/receive/order/addOrder", url: "/device/receive/order/addOrder",
method: "post", method: "post",
@ -16,7 +16,7 @@ export function addReceiveOrder(data) {
}); });
} }
export function updateReceiveOrder(data) { export function updateDeviceReceiveOrder(data) {
return axios({ return axios({
url: "/device/receive/order/update", url: "/device/receive/order/update",
method: "post", method: "post",
@ -32,7 +32,7 @@ export function submitAudit(data) {
}); });
} }
export function updateReceiveOrderStatus(data) { export function updateDeviceReceiveOrderStatus(data) {
return axios({ return axios({
url: "/device/receive/order/updateStatus", url: "/device/receive/order/updateStatus",
method: "post", method: "post",
@ -40,7 +40,7 @@ export function updateReceiveOrderStatus(data) {
}); });
} }
export function deleteReceiveOrder(data) { export function deleteDeviceReceiveOrder(data) {
return axios({ return axios({
url: "/device/receive/order/delete", url: "/device/receive/order/delete",
method: "post", method: "post",
@ -48,7 +48,7 @@ export function deleteReceiveOrder(data) {
}); });
} }
export function getReceiveOrderDetailList(params) { export function getDeviceReceiveOrderDetailList(params) {
return axios({ return axios({
url: "/device/receive/order/detail/filterList", url: "/device/receive/order/detail/filterList",
method: "get", method: "get",
@ -64,7 +64,7 @@ export function checkCode(params) {
}); });
} }
export function addReceiveOrderDetail(data) { export function addDeviceReceiveOrderDetail(data) {
return axios({ return axios({
url: "/device/receive/order/detail/addOrderDetail", url: "/device/receive/order/detail/addOrderDetail",
method: "post", method: "post",
@ -72,7 +72,7 @@ export function addReceiveOrderDetail(data) {
}); });
} }
export function updateReceiveOrderDetail(data) { export function updateDeviceReceiveOrderDetail(data) {
return axios({ return axios({
url: "/device/receive/order/detail/updateOrderDetail", url: "/device/receive/order/detail/updateOrderDetail",
method: "post", method: "post",
@ -80,7 +80,7 @@ export function updateReceiveOrderDetail(data) {
}) })
} }
export function deleteReceiveOrderDetail(data) { export function deleteDeviceReceiveOrderDetail(data) {
return axios({ return axios({
url: "/device/receive/order/detail/deleteOrderDetail", url: "/device/receive/order/detail/deleteOrderDetail",
method: "post", method: "post",

218
src/views/inventory/AssetManage.vue
Unescape Escape View File

@ -2,40 +2,18 @@
<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" size="mini" :inline="true">
<el-form-item class="query-form-item" label="养护记录号:"> <el-form-item class="query-form-item" label="设备编号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号" <el-input v-model="filterQuery.orderId" placeholder="请输入设备编号"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" label="仓库:"> <el-form-item class="query-form-item" label="产品DI:">
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true" <el-input v-model="filterQuery.nameCode" placeholder="请输入产品DI"
@change="invChange" clearable="true"></el-input>
>
<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-form-item class="query-form-item" label="货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <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="addMAOrder">新增养护记录</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -43,37 +21,27 @@
<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="productName" width="180"></el-table-column>
<el-table-column label="仓库" prop="invName" ></el-table-column> <el-table-column label="设备编号" prop="code" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="货位" prop="invSpaceName" ></el-table-column> <el-table-column label="产品DI" prop="nameCode" width="180"></el-table-column>
<el-table-column label="养护日期" prop="createTime" ></el-table-column> <el-table-column label="生产日期" prop="productionDate" width="180"></el-table-column>
<el-table-column label="养护人" prop="createUserName"></el-table-column> <el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
<template slot-scope="scope"> <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-table-column label="医疗器械注册/备案人名称" prop="ylqxzcrbarmc" width="180"></el-table-column>
</template> <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="180"></el-table-column>
</el-table-column> <el-table-column label="领用部门" prop="fromDeptName" ></el-table-column>
<el-table-column label="领用仓库" prop="fromInvName" ></el-table-column>
<el-table-column label="领用货位" prop="fromInvSpaceName" ></el-table-column>
<el-table-column label="领用日期" prop="createTime" ></el-table-column>
<el-table-column label="领用人" prop="createUserName"></el-table-column>
<el-table-column label="操作" > <el-table-column label="操作" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="editOrder(scope.row)" @click.native.stop="addMAOrder(scope.row)"
>编辑 >养护
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="submitAudit(scope.row)"
>提交审核
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button </el-button
> >
</template> </template>
@ -89,58 +57,50 @@
</el-card> </el-card>
<el-dialog <el-dialog
:title="formMap[formName]" title="新增设备养护记录"
: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"
width="85%" width="85%"
v-if="formVisible" v-if="formVisible"
> >
<addInvMAOrder <deviceMAOrderModify
:maOrder="maOrder" :deviceMAOrder="deviceMAOrder"
:closeDialog="closeDialog" :closeDialog="closeDialog"
></addInvMAOrder> >
</deviceMAOrderModify>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {getInvListByUser} from "@/api/system/invWarehouse"; import {getDeviceReceiveOrderList} from "@/api/inventory/deviceReceiveOrder";
import {getInvSpaceList} from "@/api/inventory/invSpace"; import deviceMAOrderModify from "@/views/inventory/DeviceMAOrderModify.vue";
import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder";
import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue";
export default { export default {
name: "InvMAOrderNew", name: "AssetManage",
data() { data() {
return { return {
filterQuery: { filterQuery: {
orderId: null, code: null,
invCode: this.$store.getters.locInvCode, nameCode: null,
invSpaceCode: null, status: 2,
status: 0,
page: 1, page: 1,
limit: 20, limit: 20
}, },
list: [], list: [],
total: 0, total: 0,
invList: [],
spaceList: [],
loading: false, loading: false,
idQuery: null,
formVisible: false, formVisible: false,
codeTableLoading: false, deviceMAOrder: {
statusMap: { code: null,
0: "草稿", deptName: null,
1: "未审核", createUser: null,
2: "已完成" createTime: null,
}, collOrderId: null
formName: null, }
formMap: {
add: "新增养护记录",
edit: "编辑养护记录"
},
maOrder: {},
}; };
}, },
methods: { methods: {
@ -149,14 +109,12 @@ export default {
path: "", path: "",
}); });
this.filterQuery = { this.filterQuery = {
orderId: null, code: null,
invCode: this.$store.getters.locInvCode, nameCode: null,
invSpaceCode: null, status: 2,
status: 0,
page: 1, page: 1,
limit: 20, limit: 20
}; };
this.spaceList = [];
this.getList(); this.getList();
}, },
onSubmit() { onSubmit() {
@ -165,7 +123,7 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
getInvMAOrderList(this.filterQuery).then((res) => { getDeviceReceiveOrderList(this.filterQuery).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.list = res.data.list || []; this.list = res.data.list || [];
@ -182,78 +140,28 @@ export default {
this.total = 0; this.total = 0;
}) })
}, },
invChange() {
this.spaceList = [];
this.getSpaceList();
this.getList();
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getSpaceList();
this.getList();
})
.catch(() => {
});
},
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
})
},
addMAOrder() {
this.formVisible = true;
this.formName = 'add';
this.maOrder = {};
},
editOrder(row) {
this.formVisible = true;
this.formName = 'edit';
this.maOrder = row;
},
submitAudit(row) {
let params = {id: row.id};
submitAudit(params).then((res) => {
if (res.code === 20000) {
this.$message.success("提交成功！");
this.getList();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
});
},
deleteDialog(rowId) {
this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: rowId};
this.loading = true;
deleteInvMAOrder(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() { closeDialog() {
this.formVisible = false; this.formVisible = false;
this.getList(); this.getList();
}, },
addMAOrder(row) {
this.deviceMAOrder = {
code: row.code,
createUser: this.$store.getters.adminId,
deptName: row.fromDeptName,
deptCode: row.fromDeptName,
invCode: row.fromInvCode,
invName: row.fromInvName,
invSpaceCode:row.fromInvSpaceCode,
invSpaceName: row.fromInvSpaceName,
createTime: new Date().toLocaleString(),
collOrderId: row.orderIdFk
}
this.formVisible = true;
},
}, },
components: { components: {
addInvMAOrder deviceMAOrderModify
}, },
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
@ -262,7 +170,7 @@ export default {
}; };
}, },
created() { created() {
this.getInvList(); this.getList();
}, },
}; };
</script> </script>

255
src/views/inventory/DeviceMAOrderCompleted.vue
Unescape Escape View File

@ -6,74 +6,38 @@
<el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号" <el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" label="仓库:"> <el-form-item class="query-form-item" label="设备编号:">
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true" <el-input v-model="filterQuery.code" placeholder="请输入设备编号"
@change="invChange" clearable="true"></el-input>
>
<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-form-item>
<el-form-item class="query-form-item" label="货位:"> <el-form-item class="query-form-item" label="领用记录号:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true" <el-input v-model="filterQuery.receiveOrderId" placeholder="请输入领用记录号"
> clearable="true"></el-input>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <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="addMAOrder">新增养护记录</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </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
@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="invName" ></el-table-column> <el-table-column label="领用记录号" prop="receiveOrderId"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" ></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="createUserName"></el-table-column> <el-table-column label="养护人" prop="createUserName"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="养护备注" prop="remark" width="200" show-overflow-tooltip></el-table-column>
<template slot-scope="scope"> <el-table-column label="操作">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="editOrder(scope.row)" @click.native.stop="print(scope.row)"
>编辑 >打印
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="submitAudit(scope.row)"
>提交审核
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button </el-button
> >
</template> </template>
@ -88,59 +52,66 @@
></pagination> ></pagination>
</el-card> </el-card>
<el-dialog <el-card>
:title="formMap[formName]" <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
:visible.sync="formVisible" <el-table-column label="序号" type="index" width="50"></el-table-column>
:close-on-click-modal="false" <el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
:close-on-press-escape="false" <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
width="85%" <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
v-if="formVisible" <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
> <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<addInvMAOrder <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
:maOrder="maOrder" <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
:closeDialog="closeDialog" <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
></addInvMAOrder> <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
</el-dialog> show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="getList"
></pagination>
</el-card>
</div> </div>
</template> </template>
<script> <script>
import {getInvListByUser} from "@/api/system/invWarehouse"; import {
import {getInvSpaceList} from "@/api/inventory/invSpace"; getDeviceMAOrderList,
import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder"; getDeviceMAOrderDetailList,
import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue"; verifyTemplateFile,
printOrder
} from "@/api/inventory/deviceMAOrder";
export default { export default {
name: "InvMAOrderNew", name: "DeviceMAOrderCompleted",
data() { data() {
return { return {
filterQuery: { filterQuery: {
orderId: null, orderId: null,
invCode: this.$store.getters.locInvCode, code: null,
invSpaceCode: null, receiveOrderId: null,
status: 0, status: 1,
page: 1, page: 1,
limit: 20, limit: 20,
}, },
list: [], list: [],
total: 0, total: 0,
invList: [],
spaceList: [],
loading: false, loading: false,
formVisible: false, detailQuery: {
codeTableLoading: false, orderIdFk: null,
statusMap: { page: 1,
0: "草稿", limit: 20,
1: "未审核",
2: "已完成"
},
formName: null,
formMap: {
add: "新增养护记录",
edit: "编辑养护记录"
}, },
maOrder: {}, detailList: [],
detailLoading: false,
detailTotal: 0
}; };
}, },
methods: { methods: {
@ -150,9 +121,9 @@ export default {
}); });
this.filterQuery = { this.filterQuery = {
orderId: null, orderId: null,
invCode: this.$store.getters.locInvCode, code: null,
invSpaceCode: null, receiveOrderId: null,
status: 0, status: 1,
page: 1, page: 1,
limit: 20, limit: 20,
}; };
@ -165,7 +136,9 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
getInvMAOrderList(this.filterQuery).then((res) => { this.detailList = [];
this.detailTotal = 0;
getDeviceMAOrderList(this.filterQuery).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.list = res.data.list || []; this.list = res.data.list || [];
@ -182,79 +155,55 @@ export default {
this.total = 0; this.total = 0;
}) })
}, },
invChange() { handleChange(row) {
this.spaceList = []; this.detailQuery.orderIdFk = row.orderId;
this.getSpaceList(); this.detailQuery.page = 1;
this.getList(); this.getDetailList();
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getSpaceList();
this.getList();
})
.catch(() => {
});
},
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
})
},
addMAOrder() {
this.formVisible = true;
this.formName = 'add';
this.maOrder = {};
}, },
editOrder(row) { getDetailList() {
this.formVisible = true; getDeviceMAOrderDetailList(this.detailQuery).then((res) => {
this.formName = 'edit'; if (res.code === 20000) {
this.maOrder = row; this.detailList = res.data.list || [];
this.detailTotal = res.data.total || 0;
} else {
this.detailList = [];
this.detailTotal = 0;
}
}).catch(() => {
this.detailList = [];
this.detailTotal = 0;
});
}, },
submitAudit(row) { print(row) {
let params = {id: row.id}; let query = {moduleId: 7};
submitAudit(params).then((res) => { this.loading = true;
verifyTemplateFile(query).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("提交成功！"); let printParams = {
this.getList(); templateId: res.data,
orderId: row.orderId
};
printOrder(printParams).then((response) => {
//将pdf文件转换为url。
const binaryData = [];
binaryData.push(response);
//获取blob链接。
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//打开新标签页，预览pdf。
})
} else { } else {
this.loading = false;
this.$message.error(res.message); this.$message.error(res.message);
} }
}).catch((error) => { }).catch((error) => {
this.loading = false;
this.$message.error(error.message); this.$message.error(error.message);
}); })
},
deleteDialog(rowId) {
this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: rowId};
this.loading = true;
deleteInvMAOrder(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: {
addInvMAOrder
},
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
event.preventDefault(); event.preventDefault();
@ -262,7 +211,7 @@ export default {
}; };
}, },
created() { created() {
this.getInvList(); this.getList();
}, },
}; };
</script> </script>

388
src/views/inventory/DeviceMAOrderModify.vue
Unescape Escape View File

@ -1,224 +1,161 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card style="margin: 5px;margin-top: -20px">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true"> <el-form :model="formData" ref="dataForm" label-width="100px" style="margin-bottom: -15px">
<el-form-item class="query-form-item" label="养护记录号:"> <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号" <el-button
clearable="true"></el-input> type="primary"
</el-form-item> @click.native="saveOrder()"
<el-form-item class="query-form-item" label="仓库:"> >保存
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true" </el-button>
@change="invChange" </el-button-group>
>
<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-form-item class="query-form-item" label="货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<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-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addMAOrder">新增养护记录</el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-row>
border> <el-col :span="10">
<el-table-column label="序号" type="index"></el-table-column> <el-form-item class="query-form-item" label="设备号:">
<el-table-column label="养护记录号" prop="orderId" ></el-table-column> <el-input v-model="formData.code"
<el-table-column label="仓库" prop="invName" ></el-table-column> auto-complete="off"
<el-table-column label="货位" prop="invSpaceName" ></el-table-column> :disabled="true"
<el-table-column label="养护日期" prop="createTime" ></el-table-column> style="width: 90%"
<el-table-column label="养护人" prop="createUserName"></el-table-column> clearable
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> ></el-input>
<template slot-scope="scope"> </el-form-item>
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> </el-col>
</template> <el-col :span="10">
</el-table-column> <el-form-item class="query-form-item" label="养护日期:">
<el-table-column label="操作" > <el-input v-model="formData.createTime"
<template slot-scope="scope"> auto-complete="off"
<el-button :disabled="true"
type="text" style="width: 90%"
size="small" clearable
@click.native.stop="editOrder(scope.row)" ></el-input>
>编辑 </el-form-item>
</el-button </el-col>
> </el-row>
<el-button
type="text" <el-row>
size="small" <el-col :span="10">
@click.native.stop="submitAudit(scope.row)" <el-form-item class="query-form-item" label="领用部门:">
>提交审核 <el-input v-model="formData.fromDeptName"
</el-button auto-complete="off"
> :disabled="true"
<el-button style="width: 90%"
type="text" clearable
size="small" ></el-input>
@click.native.stop="deleteDialog(scope.row.id)" </el-form-item>
>删除 </el-col>
</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
</el-card>
<el-dialog <el-col :span="10">
:title="formMap[formName]" <el-form-item class="query-form-item" label="养护人:">
:visible.sync="formVisible" <el-input v-model="formData.createUserName"
:close-on-click-modal="false" auto-complete="off"
:close-on-press-escape="false" :disabled="true"
width="85%" style="width: 90%"
v-if="formVisible" clearable
> ></el-input>
<addInvMAOrder </el-form-item>
:maOrder="maOrder" </el-col>
:closeDialog="closeDialog" </el-row>
></addInvMAOrder>
</el-dialog>
<el-table :data="detailList" style="width: 100%;margin-top: 20px;"
highlight-current-row
border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column width="150" label="养护数量" prop="count"></el-table-column>
<el-table-column width="150" label="养护状态" prop="maStatus">
<template slot-scope="scope">
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maStatus"
:label="0">未养护
</el-radio>
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maStatus"
:label="1">已养护
</el-radio>
</template>
</el-table-column>
<el-table-column width="150" label="设备状态" prop="deviceStatus">
<template slot-scope="scope">
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="1">
正常
</el-radio>
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="0">
异常
</el-radio>
</template>
</el-table-column>
<el-table-column width="200" label="养护备注" prop="remark">
<template slot-scope="scope">
<el-input :disabled="scope.$index !== currentIndex" v-model="scope.row.remark"></el-input>
</template>
</el-table-column>
<el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
<el-table-column label="失效日期(yyMMdd)" prop="expireDate"
show-overflow-tooltip></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>
</el-form>
</el-card>
</div> </div>
</template> </template>
<script> <script>
import {getInvListByUser} from "@/api/system/invWarehouse"; import {addDeviceMAOrder, filterDetail} from "@/api/inventory/deviceMAOrder";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder";
import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue";
export default { export default {
name: "InvMAOrderNew", props: {
deleteInvMAOrder: {
type: Object,
required: true
},
closeDialog: {
type: Function,
required: true
}
},
name: "DeviceMAOrderModify",
data() { data() {
return { return {
filterQuery: { collectOrderList: [],
orderId: null, collectOrderTotal: 0,
invCode: this.$store.getters.locInvCode, formData: {
invSpaceCode: null, code: null,
status: 0, createUser: null,
page: 1, createTime: null,
limit: 20, fromDeptCode: null,
fromDeptName: null,
fromInvCode: null,
fromInvName: null,
fromInvSpaceCode: null,
fromInvSpaceName: null,
remark: null,
maStatus: null,
deviceStatus: null,
receiveOrderId: null,
createUserName: null,
}, },
list: [], detailList: []
total: 0,
invList: [],
spaceList: [],
loading: false,
formVisible: false,
codeTableLoading: false,
statusMap: {
0: "草稿",
1: "未审核",
2: "已完成"
},
formName: null,
formMap: {
add: "新增养护记录",
edit: "编辑养护记录"
},
maOrder: {},
}; };
}, },
methods: { methods: {
onReset() { saveOrder() {
this.$router.push({ if (this.detailList[0].maStatus === 0) {
path: "", this.$message.error("请完成当前设备养护！");
}); return;
this.filterQuery = { }
orderId: null, this.formData.remark = this.detailList[0].remark;
invCode: this.$store.getters.locInvCode, this.formData.maStatus = this.detailList[0].maStatus;
invSpaceCode: null, this.formData.deviceStatus = this.detailList[0].deviceStatus;
status: 0, addDeviceMAOrder(this.formData).then((res) => {
page: 1,
limit: 20,
};
this.spaceList = [];
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getInvMAOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.list = [];
this.total = 0;
})
},
invChange() {
this.spaceList = [];
this.getSpaceList();
this.getList();
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getSpaceList();
this.getList();
})
.catch(() => {
});
},
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
})
},
addMAOrder() {
this.formVisible = true;
this.formName = 'add';
this.maOrder = {};
},
editOrder(row) {
this.formVisible = true;
this.formName = 'edit';
this.maOrder = row;
},
submitAudit(row) {
let params = {id: row.id};
submitAudit(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("提交成功！"); this.closeDialog();
this.getList();
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
@ -226,34 +163,12 @@ export default {
this.$message.error(error.message); this.$message.error(error.message);
}); });
}, },
deleteDialog(rowId) { getMAOrderDetailList(code) {
this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', { let params = {code: code};
confirmButtonText: '确定', filterDetail(params).then((res) => {
cancelButtonText: '取消', this.detailList.push(res.data);
type: 'warning' })
}).then(() => { }
let params = {id: rowId};
this.loading = true;
deleteInvMAOrder(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: {
addInvMAOrder
}, },
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
@ -262,7 +177,16 @@ export default {
}; };
}, },
created() { created() {
this.getInvList(); this.formData = {
code: this.deviceMAOrder.code,
createUser: this.$store.getters.adminId,
createUserName: this.$store.getters.name,
deptName: this.deviceMAOrder.deptName,
createTime: this.deviceMAOrder.createTime,
deptCode: this.deviceMAOrder.deptCode,
collOrderId: this.deviceMAOrder.collOrderId
};
this.getMAOrderDetailList(this.deviceMAOrder.code);
}, },
}; };
</script> </script>

237
src/views/inventory/DeviceReceiveOrderAudit.vue
Unescape Escape View File

@ -2,12 +2,25 @@
<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" size="mini" :inline="true">
<el-form-item class="query-form-item" label="养护记录号:"> <el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号" <el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" label="仓库:"> <el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true" <el-select v-model="filterQuery.fromDeptCode" placeholder="请选择部门" clearable="true"
@change="deptChange"
>
<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-form-item class="query-form-item" label="领用仓库:">
<el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
@change="invChange" @change="invChange"
> >
<el-option <el-option
@ -19,8 +32,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" label="货位:"> <el-form-item class="query-form-item" label="领用货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true" <el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
> >
<el-option <el-option
v-for="item in spaceList" v-for="item in spaceList"
@ -35,38 +48,33 @@
<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="addMAOrder">新增养护记录</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </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
@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="invName" ></el-table-column> <el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" ></el-table-column> <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
<el-table-column label="养护日期" prop="createTime" ></el-table-column> <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
<el-table-column label="养护人" prop="createUserName"></el-table-column> <el-table-column label="领用日期" prop="createTime"></el-table-column>
<el-table-column label="领用人" prop="createUserName"></el-table-column>
<el-table-column label="创建人" prop="createUserName"></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="操作" > <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="editOrder(scope.row)" @click.native.stop="auditOrder(scope.row)"
>编辑 >审核
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="submitAudit(scope.row)"
>提交审核
</el-button </el-button
> >
<el-button <el-button
@ -88,59 +96,78 @@
></pagination> ></pagination>
</el-card> </el-card>
<el-dialog <el-card>
:title="formMap[formName]" <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
:visible.sync="formVisible" <el-table-column label="序号" type="index" width="50"></el-table-column>
:close-on-click-modal="false" <el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
:close-on-press-escape="false" <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
width="85%" <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
v-if="formVisible" <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
> <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<addInvMAOrder <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
:maOrder="maOrder" <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
:closeDialog="closeDialog" <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
></addInvMAOrder> <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
</el-dialog> show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="getList"
></pagination>
</el-card>
</div> </div>
</template> </template>
<script> <script>
import {getInvListByUser} from "@/api/system/invWarehouse"; import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace"; import {getInvSpaceList} from "@/api/inventory/invSpace";
import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder"; import {
import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue"; getDeviceReceiveOrderDetailList,
updateDeviceReceiveOrderStatus,
deleteDeviceReceiveOrder,
getDeviceReceiveOrderList
} from "@/api/inventory/deviceReceiveOrder";
export default { export default {
name: "InvMAOrderNew", name: "DeviceReceiveOrderAudit",
data() { data() {
return { return {
filterQuery: { filterQuery: {
orderId: null, orderId: null,
invCode: this.$store.getters.locInvCode, fromDeptCode: this.$store.getters.locDeptCode,
invSpaceCode: null, fromInvCode: null,
status: 0, fromInvSpaceCode: null,
status: 1,
page: 1, page: 1,
limit: 20, limit: 20,
}, },
list: [], list: [],
total: 0, total: 0,
deptList: [],
invList: [], invList: [],
spaceList: [], spaceList: [],
loading: false, loading: false,
formVisible: false,
codeTableLoading: false,
statusMap: { statusMap: {
0: "草稿", 0: "草稿",
1: "未审核", 1: "未审核",
2: "已完成" 2: "已完成"
}, },
formName: null, detailQuery: {
formMap: { orderIdFk: null,
add: "新增养护记录", page: 1,
edit: "编辑养护记录" limit: 20,
}, },
maOrder: {}, detailList: [],
detailLoading: false,
detailTotal: 0
}; };
}, },
methods: { methods: {
@ -150,9 +177,10 @@ export default {
}); });
this.filterQuery = { this.filterQuery = {
orderId: null, orderId: null,
invCode: this.$store.getters.locInvCode, fromDeptCode: this.$store.getters.locDeptCode,
invSpaceCode: null, fromInvCode: null,
status: 0, fromInvSpaceCode: null,
status: 1,
page: 1, page: 1,
limit: 20, limit: 20,
}; };
@ -165,7 +193,7 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
getInvMAOrderList(this.filterQuery).then((res) => { getDeviceReceiveOrderList(this.filterQuery).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.list = res.data.list || []; this.list = res.data.list || [];
@ -182,16 +210,30 @@ export default {
this.total = 0; this.total = 0;
}) })
}, },
deptChange() {
this.invList = [];
this.spaceList = [];
this.filterQuery.fromInvCode = null;
this.filterQuery.fromInvSpaceCode = null;
this.getInvList();
},
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
this.getInvList();
this.getList();
});
},
invChange() { invChange() {
this.spaceList = []; this.spaceList = [];
this.filterQuery.fromInvSpaceCode = null;
this.getSpaceList(); this.getSpaceList();
this.getList();
}, },
getInvList() { getInvList() {
getInvListByUser() let params = {deptCode: this.filterQuery.fromDeptCode};
findInvByUser(params)
.then((response) => { .then((response) => {
this.invList = response.data || []; this.invList = response.data || [];
this.getSpaceList();
this.getList(); this.getList();
}) })
.catch(() => { .catch(() => {
@ -201,40 +243,82 @@ export default {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
this.getList();
}) })
}, },
addMAOrder() { auditOrder(row) {
this.formVisible = true; this.$confirm('请选择审核意见', '提示', {
this.formName = 'add'; confirmButtonText: '通过',
this.maOrder = {}; cancelButtonText: '驳回',
type: 'warning',
center: true,
closeOnPressEscape: false,//按下 ESC 键关闭弹窗
closeOnClickModal: false,//点击遮罩关闭弹窗
distinguishCancelAndClose: true,//区分取消与关闭
}).then(() => {
let params = {
id: row.id,
status: 2
};
updateDeviceReceiveOrderStatus(params).then((res) => {
if (res.code === 20000) {
this.$message.success("审核通过！");
this.getList();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
})
}).catch((action) => {
if (action === "cancel") {
let params = {
id: row.id,
status: 0
};
updateDeviceReceiveOrderStatus(params).then((res) => {
if (res.code === 20000) {
this.$message.success("已驳回！")
this.getList();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
});
} else {
return;
}
});
}, },
editOrder(row) { handleChange(row) {
this.formVisible = true; this.detailQuery.orderIdFk = row.orderId;
this.formName = 'edit'; this.detailQuery.page = 1;
this.maOrder = row; this.getDetailList();
}, },
submitAudit(row) { getDetailList() {
let params = {id: row.id}; getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => {
submitAudit(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("提交成功！"); this.detailList = res.data.list || [];
this.getList(); this.detailTotal = res.data.total || 0;
} else { } else {
this.$message.error(res.message); this.detailList = [];
this.detailTotal = 0;
} }
}).catch((error) => { }).catch(() => {
this.$message.error(error.message); this.detailList = [];
this.detailTotal = 0;
}); });
}, },
deleteDialog(rowId) { deleteDialog(rowId) {
this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', { this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
let params = {id: rowId}; let params = {id: rowId};
this.loading = true; this.loading = true;
deleteInvMAOrder(params).then((res) => { deleteDeviceReceiveOrder(params).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("删除成功！"); this.$message.success("删除成功！");
@ -252,9 +336,6 @@ export default {
this.getList(); this.getList();
}, },
}, },
components: {
addInvMAOrder
},
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
event.preventDefault(); event.preventDefault();
@ -262,7 +343,7 @@ export default {
}; };
}, },
created() { created() {
this.getInvList(); this.getDeptList();
}, },
}; };
</script> </script>

223
src/views/inventory/DeviceReceiveOrderCompleted.vue
Unescape Escape View File

@ -2,12 +2,25 @@
<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" size="mini" :inline="true">
<el-form-item class="query-form-item" label="养护记录号:"> <el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号" <el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" label="仓库:"> <el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true" <el-select v-model="filterQuery.fromDeptCode" placeholder="请选择部门" clearable="true"
@change="deptChange"
>
<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-form-item class="query-form-item" label="领用仓库:">
<el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
@change="invChange" @change="invChange"
> >
<el-option <el-option
@ -19,8 +32,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" label="货位:"> <el-form-item class="query-form-item" label="领用货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true" <el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
> >
<el-option <el-option
v-for="item in spaceList" v-for="item in spaceList"
@ -35,49 +48,26 @@
<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="addMAOrder">新增养护记录</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </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
@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="invName" ></el-table-column> <el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" ></el-table-column> <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
<el-table-column label="养护日期" prop="createTime" ></el-table-column> <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
<el-table-column label="养护人" prop="createUserName"></el-table-column> <el-table-column label="领用日期" prop="createTime"></el-table-column>
<el-table-column label="领用人" prop="createUserName"></el-table-column>
<el-table-column label="创建人" prop="createUserName"></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="操作" >
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="editOrder(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="submitAudit(scope.row)"
>提交审核
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -88,59 +78,76 @@
></pagination> ></pagination>
</el-card> </el-card>
<el-dialog <el-card>
:title="formMap[formName]" <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
:visible.sync="formVisible" <el-table-column label="序号" type="index" width="50"></el-table-column>
:close-on-click-modal="false" <el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
:close-on-press-escape="false" <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
width="85%" <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
v-if="formVisible" <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
> <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<addInvMAOrder <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
:maOrder="maOrder" <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
:closeDialog="closeDialog" <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
></addInvMAOrder> <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
</el-dialog> show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="getList"
></pagination>
</el-card>
</div> </div>
</template> </template>
<script> <script>
import {getInvListByUser} from "@/api/system/invWarehouse"; import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace"; import {getInvSpaceList} from "@/api/inventory/invSpace";
import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder"; import {
import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue"; getDeviceReceiveOrderDetailList,
getDeviceReceiveOrderList
} from "@/api/inventory/deviceReceiveOrder";
export default { export default {
name: "InvMAOrderNew", name: "DeviceReceiveOrderCompleted",
data() { data() {
return { return {
filterQuery: { filterQuery: {
orderId: null, orderId: null,
invCode: this.$store.getters.locInvCode, fromDeptCode: this.$store.getters.locDeptCode,
invSpaceCode: null, fromInvCode: null,
status: 0, fromInvSpaceCode: null,
status: 2,
page: 1, page: 1,
limit: 20, limit: 20,
}, },
list: [], list: [],
total: 0, total: 0,
deptList: [],
invList: [], invList: [],
spaceList: [], spaceList: [],
loading: false, loading: false,
formVisible: false,
codeTableLoading: false,
statusMap: { statusMap: {
0: "草稿", 0: "草稿",
1: "未审核", 1: "未审核",
2: "已完成" 2: "已完成"
}, },
formName: null, detailQuery: {
formMap: { orderIdFk: null,
add: "新增养护记录", page: 1,
edit: "编辑养护记录" limit: 20,
}, },
maOrder: {}, detailList: [],
detailLoading: false,
detailTotal: 0
}; };
}, },
methods: { methods: {
@ -150,9 +157,10 @@ export default {
}); });
this.filterQuery = { this.filterQuery = {
orderId: null, orderId: null,
invCode: this.$store.getters.locInvCode, fromDeptCode: this.$store.getters.locDeptCode,
invSpaceCode: null, fromInvCode: null,
status: 0, fromInvSpaceCode: null,
status: 2,
page: 1, page: 1,
limit: 20, limit: 20,
}; };
@ -165,7 +173,9 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
getInvMAOrderList(this.filterQuery).then((res) => { this.detailList = [];
this.detailTotal = 0;
getDeviceReceiveOrderList(this.filterQuery).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.list = res.data.list || []; this.list = res.data.list || [];
@ -182,16 +192,30 @@ export default {
this.total = 0; this.total = 0;
}) })
}, },
deptChange() {
this.invList = [];
this.spaceList = [];
this.filterQuery.fromInvCode = null;
this.filterQuery.fromInvSpaceCode = null;
this.getInvList();
},
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
this.getInvList();
this.getList();
});
},
invChange() { invChange() {
this.spaceList = []; this.spaceList = [];
this.filterQuery.fromInvSpaceCode = null;
this.getSpaceList(); this.getSpaceList();
this.getList();
}, },
getInvList() { getInvList() {
getInvListByUser() let params = {deptCode: this.filterQuery.fromDeptCode};
findInvByUser(params)
.then((response) => { .then((response) => {
this.invList = response.data || []; this.invList = response.data || [];
this.getSpaceList();
this.getList(); this.getList();
}) })
.catch(() => { .catch(() => {
@ -201,50 +225,26 @@ export default {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
this.getList();
}) })
}, },
addMAOrder() { handleChange(row) {
this.formVisible = true; this.detailQuery.orderIdFk = row.orderId;
this.formName = 'add'; this.detailQuery.page = 1;
this.maOrder = {}; this.getDetailList();
},
editOrder(row) {
this.formVisible = true;
this.formName = 'edit';
this.maOrder = row;
}, },
submitAudit(row) { getDetailList() {
let params = {id: row.id}; getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => {
submitAudit(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("提交成功！"); this.detailList = res.data.list || [];
this.getList(); this.detailTotal = res.data.total || 0;
} else { } else {
this.$message.error(res.message); this.detailList = [];
this.detailTotal = 0;
} }
}).catch((error) => { }).catch(() => {
this.$message.error(error.message); this.detailList = [];
}); this.detailTotal = 0;
},
deleteDialog(rowId) {
this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: rowId};
this.loading = true;
deleteInvMAOrder(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() { closeDialog() {
@ -252,9 +252,6 @@ export default {
this.getList(); this.getList();
}, },
}, },
components: {
addInvMAOrder
},
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
event.preventDefault(); event.preventDefault();
@ -262,7 +259,7 @@ export default {
}; };
}, },
created() { created() {
this.getInvList(); this.getDeptList();
}, },
}; };
</script> </script>

843
src/views/inventory/DeviceReceiveOrderModify.vue
Unescape Escape View File

@ -1,272 +1,701 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card style="margin: 5px;margin-top: -20px">
<el-form :model="filterQuery" class="query-form" size="mini" :inline="true"> <el-form :model="formData" ref="dataForm" label-width="100px" style="margin-bottom: -15px">
<el-form-item class="query-form-item" label="养护记录号:"> <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号" <el-button
clearable="true"></el-input> type="primary"
</el-form-item> @click.native="saveDeviceReceiveOrder()"
<el-form-item class="query-form-item" label="仓库:"> >保存
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true" </el-button>
@change="invChange" </el-button-group>
>
<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-form-item class="query-form-item" label="货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<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-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addMAOrder">新增养护记录</el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-row>
border> <el-col :span="10">
<el-table-column label="序号" type="index"></el-table-column> <el-form-item class="query-form-item" label="领用记录号:">
<el-table-column label="养护记录号" prop="orderId" ></el-table-column> <el-input v-model="formData.orderId"
<el-table-column label="仓库" prop="invName" ></el-table-column> auto-complete="off"
<el-table-column label="货位" prop="invSpaceName" ></el-table-column> :disabled="true"
<el-table-column label="养护日期" prop="createTime" ></el-table-column> style="width: 90%"
<el-table-column label="养护人" prop="createUserName"></el-table-column> clearable
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> ></el-input>
<template slot-scope="scope"> </el-form-item>
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> </el-col>
</template> <el-col :span="10">
</el-table-column> <el-form-item class="query-form-item" label="领用日期:">
<el-table-column label="操作" > <el-input v-model="formData.createTime"
<template slot-scope="scope"> auto-complete="off"
<el-button :disabled="true"
type="text" style="width: 90%"
size="small" clearable
@click.native.stop="editOrder(scope.row)" ></el-input>
>编辑 </el-form-item>
</el-button </el-col>
> </el-row>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="formData.fromDeptCode" placeholder="领用部门信息"
:disabled="detailList.length >0 "
@change="deptChange"
style="width: 90%;"
clearable>
<el-option
v-for="item in deptList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</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="formData.fromInvCode" placeholder="领用仓库信息"
:disabled="detailList.length >0 "
@change="invChange"
style="width: 90%"
clearable>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="领用货位:">
<el-select v-model="formData.fromInvSpaceCode" placeholder="领用货位信息"
:disabled="detailList.length >0 "
style="width: 90%;"
clearable>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</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="formData.receiveUser" placeholder="领用人信息"
:disabled="detailList.length >0 "
style="width: 90%"
clearable>
<el-option
v-for="item in userList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="17">
<el-form-item class="query-form-item" label="扫码录入:">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref='inputRef'
style="ime-mode:disabled"
type="tel"
v-model="formData.code"
></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button <el-button
type="text" type="primary"
size="small" size="mini"
@click.native.stop="submitAudit(scope.row)" @click.native.stop="addCode()"
>提交审核 style="margin-left: 15px"
</el-button >扫码添加
> </el-button>
<el-button <el-button
type="text" type="primary"
size="small" :disabled="this.detailList.length > 0"
@click.native.stop="deleteDialog(scope.row.id)" @click.native="selectInvProduct()"
>删除 >手动添加
</el-button </el-button>
> </el-col>
</template> </el-row>
</el-table-column>
</el-table> <el-table v-loading="loading" :data="detailList" style="width: 100%;margin-top: 20px;"
<pagination highlight-current-row
v-show="total>0" border max-height="300" height="300">
:total="total" <el-table-column label="序号" type="index" width="50"></el-table-column>
:limit.sync="filterQuery.limit" <el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column>
:page.sync="filterQuery.page" <el-table-column width="150"
@pagination="getList" label="产品通用名"
></pagination> prop="productName"
show-overflow-tooltip
></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column width="150" label="养护数量" prop="count"></el-table-column>
<el-table-column width="150" label="养护状态" prop="maintenanceStatus">
<template slot-scope="scope">
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maStatus"
:label="0">未养护
</el-radio>
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maStatus"
:label="1">已养护
</el-radio>
</template>
</el-table-column>
<el-table-column width="150" label="设备状态" prop="deviceStatus">
<template slot-scope="scope">
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="1">
正常
</el-radio>
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="0">
异常
</el-radio>
</template>
</el-table-column>
<el-table-column width="200" label="养护备注" prop="remark">
<template slot-scope="scope">
<el-input :disabled="scope.$index !== currentIndex" v-model="scope.row.remark"></el-input>
</template>
</el-table-column>
<el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
<el-table-column label="失效日期(yyMMdd)" prop="expireDate"
show-overflow-tooltip></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="操作">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="editOrderDetail(scope.$index, scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="updateOrderDetail(scope.row)"
>保存
</el-button
>
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="deleteOrderDetail(scope.$index, scope.row)"
>减一
</el-button
>
</template>
</el-table-column>
</el-table>
</el-form>
</el-card> </el-card>
<el-dialog <el-dialog
:title="formMap[formName]" title="库存产品录入"
:visible.sync="formVisible" :visible.sync="selectInvProductVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
width="85%" width="85%"
v-if="formVisible" v-if="selectInvProductVisible"
:append-to-body='true'
> >
<addInvMAOrder <el-form :inline="true" :model="filterQuery" size="mini">
:maOrder="maOrder" <el-row>
:closeDialog="closeDialog" <el-form-item class="query-form-item" label="领用仓库:">
></addInvMAOrder> <el-select v-model="filterQuery.invCode" placeholder="领用仓库信息"
</el-dialog> :disabled="true"
clearable>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item" prop="invSpaceCode">
<el-select v-model="filterQuery.invSpaceCode" placeholder="领用货位信息"
:disabled="true"
clearable>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item" label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号" 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="queryInvProductsList"
>查询
</el-button
>
<el-button type="primary" icon="search" @click="combine">确定</el-button>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-table v-loading="loading" :data="productList" style="width: 100%"
highlight-current-row="false"
:row-key="getRowKeys"
@selection-change="handleSelectionChange"
ref="multipleTable">
<el-table-column
type="selection"
:reserve-selection="true"
width="55">
</el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc"></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="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
</el-table>
<pagination
v-show="productTotal>0"
:total="productTotal"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {getInvListByUser} from "@/api/system/invWarehouse"; import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace"; import {getInvSpaceList} from "@/api/inventory/invSpace";
import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder"; import {
import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue"; addDeviceReceiveOrder,
addDeviceReceiveOrderDetail,
updateDeviceReceiveOrder,
updateDeviceReceiveOrderDetail,
getDeviceReceiveOrderDetailList,
deleteDeviceReceiveOrderDetail,
checkCode
} from "@/api/inventory/deviceReceiveOrder";
import {getInvMAProducts} from "@/api/inventory/invPorduct";
import {isBlank} from "@/utils/strUtil";
import {listDeptUser} from "@/api/system/deptUser";
export default { export default {
name: "InvMAOrderNew", props: {
deviceReceiveOrder: {
type: Object,
required: true,
},
closeDialog: {
type: Function,
required: true,
},
},
data() { data() {
return { return {
filterQuery: { filterQuery: {
orderId: null, nameCode: null,
invCode: this.$store.getters.locInvCode, cpmctymc: null,
batchNo: null,
invCode: null,
cplb: "设备",
invSpaceCode: null, invSpaceCode: null,
status: 0,
page: 1, page: 1,
limit: 20, limit: 10
}, },
list: [], productList: [],
total: 0, productTotal: 0,
deptList: [],
invList: [], invList: [],
spaceList: [], spaceList: [],
loading: false, formData: {
formVisible: false, id: null,
codeTableLoading: false, orderId: null,
statusMap: { createTime: null,
0: "草稿", fromDeptCode: null,
1: "未审核", fromInvCode: null,
2: "已完成" fromInvSpaceCode: null,
}, receiveUser: null,
formName: null, status: 0,
formMap: { code: null,
add: "新增养护记录",
edit: "编辑养护记录"
}, },
maOrder: {}, detailList: [],
}; loading: false,
scanText: "扫码录入：",
currentIndex: -1,
selectInvProductVisible: false,
multiProduct: [],
userList: [],
productInvList: [],
productSpaceList: []
}
}, },
methods: { methods: {
onReset() { getInvList() {
this.$router.push({ let params = {deptCode: this.formData.fromDeptCode};
path: "", findInvByUser(params).then((res) => {
if (res.code === 20000) {
this.invList = res.data || [];
if (!isBlank(this.deviceReceiveOrder.fromInvSpaceCode)) {
this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode;
this.invChange();
}
}
}); });
this.filterQuery = { },
orderId: null, deptChange() {
invCode: this.$store.getters.locInvCode, //查询此部门下的仓库和用户
invSpaceCode: null, this.formData.fromInvCode = null;
status: 0, this.formData.fromInvSpaceCode = null;
page: 1, this.invList = [];
limit: 20,
};
this.spaceList = []; this.spaceList = [];
this.getList(); this.getInvList();
//拉取部门用户列表
this.getDeptUserList();
}, },
onSubmit() { getDeptUserList() {
this.filterQuery.page = 1; this.userList = [];
this.getList(); let params = {deptId: this.formData.fromDeptCode};
listDeptUser(params).then((res) =>{
this.userList = res.data.list || [];
})
}, },
getList() { getDeptList() {
this.loading = true; getDeptListByUser().then((res) => {
getInvMAOrderList(this.filterQuery).then((res) => { this.deptList = res.data || [];
this.loading = false; if (!isBlank(this.deviceReceiveOrder.fromInvCode)) {
if (res.code === 20000) { this.formData.fromInvCode = this.deviceReceiveOrder.fromInvCode;
this.list = res.data.list || []; this.getInvList();
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
this.list = [];
this.total = 0;
} }
}).catch((error) => { });
this.loading = false;
this.$message.error(error.message); if (!isBlank(this.formData.fromDeptCode)) {
this.list = []; this.getDeptUserList();
this.total = 0; }
})
}, },
invChange() { invChange() {
this.formData.invSpaceCode = null;
this.spaceList = []; this.spaceList = [];
this.getSpaceList(); let params = {invWarehouseCode: this.formData.invCode};
this.getList(); getInvSpaceList(params).then((res) => {
if (!isBlank(this.deviceReceiveOrder.fromInvSpaceCode)) {
this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode;
}
this.spaceList = res.data.list || [];
});
}, },
getInvList() { selectInvProduct() {
getInvListByUser() let message = this.verifyOrder();
.then((response) => { if (!isBlank(message)) {
this.invList = response.data || []; this.$message.warning(message);
this.getSpaceList(); return;
this.getList(); }
//保存或更新设备领用仓库信息
this.saveOrder();
this.onReset();
this.selectInvProductVisible = true;
},
saveMAOrder() {
this.saveOrder();
this.closeDialog();
},
saveOrder(code) {
if (!isBlank(this.formData.orderId)) {
//更新单据
updateDeviceReceiveOrder(this.formData).then((res) => {
}).catch((error) => {
this.$message.error("更新单据信息失败！");
}) })
.catch(() => { } else {
addDeviceReceiveOrder(this.formData).then((res) => {
if (res.code === 20000) {
this.formData.id = res.data.id;
this.formData.orderId = res.data.orderId;
this.formData.createTime = res.data.createTime;
if (!isBlank(code)) {
//扫码添加设备领用记录详情
if (!isBlank(this.formData.code)) {
this.addScanCode();
}
}
} else {
this.$message.error(res.message);
}
}); });
}
}, },
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode}; saveDeviceReceiveOrder() {
getInvSpaceList(params).then((res) => { let message = this.verifyOrder();
this.spaceList = res.data.list || []; if (isBlank(message)) {
}) this.saveOrder();
this.closeDialog();
} else {
this.$message.warning(message);
}
},
getInputFocus(event) {
event.currentTarget.select();
},
enterKey(event) {
this.addCode();
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
}, },
addMAOrder() { addCode() {
this.formVisible = true; let message = this.verifyOrder();
this.formName = 'add'; if (!isBlank(message)) {
this.maOrder = {}; this.$message.warning(message);
return;
}
if (isBlank(this.formData.code)) {
this.$message.warning("请扫描或输入UDI码");
return;
}
if (isBlank(this.formData.orderId)) {
this.saveOrder(this.formData.code);
} else {
this.addScanCode();
}
}, },
editOrder(row) { verifyOrder() {
this.formVisible = true; if (isBlank(this.formData.fromDeptCode)) {
this.formName = 'edit'; return "请选择领用部门！";
this.maOrder = row; } else if (isBlank(this.formData.fromInvCode)) {
return "请选择领用仓库！";
} else if (isBlank(this.formData.fromInvSpaceCode)) {
return "请选择领用货位！";
} else if (isBlank(this.formData.receiveUser)) {
return "请选择领用人！";
}
}, },
submitAudit(row) { addScanCode() {
let params = {id: row.id}; //校验条码是否符合规则
submitAudit(params).then((res) => { let checkParams = {
code: this.formData.code
};
checkCode(checkParams).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("提交成功！"); this.addDeviceReceiveOrderDetail();
} else {
if (res.code === 3) {
this.$message.error(res.message);
} else if (res.code === 7) {
this.$confirm(res.message + "，是否继续添加？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.addDeviceReceiveOrderDetail();
}).catch(() => {
});
}
}
}).catch((error) => {
});
},
addDeviceReceiveOrderDetail() {
//扫码添加库存养护记录详情
let params = {
orderIdFk: this.formData.orderId,
code: this.formData.code
}
addDeviceReceiveOrderDetail(params).then((res) => {
if (res.code === 20000) {
this.$message.success("添加成功！");
this.getList(); this.getList();
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
}).catch((error) => {
this.$message.error(error.message);
}); });
}, },
deleteDialog(rowId) { deleteOrderDetail(index, row) {
this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', { if (row.count === 1) {
confirmButtonText: '确定', this.$confirm('此产品领用数量为1，减一后将删除此产品领用记录，是否继续?', '提示', {
cancelButtonText: '取消', confirmButtonText: '确定',
type: 'warning' cancelButtonText: '取消',
}).then(() => { type: 'warning'
let params = {id: rowId}; }).then(() => {
this.loading = true; let params = {id: row.id};
deleteInvMAOrder(params).then((res) => { deleteDeviceReceiveOrderDetail(params).then((res) => {
this.loading = false; if (res.code === 20000) {
this.$message.success("删除成功");
this.getList();
}
})
}).catch(() => {
});
} else {
let params = {id: row.id};
deleteDeviceReceiveOrderDetail(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("删除成功！"); this.$message.success("删除成功");
this.getList(); this.getList();
} else {
this.$message.error(res.message);
} }
}).catch(() => { })
this.loading = false; }
}); },
getList() {
let params = {orderIdFk: this.formData.orderId};
getDeviceReceiveOrderDetailList(params).then((res) => {
if (res.code === 20000) {
this.detailList = res.data.list || [];
}
})
},
updateOrderDetail(row) {
updateDeviceReceiveOrderDetail(row).then((res) => {
if (res.code === 20000) {
this.$message.success("保存成功！")
this.getList();
}
})
},
editOrderDetail(index, row) {
this.currentIndex = index;
},
onReset() {
this.filterQuery = {
nameCode: null,
cpmctymc: null,
batchNo: null,
invCode: this.formData.fromInvCode,
cplb: "设备",
invSpaceCode: null,
page: 1,
limit: 10
};
this.multiProduct = [];
this.queryInvProducts();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.queryInvProducts();
},
queryInvProductsList() {
this.filterQuery.page = 1;
this.queryInvProducts();
},
queryInvProducts() {
this.filterQuery.invCode = this.formData.invCode;
this.filterQuery.invSpaceCode = this.formData.invSpaceCode;
getInvMAProducts(this.filterQuery).then((res) => {
if (res.code === 20000) {
this.productList = res.data.list || [];
this.productTotal = res.data.total || 0;
} else {
this.$message.error(res.message);
this.productList = [];
this.productTotal = 0;
}
}).catch((error) => {
this.$message.error(error.message);
this.productList = [];
this.productTotal = 0;
}); });
}, },
closeDialog() { combine() {
this.formVisible = false; if (this.multiProduct.length === 0) {
this.getList(); this.$message.error("请选择养护产品！");
return;
}
let invProductIds = [];
this.multiProduct.forEach(item => {
invProductIds.push(item.id);
});
let params = {
orderIdFk: this.formData.orderId,
invProductIds: invProductIds
};
addDeviceReceiveOrderDetail(params).then((res) => {
if (res.code === 20000) {
this.$message.success("录入成功！");
this.selectInvProductVisible = false;
this.getList();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
})
},
getRowKeys(row) {
return row.id;
},
handleSelectionChange(selectedRows) {
this.multiProduct = [];
selectedRows.forEach(item => {
this.multiProduct.push(item);
});
}, },
},
components: {
addInvMAOrder
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
}, },
created() { created() {
this.getInvList(); this.getDeptList();
if (null !== this.deviceReceiveOrder) {
this.formData.orderId = this.deviceReceiveOrder.orderId;
this.formData.createTime = this.deviceReceiveOrder.createTime;
this.formData.fromDeptCode = this.deviceReceiveOrder.fromDeptCode;
this.formData.fromInvCode = this.deviceReceiveOrder.fromInvCode;
this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode;
this.formData.receiveUser = this.deviceReceiveOrder.receiveUser;
this.getList();
}
}, },
}; };
</script> </script>
<style type="text/scss" lang="scss">
</style>

110
src/views/inventory/DeviceReceiveOrderNew.vue
Unescape Escape View File

@ -2,12 +2,25 @@
<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" size="mini" :inline="true">
<el-form-item class="query-form-item" label="养护记录号:"> <el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号" <el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" label="仓库:"> <el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true" <el-select v-model="filterQuery.fromDeptCode" placeholder="请选择部门" clearable="true"
@change="deptChange"
>
<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-form-item class="query-form-item" label="领用仓库:">
<el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
@change="invChange" @change="invChange"
> >
<el-option <el-option
@ -19,8 +32,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" label="货位:"> <el-form-item class="query-form-item" label="领用货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true" <el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
> >
<el-option <el-option
v-for="item in spaceList" v-for="item in spaceList"
@ -35,7 +48,7 @@
<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="addMAOrder">新增养护记录</el-button> <el-button type="primary" icon="el-icon-plus" @click="addReceiveOrder">新增领用记录</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -43,17 +56,19 @@
<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="invName" ></el-table-column> <el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" ></el-table-column> <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
<el-table-column label="养护日期" prop="createTime" ></el-table-column> <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
<el-table-column label="养护人" prop="createUserName"></el-table-column> <el-table-column label="领用日期" prop="createTime"></el-table-column>
<el-table-column label="领用人" prop="createUserName"></el-table-column>
<el-table-column label="创建人" prop="createUserName"></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="操作" > <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -96,35 +111,38 @@
width="85%" width="85%"
v-if="formVisible" v-if="formVisible"
> >
<addInvMAOrder <deviceReceiveOrderModify
:maOrder="maOrder" :deviceReceiveOrder="deviceReceiveOrder"
:closeDialog="closeDialog" :closeDialog="closeDialog"
></addInvMAOrder> ></deviceReceiveOrderModify>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {getInvListByUser} from "@/api/system/invWarehouse"; import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace"; import {getInvSpaceList} from "@/api/inventory/invSpace";
import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder"; import deviceReceiveOrderModify from "@/views/inventory/DeviceReceiveOrderModify.vue";
import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue"; import {submitAudit, deleteDeviceReceiveOrder, getDeviceReceiveOrderList} from "@/api/inventory/deviceReceiveOrder";
export default { export default {
name: "InvMAOrderNew", name: "DeviceReceiveOrderNew",
data() { data() {
return { return {
filterQuery: { filterQuery: {
orderId: null, orderId: null,
invCode: this.$store.getters.locInvCode, fromDeptCode: this.$store.getters.locDeptCode,
invSpaceCode: null, fromInvCode: null,
fromInvSpaceCode: null,
status: 0, status: 0,
page: 1, page: 1,
limit: 20, limit: 20,
}, },
list: [], list: [],
total: 0, total: 0,
deptList: [],
invList: [], invList: [],
spaceList: [], spaceList: [],
loading: false, loading: false,
@ -137,10 +155,10 @@ export default {
}, },
formName: null, formName: null,
formMap: { formMap: {
add: "新增养护记录", add: "新增设备领用记录",
edit: "编辑养护记录" edit: "编辑设备领用记录"
}, },
maOrder: {}, deviceReceiveOrder: {},
}; };
}, },
methods: { methods: {
@ -150,8 +168,9 @@ export default {
}); });
this.filterQuery = { this.filterQuery = {
orderId: null, orderId: null,
invCode: this.$store.getters.locInvCode, fromDeptCode: this.$store.getters.locDeptCode,
invSpaceCode: null, fromInvCode: null,
fromInvSpaceCode: null,
status: 0, status: 0,
page: 1, page: 1,
limit: 20, limit: 20,
@ -165,7 +184,7 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
getInvMAOrderList(this.filterQuery).then((res) => { getDeviceReceiveOrderList(this.filterQuery).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.list = res.data.list || []; this.list = res.data.list || [];
@ -182,16 +201,30 @@ export default {
this.total = 0; this.total = 0;
}) })
}, },
deptChange() {
this.invList = [];
this.spaceList = [];
this.filterQuery.fromInvCode = null;
this.filterQuery.fromInvSpaceCode = null;
this.getInvList();
},
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
this.getInvList();
this.getList();
});
},
invChange() { invChange() {
this.spaceList = []; this.spaceList = [];
this.filterQuery.fromInvSpaceCode = null;
this.getSpaceList(); this.getSpaceList();
this.getList();
}, },
getInvList() { getInvList() {
getInvListByUser() let params = {deptCode: this.filterQuery.fromDeptCode};
findInvByUser(params)
.then((response) => { .then((response) => {
this.invList = response.data || []; this.invList = response.data || [];
this.getSpaceList();
this.getList(); this.getList();
}) })
.catch(() => { .catch(() => {
@ -201,17 +234,18 @@ export default {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
this.getList();
}) })
}, },
addMAOrder() { addReceiveOrder() {
this.formVisible = true; this.formVisible = true;
this.formName = 'add'; this.formName = 'add';
this.maOrder = {}; this.deviceReceiveOrder = {};
}, },
editOrder(row) { editOrder(row) {
this.formVisible = true; this.formVisible = true;
this.formName = 'edit'; this.formName = 'edit';
this.maOrder = row; this.deviceReceiveOrder = row;
}, },
submitAudit(row) { submitAudit(row) {
let params = {id: row.id}; let params = {id: row.id};
@ -227,14 +261,14 @@ export default {
}); });
}, },
deleteDialog(rowId) { deleteDialog(rowId) {
this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', { this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
let params = {id: rowId}; let params = {id: rowId};
this.loading = true; this.loading = true;
deleteInvMAOrder(params).then((res) => { deleteDeviceReceiveOrder(params).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("删除成功！"); this.$message.success("删除成功！");
@ -253,7 +287,7 @@ export default {
}, },
}, },
components: { components: {
addInvMAOrder deviceReceiveOrderModify
}, },
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
@ -262,7 +296,7 @@ export default {
}; };
}, },
created() { created() {
this.getInvList(); this.getDeptList();
}, },
}; };
</script> </script>

4
src/views/inventory/InvMAOrderAudit.vue
Unescape Escape View File

@ -162,13 +162,13 @@ export default {
1: "未审核", 1: "未审核",
2: "已完成" 2: "已完成"
}, },
detailList: [],
detailLoading: false,
detailQuery: { detailQuery: {
orderIdFk: null, orderIdFk: null,
page: 1, page: 1,
limit: 20, limit: 20,
}, },
detailList: [],
detailLoading: false,
detailTotal: 0 detailTotal: 0
}; };
}, },

8
src/views/inventory/InvMAOrderModify.vue
Unescape Escape View File

@ -60,7 +60,7 @@
</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="养护货位:">
<el-select v-model="formData.invSpaceCode" placeholder="养护货位信息" <el-select v-model="formData.invSpaceCode" placeholder="养护货位信息"
:disabled="detailList.length >0 " :disabled="detailList.length >0 "
style="width: 90%" style="width: 90%"
@ -193,13 +193,13 @@
> >
<el-form :inline="true" :model="filterQuery" size="mini"> <el-form :inline="true" :model="filterQuery" size="mini">
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item" label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input> <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input> <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input> <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

Write Preview
Loading…
Cancel
Save