|
@@ -136,6 +136,39 @@
|
|
|
>{{ item.name }}</button>
|
|
>{{ item.name }}</button>
|
|
|
</tui-list-cell>
|
|
</tui-list-cell>
|
|
|
|
|
|
|
|
|
|
+ <!-- 退货方式:returnGoods,-1未选 0库存不退 1库存退回 -->
|
|
|
|
|
+ <tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
|
|
+ <view class="tui-title">退货方式</view>
|
|
|
|
|
+ <button
|
|
|
|
|
+ class="admin-button-com big"
|
|
|
|
|
+ :class="form.returnGoods === 0 ? 'blue' : 'default'"
|
|
|
|
|
+ style="width:180upx;"
|
|
|
|
|
+ @click="form.returnGoods = 0"
|
|
|
|
|
+ >库存不退</button>
|
|
|
|
|
+ <button
|
|
|
|
|
+ class="admin-button-com big"
|
|
|
|
|
+ :class="form.returnGoods === 1 ? 'blue' : 'default'"
|
|
|
|
|
+ style="width:180upx;"
|
|
|
|
|
+ @click="form.returnGoods = 1"
|
|
|
|
|
+ >库存退回</button>
|
|
|
|
|
+ </tui-list-cell>
|
|
|
|
|
+
|
|
|
|
|
+ <!-- 返充到余额:returnBalance,-1未选 1是 0否 -->
|
|
|
|
|
+ <tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
|
|
+ <view class="tui-title">返充到余额</view>
|
|
|
|
|
+ <button
|
|
|
|
|
+ class="admin-button-com big"
|
|
|
|
|
+ :class="form.returnBalance === 1 ? 'blue' : 'default'"
|
|
|
|
|
+ style="width:140upx;"
|
|
|
|
|
+ @click="form.returnBalance = 1"
|
|
|
|
|
+ >是</button>
|
|
|
|
|
+ <button
|
|
|
|
|
+ class="admin-button-com big"
|
|
|
|
|
+ :class="form.returnBalance === 0 ? 'blue' : 'default'"
|
|
|
|
|
+ style="width:140upx;"
|
|
|
|
|
+ @click="form.returnBalance = 0"
|
|
|
|
|
+ >否</button>
|
|
|
|
|
+ </tui-list-cell>
|
|
|
|
|
|
|
|
<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>
|
|
@@ -347,6 +380,8 @@ export default {
|
|
|
product: '',
|
|
product: '',
|
|
|
remark: '',
|
|
remark: '',
|
|
|
payWay: -1, // 退款方式默认未选
|
|
payWay: -1, // 退款方式默认未选
|
|
|
|
|
+ returnGoods: -1, // 退货方式:-1未选 0库存不退 1库存退回
|
|
|
|
|
+ returnBalance: -1, // 返充到余额:-1未选 1是 0否
|
|
|
needPrint: 1, //订单生成时打印订单1需要2不需要
|
|
needPrint: 1, //订单生成时打印订单1需要2不需要
|
|
|
hasPay: 0,
|
|
hasPay: 0,
|
|
|
getStaffId: 0,
|
|
getStaffId: 0,
|
|
@@ -732,11 +767,19 @@ export default {
|
|
|
this.$msg(hasError);
|
|
this.$msg(hasError);
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
- // 退款方式改为按钮后默认未选,提交前必须点选
|
|
|
|
|
|
|
+ // 退款/退货/返充均默认未选,提交前必须点选
|
|
|
if (this.form.payWay === -1 || this.form.payWay === '' || this.form.payWay === null || this.form.payWay === undefined) {
|
|
if (this.form.payWay === -1 || this.form.payWay === '' || this.form.payWay === null || this.form.payWay === undefined) {
|
|
|
this.$msg('请选择退款方式');
|
|
this.$msg('请选择退款方式');
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
+ if (this.form.returnGoods === -1 || this.form.returnGoods === '' || this.form.returnGoods === null || this.form.returnGoods === undefined) {
|
|
|
|
|
+ this.$msg('请选择退货方式');
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (this.form.returnBalance === -1 || this.form.returnBalance === '' || this.form.returnBalance === null || this.form.returnBalance === undefined) {
|
|
|
|
|
+ this.$msg('请选择是否返充到余额');
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
let name = '确认提交';
|
|
let name = '确认提交';
|
|
|
if (this.form.hasPay == 0) {
|
|
if (this.form.hasPay == 0) {
|
|
|
name = '确认扫码?';
|
|
name = '确认扫码?';
|
|
@@ -1105,6 +1148,7 @@ export default {
|
|
|
padding-left: 0;
|
|
padding-left: 0;
|
|
|
padding-right: 0;
|
|
padding-right: 0;
|
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
|
|
|
+ font-size: 30upx; // 比 big 默认 32upx 小 2upx
|
|
|
&:last-child {
|
|
&:last-child {
|
|
|
margin-right: 0;
|
|
margin-right: 0;
|
|
|
}
|
|
}
|