diff --git a/.env.production b/.env.production index b3922466..00918520 100644 --- a/.env.production +++ b/.env.production @@ -8,11 +8,10 @@ ENV = 'production' #林纪裕cd -# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/' -# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' -# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/' -# VUE_APP_SYNC_API ="http://r.jiyuudims.cloud:5008/SP_SYNC_SERVER" +VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5003/UDI_WMS_MC/' + # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' + # 测试服务器 # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/' @@ -22,8 +21,11 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/' # VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER" +刘恩典 +# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/' + # 平潭正式 -VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' # VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER" # 吴总测试服务器 diff --git a/src/api/purchase/purOrder.js b/src/api/purchase/purOrder.js index aea76f21..b31981ea 100644 --- a/src/api/purchase/purOrder.js +++ b/src/api/purchase/purOrder.js @@ -146,4 +146,12 @@ export function getDetailList(params) { }); } +export function filterSupList(data) { + return request({ + url: "/purchase/order/filterSupList", + method: 'post', + data: data + }) +} + diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 784da660..afd91e04 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -22,13 +22,24 @@ >草稿保存 立即提交 待配货提交 + + 完成验收 + + + 完成验收 + + @@ -374,7 +385,7 @@ - + { this.busTypeOptions = response.data || []; this.curAction = this.getActionItem(this.orderFormData.action); - if(isBlank(this.curAction)){ - this.curAction={ + if (isBlank(this.curAction)) { + this.curAction = { corpType: 0, genUnit: false, checkWebNew: null @@ -1372,9 +1383,7 @@ export default { if (this.$isNotBlank(this.orderFormData.checkPreInOrders)) { this.checkPreInArray = this.orderFormData.split(","); } - this.curAction={ - - } + this.curAction = {} this.refreshCodesPanel(); //加载选择框候选数据 this.findInvListByUser(); diff --git a/src/views/inout/DialogSelectThrOrder.vue b/src/views/inout/DialogSelectThrOrder.vue index bbf90623..a00fb995 100644 --- a/src/views/inout/DialogSelectThrOrder.vue +++ b/src/views/inout/DialogSelectThrOrder.vue @@ -22,7 +22,7 @@ - + 生成单据 @@ -22,11 +22,11 @@ @@ -37,10 +37,10 @@ + v-for="item in curInvOptions" + :key="item.name" + :label="item.name" + :value="item.code"> {{ item.name }} @@ -51,10 +51,10 @@ + v-for="item in busTypeOptions" + :key="item.name" + :label="item.name" + :value="item.action"> {{ item.name }} @@ -66,21 +66,21 @@ {{ item.name }} @@ -91,10 +91,10 @@ + v-for="item in fromInvOptions" + :key="item.code" + :label="item.name" + :value="item.code"> {{ item.name }} {{ item.code @@ -130,52 +130,52 @@ style="width: 100%; margin-top: 20px;"> @@ -317,15 +317,15 @@ export default { products: products }; stockOrderChange(tQuery) - .then((response) => { - if (response.code === 20000) { - this.$message.success("提交成功"); - this.closeDialog(); - } else { - this.$message.error(response.message); - } - this.loading = false; - }); + .then((response) => { + if (response.code === 20000) { + this.$message.success("提交成功"); + this.closeDialog(); + } else { + this.$message.error(response.message); + } + this.loading = false; + }); }, @@ -333,15 +333,15 @@ export default { findInvListByUser() { this.curInvOptions = []; findInvByUser() - .then(response => { - this.curInvOptions = response.data || []; - if (this.curInvOptions != null && this.curInvOptions.length > 0 && this.formData.invWarehouseCode == null) { - this.formData.invWarehouseCode = this.curInvOptions[0].code; - this.getBusTypeByInv() - } - }) - .catch(() => { - }); + .then(response => { + this.curInvOptions = response.data || []; + if (this.curInvOptions != null && this.curInvOptions.length > 0 && this.formData.invWarehouseCode == null) { + this.formData.invWarehouseCode = this.curInvOptions[0].code; + this.getBusTypeByInv() + } + }) + .catch(() => { + }); }, @@ -351,11 +351,11 @@ export default { code: this.formData.invCode, }; findByInvUser(query) - .then((response) => { - this.busTypeOptions = response.data || []; - }) - .catch(() => { - }); + .then((response) => { + this.busTypeOptions = response.data || []; + }) + .catch(() => { + }); }, @@ -371,11 +371,11 @@ export default { pcode: invCode }; filterSubByInv(query) - .then((response) => { - this.subInvList = response.data || []; - }) - .catch(() => { - }); + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); }, findStorageMethod(query) { @@ -386,11 +386,11 @@ export default { locInvCode: this.formData.locStorageCode, }; filterAllByLoc(cQuery) - .then((response) => { - this.fromStorageOptions = response.data || []; - }) - .catch(() => { - }); + .then((response) => { + this.fromStorageOptions = response.data || []; + }) + .catch(() => { + }); }, findMethod(query) { this.fromOptions = []; @@ -410,13 +410,13 @@ export default { cQuery.corpType = 2; } else return; getBasicUnitMaintains(cQuery) - .then((response) => { - this.loading = false; - this.fromOptions = response.data.list || []; - }) - .catch(() => { - this.loading = false; - }); + .then((response) => { + this.loading = false; + this.fromOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); }, @@ -451,14 +451,14 @@ export default { locInvCode: this.formData.invCode, }; findByFrom(cQuery) - .then((response) => { - this.fromInvOptions = response.data || []; - if (val == 1) { - this.formData.fromInvCode = this.fromInvOptions[0].code; - } - }) - .catch(() => { - }); + .then((response) => { + this.fromInvOptions = response.data || []; + if (val == 1) { + this.formData.fromInvCode = this.fromInvOptions[0].code; + } + }) + .catch(() => { + }); }, changeFun(row) { @@ -475,14 +475,14 @@ export default { orderIdFk: orderId } getBizDetailList(query) - .then((response) => { - this.detailLoading = false; - this.detailList = response.data.list || []; - }) - .catch(() => { - this.detailLoading = false; - this.detailList = []; - }); + .then((response) => { + this.detailLoading = false; + this.detailList = response.data.list || []; + }) + .catch(() => { + this.detailLoading = false; + this.detailList = []; + }); }, deleteOrderDetail(index) { for (let i = 0; i < this.detailList.length; i++) { diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue index ca8330b2..0c03e0ee 100644 --- a/src/views/inout/IoAuditedOrder.vue +++ b/src/views/inout/IoAuditedOrder.vue @@ -164,13 +164,13 @@ - 撤回 - + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + + + + + {{ item.name }} + + + + + + + + + + + + +
+ + 显示/隐藏搜索栏 + 重置 + + 查询 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + diff --git a/src/views/inout/IoCheckAuditNewOrder.vue b/src/views/inout/IoCheckAuditNewOrder.vue new file mode 100644 index 00000000..603124c7 --- /dev/null +++ b/src/views/inout/IoCheckAuditNewOrder.vue @@ -0,0 +1,531 @@ + + + + + + diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue index b7f382eb..3c702b97 100644 --- a/src/views/inout/IoCheckAuditOrder.vue +++ b/src/views/inout/IoCheckAuditOrder.vue @@ -152,13 +152,13 @@ - 撤回 - + + + + + + + - + diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue index 4a1a83f9..61012b6c 100644 --- a/src/views/purchase/purApply/purApply.vue +++ b/src/views/purchase/purApply/purApply.vue @@ -98,6 +98,7 @@ +