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

1.优化库存养护页面展示效果

Browse Source 
2.完善库存养护功能
feature-order-fix
x_z 3 years ago
parent db1da58dc4
commit d89e3b13fa
4 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File

3
src/views/inventory/addInvMAOrder.vue
Unescape Escape View File

@ -380,8 +380,7 @@ export default {
if (res.code === 20000) { if (res.code === 20000) {
this.formData.orderId = res.data.orderId; this.formData.orderId = res.data.orderId;
this.formData.createTime = res.data.createTime; this.formData.createTime = res.data.createTime;
this.$message.success("保存成功！"); if (!isBlank(code)) {
if (!isBlank(!code)) {
//扫码添加库存养护记录详情 //扫码添加库存养护记录详情
let params = { let params = {
orderIdFk: this.formData.orderId, orderIdFk: this.formData.orderId,

40
src/views/inventory/invMAOrderAudit.vue
Unescape Escape View File

@ -61,9 +61,9 @@
<el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column> <el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column>
<el-table-column label="仓库" prop="invWarehouseName" width="180"></el-table-column> <el-table-column label="仓库" prop="invWarehouseName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column> <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="养护日期" prop="createTime" width="120"></el-table-column> <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
<el-table-column label="养护人" prop="createUser" width="120"></el-table-column> <el-table-column label="养护人" prop="createUser" width="150"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="状态" prop="status" 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>
@ -101,15 +101,15 @@
<el-card> <el-card>
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 10px;"> <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="150" prop="code"></el-table-column> <el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column width="150" <el-table-column width="200"
label="产品通用名" label="产品通用名"
prop="productName" prop="productName"
show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" 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="batchNo"></el-table-column>
<el-table-column width="150" label="养护数量" prop="count" show-overflow-tooltip></el-table-column> <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
<el-table-column width="150" label="养护数量" prop="count"></el-table-column>
<el-table-column width="150" label="养护状态" prop="maintenanceStatus"> <el-table-column width="150" label="养护状态" prop="maintenanceStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio disabled="true" v-model="scope.row.maintenanceStatus" <el-radio disabled="true" v-model="scope.row.maintenanceStatus"
@ -132,12 +132,12 @@
</el-table-column> </el-table-column>
<el-table-column width="200" label="养护备注" prop="remark"> <el-table-column width="200" label="养护备注" prop="remark">
</el-table-column> </el-table-column>
<el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column> <el-table-column width="150" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
<el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate" <el-table-column width="160" label="失效日期(yyMMdd)" prop="expireDate"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh" <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="生产厂家" prop="ylqxzcrbarmc" <el-table-column width="200" label="生产厂家" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
</el-table> </el-table>
@ -272,7 +272,7 @@ export default {
auditOrder(row) { auditOrder(row) {
this.$confirm('请选择审核意见', '提示', { this.$confirm('请选择审核意见', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '驳回',
type: 'warning', type: 'warning',
center: true center: true
}).then(() => { }).then(() => {
@ -290,7 +290,23 @@ export default {
}).catch((error) => { }).catch((error) => {
this.$message.error(error.message); this.$message.error(error.message);
}) })
}).catch(() => { }).catch((action) => {
if (action === "cancel") {
let params = {
id: row.id,
status: 0
};
updateStatus(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(id) { deleteDialog(id) {

24
src/views/inventory/invMAOrderCompleted.vue
Unescape Escape View File

@ -57,9 +57,10 @@
<el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column> <el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column>
<el-table-column label="仓库" prop="invWarehouseName" width="180"></el-table-column> <el-table-column label="仓库" prop="invWarehouseName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column> <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="养护日期" prop="createTime" width="120"></el-table-column> <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
<el-table-column label="审核日期" prop="auditTime" width="150"></el-table-column>
<el-table-column label="养护人" prop="createUser" width="120"></el-table-column> <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="状态" prop="status" 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>
@ -79,15 +80,15 @@
<el-card> <el-card>
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 10px;"> <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="150" prop="code"></el-table-column> <el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column width="150" <el-table-column width="200"
label="产品通用名" label="产品通用名"
prop="productName" prop="productName"
show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column> <el-table-column width="150" label="规格型号" prop="ggxh"></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column> <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column width="150" label="养护数量" prop="count" show-overflow-tooltip></el-table-column> <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
<el-table-column width="150" label="养护数量" prop="count"></el-table-column>
<el-table-column width="150" label="养护状态" prop="maintenanceStatus"> <el-table-column width="150" label="养护状态" prop="maintenanceStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio disabled="true" v-model="scope.row.maintenanceStatus" <el-radio disabled="true" v-model="scope.row.maintenanceStatus"
@ -108,14 +109,13 @@
</el-radio> </el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" label="养护备注" prop="remark"></el-table-column> <el-table-column width="200" label="养护备注" prop="remark" show-overflow-tooltip></el-table-column>
<el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column> <el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
<el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate" <el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate"></el-table-column>
show-overflow-tooltip></el-table-column>
<el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh" <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="生产厂家" prop="ylqxzcrbarmc" <el-table-column width="180" label="生产厂家" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column> ></el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination

3
src/views/inventory/invMAOrderNew.vue
Unescape Escape View File

@ -58,7 +58,7 @@
<el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column> <el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column>
<el-table-column label="仓库" prop="invWarehouseName" width="180"></el-table-column> <el-table-column label="仓库" prop="invWarehouseName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column> <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="养护日期" prop="createTime" width="120"></el-table-column> <el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
<el-table-column label="养护人" prop="createUser" width="120"></el-table-column> <el-table-column label="养护人" prop="createUser" width="120"></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">
@ -222,6 +222,7 @@ export default {
}, },
closeDialog() { closeDialog() {
this.formVisible = false; this.formVisible = false;
this.getList();
}, },
addMAOrder() { addMAOrder() {
this.maOrder = null; this.maOrder = null;

Write Preview
Loading…
Cancel
Save