فهرست منبع

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

lilei 2 سال پیش
والد
کامیت
0ba2691b39

+ 8 - 10
pages/shuntBackManage/addBackOrder.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view class="content flex flex_column">
 		<u-navbar back-text="新增调回单" :border-bottom="false">
 			<view slot='right' style="padding: 0 30upx;" v-if="recallBillList.length" @click="toChooseProduct">
 				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
@@ -64,7 +64,7 @@
 							</view>
 							<view class="pcurnums flex align_center">
 								<text>调回数量</text>
-								<view class="u-ninput"><u-number-box color="#000" bg-color="#fff" :input-height="60" v-model="item.confirmQty" :min="1" :max="item.qty - item.recallBillQty>0 ?item.qty - item.recallBillQty :0"></u-number-box></view>
+								<view class="u-ninput"><u-number-box color="#000" bg-color="#fff" :input-height="60" v-model="item.confirmQty" :min="1" :max="item.recallBillQty?item.qty - item.recallBillQty>0 ?item.qty - item.recallBillQty :0 :item.qty"></u-number-box></view>
 							</view>
 						</view>
 					</view>
@@ -89,7 +89,7 @@
 						清空列表
 					</view>
 				</view>
-				<view class="footerBox_r"><u-button type="primary" shape="circle"  @click="addBackOrder">新增调回单</u-button></view>
+				<view class="footerBox_r"><u-button size="medium" @click="addBackOrder" :custom-style="customBtnStyle" shape="circle" type="primary" hover-class="none" >新增调回单</u-button></view>
 			</view>
 		</view>
 	</view>
@@ -115,8 +115,7 @@ export default {
 			detailFlag:false,//查看详情
 			chooseShow: false,//滞销天数弹窗
 			theme: '',
-			customBtnStyle: {
-				//  自定义按钮样式
+			customBtnStyle: {  //  自定义按钮样式
 				borderColor: this.$config('primaryColor'),
 				backgroundColor: this.$config('primaryColor'),
 				color: '#fff'
@@ -337,7 +336,7 @@ export default {
 	}
 	.backOrderCon {
 		width: 100%;
-		height: calc(100vh - 338rpx);
+		flex-grow:1 ;
 		.scroll-view{
 			height: 100%;
 		.partList-list-box {
@@ -438,12 +437,11 @@ export default {
 		.nodata{
 			text-align: center;
 			image{
-				width: 280rpx;
-				height: 280rpx;
-				margin-top: 100rpx;
+				width: 180rpx;
+				height: 180rpx;
+				margin-top: 200rpx;
 			}
 			.nodataTip{
-				
 				text{
 					color: #00aaff;
 					margin-left: 10rpx;

+ 4 - 2
pages/shuntBackManage/cancellingStocks.vue

@@ -118,7 +118,6 @@
 					}else{
 						this.basicInfoData = null
 					}
-					
 				})
 			},
 			// 查询配件列表
@@ -179,7 +178,10 @@
 				   uni.showToast({
 				   	title:res.message
 				   })
-				   this.refundModal = false
+				   this.getDetail();
+				   setTimeout(()=>{
+						this.refundModal = false 
+				   },800)
 				  }else{
 					  uni.showToast({
 					  	title:res.message,

+ 7 - 3
pages/shuntBackManage/chooseProduct.vue

@@ -121,7 +121,7 @@
 						</view>
 					</view>
 				</scroll-view>
-				<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="200" text="暂无选中调单" img-width="120" v-else></u-empty>
+				<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="200" text="暂无选中调单" img-width="120" v-else></u-empty>
 			</u-popup>
 	</view>
 </template>
@@ -249,7 +249,12 @@
 					if (res.status == 200) {
 						res.data.forEach(item=>{
 							item.isChecked= false
-							item.confirmQty = item.qty - item.recallBillQty>0 ?item.qty - item.recallBillQty: 0;
+							if(item.recallBillQty){
+								item.confirmQty = item.qty - item.recallBillQty>0 ?item.qty - item.recallBillQty: 0;
+							}else{
+								item.confirmQty = item.qty
+							}
+							
 						})
 						_this.partList=res.data;
 					}else{
@@ -263,7 +268,6 @@
 						})
 					}
 					// 已选
-					console.log('1111111:',this.chooseList)
 					_this.partList.map(item => {
 						const row = _this.chooseList.find(k => k.id == item.id)
 						item.checked = !!row

+ 6 - 3
pages/shuntBackManage/detail.vue

@@ -98,7 +98,10 @@
 						this.salesOrderList = res.data.salesReturnBillList ? res.data.salesReturnBillList:[];
 						//#ifdef APP-PLUS
 						let webView = this.$mp.page.$getAppWebview();
-						if(res.data.billState == 'CANCEL' ||res.data.billState == 'FINISH'){
+						let zeroFlag=this.partList.every(item=>{
+							return item.confirmQty ==0
+						})
+						if(res.data.billState == 'CANCEL' ||zeroFlag ){
 							webView.setTitleNViewButtonStyle(0,{
 								"color": "transparent",
 								"width": "0px"
@@ -133,9 +136,9 @@
 				   uni.showToast({
 				   	title:res.message
 				   })
+				   this.getDetail();
 				  setTimeout(()=>{
-					   this.refundModal = false
-					   this.getDetail();
+					   this.refundModal = false 
 				  },800)
 				  }else{
 					 uni.showToast({

+ 17 - 9
pages/shuntBackManage/productList.vue

@@ -18,16 +18,24 @@
 							<view class="pname pname1">
 								{{item.productName}}
 							</view>
+							<view class="ptxt flex align_center">
+								<view>
+									最大库容
+									<text class="pnums">{{item.maxQty}}</text>
+								</view>
+								<view>
+									/货架库存
+									<text class="pnums">{{item.qty}}</text>
+								</view>
+								<view>
+									/滞销
+									<text class="pnums">{{!item.unsalableDays || (item.unsalableDays&&item.unsalableDays) == 0 ?'--天':item.unsalableDays}}</text>
+								</view>
+							</view>
 						</view>
 					</view>
 				</view>
-				<view class="ptxt flex align_center justify_end">
-					<view>
-					最大库容:<text class="pnums">{{item.maxQty||0}}</text>
-					货架库存:<text class="pnums">{{item.qty||0}}</text>
-					门店库存:<text class="pnums">{{item.qplsStockQty||0}}</text>
-					</view>
-				</view>
+				
 				<view class="ptools flex align_center justify_between">
 					<view class="flex align_center">
 						<view v-if="item.replenishBillQty">
@@ -185,11 +193,11 @@
 			}
 		}
 		.ptxt{
-			font-size: 26rpx;
+			font-size: 24rpx;
 			color: #999;
 			.pnums{
 				color: #222;
-				margin-right: 20upx;
+				padding: 0 4upx;
 			}
 		}
 		.ptools{