diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue index 555fc1f..194aa1c 100644 --- a/pages-order/orderDetail/orderDetail.vue +++ b/pages-order/orderDetail/orderDetail.vue @@ -16,7 +16,7 @@ - + 当前项目有待审批的配件申请单! @@ -291,6 +291,8 @@ export default { iconColor: '#fff' }, content: [], + //维修配件申请单 + wares:[], sizeType:['compressed'], fileList: [], imgUrlPrex:config.baseImageUrl, @@ -362,7 +364,10 @@ export default { if (data.isDetail){ this.isDetail = data.isDetail } + //获取订单详情 this.getOrderDetail() + //获取当前订单是否有审批的配件 + this.waresByTicket() }, methods: { afterRead(file) { @@ -515,6 +520,21 @@ export default { }) }, + /** + * 查询当前工单下的审批单 + */ + waresByTicket(){ + request({ + url: '/admin-api/repair/tw/list', + method: 'get', + params:{ticketId:this.ticketId,status:'01'} + }).then((res)=>{ + if (res.code == 200){ + this.wares = res.data + } + }) + }, + editPeople(type, proj) { bus.$off('choosePeople') bus.$on('choosePeople', (data) => { @@ -531,9 +551,13 @@ export default { url: `/pages-order/choosePeople/choosePeople?type=${type}` }) }, - showReviewList(projId) { + /** + * 点击配件申请单提醒,查看相关配件 + * @param wareId + */ + showReviewList(formData) { uni.navigateTo({ - url: `/pages-order/reviewList/reviewList?projId=${projId}` + url: '/pages-order/reviewList/reviewList?formData='+encodeURIComponent(JSON.stringify(formData)) }) } } diff --git a/pages-order/reviewList/reviewList.vue b/pages-order/reviewList/reviewList.vue index a4de0d0..2e26f13 100644 --- a/pages-order/reviewList/reviewList.vue +++ b/pages-order/reviewList/reviewList.vue @@ -1,21 +1,21 @@