diff --git a/src/api/request2.js b/src/api/request2.js index c20c616f..11749dd6 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -1263,6 +1263,44 @@ export function putawayJobSubmit(params) { }); } +/** + * 采购上架 全部承接任务 + * @param {*} id + * + */ +export function takeAllPutawayJob(data) { + return request({ + url: baseApi + "/wms/putaway-job-main/acceptBatch" , + method: "put", + data: data, + }); +} + +/** + * 采购上架 全部放弃承接任务 + * @param {*} id + * + */ +export function cancleAllTakePutawayJob(data) { + return request({ + url: baseApi + "/wms/putaway-job-main/abandonBatch", + method: "put", + data: data, + }); +} +/** + * 采购上架 任务全部提交 + * @param {*} data + */ +export function putawayJobAllExecute(data) { + return request({ + url: baseApi + "/wms/putaway-job-main/executeBatch", + method: "put", + data: data, + }); +} + + /** * 采购上架申请 获取任务列表 * 任务状态 @@ -2610,7 +2648,17 @@ export function deliverRequestClose(id) { data: {}, }); } - +/** + * 翻包任务 关闭任务 + * @param {*} params + */ +export function packageoverRequestClose(id) { + return request({ + url: baseApi + "/wms/packageover-job-main/close?id=" + id, + method: "put", + data: {}, + }); +} /** * 制品发货申请 提交审批 * @param {*} params diff --git a/src/common/balance.js b/src/common/balance.js index 460e9bf4..a8012fbd 100644 --- a/src/common/balance.js +++ b/src/common/balance.js @@ -345,12 +345,6 @@ export function byBatch(label, locationCode, fromInventoryStatuses, callback) { action: "in", value: status }) - - filters.push({ - column: "inventoryStatus", - action: "in", - value: status - }) } var params = { @@ -424,12 +418,6 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback) action: "in", value: status }) - - filters.push({ - column: "inventoryStatus", - action: "in", - value: status - }) } var params = { @@ -485,12 +473,6 @@ export function byUniqueId(label, locationCode, fromInventoryStatuses, callback) action: "in", value: status }) - - filters.push({ - column: "inventoryStatus", - action: "in", - value: status - }) } var params = { diff --git a/src/common/config.js b/src/common/config.js index 4c8cc3c4..416ed517 100644 --- a/src/common/config.js +++ b/src/common/config.js @@ -1,4 +1,10 @@ export const overPagePrint="overPage_print" export const overPageTemplate="overPage_Template" //3分钟刷新 -export const planRefreshTime=3*60*1000 \ No newline at end of file +export const planRefreshTime=3*60*1000 + +export const issueJobFilter="issue_job_filter" +export const repleinshJobFilter="repleinsh_job_filter" +export const overPackageJobFilter="over_package_job_filter" +export const productionReceiptJobFilter="production_receipt_job_filter" + diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index 32d1546f..0b47d7e6 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -52,7 +52,7 @@ 来源库区 + placeholder="请输入来源库区" /> @@ -60,7 +60,7 @@ 到库区 + placeholder="请输入到库区" /> - + @@ -164,7 +165,10 @@ toAreaCode: '', // 到库区 itemCode: '', //物料代码 creationTime: '', - status: '' + status: '1,2', + isOnToday: false, + isOnWait: false, + params: {} } }, watch: { @@ -197,16 +201,16 @@ } return params; }, - reset(){ + reset() { this.checkedTodayModel = false this.checkedWaitModel = false this.productionLineCode = '' this.fromLocationCode = '' - this.fromAreaCode = ''// 来源库区 - this.toAreaCode = ''// 到库区 + this.fromAreaCode = '' // 来源库区 + this.toAreaCode = '' // 到库区 this.itemCode = '' this.creationTime = '' - this.status = '' + this.status = '1,2' this.query() }, @@ -239,6 +243,21 @@ openFilter() { this.$refs['popup'].open("top"); }, + openFilterParams(params) { + this.$refs['popup'].open("top"); + if(params){ + this.productionLineCode = params.productionLineCode + this.fromLocationCode = params.fromLocationCode + this.fromAreaCode = params.fromAreaCode + this.toAreaCode = params.toAreaCode + this.itemCode = params.itemCode + this.creationTime = params.creationTime + this.status = params.status + this.checkedTodayModel=this.creationTime?true:false + this.checkedWaitModel=this.status=="1"?true:false + } + + }, closeScanPopup() { this.$refs.popup.close() }, diff --git a/src/pages.json b/src/pages.json index a9689c54..419f3380 100644 --- a/src/pages.json +++ b/src/pages.json @@ -458,7 +458,7 @@ "enablePullDownRefresh": false } }, - + { "path": "pages/putaway/job/quantityPutawayJob", "style": { @@ -469,15 +469,15 @@ "buttons": [ // 右边按钮 { - + "float": "right", "fontSize": "58rpx", //按钮上文字的大小 "text": "\ue696", "fontSrc": "/static/ali_icon/iconfont.ttf" - + }, { - + "float": "right", "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", @@ -487,7 +487,7 @@ } } }, - + { "path": "pages/putaway/job/quantityPutawayJobDetail", "style": { @@ -495,8 +495,8 @@ "enablePullDownRefresh": false } }, - - + + { "path": "pages/putaway/record/putawayRecord", "style": { @@ -639,15 +639,15 @@ "buttons": [ // 右边按钮 { - + "float": "right", "fontSize": "58rpx", //按钮上文字的大小 "text": "\ue696", "fontSrc": "/static/ali_icon/iconfont.ttf" - + }, { - + "float": "right", "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", @@ -684,15 +684,15 @@ "buttons": [ // 右边按钮 { - + "float": "right", "fontSize": "58rpx", //按钮上文字的大小 "text": "\ue696", "fontSrc": "/static/ali_icon/iconfont.ttf" - + }, { - + "float": "right", "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", @@ -712,15 +712,15 @@ "buttons": [ // 右边按钮 { - + "float": "right", "fontSize": "58rpx", //按钮上文字的大小 "text": "\ue696", "fontSrc": "/static/ali_icon/iconfont.ttf" - + }, { - + "float": "right", "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", @@ -823,15 +823,15 @@ "buttons": [ // 右边按钮 { - + "float": "right", "fontSize": "58rpx", //按钮上文字的大小 "text": "\ue696", "fontSrc": "/static/ali_icon/iconfont.ttf" - + }, { - + "float": "right", "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", @@ -2435,8 +2435,9 @@ // "fontSize": "58rpx" // }] // }, - //手机软键盘升起不让其将页面头部上推 - "softinputMode": "adjustResize" //adjustResize + //adjustResize：软键盘弹出时，webview窗体高度挤压。屏幕高度=webview窗体高度+软键盘高度 + // adjustPan：软键盘弹出时，webview窗体高度不变，但窗体上推，以保证输入框不被软键盘盖住 + "softinputMode": "adjustPan" //adjustResize }, "tabBar": { "color": "#000000", diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue index d6502676..b95a08db 100644 --- a/src/pages/customerReturn/record/returnRecord.vue +++ b/src/pages/customerReturn/record/returnRecord.vue @@ -9,7 +9,9 @@ + @removeItem="removeItem(index,item)" + :isShowParentToLocation="false" + @updateData="updateData" @removePack="removePack"> @@ -31,7 +33,10 @@ - + { - if (res) { - - } - }); - }, showScanMessage(message) { this.$refs.comMessage.showScanMessage(message); diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 9cdc562b..b0559bff 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -305,7 +305,9 @@ } this.$refs.comMessage.showErrorMessage(message, res => { if (res) { - + if (this.$refs.scanPopup) { + this.$refs.scanPopup.packGetFocus() + } } }); }, @@ -393,8 +395,8 @@ this.dataContent.subList.forEach(res => { if (res.fromLocationCode == res.toLocationCode) { if (res.fromInventoryStatus == res.toInventoryStatus) { - var resultHint = res.fromPackingNumber?`包装号【${res.fromPackingNumber}】`:"" - hint += resultHint+`来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` + var resultHint = res.fromPackingNumber ? `包装号【${res.fromPackingNumber}】` : "" + hint += resultHint + `来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` } } }) diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index de0229f1..2a1edfb9 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -489,7 +489,7 @@ }, selectBalanceItem(balance) { - this.afterGetBalance(this.label, balance, this.packageInfo); + this.afterGetBalance(balance, balance, this.packageInfo); }, afterGetBalance(label, balance, packageInfo) { diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 38acf2ac..5cd8a39a 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -1,18 +1,11 @@