diff --git a/src/config/getData2.js b/src/config/getData2.js
index 5e39e5b..042cfd0 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -377,6 +377,8 @@ export const bypda = (page, size) => post('api/bcp/bypda', {
// }
// return res
// }
+// 空框送回
+export const kzsendVechile = () => post('api/pda/kz/sendVechile', {})
// 1.2刻字机选择
export const kzDeviceList = () => post('api/produceWorkorder', {
product_area: 'A1',
@@ -443,6 +445,10 @@ export const operation = (id, method) => post('api/task/operation', {
task_id: id,
method_name: method
})
+// 重新下发
+export const kzresend = (id) => post('api/pda/kz/resend', {
+ task_id: id
+})
/**
* 批量入库
diff --git a/src/pages/modules/finished/batch-instore.vue b/src/pages/modules/finished/batch-instore.vue
index 171fac5..d00a810 100644
--- a/src/pages/modules/finished/batch-instore.vue
+++ b/src/pages/modules/finished/batch-instore.vue
@@ -56,7 +56,7 @@
-
+
@@ -72,7 +72,6 @@
组盘日期 |
订单号 |
订单行号 |
- 规格 |
数量 |
明细数 |
入库点 |
@@ -88,7 +87,6 @@
{{ e.create_time }} |
{{e.sale_code}} |
{{e.sale_seq_no}} |
- {{ e.material_spec }} |
{{ e.storage_qty }} |
{{ e.count }} |
{{ e.point_code }} |
@@ -197,15 +195,15 @@ export default {
// 确认入库
async _finishproductBatchin () {
this.disabled1 = true
- if (this.dataList.length === 0) {
+ if (this.checkArr.length === 0) {
this.disabled1 = false
return
}
try {
- this.dataList.map(el => {
+ this.checkArr.map(el => {
this.$set(el, 'bill_code', this.value3)
})
- let res = await finishproductBatchin(this.dataList)
+ let res = await finishproductBatchin(this.checkArr)
if (res.code === 200) {
this.toast(res.msg)
this._finishproductBucket()
diff --git a/src/pages/modules/lettering/lettering-process.vue b/src/pages/modules/lettering/lettering-process.vue
index 715b5d5..9ebbd29 100644
--- a/src/pages/modules/lettering/lettering-process.vue
+++ b/src/pages/modules/lettering/lettering-process.vue
@@ -5,6 +5,7 @@
+
@@ -43,7 +44,7 @@