|
@@ -198,9 +198,21 @@
|
|
|
|
|
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
<view class="tui-title">备注</view>
|
|
<view class="tui-title">备注</view>
|
|
|
- <textarea style="height: 100upx;z-index:0" v-model="form.remark" placeholder-class="remark-class" placeholder=".." />
|
|
|
|
|
|
|
+ <textarea style="height:80upx;z-index:0" v-model="form.remark" placeholder-class="remark-class" placeholder="选填" />
|
|
|
</tui-list-cell>
|
|
</tui-list-cell>
|
|
|
|
|
|
|
|
|
|
+ <tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
|
|
+ <view class="tui-title">订单类型</view>
|
|
|
|
|
+ <button @tap="form.forward = 0;form.hasPay = 4" class="admin-button-com middle" style="width:170upx;" :class="form.forward == 0? 'blue' : 'default'">常规订单</button>
|
|
|
|
|
+ <button @click="form.forward = 1;form.hasPay = 1" class="admin-button-com middle" style="width:170upx;" :class="form.forward == 1 ? 'blue' : 'default'">负数订单</button>
|
|
|
|
|
+ </tui-list-cell>
|
|
|
|
|
+
|
|
|
|
|
+ <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.forward == 1">
|
|
|
|
|
+ <view class="tui-title">库存变化</view>
|
|
|
|
|
+ <button @tap="form.forwardStock = 0" class="admin-button-com middle" style="width:170upx;" :class="form.forwardStock == 0? 'blue' : 'default'">库存退回</button>
|
|
|
|
|
+ <button @click="form.forwardStock = 1" class="admin-button-com middle" style="width:170upx;" :class="form.forwardStock == 1 ? 'blue' : 'default'">库存不退</button>
|
|
|
|
|
+ </tui-list-cell>
|
|
|
|
|
+
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</form>
|
|
</form>
|
|
@@ -321,7 +333,9 @@ export default {
|
|
|
needPrint:2,
|
|
needPrint:2,
|
|
|
hasPay:0,
|
|
hasPay:0,
|
|
|
getStaffName:'',
|
|
getStaffName:'',
|
|
|
- dealPrice:0
|
|
|
|
|
|
|
+ dealPrice:0,
|
|
|
|
|
+ forward:0,
|
|
|
|
|
+ forwardStock:0
|
|
|
},
|
|
},
|
|
|
showCustomer: false,
|
|
showCustomer: false,
|
|
|
customInfo:{discount:1,balance:0},
|
|
customInfo:{discount:1,balance:0},
|
|
@@ -523,6 +537,9 @@ export default {
|
|
|
name = '确认扫码付?'
|
|
name = '确认扫码付?'
|
|
|
}else if(this.form.hasPay == 1){
|
|
}else if(this.form.hasPay == 1){
|
|
|
name = '确认线下付款?'
|
|
name = '确认线下付款?'
|
|
|
|
|
+ if(this.form.forward == 1){
|
|
|
|
|
+ name = '确认清楚负数订单用法,要开单?'
|
|
|
|
|
+ }
|
|
|
}else if(this.form.hasPay == 2){
|
|
}else if(this.form.hasPay == 2){
|
|
|
name = '确认赊账?'
|
|
name = '确认赊账?'
|
|
|
}else if(this.form.hasPay == 4){
|
|
}else if(this.form.hasPay == 4){
|
|
@@ -579,7 +596,11 @@ export default {
|
|
|
if(this.form.hasPay == 0){
|
|
if(this.form.hasPay == 0){
|
|
|
this.$util.pageTo({ url: '/admin/billing/toPay',type:2,query: {orderId:id,orderSn:orderSn,actPrice:actPrice}})
|
|
this.$util.pageTo({ url: '/admin/billing/toPay',type:2,query: {orderId:id,orderSn:orderSn,actPrice:actPrice}})
|
|
|
}else{
|
|
}else{
|
|
|
- this.$util.pageTo({ url: '/admin/billing/result?orderId='+id,type:2})
|
|
|
|
|
|
|
+ if(this.form.forward == 1){
|
|
|
|
|
+ this.$util.pageTo({ url: '/admin/billing/remind?orderId='+id,type:2})
|
|
|
|
|
+ }else{
|
|
|
|
|
+ this.$util.pageTo({ url: '/admin/billing/result?orderId='+id,type:2})
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}else{
|
|
}else{
|
|
|
this.$msg('提交失败')
|
|
this.$msg('提交失败')
|