From 7406be32979e90a730b5a2ac8d392892f71835d2 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 10 四月 2023 14:53:17 +0800
Subject: [PATCH] 修复称重不显示问题，优化信息提示
---
pages/customer-page/customer-index/customer-index.vue | 153 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 120 insertions(+), 33 deletions(-)
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 5b11efb..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>
@@ -46,7 +46,32 @@
</template>
</card>
</view>
-
+ <view class="history-numbers">
+ <combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+ <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltolower="historyScrolltolower">
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" :loading="loading">
+ <uni-tr>
+ <uni-th width="100" align="center">鍙戣繍鏃ユ湡</uni-th>
+ <uni-th width="100" align="center">鎵�灞炲崟浣�</uni-th>
+ <uni-th align="center" width="150">鐓ゅ満鍚嶇О</uni-th>
+ <uni-th align="center" width="100">鐓ょ鍚嶇О</uni-th>
+ <uni-th align="center" width="150">璁㈠崟缂栧彿</uni-th>
+ <uni-th align="center" width="100">璁㈠崟鍓╀綑閲�</uni-th>
+ <uni-th align="center" width="80">鎻愮叅鍗曚釜鏁�</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(item, index) in historyCoalData" :key="index">
+ <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 && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
+ </scroll-view>
+ </view>
<!-- 棰嗗彇寮瑰嚭妗� -->
<u-popup :show="show" @close="close" @open="open" mode="center" round="10">
<view class="receiverPopup">
@@ -60,12 +85,27 @@
<script>
import card from '@/components/card/card.vue';
+import combinedTitle from '@/components/combined-title/combined-title.vue';
import { customerId } from '@/utils/status';
-// import colorGradient from '@/uni_modules/uview-ui/libs/function/colorGradient';
-import { todayDate } from '@/utils/util.js';
export default {
+ props: {
+ orderPlanDataStore: {
+ type: Array,
+ default: []
+ }
+ },
components: {
- card
+ card,
+ combinedTitle
+ },
+ watch: {
+ orderPlanDataStore: {
+ handler(v) {
+ this.orderPlanData = v;
+ },
+ deep: true,
+ immediate: true
+ }
},
data() {
return {
@@ -75,37 +115,68 @@
getOrderNum: {
num: '',
id: null
- }
+ },
+ historyCoalData: [],
+ // 琛ㄦ牸鍔犺浇鐘舵��
+ loading: false,
+ scrollTop: 0,
+ // 姣忛〉鏁版嵁閲�
+ pageSize: 10,
+ // 褰撳墠椤�
+ pageCurrent: 1,
+ // 鏁版嵁鎬婚噺
+ total: 0,
+ // 鏄惁鏄剧ず鏇村鏁版嵁
+ showMoreData: false
};
},
+ onLoad() {},
onShow() {
this.init();
- console.log(todayDate, '鑾峰彇浠婂ぉ鐨勬棩鏈�');
},
methods: {
init() {
this.GetOrderPlan();
+ this.getJhOrderPlanDataPage();
},
// 鑾峰彇鍙戣繍璁″垝鍒楄〃
GetOrderPlan() {
- uni.showLoading({
- title: '鍔犺浇涓�...'
- });
+ uni.showLoading({ title: '鍔犺浇涓�...' });
this.$reqGet('GetOrderPlan').then(res => {
- this.orderPlanData = res.data;
- uni.hideLoading();
+ if (res.data) {
+ this.orderPlanData = res.data;
+ uni.hideLoading();
+ }
});
},
- // 棰嗗彇鐐瑰嚮
- // numInput(id) {
-
- // },
+ // 鑾峰彇鍘嗗彶鎻愮叅鍗�
+ getJhOrderPlanDataPage() {
+ this.loading = true;
+ this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
+ if (res.data.records) {
+ 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;
+ }
+ });
+ },
+ // 涓婃媺鍔犺浇
+ historyScrolltolower() {
+ if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
+ this.pageCurrent++;
+ this.getJhOrderPlanDataPage();
+ },
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) {
@@ -116,6 +187,8 @@
icon: 'none',
duration: 1000
});
+ } else {
+ this.$u.toast(res.msg ? res.msg : '棰嗗彇澶辫触');
}
});
} else {
@@ -128,17 +201,14 @@
},
/**
* @瀹㈡埛棰嗗彇
+ * 棰嗗彇寮规
*/
receiveClick(item) {
this.show = true;
-
this.getOrderNum.id = item.id; // 鑾峰彇棰嗗彇鎻愮叅鍗曠殑id
},
- open() {
- console.log('鎵撳紑浜�');
- },
+ open() {},
close() {
- console.log('鍏抽棴鏂规硶');
this.show = false;
this.receiveNum = null;
},
@@ -147,28 +217,45 @@
},
// 鎻愮叅鍗曡鎯�
cardBodyClick(name) {
- console.log('鎻愮叅鍗曡鎯�', name);
- uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${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}&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}`
- });
+ 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>
+.scroll-Y {
+ height: 600rpx;
+ margin-bottom: vww(50);
+ .more_text {
+ color: #999;
+ font-size: 24rpx;
+ text-align: center;
+ }
+}
::v-deep.customer-index {
width: 94%;
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