调拨

ghsApp/src/pagesStorehouse/allot/modifyDetails.vue

@@ -43,12 +43,15 @@
 			</view>
 		</view>
 
-		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+		<uni-popup ref="selectShopNumRef" 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,0)">{{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 blue" @tap.stop="pitchShop(item.id,item.shopName,inStockList,0)">{{item.shopName}}</button>
 			</view>
-			<view style="height:160upx;"> </view>
+			<view style="margin-top:30upx;">
+				<button class="admin-button-com middle blue" @tap.stop="cancelGetShop()">取消</button>
+			</view>
+			<view style="height:140upx;"> </view>
 		</uni-popup>
 
 	</view>
@@ -92,13 +95,16 @@ export default {
 			item.actPutNum = ''
 			this.$forceUpdate()
 		},
+		cancelGetShop(){
+			this.$refs.selectShopNumRef.close()
+		},
 		pitchShop(inShopId,inShopName,inStockList,back){
 			let that = this
 			let content = '确认一键出库到'+inShopName+'？'
 			if(back == 0){
 				content = '确认一键回调到'+inShopName+'？'
 			}
-			this.$refs.selectFlowerNumRef.close()
+			this.$refs.selectShopNumRef.close()
 			const changeList = inStockList.map(ele => { 
 				return { productId: ele.productId, actPutNum:ele.actPutNum,itemName:ele.itemName}
 			})
@@ -133,7 +139,7 @@ export default {
 			uni.navigateBack({delta:1})
 		},
 		putOut(){
-			this.$refs.selectFlowerNumRef.open('bottom')
+			this.$refs.selectShopNumRef.open('bottom')
 		},
 		async initData() {
 			const { data } = await getStockInFullInfo({orderSn:this.orderSn})

ghsApp/src/pagesStorehouse/allot/putDetails.vue

@@ -91,12 +91,15 @@
 				<button class="admin-button-com middle blue" @click="confirmPutEvent" v-if="inStockData.status == 1"> 确认入库 </button>
 			</view>
 		</view>
-		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+		<uni-popup ref="selectShopNumRef" 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,0)">{{item.shopName}}</button>
+				<button v-for="(item, index) in list.data" v-if="Number(currentShopId)!=Number(item.id)" class="admin-button-com middle blue" @tap.stop="pitchShop(item.id,item.shopName,inStockData,0)">{{item.shopName}}</button>
 			</view>
-			<view style="height:160upx;"> </view>
+			<view style="margin-top:30upx;">
+				<button class="admin-button-com middle blue" @tap.stop="cancelGetShop()">取消</button>
+			</view>
+			<view style="height:140upx;"> </view>
 		</uni-popup>
 	</view>
 </template>
@@ -164,6 +167,9 @@ export default {
 		}
 	},
 	methods: {
+		cancelGetShop(){
+			this.$refs.selectShopNumRef.close()
+		},
 		goBack(){
 			uni.navigateBack({delta:1})
 		},
@@ -176,7 +182,7 @@ export default {
 			if(back == 1){
 				content = '确认一键回调到'+inShopName+'？'
 			}
-			this.$refs.selectFlowerNumRef.close()
+			this.$refs.selectShopNumRef.close()
 			this.$util.confirmModal({content:content},() => {
 				oneKeyStockOut({inShopId:inShopId,orderSn:inStockData.orderSn}).then(res=>{
 					if(res.code == 1){
@@ -208,7 +214,7 @@ export default {
 
 		},
 		putOut(){
-			this.$refs.selectFlowerNumRef.open('bottom')
+			this.$refs.selectShopNumRef.open('bottom')
 		},
 		async initData() {
 			try {