Merge branch 'zhongqi-intraCityExpress' of git.huaml.com:zhh/front-end into zhongqi-intraCityExpress

hdApp/src/admin/billing/affirm.vue

@@ -54,7 +54,7 @@
               </view>
             </view>
             <view class="summary-bar">
-              <view class="operate-view" v-if="isScanEnv" @click="pageToItemList()"><text class="iconfont iconzeng"></text>手动添加花材</view>
+              <view class="operate-view" v-if="isScanEnv"><text class="iconfont iconzeng"></text>手动添加花材</view>
               <view class="operate-view" v-if="isScanEnv == false"><text> </text></view>
               <view class="describe-view">
                 <text>{{ selectList.length }}种</text>
@@ -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(){
 
@@ -584,7 +590,7 @@ export default {
       //售后付款单，只能走线下模式
       this.form.hasPay = 1
       this.form.payWay = this.forwardPayWay
-      this.toCommit()
+      this.submitOrder()
     },
     confirmSubmit(){
       if(this.form.forward == 1){
@@ -594,14 +600,14 @@ export default {
           //客户余额充值，只能使用余额支付
           this.$util.confirmModal({content:'客户余额充足，请使用余额支付'},() => {
             this.form.hasPay = 4
-            this.toCommit()
+            this.submitOrder()
           })
         }else{
-          this.toCommit()
+          this.submitOrder()
         }
       }
     },
-    toCommit() {
+    submitOrder() {
       let self = this;
       let name = '确认提交'
       if(this.form.hasPay == 0){
@@ -649,6 +655,12 @@ export default {
       //orderType 开单类型，1商品开单 2花材开单
       params = {...params,xj:JSON.stringify(xj),orderType:2}
 
+      //扣减库存
+      let orderId = this.option.orderId  ? this.option.orderId : 0
+			let book = this.option.book ? this.option.book : 0
+			let reduceStock = this.option.reduceStock?this.option.reduceStock:0
+      params = {...params,orderId:orderId,book:book,reduceStock:reduceStock}
+
       uni.showLoading({mask:true})
       createOrder(params).then((res) => {
         uni.hideLoading()
@@ -685,10 +697,10 @@ export default {
     gobackEvent () {
       let customId = this.option.customId ? this.option.customId : 0
       let customName = this.option.customName ? this.option.customName : ''
-      this.$util.pageTo({url: '/admin/billing/index2?customId='+customId+'&customName='+customName,type:2})
-    },
-    pageToItemList() {
-      this.$util.pageTo({url: '/admin/billing/index2?customId='+this.option.customId,type:2})
+      let reduceStock = this.option.reduceStock?this.option.reduceStock:0
+      let orderId = this.option.orderId  ? this.option.orderId : 0
+      let book = this.option.book ? this.option.book : 0
+      this.$util.pageTo({url: '/admin/billing/index2?customId='+customId+'&customName='+customName+'&orderId='+orderId+'&book='+book+'&reduceStock='+reduceStock,type:2})
     }
   }
 };

hdApp/src/admin/billing/index2.vue

@@ -232,7 +232,9 @@ export default {
 			let customName = this.option.customName ? this.option.customName : '';
 			let orderId = this.option.orderId  ? this.option.orderId : 0
 			let book = this.option.book ? this.option.book : 0
-			this.$util.pageTo({ url: '/admin/billing/affirm',type:2,query: {customId:this.option.customId,customName:customName,orderId:orderId,book:book}})
+			let customId = this.option.customId?this.option.customId:0
+			let reduceStock = this.option.reduceStock?this.option.reduceStock:0
+			this.$util.pageTo({ url: '/admin/billing/affirm?customId='+customId+'&customName='+customName+'&orderId='+orderId+'&book='+book+'&reduceStock='+reduceStock,type:2})
 		}
 	}
 };

hdApp/src/admin/cg/code.vue

@@ -8,7 +8,7 @@
     </view>
 
     <view style="text-align: center;font-size:32upx;">
-      收款码是否算收入：<switch style="transform:scale(0.7,0.7)" :checked="gatherRepeat == 0 ? true : false" @change="gatherRepeatChangeFn" />{{ gatherRepeat==0?'是':'否' }}
+      收款码是否算收入：<switch style="transform:scale(0.7,0.7)" :checked="gatherRepeat == 0 ? true : false" @change="gatherRepeatChangeFn" />{{ gatherRepeat==0?'是（没有重复收款）':'否（属于重复收款）' }}
     </view>
 
   </view>

hdApp/src/admin/home/components/order-item.vue

@@ -75,10 +75,10 @@ export default {
 		}
 		.scan-icon{
 			position: absolute;
-			width:130upx;
-			height:130upx;
-			top:80upx;
-			left:390upx;
+			width:190upx;
+			height:190upx;
+			top:60upx;
+			left:340upx;
 		}
 		.list-msg {
 			color:#999999;

hdApp/src/admin/home/order.vue

@@ -40,15 +40,30 @@
           本客户共有{{item.sameTimeIdsNum?item.sameTimeIdsNum:0}}个订单，可合并发货
         </view>
             <view class="list-button">
-              <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="">扣库存</view>
+
+              <block v-if="item.payStatus == 1 && item.repeat == 1">
+                <view class="admin-button-com middle" @click.stop="reduceOrderStock(item)">扣库存</view>
+              </block>
+              <block v-else>
+                <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>
-              <view class="admin-button-com default" v-else>发货</view>
+              <view class="admin-button-com default" v-else @click.stop="">发货</view>
+
               <view class="admin-button-com middle" v-if="item.payStatus == 1" @click.stop="printOrder(item)">打印</view>
-              <view class="admin-button-com default" v-else>打印</view>
-              <view class="admin-button-com middle" v-if="item.sendStatus == '0' && (item.status > 1 && item.status < 4)" @click.stop="openExpressPage(item.id, true)">配送</view>
-              <view class="admin-button-com default" v-if="item.sendStatus == '1' && (item.status > 1 && item.status < 4)" @click.stop="cancelExpress(item.id)" style="background-color: #ff6b6b;">取消配送</view>
-              <view class="admin-button-com middle" v-if="item.sendStatus == '3' && (item.status > 1 && item.status < 4)" @click.stop="openExpressPage(item.id, false)">重新配送</view>
-              <view class="admin-button-com middle" v-if="item.sendStatus == '2' && item.status == 4" @click.stop="selectExpress(item.id)">配送成功</view>
+              <view class="admin-button-com default" v-else @click.stop="">打印</view>
+
+              <block v-if="item.payStatus == 0">
+                <view class="admin-button-com middle" @click.stop="">呼叫跑腿</view>
+              </block>
+              <block v-else>
+                <view class="admin-button-com middle" v-if="item.sendStatus == '0' && item.payStatus == 1" @click.stop="openExpressPage(item.id, true)">呼叫跑腿</view>
+                <view class="admin-button-com default" v-if="item.sendStatus == '1' && item.payStatus == 1" @click.stop="cancelExpress(item.id)" style="background-color: #ff6b6b;">取消跑腿</view>
+                <view class="admin-button-com middle" v-if="item.sendStatus == '3' && item.payStatus == 1" @click.stop="openExpressPage(item.id, false)">重叫跑腿</view>
+                <view class="admin-button-com middle" v-if="item.sendStatus == '2' && item.payStatus == 1" @click.stop="selectExpress(item.id)">跑腿完成</view>
+              </block>
+
             </view>
           </view>
         </view>
@@ -105,7 +120,7 @@ export default {
       searchTypeName:'价格',
       searchType:0,
       searchOption:['价格', '单号','手机','名称'],
-      refreshPage:1
+      refreshPage:0
     };
   },
   onPullDownRefresh () {
@@ -140,10 +155,8 @@ export default {
     if(this.refreshPage == 1){
       this.resetList();
       this.getOrderList()
-    }else{
-      this.refreshPage = 1
+      this.refreshPage = 0
     }
-
   },
   methods: {
     setSearchType(){
@@ -163,6 +176,11 @@ export default {
       this.searchText = e;
       this.getOrderList()
     },
+    reduceOrderStock(item){
+      this.$util.confirmModal({content:'只有一次扣除机会，扣除后不能再改'},() => {
+        this.$util.pageTo({url:'/admin/billing/index2?customId='+item.customId+'&orderId='+item.id+'&reduceStock=1'})
+      })
+    },
     sendOrderFn(item){
       let that = this
       that.$util.confirmModal({content:'确认待收货？'},() => {
@@ -317,7 +335,7 @@ export default {
           justify-content: flex-end;
           flex-wrap: nowrap;
           .admin-button-com {
-            margin-left: 20upx;
+            margin-left: 30upx;
             padding: 16upx 20upx;
             white-space: nowrap;
           }

hdApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -104,14 +104,14 @@
 				}else if(item.recordType == 4){
 					that.pageTo({ url: '/pagesStorehouse/inventory/details?orderSn='+item.orderSn})
 				}else if(item.recordType == 5){
-					uni.showLoading()
-					getInfoByOrderSn({orderSn:item.orderSn}).then(res=>{
-						uni.hideLoading()
-						if(res.code == 1){
-							let id = res.data.info.id ? res.data.info.id : 0
-							that.pageTo({ url: '/pagesOrder/detail?id='+id})
-						}
-					})
+					this.$msg('开发中')
+					// getInfoByOrderSn({orderSn:item.orderSn}).then(res=>{
+					// 	uni.hideLoading()
+					// 	if(res.code == 1){
+					// 		let id = res.data.info.id ? res.data.info.id : 0
+					// 		that.pageTo({ url: '/pagesOrder/detail?id='+id})
+					// 	}
+					// })
 				}else{
 	
 				}