From 94094ad137a47ba99129c2510731cf4233826d03 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 27 Oct 2023 20:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A7=94=E6=89=98=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/realselist/realselist.vue          |  3 +++
 components/shoppinglist/shoppinglist.vue      |  3 +++
 .../commissionedSales/addDelegation/index.vue | 20 +++++++++++--------
 .../delegation_details/index.vue              |  2 +-
 .../initiateDelegation/index.vue              |  4 ++--
 pages/product/list/index.vue                  |  4 +++-
 6 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/components/realselist/realselist.vue b/components/realselist/realselist.vue
index 0d22916..8d9d153 100644
--- a/components/realselist/realselist.vue
+++ b/components/realselist/realselist.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) {
diff --git a/components/shoppinglist/shoppinglist.vue b/components/shoppinglist/shoppinglist.vue
index 2f4912f..281ec7f 100644
--- a/components/shoppinglist/shoppinglist.vue
+++ b/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) {
diff --git a/pages/commissionedSales/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue
index d2da49e..fbc4ac7 100644
--- a/pages/commissionedSales/addDelegation/index.vue
+++ b/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,
-			eselect
+			associated
 		},
 		data() {
 			return {
@@ -172,11 +170,15 @@
 			},
 			//获取商品信息
 			getProduct(data) {
-		       this.formData.product_info=[]
-				if (data.length > 0) {
-                        
+        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;
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 782ec29..e1d748a 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/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>
 
 
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index 6e75e04..9618f0c 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/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)">
 			         			详情
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 868840d..c53cbb8 100644
--- a/pages/product/list/index.vue
+++ b/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);