diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue index 9cd8cac..acea0d3 100644 --- a/pages/ProductManage/ZjCasing.vue +++ b/pages/ProductManage/ZjCasing.vue @@ -104,7 +104,7 @@ }; }, created () { - // this._queryProductArea() + this._queryProductArea() }, methods: { /** 选择器 */ @@ -130,7 +130,7 @@ /** 确认 */ async _casingConfirm () { this.disabled = true - if (!this.checkArr.length) { + if (!this.checkArr.length || !this.val2) { this.disabled = false return } diff --git a/pages/ProductManage/ZjDelivery.vue b/pages/ProductManage/ZjDelivery.vue index 315c6ad..39f57dd 100644 --- a/pages/ProductManage/ZjDelivery.vue +++ b/pages/ProductManage/ZjDelivery.vue @@ -1,23 +1,188 @@ diff --git a/pages/ProductManage/ZjOutStore.vue b/pages/ProductManage/ZjOutStore.vue index afd6a24..cbcd8fc 100644 --- a/pages/ProductManage/ZjOutStore.vue +++ b/pages/ProductManage/ZjOutStore.vue @@ -1,23 +1,158 @@ diff --git a/utils/getData2.js b/utils/getData2.js index c90f172..110e856 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -64,4 +64,50 @@ export const casingConfirm = (row, qzz) => request({ cut_rows: row, qzzno: qzz } +}) + +/** + * 子卷配送 + */ +// 1.1分切计划初始化查询 +export const queryMaterialInfo3 = (code, qzz, area) => request({ + url:'api/pda/shipping/queryMaterialInfo', + data: { + vehicle_code: code, + qzzno: qzz, + product_area: area + } +}) +// 1.2呼叫载具 +export const needVehicle = (code) => request({ + url:'api/pda/shipping/needVehicle', + data: { + cut_jo: code + } +}) +// 1.3配送确认 +export const shippingConfirm = (rows) => request({ + url:'api/pda/shipping/confirm', + data: { + cut_rows: rows + } +}) + +/** + * 子卷出站 + */ +// 1.1分切计划初始化查询 +export const queryMaterialInfo4 = (code, area) => request({ + url:'api/pda/out/queryMaterialInfo', + data: { + point_code: code, + product_area: area + } +}) +// 1.2子卷出站 +export const outConfirm = (rows) => request({ + url:'api/pda/out/confirm', + data: { + cut_rows: rows + } }) \ No newline at end of file