扣库存

hdApp/src/admin/billing/affirm.vue

@@ -209,7 +209,8 @@
 						<textarea style="height:80upx;z-index:0" v-model="form.remark" placeholder-class="remark-class" placeholder="选填" />
 					</tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
+          <!-- 如果是扣除库存方式开单，不显示售后付款选项 -->
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="reduceStock == 0">
             <view class="tui-title">订单类型</view>
             <button @tap="form.forward = 0;" class="admin-button-com mini-btn" style="width:170upx;" :class="form.forward == 0? 'blue' : 'default'">收入订单</button>
             <button @click="form.forward = 1;" class="admin-button-com mini-btn" style="width:170upx;" :class="form.forward == 1 ? 'blue' : 'default'">售后付款</button>
@@ -386,7 +387,8 @@ export default {
       calc:'add',
       diffPriceList:[],
       currentShop:{default:0},
-      forwardPayWay:0//不影响原有的form.payWay方式，重新定义一个
+      forwardPayWay:0,//不影响原有的form.payWay方式，重新定义一个
+      reduceStock:0
     };
   },
   onLoad (option) {
@@ -396,11 +398,8 @@ export default {
 
     let that = this
     this.initMerchantInfo().then((data) => {
-
         uni.setNavigationBarTitle({ title: data.name })
-
         that.currentShop = data.shopInfo
-
     })
 
     if(Number(option.customId) > 0){
@@ -428,6 +427,13 @@ export default {
     }
 	  //#endif
 
+    //如果是扣除库存方式开单，不显示售后付款选项
+    this.reduceStock = this.option.reduceStock?this.option.reduceStock:0
+    //如果扣除库存方法，付款方式默认选择赊账，这样方便提交
+    if(this.reduceStock == 1){
+      this.form.hasPay = 2
+    }
+
   },
 	onShow(){
 

hdApp/src/admin/home/order.vue

@@ -42,11 +42,10 @@
             <view class="list-button">
 
               <block v-if="item.payStatus == 1 && item.repeat == 1">
-                <view class="admin-button-com middle" @click.stop="reduceStock(item)">扣除库存</view>
+                <view class="admin-button-com middle" @click.stop="reduceOrderStock(item)">扣库存</view>
               </block>
               <block v-else>
-                <view class="admin-button-com middle default" v-if="item.payStatus == 1 && item.repeat == 0" @click.stop="setRepeat(item)">不扣库存</view>
-                <view class="admin-button-com middle default" @click.stop="" v-else>扣除库存</view>                
+                <view class="admin-button-com middle default" @click.stop="">扣库存</view>                
               </block>
 
               <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="sendOrderFn(item)">发货</view>
@@ -177,11 +176,9 @@ export default {
       this.searchText = e;
       this.getOrderList()
     },
-    reduceStock(item){
-      this.$util.pageTo({url:'/admin/billing/index2?customId='+item.customId+'&orderId='+item.id+'&reduceStock=1'})
-    },
-    setRepeat(item){
-      this.$util.confirmModal({content:'确认要转为扫码收款？'},() => {
+    reduceOrderStock(item){
+      this.$util.confirmModal({content:'只有一次扣除机会，扣除后不能再改'},() => {
+        this.$util.pageTo({url:'/admin/billing/index2?customId='+item.customId+'&orderId='+item.id+'&reduceStock=1'})
       })
     },
     sendOrderFn(item){