修改大部分问题

qingyiay

2023-03-28 e7b0b34176549cfec809c6b89c4cab0999e488b9

 pages/customer-page/customer-index/customer-index.vue

@@ -10,7 +10,7 @@
               </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 text="转发" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button>
               </view>
            </template>
            <template v-slot:right-top>
@@ -48,7 +48,7 @@
      </view>
      <view class="history-numbers">
         <combined-title title="历史提煤单"></combined-title>
         <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y">
         <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>
@@ -60,17 +60,17 @@
                  <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>
         </scroll-view>
         <view class="uni-pagination-box"><uni-pagination show-icon :page-size="pageSize" :current="pageCurrent" :total="total" @change="change2" /></view>
      </view>
      <!-- 领取弹出框 -->
      <u-popup :show="show" @close="close" @open="open" mode="center" round="10">
@@ -88,9 +88,24 @@
import combinedTitle from '@/components/combined-title/combined-title.vue';
import { customerId } from '@/utils/status';
export default {
   props: {
      orderPlanDataStore: {
         type: Array,
         default: []
      }
   },
   components: {
      card,
      combinedTitle
   },
   watch: {
      orderPlanDataStore: {
         handler(v) {
            this.orderPlanData = v;
         },
         deep: true,
         immediate: true
      }
   },
   data() {
      return {
@@ -106,11 +121,13 @@
         loading: false,
         scrollTop: 0,
         // 每页数据量
         pageSize: 5,
         pageSize: 10,
         // 当前页
         pageCurrent: 1,
         // 数据总量
         total: 0
         total: 0,
         // 是否显示更多数据
         showMoreData: false
      };
   },
   onLoad() {},
@@ -121,6 +138,7 @@
      init() {
         this.GetOrderPlan();
         this.getJhOrderPlanDataPage();
         if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
      },
      // 获取发运计划列表
      GetOrderPlan() {
@@ -128,22 +146,27 @@
            title: '加载中...'
         });
         this.$reqGet('GetOrderPlan').then(res => {
            this.orderPlanData = res.data;
            uni.hideLoading();
            if (res.data) {
               this.orderPlanData = res.data;
               uni.hideLoading();
            }
         });
      },
      // 获取历史提煤单
      getJhOrderPlanDataPage() {
         this.loading = true;
         this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
            this.historyCoalData = res.data.records;
            this.total = res.data.total;
            this.loading = false;
            if (res.data.records) {
               this.historyCoalData = [...this.historyCoalData, ...res.data.records];
               this.total = res.data.total;
               this.loading = false;
            }
         });
      },
      change2(e) {
         console.log(e, '页码改变');
         this.pageCurrent = e.current;
      // 上拉加载
      historyScrolltolower() {
         if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
         this.pageCurrent++;
         this.getJhOrderPlanDataPage();
      },
      popupDetermineClick() {
@@ -192,14 +215,23 @@
      },
      // 提煤单详情
      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}`
            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}`
         });
      },
      // 转发
@@ -213,11 +245,13 @@
</script>

<style lang="scss" scoped>
.uni-pagination-box {
   height: 60rpx;
}
.scroll-Y {
   height: 600rpx;
   .more_text {
      color: #999;
      font-size: 24rpx;
      text-align: center;
   }
}
::v-deep.customer-index {
   width: 94%;