-
提交订单
@@ -22,7 +22,7 @@
-
@@ -30,10 +30,11 @@
@@ -44,7 +45,7 @@
-
@@ -61,10 +62,9 @@
-
-
-
-
-
@@ -180,13 +180,13 @@
-
+
-
+
-
+
@@ -301,22 +301,27 @@ export default {
data() {
return {
- formData: {
+ //单据相关
+ orderFormData: {
billNo: null,
corpOrderId: null,
action: null,
- createTime: new Date(),
invCode: null,
fromCorp: null,
fromInvCode: null,
remark: null,
- code: "",
fromType: 2,
+ },
+
+ //扫码相关
+ codeFormData: {
+ code: "",
batchNo: null,
produceDate: null,
expireDate: null,
serialNo: null,
},
+
curInvOptions: [],
busTypeOptions: [],
fromInvOptions: [],
@@ -348,12 +353,8 @@ export default {
formVisible: false,
deleteLoading: false,
orderNo: null,
-
fromStorageOptions: [],
-
-
curRow: null,
-
dialogTableVisible: false,
sitcomScan: false,
selectRlTitle: "绑定产品",
@@ -382,7 +383,7 @@ export default {
.then((response) => {
this.curInvOptions = response.data || [];
if (this.curInvOptions != null && this.curInvOptions.length == 1) {
- this.formData.invWarehouseCode = this.curInvOptions[0].code;
+ this.orderFormData.invWarehouseCode = this.curInvOptions[0].code;
this.getBusTypeByInv()
}
})
@@ -392,14 +393,14 @@ export default {
//仓库改变
changeInv() {
- this.formData.action = null;
+ this.orderFormData.action = null;
this.getBusTypeByInv();
},
//根据仓库,用户获取单据类型
getBusTypeByInv() {
let query = {
- code: this.formData.invCode,
+ code: this.orderFormData.invCode,
};
findByInvUser(query)
.then((response) => {
@@ -442,11 +443,11 @@ export default {
this.curAction = this.getActionItem(item);
if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) {
//1.切换往来单位
- this.formData.fromCorp = null;
+ this.orderFormData.fromCorp = null;
this.findMethod();
} else if (this.curAction.corpType == 3) {
//2. 切换往来仓库
- this.formData.fromInvCode = null;
+ this.orderFormData.fromInvCode = null;
this.findFromInvList();
}
},
@@ -454,13 +455,13 @@ export default {
//获取往来仓库列表
findFromInvList(val) {
let cQuery = {
- locInvCode: this.formData.invCode,
+ locInvCode: this.orderFormData.invCode,
};
findByFrom(cQuery)
.then((response) => {
this.fromInvOptions = response.data || [];
if (val == 1) {
- this.formData.fromInvCode = this.fromInvOptions[0].code;
+ this.orderFormData.fromInvCode = this.fromInvOptions[0].code;
}
})
.catch(() => {
@@ -480,30 +481,28 @@ export default {
addCode(event) {
this.originCode = "";
this.sictomText = "";
- this.formData.corpOrderId = this.formData.corpOrderId.trim();
- this.formData.batchNo = "";
- this.formData.produceDate = "";
- this.formData.expireDate = "";
- this.formData.serialNo = "";
+ this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
+ this.codeFormData.batchNo = "";
+ this.codeFormData.produceDate = "";
+ this.codeFormData.expireDate = "";
+ this.codeFormData.serialNo = "";
this.actionEnable = true;
if (event == null) {
} else event.target.select();
this.$refs.inputRef.select();
- if (this.$isBlank(this.formData.action)) {
+ if (this.$isBlank(this.orderFormData.action)) {
this.$message.warning("请选择单据类型！");
return;
}
- if (this.$isBlank(this.formData.corpOrderId)) {
+ if (this.$isBlank(this.orderFormData.corpOrderId)) {
let date = new Date();
- this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+ this.orderFormData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
}
- this.formData.code = this.formData.code.trim();
- if (this.$isBlank(this.formData.code)) return;
+ this.codeFormData.code = this.codeFormData.code.trim();
+ if (this.$isBlank(this.codeFormData.code)) return;
this.loading = true;
- let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
- tQuery.orderId = this.idQuery.id;
- tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
- tQuery.action = this.formData.action;
+ let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
+ tQuery.code = this.codeFormData.code;
this.addCodeSubmit(tQuery);
this.$refs.inputRef.select();
},
@@ -565,10 +564,10 @@ export default {
} else if (response.code == 507) {
this.editOriginCodeVisible = true;
this.editTitle = response.message;
- this.formData.produceDate = response.data.produceDate;
- this.formData.expireDate = response.data.expireDate;
- this.formData.batchNo = response.data.batchNo;
- this.formData.serialNo = response.data.serialNo;
+ this.codeFormData.produceDate = response.data.produceDate;
+ this.codeFormData.expireDate = response.data.expireDate;
+ this.codeFormData.batchNo = response.data.batchNo;
+ this.codeFormData.serialNo = response.data.serialNo;
this.$message({
type: 'error',
message: "提交失败！" + this.editTitle,
@@ -592,32 +591,15 @@ export default {
refreshCodesPanel() {
this.isCodeAlive = false;
- this.idQuery =
this.$nextTick(() => { //重新加载组件
this.isCodeAlive = true
})
},
- submit(formName) {
- if (this.total < 1) {
- this.$message.error('未添加条码');
- return;
- }
- let tQuery = {
- orderId: this.idQuery.id,
- locStorageCode: this.formData.locStorageCode,
- invStorageCode: this.formData.invStorageCode,
- invWarehouseCode: this.formData.invWarehouseCode,
- fromInvCode: this.formData.fromInvCode,
- subInvCode: this.formData.subInvCode,
- action: this.formData.action,
- fromCorp: this.formData.fromCorp,
- fromCorpId: this.formData.fromCorpId,
- outChangeEnable: this.formData.outChangeEnable,
- preCheck: this.formData.preCheck,
- deptCode: this.formData.deptCode,
- }
+ submit() {
+ let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
+ tQuery.orderId = this.idQuery.billNo;
submitOrderWeb(tQuery)
.then((response) => {
if (response.code === 20000) {
@@ -630,23 +612,8 @@ export default {
});
},
saveOrder() {
- if (this.total < 1) {
- this.$message.error('未添加条码');
- return;
- }
- if (this.formData.action == null || this.formData.action == '') {
- this.$message.error('未选择扫码单据类型');
- return
- }
-
-
- if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
- this.$message.error('当前分库不能为空');
- return;
- }
- let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
+ let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
tQuery.orderId = this.idQuery.billNo;
- tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
saveOrderWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.closeDialog();
@@ -676,42 +643,40 @@ export default {
this.checkSuccess = true;
let tQuery = {
originCode: this.originCode,
- code: this.formData.code.trim(),
+ code: this.codeFormData.code.trim(),
}
enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
- this.formData.code = response.data;
+ this.codeFormData.code = response.data;
this.addCode();
} else {
if (response.code == 502) {
this.checkSuccess = false;
- this.formData.code = response.data;
- this.originCode = this.formData.code;
+ this.codeFormData.code = response.data;
+ this.originCode = this.codeFormData.code;
} else if (response.code == 501) {
this.checkSuccess = false;
- // this.formData.code = response.data;
- // this.originCode = this.formData.code;
this.$message.error(response.message);
} else if (response.code == 503) {
this.checkSuccess = false;
- this.formData.code = response.data;
+ this.codeFormData.code = response.data;
this.$confirm(response.message, "提示", {
type: "warning",
})
.then(() => {
- this.formData.code = response.data;
+ this.codeFormData.code = response.data;
this.addCode();
})
.catch(() => {
- this.formData.code = this.originCode;
+ this.codeFormData.code = this.originCode;
});
} else if (response.code == 508) {
this.originCode = "";
- this.formData.code = "01" + response.data.nameCode;
- this.originCode = this.formData.code;
+ this.codeFormData.code = "01" + response.data.nameCode;
+ this.originCode = this.codeFormData.code;
} else {
this.$alert(response.message, '提示', {
confirmButtonText: '确定',
@@ -732,8 +697,8 @@ export default {
repeatAddCode(editData) {
let tQuery = editData;
tQuery.orderId = this.idQuery.id;
- tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
- tQuery.action = this.formData.action;
+ tQuery.actDate = parseTime(this.orderFormData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
+ tQuery.action = this.orderFormData.action;
this.closeCodeDialog();
this.addCodeSubmit(tQuery);
@@ -822,7 +787,7 @@ export default {
window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
sc.onInput = function (text) {
if (text.includes("delete")) {
- that.formData.code = "";
+ that.codeFormData.code = "";
that.sictomText = "";
that.originCode = "";
return;
@@ -831,44 +796,34 @@ export default {
let tempTxt = text;
let str = tempTxt.replace(/[\r]/g, "");
that.sictomText = that.sictomText + str;
- that.formData.code = that.sictomText;
+ that.codeFormData.code = that.sictomText;
} else {
- that.formData.code = text;
- // setTimeout(function(){ that.formData.code = text; }, 3000);
-
-
+ that.codeFormData.code = text;
}
};
inputer.focus();
},
created() {
- this.formData.code = '';
+ this.codeFormData.code = '';
this.codeArray = [];
if (this.$isNotBlank(this.idQuery.billNo)) {
- this.formData.actDate = new Date(this.idQuery.actDate);
- this.formData.corpOrderId = this.idQuery.corpOrderId;
this.corpOrderIdDisabled = true;
- this.formData.action = this.idQuery.action;
- this.formData.fromCorp = this.idQuery.fromCorp;
- this.formData.deptCode = this.idQuery.deptCode
- this.formData.invCode = this.idQuery.invCode;
- this.formData.fromInvCode = this.idQuery.fromInvCode;
- this.formData.preCheck = this.idQuery.preCheck;
- this.formData.remark = this.idQuery.remark;
+ this.orderFormData = this.idQuery;
this.actionEnable = true;
this.refreshCodesPanel();
//选择框候选数据
this.findInvByUser();
this.getBusTypeByInv();
- this.findMethod(this.formData.fromCorp);
+ this.findMethod(this.orderFormData.fromCorp);
this.findFromInvList();
} else {
this.corpOrderIdDisabled = false;
- this.formData.actDate = new Date();
let date = new Date();
- this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
- this.formData.invCode = this.$store.getters.locInvCode;
+ this.orderFormData.createTime = parseTime(date, '{y}-{m}-{d} {h}:{i}:{s}');
+ this.orderFormData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+ this.orderFormData.deptCode = this.$store.getters.deptCode;
+ this.orderFormData.invCode = this.$store.getters.locInvCode;
this.findInvByUser();
}
diff --git a/src/views/inout/IoCreateOrderBizDetail.vue b/src/views/inout/IoCreateOrderBizDetail.vue
index 143669d6..297c6f69 100644
--- a/src/views/inout/IoCreateOrderBizDetail.vue
+++ b/src/views/inout/IoCreateOrderBizDetail.vue
@@ -1,20 +1,33 @@
-
- 产品录入
-
-
+
+
+
+ 产品录入
+
+ 第三方单据选入
+
+
+
+
+
+
@@ -239,7 +252,7 @@ export default {
rowStyle({row, rowIndex}) {
let rowBackground = {};
- if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
+ if (!row.checkSuccess) {
rowBackground.color = '#f60303';
}
return rowBackground;
@@ -327,7 +340,8 @@ export default {
}
,
created() {
- this.getOrderDetails();
+ if (this.idQuery.billNo != null)
+ this.getOrderDetails();
}
,
}
diff --git a/src/views/inout/IoCreateOrderCodeDetail.vue b/src/views/inout/IoCreateOrderCodeDetail.vue
index 819b6314..eb94fd3d 100644
--- a/src/views/inout/IoCreateOrderCodeDetail.vue
+++ b/src/views/inout/IoCreateOrderCodeDetail.vue
@@ -91,7 +91,8 @@ export default {
},
},
created() {
- this.getOrderDetails();
+ if (this.idQuery.billNo != null)
+ this.getOrderDetails();
},
}
diff --git a/src/views/inout/IoCreateOrderCodes.vue b/src/views/inout/IoCreateOrderCodes.vue
index 5b68e513..33d45a75 100644
--- a/src/views/inout/IoCreateOrderCodes.vue
+++ b/src/views/inout/IoCreateOrderCodes.vue
@@ -200,7 +200,8 @@ export default {
},
},
created() {
- this.getCodeList();
+ if (this.idQuery.billNo != null)
+ this.getCodeList();
},
}
diff --git a/src/views/inout/IoNewOrder.vue b/src/views/inout/IoNewOrder.vue
index 4e46707b..b19c2b64 100644
--- a/src/views/inout/IoNewOrder.vue
+++ b/src/views/inout/IoNewOrder.vue
@@ -306,8 +306,7 @@ export default {
fromCorpId: "",
fromCorp: "",
},
- idQuery: {
- },
+ idQuery: {},
storageList: [],
subInvList: [],
errOrderVisible: false,
diff --git a/src/views/inout/stockOrderNewSelectProduct.vue b/src/views/inout/stockOrderNewSelectProduct.vue
index 2b409c27..45ffe0d3 100644
--- a/src/views/inout/stockOrderNewSelectProduct.vue
+++ b/src/views/inout/stockOrderNewSelectProduct.vue
@@ -1,126 +1,140 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
- 查询
- 确定
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
-
-
-
-
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+ 查询
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
-
@@ -134,7 +148,6 @@
取 消
@@ -163,6 +176,7 @@ export default {
data() {
return {
loading: false,
+ showSearch: true,
listQuery: {
udiCode: null,
cpmctymc: null,
@@ -201,6 +215,10 @@ export default {
this.getList();
},
+ hideSearch() {
+ this.showSearch = !this.showSearch;
+ },
+
search() {
this.listQuery.page = 1;
this.getList();
@@ -257,7 +275,7 @@ export default {
if (this.currentCert == null) {
this.$message.error("请先选择对应的注册证！");
} else {
- this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+ this.currentRow.zczbhhzbapzbh = this.currentCert;
this.combine();
}
},
From 92312d046050bc01a90c65c2bd96d5fc8fb8bdc4 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 7 Feb 2023 15:43:21 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/thirdSys/inv/index.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue
index 7091be56..8c4308ad 100644
--- a/src/views/thirdSys/inv/index.vue
+++ b/src/views/thirdSys/inv/index.vue
@@ -316,6 +316,7 @@ export default {
thirdSysFk: null,
},
mainThirdSys:'',
+ ThirdSysName:"",
mergeList: [],
subList: [],
subData: {},
@@ -482,6 +483,7 @@ export default {
if (data && data.id) {
this.index = this.mergeList.findIndex((d) => d.id === data.id);
}
+ this.ThirdSysName=this.formData.thirdSysFk
},
handleSubForm(data, formName) {
@@ -609,8 +611,8 @@ export default {
})
.catch(() => {
this.formLoading = false;
- // 刷新表单
- this.resetForm();
+
+ this.formData.thirdSysFk=this.ThirdSysName;
});
}
});
From 1bf1728a4d7aed54ca681588c54c531bb5f92e03 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 7 Feb 2023 17:17:47 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/dept/invRelUsers.vue | 4 ++++
src/views/system/dept/invWarehouse.vue | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/src/views/system/dept/invRelUsers.vue b/src/views/system/dept/invRelUsers.vue
index 27c2da69..3cc0b7b1 100644
--- a/src/views/system/dept/invRelUsers.vue
+++ b/src/views/system/dept/invRelUsers.vue
@@ -263,6 +263,10 @@ export default {
},
addUserData() { //提交选入用户
+ if(this.selectAddUser.length==0){
+ this.$message.error("请选择要选入的用户！");
+ return;
+ }
let query = {
code: this.currentCode,
userList: JSON.stringify(this.selectAddUser)
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 7ec7a658..804765ef 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -581,9 +581,13 @@ export default {
this.thrSubWareHouseVisible = false;
//刷新表单
this.thirdSubQuery.name="";
+ this.subData.id=null;
+ this.checkSubThrWarehouseRow.code=null;
+ this.checkSubThrWarehouseRow.thirdSysFk=null;
},
//绑定第三方分库
bindSubThrWarehouse() {
+
let params = {
id: this.subData.id,
thridWarehouseId: this.checkSubThrWarehouseRow.code,
From 0899f62fa86aa06a2a89d6d9d265560571a859e4 Mon Sep 17 00:00:00 2001
From: x_z
Date: Tue, 7 Feb 2023 17:47:12 +0800
Subject: [PATCH 10/13] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9C=AA=E6=A0=A1?=
=?UTF-8?q?=E9=AA=8C=E9=A1=B5=E9=9D=A2=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/inout/order.js | 482 +++++++++--------
src/api/inout/orderDetailBiz.js | 11 +
src/api/inout/orderDetailCode.js | 7 +
src/api/inout/orderDetailResult.js | 9 +
src/views/inout/IoUnCheckedOrder.vue | 777 ++++++++++++++++-----------
5 files changed, 733 insertions(+), 553 deletions(-)
create mode 100644 src/api/inout/orderDetailBiz.js
create mode 100644 src/api/inout/orderDetailResult.js
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 415dbfa6..bfd89d07 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -11,377 +11,385 @@ export function getDraft(query) {
export function orderList(query) {
- return axios({
- url: "/admin/warehouse/inout/order/list",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/admin/warehouse/inout/order/list",
+ method: "get",
+ params: query
+ });
}
export function orderGetUdi(query) {
- return axios({
- url: "/udiwms/inout/order/getUdi",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/udiwms/inout/order/getUdi",
+ method: "get",
+ params: query
+ });
}
export function deleteCodesTempById(query) {
- return axios({
- url: "/warehouse/inout/deleteCodesTempById",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/warehouse/inout/deleteCodesTempById",
+ method: "get",
+ params: query
+ });
}
export function submitOrderWeb(query) {
- return axios({
- url: "/warehouse/inout/submitOrderWeb",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/warehouse/inout/submitOrderWeb",
+ method: "get",
+ params: query
+ });
}
export function saveOrderWeb(query) {
- return axios({
- url: "/warehouse/inout/saveOrderWeb",
- method: "post",
- data: query
- });
+ return axios({
+ url: "/warehouse/inout/saveOrderWeb",
+ method: "post",
+ data: query
+ });
}
export function orderListError(query) {
- return axios({
- url: "/udiwms/inout/order/error",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/udiwms/inout/order/error",
+ method: "get",
+ params: query
+ });
}
export function orderListRepeat(query) {
- return axios({
- url: "/admin/warehouse/inout/order/listRepeat",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/admin/warehouse/inout/order/listRepeat",
+ method: "get",
+ params: query
+ });
}
export function codeList(query) {
- return axios({
- url: "/admin/warehouse/inout/findByOrderId",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/admin/warehouse/inout/findByOrderId",
+ method: "get",
+ params: query
+ });
}
export function addOrderWeb(query) {
- return axios({
- url: "/warehouse/inout/addOrderWeb",
- method: "post",
- data: query
- });
+ return axios({
+ url: "/warehouse/inout/addOrderWeb",
+ method: "post",
+ data: query
+ });
}
export function enterCodeWeb(query) {
- return axios({
- url: "/warehouse/inout/enterCode",
- method: "post",
- data: query
- });
+ return axios({
+ url: "/warehouse/inout/enterCode",
+ method: "post",
+ data: query
+ });
}
export function postOrdersWeb(query) {
- return axios({
- url: "/warehouse/inout/postOrdersWeb",
- method: "post",
- data: query
- });
+ return axios({
+ url: "/warehouse/inout/postOrdersWeb",
+ method: "post",
+ data: query
+ });
}
export function mergeOrder(query) {
- return axios({
- url: "/warehouse/inout/order/mergeOrder",
- method: "post",
- data: query
- });
+ return axios({
+ url: "/warehouse/inout/order/mergeOrder",
+ method: "post",
+ data: query
+ });
}
export function updateUnit(query) {
- return axios({
- url: "/udiwms/inout/order/updateUnit",
- method: "post",
- data: query
- });
+ return axios({
+ url: "/udiwms/inout/order/updateUnit",
+ method: "post",
+ data: query
+ });
}
export function filterOrder(query) {
- return axios({
- url: "/udiwms/inout/order/filter",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/udiwms/inout/order/filter",
+ method: "get",
+ params: query
+ });
}
export function selectNew(query) {
- return axios({
- url: "/admin/warehouse/inout/order/selectNew",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/admin/warehouse/inout/order/selectNew",
+ method: "get",
+ params: query
+ });
}
export function selectWait(query) {
- return axios({
- url: "/sale/inout/order/selectWait",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/sale/inout/order/selectWait",
+ method: "get",
+ params: query
+ });
}
export function selectStatus(query) {
- return axios({
- url: "/sale/inout/order/selectStatus",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/sale/inout/order/selectStatus",
+ method: "get",
+ params: query
+ });
}
export function selectDownload(query) {
- return axios({
- url: "/sale/inout/order/selectDownload",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/sale/inout/order/selectDownload",
+ method: "get",
+ params: query
+ });
}
export function selectFinish(query) {
- return axios({
- url: "/sale/inout/order/selectFinish",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/sale/inout/order/selectFinish",
+ method: "get",
+ params: query
+ });
}
export function selectSubOrders(query) {
- return axios({
- url: "/sale/inout/order/selectSubOrders",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/sale/inout/order/selectSubOrders",
+ method: "get",
+ params: query
+ });
}
export function errorCodeList(query) {
- return axios({
- url: "/admin/warehouse/inout/findErrorByOrderId",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/admin/warehouse/inout/findErrorByOrderId",
+ method: "get",
+ params: query
+ });
}
export function deleteByOrderId(query) {
- return axios({
- url: "/udiwms/inout/order/delete",
- method: "post",
- data: query
- });
+ return axios({
+ url: "/udiwms/inout/order/delete",
+ method: "post",
+ data: query
+ });
}
export function deleteCodes(query) {
- return axios({
- url: "/warehouse/inout/code/deleteCodes",
- method: "post",
- data: query
- });
+ return axios({
+ url: "/warehouse/inout/code/deleteCodes",
+ method: "post",
+ data: query
+ });
}
export function commitOrder(query) {
- return axios({
- url: "/warehouse/inout/commit",
- method: "post",
- data: query
- });
+ return axios({
+ url: "/warehouse/inout/commit",
+ method: "post",
+ data: query
+ });
}
export function addCommitOrder(query) {
- return axios({
- url: "/warehouse/inout/addCommit",
- method: "post",
- data: query
- });
+ return axios({
+ url: "/warehouse/inout/addCommit",
+ method: "post",
+ data: query
+ });
}
export function updateExportStatus(query) {
- return axios(
- {
- url: "/warehouse/inout/order/updateExportStatus",
- method: "post",
- data: query
- }
- )
+ return axios(
+ {
+ url: "/warehouse/inout/order/updateExportStatus",
+ method: "post",
+ data: query
+ }
+ )
}
export function orderDetail(query) {
- return axios(
- {
- url: "/warehouse/inout/order/detail",
- method: "get",
- params: query
- }
- )
+ return axios(
+ {
+ url: "/warehouse/inout/order/detail",
+ method: "get",
+ params: query
+ }
+ )
}
export function updateBind(query) {
- return axios(
- {
- url: "/udiwms/erpOrder/updateBind",
- method: "post",
- data: query
- }
- )
+ return axios(
+ {
+ url: "/udiwms/erpOrder/updateBind",
+ method: "post",
+ data: query
+ }
+ )
}
export function updateBindSup(query) {
- return axios(
- {
- url: "/udiwms/erpOrder/updateBindSup",
- method: "post",
- data: query
- }
- )
+ return axios(
+ {
+ url: "/udiwms/erpOrder/updateBindSup",
+ method: "post",
+ data: query
+ }
+ )
}
export function updateCodeBindSup(query) {
- return axios(
- {
- url: "/udiwms/addCode/updateBindSup",
- method: "post",
- data: query
- }
- )
+ return axios(
+ {
+ url: "/udiwms/addCode/updateBindSup",
+ method: "post",
+ data: query
+ }
+ )
}
export function backStock(query) {
- return axios(
- {
- url: "/sale/inout/order/backStock",
- method: "get",
- params: query
- }
- )
+ return axios(
+ {
+ url: "/sale/inout/order/backStock",
+ method: "get",
+ params: query
+ }
+ )
}
export function uploadOrder(query) {
- return axios(
- {
- url: "/warehouse/inout/order/uploadOrder",
- method: "post",
- data: query
- }
- )
+ return axios(
+ {
+ url: "/warehouse/inout/order/uploadOrder",
+ method: "post",
+ data: query
+ }
+ )
}
export function moveStock(query) {
- return axios(
- {
- url: "/sale/inout/order/moveStock",
- method: "post",
- data: query
- }
- )
+ return axios(
+ {
+ url: "/sale/inout/order/moveStock",
+ method: "post",
+ data: query
+ }
+ )
}
export function findAllByOrderId(query) {
- return axios({
- url: "/admin/warehouse/inout/findAllByOrderId",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/admin/warehouse/inout/findAllByOrderId",
+ method: "get",
+ params: query
+ });
}
export function revokeOredr(query) {
- return axios({
- url: "/spms/inout/order/revoke",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/spms/inout/order/revoke",
+ method: "get",
+ params: query
+ });
}
export function exportJson(query) {
- return axios({
- url: "/warehouse/inout/order/exportXml",
- method: "post",
- data: query,
- headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
- responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf
- });
+ return axios({
+ url: "/warehouse/inout/order/exportXml",
+ method: "post",
+ data: query,
+ headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+ responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf
+ });
}
export function expireTimeCheck(query) {
- return axios(
- {
- url: "/warehouse/inout/expireTimeCheck",
- method: "post",
- data: query
- }
- )
+ return axios(
+ {
+ url: "/warehouse/inout/expireTimeCheck",
+ method: "post",
+ data: query
+ }
+ )
}
export function filterOrderForDelete(params) {
- return axios({
- url: "/udiwms/inout/order/filterOrderForDelete",
- method: "get",
- params: params
- });
+ return axios({
+ url: "/udiwms/inout/order/filterOrderForDelete",
+ method: "get",
+ params: params
+ });
}
export function updateOrderInfo(data) {
- return axios({
- url: "/udiwms/inout/order/updateOrderInfo",
- method: "post",
- data: data
- })
+ return axios({
+ url: "/udiwms/inout/order/updateOrderInfo",
+ method: "post",
+ data: data
+ })
}
export function getOrderById(params) {
- return axios({
- url: "/udiwms/inout/order/getOrderById",
- method: "get",
- params: params
- })
+ return axios({
+ url: "/udiwms/inout/order/getOrderById",
+ method: "get",
+ params: params
+ })
}
export function updateOrder(data) {
- return axios({
- url: "/udiwms/inout/order/updateOrder",
- method: "post",
- data: data
- })
+ return axios({
+ url: "/udiwms/inout/order/updateOrder",
+ method: "post",
+ data: data
+ })
}
export function uploadSpms(query) {
- return axios(
- {
- url: "/warehouse/inout/order/uploadSpms",
- method: "post",
- data: query
- }
- );
+ return axios(
+ {
+ url: "/warehouse/inout/order/uploadSpms",
+ method: "post",
+ data: query
+ }
+ );
}
export function updateOrderPrintRemark(data) {
- return axios({
- url: "/udiwms/inout/order/updateOrderPrintRemark",
- method: "post",
- data: data
- });
+ return axios({
+ url: "/udiwms/inout/order/updateOrderPrintRemark",
+ method: "post",
+ data: data
+ });
+}
+
+export function getOrderList(params) {
+ return axios({
+ url: "/udiwms/inout/order/filter",
+ method: "get",
+ params: params
+ });
}
diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js
new file mode 100644
index 00000000..c6ef9fe7
--- /dev/null
+++ b/src/api/inout/orderDetailBiz.js
@@ -0,0 +1,11 @@
+import axios from '@/utils/request'
+
+export function getBizDetailList(params) {
+ return axios({
+ url: "/udiwms/inout/bizDetail/filterList",
+ method: "get",
+ params: params
+ });
+}
+
+
diff --git a/src/api/inout/orderDetailCode.js b/src/api/inout/orderDetailCode.js
index 69abeaa9..332e1e82 100644
--- a/src/api/inout/orderDetailCode.js
+++ b/src/api/inout/orderDetailCode.js
@@ -44,5 +44,12 @@ export function delBizProduct(query) {
});
}
+export function getCodeDetailList(params) {
+ return axios({
+ url: "udiwms/inout/codeDetail/filterList",
+ method: "get",
+ params: params
+ });
+}
diff --git a/src/api/inout/orderDetailResult.js b/src/api/inout/orderDetailResult.js
new file mode 100644
index 00000000..1c84516b
--- /dev/null
+++ b/src/api/inout/orderDetailResult.js
@@ -0,0 +1,9 @@
+import axios from '@/utils/request'
+
+export function getResultDetailList(params) {
+ return axios({
+ url: "/udiwms/inout/resultDetail/filterList",
+ method: "get",
+ params: params
+ });
+}
diff --git a/src/views/inout/IoUnCheckedOrder.vue b/src/views/inout/IoUnCheckedOrder.vue
index 17c42aa3..99d1b612 100644
--- a/src/views/inout/IoUnCheckedOrder.vue
+++ b/src/views/inout/IoUnCheckedOrder.vue
@@ -35,7 +35,7 @@
-
@@ -54,9 +54,18 @@
-
+
+
@@ -74,42 +83,34 @@
>查询
- 合并单据
- 新增单据
- 异常单据
-
- {{ errorDetail }}
-
-
-
-
-
-
+
+
+
+
+
+
+ 单据 {{ currentRow.billNo }}-业务详情
+
+
+
+
- 查询
-
+ 重置
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+
+ 单据 {{ currentRow.billNo }}-扫码详情
+
+
+
+
+
+
+
+ 重置
+
+ 查询
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+ 单据 {{ currentRow.billNo }}-扫码明细
+
+
+
+
+
+
+
+ 重置
+
+ 查询
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From d133f515bf01f19af04bb71a9cb12d52e1097129 Mon Sep 17 00:00:00 2001
From: anthonywj