From 914a31928ab813d375104fcc3b78f23dec4f7c17 Mon Sep 17 00:00:00 2001
From: "tianyi@bogon" <ittianyi@163.com>
Date: Sat, 11 Nov 2023 15:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/.DS_Store                | Bin 8196 -> 8196 bytes
 pages/index/.DS_Store          | Bin 6148 -> 0 bytes
 pages/index/order.vue          |  36 +++++++++++++++++++++++++++++++--
 pages/inventory/goodsList1.vue |  12 ++++++++---
 4 files changed, 43 insertions(+), 5 deletions(-)
 delete mode 100644 pages/index/.DS_Store

diff --git a/pages/.DS_Store b/pages/.DS_Store
index d7153e46695f5a8543c82bde9d3e4d88294c1cc5..8e5dbf0a89290feb7fba45c9b39360ac2dbf8d8a 100644
GIT binary patch
delta 38
ucmZp1XmOa}&&aniU^hP_-)0_xK*r6*La&%MyYn1i-pnrXon>Ps8#4g&oD5$8

delta 140
zcmZp1XmOa}&nUPtU^hRb;AS3yKt@wmhD?S$h7^WWh6>M|{N$vZ{3Hej1_1^JMp+=O
z_a6*^ECvQ7m6Lr08aPZ$jC2%?%#0@&3QJFZFQ6ihq@XOgC@&{JFCD0jadVX5Tc(Z0
UtC%*kOMGXU{6aW>WASn(0ALg-H2?qr

diff --git a/pages/index/.DS_Store b/pages/index/.DS_Store
deleted file mode 100644
index 90b5d9e26cadc82cb9d2269c97620c211e79698b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~O-{ow6okjnMS=b;VS$trRN@8!6^TknEP4S732jB8Ra^dc*>eZ3z`-~Ht1|D|
zf+S7K4pqpO>~S4`dG^GKYXIitAvywD0IJNQm0cDENv=y?Nn5U^Ni}+pKJGEV1!jm=
zdiw_NfOlZi9FTXng+AZc2xruv_c!KS+{Pmw5O>Fu>#OnPO8WxG)b>)7PN$A*3=y-u
zMUS-!rX}Qij%+gO1W%0GXS5mbAv!On&0&sieA9C*9DP^9zUJ5+j2Jay#OD&?Ge^`h
z=2!>hB-)6xEg9$5AV=<ylP}_WN8eJ8Hd920+=9N07{Bm&m=At_4=lZ0GIoRh$GpRo
zM2vGc;$l`jO-F91j|)Ea8U0z$il<q2&Uo?!Wj%CQlW`Zv6?gOOP}!JkXn_|Udm*d-
zrr8>wgk5!Aj`@Z&FXUw1nnudyI%hf6n7^z%aNTCenv%b-I=Y+TIOz>a+_NQB_pJKT
zJK!Dg4tzTx--m!%G<2F+)lUZtJpxcGY}UlOoF#+_oQ6&ltGvQwEK0SgaYqbeakdAp
zU+6TkYH=8M_%JTAaVHd`(Ru$syTgQ5ed!(W4rCqJwm)04|DTqh|Fe+)<sI-2{3{1c
zrPJ%2a7u1(U74KhwE^=bvn1)4SXG3D+m5v&Tk$@#CSD7qLJgfJR@uVj{|KlJzVHtG
GsRLh<2=o&G

diff --git a/pages/index/order.vue b/pages/index/order.vue
index b47a83d..907bf9e 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -17,7 +17,7 @@
 						<view class="uni-body"> <text class="cardText">
 							订单状态：</text>{{item.status == 0 ?'待抢单' :item.status == 1 ?'待取货' :item.status == 3 ?'待送达' :item.status == 4 ?'已完成' :item.status == 5 ?'下游客户待退货' :item.status == 00 ?'退货待抢单' :item.status == 01 ?'退货待取货' :item.status == 03 ?'退货待送达' :item.status == 04 ?'待确认退货' :item.status == 6 ?'待配货' :'挂单'}}
 						</view>
-						<view class="floatRight">去开单</view>
+						<view class="floatRight" @tap.stop="goSaleGoods(item)">去开单</view>
 						<!-- <view class="floatRight" v-if="type =='order'">物流信息 </view> -->
 					</uni-card>
 				</li>
@@ -93,7 +93,39 @@
 					}
 				}).catch((res) => {})
 			},
-
+			//带参数跳转到开单页
+			goSaleGoods(item) {
+				let obj = {
+					id:'',
+					lsprice:0,
+					num:0,
+					price:0,
+					productName:'',
+					producticture:'',
+					productSn:'',
+					saleDetailQueryDTO:[],
+					supplierName:'',
+					wholesalePrice:0,
+					remark:item.remark
+				},
+				dataList = []
+				for (let i=0;i<item.saleDetailDTOList.length;i++) {
+					obj.saleDetailQueryDTO = item.saleDetailDTOList[i].stockLogList1
+					obj.id = item.saleDetailDTOList[i].productId
+					obj.lsprice = item.saleDetailDTOList[i].price
+					obj.num = item.saleDetailDTOList[i].productCount
+					obj.price = item.saleDetailDTOList[i].discountAmount
+					obj.productName = item.saleDetailDTOList[i].productName
+					obj.producticture = item.saleDetailDTOList[i].productPicture
+					obj.productSn = item.saleDetailDTOList[i].productSn
+					obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
+					dataList.push(obj)
+				}
+				uni.setStorageSync('carList1',dataList)
+				uni.switchTab({
+					url: '/pages/inventory/goodsList1'
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index 58d0b7e..2e3d316 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -147,7 +147,7 @@
 					<view class="content-list">
 						<view class="list-name">备注</view>
 						<view class="">
-							<textarea :value="remark"/>
+							<textarea @input='changeRemark($event)' :value="remark"/>
 						</view>
 					</view>
 				</view>
@@ -210,7 +210,7 @@
 						<view class="content-list" v-if="radioType == '3'">
 							<view class="list-name">拼包地址</view>
 							<view class="">
-								<textarea :value='pbAddress' />
+								<textarea @input='changePbAddress($event)' :value='pbAddress' />
 							</view>
 						</view>
 					</view>
@@ -516,6 +516,12 @@
 					}
 				}
 			},
+			changeRemark(e){
+				this.remark = e.detail.value
+			},
+			changePbAddress(e){
+				this.pbAddress = e.detail.value
+			},
 			//整体折扣数字框改变
 			change(e){
 				console.log(e)
@@ -587,7 +593,7 @@
 						createByName:this.createByName,
 						remark: this.remark,
 						otherExpense:this.otherExpense, //其他费用
-						pbAddress:this.pbAddress,
+						shareAddress:this.pbAddress,
 						transCompany: this.wlName.id,
 						companyName:this.wlName.companyName,
 						orderByWorker: this.lbgName.workerId,