From 07592716280f106208036ec4593576d5fac790aa Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 24 Oct 2023 16:38:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=9B=B8=E5=85=B3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD--=E7=9B=98=E7=82=B9=E6=96=B9=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9B=98=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- src/api/inventory/invCountCodes.js | 40 +- src/api/inventory/invCountOrder.js | 124 +++-- src/views/inout/DialogSelectInvProduct.vue | 8 +- src/views/inventory/count/InvCountCodes.vue | 93 ++-- .../inventory/count/InvCountOrderAudit.vue | 151 +++--- .../count/InvCountOrderCompleted.vue | 128 +++-- .../inventory/count/InvCountOrderModify.vue | 467 ++++++++++++------ .../inventory/count/InvCountOrderNew.vue | 254 ++++++---- src/views/inventory/count/invCountSetting.vue | 424 ++++++++++++++++ 10 files changed, 1233 insertions(+), 460 deletions(-) create mode 100644 src/views/inventory/count/invCountSetting.vue diff --git a/.env.production b/.env.production index 118755df..de1ab952 100644 --- a/.env.production +++ b/.env.production @@ -9,7 +9,7 @@ ENV = 'production' #林纪裕cd # VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/' -# VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' @@ -30,7 +30,7 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.0.242: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/' # 吴总测试服务器. diff --git a/src/api/inventory/invCountCodes.js b/src/api/inventory/invCountCodes.js index c9138084..6619de87 100644 --- a/src/api/inventory/invCountCodes.js +++ b/src/api/inventory/invCountCodes.js @@ -1,33 +1,33 @@ import axios from '@/utils/request' export function getCountCodesList(params) { - return axios({ - url: "/invCount/codes/filter", - method: "get", - params: params - }); + return axios({ + url: "/invCount/codes/filter", + method: "get", + params: params + }); } export function deleteCode(data) { - return axios({ - url: "/invCount/codes/deleteCode", - method: "post", - data: data - }); + return axios({ + url: "/invCount/codes/deleteCode", + method: "post", + data: data + }); } export function addCode(data) { - return axios({ - url: "/invCount/codes/addCode", - method: "post", - data: data - }); + return axios({ + url: "/invCount/codes/addCode", + method: "post", + data: data + }); } export function getCodesNum(params) { - return axios({ - url: "/invCount/codes/getCountOrderCodesNum", - method: "get", - params: params - }); + return axios({ + url: "/invCount/codes/getCountOrderCodesNum", + method: "get", + params: params + }); } diff --git a/src/api/inventory/invCountOrder.js b/src/api/inventory/invCountOrder.js index 2d410bf0..97dbec2f 100644 --- a/src/api/inventory/invCountOrder.js +++ b/src/api/inventory/invCountOrder.js @@ -1,83 +1,103 @@ import axios from '@/utils/request' export function getCountOrderList(params) { - return axios({ - url: "/invCount/order/filter", - method: "get", - params: params - }); + return axios({ + url: "/invCount/order/filter", + method: "get", + params: params + }); } export function deleteCountOrder(data) { - return axios({ - url: "/invCount/order/delete", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/delete", + method: "post", + data: data + }); } export function getCountOrderDetailList(params) { - return axios({ - url: "/invCount/order/detail/filter", - method: "get", - params: params - }); + return axios({ + url: "/invCount/order/detail/filter", + method: "get", + params: params + }); } export function saveCountOrder(data) { - return axios({ - url: "/invCount/order/saveCountOrder", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/saveCountOrder", + method: "post", + data: data + }); } export function submitAudit(params) { - return axios({ - url: "/invCount/order/submitAudit", - method: "get", - params: params - }); + return axios({ + url: "/invCount/order/submitAudit", + method: "post", + data: params + }); } export function deleteCountOrderDetail(data) { - return axios({ - url: "/invCount/order/detail/deleteOrderDetail", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/detail/deleteOrderDetail", + method: "post", + data: data + }); } export function addCountOrderDetail(data) { - return axios({ - url: "/invCount/order/detail/addCountOrderDetail", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/detail/addCountOrderDetail", + method: "post", + data: data + }); } export function updateCountOrderStatus(data) { - return axios({ - url: "/invCount/order/updateCountOrderStatus", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/updateCountOrderStatus", + method: "post", + data: data + }); } +export function updateCountOrderDetail(data) { + return axios({ + url: "/invCount/order/detail/updateCountOrderDetail", + method: "post", + data: data + }); +} + + + + export function verifyTemplateFile(data) { - return axios({ - url: "/invCount/order/verifyTemplateFile", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/verifyTemplateFile", + method: "post", + data: data + }); } export function printOrder(data) { - return axios({ - url: "/invCount/order/printOrder", - method: "post", - data: data, - headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, - responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf - }); + return axios({ + url: "/invCount/order/printOrder", + method: "post", + data: data, + headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, + responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf + }); +} + +export function batchAddDetail(data) { + return axios({ + url: "/inv/count/order/detail/batchAddDetail", + method: "post", + data: data + }); } + diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue index 7cf3c644..edb361a7 100644 --- a/src/views/inout/DialogSelectInvProduct.vue +++ b/src/views/inout/DialogSelectInvProduct.vue @@ -41,9 +41,8 @@ - - - + + @@ -51,6 +50,9 @@ + + + diff --git a/src/views/inventory/count/InvCountCodes.vue b/src/views/inventory/count/InvCountCodes.vue index 1eb2fe23..c1bfb5ee 100644 --- a/src/views/inventory/count/InvCountCodes.vue +++ b/src/views/inventory/count/InvCountCodes.vue @@ -1,43 +1,51 @@ @@ -51,6 +59,10 @@ export default { type: Object, required: true, }, + orderIdFk: { + type: Object, + required: true, + }, getCountOrderDetail: { type: Function, required: true @@ -77,7 +89,6 @@ export default { this.query = { code: null, productId: null, - orderIdFk: null, batchNo: null, page: 1, limit: 20 @@ -89,9 +100,9 @@ export default { this.getCodeList(); }, getCodeList() { - this.loading = true; + this.loading = true; this.query.relId = this.codeQuery.relId; - this.query.orderIdFk = this.codeQuery.orderIdFk; + this.query.orderIdFk = this.orderIdFk; this.query.batchNo = this.codeQuery.batchNo; getCountCodesList(this.query).then((res) => { this.loading = false; @@ -116,7 +127,7 @@ export default { }).then(() => { let params = { orderIdFk: row.orderIdFk, - relId: row.relId, + productId: row.productId, code: row.code }; deleteCode(params).then((res) => { diff --git a/src/views/inventory/count/InvCountOrderAudit.vue b/src/views/inventory/count/InvCountOrderAudit.vue index 9a6ddc94..3cda419f 100644 --- a/src/views/inventory/count/InvCountOrderAudit.vue +++ b/src/views/inventory/count/InvCountOrderAudit.vue @@ -1,64 +1,79 @@