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

1.修复单据相关页面的bug

Browse Source
prod
x_z 2 years ago
parent 8cd060bcd0
commit a31578ca74
6 changed files with 126 additions and 125 deletions

43
src/api/inout/code.js
Unescape Escape View File

@ -1,20 +1,39 @@
import axios from '@/utils/request' import axios from '@/utils/request'
export function saveCode(query) { export function saveCode(query) {
return axios({ return axios({
url: "/warehouse/inout/saveTempCode", url: "/warehouse/inout/saveTempCode",
method: "post", method: "post",
data: query data: query
}); });
} }
export function findByCode(query) { export function findByCode(query) {
return axios( return axios(
{ {
url: "/udiwms/basic/findByCode", url: "/udiwms/basic/findByCode",
method: "get", method: "get",
params: query params: query
} }
); );
}
export function getCodeList(params) {
return axios({
url: "/udiwms/inout/code/filterList",
method: "get",
params: params
});
} }
export function findByOrderId(params) {
return axios({
url: "/udiwms/inout/code/findByOrderId",
method: "get",
params: params
});
}

68
src/views/inout/IoAuditedOrder.vue
Unescape Escape View File

@ -332,8 +332,8 @@
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini"> <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="产品名称:"> <el-form-item class="query-form-item" label="产品名称:">
<el-input <el-input
v-model="resultQuery.productName" v-model="resultQuery.code"
placeholder="请输入产品名称" placeholder="请输入UDI码"
clearable clearable
> >
</el-input> </el-input>
@ -360,52 +360,39 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="产品通用名" label="UDI码"
prop="coName" prop="code"
></el-table-column> show-overflow-tooltip
<el-table-column
label="规格型号"
prop="spec"
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产日期" label="生产日期"
prop="productDate" prop="produceDate"
width="120"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="失效日期" label="失效日期"
prop="expireDate" prop="expireDate"
width="120"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="单据数量" label="批次号"
prop="count" prop="batchNo"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
></el-table-column>
<el-table-column
label="价格"
prop="price"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="销售清单号" label="序列号"
prop="secSalesListNo" prop="serialNo"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票第一票" label="供应商"
prop="firstSalesInvNo" prop="supName"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票第二票" label="扫码数量"
prop="secSalesInvNo" prop="reCount"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票有效期" label="实际数量"
prop="invoiceDate" prop="reCount"
></el-table-column> ></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
@ -442,7 +429,8 @@ import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getResultDetailList} from "@/api/inout/orderDetailResult"; import {getCodeList} from "@/api/inout/code";
const formJson = { const formJson = {
site_id: "", site_id: "",
@ -557,7 +545,8 @@ export default {
codeDetailLoading: false, codeDetailLoading: false,
codeDetailList: [], codeDetailList: [],
resultQuery: { resultQuery: {
orderIdFk: null, orderId: null,
code: null,
page: 1, page: 1,
limit: 10 limit: 10
}, },
@ -620,6 +609,10 @@ export default {
}, },
// 获取单据 业务详情、扫码详情、扫码明细 // 获取单据 业务详情、扫码详情、扫码明细
getOrderDetails() { getOrderDetails() {
this.bizQuery.page = 1;
this.codeQuery.page = 1;
this.resultQuery.page = 1;
this.getBizDetailList(); this.getBizDetailList();
this.getCodeDetailList(); this.getCodeDetailList();
this.getResultDetailList(); this.getResultDetailList();
@ -787,7 +780,8 @@ export default {
}, },
onResultReset() { onResultReset() {
this.resultQuery = { this.resultQuery = {
orderIdFk: null, orderId: null,
code: null,
page: 1, page: 1,
limit: 10 limit: 10
}; };
@ -803,13 +797,13 @@ export default {
return; return;
} }
this.resultQuery.orderIdFk = this.currentRow.billNo; this.resultQuery.orderId = this.currentRow.billNo;
this.resultDetailLoading = true; this.resultDetailLoading = true;
getResultDetailList(this.resultQuery).then((res) => { getCodeList(this.resultQuery).then((res) => {
this.resultDetailLoading = false; this.resultDetailLoading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.resultDetailList = res.data.list || []; this.resultDetailList = res.data.list || [];
this.resultTotal = 0; this.resultTotal = res.data.total || 0;
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
this.resultDetailList = []; this.resultDetailList = [];

68
src/views/inout/IoCheckErrorOrder.vue
Unescape Escape View File

@ -322,8 +322,8 @@
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini"> <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="产品名称:"> <el-form-item class="query-form-item" label="产品名称:">
<el-input <el-input
v-model="resultQuery.productName" v-model="resultQuery.code"
placeholder="请输入产品名称" placeholder="请输入UDI码"
clearable clearable
> >
</el-input> </el-input>
@ -350,52 +350,39 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="产品通用名" label="UDI码"
prop="coName" prop="code"
></el-table-column> show-overflow-tooltip
<el-table-column
label="规格型号"
prop="spec"
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产日期" label="生产日期"
prop="productDate" prop="produceDate"
width="120"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="失效日期" label="失效日期"
prop="expireDate" prop="expireDate"
width="120"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="单据数量" label="批次号"
prop="count" prop="batchNo"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
></el-table-column>
<el-table-column
label="价格"
prop="price"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="销售清单号" label="序列号"
prop="secSalesListNo" prop="serialNo"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票第一票" label="供应商"
prop="firstSalesInvNo" prop="supName"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票第二票" label="扫码数量"
prop="secSalesInvNo" prop="reCount"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票有效期" label="实际数量"
prop="invoiceDate" prop="reCount"
></el-table-column> ></el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -439,7 +426,7 @@ import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getResultDetailList} from "@/api/inout/orderDetailResult"; import {getCodeList} from "@/api/inout/code";
import addOrder from "./IoCreateOrder"; import addOrder from "./IoCreateOrder";
@ -556,7 +543,8 @@ export default {
codeDetailLoading: false, codeDetailLoading: false,
codeDetailList: [], codeDetailList: [],
resultQuery: { resultQuery: {
orderIdFk: null, orderId: null,
code: null,
page: 1, page: 1,
limit: 10 limit: 10
}, },
@ -649,6 +637,11 @@ export default {
}, },
// 获取单据 业务详情、扫码详情、扫码明细 // 获取单据 业务详情、扫码详情、扫码明细
getOrderDetails() { getOrderDetails() {
this.bizQuery.page = 1;
this.codeQuery.page = 1;
this.resultQuery.page = 1;
this.getBizDetailList(); this.getBizDetailList();
this.getCodeDetailList(); this.getCodeDetailList();
this.getResultDetailList(); this.getResultDetailList();
@ -832,7 +825,8 @@ export default {
}, },
onResultReset() { onResultReset() {
this.resultQuery = { this.resultQuery = {
orderIdFk: null, orderId: null,
code: null,
page: 1, page: 1,
limit: 10 limit: 10
}; };
@ -848,13 +842,13 @@ export default {
return; return;
} }
this.resultQuery.orderIdFk = this.currentRow.billNo; this.resultQuery.orderId = this.currentRow.billNo;
this.resultDetailLoading = true; this.resultDetailLoading = true;
getResultDetailList(this.resultQuery).then((res) => { getCodeList(this.resultQuery).then((res) => {
this.resultDetailLoading = false; this.resultDetailLoading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.resultDetailList = res.data.list || []; this.resultDetailList = res.data.list || [];
this.resultTotal = 0; this.resultTotal = res.data.total || 0;
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
this.resultDetailList = []; this.resultDetailList = [];

68
src/views/inout/IoCheckSuccessOrder.vue
Unescape Escape View File

@ -330,8 +330,8 @@
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini"> <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="产品名称:"> <el-form-item class="query-form-item" label="产品名称:">
<el-input <el-input
v-model="resultQuery.productName" v-model="resultQuery.code"
placeholder="请输入产品名称" placeholder="请输入UDI码"
clearable clearable
> >
</el-input> </el-input>
@ -358,54 +358,42 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="产品通用名" label="UDI码"
prop="coName" prop="code"
></el-table-column> show-overflow-tooltip
<el-table-column
label="规格型号"
prop="spec"
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产日期" label="生产日期"
prop="productDate" prop="produceDate"
width="120"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="失效日期" label="失效日期"
prop="expireDate" prop="expireDate"
width="120"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="单据数量" label="批次号"
prop="count" prop="batchNo"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
></el-table-column>
<el-table-column
label="价格"
prop="price"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="销售清单号" label="序列号"
prop="secSalesListNo" prop="serialNo"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票第一票" label="供应商"
prop="firstSalesInvNo" prop="supName"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票第二票" label="扫码数量"
prop="secSalesInvNo" prop="reCount"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票有效期" label="实际数量"
prop="invoiceDate" prop="reCount"
></el-table-column> ></el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="resultTotal>0" v-show="resultTotal>0"
:total="resultTotal" :total="resultTotal"
@ -445,7 +433,7 @@ import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getResultDetailList} from "@/api/inout/orderDetailResult"; import {getCodeList} from "@/api/inout/code";
import AcceptOrder from "@/views/inout/IoReviewOrder"; import AcceptOrder from "@/views/inout/IoReviewOrder";
const formJson = { const formJson = {
@ -565,7 +553,8 @@ export default {
codeDetailLoading: false, codeDetailLoading: false,
codeDetailList: [], codeDetailList: [],
resultQuery: { resultQuery: {
orderIdFk: null, orderId: null,
code: null,
page: 1, page: 1,
limit: 10 limit: 10
}, },
@ -634,6 +623,10 @@ export default {
}, },
// 获取单据 业务详情、扫码详情、扫码明细 // 获取单据 业务详情、扫码详情、扫码明细
getOrderDetails() { getOrderDetails() {
this.bizQuery.page = 1;
this.codeQuery.page = 1;
this.resultQuery.page = 1;
this.getBizDetailList(); this.getBizDetailList();
this.getCodeDetailList(); this.getCodeDetailList();
this.getResultDetailList(); this.getResultDetailList();
@ -790,7 +783,8 @@ export default {
}, },
onResultReset() { onResultReset() {
this.resultQuery = { this.resultQuery = {
orderIdFk: null, orderId: null,
code: null,
page: 1, page: 1,
limit: 10 limit: 10
}; };
@ -806,13 +800,13 @@ export default {
return; return;
} }
this.resultQuery.orderIdFk = this.currentRow.billNo; this.resultQuery.orderId = this.currentRow.billNo;
this.resultDetailLoading = true; this.resultDetailLoading = true;
getResultDetailList(this.resultQuery).then((res) => { getCodeList(this.resultQuery).then((res) => {
this.resultDetailLoading = false; this.resultDetailLoading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.resultDetailList = res.data.list || []; this.resultDetailList = res.data.list || [];
this.resultTotal = 0; this.resultTotal = res.data.total || 0;
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
this.resultDetailList = []; this.resultDetailList = [];

2
src/views/inout/IoCreateErrorOrder.vue
Unescape Escape View File

@ -300,7 +300,7 @@ export default {
billNo: null, billNo: null,
mainAction: null, mainAction: null,
action: null, action: null,
statusType: "scan_code", statusType: "processedError",
page: 1, page: 1,
limit: 10, limit: 10,
startTime: null, startTime: null,

2
src/views/inout/IoReviewOrder.vue
Unescape Escape View File

@ -103,7 +103,7 @@
:cell-style="{padding:6+'px'}" :cell-style="{padding:6+'px'}"
style="width: 100%"> style="width: 100%">
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品通用名" width="160" prop="productName"></el-table-column> <el-table-column label="产品通用名" width="160" prop="coName"></el-table-column>
<el-table-column label="包装规格" width="160" prop="spec"></el-table-column> <el-table-column label="包装规格" width="160" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column> <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column> <el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>

Write Preview
Loading…
Cancel
Save