Browse Source

Merge branch 'develop_szhj07' of http://git.chelingzhu.com/jianguan-web/qpls-md-app into develop_szhj07

lilei 2 years ago
parent
commit
8dcb845787

+ 5 - 4
pages/shuntBackManage/addBackOrder.vue

@@ -69,13 +69,13 @@
 									<text class="pnums">{{item.replenishBillQty}}</text>
 								</view>
 								<view v-if="item.recallBillQty && item.recallBillQty!=0">
-									调回在途
+									{{item.replenishBillQty && item.replenishBillQty!=0 ? '/':''}}调回在途
 									<text class="pnums">{{item.recallBillQty}}</text>
 								</view>
 							</view>
 							<view class="pcurnums flex align_center">
 								<text>调回数量</text>
-								<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="item.confirmQty" :min="0" :max="item.qty" @minus="minus" @plus="plus" @change="numberBoxChange"></u-number-box></view>
+								<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="item.confirmQty" :min="1" :max="item.qty" @minus="minus" @plus="plus" @change="numberBoxChange"></u-number-box></view>
 							</view>
 						</view>
 					</view>
@@ -241,7 +241,7 @@ export default {
 		seeDetail(){
 			if(this.chooseArr.length == 0){
 				uni.showToast({
-					title:'请先选择调回',
+					title:'请先选择调回产品',
 					icon:'none'
 				})
 			}else{
@@ -294,6 +294,7 @@ export default {
 		handelFilter(){
 			if(this.checkValueRange()){
 				this.queryParam.shelfSn = this.shelfSn;
+				this.chooseShow =false;
 				this.loadData(this.queryParam);
 			}	
 		},
@@ -351,7 +352,7 @@ export default {
 			const arrInd = []
 			if(this.chooseArr.length == 0){
 				uni.showToast({
-					title:'请先选择调回',
+					title:'请先选择调回产品',
 					icon:'none'
 				})
 				return;

+ 7 - 7
pages/shuntBackManage/cancellingStocks.vue

@@ -36,23 +36,23 @@
 					<view>产品总件数:<text style="color: red;">{{basicInfoData.totalQty}}</text></view>
 				</view>
 				<view v-if="salesOrderList.length">
-					<view style="padding: 0 10upx 10upx;">此补货单已经存在对应的销售单?</view>
-					<view style="padding: 0 10upx 20upx;">确认再次生成销售单吗?</view>
-					<view>
+					<view style="padding: 0 10upx 10upx;">此调回单已经存在对应的销售退货单?</view>
+					<view style="padding: 0 10upx 20upx;">确认再次生成销售退货单吗?</view>
+					<scroll-view scroll-y="true" style="height: 200rpx;">
 						<view 
 						v-for="item in salesOrderList" 
 						:key="item.id"
 						style="color: #00aaff;border-bottom: 1px solid #eee;padding: 10upx 0;" 
 						class="flex align_center justify_between">
 							<text>{{item.salesReturnNo}}</text>
-							<view>
+							<!-- <view>
 								<u-icon name="arrow-right"></u-icon>
-							</view>
+							</view> -->
 						</view>
-					</view>
+					</scroll-view>
 				</view>
 				<view v-else>
-					<view style="padding: 0 10upx 20upx;">确认生成销售单?</view>
+					<view style="padding: 0 10upx 20upx;">确认生成销售退货?</view>
 					<!-- <view>
 						<view 
 						v-for="item in salesOrderList" :key="item.id"

+ 10 - 8
pages/shuntBackManage/detail.vue

@@ -30,23 +30,23 @@
 					<view>产品总件数:<text style="color: red;">{{basicInfoData.totalQty}}</text></view>
 				</view>
 				<view v-if="salesOrderList.length">
-					<view style="padding: 0 10upx 10upx;">此补货单已经存在对应的销售单?</view>
-					<view style="padding: 0 10upx 20upx;">确认再次生成销售单吗?</view>
-					<view>
+					<view style="padding: 0 10upx 10upx;font-size: 26rpx;">此调回单已经存在对应的销售退货单?</view>
+					<view style="padding: 0 10upx 20upx;font-size: 26rpx;">确认再次生成销售退货单吗?</view>
+					<scroll-view scroll-y="true" style="height: 200rpx;">
 						<view 
 						v-for="item in salesOrderList" 
 						:key="item.id"
 						style="color: #00aaff;border-bottom: 1px solid #eee;padding: 10upx 0;" 
 						class="flex align_center justify_between">
 							<text>{{item.salesReturnNo}}</text>
-							<view>
+							<!-- <view>
 								<u-icon name="arrow-right"></u-icon>
-							</view>
+							</view> -->
 						</view>
-					</view>
+					</scroll-view>
 				</view>
 				<view v-else>
-					<view style="padding: 0 10upx 20upx;">确认生成销售单?</view>
+					<view style="padding: 0 10upx 20upx;">确认生成销售退货?</view>
 				</view>
 			</view>
 		</common-modal>
@@ -70,7 +70,7 @@
 					background: this.$config('primaryColor')
 				},
 				pageType: '',
-				refundModal:true,
+				refundModal:false,
 				salesOrderList:[]
 			}
 		},
@@ -127,6 +127,7 @@
 			},
 			// 生成销售退货单
 			refundModalConfirm(){
+				this.showLoading("正在生成销售退货单...")
 				generateSaleReturnBill({ recallBillSn: this.recallBillSn }).then(res => {
 				  if (res.status == 200) {
 				   uni.showToast({
@@ -139,6 +140,7 @@
 						icon:'none'
 					 }) 
 				  }
+				   uni.hideLoading()
 				})
 			}
 		}

+ 2 - 2
pages/shuntBackManage/detailModal.vue

@@ -46,13 +46,13 @@
 							<text class="pnums">{{con.replenishBillQty}}</text>
 						</view>
 						<view v-if="con.recallBillQty && con.recallBillQty!=0">
-							调回在途
+							{{con.replenishBillQty && con.replenishBillQty!=0 ? '/':''}}调回在途
 							<text class="pnums">{{con.recallBillQty}}</text>
 						</view>
 					</view>
 					<view class="pcurnums flex align_center">
 						<text>调回数量</text>
-						<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="con.confirmQty" :min="0" :max="con.qty" @minus="minus" @plus="plus" @change="change"></u-number-box></view>
+						<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="con.confirmQty" :min="1" :max="con.qty" @minus="minus" @plus="plus" @change="change"></u-number-box></view>
 					</view>
 				</view>
 			</view>