|
@@ -25,6 +25,7 @@
|
|
|
<view class="flex" style="color: #3385ff;font-weight: 400">
|
|
<view class="flex" style="color: #3385ff;font-weight: 400">
|
|
|
<view @click.stop="openAgain()" style="margin-left:0upx;">继续开单</view>
|
|
<view @click.stop="openAgain()" style="margin-left:0upx;">继续开单</view>
|
|
|
<view @click.stop="allotFn()" style="margin-left:50upx;">分配工作</view>
|
|
<view @click.stop="allotFn()" style="margin-left:50upx;">分配工作</view>
|
|
|
|
|
+ <view @click.stop="printWlFlag()" style="margin-left:50upx;">打印物流标</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
<view class="bills-info_box content-box">
|
|
<view class="bills-info_box content-box">
|
|
@@ -462,7 +463,7 @@
|
|
|
import { mapGetters } from "vuex";
|
|
import { mapGetters } from "vuex";
|
|
|
import stepStatus from "./components/stepStatus";
|
|
import stepStatus from "./components/stepStatus";
|
|
|
import TuiListCell from "@/components/plugin/list-cell";
|
|
import TuiListCell from "@/components/plugin/list-cell";
|
|
|
-import { getDetail,debtPay,hasPay, freeShipping,confirmFinish,cancel,modifyRemarkFn,orderFh,modifyOrderConfirmTimeFn } from "@/api/order";
|
|
|
|
|
|
|
+import { getDetail,debtPay,hasPay, freeShipping,confirmFinish,cancel,modifyRemarkFn,orderFh,modifyOrderConfirmTimeFn,printWlLabel } from "@/api/order";
|
|
|
import { getOrderProduct,giveItem } from "@/api/order-item";
|
|
import { getOrderProduct,giveItem } from "@/api/order-item";
|
|
|
import productMins from "@/mixins/product";
|
|
import productMins from "@/mixins/product";
|
|
|
import { ORDER_STATUS } from "@/utils/declare";
|
|
import { ORDER_STATUS } from "@/utils/declare";
|
|
@@ -668,16 +669,14 @@ export default {
|
|
|
},
|
|
},
|
|
|
confirmModify(){
|
|
confirmModify(){
|
|
|
let that = this
|
|
let that = this
|
|
|
- this.$util.confirmModal({content:'确认修改?'},() => {
|
|
|
|
|
- uni.showLoading({mask:true})
|
|
|
|
|
- modifyRemarkFn({id: this.option.id,remark:this.modifyRemarkText}).then(res=>{
|
|
|
|
|
- uni.hideLoading()
|
|
|
|
|
- if(res.code == 1){
|
|
|
|
|
- that.cancelModify()
|
|
|
|
|
- that.$msg('操作成功')
|
|
|
|
|
- that.init()
|
|
|
|
|
- }
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ uni.showLoading({mask:true})
|
|
|
|
|
+ modifyRemarkFn({id: this.option.id,remark:this.modifyRemarkText}).then(res=>{
|
|
|
|
|
+ uni.hideLoading()
|
|
|
|
|
+ if(res.code == 1){
|
|
|
|
|
+ that.cancelModify()
|
|
|
|
|
+ that.$msg('操作成功')
|
|
|
|
|
+ that.init()
|
|
|
|
|
+ }
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
beginModify(val){
|
|
beginModify(val){
|
|
@@ -686,10 +685,15 @@ export default {
|
|
|
},
|
|
},
|
|
|
dealRemark(val){
|
|
dealRemark(val){
|
|
|
let that = this
|
|
let that = this
|
|
|
- that.$util.confirmModal({content:'请选择操作项',okText:'复制',cancelText:'修改',cacelTextColor:'#38ADFF'},() => {
|
|
|
|
|
- that.copyRemark(val)
|
|
|
|
|
- },()=>{
|
|
|
|
|
|
|
+ that.$util.confirmModal({content:'请选择操作项',okText:'修改',cancelText:'复制',cacelTextColor:'#38ADFF',okTextColor:'#37863a'},() => {
|
|
|
that.beginModify(val)
|
|
that.beginModify(val)
|
|
|
|
|
+ },()=>{
|
|
|
|
|
+ // #ifdef MP-WEIXIN
|
|
|
|
|
+ that.$msg('APP上才能用复制功能')
|
|
|
|
|
+ // #endif
|
|
|
|
|
+ // #ifdef APP-PLUS
|
|
|
|
|
+ that.copyRemark(val)
|
|
|
|
|
+ // #endif
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
backBefore(){
|
|
backBefore(){
|
|
@@ -715,12 +719,17 @@ export default {
|
|
|
}
|
|
}
|
|
|
let val = address+"\n"+customName+" "+customMobile
|
|
let val = address+"\n"+customName+" "+customMobile
|
|
|
const self = this
|
|
const self = this
|
|
|
|
|
+ // #ifdef MP-WEIXIN
|
|
|
|
|
+ self.$msg('APP上才能用复制功能')
|
|
|
|
|
+ // #endif
|
|
|
|
|
+ // #ifdef APP-PLUS
|
|
|
uni.setClipboardData({
|
|
uni.setClipboardData({
|
|
|
data: val,
|
|
data: val,
|
|
|
success: function() {
|
|
success: function() {
|
|
|
self.$msg("复制成功")
|
|
self.$msg("复制成功")
|
|
|
}
|
|
}
|
|
|
- });
|
|
|
|
|
|
|
+ })
|
|
|
|
|
+ // #endif
|
|
|
},
|
|
},
|
|
|
copyRemark(val){
|
|
copyRemark(val){
|
|
|
const self = this
|
|
const self = this
|
|
@@ -833,6 +842,13 @@ export default {
|
|
|
goRefund(){
|
|
goRefund(){
|
|
|
this.$util.pageTo({url:'/pagesOrder/refund?id='+this.option.id})
|
|
this.$util.pageTo({url:'/pagesOrder/refund?id='+this.option.id})
|
|
|
},
|
|
},
|
|
|
|
|
+ printWlFlag(){
|
|
|
|
|
+ printWlLabel({id:this.option.id}).then(res=>{
|
|
|
|
|
+ if(res.code == 1){
|
|
|
|
|
+ this.$msg(res.msg)
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
|
|
+ },
|
|
|
allotFn(){
|
|
allotFn(){
|
|
|
this.$util.pageTo({url:'/pagesOrder/allot?id='+this.option.id})
|
|
this.$util.pageTo({url:'/pagesOrder/allot?id='+this.option.id})
|
|
|
},
|
|
},
|