From 1b4f1c9db703b1bfd0e3f8cc7f01153a7399088d Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 10 四月 2023 15:53:47 +0800
Subject: [PATCH] 修改称重控制，修复刷新失败
---
pages/customer-page/customer-index/customer-index.vue | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index cce6dc0..120d1d7 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -9,8 +9,8 @@
寮�
</view>
<view class="card-left__utils">
- <u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.cars2 != item.carNum" shape="circle"></u-button>
- <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNum != item.carNumSurplus1"></u-button>
+ <u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.carNum - item.cars2 != 0" shape="circle"></u-button>
+ <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNumSurplus1 != 0"></u-button>
</view>
</template>
<template v-slot:right-top>
@@ -34,7 +34,7 @@
<text class="lingqu" @tap.stop="numInput(item.id)">{{ item.receiveNum || '_______' }}</text>
寮�
</view> -->
- <view v-if="item.cars == item.cars2 ? false : true">鍓╀綑{{ item.carNum - item.cars2 }}寮�</view>
+ <view v-if="item.carNum == item.cars2 ? false : true">鍓╀綑{{ item.carNum - item.cars2 }}寮�</view>
<view v-else>宸查瀹�</view>
</view>
</view>
@@ -60,16 +60,16 @@
<uni-th align="center" width="80">鎻愮叅鍗曚釜鏁�</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in historyCoalData" :key="index">
- <uni-td align="center">{{ item.sendDate }}</uni-td>
- <uni-td align="left">{{ item.deptName }}</uni-td>
- <uni-td align="center">{{ item.filedName }}</uni-td>
- <uni-td align="center">{{ item.coalName }}</uni-td>
- <uni-td align="center">{{ item.orderCode }}</uni-td>
- <uni-td align="center">{{ item.carNumSurplus }}</uni-td>
- <uni-td align="center">{{ item.tmCount }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate }}</uni-td>
+ <uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus }}</uni-td>
+ <uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount }}</uni-td>
</uni-tr>
</uni-table>
- <view class="more_text" v-if="showMoreData">娌℃湁鏁版嵁浜�...</view>
+ <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
</scroll-view>
</view>
<!-- 棰嗗彇寮瑰嚭妗� -->
@@ -99,11 +99,12 @@
combinedTitle
},
watch: {
- orderPlanDataStore(v) {
- if (v.length > 0) {
- console.log(v, 'props');
+ orderPlanDataStore: {
+ handler(v) {
this.orderPlanData = v;
- }
+ },
+ deep: true,
+ immediate: true
}
},
data() {
@@ -120,7 +121,7 @@
loading: false,
scrollTop: 0,
// 姣忛〉鏁版嵁閲�
- pageSize: 5,
+ pageSize: 10,
// 褰撳墠椤�
pageCurrent: 1,
// 鏁版嵁鎬婚噺
@@ -137,13 +138,10 @@
init() {
this.GetOrderPlan();
this.getJhOrderPlanDataPage();
- if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
},
// 鑾峰彇鍙戣繍璁″垝鍒楄〃
GetOrderPlan() {
- uni.showLoading({
- title: '鍔犺浇涓�...'
- });
+ uni.showLoading({ title: '鍔犺浇涓�...' });
this.$reqGet('GetOrderPlan').then(res => {
if (res.data) {
this.orderPlanData = res.data;
@@ -156,15 +154,18 @@
this.loading = true;
this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
if (res.data.records) {
- this.historyCoalData = [...this.historyCoalData, ...res.data.records];
- this.total = res.data.total;
- this.loading = false;
+ if (this.pageCurrent > 1) {
+ this.historyCoalData = this.historyCoalData.concat(res.data.records);
+ this.loading = false;
+ } else {
+ this.historyCoalData = res.data.records;
+ this.loading = false;
+ }
+ // this.historyCoalData = [...this.historyCoalData, ...res.data.records];
+ // this.total = res.data.total;
+ // this.loading = false;
}
});
- },
- change2(e) {
- this.pageCurrent = e.current;
- this.getJhOrderPlanDataPage();
},
// 涓婃媺鍔犺浇
historyScrolltolower() {
@@ -175,9 +176,7 @@
popupDetermineClick() {
if (this.receiveNum) {
this.getOrderNum.num = this.receiveNum;
- uni.showLoading({
- title: '鍔犺浇涓�...'
- });
+ uni.showLoading({ title: '鍔犺浇涓�...' });
this.$reqPost('customerGet', this.getOrderNum, 'params').then(res => {
uni.hideLoading();
if (res.code == 0) {
@@ -189,7 +188,7 @@
duration: 1000
});
} else {
- this.$u.toast(res.data ? res.data : '棰嗗彇澶辫触');
+ this.$u.toast(res.msg ? res.msg : '棰嗗彇澶辫触');
}
});
} else {
@@ -218,32 +217,33 @@
},
// 鎻愮叅鍗曡鎯�
cardBodyClick(name) {
+ console.log(name, 'name');
let code = null;
+ let cars2 = null;
this.orderPlanData.forEach(item => {
if (item.id == name) {
code = item.code;
+ cars2 = item.cars2;
}
});
- uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}&code=${code}`
- });
+ uni.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}&code=${code}&cars2=${cars2}` });
+ },
+ // 鐐瑰嚮鍘嗗彶鎻愮叅鍗曚竴琛岃幏鍙栬鎯�
+ faYundetail(v) {
+ uni.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}` });
},
// 杞彂
forwardClick(obj) {
- uni.navigateTo({
- url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&carNumSurplus1=${obj.carNumSurplus1}&carNum=${obj.carNum}&cars2=${obj.cars2}`
- });
+ uni.navigateTo({ url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&carNumSurplus1=${obj.carNumSurplus1}&carNum=${obj.carNum}&cars2=${obj.cars2}` });
}
}
};
</script>
<style lang="scss" scoped>
-.uni-pagination-box {
- height: 60rpx;
-}
.scroll-Y {
- height: 300rpx;
+ height: 600rpx;
+ margin-bottom: vww(50);
.more_text {
color: #999;
font-size: 24rpx;
@@ -255,7 +255,7 @@
margin: 0 auto;
// 涓讳綋
.customer-index-body {
- margin-bottom: vww(56);
+ margin-bottom: vww(10);
.card-left__top {
margin-top: vww(26);
text-align: center;
--
Gitblit v1.9.1