From bf7b78223c4fe7bfbf91a5318fa1ac4a6c88130a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 9 Sep 2024 14:49:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=98=E7=82=B9=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=BB=84=E4=BB=B62024/7/19=2019:59:14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/directory.js | 22 +- src/mycomponents/detail/comDetailCard.vue | 13 +- .../package/PackageAndItemCard.vue | 31 + src/mycomponents/qty/recommendQty.vue | 6 +- src/pages.json | 698 +++++++++--------- src/pages/count/coms/comFuzzyCountJobCard.vue | 33 + src/pages/count/job/fuzzyCountDetail.vue | 397 ++++++++++ src/pages/count/job/fuzzyCountJob.vue | 430 +++++++++++ src/pages/index/index.vue | 2 +- 9 files changed, 1293 insertions(+), 339 deletions(-) create mode 100644 src/mycomponents/package/PackageAndItemCard.vue create mode 100644 src/pages/count/coms/comFuzzyCountJobCard.vue create mode 100644 src/pages/count/job/fuzzyCountDetail.vue create mode 100644 src/pages/count/job/fuzzyCountJob.vue diff --git a/src/common/directory.js b/src/common/directory.js index c7d963e6..583c4e42 100644 --- a/src/common/directory.js +++ b/src/common/directory.js @@ -20,7 +20,8 @@ let sampleMethodList = []; let transferModeList = []; let countStageList = []; let locationAreaTypeList = []; -let businessList=[] +let businessList=[]; +let countScopeTypeList = []; @@ -61,7 +62,8 @@ export function clearCacheData() { transferModeList = []; countStageList = []; locationAreaTypeList=[]; - businessList=[] + businessList=[]; + countScopeTypeList = [] } //获取字典信息 @@ -317,6 +319,22 @@ export function getUomInfo(value) { } return resultInfo } +//获取盘点范围类型 +export function getCountScopeType(value) { + var resultInfo = ""; + if (countStageList.length == 0) { + countStageList = getDirectoryInfo("count_scope_type") + } + if (countStageList.length > 0) { + for (let item of countStageList) { + if (item.value == value) { + resultInfo = item + break; + } + } + } + return resultInfo +} //获取包装单位 export function getPackUnitInfo(value) { diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue index 6f82ed2b..f66c77f9 100644 --- a/src/mycomponents/detail/comDetailCard.vue +++ b/src/mycomponents/detail/comDetailCard.vue @@ -90,15 +90,16 @@ watch( } ) onMounted(() => { - if (detailOptions.value.length == 0) { - detailOptions.value = getDetailOption() - } - if (scanOptions.value.length == 0) { - scanOptions.value = getPurchaseReceiptOption(props.settingParam.allowModifyQty, false) - } + // if (detailOptions.value.length == 0) { + // detailOptions.value = getDetailOption() + // } + // if (scanOptions.value.length == 0) { + // scanOptions.value = getPurchaseReceiptOption(props.settingParam.allowModifyQty, false) + // } nextTick((res) => { collapse.value.init() }) + showLocation() }) const swipeClick = (params, item) => { let text = '' diff --git a/src/mycomponents/package/PackageAndItemCard.vue b/src/mycomponents/package/PackageAndItemCard.vue new file mode 100644 index 00000000..5fec15fa --- /dev/null +++ b/src/mycomponents/package/PackageAndItemCard.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/mycomponents/qty/recommendQty.vue b/src/mycomponents/qty/recommendQty.vue index f96d422f..b7e007a0 100644 --- a/src/mycomponents/qty/recommendQty.vue +++ b/src/mycomponents/qty/recommendQty.vue @@ -7,7 +7,7 @@ {{ Number(dataContent.qty) }} - + / {{ calc(dataContent.qty, dataContent.packQty) }} @@ -54,6 +54,10 @@ const props = defineProps({ objTextStyle: { type: Object, default: null + }, + isShowPackCount: { + type: Boolean, + default: true } }) const calc = (qty, packQty) => { diff --git a/src/pages.json b/src/pages.json index 1c85e701..ff5f195d 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1892,349 +1892,389 @@ } }, - { - "path": "pages/count/record/countRecord", - "style": { - "navigationBarTitleText": "按库位盘点", - "enablePullDownRefresh": false + "path": "pages/count/job/fuzzyCountJob", + "style": { + "navigationBarTitleText": "盲盘任务", + "enablePullDownRefresh": true, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] } - }, - { - "path": "pages/unPlanned/job/receiptJob", - "style": { - "navigationBarTitleText": "计划外入库任务", - "enablePullDownRefresh": true, - "titleNView": { - // "autoBackButton": "true", - "buttons": [ - // 右边按钮 - { - - "float": "right", - "fontSize": "58rpx", //按钮上文字的大小 - "text": "\ue696", - "fontSrc": "/static/ali_icon/iconfont.ttf" - - }, - { - - "float": "right", - "fontSize": "52rpx", //按钮上文字的大小 - "text": "\ue6e2", - "fontSrc": "/static/ali_icon/iconfont.ttf" - } - ] - } - } - }, - - { - "path": "pages/unPlanned/job/receiptJobDetail", - "style": { - "navigationBarTitleText": "计划外入库详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/unPlanned/request/receiptRequest", - "style": { - "navigationBarTitleText": "计划外入库申请", - "enablePullDownRefresh": false, - "titleNView": { - // "autoBackButton": "true", - "buttons": [ - // 右边按钮 - { - "float": "right", - "fontSize": "58rpx", //按钮上文字的大小 - "text": "\ue696", - "fontSrc": "/static/ali_icon/iconfont.ttf" - }, - { - - "float": "right", - "fontSize": "52rpx", //按钮上文字的大小 - "text": "\ue6e2", - "fontSrc": "/static/ali_icon/iconfont.ttf" - } - ] - } - } - }, - { - "path": "pages/unPlanned/request/receiptRequestDetail", - "style": { - "navigationBarTitleText": "计划外入库申请详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/unPlanned/request/receiptRequestCreate", - "style": { - "navigationBarTitleText": "计划外入库申请创建", - "enablePullDownRefresh": false - } - }, - - { - "path": "pages/unPlanned/job/issueJob", - "style": { - "navigationBarTitleText": "计划外出库任务", - "enablePullDownRefresh": false, - "titleNView": { - // "autoBackButton": "true", - "buttons": [ - // 右边按钮 - { - - "float": "right", - "fontSize": "58rpx", //按钮上文字的大小 - "text": "\ue696", - "fontSrc": "/static/ali_icon/iconfont.ttf" + } + }, + { + "path": "pages/count/job/fuzzyCountDetail", + "style": { + "navigationBarTitleText": "盲盘明细", + "enablePullDownRefresh": false - }, - { + } + }, + { + "path": "pages/count/record/countRecord", + "style": { + "navigationBarTitleText": "按库位盘点", + "enablePullDownRefresh": false - "float": "right", - "fontSize": "52rpx", //按钮上文字的大小 - "text": "\ue6e2", - "fontSrc": "/static/ali_icon/iconfont.ttf" - } - ] - } - } - }, - { - "path": "pages/unPlanned/job/issueJobDetail", - "style": { - "navigationBarTitleText": "计划外出库详情", - "enablePullDownRefresh": false + } + }, + { + "path": "pages/unPlanned/job/receiptJob", + "style": { + "navigationBarTitleText": "计划外入库任务", + "enablePullDownRefresh": true, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] } - }, - { - "path": "pages/unPlanned/request/issueRequest", - "style": { - "navigationBarTitleText": "计划外出库申请", - "enablePullDownRefresh": false, - "titleNView": { - // "autoBackButton": "true", - "buttons": [ - // 右边按钮 - { - "float": "right", - "fontSize": "58rpx", //按钮上文字的大小 - "text": "\ue696", - "fontSrc": "/static/ali_icon/iconfont.ttf" - }, - { + } + }, - "float": "right", - "fontSize": "52rpx", //按钮上文字的大小 - "text": "\ue6e2", - "fontSrc": "/static/ali_icon/iconfont.ttf" - } - ] - } - } - }, - { - "path": "pages/unPlanned/request/issueRequestDetail", - "style": { - "navigationBarTitleText": "计划外出库申请详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/unPlanned/request/issueRequestCreate", - "style": { - "navigationBarTitleText": "计划外出库申请创建", - "enablePullDownRefresh": false + { + "path": "pages/unPlanned/job/receiptJobDetail", + "style": { + "navigationBarTitleText": "计划外入库详情", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/unPlanned/request/receiptRequest", + "style": { + "navigationBarTitleText": "计划外入库申请", + "enablePullDownRefresh": false, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] } - }, + } + }, + { + "path": "pages/unPlanned/request/receiptRequestDetail", + "style": { + "navigationBarTitleText": "计划外入库申请详情", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/unPlanned/request/receiptRequestCreate", + "style": { + "navigationBarTitleText": "计划外入库申请创建", + "enablePullDownRefresh": false + } + }, - { - "path": "pages/unPlanned/record/receiptRecord", - "style": { - "navigationBarTitleText": "计划外入库记录", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/unPlanned/record/issueRecord", - "style": { - "navigationBarTitleText": "计划外出库记录", - "enablePullDownRefresh": false + { + "path": "pages/unPlanned/job/issueJob", + "style": { + "navigationBarTitleText": "计划外出库任务", + "enablePullDownRefresh": false, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] } - }, - { - "path": "pages/container/record/containerBindRecord", - "style": { - "navigationBarTitleText": "器具绑定", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/container/record/containerUnBindRecord", - "style": { - "navigationBarTitleText": "器具解绑", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/package/record/splitPackageRecord", - "style": { - "navigationBarTitleText": "拆包", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/package/record/mergePackageRecord", - "style": { - "navigationBarTitleText": "合包", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/package/record/overPackageRecord", - "style": { - "navigationBarTitleText": "翻包", - "enablePullDownRefresh": false + } + }, + { + "path": "pages/unPlanned/job/issueJobDetail", + "style": { + "navigationBarTitleText": "计划外出库详情", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/unPlanned/request/issueRequest", + "style": { + "navigationBarTitleText": "计划外出库申请", + "enablePullDownRefresh": false, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] } - }, - - { - "path": "pages/package/job/overPackageJob", - "style": { - "navigationBarTitleText": "翻包任务", - "enablePullDownRefresh": false, - "titleNView": { - // "autoBackButton": "true", - "buttons": [ - // 右边按钮 - { - - "float": "right", - "fontSize": "58rpx", //按钮上文字的大小 - "text": "\ue696", - "fontSrc": "/static/ali_icon/iconfont.ttf" + } + }, + { + "path": "pages/unPlanned/request/issueRequestDetail", + "style": { + "navigationBarTitleText": "计划外出库申请详情", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/unPlanned/request/issueRequestCreate", + "style": { + "navigationBarTitleText": "计划外出库申请创建", + "enablePullDownRefresh": false + } + }, - }, - { + { + "path": "pages/unPlanned/record/receiptRecord", + "style": { + "navigationBarTitleText": "计划外入库记录", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/unPlanned/record/issueRecord", + "style": { + "navigationBarTitleText": "计划外出库记录", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/container/record/containerBindRecord", + "style": { + "navigationBarTitleText": "器具绑定", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/container/record/containerUnBindRecord", + "style": { + "navigationBarTitleText": "器具解绑", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/package/record/splitPackageRecord", + "style": { + "navigationBarTitleText": "拆包", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/package/record/mergePackageRecord", + "style": { + "navigationBarTitleText": "合包", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/package/record/overPackageRecord", + "style": { + "navigationBarTitleText": "翻包", + "enablePullDownRefresh": false + } + }, - "float": "right", - "fontSize": "52rpx", //按钮上文字的大小 - "text": "\ue6e2", - "fontSrc": "/static/ali_icon/iconfont.ttf" - } - ] - } - } - }, - { - "path": "pages/package/job/overPackageJobDetail", - "style": { - "navigationBarTitleText": "翻包任务详情", - "enablePullDownRefresh": false - } - }, { - "path": "pages/point/index", - "style": { - "navigationBarTitleText": "打印", - "enablePullDownRefresh": false - } - }, { - "path": "pages/pointProductReceipt/index", - "style": { - "navigationBarTitleText": "打印", - "enablePullDownRefresh": false - } - }, { - "path": "pages/pointProductReceipt/webview", - "style": { - "navigationBarTitleText": "打印", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/pointPutawayJob/index", - "style": { - "navigationBarTitleText": "打印", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/check/checkFgLabel", - "style": { - "navigationBarTitleText": "标签成品标签", - "enablePullDownRefresh": false - } - }, { - "path": "pages/material/materialDowngrade", - "style": { - "navigationBarTitleText": "物料降级", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/fg/receiptByPlan", - "style": { - "navigationBarTitleText": "按计划报工", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/fg/receiptNoPlan", - "style": { - "navigationBarTitleText": "无计划报工", - "enablePullDownRefresh": false + { + "path": "pages/package/job/overPackageJob", + "style": { + "navigationBarTitleText": "翻包任务", + "enablePullDownRefresh": false, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] } } - ], - "globalStyle": { - "navigationBarTextStyle": "white", - "navigationBarTitleText": "WMS仓库管理系统-移动端", - "navigationBarBackgroundColor": "#3C9CFF", - "h5": { - "maxWidth": 1190, - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#3C9CFF !important" - }, - //增加返回首页 - // "titleNView": { - // "autoBackButton": "true", - // "buttons": [{ - // "float": "right", - // "text": "\ue696", - // "fontSrc": "/static/ali_icon/iconfont.ttf", - // "fontSize": "58rpx" - // }] - // }, - "softinputMode": "adjustPan" //adjustResize }, - "tabBar": { - "color": "#000000", - "selectedColor": "#2678f2", - "borderStyle": "black", - "backgroundColor": "", - "list": [{ - - "pagePath": "pages/index/index", - "iconPath": "./static/bar/home.png", - "selectedIconPath": "./static/bar/home_p.png", - "text": "首页" - }, - { - "pagePath": "pages/message/index", - "iconPath": "./static/bar/message.png", - "selectedIconPath": "./static/bar/message_p.png", - "text": "消息" - }, { - "pagePath": "pages/setter/index", - "iconPath": "./static/bar/setting.png", - "selectedIconPath": "./static/bar/setting_p.png", - "text": "设置" - } - ] + { + "path": "pages/package/job/overPackageJobDetail", + "style": { + "navigationBarTitleText": "翻包任务详情", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/point/index", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/pointProductReceipt/index", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/pointProductReceipt/webview", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/pointPutawayJob/index", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/check/checkFgLabel", + "style": { + "navigationBarTitleText": "标签成品标签", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/material/materialDowngrade", + "style": { + "navigationBarTitleText": "物料降级", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/fg/receiptByPlan", + "style": { + "navigationBarTitleText": "按计划报工", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/fg/receiptNoPlan", + "style": { + "navigationBarTitleText": "无计划报工", + "enablePullDownRefresh": false + } } +], +"globalStyle": { + "navigationBarTextStyle": "white", + "navigationBarTitleText": "WMS仓库管理系统-移动端", + "navigationBarBackgroundColor": "#3C9CFF", + "h5": { + "maxWidth": 1190, + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#3C9CFF !important" + }, + //增加返回首页 + // "titleNView": { + // "autoBackButton": "true", + // "buttons": [{ + // "float": "right", + // "text": "\ue696", + // "fontSrc": "/static/ali_icon/iconfont.ttf", + // "fontSize": "58rpx" + // }] + // }, + "softinputMode": "adjustPan" //adjustResize +}, +"tabBar": { + "color": "#000000", + "selectedColor": "#2678f2", + "borderStyle": "black", + "backgroundColor": "", + "list": [{ + + "pagePath": "pages/index/index", + "iconPath": "./static/bar/home.png", + "selectedIconPath": "./static/bar/home_p.png", + "text": "首页" + }, + { + "pagePath": "pages/message/index", + "iconPath": "./static/bar/message.png", + "selectedIconPath": "./static/bar/message_p.png", + "text": "消息" + }, { + "pagePath": "pages/setter/index", + "iconPath": "./static/bar/setting.png", + "selectedIconPath": "./static/bar/setting_p.png", + "text": "设置" + } + ] +} } \ No newline at end of file diff --git a/src/pages/count/coms/comFuzzyCountJobCard.vue b/src/pages/count/coms/comFuzzyCountJobCard.vue new file mode 100644 index 00000000..79adde28 --- /dev/null +++ b/src/pages/count/coms/comFuzzyCountJobCard.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/src/pages/count/job/fuzzyCountDetail.vue b/src/pages/count/job/fuzzyCountDetail.vue new file mode 100644 index 00000000..bbca95a5 --- /dev/null +++ b/src/pages/count/job/fuzzyCountDetail.vue @@ -0,0 +1,397 @@ + + + + + diff --git a/src/pages/count/job/fuzzyCountJob.vue b/src/pages/count/job/fuzzyCountJob.vue new file mode 100644 index 00000000..690778a7 --- /dev/null +++ b/src/pages/count/job/fuzzyCountJob.vue @@ -0,0 +1,430 @@ + + + + + diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index ffcea41f..8f9d17ef 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -324,7 +324,7 @@ const rightScroll = async (e) => { } const getDictory = () => { const params = { - types: ['job_status', 'location_type', 'item_status', 'item_type', 'uom', 'inventory_status', 'container_type', 'pack_unit', 'unplanned_receipt_reason', 'unplanned_issue_reason', 'scrap_reason', 'inspect_failed_reason', 'request_status', 'inspect_type', 'next_action', 'sample_method', 'transfer_mode', 'count_stage', 'inspect_result', 'area_type'] + types: ['job_status', 'location_type', 'item_status', 'item_type', 'uom', 'inventory_status', 'container_type', 'pack_unit', 'unplanned_receipt_reason', 'unplanned_issue_reason', 'scrap_reason', 'inspect_failed_reason', 'request_status', 'inspect_type', 'next_action', 'sample_method', 'transfer_mode', 'count_stage', 'inspect_result', 'area_type', 'count_scope_type'] } getDictionaryItem(params) .then((res) => {