fix:修改测试单若干bug

yangan

2024-07-03 cbe582d4cee959967527148b1f15917b8194ed85

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

@@ -2,15 +2,29 @@
   <view class="">
      <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">
               style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
            </view>
               <!-- 自主配送界面 -->
            <view class="self-deliver">
               <view class="self-deliver_text">
                  创建日计划订单
               </view>
               <view class="self-deliver_btn">
                  <u-button text="去创建"
                     type="primary"
                     shape="cirle"
                     @click="selfDeliver"></u-button>
               </view>
            </view>
            <view style="position: relative;top: -120px;">
               <u-empty mode="data"
                  icon="http://cdn.uviewui.com/uview/empty/data.png"
                  textSize="30"
                  iconSize="1000"
                  text="暂无数据"
                  v-if="orderPlanData.length == 0"></u-empty>
            </view>
            <view class="collection-form">
@@ -20,6 +34,8 @@
                  @click="cardBodyClick(item)">
                  <view class="first-line">
                     <view class="dispatch-receive">
                        <view class="dispatch-dept">{{ item.deptName }}</view>
                        <view class="black-bar"></view>
                        <view class="dispatch">{{ item.filedName }}</view>
                     </view>
                     <view class="point-number">
@@ -27,18 +43,26 @@
                        <text>/{{ item.carNum }}</text>
                     </view>
                  </view>
                  <view class="second-line"
                     style="width: 94%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
                     v-if="item.orderType==='内销'||item.orderType==='外购' || item.orderType==='外购退'">
                     {{item.customerName}}
                  </view>
                  <view class="second-line">
                     <view class="coal-name">
                        <view class="">{{ item.coalName }}</view>
                        <view class="">{{ item.productNames || item.productName }}</view>
                        <view class="black-bar"></view>
                        <view class="coal-type"
                           v-if="item.orderType">{{ item.orderType }}</view>
                     </view>
                  </view>
                  <view class="second-line">
                     {{item.orderCode}}
                  </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">
                           style="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
                        </view>
                     </view>
                     <view class="send-date">{{ item.sendDate }}</view>
@@ -67,6 +91,7 @@
                     icon="http://cdn.uviewui.com/uview/empty/data.png"
                     textSize="30"
                     iconSize="1000"
                     text="暂无数据"
                     v-if="historyCoalData.length == 0"></u-empty>
                  <view class="history-information"
                     v-for="(item, index) in historyCoalData"
@@ -79,7 +104,7 @@
                              size="40"></u-icon></view>
                     </view>
                     <view class="second">
                        <view class="coal-name">{{ item.coalName || '' }}</view>
                        <view class="coal-name">{{  item.productNames || item.productName }}</view>
                        <view class="order-type">{{ item.orderType || '' }}</view>
                     </view>
                     <view class="third">
@@ -95,14 +120,14 @@
                              v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
                        </view>
                        <view class="third-line">
                           <view class="third-line_text">提煤单个数:</view>
                           <view class="third-line_text">收发单个数:</view>
                           <view class="third-line_num">{{ item.tmCount }}</view>
                        </view>
                     </view>
                     <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">
                              style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
                           </view>
                        </view>
                        <view class="senddate">{{ item.sendDate }}</view>
@@ -110,7 +135,7 @@
                     <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;">
                              style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
                           </view>
                        </view>
                        <view class="senddate">{{ item.orderCode }}</view>
@@ -138,7 +163,8 @@
               <view class="receiverPopup__btn"><u-button text="确定"
                     type="primary"
                     @click="popupDetermineClick"
                     :disabled="canClick"></u-button></view>
                     :disabled="canClick"
                     :loading="popupDetermineClickLoading"></u-button></view>
            </view>
         </u-popup>
      </view>
@@ -195,15 +221,15 @@
            total: 0,
            // 是否显示更多数据
            showMoreData: false,
            cars2: "",
            carNum: "",
            cars2: "",  //领取日计划的车数
            carNum: "",  //日计划的总车数
            // 剩余的提煤单数量
            carNumSurplus: '',
            canClick: false
            canClick: false,
            popupDetermineClickLoading: false
         };
      },
      onLoad() {},
      onShow() {
      onLoad() {
         this.init();
      },
      methods: {
@@ -255,13 +281,16 @@
            }, []);
            return arrays;
         },
      //领取弹框
         popupDetermineClick() {
            if (this.receiveNum > 0) {
               this.popupDetermineClickLoading = true;
               this.getOrderNum.num = this.receiveNum;
               uni.showLoading({ title: '加载中...' });
               this.$reqPost('customerGet', this.getOrderNum, 'params').then(res => {
                  uni.hideLoading();
                  if (res.code == 0) {
                     this.popupDetermineClickLoading = false;
                     this.getOrderNum.num = '';
                     this.GetOrderPlan();
                     this.show = false;
@@ -271,6 +300,7 @@
                        duration: 1000
                     });
                  } else {
                     this.popupDetermineClickLoading = false;
                     this.$u.toast(res.msg ? res.msg : '领取失败');
                  }
               });
@@ -310,15 +340,15 @@
               this.$u.toast('已超过当前日计划提煤单数量,请重新输入')
            }
         },
         // 提煤单详情
         // （顶部）发运计划详情
         cardBodyClick(v) {
            uni
      .navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
               .navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
         },
         // 点击历史提煤单获取详情
         faYundetail(v) {
            uni.navigateTo({
               url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}&coalName=${v.coalName}&deptName=${v.deptName}`
               url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}&productNames=${v.productNames || v.productName}&deptName=${v.deptName}`
            });
         },
         // 转发
@@ -326,6 +356,12 @@
            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}` });
         },
         // 自主配送
         selfDeliver() {
            uni.navigateTo({
               url: '/pages/customer-page/addDailyPlan/addDailyPlan'
            })
         }
      }
   };
@@ -333,11 +369,40 @@

<style lang="scss"
   scoped>
	
   @mixin flex {
      display: flex;
      justify-content: space-between;
      align-items: center;
   }
   // 自主配送
         .self-deliver {
            position: relative;
            top: vww(-150);
            width: 88%;
            height: vww(50);
            margin: vww(8) auto;
            padding: 0 vww(8);
            background: #ffffff;
            box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
            border-radius: 20rpx;
            @include flex;

			
         }
            /deep/.u-button {
               width: 100%;
               height: 28px !important;
               line-height: 40px;
               padding: 0 12px;
               font-size: 28rpx;
               font-weight: 300;
               color: #ffffff;
               background: #497bfb !important;
               letter-spacing: 4rpx;
               border-radius: 37rpx 37rpx 37rpx 37rpx !important;
               box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
            }

   .wait-collection {
      width: 100%;
@@ -473,12 +538,13 @@

            .collection-form-item {
               width: 690rpx;
               height: 300rpx;
               height: 370rpx;
               background: #ffffff;
               box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
               border-radius: 20rpx;
               overflow: hidden;
               @include flex flex-direction: column;
               @include flex;
               flex-direction: column;
               position: relative;
               align-items: flex-start;
               margin-top: vww(10);
@@ -493,8 +559,27 @@
                  .dispatch-receive {
                     width: 70%;
                     display: flex;
                     justify-content: space-between;
                     justify-content: flex-start;
                     align-items: center;

                     .dispatch-dept {

                        display: flex;
                        align-items: center;
                     }

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

                     .dispatch {
                        margin-left: vww(12);
                        min-width: vww(50);
                     }

                  }

                  .point-number {
@@ -656,4 +741,4 @@
         }
      }
   }
</style>
</style>