增加新功能，修复bug

qingyiay

2023-05-30 4b74ae71c84d7c3a2fcc83d1ef75f11f8f8c05e0

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

@@ -3,12 +3,21 @@
      <view class="customer-index">
         <view class="customer-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="dispatch-receive">
                        <view class="dispatch">{{ item.filedName }}</view>
@@ -22,20 +31,27 @@
                     <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;li ne-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;li ne-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="receive" @click.stop="receiveClick(item)"><view class="button-image">领取</view></view>
                     <view class="forward" @click.stop="forwardClick(item)"><view class="button-image">转发</view></view>
                     <view class="receive"
                        @click.stop="receiveClick(item)">
                        <view class="button-image">领取</view>
                     </view>
                     <view class="forward"
                        @click.stop="forwardClick(item)">
                        <view class="button-image">转发</view>
                     </view>
                  </view>
               </view>
            </view>
@@ -43,12 +59,24 @@
            <!-- 历史提煤单 -->
            <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>
@@ -61,8 +89,10 @@
                        </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"
                              v-if="roleType == 1">{{ item.carNumSurplus1 }}</view>
                           <view class="third-line_num"
                              v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
                        </view>
                        <view class="third-line">
                           <view class="third-line_text">提煤单个数:</view>
@@ -72,31 +102,43 @@
                     <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="more_text"
                     v-if="showMoreData && historyCoalData.length !== 0">没有数据了...</view>
                  <view class="white-block"></view>
               </scroll-view>
            </view>
         </view>
         <!-- 领取弹出框 -->
         <u-popup :show="show" @close="close" @open="open" mode="center" round="10">
         <u-popup :show="show"
            @close="close"
            @open="open"
            mode="center"
            round="10">
            <view class="receiverPopup">
               <view class="receiverPopup__title"><text>确认领取数量</text></view>
               <view class="receiverPopup__input"><u--input v-model="receiveNum" @change="change" placeholder="请输入内容" type="number" border="surround"></u--input></view>
               <view class="receiverPopup__btn"><u-button text="确定" type="primary" @click="popupDetermineClick"></u-button></view>
               <view class="receiverPopup__input"><u--input v-model="receiveNum"
                     @change="change"
                     placeholder="请输入内容"
                     type="number"
                     border="surround"></u--input></view>
               <view class="receiverPopup__btn"><u-button text="确定"
                     type="primary"
                     @click="popupDetermineClick"
                     :disabled="canClick"></u-button></view>
            </view>
         </u-popup>
      </view>
@@ -152,7 +194,12 @@
         // 数据总量
         total: 0,
         // 是否显示更多数据
         showMoreData: false
            showMoreData: false,
            cars2: "",
            carNum: "",
            // 剩余的提煤单数量
            carNumSurplus: '',
            canClick: false
      };
   },
   onLoad() {},
@@ -248,6 +295,8 @@
      receiveClick(item) {
         this.show = true;
         this.getOrderNum.id = item.id; // 获取领取提煤单的id
            this.cars2 = item.cars2
            this.carNum = item.carNum
      },
      open() {},
      close() {
@@ -256,10 +305,15 @@
      },
      change(e) {
         console.log('输入框', e);
            this.canClick = e > (this.carNum - this.cars2)
            if (this.canClick) {
               this.$u.toast('已超过当前日计划提煤单数量,请重新输入')
            }
      },
      // 提煤单详情
      cardBodyClick(v) {
         uni.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
            uni
      .navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
      },
      // 点击历史提煤单获取详情
      faYundetail(v) {
@@ -270,18 +324,21 @@
      // 转发
      forwardClick(obj) {
         if (obj.cars2 == 0) return this.$u.toast('请先领取后再转发');
         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>
<style lang="scss"
   scoped>
@mixin flex {
   display: flex;
   justify-content: space-between;
   align-items: center;
}

.wait-collection {
   width: 100%;
   height: 600rpx;
@@ -289,23 +346,28 @@
   top: vww(-10);
   z-index: 0;
}

.white-block {
   width: 100%;
   height: vww(50);
   margin-top: vww(10);
}

.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;
@@ -317,6 +379,7 @@
      align-items: flex-start;
      justify-content: space-evenly;
      overflow: hidden;

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

      .second {
         width: 100%;
         height: 31rpx;
@@ -335,11 +399,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;
@@ -348,6 +414,7 @@
            text-align: center;
         }
      }

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

         .third-line {
            @include flex;

            &_text {
               color: #919090;
            }

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

      .fourth {
         width: 100%;
         height: 31rpx;
@@ -374,11 +445,13 @@
         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;
         }
@@ -389,6 +462,7 @@
::v-deep.customer-index {
   width: 100%;
   margin: 0 auto;

   // 主体
   .customer-index-body {
      .collection-form {
@@ -396,6 +470,7 @@
         margin: 0 vww(15);
         position: relative;
         top: vww(-144);

         .collection-form-item {
            width: 690rpx;
            height: 300rpx;
@@ -407,25 +482,30 @@
            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;

               .dispatch-receive {
                  width: 70%;
                  display: flex;
                  justify-content: space-between;
                  align-items: center;
               }

               .point-number {
                  width: 15%;

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

                  .residue {
                     font-size: 40rpx;
                     font-weight: 400;
@@ -433,6 +513,7 @@
                  }
               }
            }

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

               .coal-name {
                  flex-grow: 1;
                  height: 30rpx;
@@ -449,12 +531,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);
@@ -466,6 +550,7 @@
                  }
               }
            }

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

               .send-date {
                  margin-left: vww(14);
                  width: 148rpx;
@@ -483,6 +569,7 @@
                  color: #515151;
               }
            }

            .fourth-line {
               width: 100%;
               height: vww(30);
@@ -491,6 +578,7 @@
               position: relative;
               bottom: vww(10);
               left: 25%;

               .receive,
               .forward {
                  width: vww(123);
@@ -500,6 +588,7 @@
                  color: #ffffff;
                  font-size: 28rpx;
                  position: absolute;

                  .button-image {
                     width: 100%;
                     height: 100%;
@@ -512,12 +601,15 @@
                     line-height: vww(45);
                  }
               }

               .receive {
                  left: vww(20);
               }

               .forward {
                  width: vww(106);
                  left: vww(140);

                  .button-image {
                     width: 100%;
                     height: 100%;
@@ -557,6 +649,7 @@
      &__btn {
         margin: vww(10) auto;
         width: 50%;

         .u-button {
            height: vww(20);
         }