增加新功能，修复bug

qingyiay

2023-05-30 4b74ae71c84d7c3a2fcc83d1ef75f11f8f8c05e0

 pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue

@@ -1,18 +1,29 @@
<template>
   <view class="freightForwarder-index">
      <view class="freightForwarder-index-body">
         <view class="wait-collection" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain"></view>
         <view class="wait-collection"
            style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
         </view>
         <view style="position: relative;top: -120px;">
            <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty>
            <u-empty mode="data"
               icon="http://cdn.uviewui.com/uview/empty/data.png"
               textSize="30"
               iconSize="1000"
               v-if="orderPlanData.length == 0"></u-empty>
         </view>
         <view class="collection-form">
            <view class="collection-form-item" v-for="(item, index) in orderPlanData" :key="index" @click="cardBodyClick(item)">
            <view class="collection-form-item"
               v-for="(item, index) in orderPlanData"
               :key="index"
               @click="cardBodyClick(item)">
               <view class="first-line">
                  <view class="main-information">
                     <view class="sign">装</view>
                     <view class="filedname exceedHide">
                        <text v-if="item.orderType == '外销' || item.orderType == '内销' || item.orderType == '转出'">{{ item.deptName }}</text>
                        <text v-else-if="item.orderType == '外购' || item.orderType == '内购' || item.orderType == '转入'">{{ item.customerName }}</text>
                        <text
                           v-if="item.orderType == '外销' || item.orderType == '内销' || item.orderType == '转出'">{{ item.deptName }}</text>
                        <text
                           v-else-if="item.orderType == '外购' || item.orderType == '内购' || item.orderType == '转入'">{{ item.customerName }}</text>
                     </view>
                  </view>
                  <view class="main-divider"></view>
@@ -25,8 +36,10 @@
                  <view class="main-information">
                     <view class="sign">卸</view>
                     <view class="filedname exceedHide">
                        <text v-if="item.orderType == '外销' || item.orderType == '内销' || item.orderType == '转出'">{{ item.customerName }}</text>
                        <text v-else-if="item.orderType == '外购' || item.orderType == '内购' || item.orderType == '转入'">{{ item.deptName }}</text>
                        <text
                           v-if="item.orderType == '外销' || item.orderType == '内销' || item.orderType == '转出'">{{ item.customerName }}</text>
                        <text
                           v-else-if="item.orderType == '外购' || item.orderType == '内购' || item.orderType == '转入'">{{ item.deptName }}</text>
                     </view>
                  </view>
               </view>
@@ -34,19 +47,23 @@
                  <view class="coal-name">
                     <view class="">{{ item.coalName }}</view>
                     <view class="black-bar"></view>
                     <view class="coal-type" v-if="item.orderType">{{ item.orderType }}</view>
                     <view class="coal-type"
                        v-if="item.orderType">{{ item.orderType }}</view>
                  </view>
               </view>
               <view class="third-line">
                  <view class="time-icon">
                     <view
                        style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover"
                     ></view>
                        style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
                     </view>
                  </view>
                  <view class="send-date">{{ item.sendDate }}</view>
               </view>
               <view class="fourth-line">
                  <view class="forward" @click.stop="forwardClick(item)"><view class="button-image">转发</view></view>
                  <view class="forward"
                     @click.stop="forwardClick(item)">
                     <view class="button-image">转发</view>
                  </view>
               </view>
            </view>
         </view>
@@ -55,16 +72,29 @@
         </view> -->
         <view class="history-numbers">
            <combined-title title="历史提煤单"></combined-title>
            <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltolower="historyScrolltolower">
               <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="historyCoalData.length === 0"></u-empty>
               <view class="history-information" v-for="(item, index) in historyCoalData" :key="index" @click="faYundetail(item)">
            <scroll-view :scroll-top="scrollTop"
               scroll-y="true"
               class="scroll-Y"
               @scrolltolower="historyScrolltolower">
               <u-empty mode="data"
                  icon="http://cdn.uviewui.com/uview/empty/data.png"
                  textSize="30"
                  iconSize="1000"
                  v-if="historyCoalData.length === 0"></u-empty>
               <view class="history-information"
                  v-for="(item, index) in historyCoalData"
                  :key="index"
                  @click="faYundetail(item)">
                  <view class="first">
                     <view class="">{{ item.deptName || '' }}</view>
                     <view class=""><u-icon name="arrow-right" color="#999999" size="40"></u-icon></view>
                     <view class=""><u-icon name="arrow-right"
                           color="#999999"
                           size="40"></u-icon></view>
                  </view>
                  <view class="second">
                     <view class="coal-name">{{ item.coalName || '' }}</view>
                     <view class="order-type" v-if="item.orderType">{{ item.orderType || '' }}</view>
                     <view class="order-type"
                        v-if="item.orderType">{{ item.orderType || '' }}</view>
                  </view>
                  <view class="third">
                     <view class="third-line">
@@ -73,8 +103,7 @@
                     </view>
                     <view class="third-line">
                        <view class="third-line_text">剩余数：</view>
                        <view class="third-line_num" v-if="roleType == 1">{{ item.carNumSurplus1 }}</view>
                        <view class="third-line_num" v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
                        <view class="third-line_num">{{ item.carNumSurplus }}</view>
                     </view>
                     <view class="third-line">
                        <view class="third-line_text">提煤单个数：</view>
@@ -84,22 +113,23 @@
                  <view class="fourth">
                     <view class="fourth-icon">
                        <view
                           style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover"
                        ></view>
                           style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
                        </view>
                     </view>
                     <view class="senddate">{{ item.sendDate }}</view>
                  </view>
                  <view class="fourth">
                     <view class="fourth-icon">
                        <view
                           style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover"
                        ></view>
                           style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover">
                        </view>
                     </view>
                     <view class="senddate">{{ item.orderCode }}</view>
                  </view>
               </view>
               <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">没有数据了...</view>
               <view class="white-block"></view>
               <view class="more_text"
                  v-if="showMoreData && historyCoalData.length !== 0">没有数据了...</view>
               <!-- <view class="white-block"></view> -->
            </scroll-view>
         </view>
      </view>
@@ -215,7 +245,7 @@
         //    }
         // });
         uni.navigateTo({
            url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${item.orderPlanId}&code=${item.code}`
               url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${item.orderPlanId}&carNum=${item.carNum}`
         });
      },
      // 转发
@@ -234,12 +264,14 @@
};
</script>

<style lang="scss" scoped>
<style lang="scss"
   scoped>
@mixin flex {
   display: flex;
   justify-content: space-between;
   align-items: center;
}

@mixin firstLine {
   width: 94%;
   height: vww(68);
@@ -247,18 +279,22 @@
   display: flex;
   justify-content: space-between;
}

.scroll-Y {
   height: 900rpx;

   .more_text {
      color: #333;
      font-size: 24rpx;
      text-align: center;
   }
}

.history-numbers {
   width: 100%;
   position: relative;
   top: vww(-110);

   .history-information {
      width: 690rpx;
      height: 398rpx;
@@ -270,6 +306,7 @@
      align-items: flex-start;
      justify-content: space-evenly;
      overflow: hidden;

      .first {
         width: 96%;
         height: 34rpx;
@@ -279,6 +316,7 @@
         @include flex;
         margin: vww(10) vww(10) 0;
      }

      .second {
         width: 100%;
         height: 31rpx;
@@ -288,11 +326,13 @@
         margin: vww(10) vww(10) 0;
         @include flex;
         justify-content: flex-start;

         .coal-name {
            min-width: vww(30);
            height: vww(20);
            margin-right: vww(21);
         }

         .order-type {
            color: #035cfb;
            border: 2px solid #035cfb;
@@ -301,6 +341,7 @@
            text-align: center;
         }
      }

      .third {
         width: 96%;
         height: 31rpx;
@@ -309,16 +350,20 @@
         color: #515151;
         margin: vww(10) vww(10) 0;
         @include flex;

         .third-line {
            @include flex;

            &_text {
               color: #919090;
            }

            &_num {
               color: #035cfb;
            }
         }
      }

      .fourth {
         width: 50%;
         height: 31rpx;
@@ -327,25 +372,30 @@
         color: #515151;
         margin: vww(10) vww(10) 0;
         @include flex;

         .fourth-icon {
            width: vww(13);
            height: vww(13);
            margin-right: vww(14);
         }

         .senddate {
            flex: 1;
         }
      }
   }
}

.exceedHide {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
}

::v-deep.freightForwarder-index {
   width: 100%;
   margin: 0 auto;

   // 主体
   .freightForwarder-index-body {
      .wait-collection {
@@ -355,11 +405,13 @@
         top: vww(-10);
         z-index: 0;
      }

      .collection-form {
         width: vww(345);
         margin: 0 vww(15);
         position: relative;
         top: vww(-144);

         .collection-form-item {
            width: 690rpx;
            height: 340rpx;
@@ -372,18 +424,21 @@
            position: relative;
            align-items: flex-start;
            margin-top: vww(10);

            .first-line {
               width: 94%;
               height: vww(30);
               margin: vww(10) vww(16) 0 vww(16);
               display: flex;
               justify-content: space-between;

               .main-information {
                  width: 88%;
                  height: vww(28);
                  display: flex;
                  justify-content: flex-start;
                  align-items: center;

                  .sign {
                     width: vww(28);
                     height: vww(28);
@@ -397,6 +452,7 @@
                     margin-right: vww(20);
                  }
               }

               .main-divider {
                  width: 560rpx;
                  height: 1rpx;
@@ -405,15 +461,18 @@
                  top: 98rpx;
                  left: 122rpx;
               }

               .point-number {
                  position: absolute;
                  right: 0;
                  width: 15%;

                  text {
                     font-size: 24rpx;
                     font-weight: 400;
                     color: #c78a64;
                  }

                  .residue {
                     font-size: 40rpx;
                     font-weight: 400;
@@ -421,14 +480,17 @@
                  }
               }
            }

            .first-extra {
               @include firstLine;

               .main-information {
                  width: 100%;
                  height: vww(28);
                  display: flex;
                  justify-content: flex-start;
                  align-items: center;

                  .sign {
                     width: vww(28);
                     height: vww(28);
@@ -443,6 +505,7 @@
                  }
               }
            }

            .second-line {
               width: 100%;
               height: vww(40);
@@ -450,6 +513,7 @@
               display: flex;
               justify-content: flex-start;
               align-items: center;

               .coal-name {
                  flex-grow: 1;
                  height: 30rpx;
@@ -459,12 +523,14 @@
                  position: relative;
                  display: flex;
                  align-items: center;

                  .black-bar {
                     width: 2rpx;
                     height: 30rpx;
                     background: #515151;
                     margin-left: vww(12);
                  }

                  .coal-type {
                     margin-left: vww(12);
                     min-width: vww(50);
@@ -476,6 +542,7 @@
                  }
               }
            }

            .third-line {
               width: 40%;
               height: vww(50);
@@ -483,6 +550,7 @@
               display: flex;
               justify-content: flex-start;
               align-items: center;

               .send-date {
                  width: 148rpx;
                  height: 24rpx;
@@ -493,6 +561,7 @@
                  color: #515151;
               }
            }

            .fourth-line {
               width: 40%;
               height: vww(30);
@@ -500,10 +569,12 @@
               position: relative;
               left: 60%;
               bottom: vww(10);

               .forward {
                  width: vww(123);
                  height: vww(48);
                  left: vww(140);

                  .button-image {
                     width: 100%;
                     height: 100%;