开单及人员列表bug修改

pages/index/peopleList.vue

@@ -65,12 +65,15 @@
 				signCompany: '', // 1物流  2快递  3发车
 				people: '', //快递、物流、发车的id
 				radioType: '', //选择的是快递还是物流
-				companyType: '', //运输公司类型  快递公司有值  物流公司直接传空
+				companyType: '', //运输公司类型  快递公司有值  物流公司直接传空
+				modelShow:false
 			}
 		},
 		onShow(){
-			this.popleType = this.popleType
-			this.khOrGysList();
+			if(this.modelShow == true){
+				this.popleType = this.popleType
+				this.khOrGysList();
+			}
 		},
 		onLoad(options) {
 			this.popleType = options.popleType
@@ -168,6 +171,7 @@
 			},
 			//新增人员
 			goAddPeople(type,data){
+				this.modelShow = true;
 				uni.navigateTo({
 					url: "/pages/billing/addUser?type="+type+'&data='+JSON.stringify(data)
 				})

pages/inventory/goodsList1.vue

@@ -50,6 +50,22 @@
 							
 						</view>
 					</view>
+				</view>
+				<view class="shop-box">
+					<view class="content-list">
+						<view class="list-name" style="width:150rpx">选择价格</view>
+						<view class="list-val" style="width:560rpx;display: flex;">
+							<radio-group style="display: flex;">
+								<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in priceItems"
+									:key="item.value">
+									<view>
+										<radio :value="item.value" @tap="priceChange(item.value)" :checked="index === priceCurrent" />
+									</view>
+									<view>{{item.name}}</view>
+								</label>
+							</radio-group>							
+						</view>
+					</view>
 				</view>
 				<view class="shop-box" style="border-top:5px solid #eee;" v-for="(value,key) in Array.from(carList)" :key="key">
 					<view class="shop-name" style="position: relative;">
@@ -235,8 +251,18 @@
 				relPrice: '0', //已付金额
 				otherExpense: '0', // 其他费用
 				priceNo: '0', //未付金额
-				discountNum:10,
-				value: '',
+				discountNum:10,
+				priceCurrent:'',
+				value: '',
+				priceItems:[{
+						value: '0',
+						name: '零售价'
+					},
+					{
+						value: '1',
+						name: '批发价'
+					}
+				],
 				items: [{
 						value: '0',
 						name: '单品折'
@@ -446,7 +472,7 @@
 			//整体折扣数字框改变
 			change(e){
 				console.log(e)
-				
+				this.discountNum = e
 				this.shouldPay = this.price *10000 * e / 10 /10000
 			},
 			//点击发货方式按钮
@@ -458,8 +484,8 @@
 				this.lbgName = ''
 				//快递0 物流1 发车2 拼包3 自送4
 				this.radioType = e.detail.value;
-				for (let i = 0; i < this.items.length; i++) {
-					if (this.items[i].value === e.detail.value) {
+				for (let i = 0; i < this.logisticsType.length; i++) {
+					if (this.logisticsType[i].value === e.detail.value) {
 						this.current = i;
 						break;
 					}
@@ -495,24 +521,21 @@
 					orderByWorker: this.lbgName.workerId,
 					transCompany: this.wlName.id,
 					sale: {
-						alreadyEarn: 100,
-						realAmount: 100,
-						noEarn: 0,
-						area: "丰台区",
-						city: "北京",
-						province: "北京",
+						alreadyEarn: 100, //已付金额
+						realAmount: 100, //实际金额
+						noEarn: 0, //欠款
+						totalAmount: this.totalAmount, //总数量
+						area: this.khName.area,
+						city: this.khName.city,
+						province: this.khName.province,
 						payStatus: 1,
-						shopId: '002',
-						receiveAddress: "测试地址1",
-						totalAmount: 100, //应付金额
-						transportType: 0, //this.radioType
-						discount: 10,
+						receiveAddress: this.khName.receiveAddress,
+						transportType: this.radioType, //this.radioType
+						discount: this.discountNum,
 						createBy: this.xsyId,
 						createByName:this.createByName,
-						userId: "1704126992443641856",
-						remark: '123',
-						discountNum:10,
-						otherExpense:this.otherExpense
+						remark: this.remark,
+						otherExpense:this.otherExpense //其他费用
 					},
 					
 					saleDetailList: []
@@ -573,10 +596,23 @@
 					that.shouldPay += value.price
 				})
 			},
-			//选择是零售价还是批发价
+			//整体选择是批发价还是零售价
+			priceChange(e){
+				let that = this;
+				this.carList.forEach(function(value, key) {
+					that.index = value.productId
+					if(e == 0){ //零售
+						that.checkPay(value.lsprice)
+					}else{ //批发
+						that.checkPay(value.wholesalePrice)
+					}
+				})
+			},
+			//商品上选择是零售价还是批发价
 			checkPay(price){
 				let that = this;
 				this.shouldPay = 0
+				this.carList.get(this.index).discountAmount = price
 				this.carList.get(this.index).unitPrice = price;
 				that.carList.get(that.index).price = price * that.carList.get(that.index).productCount;
 				this.$refs.inputDialog.close()