优化

ghsApp/src/api/gys/index.js

@@ -20,6 +20,10 @@ export const clearOrderApi = id => {
 	return https.post("/purchase-clear/create-order", id);
 };
 
+/**
+ * 供货商采购挂账明细。searchTime 筛账单时间 entryTime；sendSearchTime 筛发货时间 sendTime。
+ * 对应 PurchaseController::actionDebtList
+ */
 export const getDebtList = data => {
 	return https.get("/purchase/debt-list", data);
 };

ghsApp/src/pagesGys/details.vue

@@ -9,7 +9,11 @@
 						{{ ghsInfo.name}}
 					</text>
 				</view>
-				<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" defaultShowName='时间' />
+				<!-- 发货时间在左、开单时间在右；不改顶栏结构，只并排放两个筛选 -->
+				<view class="date-filter">
+					<DateSelect class="bar" top="0" @selectDateFn="selectSendDateFn" defaultShowName="发货时间" />
+					<DateSelect class="bar date-filter-gap" top="0" @selectDateFn="selectDateFn" defaultShowName="开单时间" />
+				</view>
 			</view>
 		</view>
 		<view scroll-y class="shop-list">
@@ -108,6 +112,9 @@ export default {
 			searchTime:'',
 			startTime:'',
 			endTime:'',
+			sendSearchTime:'',
+			sendStartTime:'',
+			sendEndTime:'',
 			payWayList:[{name:"线下微信",id:0},{name:"现金",id:4},{name:"线下支付宝",id:1},{name:"银行卡",id:5}],
 			payWay:0,
 			confirm:-1
@@ -196,6 +203,16 @@ export default {
 				uni.stopPullDownRefresh()
 			})
 		},
+		// 发货时间筛 sendTime，可与开单时间（entryTime）同时生效
+		selectSendDateFn(val){
+			this.sendSearchTime = val.searchTime
+			this.sendStartTime = val.startTime
+			this.sendEndTime = val.endTime
+			this.resetDebtListPage()
+			this.initData().then(res => {
+				uni.stopPullDownRefresh()
+			})
+		},
 		clearSelectedOrder(){
 			if (this.$util.isEmpty(this.selectList)) {
 				this.$msg("请选择订单");
@@ -211,6 +228,9 @@ export default {
 					searchTime: this.searchTime,
 					startTime: this.startTime,
 					endTime: this.endTime,
+					sendSearchTime: this.sendSearchTime,
+					sendStartTime: this.sendStartTime,
+					sendEndTime: this.sendEndTime,
 					confirm: this.confirm,
 				}))
 				this.ghsInfo = data.ghsInfo;
@@ -361,6 +381,14 @@ export default {
 				font-weight: 600;
 				color: #333333;
 			}
+			.date-filter {
+				display: flex;
+				align-items: center;
+				flex-shrink: 0;
+			}
+			.date-filter-gap {
+				margin-left: 24upx;
+			}
 		}
 	}
 	.shop-list {

ghsApp/src/pagesGys/detailsItem.vue

@@ -25,6 +25,8 @@
 				<view class="price" style="color:#3385FF;">
 					<text :class="[hasPartialClear ? 'price-del' : '']">¥{{ parseFloat(displayDebtPrice) }}</text>
 				</view>
+				<!-- 发货时间与账单时间（entryTime）不完全相同时才贴右侧 -->
+				<view v-if="showSendTime" class="send-date">发货时间 {{ info.sendTime.substr(2, 14) }}</view>
 			</view>
 			<!-- 售后退款单独成行，不与挂账价格挤在同一行 -->
 			<view class="item-row" v-if="Number(info.tkPrice)>0">
@@ -33,7 +35,7 @@
 			<view class="item-row" v-if="Number(info.nextDayTkPrice)>0">
 				<view class="refund-tip refund-tip-next">跨天售后 ¥{{parseFloat(info.nextDayTkPrice)}}</view>
 			</view>
-			<view class="item-row" v-if="hasPartialClear">
+			<view class="item-row" v-if="Number(remainDebtPrice)>0 && parseFloat(displayDebtPrice)!=parseFloat(remainDebtPrice)">
 				<view class="price" style="color:red;">剩余待结 ¥{{ parseFloat(remainDebtPrice) }}</view>
 			</view>
 		</view>
@@ -81,6 +83,20 @@ export default {
 		},
 		hasPartialClear() {
 			return this.displayDebtPrice > this.remainDebtPrice
+		},
+		/**
+		 * 金额行右侧发货时间：sendTime 有效，且与账单时间 entryTime（含时分秒）不完全相同才展示。
+		 */
+		showSendTime() {
+			const send = this.info.sendTime
+			const bill = this.info.entryTime
+			if (!send || send.indexOf('0000-00-00') >= 0) {
+				return false
+			}
+			if (!bill || bill.indexOf('0000-00-00') >= 0) {
+				return true
+			}
+			return send.substr(0, 19) !== bill.substr(0, 19)
 		}
 	},
 	methods: {
@@ -183,6 +199,14 @@ export default {
 		.refund-tip-next {
 			color: #e67e22;
 		}
+		.send-date {
+			margin-left: auto;
+			text-align: right;
+			white-space: nowrap;
+			flex-shrink: 0;
+			font-size: 26upx;
+			color: red;
+		}
 	}
 }
 </style>