From 36bf9dcddd253a7cead19847f6410c000a734bcc Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 12 Dec 2023 14:42:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/basic.js | 64 +++- common/directory.js | 8 +- pages/unPlanned/record/issueRecord.vue | 52 +--- pages/unPlanned/record/receiptRecord.vue | 54 ---- .../unPlanned/request/issueRequestCreate.vue | 178 +++++------ .../request/receiptRequestCreate.vue | 291 +++++++++++++++++- 6 files changed, 440 insertions(+), 207 deletions(-) diff --git a/common/basic.js b/common/basic.js index b170962e..35db63a2 100644 --- a/common/basic.js +++ b/common/basic.js @@ -715,6 +715,66 @@ export function getTodayDate() { return startTime + "," + endTime; } +export function getCurrDateOneMonthsTimes() { + var end = Date.now() + // var end = new Date('2019/12/31 15:18').getTime() + var day = 31 + var enda = new Date(end); + var endm = enda.getMonth() + 1; + var d = enda.getDate(); + if (endm == 4 || endm == 6 || endm == 9 || endm == 11) { + day = 30 + } else { + if (d == 31) { + day = 30 + } + if (endm == 7 || endm == 12) { + day = 31 + } + } + if (endm == 1) { + var endy = enda.getFullYear(); + day = 31 + if (d == 31) { + day = 28 + } + if (d == 30) { + day = 29 + } + if (d == 29) { + day = 30 + } + if (endy % 4 == 0) { + day = 31 + if (d == 31) { + day = 29 + } + if (d == 30) { + day = 30 + } + if (d == 29) { + day = 31 + } + } + } + if (endm == 2) { + var endy = enda.getFullYear(); + day = 28 + if (endy % 4 == 0) { + day = 29 + } + } + var start = 1000 * 60 * 60 * 24 * day + var interval = end + start; + return interval; +} + + +export function getCurrDateTimes() { + var time = (new Date()).getTime(); + return time; +} + export function getCurrDate() { var date = new Date(); return getDate(date); @@ -733,11 +793,11 @@ export function getISODateTime() { //格式化处理 export function dateFormat(time) { var result = "" - if(time!=null){ + if (time != null) { let date = new Date(time); result = getDate(date) + " " + getTime(date); } - + return result; } diff --git a/common/directory.js b/common/directory.js index 0ae9dfd8..80c38b53 100644 --- a/common/directory.js +++ b/common/directory.js @@ -9,6 +9,7 @@ let containerTypeList = []; let packUnitList = []; let requestStatusList = []; let unplannedReceiptReasonList = []; +let unplannedIssueReasonList = []; let unplannedIissueReason = []; let scrapReasonList = []; let inspectFailedReasonList = []; @@ -42,6 +43,7 @@ export function clearCacheData() { packUnitList = []; requestStatusList = []; unplannedReceiptReasonList = []; + unplannedIssueReasonList=[]; unplannedIissueReason = []; scrapReasonList = []; inspectFailedReasonList = []; @@ -329,7 +331,7 @@ export function getUnPlannedReceiptReasonList(value) { } unplannedReceiptReasonList.forEach(res => { res.text = res.label; - res.value = res.code + res.value = res.value }) return unplannedReceiptReasonList } @@ -341,7 +343,7 @@ export function getUnPlannedIssuseReasonList(value) { } unplannedIssueReasonList.forEach(res => { res.text = res.label; - res.value = res.code + res.value = res.value }) return unplannedIssueReasonList } @@ -353,7 +355,7 @@ export function getScarpReasonList(value) { } scrapReasonList.forEach(res => { res.text = res.label; - res.value = res.code + res.value = res.value }) return scrapReasonList } diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue index baa9f62a..5688e903 100644 --- a/pages/unPlanned/record/issueRecord.vue +++ b/pages/unPlanned/record/issueRecord.vue @@ -102,7 +102,6 @@ detailSource: [], //绑定在页面上的数据源 reason: "", reasonList: [], - fromType: "", dataContent:{} } }, @@ -121,12 +120,6 @@ }, onLoad(option) { - this.fromType = option.fromType - if (this.fromType == "requestType") { - updateTitle("计划外出库申请") - } else { - updateTitle("计划外出库记录") - } }, methods: { @@ -223,24 +216,7 @@ this.showErrorMessage("请选择出库原因") return; } - - if(this.fromType=="requestType"){ - var params = this.setRequestParams(); - console.log("提交参数",JSON.stringify(params)); - - - // unPlannedIssueRequestSubmit(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data, ) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) - }else { + var params =this.setParams() // unPlannedIssueRecordSubmit(params).then(res => { // uni.hideLoading() // if (res.data) { @@ -252,7 +228,6 @@ // uni.hideLoading() // this.showErrorMessage(error) // }) - } }, setParams() { @@ -271,31 +246,6 @@ return subList; }, - setRequestParams(){ - var subList = [] - var supplierCode="" - this.detailSource.forEach(item => { - item.subList.forEach(detail => { - if (detail.scaned) { - if(supplierCode==""){ - supplierCode = detail.package.supplierCode - } - subList.push(detail) - } - }) - }) - - this.dataContent.subList = subList - this.dataContent.supplierCode = supplierCode - this.dataContent.businessType = "PurchasePutaway" - this.dataContent.departmentCode= "研发部门"; - this.dataContent.status= 1 ; - this.dataContent.autoCommit = "FALSE"; - this.dataContent.autoAgree = "FALSE"; - this.dataContent.autoExecute = "FALSE"; - this.dataContent.directCreateRecord = "FALSE"; - return this.dataContent; - }, } } diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue index f7e371cf..6ca5d38f 100644 --- a/pages/unPlanned/record/receiptRecord.vue +++ b/pages/unPlanned/record/receiptRecord.vue @@ -99,7 +99,6 @@ businessTypeCode: "UnplannedReceipt", reason: "", reasonList: [], - fromType: "", showToLoaction:true, dataContent:{} } @@ -120,20 +119,9 @@ }, onLoad(option) { - this.fromType = option.fromType - this.updateTitle(); }, methods: { - updateTitle(){ - if (this.fromType == "requestType") { - updateTitle("计划外入库申请") - this.showToLoaction =false - } else { - updateTitle("计划外入库记录") - this.showToLoaction =true - } - }, openScanPopup() { this.$refs.scanPopup.openScanPopup(); }, @@ -249,21 +237,6 @@ return; } - if(this.fromType=="requestType"){ - var params = this.setRequestParams() - console.log("提交" + JSON.stringify(params)) - // unPlannedReceiptRequestbSubmit(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成计划外入库申请" + res.data, ) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) - }else { //记录有目标库位，需要查询管理模式 var itemCodes = [] this.detailSource.forEach(item => { @@ -292,7 +265,6 @@ this.showErrorMessage(res.message); } }); - } }, setParams(queryModel) { @@ -328,32 +300,6 @@ return this.dataContent; }, - setRequestParams(){ - var subList = [] - var supplierCode="" - this.detailSource.forEach(item => { - item.subList.forEach(detail => { - if (detail.scaned) { - if(supplierCode==""){ - supplierCode = detail.package.supplierCode - } - subList.push(detail) - } - }) - }) - - this.dataContent.subList = subList - this.dataContent.supplierCode = supplierCode - this.dataContent.businessType = "PurchasePutaway" - this.dataContent.departmentCode= "研发部门"; - this.dataContent.status= 1 ; - this.dataContent.autoCommit = "FALSE"; - this.dataContent.autoAgree = "FALSE"; - this.dataContent.autoExecute = "FALSE"; - this.dataContent.directCreateRecord = "FALSE"; - return this.dataContent; - }, - } } diff --git a/pages/unPlanned/request/issueRequestCreate.vue b/pages/unPlanned/request/issueRequestCreate.vue index baa9f62a..eb6dedbc 100644 --- a/pages/unPlanned/request/issueRequestCreate.vue +++ b/pages/unPlanned/request/issueRequestCreate.vue @@ -3,36 +3,42 @@ - - - - - - - - - + + + 出库原因： + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data, ) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) - }else { - // unPlannedIssueRecordSubmit(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data, ) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) - } - - }, - setParams() { - var subList = [] - this.detailSource.forEach(item => { - item.subList.forEach(detail => { - if (detail.scaned) { - // var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, - // detail.packingNumber, detail.batch); - // detail.toPackingNumber =info.packingNumber; - // detail.toBatch =info.batch; - subList.push(detail) - } - }) + + var params = this.setRequestParams(); + console.log("提交参数", JSON.stringify(params)); + uni.showLoading({ + title:"提交中" }) - return subList; + unPlannedIssueRequestSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成计划外出库申请
" + res.data) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) + }, - - setRequestParams(){ + + setRequestParams() { var subList = [] - var supplierCode="" this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { - if(supplierCode==""){ - supplierCode = detail.package.supplierCode - } + detail.fromLocationCode = detail.locationCode; + detail.reasonText = this.reasonCode; + detail.containerNumber =""; subList.push(detail) } }) }) - + this.dataContent.subList = subList - this.dataContent.supplierCode = supplierCode - this.dataContent.businessType = "PurchasePutaway" - this.dataContent.departmentCode= "研发部门"; - this.dataContent.status= 1 ; - this.dataContent.autoCommit = "FALSE"; - this.dataContent.autoAgree = "FALSE"; - this.dataContent.autoExecute = "FALSE"; - this.dataContent.directCreateRecord = "FALSE"; + this.dataContent.status = 1; + this.dataContent.requestTime = getCurrDateTimes(); + this.dataContent.dueTime = getCurrDateOneMonthsTimes(); + return this.dataContent; }, + showCommitSuccessMessage(hint) { + this.$refs.comMessage.showSuccessMessage(hint, res => { + navigateBack(1) + }) + }, + + reasonChange(e) { + if (e.detail.value.length == 0) { + this.reasonCode = "" + this.reasonText = "" + } else { + this.reasonCode = e.detail.value[0].value + this.reasonText = e.detail.value[0].text + } + } } } diff --git a/pages/unPlanned/request/receiptRequestCreate.vue b/pages/unPlanned/request/receiptRequestCreate.vue index 02409e35..affe5205 100644 --- a/pages/unPlanned/request/receiptRequestCreate.vue +++ b/pages/unPlanned/request/receiptRequestCreate.vue @@ -1,8 +1,297 @@ \ No newline at end of file + .page-main { + flex: 1; + position: relative; + } + + .page-main-scroll { + position: relative; + margin-top: 2px; + } + From b2080ff998073fcf29badfee251f5250ea7d3417 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 12 Dec 2023 16:21:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=A0=87=E7=AD=BE=E5=BC=B9=E5=87=BA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request2.js | 67 ++++++++- common/label.js | 14 +- mycomponents/scan/winComScan.vue | 1 + .../purchaseReturn/request/returnRequest.vue | 27 ++-- pages/putaway/job/putawayDetail.vue | 7 +- pages/unPlanned/request/issueRequest.vue | 130 ++++++++++++++++-- .../unPlanned/request/issueRequestCreate.vue | 5 +- static/config.json | 2 +- 8 files changed, 212 insertions(+), 41 deletions(-) diff --git a/api/request2.js b/api/request2.js index dfbf8ad3..0c7bb977 100644 --- a/api/request2.js +++ b/api/request2.js @@ -634,7 +634,7 @@ export function purchaseReturnRequestClose(id) { * 采购退货申请 提交审批 * @param {*} params */ -export function purchaseReturnRequestSubmitApprove(id) { +export function purchaseReturnRequestApprove(id) { return request({ url: baseApi + "/wms/purchasereturn-request-main/submit?id="+id, method: "put", @@ -646,7 +646,7 @@ export function purchaseReturnRequestSubmitApprove(id) { * 采购退货申请 提交审批通过 * @param {*} params */ -export function purchaseReturnRequestSubmitApproveAgree(id) { +export function purchaseReturnRequestApproveAgree(id) { return request({ url: baseApi + "/wms/purchasereturn-request-main/agree?id="+id, method: "put", @@ -658,7 +658,7 @@ export function purchaseReturnRequestSubmitApproveAgree(id) { * 采购退货申请 审批驳回 * @param {*} params */ -export function purchaseReturnRequestSubmitApproveRefused(id) { +export function purchaseReturnRequestApproveRefused(id) { return request({ url: baseApi + "/wms/purchasereturn-request-main/refused?id="+id, method: "put", @@ -1373,6 +1373,67 @@ export function unPlannedIssueRequestSubmit(params) { }); } +/** + * 计划外出库申请 提交审批 + * @param {*} params + */ +export function unPlannedIssueRequestApprove(id) { + return request({ + url: baseApi + "/wms/unplannedissue-request-main/submit?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 计划外出库申请 关闭 + * @param {*} params + */ +export function unPlannedIssueRequestClose(id) { + return request({ + url: baseApi + "/wms/unplannedissue-request-main/close?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 计划外出库申请 审批通过 + * @param {*} params + */ +export function unPlannedIssueRequestApproveAgree(id) { + return request({ + url: baseApi + "/wms/unplannedissue-request-main/agree?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 计划外出库申请 审批驳回 + * @param {*} params + */ +export function unPlannedIssueRequestApproveRefused(id) { + return request({ + url: baseApi + "/wms/unplannedissue-request-main/refused?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 计划外出库申请 处理 + * @param {*} params + */ +export function unPlannedIssueRequestHandle(id) { + return request({ + url: baseApi + "/wms/unplannedissue-request-main/handle?id="+id, + method: "put", + data: {}, + }); +} + + /** * 计划外出库记录 提交 * @param {*} params diff --git a/common/label.js b/common/label.js index 60824ee0..ddecb4dd 100644 --- a/common/label.js +++ b/common/label.js @@ -14,7 +14,7 @@ export function getLabelInfo(scanMsg, callBack) { let items = scanMsg.split(';'); let header = items[0]; let version = items[1]; - if (header != '' && version != '') { + if ((header != undefined) && (version!=undefined)) { //解析扫描的是一维码还是二维码 let type = header.substring(header.length - 1, header.length); if (type == 'Q') //qrcode @@ -26,6 +26,18 @@ export function getLabelInfo(scanMsg, callBack) { } else { //直接输入文本 getBarCodeInfo('text', 'V1.0', scanMsg, callBack); } + }else { + let labelResult = { + label: { + labelType: "", + barType: '', + code:"" + }, + package: null, + sucess: false, + message: '标签格式不正确', + } + callBack(labelResult); } } diff --git a/mycomponents/scan/winComScan.vue b/mycomponents/scan/winComScan.vue index 9616a0f8..b8757707 100644 --- a/mycomponents/scan/winComScan.vue +++ b/mycomponents/scan/winComScan.vue @@ -157,6 +157,7 @@ // that.getfocus();//不能自动获取焦点 that.$emit("getResult", scanResult); } else { + that.clear(); this.$refs.comMessage.showErrorMessage(scanResult.message, res => { if (res) { that.getfocus(); diff --git a/pages/purchaseReturn/request/returnRequest.vue b/pages/purchaseReturn/request/returnRequest.vue index 5893250f..9af7f141 100644 --- a/pages/purchaseReturn/request/returnRequest.vue +++ b/pages/purchaseReturn/request/returnRequest.vue @@ -41,9 +41,9 @@ import { getPurchaseReturnRequestList, purchaseReturnRequestClose, - purchaseReturnRequestSubmitApprove, - purchaseReturnRequestSubmitApproveAgree, - purchaseReturnRequestSubmitApproveRefused, + purchaseReturnRequestApprove, + purchaseReturnRequestApproveAgree, + purchaseReturnRequestApproveRefused, purchaseReturnRequestHandle } from '@/api/request2.js'; import { @@ -215,15 +215,15 @@ }) } else if (text == "提交审批") { this.showQuestionMessage("确定要审批当前申请吗?",res=>{ - this.purchaseReturnRequestSubmitApprove(dataContent.id) + this.purchaseReturnRequestApprove(dataContent.id) }) } else if (text=="审批通过") { this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{ - this.purchaseReturnRequestSubmitApproveAgree(dataContent.id) + this.purchaseReturnRequestApproveAgree(dataContent.id) }) } else if (text == "审批驳回") { this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{ - this.purchaseReturnRequestSubmitApproveRefused(dataContent.id) + this.purchaseReturnRequestApproveRefused(dataContent.id) }) } else if (text == "关闭") { this.showQuestionMessage("确定要关闭当前申请吗?",res=>{ @@ -290,9 +290,8 @@ }, - - purchaseReturnRequestSubmitApprove(id) { - purchaseReturnRequestSubmitApprove(id).then(res => { + purchaseReturnRequestApprove(id) { + purchaseReturnRequestApprove(id).then(res => { if (res.data) { this.getList("refresh") uni.showToast({ @@ -323,8 +322,8 @@ this.showMessage(error) }) }, - purchaseReturnRequestSubmitApproveAgree(id) { - purchaseReturnRequestSubmitApproveAgree(id).then(res => { + purchaseReturnRequestApproveAgree(id) { + purchaseReturnRequestApproveAgree(id).then(res => { if (res.data) { this.getList("refresh") uni.showToast({ @@ -338,8 +337,8 @@ this.showMessage(error) }) }, - purchaseReturnRequestSubmitApproveRefused(id) { - purchaseReturnRequestSubmitApproveRefused(id).then(res => { + purchaseReturnRequestApproveRefused(id) { + purchaseReturnRequestApproveRefused(id).then(res => { if (res.data) { this.getList("refresh") uni.showToast({ @@ -354,7 +353,7 @@ }) }, purchaseReturnRequestHandle(id) { - purchaseReturnRequestSubmitApproveRefused(id).then(res => { + purchaseReturnRequestHandle(id).then(res => { if (res.data) { this.getList("refresh") uni.showToast({ diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue index a64d98c8..9f12ec84 100644 --- a/pages/putaway/job/putawayDetail.vue +++ b/pages/putaway/job/putawayDetail.vue @@ -301,6 +301,7 @@ if (res) { itemDetail.scaned = true; itemDetail.handleQty = Number(result.balance.qty) ; + itemDetail.toInventoryStatus =result.balance.inventoryStatus itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.stdPackQty = result.package.stdPackQty @@ -313,6 +314,7 @@ } else { itemDetail.scaned = true; itemDetail.handleQty = Number(result.balance.qty) ; + itemDetail.toInventoryStatus =itemDetail.inventoryStatus itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.stdPackQty = result.package.stdPackQty @@ -439,8 +441,6 @@ detail.toPackingNumber = info.packingNumber; detail.toBatch = info.batch; detail.toContainerNumber = ''; - detail.toInventoryStatus = detail.inventoryStatus; - detail.singlePrice = detail.balance.singlePrice; detail.amount = detail.balance.singlePrice * detail.handleQty; @@ -448,9 +448,6 @@ detail.arriveDate = detail.balance.arriveDate; detail.produceDate = detail.balance.produceDate; detail.expireDate = detail.balance.expireDate; - // "arriveDate": 1694591614000, - // "produceDate": 1694591615000, - // "expireDate": 1694591617000, subList.push(detail) } }) diff --git a/pages/unPlanned/request/issueRequest.vue b/pages/unPlanned/request/issueRequest.vue index ff2ffc7a..7d974e7d 100644 --- a/pages/unPlanned/request/issueRequest.vue +++ b/pages/unPlanned/request/issueRequest.vue @@ -33,13 +33,19 @@ import { goHome, - updateTitle + updateTitle, + clearTirmAndWrap } from '@/common/basic.js'; import { getBusinessType, } from '@/common/record.js'; import { getUnPlannedIssueRequestList, + unPlannedIssueRequestApprove, + unPlannedIssueRequestClose, + unPlannedIssueRequestApproveAgree, + unPlannedIssueRequestApproveRefused, + unPlannedIssueRequestHandle } from '@/api/request2.js'; import { getDetailOption, @@ -82,7 +88,7 @@ this.detailOptions = getDetailOption(); this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), - this.detailAndHandleOption = getDetailAndHandleOption() + this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndCloseOption = getDetailAndCloseOption() }, @@ -204,21 +210,39 @@ }, swipeClick(e, dataContent) { - if (e.content.text == "详情") { - console.log("详情", dataContent.id) + var text = clearTirmAndWrap(e.content.text) + if (text == "详情") { this.openRequestInfoPopup(dataContent); - } else if (e.content.text == "处理") { - console.log("处理") - } else if (e.content.text == "审批") { - console.log("审批") - } else if (e.content.text == "审批通过") { - console.log("审批通过") - } else if (e.content.text == "审批驳回") { - console.log("审批驳回") - } else if (e.content.text == "关闭") { - console.log("关闭") + } else if (text == "处理") { + this.showQuestionMessage("确定要处理当前申请吗?",res=>{ + this.unPlannedIssueRequestHandle(dataContent.id) + }) + } else if (text == "提交审批") { + this.showQuestionMessage("确定要审批当前申请吗?",res=>{ + this.unPlannedIssueRequestApprove(dataContent.id) + }) + } else if (text == "审批通过") { + this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{ + this.unPlannedIssueRequestApproveAgree(dataContent.id) + }) + } else if (text == "审批驳回") { + this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{ + this.unPlannedIssueRequestApproveRefused(dataContent.id) + }) + } else if (text == "关闭") { + this.showQuestionMessage("确定要关闭当前申请吗?",res=>{ + this.unPlannedIssueRequestClose(dataContent.id) + }) } }, + showQuestionMessage(hint,callBack){ + this.$refs.comMessage.showQuestionMessage(hint, + res => { + if (res) { + callBack() + } + }); + }, switchChangeWait(state, jobStatus) { this.checkedWaitTask = state; this.status = jobStatus; @@ -267,6 +291,84 @@ } }); }, + + unPlannedIssueRequestApprove(id) { + unPlannedIssueRequestApprove(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请提交审批成功" + }) + } else { + this.showMessage("申请提交审批失败") + } + + }).catch(error => { + this.showMessage(error) + }) + + }, + + unPlannedIssueRequestClose(id) { + unPlannedIssueRequestClose(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请关闭成功" + }) + } else { + this.showMessage("申请关闭失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, + unPlannedIssueRequestApproveAgree(id) { + unPlannedIssueRequestApproveAgree(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请审批通过成功" + }) + } else { + this.showMessage("申请审批通过失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, + unPlannedIssueRequestApproveRefused(id) { + unPlannedIssueRequestApproveRefused(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请审批驳回成功" + }) + } else { + this.showMessage("申请审批驳回失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, + unPlannedIssueRequestHandle(id) { + unPlannedIssueRequestHandle(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请处理成功" + }) + } else { + this.showMessage("申请处理失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, } } diff --git a/pages/unPlanned/request/issueRequestCreate.vue b/pages/unPlanned/request/issueRequestCreate.vue index eb6dedbc..065e3cfb 100644 --- a/pages/unPlanned/request/issueRequestCreate.vue +++ b/pages/unPlanned/request/issueRequestCreate.vue @@ -57,8 +57,7 @@ import comMessage from '@/mycomponents/common/comMessage.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import { - unPlannedIssueRequestSubmit, - unPlannedIssueRecordSubmit + unPlannedIssueRequestCreate, } from '@/api/request2.js'; import { @@ -233,7 +232,7 @@ uni.showLoading({ title:"提交中" }) - unPlannedIssueRequestSubmit(params).then(res => { + unPlannedIssueRequestCreate(params).then(res => { uni.hideLoading() if (res.data) { this.showCommitSuccessMessage("提交成功
生成计划外出库申请
" + res.data) diff --git a/static/config.json b/static/config.json index 4a668deb..4f688e61 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://192.168.0.106:12080/admin-api", + "value": "http://dev.ccwin-in.com:25100/api/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.178:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", From 333e6ed92597825506ea1474fc1e6a9aa7401552 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 12 Dec 2023 19:55:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request2.js | 69 +++- common/basic.js | 9 + common/label.js | 20 +- common/scan.js | 40 +- mycomponents/scan/winComScan.vue | 2 +- mycomponents/scan/winScanPack.vue | 2 +- .../request/returnRequestCreate.vue | 6 +- .../unPlanned/coms/comReceiptRequestPopup.vue | 254 ++++++++++++ pages/unPlanned/job/receiptJobDetail.vue | 3 +- .../unPlanned/request/issueRequestCreate.vue | 10 +- pages/unPlanned/request/receiptRequest.vue | 133 +++++- .../request/receiptRequestCreate.vue | 382 +++++++----------- static/config.json | 2 +- 13 files changed, 643 insertions(+), 289 deletions(-) create mode 100644 pages/unPlanned/coms/comReceiptRequestPopup.vue diff --git a/api/request2.js b/api/request2.js index 0c7bb977..0c4c3b2a 100644 --- a/api/request2.js +++ b/api/request2.js @@ -1270,17 +1270,78 @@ export function unPlannedReceiptJobSubmit(params) { } /** - * 计划外入库申请 提交 + * 计划外入库申请 创建 * @param {*} params */ -export function unPlannedReceiptRequestbSubmit(params) { +export function unPlannedReceiptRequestCreate(params) { return request({ - url: baseApi + "/magic-api/pda/job/purchasereturn/jobSubmit", - method: "put", + url: baseApi + "/wms/unplannedreceipt-request-main/create", + method: "post", data: params, }); } +/** + * 计划外入库申请 提交审批 + * @param {*} params + */ +export function unPlannedReceiptRequestApprove(id) { + return request({ + url: baseApi + "/wms/unplannedreceipt-request-main/submit?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 计划外入库申请 关闭 + * @param {*} params + */ +export function unPlannedReceiptRequestClose(id) { + return request({ + url: baseApi + "/wms/unplannedreceipt-request-main/close?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 计划外入库申请 审批通过 + * @param {*} params + */ +export function unPlannedReceiptRequestApproveAgree(id) { + return request({ + url: baseApi + "/wms/unplannedreceipt-request-main/agree?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 计划外入库申请 审批驳回 + * @param {*} params + */ +export function unPlannedReceiptRequestApproveRefused(id) { + return request({ + url: baseApi + "/wms/unplannedreceipt-request-main/refusedd?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 计划外入库申请 处理 + * @param {*} params + */ +export function unPlannedReceiptRequestHandle(id) { + return request({ + url: baseApi + "/wms/unplannedreceipt-request-main/handle?id="+id, + method: "put", + data: {}, + }); +} + + /** * 计划外入库记录 提交 * @param {*} params diff --git a/common/basic.js b/common/basic.js index 35db63a2..f3507b2a 100644 --- a/common/basic.js +++ b/common/basic.js @@ -775,6 +775,15 @@ export function getCurrDateTimes() { return time; } +export function getBatch() { + var date = new Date(); + var year = date.getFullYear(); //年 + var month = date.getMonth() + 1; //月 + var day = date.getDate(); //日 + var batch =year.toString()+month.toString()+day.toString() + return batch; +} + export function getCurrDate() { var date = new Date(); return getDate(date); diff --git a/common/label.js b/common/label.js index ddecb4dd..b720c6a6 100644 --- a/common/label.js +++ b/common/label.js @@ -34,7 +34,7 @@ export function getLabelInfo(scanMsg, callBack) { code:"" }, package: null, - sucess: false, + success: false, message: '标签格式不正确', } callBack(labelResult); @@ -50,12 +50,12 @@ export function getQRCodeInfo(header, version, scanMsg, callBack) { barType: 'QRCode', }, package: {}, - sucess: true, + success: true, message: '' } getLabelByHeader(header, version).then(res => { if (res.data==null) { - labelResult.sucess = false; + labelResult.success = false; labelResult.message = '未查找到标签头为[' + header + ']的标签类型'; callBack(labelResult); } else { @@ -69,7 +69,7 @@ export function getQRCodeInfo(header, version, scanMsg, callBack) { getLabelItems(newItem, scanMsg, callBack); } }).catch(err => { - labelResult.sucess = false; + labelResult.success = false; labelResult.message = err; callBack(err); }) @@ -86,7 +86,7 @@ export function getLabelItems(labelItem, scanMsg, callBack) { if (packingNumber != undefined) { getPackageByNumber(packingNumber).then(pack => { if (pack.data.list.length == 0) { - labelResult.sucess = false; + labelResult.success = false; labelResult.message = '包装号[' + packingNumber + ']没有包装信息'; } else { labelResult.package = pack.data.list[0]; @@ -94,12 +94,12 @@ export function getLabelItems(labelItem, scanMsg, callBack) { } callBack(labelResult); }).catch(err => { - labelResult.sucess = false; + labelResult.success = false; labelResult.message = err; callBack(labelResult); }) } else { - labelResult.sucess = false; + labelResult.success = false; labelResult.message = '在条码中未解析到箱码'; callBack(labelResult); } @@ -115,7 +115,7 @@ export function analysisQRCodeLabel(labelItem, scanMsg) { barType: 'QRCode', }, package: {}, - sucess: true, + success: true, message: '' } @@ -124,7 +124,7 @@ export function analysisQRCodeLabel(labelItem, scanMsg) { labelResult.message = "未读取到分隔符"; } else { if (scanMsg.indexOf(separators) < 0) { - labelResult.sucess = false; + labelResult.success = false; labelResult.message = "标签格式不正确"; } else { try { @@ -165,7 +165,7 @@ export function getBarCodeInfo(header, version, value, callBack) { code:value }, package: null, - sucess: true, + success: true, message: '', } callBack(labelResult); diff --git a/common/scan.js b/common/scan.js index 93a3e8c5..73fe2759 100644 --- a/common/scan.js +++ b/common/scan.js @@ -13,12 +13,12 @@ //B：supplierBatch 供应商批次 //返回结果 -//sucess true:成功 false:失败 +//success true:成功 false:失败 //scanType barcode:条码 qrcode:二维码 //isPack true:箱码 false:托码 export function analyseScanInfo(scanMsg) { let scanResult = { - sucess: false, + success: false, message: "", data: { isPack: null, @@ -41,7 +41,7 @@ export function analyseScanInfo(scanMsg) { console.log('1.扫描到的内容:', scanMsg); //条码 if (scanMsg.indexOf(';') < 0) { - scanResult.sucess = true; + scanResult.success = true; scanResult.data.code = scanMsg; scanResult.data.scanType = 'barcode'; //条码 } else { @@ -107,15 +107,15 @@ export function analyseScanInfo(scanMsg) { } }) - scanResult.sucess = true; + scanResult.success = true; } else { //扫描的是条码,直接返回接收到的内容 - scanResult.sucess = true; + scanResult.success = true; scanResult.data.code = scanMsg; scanResult.data.scanType = 'barcode'; } } } catch (ex) { - scanResult.sucess = false; + scanResult.success = false; scanResult.message = "解析遇到异常" + ex.message; } } @@ -138,12 +138,12 @@ export function analyseScanInfo(scanMsg) { //E:produceDate日期 //返回结果 -//sucess true:成功 false:失败 +//success true:成功 false:失败 //scanType barcode:条码 qrcode:二维码 //isPack true:箱码 false:托码 export function analyseProductLabelInfo(scanMsg) { let scanResult = { - sucess: false, + success: false, message: "", data: { itemCode: null, @@ -163,7 +163,7 @@ export function analyseProductLabelInfo(scanMsg) { try { //条码 if (scanMsg.indexOf(';') < 0) { - scanResult.sucess = false; + scanResult.success = false; scanResult.message = "标签格式不正确"; } else { let arrayItems = scanMsg.split(';'); @@ -211,13 +211,13 @@ export function analyseProductLabelInfo(scanMsg) { scanResult.data.produceDate = value; break; default: - scanResult.sucess = false; + scanResult.success = false; scanResult.message = "无法识别的前缀" + type; break; } - scanResult.sucess = true; + scanResult.success = true; } else { - scanResult.sucess = false; + scanResult.success = false; scanResult.message = "标签信息不能为空" + type; } } @@ -225,12 +225,12 @@ export function analyseProductLabelInfo(scanMsg) { } else { //扫描的是条码,直接返回接收到的内容 - scanResult.sucess = false; + scanResult.success = false; scanResult.message = "标签分隔符错误"; } } } catch (ex) { - scanResult.sucess = false; + scanResult.success = false; scanResult.message = "解析遇到异常" + ex.message; } } @@ -243,7 +243,7 @@ export function analyseProductLabelInfo(scanMsg) { //1.序号1，2.生产号2546311FL，3.零件号254FL004，4.批序号202207110009 export function analyseTJMesQRCode(scanMsg) { let scanResult = { - sucess: false, + success: false, message: "", items: [] }; @@ -252,7 +252,7 @@ export function analyseTJMesQRCode(scanMsg) { } else { try { if (scanMsg.indexOf(':') < 0) { - scanResult.sucess = false; + scanResult.success = false; scanResult.message = "标签格式不正确"; } else { let arrayItems = scanMsg.split(':'); @@ -290,18 +290,18 @@ export function analyseTJMesQRCode(scanMsg) { } } } else { - scanResult.sucess = false; + scanResult.success = false; scanResult.message = "标签信息不能为空"; } }) - scanResult.sucess = true; + scanResult.success = true; } else { //扫描的是条码,直接返回接收到的内容 - scanResult.sucess = false; + scanResult.success = false; scanResult.message = "标签分隔符错误"; } } } catch (ex) { - scanResult.sucess = false; + scanResult.success = false; scanResult.message = "解析遇到异常" + ex.message; } } diff --git a/mycomponents/scan/winComScan.vue b/mycomponents/scan/winComScan.vue index b8757707..573f2281 100644 --- a/mycomponents/scan/winComScan.vue +++ b/mycomponents/scan/winComScan.vue @@ -152,7 +152,7 @@ } getLabelInfo(content, callback => { let scanResult = callback; - if (scanResult.sucess) { + if (scanResult.success) { that.clear(); // that.getfocus();//不能自动获取焦点 that.$emit("getResult", scanResult); diff --git a/mycomponents/scan/winScanPack.vue b/mycomponents/scan/winScanPack.vue index 82058c80..7b8c9daf 100644 --- a/mycomponents/scan/winScanPack.vue +++ b/mycomponents/scan/winScanPack.vue @@ -74,7 +74,7 @@ }, getScanResult(result) { - if (result.sucess) { + if (result.success) { this.$emit("getResult", result); } else { this.showMessage(result.message) diff --git a/pages/productionReturn/request/returnRequestCreate.vue b/pages/productionReturn/request/returnRequestCreate.vue index b78163de..d522f378 100644 --- a/pages/productionReturn/request/returnRequestCreate.vue +++ b/pages/productionReturn/request/returnRequestCreate.vue @@ -5,8 +5,8 @@ - - + + @@ -44,7 +44,7 @@ import comScanReturnPack from '@/pages/productionReturn/coms/comScanReturnPack.vue' import comMessage from '@/mycomponents/common/comMessage.vue' import comReturnRequestCreator from '@/pages/productionReturn/coms/comReturnRequestCreator.vue' - + import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue' export default { name: '', components: { diff --git a/pages/unPlanned/coms/comReceiptRequestPopup.vue b/pages/unPlanned/coms/comReceiptRequestPopup.vue new file mode 100644 index 00000000..aee41088 --- /dev/null +++ b/pages/unPlanned/coms/comReceiptRequestPopup.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue index acd0fae8..e95ec319 100644 --- a/pages/unPlanned/job/receiptJobDetail.vue +++ b/pages/unPlanned/job/receiptJobDetail.vue @@ -313,7 +313,7 @@ console.log("提交参数", JSON.stringify(params)); // unPlannedReceiptJobSubmit(params).then(res => { // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成计划外入库记录" + res.data) + // this.showCommitSuccessMessage("提交成功
生成计划外入库记录
" + res.data) // } else { // this.showErrorMessage("提交失败[" + res.msg + "]") // } @@ -340,6 +340,7 @@ detail.packingNumber, detail.batch); detail.toPackingNumber = info.packingNumber; detail.toBatch = info.batch; + detail.toContainerNumber = ''; subList.push(detail) } }) diff --git a/pages/unPlanned/request/issueRequestCreate.vue b/pages/unPlanned/request/issueRequestCreate.vue index 065e3cfb..8f28e1d4 100644 --- a/pages/unPlanned/request/issueRequestCreate.vue +++ b/pages/unPlanned/request/issueRequestCreate.vue @@ -226,12 +226,14 @@ this.showErrorMessage("请选择出库原因") return; } + + uni.showLoading({ + title: "提交中....", + mask: true + }); var params = this.setRequestParams(); console.log("提交参数", JSON.stringify(params)); - uni.showLoading({ - title:"提交中" - }) unPlannedIssueRequestCreate(params).then(res => { uni.hideLoading() if (res.data) { @@ -252,7 +254,7 @@ item.subList.forEach(detail => { if (detail.scaned) { detail.fromLocationCode = detail.locationCode; - detail.reasonText = this.reasonCode; + detail.reason = this.reasonCode; detail.containerNumber =""; subList.push(detail) } diff --git a/pages/unPlanned/request/receiptRequest.vue b/pages/unPlanned/request/receiptRequest.vue index 92f062af..600eaddc 100644 --- a/pages/unPlanned/request/receiptRequest.vue +++ b/pages/unPlanned/request/receiptRequest.vue @@ -35,11 +35,17 @@ } from '@/common/record.js'; import { goHome, - updateTitle + updateTitle, + clearTirmAndWrap } from '@/common/basic.js'; import { getUnPlannedReceiptRequestList, + unPlannedReceiptRequestApprove, + unPlannedReceiptRequestClose, + unPlannedReceiptRequestApproveAgree, + unPlannedReceiptRequestApproveRefused, + unPlannedReceiptRequestHandle } from '@/api/request2.js'; import { getDetailOption, @@ -82,7 +88,7 @@ this.detailOptions = getDetailOption(); this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), - this.detailAndHandleOption = getDetailAndHandleOption() + this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndCloseOption = getDetailAndCloseOption() }, @@ -197,27 +203,45 @@ openScanDetailPopup() { uni.navigateTo({ - url: "./receiptRequest?fromType=" + this.fromType + url: "./receiptRequestCreate" }) }, - swipeClick(e, dataContent) { - if (e.content.text == "详情") { - console.log("详情", dataContent.id) + var text = clearTirmAndWrap(e.content.text) + if (text == "详情") { this.openRequestInfoPopup(dataContent); - } else if (e.content.text == "处理") { - console.log("处理") - } else if (e.content.text == "审批") { - console.log("审批") - } else if (e.content.text == "审批通过") { - console.log("审批通过") - } else if (e.content.text == "审批驳回") { - console.log("审批驳回") - } else if (e.content.text == "关闭") { - console.log("关闭") + } else if (text == "处理") { + this.showQuestionMessage("确定要处理当前申请吗?",res=>{ + this.unPlannedReceiptRequestHandle(dataContent.id) + }) + } else if (text == "提交审批") { + this.showQuestionMessage("确定要审批当前申请吗?",res=>{ + this.unPlannedReceiptRequestApprove(dataContent.id) + }) + } else if (text == "审批通过") { + this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{ + this.unPlannedReceiptRequestApproveAgree(dataContent.id) + }) + } else if (text == "审批驳回") { + this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{ + this.unPlannedReceiptRequestApproveRefused(dataContent.id) + }) + } else if (text == "关闭") { + this.showQuestionMessage("确定要关闭当前申请吗?",res=>{ + this.unPlannedReceiptRequestClose(dataContent.id) + }) } }, + showQuestionMessage(hint,callBack){ + this.$refs.comMessage.showQuestionMessage(hint, + res => { + if (res) { + callBack() + } + }); + }, + switchChangeWait(state, jobStatus) { this.checkedWaitTask = state; this.status = jobStatus; @@ -266,6 +290,83 @@ } }); }, + unPlannedReceiptRequestApprove(id) { + unPlannedReceiptRequestApprove(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请提交审批成功" + }) + } else { + this.showMessage("申请提交审批失败") + } + + }).catch(error => { + this.showMessage(error) + }) + + }, + + unPlannedReceiptRequestClose(id) { + unPlannedReceiptRequestClose(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请关闭成功" + }) + } else { + this.showMessage("申请关闭失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, + unPlannedReceiptRequestApproveAgree(id) { + unPlannedReceiptRequestApproveAgree(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请审批通过成功" + }) + } else { + this.showMessage("申请审批通过失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, + unPlannedReceiptRequestApproveRefused(id) { + unPlannedReceiptRequestApproveRefused(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请审批驳回成功" + }) + } else { + this.showMessage("申请审批驳回失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, + unPlannedReceiptRequestHandle(id) { + unPlannedReceiptRequestHandle(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请处理成功" + }) + } else { + this.showMessage("申请处理失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, } } diff --git a/pages/unPlanned/request/receiptRequestCreate.vue b/pages/unPlanned/request/receiptRequestCreate.vue index affe5205..14147d85 100644 --- a/pages/unPlanned/request/receiptRequestCreate.vue +++ b/pages/unPlanned/request/receiptRequestCreate.vue @@ -1,297 +1,223 @@ diff --git a/static/config.json b/static/config.json index 4f688e61..471c6bba 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://dev.ccwin-in.com:25100/api/admin-api", + "value": "http://192.168.0.178:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.178:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", From 4f09432e37e3e2385dea7e43fc60a453050bc9bf Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 13 Dec 2023 09:02:00 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/unPlanned/job/receiptJobDetail.vue | 43 ++++++++++++------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue index e95ec319..43ae3769 100644 --- a/pages/unPlanned/job/receiptJobDetail.vue +++ b/pages/unPlanned/job/receiptJobDetail.vue @@ -104,15 +104,14 @@ this.id = option.id; if (this.id != undefined) { // //新建的任务自动接收 - // if (option.status == "JOB_PENDING") { - // this.receive((callback => { - // this.received = true; - // this.getDetail(); - // })); - // } else { - // this.getDetail(); - // } - this.getDetail(); + if (option.status == "1") { + this.receive((callback => { + this.received = true; + this.getDetail(); + })); + } else { + this.getDetail(); + } } }, //返回首页 @@ -278,7 +277,7 @@ checkLocation() { var isPass = true; if (this.toLocationCode == "" || this.toLocationCode == null) { - this.showMessageHint('请扫描收货库位', callback => { + this.showMessageHint('请扫描目标库位', callback => { this.$refs.comScanLocation.showLocation(); }) @@ -311,17 +310,18 @@ this.managementList = res.list; var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - // unPlannedReceiptJobSubmit(params).then(res => { - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成计划外入库记录
" + res.data) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // uni.hideLoading() - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + unPlannedReceiptJobSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成计划外入库记录
" + res.data) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) } else { uni.hideLoading(); this.showErrorMessage(res.message); @@ -340,6 +340,7 @@ detail.packingNumber, detail.batch); detail.toPackingNumber = info.packingNumber; detail.toBatch = info.batch; + detail.toLocationCode = this.toLocationCode detail.toContainerNumber = ''; subList.push(detail) } From 80f354a7bf63cad0e19867a6cb85d0d61724a1d3 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 13 Dec 2023 11:25:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request2.js | 78 +++- pages.json | 8 + pages/scrap/coms/comScrapJobCard.vue | 12 +- pages/scrap/job/scrapJobDetail.vue | 54 +-- pages/scrap/request/scrapRequestCreate.vue | 389 ++++++++++++++++++ pages/scrap/request/scrapRrequest.vue | 131 +++++- .../unPlanned/request/issueRequestCreate.vue | 14 +- .../request/receiptRequestCreate.vue | 10 +- static/config.json | 2 +- 9 files changed, 624 insertions(+), 74 deletions(-) create mode 100644 pages/scrap/request/scrapRequestCreate.vue diff --git a/api/request2.js b/api/request2.js index 0c4c3b2a..0360896d 100644 --- a/api/request2.js +++ b/api/request2.js @@ -1323,7 +1323,7 @@ export function unPlannedReceiptRequestApproveAgree(id) { */ export function unPlannedReceiptRequestApproveRefused(id) { return request({ - url: baseApi + "/wms/unplannedreceipt-request-main/refusedd?id="+id, + url: baseApi + "/wms/unplannedreceipt-request-main/refused?id="+id, method: "put", data: {}, }); @@ -1426,7 +1426,7 @@ export function unPlannedIssueJobSubmit(params) { * 计划外出库申请 提交 * @param {*} params */ -export function unPlannedIssueRequestSubmit(params) { +export function unPlannedIssueRequestCreate(params) { return request({ url: baseApi + "/wms/unplannedissue-request-main/create", method: "post", @@ -2587,7 +2587,7 @@ export function unPlannedReceiptRequestSubmit(params) { /** - * 报废出库 任务 + * 报废出库任务 * status 任务状态 * 开始日期 * 结束日期 @@ -2620,7 +2620,7 @@ export function getScrapJobDetail(id) { */ export function takeScrapJob(id) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id, + url: baseApi + "/wms/scrap-job-main/accept?id=" + id, method: "put", data: {}, }); @@ -2633,7 +2633,7 @@ export function takeScrapJob(id) { */ export function cancleTakeScrapJob(id) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, + url: baseApi + "/wms/scrap-job-main/abandon?id=" + id, method: "put", data: {}, }); @@ -2646,7 +2646,7 @@ export function cancleTakeScrapJob(id) { */ export function scrapJobSubmit(params) { return request({ - url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id, + url: baseApi + "/wms/scrap-job-main/execute", method: "put", data: params, }); @@ -2682,17 +2682,77 @@ export function getScrapRequestDetail(id) { } /** - * 报废出库申请 提交 + * 报废出库申请 创建 * @param {*} params */ -export function scrapRequestSubmit(params) { +export function scrapRequestCreate(params) { return request({ - url: baseApi + "/wms/purchasereturn-request-main/submit", + url: baseApi + "/wms/scrap-job-main/create", method: "put", data: params, }); } +/** + * 报废出库申请 提交审批 + * @param {*} params + */ +export function scrapRequestApprove(id) { + return request({ + url: baseApi + "/wms/scrap-request-main/submit?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 报废出库申请 关闭 + * @param {*} params + */ +export function scrapRequestClose(id) { + return request({ + url: baseApi + "/wms/scrap-request-main/close?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 报废出库申请 审批通过 + * @param {*} params + */ +export function scrapRequestApproveAgree(id) { + return request({ + url: baseApi + "/wms/scrap-request-main/agree?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 报废出库申请 审批驳回 + * @param {*} params + */ +export function scrapRequestApproveRefused(id) { + return request({ + url: baseApi + "/wms/scrap-request-main/refused?id="+id, + method: "put", + data: {}, + }); +} + +/** + * 报废出库申请 审批驳回 + * @param {*} params + */ +export function scrapRequestHandle(id) { + return request({ + url: baseApi + "/wms/scrap-request-main/handle?id="+id, + method: "put", + data: {}, + }); +} + /** * 报废出库记录 提交 * @param {*} params diff --git a/pages.json b/pages.json index 2b344fee..3e2f6fd0 100644 --- a/pages.json +++ b/pages.json @@ -1640,6 +1640,14 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/scrap/request/scrapRequestCreate", + "style": { + "navigationBarTitleText": "报废出库申请创建", + "enablePullDownRefresh": false + } + }, + { "path": "pages/pallet/record/bindPalletRecord", "style": { diff --git a/pages/scrap/coms/comScrapJobCard.vue b/pages/scrap/coms/comScrapJobCard.vue index 65affce4..037ee32c 100644 --- a/pages/scrap/coms/comScrapJobCard.vue +++ b/pages/scrap/coms/comScrapJobCard.vue @@ -3,17 +3,7 @@ - 发货单号 : {{dataContent.asnNumber}} - - - - - 要货计划单号 : {{dataContent.ppNumber}} - - - - - 供应商名称 : {{dataContent.supplierName}} + 申请单号 : {{dataContent.requestNumber}} diff --git a/pages/scrap/job/scrapJobDetail.vue b/pages/scrap/job/scrapJobDetail.vue index 9a3cd6bf..6eb893ec 100644 --- a/pages/scrap/job/scrapJobDetail.vue +++ b/pages/scrap/job/scrapJobDetail.vue @@ -99,15 +99,14 @@ this.id = option.id; if (this.id != undefined) { //新建的任务自动接收 - // if (option.status == "JOB_PENDING") { - // this.receive((callback => { - // this.received = true; - // this.getDetail(); - // })); - // } else { - // this.getDetail(); - // } - this.getDetail(); + if (option.status == "1") { + this.receive((callback => { + this.received = true; + this.getDetail(); + })); + } else { + this.getDetail(); + } } }, //返回首页 @@ -213,11 +212,11 @@ let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + - ']不一致,是否继续上架?', res => { + ']不一致,是否继续出库?', res => { if (res) { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.label.qty) > Number(result.balance - .qty) ? Number(result.balance.qty) : Number(result.label.qty); + itemDetail.handleQty = Number(result.label.qty); + itemDetail.inventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.stdPackQty = result.package.stdPackQty @@ -229,8 +228,7 @@ }); } else { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number( - result.balance.qty) : Number(result.label.qty); + itemDetail.handleQty = Number(result.label.qty); itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.stdPackQty = result.package.stdPackQty @@ -246,7 +244,6 @@ }, - //继续扫描 continueScan() { this.scanCount = getScanCount(this.subList); @@ -305,17 +302,17 @@ //没有目标库位，不查询管理模式 var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - // scrapJobSubmit(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成计划外出库记录" + res.data ) - // } else { - // this.showErrorMessage("提交失败"+res.msg) - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + scrapJobSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成报废出库记录
" + res.data ) + } else { + this.showErrorMessage("提交失败["+res.msg+"]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) }, @@ -325,6 +322,11 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { + detail.toPackingNumber = detail.packingNumber; + detail.toContainerNumber = ""; + detail.toInventoryStatus= ""; + detail.toLocationCode = ""; + detail.toBatch = detail.batch; subList.push(detail) } }) diff --git a/pages/scrap/request/scrapRequestCreate.vue b/pages/scrap/request/scrapRequestCreate.vue new file mode 100644 index 00000000..982d9431 --- /dev/null +++ b/pages/scrap/request/scrapRequestCreate.vue @@ -0,0 +1,389 @@ + + + + + diff --git a/pages/scrap/request/scrapRrequest.vue b/pages/scrap/request/scrapRrequest.vue index c5a84789..74b31979 100644 --- a/pages/scrap/request/scrapRrequest.vue +++ b/pages/scrap/request/scrapRrequest.vue @@ -34,11 +34,13 @@ updateTitle } from '@/common/basic.js'; - import { - getBusinessType, - } from '@/common/record.js'; import { getScrapRequestList, + scrapRequestApprove, + scrapRequestClose, + scrapRequestApproveAgree, + scrapRequestApproveRefused, + scrapRequestHandle } from '@/api/request2.js'; import { getDetailOption, @@ -112,7 +114,6 @@ }, methods: { - requestConfirm(action, item) {}, openRequestInfoPopup(item) { this.$refs.requestInfoPopup.openPopup(item) @@ -195,27 +196,45 @@ openScanDetailPopup() { uni.navigateTo({ - url: "../record/scrapRecord?fromType=" + this.fromType + url: "./scrapRequestCreate" }) }, swipeClick(e, dataContent) { - if (e.content.text == "详情") { - console.log("详情", dataContent.id) + var text = clearTirmAndWrap(e.content.text) + if (text == "详情") { this.openRequestInfoPopup(dataContent); - } else if (e.content.text == "处理") { - console.log("处理") - } else if (e.content.text == "审批") { - console.log("审批") - } else if (e.content.text == "审批通过") { - console.log("审批通过") - } else if (e.content.text == "审批驳回") { - console.log("审批驳回") - } else if (e.content.text == "关闭") { - console.log("关闭") + } else if (text == "处理") { + this.showQuestionMessage("确定要处理当前申请吗?",res=>{ + this.scrapRequestHandle(dataContent.id) + }) + } else if (text == "提交审批") { + this.showQuestionMessage("确定要审批当前申请吗?",res=>{ + this.scrapRequestApprove(dataContent.id) + }) + } else if (text == "审批通过") { + this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{ + this.scrapRequestApproveAgree(dataContent.id) + }) + } else if (text == "审批驳回") { + this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{ + this.scrapRequestApproveRefused(dataContent.id) + }) + } else if (text == "关闭") { + this.showQuestionMessage("确定要关闭当前申请吗?",res=>{ + this.scrapRequestClose(dataContent.id) + }) } }, + showQuestionMessage(hint,callBack){ + this.$refs.comMessage.showQuestionMessage(hint, + res => { + if (res) { + callBack() + } + }); + }, switchChangeWait(state, jobStatus) { this.checkedWaitTask = state; @@ -265,7 +284,83 @@ } }); }, - + scrapRequestApprove(id) { + scrapRequestApprove(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请提交审批成功" + }) + } else { + this.showMessage("申请提交审批失败") + } + + }).catch(error => { + this.showMessage(error) + }) + + }, + + scrapRequestClose(id) { + scrapRequestClose(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请关闭成功" + }) + } else { + this.showMessage("申请关闭失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, + scrapRequestApproveAgree(id) { + scrapRequestApproveAgree(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请审批通过成功" + }) + } else { + this.showMessage("申请审批通过失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, + scrapRequestApproveRefused(id) { + scrapRequestApproveRefused(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请审批驳回成功" + }) + } else { + this.showMessage("申请审批驳回失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, + scrapRequestHandle(id) { + scrapRequestHandle(id).then(res => { + if (res.data) { + this.getList("refresh") + uni.showToast({ + title: "申请处理成功" + }) + } else { + this.showMessage("申请处理失败") + } + + }).catch(error => { + this.showMessage(error) + }) + }, } } diff --git a/pages/unPlanned/request/issueRequestCreate.vue b/pages/unPlanned/request/issueRequestCreate.vue index 8f28e1d4..4e96ea9f 100644 --- a/pages/unPlanned/request/issueRequestCreate.vue +++ b/pages/unPlanned/request/issueRequestCreate.vue @@ -116,6 +116,11 @@ }, mounted() { + + }, + + onLoad(option) { + this.reasonList = getUnPlannedIssuseReasonList() var typeCode = "UnplannedDeliver" getBusinessType(typeCode, res => { if (res.success) { @@ -126,10 +131,7 @@ this.$refs.comMessage.showBreakMessage(res.message); } }); - }, - - onLoad(option) { - this.reasonList = getUnPlannedIssuseReasonList() + }, methods: { @@ -226,6 +228,10 @@ this.showErrorMessage("请选择出库原因") return; } + if(this.detailSource.length==0){ + this.showErrorMessage("请先扫描数据") + return; + } uni.showLoading({ title: "提交中....", diff --git a/pages/unPlanned/request/receiptRequestCreate.vue b/pages/unPlanned/request/receiptRequestCreate.vue index 14147d85..88f5a974 100644 --- a/pages/unPlanned/request/receiptRequestCreate.vue +++ b/pages/unPlanned/request/receiptRequestCreate.vue @@ -189,12 +189,12 @@ console.log("",getBatch()) subList.push(detail) }) - - this.detailSource.status = 1; - this.detailSource.requestTime = getCurrDateTimes(); - this.detailSource.dueTime = getCurrDateOneMonthsTimes(); + this.dataContent.subList = subList + this.dataContent.status = 1; + this.dataContent.requestTime = getCurrDateTimes(); + this.dataContent.dueTime = getCurrDateOneMonthsTimes(); - return this.detailSource; + return this.dataContent; }, showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => { diff --git a/static/config.json b/static/config.json index 471c6bba..4a668deb 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://192.168.0.178:12080/admin-api", + "value": "http://192.168.0.106:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.178:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", From f0cb753b3ff79f11ad81df460ba535bbfe67954a Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 13 Dec 2023 13:56:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request2.js | 4 +- mycomponents/scan/winScanPackAndLocation.vue | 1 + pages/package/record/mergePackageRecord.vue | 7 +- pages/package/record/overPackageRecord.vue | 7 +- pages/package/record/splitPackageRecord.vue | 5 +- pages/pallet/record/unBindPalletRecord.vue | 7 +- .../coms/requestInfoPopup.vue | 3 +- .../job/productDismantleDetail.vue | 6 +- .../job/productPutawayDetail.vue | 7 +- pages/putaway/job/putawayDetail.vue | 1 - pages/scrap/record/scrapRecord.vue | 836 +++++++++--------- pages/scrap/request/scrapRequestCreate.vue | 78 +- pages/unPlanned/record/issueRecord.vue | 1 - pages/unPlanned/record/receiptRecord.vue | 1 - static/config.json | 1 + 15 files changed, 481 insertions(+), 484 deletions(-) diff --git a/api/request2.js b/api/request2.js index 0360896d..ca0798db 100644 --- a/api/request2.js +++ b/api/request2.js @@ -2687,8 +2687,8 @@ export function getScrapRequestDetail(id) { */ export function scrapRequestCreate(params) { return request({ - url: baseApi + "/wms/scrap-job-main/create", - method: "put", + url: baseApi + "/wms/scrap-request-main/create", + method: "post", data: params, }); } diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue index e3ec3242..62b61d78 100644 --- a/mycomponents/scan/winScanPackAndLocation.vue +++ b/mycomponents/scan/winScanPackAndLocation.vue @@ -139,6 +139,7 @@ this.$refs.popup.open('bottom'); this.fromInventoryStatuses = jobContent.outInventoryStatuses this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 + debugger this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态 }, diff --git a/pages/package/record/mergePackageRecord.vue b/pages/package/record/mergePackageRecord.vue index 2d57c1dd..b7f4e1ce 100644 --- a/pages/package/record/mergePackageRecord.vue +++ b/pages/package/record/mergePackageRecord.vue @@ -44,10 +44,13 @@ - - + + + + + diff --git a/pages/scrap/request/scrapRequestCreate.vue b/pages/scrap/request/scrapRequestCreate.vue index 982d9431..b4c921f4 100644 --- a/pages/scrap/request/scrapRequestCreate.vue +++ b/pages/scrap/request/scrapRequestCreate.vue @@ -5,8 +5,8 @@ - 报废原因： - + 报废原因： + @@ -51,18 +51,20 @@ import { scrapRequestCreate, } from '@/api/request2.js'; - + import { goHome, - updateTitle + updateTitle, + getCurrDateOneMonthsTimes, + navigateBack } from '@/common/basic.js'; - + import { getInventoryStatusDesc, getDirectoryItemArray, getScarpReasonList } from '@/common/directory.js'; - + import { getBusinessType, createItemInfo, @@ -78,7 +80,7 @@ import comMessage from '@/mycomponents/common/comMessage.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' - + export default { components: { winScanButton, @@ -113,9 +115,9 @@ reasonList: [], reasonText: "", }; - + }, - + onLoad(option) { this.reasonList = getScarpReasonList(); var typeCode = "Scrap" @@ -126,7 +128,7 @@ this.tolocationTypeList = res.tolocationTypeList; this.showFromLocationPopup(); } else { - this.$refs.comMessage.showBreakMessage(res.message ); + this.$refs.comMessage.showBreakMessage(res.message); } }); @@ -143,7 +145,7 @@ onPullDownRefresh() {}, mounted() { - + }, methods: { getScanResult(result) { @@ -235,11 +237,11 @@ commit() { - if(this.reasonText==""){ + if (this.reasonText == "") { this.showMessage("请先选择报废原因") return; } - if(this.detailSource.length==0){ + if (this.detailSource.length == 0) { this.showErrorMessage("请先扫描数据") return; } @@ -248,46 +250,41 @@ title: "提交中....", mask: true }); - - var params = this.setRequestParams(); - console.log("提交" + JSON.stringify(params)) - // scrapRequestCreate(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data, ) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) - + var params = this.setRequestParams(); + console.log("提交" + JSON.stringify(params)) + scrapRequestCreate(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成报废出库申请
" + res.data, ) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) }, - - setRequestParams(){ + + setRequestParams() { var subList = [] this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { + detail.fromLocationCode = detail.locationCode subList.push(detail) } }) }) - + this.dataContent.subList = subList - this.dataContent.businessType = "PurchasePutaway" - this.dataContent.departmentCode= "研发部门"; - this.dataContent.status= 1 ; - this.dataContent.autoCommit = "FALSE"; - this.dataContent.autoAgree = "FALSE"; - this.dataContent.autoExecute = "FALSE"; - this.dataContent.directCreateRecord = "FALSE"; + this.dataContent.status = 1; + this.dataContent.fromWarehouseCode = "W1"; + this.dataContent.dueTime = getCurrDateOneMonthsTimes(); return this.dataContent; }, - + showMessage(message) { this.$refs.comMessage.showMessage(message, res => { @@ -324,8 +321,7 @@ showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => { - this.fromLocationCode = ''; - + navigateBack(1) }) }, diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue index 5688e903..a81d7470 100644 --- a/pages/unPlanned/record/issueRecord.vue +++ b/pages/unPlanned/record/issueRecord.vue @@ -51,7 +51,6 @@ import comMessage from '@/mycomponents/common/comMessage.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import { - unPlannedIssueRequestSubmit, unPlannedIssueRecordSubmit } from '@/api/request2.js'; diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue index 6ca5d38f..a05e811f 100644 --- a/pages/unPlanned/record/receiptRecord.vue +++ b/pages/unPlanned/record/receiptRecord.vue @@ -52,7 +52,6 @@ import comMessage from '@/mycomponents/common/comMessage.vue' import { - unPlannedReceiptRequestbSubmit, unPlannedReceiptRecordbSubmit } from '@/api/request2.js'; diff --git a/static/config.json b/static/config.json index 4a668deb..124e1c16 100644 --- a/static/config.json +++ b/static/config.json @@ -26,6 +26,7 @@ "local": "http://localhost:12080", "desc": "api请求地址" }, + "tenantId": { "name": "tenantId", "value": "1",