调拨

ghsApp/src/pagesStorehouse/allot/modifyDetails.vue

@@ -39,14 +39,14 @@
 			<view class="btn-view">
 				<button class="admin-button-com middle" @click="goBack()" v-if="stockInfo.status == 2"> 返回 </button>
 				<button class="admin-button-com middle blue" @click="putOut()" v-if="stockInfo.status == 2"> 一键出库到 </button>
-				<button class="admin-button-com middle blue" @click="pitchShop(stockInfo.outShopId,stockInfo.outShopName,inStockList)" v-if="stockInfo.status == 2"> 一键回调 </button>
+				<button class="admin-button-com middle blue" @click="pitchShop(stockInfo.outShopId,stockInfo.outShopName,inStockList,1)" v-if="stockInfo.status == 2"> 一键回调 </button>
 			</view>
 		</view>
 
 		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
 			<view style="font-size:30upx;font-weight:bold;margin:35upx 0 25upx 15upx;">请选择门店：</view>
 			<view style="display:flex;padding:20upx;height:auto;justify-content:space-around;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
-				<button v-for="(item, index) in list.data" :key="index" v-if="Number(currentShopId)!=Number(item.id)" class="admin-button-com middle" @tap.stop="pitchShop(item.id,item.shopName,inStockList)">{{item.shopName}}</button>
+				<button v-for="(item, index) in list.data" :key="index" v-if="Number(currentShopId)!=Number(item.id)" class="admin-button-com middle" @tap.stop="pitchShop(item.id,item.shopName,inStockList,0)">{{item.shopName}}</button>
 			</view>
 			<view style="height:160upx;"> </view>
 		</uni-popup>
@@ -92,10 +92,10 @@ export default {
 			item.actPutNum = ''
 			this.$forceUpdate()
 		},
-		pitchShop(inShopId,inShopName,inStockList){
+		pitchShop(inShopId,inShopName,inStockList,back){
 			let that = this
-			let content = '确认出库到'+inShopName+'？'
-			if(inShopId == 0){
+			let content = '确认一键出库到'+inShopName+'？'
+			if(back == 0){
 				content = '确认一键回调到'+inShopName+'？'
 			}
 			this.$refs.selectFlowerNumRef.close()

ghsApp/src/pagesStorehouse/allot/putDetails.vue

@@ -85,7 +85,7 @@
 			<view class="btn-view">
 				<button class="admin-button-com middle" @click="goBack()" v-if="inStockData.status == 2"> 返回 </button>
 				<button class="admin-button-com middle blue" @click="putOut()" v-if="inStockData.status == 2"> 一键出库到 </button>
-				<button class="admin-button-com middle blue" @click="pitchShop(inStockData.outShopId,inStockData.outShopName,inStockData)" v-if="inStockData.status == 2"> 一键回调 </button>
+				<button class="admin-button-com middle blue" @click="pitchShop(inStockData.outShopId,inStockData.outShopName,inStockData,1)" v-if="inStockData.status == 2"> 一键回调 </button>
 				<button class="admin-button-com middle blue" @click="modifyPut()" v-if="inStockData.status == 2"> 修改数量 </button>
 				<button class="admin-button-com middle blue" @click="cancelPutEvent" v-if="inStockData.status == 1"> 取消入库 </button>
 				<button class="admin-button-com middle blue" @click="confirmPutEvent" v-if="inStockData.status == 1"> 确认入库 </button>
@@ -94,7 +94,7 @@
 		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
 			<view style="font-size:30upx;font-weight:bold;margin:35upx 0 25upx 15upx;">请选择门店：</view>
 			<view style="display:flex;padding:20upx;height:auto;justify-content:space-around;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
-				<button v-for="(item, index) in list.data" v-if="Number(currentShopId)!=Number(item.id)" class="admin-button-com middle" @tap.stop="pitchShop(item.id,item.shopName,inStockData)">{{item.shopName}}</button>
+				<button v-for="(item, index) in list.data" v-if="Number(currentShopId)!=Number(item.id)" class="admin-button-com middle" @tap.stop="pitchShop(item.id,item.shopName,inStockData,0)">{{item.shopName}}</button>
 			</view>
 			<view style="height:160upx;"> </view>
 		</uni-popup>
@@ -170,10 +170,10 @@ export default {
 		modifyPut(){
 			this.$util.pageTo({url: "/pagesStorehouse/allot/modifyDetails?orderSn="+this.orderSn})
 		},
-		pitchShop(inShopId,inShopName,inStockData){
+		pitchShop(inShopId,inShopName,inStockData,back){
 			let that = this
-			let content = '确认出库到'+inShopName+'？'
-			if(inShopId == 0){
+			let content = '确认一键出库到'+inShopName+'？'
+			if(back == 1){
 				content = '确认一键回调到'+inShopName+'？'
 			}
 			this.$refs.selectFlowerNumRef.close()