feat:发版

yangan

2024-08-09 040acd447439dc98536281414a6d43a54b00719d

 pages/public-page/forward/forward.vue

@@ -15,7 +15,7 @@
         <u-notice-bar :text="text"
            :fontSize="30"></u-notice-bar>
         <view class="notice-icon"
            style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;">
            style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;">
         </view>
      </view>
      <view v-else-if="roleType == 2"
@@ -88,13 +88,21 @@
               :hairline="false"
               @click.stop="addForm"
               :disabled="whetherClick"></u-button></view>
         <!--分享日计划  -->
         <view 
         class="AdddBtn" v-if="isshow"><u-button text="分享日计划"
               :hairline="false"
               open-type="share"
               :loading='loading'></u-button></view>
         <!-- 提交按钮 -->
         <view class="forwardBtn"><u-button text="提交"
         <view 
         class="forwardBtn"><u-button text="提交"
               :hairline="false"
               type="warning"
               @click.stop="submitForm"
               :disabled="whetherClick1"
               :loading='loading'></u-button></view>
			
      </view>
      <!-- 增加按钮 -->

@@ -152,6 +160,8 @@
   export default {
      onLoad(params) {
         console.log(params, '转发页面的参数');
         let reg=RegExp(/销/)
         this.isshow=!reg.test(params.orderType)
         // 客户
         this.cars2 = Number(params.cars2);
         this.tempcarNumSurplus1 = this.carNumSurplus1 = Number(params.carNumSurplus1 || 0);
@@ -160,27 +170,41 @@
         this.carNumSurplusHuodai = this.forwardSurplus = Number(params.carNumSurplusHuodai || 0);
         this.orderPlanId = params.orderPlanId;
         // 判断是否转发完成 完成则不可再添加
         if (this.roleType === 1) {
         if (this.roleType === 1) {  //roleType 1客户
            this.whetherClick = this.carNumSurplus1 === 0
         } else if (this.roleType === 2) {
         } else if (this.roleType === 2) {  //roleType 2货代
            this.whetherClick = this.forwardSurplus === 0
         }
         this.getOrderPlan()
      },
      onShareAppMessage(res) {
      　　if (res.from === 'button') {// 来自页面内分享按钮
      　　　　console.log(res.target)
      　　}
      　　return {
      　　　　title: '分享日计划',
      　　　　path: 'pages/driver-page/delivery-my/delivery-my/delivery-my?'+ `id=${this.orderPlanId}`
      　　}

      },


      data() {
         return {
            isshow:false,
            forwardSurplus: 0,
            paramsName: {},
            huoDaiData: [],
            isClickFlag:true,// true 可以 or false for forward and back to the direction of the car direction (default	 	
            fleetData: [],
            // 日计划id
            orderPlanId: '',
            jhOrderPlanForwardList: [{
               orderPlanId: '',
               name: '',
               carNum: null,
               xsUserId: 0,
               fleetId: 0,
            jhOrderPlanForwardList: [{  //转发对象
               orderPlanId: '',  //日计划Id
               name: '',  //车队或货代名称
               carNum: null,  //转发数量
               xsUserId: 0,  //货代Id
               fleetId: 0,  //车队Id
               checkboxValue1: '',  //全部转发
               isSelected: false
            }],
@@ -190,9 +214,9 @@
            selectPopupShow: false,
            list1: [{ name: '车队' }, { name: '货代' }],
            tabHuoDai: false,
            carNumSurplus1: '',
            carNumSurplus1: '',  //剩余的收发单数量（转发的数量 - 领取的数量）
            tempcarNumSurplus1: '',
            cars2: '',
            cars2: '',  //已经领取的车数
            carNum: '',
            carNumSurplusHuodai: '',
            formNum: 1,
@@ -227,10 +251,10 @@
            return uni.getStorageSync('roleType');
         },
         text() {
            return `已领取${this.cars2}张提煤单,剩余${this.carNumSurplus1}张提煤单`;
            return `已领取${this.cars2}张收发单,剩余${this.carNumSurplus1}张收发单`;
         },
         text1() {
            return `已拥有${this.carNum}张提煤单,剩余${this.carNumSurplusHuodai}张提煤单`;
            return `已拥有${this.carNum}张收发单,剩余${this.carNumSurplusHuodai}张收发单`;
         }
      },
      methods: {
@@ -362,13 +386,18 @@
               this.fleetData = res.data;
            });
         },
         // 转发
         // 转发对象
         forwardObjectClick(index, name, id) {
            if(!id){
            this.selectPopupShow = true;
            this.index = index;
            this.originForwardName = name || ''
            this.isDirectAdd = this.originForwardName !== ''
            this.forwardId = id
            }else{
               return 
            }
				
         },
         selectPopupClose() {
            this.selectPopupShow = false;
@@ -397,7 +426,7 @@
               // })
               //    this.selectPopupShow = false;
               // } else {
               //    this.$u.toast('提煤单剩余数为0或已添加');
               //    this.$u.toast('收发单剩余数为0或已添加');
               //    this.selectPopupShow = true;
               // }
               // } else {
@@ -410,7 +439,7 @@
                  this.jhOrderPlanForwardList[this.index].xsUserId = item.userId;
                  this.jhOrderPlanForwardList[this.index].name = item.name;
                  this.jhOrderPlanForwardList[this.index].fleetId = 0;
                  this.jhOrderPlanForwardList[this.index].forWardType = 1;
                  this.jhOrderPlanForwardList[this.index].forWardType = 1;  //forWardType 转发类型 货代1 车队2
               }
               // }
            });
@@ -438,7 +467,7 @@
               // })
               //    this.selectPopupShow = false;
               // } else {
               //    this.$u.toast('提煤单剩余数为0或已添加');
               //    this.$u.toast('收发单剩余数为0或已添加');
               //    this.selectPopupShow = true;
               // }
               // } else {
@@ -456,25 +485,25 @@
               // }
            });
         },
         // 计算提煤单数量，添加或删除时调用
         // 计算收发单数量，添加或删除时调用
         calculate(arr) {
            let total = arr.reduce((prev, cur) => {
               return cur.carNum + prev;
            }, 0);
            console.log(total, '提煤单一共的数据');
            console.log(total, '收发单一共的数据');
        //roleType 1客户 2 货代 3司机 5装卸员
            if (this.roleType == 1) {
               if (Number(this.cars2) > total) {
                  this.carNumSurplus1 = Number(this.cars2) - total;
                  this.whetherClick = false;
                  this.whetherClick1 = false;
               } else if (Number(this.cars2) == total) {  //剩余的提煤单为0（添加、提交按钮不能点击）
               } else if (Number(this.cars2) == total) {  //剩余的收发单为0（添加、提交按钮不能点击）
                  this.whetherClick = true;
                  this.whetherClick1 = false;
                  this.carNumSurplus1 = Number(this.cars2) - total;
               } else {
                  this.carNumSurplus1 = 0;
                  this.$u.toast('剩余提煤单数量不足');
                  this.$u.toast('剩余收发单数量不足');
                  this.whetherClick = true;
                  this.whetherClick1 = true;
               }
@@ -490,7 +519,7 @@
                  this.carNumSurplusHuodai = Number(this.carNum) - total;
               } else {
                  this.carNumSurplusHuodai = 0;
                  this.$u.toast('剩余提煤单数量不足');
                  this.$u.toast('剩余收发单数量不足');
                  this.whetherClick = true;
                  this.whetherClick1 = true;
               }
@@ -593,6 +622,7 @@
                  return isPass;
               }
            });
            console.log(this.jhOrderPlanForwardList,'jhOderPlan')
            if (isPass) {
               this.loading = true;
               this.$reqPost('forward', this.jhOrderPlanForwardList, 'json').then(res => {
@@ -620,7 +650,7 @@
            } else {
               this.tabHuoDai = false;
            }
         }
         },
      }
   };
</script>
@@ -784,11 +814,12 @@
      }

      .utils-buttonGroup {
         width: 610rpx;
         width: 700rpx;
         @include flex;
         justify-content: space-between;
         position: fixed;
         bottom: vww(30);
         left: vww(30);
         left: vww(18);
         z-index: 3;

         .AdddBtn,