diff --git a/common/style/layout.styl b/common/style/layout.styl index 2dee157..b033e71 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -506,4 +506,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { width 70% height 4rpx background-color #fff +} +uni-button[size=mini] { + white-space: nowrap; } \ No newline at end of file diff --git a/locale/en.json b/locale/en.json index 8a8553f..a907a82 100644 --- a/locale/en.json +++ b/locale/en.json @@ -32,7 +32,8 @@ "ManualWarehouseTransfer": "Manual Warehouse Transfer", "OperationManagement": "Operation Management", "PointUpdate": "Point Update", - "QueryMaterials": "Query Materials" + "QueryMaterials": "Query Materials", + "Outboundsorting": "Outbound sorting" }, "utils": { "loading": "Loading...", @@ -75,7 +76,12 @@ "Pointlocationcarrier": "Point - location carrier", "Unitmeasurement": "Unit of measurement", "WarehousingType": "Warehousing Type", - "MaterialQRCode": "Material QR Code" + "MaterialQRCode": "Material QR Code", + "ReturnwarehousePalletCode": "Return - to - warehouse Pallet Code", + "OutboundPalletCode": "Outbound Pallet Code", + "OutboundPalletStorageLocation": "Outbound Pallet Storage Location", + "QtyReturnedWarehouse": "Quantity Returned to Warehouse", + "OutboundQty": "Outbound Quantity" }, "th": { "MaterialBoxNumber": "Material Box Number", @@ -91,5 +97,8 @@ "toast": { "boxnotduplicated": "The material box number cannot be repeated.", "quantitynonnegative": "The quantity must be a non - negative number" + }, + "modal": { + "checkSorting": "The outbound pallet location is【{location}】, return quantity【{returnNum}】, outbound quantity【{outNum}】. Please check if the sorting is correct?" } } \ No newline at end of file diff --git a/locale/vi.json b/locale/vi.json index 20afbd9..5e51ed5 100644 --- a/locale/vi.json +++ b/locale/vi.json @@ -32,7 +32,8 @@ "ManualWarehouseTransfer": "Chuyển kho thủ công", "OperationManagement": "Quản lý hoạt động", "PointUpdate": "Cập nhật điểm", - "QueryMaterials": "Tra cứu vật liệu" + "QueryMaterials": "Tra cứu vật liệu", + "Outboundsorting": "Phân loại xuất kho" }, "utils": { "loading": "Đang tải...", @@ -75,7 +76,12 @@ "Pointlocationcarrier": "Vật chở tại điểm", "Unitmeasurement": "Đơn vị đo", "WarehousingType": "Loại nhập kho", - "MaterialQRCode": "Mã QR vật liệu" + "MaterialQRCode": "Mã QR vật liệu", + "ReturnwarehousePalletCode": "Mã thùng đựng trả về kho", + "OutboundPalletCode": "Mã thùng đựng xuất kho", + "OutboundPalletStorageLocation": "Vị trí lưu trữ thùng đựng xuất kho", + "QtyReturnedWarehouse": "Số lượng trả về kho", + "OutboundQty": "Số lượng xuất kho" }, "th": { "MaterialBoxNumber": "Số hộp vật liệu", @@ -91,5 +97,8 @@ "toast": { "boxnotduplicated": "Số hộp vật liệu không được trùng nhau", "quantitynonnegative": "Số lượng phải là số không âm" - } + }, + "modal": { + "checkSorting": "Vị trí lưu trữ thùng đựng xuất kho là【{location}】, số lượng trả lại【{returnNum}】, số lượng xuất kho【{outNum}】. Vui lòng kiểm tra xem phân loại có chính xác không?" + } } \ No newline at end of file diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 5a0269e..37f1081 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -32,7 +32,8 @@ "ManualWarehouseTransfer": "手工移库", "OperationManagement": "作业管理", "PointUpdate": "点位更新", - "QueryMaterials": "查询物料" + "QueryMaterials": "查询物料", + "Outboundsorting": "出库分拣" }, "utils": { "loading": "加载中...", @@ -75,7 +76,12 @@ "Pointlocationcarrier": "点位载具", "Unitmeasurement": "计量单位", "WarehousingType": "入库类型", - "MaterialQRCode": "物料二维码" + "MaterialQRCode": "物料二维码", + "ReturnwarehousePalletCode": "回库托盘码", + "OutboundPalletCode": "出库托盘码", + "OutboundPalletStorageLocation": "出库托盘库位", + "QtyReturnedWarehouse": "回库数量", + "OutboundQty": "出库数量" }, "th": { "MaterialBoxNumber": "料框号", @@ -91,5 +97,8 @@ "toast": { "boxnotduplicated": "料框号不能重复", "quantitynonnegative": "数量必须为非负数" + }, + "modal": { + "checkSorting": "出库托盘库位为【{location}】,回库数量【{returnNum}】个,出库数量【{outNum}】个,请核对分拣是否正确?" } } \ No newline at end of file diff --git a/pages.json b/pages.json index 97755fb..1b7c4a1 100644 --- a/pages.json +++ b/pages.json @@ -95,6 +95,13 @@ "navigationStyle": "custom" } + }, + { + "path" : "pages/manage/ckfj", + "style" : + { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/home/home.vue b/pages/home/home.vue index 70e6b7a..06e73e7 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -38,7 +38,8 @@ {title: this.$t('home.ManualMaterialRequest'), icon: 'RF04', path: '/pages/manage/rgjl'}, {title: this.$t('home.ManualWarehouseTransfer'), icon: 'RF05', path: '/pages/manage/sgyk'}, {title: this.$t('home.OperationManagement'), icon: 'RF06', path: '/pages/manage/zygl'}, - {title: this.$t('home.PointUpdate'), icon: 'RF07', path: '/pages/manage/dwgx'} + {title: this.$t('home.PointUpdate'), icon: 'RF07', path: '/pages/manage/dwgx'}, + {title: this.$t('home.Outboundsorting'), icon: 'RF08', path: '/pages/manage/ckfj'} ], show: false, secM: [] diff --git a/pages/manage/ckfj.vue b/pages/manage/ckfj.vue new file mode 100644 index 0000000..b00958c --- /dev/null +++ b/pages/manage/ckfj.vue @@ -0,0 +1,134 @@ + + + \ No newline at end of file diff --git a/pages/manage/dwgx.vue b/pages/manage/dwgx.vue index bc4fe3f..16d5ffe 100644 --- a/pages/manage/dwgx.vue +++ b/pages/manage/dwgx.vue @@ -14,7 +14,7 @@ - + diff --git a/pages/manage/rgjl.vue b/pages/manage/rgjl.vue index 18f4b14..2032fcb 100644 --- a/pages/manage/rgjl.vue +++ b/pages/manage/rgjl.vue @@ -16,7 +16,7 @@ - + diff --git a/pages/manage/sgyk.vue b/pages/manage/sgyk.vue index eb0845d..81d676a 100644 --- a/pages/manage/sgyk.vue +++ b/pages/manage/sgyk.vue @@ -14,7 +14,7 @@ - + diff --git a/pages/manage/zprk.vue b/pages/manage/zprk.vue index 56596aa..671183d 100644 --- a/pages/manage/zprk.vue +++ b/pages/manage/zprk.vue @@ -21,7 +21,7 @@ @handleChange="handleChange" /> - + {{$t('label.WarehouseArea')}} diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png new file mode 100644 index 0000000..30c871f Binary files /dev/null and b/static/image/menu/RF08.png differ diff --git a/utils/getData.js b/utils/getData.js index bf1df93..34b2c05 100644 --- a/utils/getData.js +++ b/utils/getData.js @@ -136,4 +136,12 @@ export const addTaskV2 = (Value, point1, point2) => request({ export const dictDetail = (code) => request({ url:'api/dict/dictDetail?code=' + code + '&page=0&size=9999', method: 'GET' +}) +export const getOutAndReturnNumByReturnVehicleCode = (code) => request({ + url:'api/pda/iosOut/getOutAndReturnNumByReturnVehicleCode', + data: {return_vehicle_code: code} +}) +export const outSortingSubmit = (code, vcode, ost) => request({ + url:'api/pda/iosOut/outSortingSubmit', + data: {return_vehicle_code: code, out_vehicle_code: vcode, out_struct_code: ost} }) \ No newline at end of file