liujun 2 年 前
コミット
b9f73744e6
3 ファイル変更32 行追加6 行削除
  1. 6 3
      pages/sales/bill.vue
  2. 2 2
      pages/sales/billListComponent.vue
  3. 24 1
      pages/sales/salesDetail.vue

+ 6 - 3
pages/sales/bill.vue

@@ -43,14 +43,14 @@
 					待收:
 					<text class="fontColor">¥{{ chooseTotalPayPrice }}</text>
 				</view>
-				<view v-if="chooseList.length > 0 && discountVal!=0">
+				<view v-if="chooseList.length > 0 && backDiscountVal&&backDiscountVal!=0">
 					折后:
 					<text class="fontColor">¥{{ backDiscountPrice }}</text>
 				</view>
 				<view class="u-flex" v-if="chooseList.length > 0">
 					<view>
 						折让:
-						<text>¥{{ discountVal || 0 }}</text>
+						<text>¥{{ backDiscountVal || 0 }}</text>
 					</view>
 					<view class="costBtn" @click="costShow = true">打折</view>
 				</view>
@@ -194,7 +194,8 @@ export default {
 			submitLoading: false,
 			shareShow: false,
 			verifySn:'',
-			backDiscountPrice:'0.00'
+			backDiscountPrice:null,
+			backDiscountVal:null
 		};
 	},
 	onReady() {
@@ -382,6 +383,7 @@ export default {
 			}
 			this.costShow = false;
 			this.backDiscountPrice = this.settlement
+			this.backDiscountVal = this.discountVal
 		},
 		submitOrder() {
 			//发送对账单
@@ -419,6 +421,7 @@ export default {
 			}
 			this.discountVal = ''
 			this.backDiscountPrice = this.settlement
+			this.backDiscountVal = this.discountVal
 			// 是否全选
 			this.allChecked = isAllChecked;
 		},

+ 2 - 2
pages/sales/billListComponent.vue

@@ -7,9 +7,9 @@
 					<view class="billInfo u-flex">
 						<text>{{item.bizDate.substr(0,10)}}</text>
 						<view v-if="item.bizStatusDictValue">{{item.bizStatusDictValue}}</view>
-						<view v-if="item.bizSourceTypeDictValue">{{item.bizSourceTypeDictValue}}</view>
+						<view v-if="item.bizSourceTypeDictValue && item.bizSourceTypeDictValue!='自建'">{{item.bizSourceTypeDictValue}}</view>
 					</view>
-					<view class="billOrder">{{item.bizNo}}</view>
+					<view class="billOrder" v-if="item.distributionFlag && item.distributionFlag == 1">{{item.bizNo}}</view>
 				</view>
 				<view class="rigth_b u-flex u-row-between">
 					<view>应收:¥{{toThousands(item.bizAmount||0,2)}}</view>

+ 24 - 1
pages/sales/salesDetail.vue

@@ -140,7 +140,8 @@
 				productInfo: null,  // 编辑产品需要的参数
 				editInfo: null,  // 添加/编辑 提交的值
 				commonType: 1,  // 公共弹框类型  1删除产品,2删除销售单,3编辑产品时库存不足
-				payRecode:[]
+				payRecode:[],
+				toggle:true
 			}
 		},
 		onLoad(options) {
@@ -152,6 +153,11 @@
 		onUnload() {
 			uni.$off('refreshEditBL')
 		},
+		watch: {
+			toggle (newValue, oldValue) {
+				this.changeScrollH()
+			}
+		},
 		methods: {
 			//获取收款记录
 			getRecodeData(pageNo){
@@ -228,6 +234,23 @@
 					this.getList()
 					this.getRecodeData()
 				}
+			},
+			changeScrollH(){
+				const _this = this
+				uni.getSystemInfo({
+					success: function (res) {
+						const winH = res.windowHeight * 2
+						let totalH = _this.$refs.salesTotal && _this.$refs.salesTotal.$el && _this.$refs.salesTotal.$el.offsetHeight || 0
+						if(_this.toggle){
+							_this.scrollH = winH - 656 - totalH
+						}else{
+							_this.scrollH = winH - 522 - totalH
+						}
+						// if(_this.detailData&&_this.detailData.billStatus=='FINISH'){
+							_this.scrollH = _this.scrollH + 100
+						// }
+					}
+				})
 			}
 		}
 	}