From 80f83dbcdb373547c18c450b5ef0cf759a9c53b6 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Sat, 30 Nov 2024 14:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=98=E7=AB=AF-=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E5=8E=BB=E6=8E=89=E5=BE=85=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98-=E5=BE=85=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=94=BE=E5=85=A5=E5=88=B0=E5=BE=85=E5=AE=A1=E6=A0=B8=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_salesman_index/index/reviewed.vue | 158 ++++++++++++++++---------
 page_salesman_order/index/index.vue    | 139 +++++++++++-----------
 2 files changed, 176 insertions(+), 121 deletions(-)

diff --git a/page_salesman_index/index/reviewed.vue b/page_salesman_index/index/reviewed.vue
index b2183b2..a727e09 100644
--- a/page_salesman_index/index/reviewed.vue
+++ b/page_salesman_index/index/reviewed.vue
@@ -36,6 +36,10 @@
 			<view class="list-time">
 				下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span>
 			</view>
+      <view class="list-time">
+        支付状态<span>{{item.pay_status_name}}</span>
+        <span v-if="item.pay.pay_money > 0">剩余未支付金额{{item.pay.pay_money}}</span>
+      </view>
 			<view class="list-money">
 				合计{{item.goods_num}}件商品，
 				<span v-if="item.sales_money>0">订单金额￥{{item.sales_money}}</span>
@@ -48,6 +52,12 @@
 							@click.stop="increased(item,item.order_id,item.member_id,item.sales_balance,item.sales_status)">新增收款</div>
 						<div class="df aic jcsa listtwo" v-if="item.pay_type_name=='业务员额度下单'"
 							@click.stop="affirm(item.order_id,item.member_id,item.sales_balance,item.sales_status)">确认收款</div> -->
+
+        <div class="df aic jcsa listone" v-if="item.pay_type_name=='业务员额度下单'"
+             @click.stop="increased(item,item.order_id,item.member_id)">新增收款</div>
+        <div class="df aic jcsa listtwo" v-if="item.pay_type_name=='业务员额度下单'"
+             @click.stop="affirm(item.order_id,item.member_id)">确认收款</div>
+
 				<div class="df aic jcsa listsui" @click.stop="more(item)">再次订购</div>
 			</view>
 		</view>
@@ -97,25 +107,37 @@
 					sales_status: '0'
 				},
 				success: res => {
-					console.log(res, '待审核');
+					console.log(res, '待审核+待支付');
 					this.list = res.data.list
 				}
 			})
 		},
 		methods: {
-			getwrong(order_status,member_id, is_today, sales_status, searchText) {
-
-				console.log(order_status,member_id, is_today, sales_status, searchText);
+			getwrong(order_status,member_id, is_today, sales_status, searchText,one,start_time,end_time) {
+				console.log('xxx',order_status,member_id, is_today, sales_status, searchText,one,start_time,end_time);
 				let obj = {
 					order_status,
 					member_id,
 					is_today,
 					sales_status,
-					searchText
-				}
-				if (!obj.sales_status) {
-					obj.sales_status = '0'
+					searchText,
+          start_time,
+          end_time
 				}
+
+        if (searchText) {
+          delete obj.sales_status
+        }
+        if (is_today) {
+          delete obj.sales_status
+        }
+        if (!sales_status) {
+          delete obj.sales_status
+        }
+        if (!obj.sales_status) {
+          obj.sales_status = '0'
+        }
+
 				this.$api.sendRequest({
 					url: '/api/salasmanorder/lists',
 					data: obj,
@@ -184,7 +206,8 @@
 					url: `/page_salesman_order/Order_details/Order_details?or=${order}&me=${member}`
 				})
 			},
-			increased(item, order, member, sales_balance, sales_status) {
+			// increased(item, order, member, sales_balance, sales_status) {}
+			increased(item, order, member) {
 				// event.stopPropagation();
 				// console.log(item);
 				let _this = this
@@ -213,51 +236,78 @@
 					url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}`
 				})
 			},
-			affirm(order_id, member_id, sales_balance, sales_status) {
-				let _this = this
-				if (sales_balance == 0) {
-					this.$util.showToast({
-						title: '无收款记录'
-					});
-					return
-				}
-				if (sales_status == 0) {
-					this.$util.showToast({
-						title: '未审核'
-					});
-					return
-				}
-				if (sales_status == 2) {
-					this.$util.showToast({
-						title: '已驳回'
-					});
-					return
-				}
-				// event.stopPropagation();
-				console.log(order_id, member_id);
-				this.$api.sendRequest({
-					url: '/api/salasmanorder/detail',
-					data: {
-						order_id: order_id,
-						member_id: member_id
-					},
-					success: res => {
-						this.data = res.data
-						console.log(res.data, '订单详情');
-						// setTimeout(()=>{
-						// 	uni.$emit('CommodityList',res.data.order_goods)
-						// },500)
-						// uni.navigateTo({
-						// 	// url:this.list[this.current.URL]
-						// 	url:`/page_salesman_index/Commodity_list/Commodity_list`
-						// })
-						uni.navigateTo({
-							// url:this.list[this.current.URL]
-							url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
-						})
-					}
-				})
-			},
+			// affirm(order_id, member_id, sales_balance, sales_status) {
+			// 	let _this = this
+			// 	if (sales_balance == 0) {
+			// 		this.$util.showToast({
+			// 			title: '无收款记录'
+			// 		});
+			// 		return
+			// 	}
+			// 	if (sales_status == 0) {
+			// 		this.$util.showToast({
+			// 			title: '未审核'
+			// 		});
+			// 		return
+			// 	}
+			// 	if (sales_status == 2) {
+			// 		this.$util.showToast({
+			// 			title: '已驳回'
+			// 		});
+			// 		return
+			// 	}
+			// 	// event.stopPropagation();
+			// 	console.log(order_id, member_id);
+			// 	this.$api.sendRequest({
+			// 		url: '/api/salasmanorder/detail',
+			// 		data: {
+			// 			order_id: order_id,
+			// 			member_id: member_id
+			// 		},
+			// 		success: res => {
+			// 			this.data = res.data
+			// 			console.log(res.data, '订单详情');
+			// 			// setTimeout(()=>{
+			// 			// 	uni.$emit('CommodityList',res.data.order_goods)
+			// 			// },500)
+			// 			// uni.navigateTo({
+			// 			// 	// url:this.list[this.current.URL]
+			// 			// 	url:`/page_salesman_index/Commodity_list/Commodity_list`
+			// 			// })
+			// 			uni.navigateTo({
+			// 				// url:this.list[this.current.URL]
+			// 				url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
+			// 			})
+			// 		}
+			// 	})
+			// },
+      affirm(order_id, member_id) {
+        let _this = this
+        // event.stopPropagation();
+        console.log(order_id, member_id);
+        this.$api.sendRequest({
+          url: '/api/salasmanorder/detail',
+          data: {
+            order_id: order_id,
+            member_id: member_id
+          },
+          success: res => {
+            this.data = res.data
+            console.log(res.data, '订单详情');
+            // setTimeout(()=>{
+            // 	uni.$emit('CommodityList',res.data.order_goods)
+            // },500)
+            // uni.navigateTo({
+            // 	// url:this.list[this.current.URL]
+            // 	url:`/page_salesman_index/Commodity_list/Commodity_list`
+            // })
+            uni.navigateTo({
+              // url:this.list[this.current.URL]
+              url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
+            })
+          }
+        })
+      },
 			more(item) {
 				// event.stopPropagation();
 				console.log(item);
diff --git a/page_salesman_order/index/index.vue b/page_salesman_order/index/index.vue
index 7decc21..747558e 100644
--- a/page_salesman_order/index/index.vue
+++ b/page_salesman_order/index/index.vue
@@ -39,11 +39,11 @@
 			<undgbm ref=one></undgbm>
 		</view>
 		<!-- 待支付 -->
-		<view v-if="indexa==1">
-			<dettisl ref=two></dettisl>
-		</view>
+<!--		<view v-if="indexa==1">-->
+<!--			<dettisl ref=two></dettisl>-->
+<!--		</view>-->
 		<!-- 待审核 -->
-		<view v-if="indexa==2">
+		<view v-if="indexa==1">
 			<reviewed ref=sui></reviewed>
 		</view>
 		<!-- 待出库 -->
@@ -51,24 +51,24 @@
 		<deliveredsa></deliveredsa>
 	</view> -->
 		<!-- 待发货 -->
-		<view v-if="indexa==3">
+		<view v-if="indexa==2">
 			<Tobeshipped ref=four></Tobeshipped>
 		</view>
 		<!-- 待收货 -->
-		<view v-if="indexa==4">
+		<view v-if="indexa==3">
 			<Goodsto ref=five></Goodsto>
 		</view>
 		<!-- 已收货 -->
-		<view v-if="indexa==5">
+		<view v-if="indexa==4">
 			<received ref=six></received>
 		</view>
 
 		<!-- 待确认收款 -->
-		<view v-if="indexa==6">
+		<view v-if="indexa==5">
 			<Collectionto ref=seven></Collectionto>
 		</view>
 		<!-- 已关闭 -->
-		<view v-if="indexa==7">
+		<view v-if="indexa==6">
 			<close ref=eight></close>
 		</view>
 	</view>
@@ -110,31 +110,36 @@
 				value: '',
 				input: '',
 				show: false,
-				list1: [{
-						name: '全部',
-					}, {
-						name: '待支付',
-					}, {
-						name: '待审核',
-					}
-					// , {
-					// 	name: '待出库'
-					// }
-					, {
-						name: '待发货'
-					}, {
-						name: '已发货'
-					},
-					{
-						name: '已收货'
-					},
-					{
-						name: '待确认收款'
-					},
-					{
-						name: '已关闭'
-					}
-				],
+        list1: [
+          {
+            name: '全部',
+          },
+          // {
+          //   name: '待支付',
+          // },
+          {
+            name: '待审核',
+          },
+          //{
+          // 	name: '待出库'
+          // },
+
+          {
+            name: '待发货'
+          },
+          {
+            name: '已发货'
+          },
+          {
+            name: '已收货'
+          },
+          {
+            name: '待确认收款'
+          },
+          {
+            name: '已关闭'
+          }
+        ],
 				dataList: []
 			};
 		},
@@ -149,25 +154,25 @@
 			if (this.indexa == 0) {
 				this.$refs.one.getwrongtllisttwo()
 			}
+			// if (this.indexa == 1) {
+			// 	this.$refs.two.getwrongtllisttwo()
+			// }
 			if (this.indexa == 1) {
-				this.$refs.two.getwrongtllisttwo()
-			}
-			if (this.indexa == 2) {
 				this.$refs.sui.getwrongtllisttwo()
 			}
-			if (this.indexa == 3) {
+			if (this.indexa == 2) {
 				this.$refs.four.getwrongtllisttwo()
 			}
-			if (this.indexa == 4) {
+			if (this.indexa == 3) {
 				this.$refs.five.getwrongtllisttwo()
 			}
-			if (this.indexa == 5) {
+			if (this.indexa == 4) {
 				this.$refs.six.getwrongtllisttwo()
 			}
-			if (this.indexa == 6) {
+			if (this.indexa == 5) {
 				this.$refs.seven.getwrongtllisttwo()
 			}
-			if (this.indexa == 7) {
+			if (this.indexa == 6) {
 				this.$refs.eight.getwrongtllisttwo()
 			}
 		},
@@ -175,25 +180,25 @@
 			if (this.indexa == 0) {
 				await this.$refs.one.getwrongtllisttwo()
 			}
+			// if (this.indexa == 1) {
+			// 	await this.$refs.two.getwrongtllisttwo()
+			// }
 			if (this.indexa == 1) {
-				await this.$refs.two.getwrongtllisttwo()
-			}
-			if (this.indexa == 2) {
 				await this.$refs.sui.getwrongtllisttwo()
 			}
-			if (this.indexa == 3) {
+			if (this.indexa == 2) {
 				await this.$refs.four.getwrongtllisttwo()
 			}
-			if (this.indexa == 4) {
+			if (this.indexa == 3) {
 				await this.$refs.five.getwrongtllisttwo()
 			}
-			if (this.indexa == 5) {
+			if (this.indexa == 4) {
 				await this.$refs.six.getwrongtllisttwo()
 			}
-			if (this.indexa == 6) {
+			if (this.indexa == 5) {
 				await this.$refs.seven.getwrongtllisttwo()
 			}
-			if (this.indexa == 7) {
+			if (this.indexa == 6) {
 				await this.$refs.eight.getwrongtllisttwo()
 			}
 		},
@@ -201,25 +206,25 @@
 			if (this.indexa == 0) {
 				await this.$refs.one.getwrongtllistsui()
 			}
+			// if (this.indexa == 1) {
+			// 	await this.$refs.two.getwrongtllistsui()
+			// }
 			if (this.indexa == 1) {
-				await this.$refs.two.getwrongtllistsui()
-			}
-			if (this.indexa == 2) {
 				await this.$refs.sui.getwrongtllistsui()
 			}
-			if (this.indexa == 3) {
+			if (this.indexa == 2) {
 				await this.$refs.four.getwrongtllistsui()
 			}
-			if (this.indexa == 4) {
+			if (this.indexa == 3) {
 				await this.$refs.five.getwrongtllistsui()
 			}
-			if (this.indexa == 5) {
+			if (this.indexa == 4) {
 				await this.$refs.six.getwrongtllistsui()
 			}
-			if (this.indexa == 6) {
+			if (this.indexa == 5) {
 				await this.$refs.seven.getwrongtllistsui()
 			}
-			if (this.indexa == 7) {
+			if (this.indexa == 6) {
 				await this.$refs.eight.getwrongtllisttwo()
 			}
 		},
@@ -231,31 +236,31 @@
 					this.$refs.one.getwrong(order_status, member_id, is_today, sales_status, searchText, one, start_time,
 						end_time)
 				}
+				// if (this.indexa == 1) {
+				// 	this.$refs.two.getwrong(order_status, member_id, is_today, sales_status, searchText, one, start_time,
+				// 		end_time)
+				// }
 				if (this.indexa == 1) {
-					this.$refs.two.getwrong(order_status, member_id, is_today, sales_status, searchText, one, start_time,
-						end_time)
-				}
-				if (this.indexa == 2) {
 					this.$refs.sui.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
 						end_time)
 				}
-				if (this.indexa == 3) {
+				if (this.indexa == 2) {
 					this.$refs.four.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
 						end_time)
 				}
-				if (this.indexa == 4) {
+				if (this.indexa == 3) {
 					this.$refs.five.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
 						end_time)
 				}
-				if (this.indexa == 5) {
+				if (this.indexa == 4) {
 					this.$refs.six.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
 						end_time)
 				}
-				if (this.indexa == 6) {
+				if (this.indexa == 5) {
 					this.$refs.seven.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
 						end_time)
 				}
-				if (this.indexa == 7) {
+				if (this.indexa == 6) {
 					this.$refs.eight.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
 						end_time)
 				}