|
|
@@ -13,8 +13,8 @@
|
|
|
<div class="axis-slot-wrap">
|
|
|
<div class="axis-title">送达</div>
|
|
|
<div class="axis-det express-wrap">
|
|
|
- <button class="admin-button-com big blue" @click="confirmFn">确认送达</button>
|
|
|
- <div class="button-prompt">送达会自动通知客户哦</div>
|
|
|
+ <button class="admin-button-com big blue" @click="askConfirmReachFn">确认送达</button>
|
|
|
+ <div class="button-prompt">送达会通知客户哦</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -78,6 +78,7 @@
|
|
|
</template>
|
|
|
</timeaxis-item>
|
|
|
</time-axis>
|
|
|
+ <modal-module :show="showManualConfirmModal" @cancel="cancelConfirmReachFn" @click="manualConfirmReachFn" content="此订单由快递配送，送到会自动确认，确定要手动确认？" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -85,6 +86,7 @@
|
|
|
import TimeAxis from '@/admin/home/components/plugin/time-axis'
|
|
|
import TimeaxisItem from '@/admin/home/components/plugin/timeaxis-item'
|
|
|
import CardName from './card-name'
|
|
|
+import ModalModule from '@/components/plugin/modal'
|
|
|
// api
|
|
|
import { orderReach } from '@/api/order'
|
|
|
export default {
|
|
|
@@ -92,7 +94,8 @@ export default {
|
|
|
components: {
|
|
|
TimeAxis,
|
|
|
TimeaxisItem,
|
|
|
- CardName
|
|
|
+ CardName,
|
|
|
+ ModalModule
|
|
|
},
|
|
|
props: {
|
|
|
query: {
|
|
|
@@ -108,8 +111,13 @@ export default {
|
|
|
default: () => []
|
|
|
}
|
|
|
},
|
|
|
+ data() {
|
|
|
+ return {
|
|
|
+ showManualConfirmModal:false
|
|
|
+ }
|
|
|
+ },
|
|
|
methods: {
|
|
|
- confirmFn() {
|
|
|
+ confirmReachFn() {
|
|
|
orderReach({
|
|
|
id: this.orderData.id,
|
|
|
option: 1
|
|
|
@@ -125,6 +133,22 @@ export default {
|
|
|
})
|
|
|
}, 1000)
|
|
|
})
|
|
|
+ },
|
|
|
+ askConfirmReachFn(){
|
|
|
+ if(this.orderData.sendType == 3){
|
|
|
+ this.showManualConfirmModal = true
|
|
|
+ }else{
|
|
|
+ this.confirmReachFn()
|
|
|
+ }
|
|
|
+ },
|
|
|
+ manualConfirmReachFn(){
|
|
|
+ console.log('aaaa')
|
|
|
+ return false
|
|
|
+ this.confirmReachFn()
|
|
|
+ },
|
|
|
+ cancelConfirmReachFn(){
|
|
|
+ console.log('bbb')
|
|
|
+ return false
|
|
|
}
|
|
|
}
|
|
|
}
|
shish