更新

pages/index/neworderStatistic.vue

@@ -138,6 +138,17 @@
 							</view>
 						</view>
 						<!-- 支付方式选择 -->
+						<view class="filter-section">
+							<text>支付状态</text>
+							<view class="options">
+								<text class="options_content" v-for="(item, index) in payStatuses" :key="index"
+									@click="selectPayStatus(item.value)"
+									:class="{ selected: queryParams.payStatus === item.value }">
+									{{ item.label }}
+								</text>
+							</view>
+						</view>
+						<!-- 支付方式选择 -->
 						<view class="filter-section">
 							<text>支付方式</text>
 							<view class="options">
@@ -245,6 +256,7 @@
 					carYear: 0,
 					type: "",
 					inspectionTime: "",
+					payStatus: 0
 				},
 				loading: false, // 加载更多时的标志位
 				tableData: {},
@@ -253,6 +265,16 @@
 				isShowCustomer: false,
 				isShowbusiness: false,
 				payTypes: [],
+				payStatuses: [{
+					label: "全部",
+					value: "2",
+				}, {
+					label: "已支付",
+					value: "1",
+				}, {
+					label: "未支付",
+					value: "0",
+				}, ],
 				inspectionStatus: [{
 						label: "全部",
 						value: "1",
@@ -365,6 +387,9 @@
 			if (options.skuName) {
 				this.queryParams.skuName = options.skuName
 			}
+			if (options.amountStatus) {
+				this.queryParams.payStatus = options.amountStatus
+			}
 		},
 		onReady() {
 			uni.getSystemInfo({
@@ -504,6 +529,9 @@
 			selectPayType(value) {
 				this.queryParams.payType = value;
 			},
+			selectPayStatus(value) {
+				this.queryParams.payStatus = value;
+			},
 			selectType(value) {
 				this.queryParams.type = value;
 			},

pages/statistics/business.vue

@@ -44,19 +44,19 @@
 				<common-time-select v-model="rangeYYE" @subsection-change="slectRangeYYECount"></common-time-select>
 				<view class="d_b"
 					style="border-top: 1px solid #F5F5F5; margin-top: 30rpx;box-sizing: border-box;padding-top: 30rpx;">
-					<view class="four_">
+					<view class="four_" @click="goOrderStatistic">
 						<view class="text_">公示价格</view>
 						<view class="">{{ data1.gsAmount || 0 }}</view>
 					</view>
-					<view class="four_">
+					<view class="four_" @click="goOrderStatistic">
 						<view class="text_">应收款</view>
 						<view class="">{{ data1.ysAmount || 0 }}</view>
 					</view>
-					<view class="four_">
+					<view class="four_" @click="goOrderStatistic('1')">
 						<view class="text_">已收款</view>
 						<view class="">{{ data1.yjsAmount || 0 }}</view>
 					</view>
-					<view class="four_">
+					<view class="four_" @click="goOrderStatistic('0')">
 						<view class="text_">待收款</view>
 						<view class="">{{ data1.dsAmount || 0 }}</view>
 					</view>
@@ -160,12 +160,8 @@
 				<qiun-data-charts type="area" :opts="opts2" :chartData="chartData1" />
 			</view>
 			<view class="title_">已收款金额</view>
-			<view class="lan-you">
-				<view class="yi" :class="{'er' : qhindex2 == index}" v-for="(item,index) in zilist" :key="index"
-					@click="gbindex2(index,item.unit)"> {{ item.text }}
-				</view>
-			</view>
 			<view class="box_">
+				<common-time-select v-model="rangeYSK" @subsection-change="slectRangeYSK"></common-time-select>
 				<qiun-data-charts type="line" :opts="opts1" :chartData="chartData2" />
 			</view>
 
@@ -201,6 +197,7 @@
 				rangeSku: ['2023-9-28', '2023-10-7'],
 				rangeDsk: ['2023-9-28', '2023-10-7'],
 				rangeCjAmount: ['2023-9-28', '2023-10-7'],
+				rangeYSK: ['2023-9-28', '2023-10-7'],
 				rangeInspectionCount: ['2023-9-28', '2023-10-7'],
 				//检测类型统计
 				skuList: [],
@@ -433,6 +430,17 @@
 				})
 				this.data2 = res2.data
 			},
+			/**
+			 * 跳转工单列表
+			 */
+			goOrderStatistic(status) {
+				if (!status) {
+					status = 2
+				}
+				uni.navigateTo({
+					url: `/pages/index/neworderStatistic?amountStatus=${status}`
+				})
+			},
 			async slectRangeYYECount(e) {
 				this.rangeYYE = e
 				this.data1 = {}
@@ -529,6 +537,14 @@
 				}
 				this.chartLineInspectionAmount()
 			},
+			async slectRangeYSK(e) {
+				this.rangeYSK = e
+				let data5 = {
+					startTime: this.rangeYSK[0],
+					endTime: this.rangeYSK[1]
+				}
+				this.getServerData1()
+			},
 			async slectRangeInspectionCountNew(e) {
 				this.rangeInspectionCount = e
 				let data5 = {
@@ -582,6 +598,8 @@
 				this.rangeCjAmount[1] = currentTime
 				this.rangeInspectionCount[0] = currentTime
 				this.rangeInspectionCount[1] = currentTime
+				this.rangeYSK[0] = currentTime
+				this.rangeYSK[1] = currentTime
 			},
 			// 五条
 			async getfive() {
@@ -828,6 +846,8 @@
 				let data = {
 					partnerId: this.partnerId,
 					unit: this.unit,
+					startTime: this.rangeYSK[0],
+					endTime: this.rangeYSK[1]
 				}
 				let rex = await request({
 					url: '/partnerOwn/partner/chartInfoAmount',