更新委托销售功能

components/realselist/realselist.vue

@@ -173,27 +173,26 @@
 			//价格
 			producrprice(e, i, item) {
 				this.bought[i].price = e.detail.value
-				this.$set(item, 'check', false);
+        // 处理数据回显时, 调整数量, 选中的数据不改变的问题
-				for (let i in this.checkedArr) {
+        let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id);
-					if (this.checkedArr[i].product_id == item.product_id) {
+        obj ? obj.price = e.detail.value:null;
-						this.checkedArr.splice(i, 1)
+				// this.$set(item, 'check', false);
-					}
+				// for (let i in this.checkedArr) {
-				}
+				// 	if (this.checkedArr[i].product_id == item.product_id) {
+				// 		this.checkedArr.splice(i, 1)
+				// 	}
+				// }
 
 
 
 			},
 			incrementTotal(e, i, item) {
-				this.$set(item, 'check', false);
+				// this.$set(item, 'check', false);
-				for (let i in this.checkedArr) {
+				// for (let i in this.checkedArr) {
-					if (this.checkedArr[i].product_id == item.product_id) {
+				// 	if (this.checkedArr[i].product_id == item.product_id) {
-						this.checkedArr.splice(i, 1)
+				// 		this.checkedArr.splice(i, 1)
-					}
+				// 	}
-				}
+				// }
-
-
-
-
 
 			},
 			// picker修改事件
@@ -216,8 +215,10 @@
 			},
 			numberChange(data, i) {
 				this.peicenumber = data.number;
-				this.bought[i].number = data.number
+				this.bought[i].number = data.number;
-
+        // 处理数据回显时, 调整数量, 选中的数据不改变的问题
+        let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id);
+        obj ? obj.number = data.number:null;
 			},
 
 			tabs(index) {
@@ -300,7 +301,6 @@
 				this.checkedArr.forEach((item, index) => {
 					this.checkedArr.push(item)
 
-
 				})
 			},
 			/*点击选中与否*/
@@ -330,7 +330,7 @@
 						}
 						acc.push(cru)
 					} else {
-						console.log(acc, hash[cru[name]])
+						// console.log(acc, hash[cru[name]])
 						acc.splice(hash[cru[name]]['index'], 1, cru)
 					}
 
@@ -344,7 +344,7 @@
 			},
 			/*确定提交*/
 			submit() {
-
+        console.log(this.checkedArr);
 				this.$emit('getProduct', this.checkedArr);
 
 			},

components/shoppinglist/shoppinglist.vue

@@ -173,6 +173,9 @@
 			//价格
 			producrprice(e, i, item) {
 				this.bought[i].price = e.detail.value
+        // 处理数据回显时, 调整数量, 选中的数据不改变的问题
+        let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id);
+        obj ? obj.price = e.detail.value:null;
 				// this.$set(item, 'check', false);
 				// for (let i in this.checkedArr) {
 				// 	if (this.checkedArr[i].product_id == item.product_id) {
@@ -209,7 +212,9 @@
 			numberChange(data, i) {
 				this.peicenumber = data.number;
 				this.bought[i].number = data.number
-
+        // 处理数据回显时, 调整数量, 选中的数据不改变的问题
+        let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id);
+        obj ? obj.number = data.number:null;
 			},
 
 			tabs(index) {

pages/commissionedSales/addDelegation/index.vue

@@ -72,7 +72,6 @@
 
 <script>
 	import associated from '@/components/realselist/realselist.vue';
-	import eselect from '@/components/e-select/e-select.vue';
 	import {
 		supplychain,
 		entrustchain,
@@ -81,8 +80,7 @@
 	} from '@/api/sale.js'
 	export default {
 		components: {
-			associated,
+			associated
-			eselect
 		},
 		data() {
 			return {
@@ -172,11 +170,15 @@
 			},
 			//获取商品信息
 			getProduct(data) {
-		       this.formData.product_info=[]
+        console.log('选择商品', data);
+        this.productList = [];
+		    this.formData.product_info = [];
+        this.formData.content = '';
 				if (data.length > 0) { 
-                        
+          this.productList = data;
 					for (let i in data) {
-						this.formData.content += data[i].store_name + ','
+						this.formData.content += data[i].store_name + ',';
+            console.log(data[i].number);
 						this.formData.product_info.push({
 							product_attr_unique: data[i].product_attr_unique,
 							number: Number(data[i].number),
@@ -184,6 +186,8 @@
 						})
 					}
 				}
+        this.formData.content = this.formData.content.slice(0,-1);
+        console.log('选择商品', this.formData);
 				this.$refs.associated.close()
 			},
 			//提交
@@ -522,7 +526,7 @@
 
 	.release_btn {
 
-		position: absolute;
+		position: fixed;
 		bottom: 150rpx;
 		left: 50%;
 		margin-left: -347rpx;

pages/commissionedSales/delegation_details/index.vue

@@ -110,7 +110,7 @@
 		</view>
 		<view class="content_bootm">
 			<view class="content_bootm_txt">
-				查看TA提到的宝贝(2)
+				查看TA提到的宝贝({{objinfo.product_list.length||0}})
 			</view>
 
 

pages/commissionedSales/initiateDelegation/index.vue

@@ -52,9 +52,9 @@
 			         			编辑
 			         		</view>
 			         		<span></span>
-			         		<view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(item)">
+			         		<!-- <view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(item)">
 			         			删除
-			         		</view>
+			         		</view> -->
 			         		<span></span>
 			         		<view class="contentgn_b" @click="detail(item)">
 			         			详情

pages/product/list/index.vue

@@ -62,7 +62,7 @@
 										<text class="text">规格模板</text>
 									</navigator>
 									<navigator class="item"
-										:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
+										:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}&type=${mer_info.type_code}`"
 										hover-class='none'>
 										<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
 										<text class="text">商品导入</text>
@@ -231,6 +231,7 @@
 				loaded: false,
 				loading: false,
 				mer_id: '',
+        mer_info: {},
 				productList: [],
 				swiperCur: 0,
 				circular: true,
@@ -285,6 +286,7 @@
 			
 					
 					this.mer_id = res.data.service.mer_id;
+          this.mer_info = res.data.mer_info;
 			
 				   this.getList(res.data.service.mer_id, true);