diff --git a/mycomponents/detail/comRequestDetailCard.vue b/mycomponents/detail/comRequestDetailCard.vue index 8cb916fa..2e1dc2c3 100644 --- a/mycomponents/detail/comRequestDetailCard.vue +++ b/mycomponents/detail/comRequestDetailCard.vue @@ -1,28 +1,19 @@ @@ -32,6 +23,10 @@ import recommend from '@/mycomponents/recommend/recommend.vue' import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue' import comMessage from '@/mycomponents/common/comMessage.vue' + import itemQty from '@/mycomponents/item/itemQty.vue' + import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue' + import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue' + import { getDetailOption, getDetailEditRemoveOption, @@ -45,6 +40,9 @@ recommend, balanceQtyEdit, comMessage, + itemQty, + comIssueRequestInfo, + requestDetailInfoPopup }, props: { dataContent: { @@ -69,7 +67,9 @@ }, }, watch: { - + dataContent(newVal) { + this.requestItem = newVal.subList[0]; + }, }, data() { @@ -81,6 +81,7 @@ } }, + requestItem: {}, detailOptions: [], scanOptions: [] } @@ -116,9 +117,10 @@ }, detail(item) { - this.$emit('openDetail', item); - // this.showItem = item; - // this.$refs.jobDetailPopup.openPopup(item) + this.$refs.jobDetailPopup.openPopup(item) + // this.$emit('openDetail', item); + // // this.showItem = item; + // // this.$refs.jobDetailPopup.openPopup(item) }, remove(item) { this.$refs.message.showQuestionMessage("确定移除扫描信息?", diff --git a/mycomponents/qty/balanceQty.vue b/mycomponents/qty/balanceQty.vue index d1358a3d..fa5ee3c5 100644 --- a/mycomponents/qty/balanceQty.vue +++ b/mycomponents/qty/balanceQty.vue @@ -6,7 +6,7 @@ {{Number(dataContent.qty)}} - + diff --git a/pages/issue/coms/comIssueRequestCard.vue b/pages/issue/coms/comIssueRequestCard.vue index 8f7f4b5a..4bd68253 100644 --- a/pages/issue/coms/comIssueRequestCard.vue +++ b/pages/issue/coms/comIssueRequestCard.vue @@ -2,10 +2,7 @@ - 部门 : {{dataContent.departmentCode}} - - - 车间代码 : {{dataContent.WorkshopCode}} + 车间代码 {{dataContent.workshopCode}} diff --git a/pages/issue/coms/comIssueRequestInfo.vue b/pages/issue/coms/comIssueRequestInfo.vue new file mode 100644 index 00000000..fbb64a31 --- /dev/null +++ b/pages/issue/coms/comIssueRequestInfo.vue @@ -0,0 +1,57 @@ + + + + + + + + diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue index 77b289cc..2564ad7e 100644 --- a/pages/issue/coms/comScanIssuePack.vue +++ b/pages/issue/coms/comScanIssuePack.vue @@ -7,7 +7,7 @@ 扫描箱码 关闭 - {{positionInfo}} - + - - + --> + - - - - 车间 - {{jobContent.workShopCode}} - - - 生产线 - {{toLocation.productionLineCode}} - - - 工位 - {{ toLocation.workStationCode }} - - - 原材料库 - {{ toLocation.toLocationCode}} - - - - + + @@ -80,6 +61,7 @@ import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue' import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue' import comMessage from '@/mycomponents/common/comMessage.vue' + import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue' export default { name: 'issueDetail', @@ -87,6 +69,7 @@ jobDetailPopup, winScanButton, comIssueDetailCard, + comIssueRequestInfo, comScanIssuePack, comMessage }, @@ -235,8 +218,10 @@ //目前任务只到一个库位 var itemCodes = [] let locationCode = this.detailSource[0].toLocationCode - this.detailSource.forEach(item => { - itemCodes.push(item.itemCode) + this.detailSource.forEach(toLocation => { + toLocation.Items.forEach(item => { + itemCodes.push(item.itemCode) + }) }) //使用在途库，不查询管理模式 diff --git a/pages/issue/request/issueRequestDetail.vue b/pages/issue/request/issueRequestDetail.vue index dce7a970..eaf62e57 100644 --- a/pages/issue/request/issueRequestDetail.vue +++ b/pages/issue/request/issueRequestDetail.vue @@ -1,19 +1,15 @@ @@ -34,13 +30,12 @@ import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue" - import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue' - import comMessage from '@/mycomponents/common/comMessage.vue' + import comMessage from '@/mycomponents/common/comMessage.vue' + export default { components: { comRequestDetailCard, - requestDetailInfoPopup, comMessage, }, data() { @@ -48,7 +43,6 @@ id: '', requestContent: {}, //任务内容 subList: [], //接口返回的任务 - detailSource: [], //绑定在页面上的数据源 }; }, onLoad(option) { @@ -83,36 +77,31 @@ if (res.data == null) { that.showMessage('未获取到详情'); } else { - if (res.data.subList.length > 0) { - that.requestContent = res.data; - that.subList = res.data.subList; - that.subList.forEach(res=>{ - res.fromLocationCode = res.toLocationCode - }) - that.detailSource = getDataSource(that.subList); - updateTitle(this.requestContent.number); - } else { - that.showMessage('列表数据为0'); - } + if (res.data.subList.length > 0) { + that.requestContent = res.data; + that.requestContent.subList=res.data.subList; + that.subList = res.data.subList; + // that.subList.forEach(res => { + // res.fromLocationCode = res.toLocationCode + // }) + // that.detailSource = getDataSource(that.subList); + updateTitle(this.requestContent.number); + } else { + that.showMessage('列表数据为0'); + } } }).catch(error => { uni.hideLoading() this.showMessage(error) }) }, - + showMessage(message) { this.$refs.comMessage.showMessage(message, res => { - if (res) { - } + if (res) {} }); }, - openDetail(item) { - this.$refs.jobDetailPopup.openPopup(item) - }, - - } } diff --git a/static/config.json b/static/config.json index 2f6ce912..bb9307bf 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://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", "dev":"http://dev.ccwin-in.com:25100/api/admin-api",