diff --git a/src/pages/order/complete.vue b/src/pages/order/complete.vue index 72efad3b2a4e41cee5eb3e64d7c5789d843b6b70..431238ad18242f5dbf04f292b3c09cbaa4618cd9 100644 --- a/src/pages/order/complete.vue +++ b/src/pages/order/complete.vue @@ -428,7 +428,7 @@ return param }, saveComplete(){// ä¿å˜å®Œå·¥ä¿¡æ¯ - this.submitParts() + // this.submitParts() // ä¸è°ƒè¿™ä¸ªæŽ¥å£ï¼›æ²¡å®Œå·¥ä¸èƒ½è°ƒæäº¤é…ä»¶ const param = this.handleSaveData() this.$u.api.saveCompleteData(param,this.orderId).then((res)=>{ if (res.code == 200) { @@ -573,7 +573,7 @@ const params = { workOrderId: this.orderId, applyType: '10', - parts: lists + parts: lists ? JSON.stringify(lists) : '' } this.$u.api.createParts(params).then(res => { if (res.code !== 200) { @@ -587,7 +587,6 @@ }, // æäº¤è®¢å• orderFinish(){ - this.submitParts() const param = this.handleSaveData() // 完工事件埋点 getApp().track('order_finish', {id: this.vuex_user.id, mobile: this.vuex_user.mobile, orderId: Number(this.orderId)}) @@ -596,6 +595,7 @@ if(this.inGuaranteePeriod === 'Y'){ this.$u.api.inOrderFinish(this.orderId).then((res)=>{ if (res.code == 200) { + this.submitParts() this.$refs.uToast.show({ title: 'æäº¤æˆåŠŸ', type: 'success', diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue index af902a3ca3474b2d61d85537e38cd422ba045345..10b0596aa20159d7d67e9537d6f5e90798315f13 100644 --- a/src/pages/order/detail.vue +++ b/src/pages/order/detail.vue @@ -80,7 +80,7 @@ </view> </u-popup> <!-- 已申请é…件列表 --> - <ApplyList :show.sync="showApplyList" :list="partsList" @action="handleClickCell" @operate="handleOperate" @apply="handleApply"></ApplyList> + <!-- <ApplyList :show.sync="showApplyList" :list="partsList" @action="handleClickCell" @operate="handleOperate" @apply="handleApply"></ApplyList> --> </template> </view> </template> @@ -94,7 +94,7 @@ import Record from "@/components/order/performanceRecord.vue" import Detail from "@/components/order/detail.vue" import BottomButtons from "@/components/order/bottomButtons.vue" - import ApplyList from "@/components/parts/applyList.vue" + // import ApplyList from "@/components/parts/applyList.vue" let now = new Date(new Date().toLocaleDateString()).getTime(); export default { components: { @@ -105,7 +105,7 @@ Record, Detail, BottomButtons, - ApplyList + // ApplyList }, mixins: [baseFile], data() { @@ -166,7 +166,7 @@ timeout: false, timestamp: 0, showCountTime : false, // 从上个页é¢ä¼ å…¥æ˜¯å¦æ˜¾ç¤ºå€’计时 - showApplyList: false, // 显示已申请é…件列表 + // showApplyList: false, // 显示已申请é…件列表 partsList: [], // 已申请的é…件列表 partsCount: 0 } @@ -182,7 +182,7 @@ } }, buttons() { - //id: 0 主æµç¨‹ï¼› 1 过程å馈;2 异常ç¾åˆ°ï¼› 3 现场æ‹ç…§ï¼› 4 é…件申请 + //id: 0 主æµç¨‹ï¼› 1 过程å馈;2 异常ç¾åˆ°ï¼› 3 现场æ‹ç…§ï¼› 4 备件申请 // label: 按钮文å—, // type: 'image' 上图片下文å—ï¼›'text' 纯文å—, // image: 图片å, @@ -214,7 +214,7 @@ id: 3 }, { - label: 'é…件申请', + label: '备件申请', type: 'image', image: 'peijian.png', show: this.allowFeedback, @@ -340,7 +340,7 @@ } else { this.loadOrderRecord() // 履约记录 this.getSignDistance() // å®šä½ - this.getOrderPartsSum() + // this.getOrderPartsSum() // 备件啿•°é‡ } }, onShow() { @@ -458,17 +458,17 @@ } }); }, - getOrderPartsSum() { // 获å–订å•é…ä»¶æ•°é‡ - this.$u.api.getOrderPartsSum(this.orderId).then((res) => { - if (res.code == 200) { - if (res.data) { - this.partsCount = res.data.totalPartCount - } - } else { - console.log(res.message) - } - }); - }, + // getOrderPartsSum() { // 获å–订å•é…ä»¶æ•°é‡ + // this.$u.api.getOrderPartsSum(this.orderId).then((res) => { + // if (res.code == 200) { + // if (res.data) { + // this.partsCount = res.data.totalPartCount + // } + // } else { + // console.log(res.message) + // } + // }); + // }, getSignDistance(){ let self = this var data={} @@ -652,12 +652,12 @@ }, handleApplyParts() { // 点击了é…件申请按钮 - if (this.buttons[3].count > 0) { // å·²ç»æœ‰é…ä»¶,弹出é…件列表 - this.showApplyList = true - this.getApplyList() - } else { // 没有é…ä»¶,跳到é…件申请 + // if (this.buttons[3].count > 0) { // å·²ç»æœ‰é…ä»¶,弹出é…件列表 + // this.showApplyList = true + // this.getApplyList() + // } else { // 没有é…ä»¶,跳到é…件申请 this.toApplyParts() - } + // } }, async getApplyList() { let res = await this.$u.api.applyList({ diff --git a/src/pages/parts/application.vue b/src/pages/parts/application.vue index 30be059e78381708cfe1e55eb514090b945b4a8b..7744d2a69a9cbc01baaa7ad425bd169b6c0b549c 100644 --- a/src/pages/parts/application.vue +++ b/src/pages/parts/application.vue @@ -17,7 +17,7 @@ <view slot="error" style="font-size: 24rpx;">åŠ è½½å¤±è´¥</view> </u-image> </view> - <view class="message">当å‰è¿˜æœªé€‰æ‹©é…ä»¶ï¼Œè¯·ç‚¹å‡»æ·»åŠ </view> + <view class="message">当å‰è¿˜æœªé€‰æ‹©é…ä»¶ï¼Œè¯·ç‚¹å‡»æ·»åŠ ï¼Œæ·»åŠ åŽåœ¨'我的->备件订å•'查看</view> <button class="add-button" plain="true" @click="$u.throttle(addParts, 500)">åŽ»æ·»åŠ </button> </view> <view v-else class="list"> @@ -257,7 +257,8 @@ export default { font-size: 26rpx; font-weight: 400; color: #999999; - line-height: 26rpx; + line-height: 36rpx; + text-align: center; } .add-button { margin: 42rpx 0 20rpx 0;