feat:PVC增加分配数

yangan

2024-08-31 8d61dc60466e243414d2a05106bf8cf173fb47f0

 pages/loadUnload-page/selectTarget/selectTarget.vue

@@ -2,7 +2,7 @@
   <view class="main">
      <!-- 当前选择仓库 -->
      <view class="top-tag">
         <text>点击切换/选择仓库</text>
         <text style="margin-right:20rpx">点击切换/选择仓库</text>
         <u-tag 
         size='large'
         icon='map'
@@ -11,6 +11,7 @@
         ></u-tag>
      </view>
      <!-- 点击查看原盐钙镁 -->
		
         <view class="self-deliver">
               <view class="self-deliver_text">
                  查看原盐钙镁结果
@@ -22,6 +23,11 @@
                     @click="todoDetail"></u-button>
               </view>
            </view>
            <view 
            v-if="messageObj.carNo"
         class="notice-bar"><u-notice-bar :text="messageText"
          :fontSize="30" :showIcon = 'true'
          ></u-notice-bar></view>
      <!-- <u--form labelPosition="top"
         labelWidth="20%"
         :borderBottom="false"
@@ -73,7 +79,11 @@
                           <view class="third-line_text">客户名称:</view>
                           <view>{{ item.customerName }}</view>
                        </view>
                        <view class="third-line"  v-if="item.productName === 'EDC'">
                           <view class="third-line" v-if="/聚氯乙烯树脂/.test(item.productName)">
                           <view class="third-line_text">包装类型:</view>
                           <view>{{ proType[item.packingType] }}</view>
                        </view>
                        <view class="third-line"  v-if="item.productName === '二氯乙烷(EDC)'">
                           <view class="third-line_text">质检状态:</view>
                           <view> <u-tag :text="checkStatusList[item.checkStatus]" plain > </u-tag></view>
                        </view>
@@ -81,7 +91,7 @@
                     <view class="fourth">
                        <view class="fourth-icon">
                           <view
                              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">
                              style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clock.png') no-repeat;background-size: cover">
                           </view>
                        </view>
                        <view class="senddate">{{ item.sendDate }}</view>
@@ -89,7 +99,7 @@
                     <view class="fourth">
                        <view class="fourth-icon">
                           <view
                              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;">
                              style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
                           </view>
                        </view>
                        <view class="senddate">{{ item.orderCode }}</view>
@@ -98,14 +108,14 @@
         <uni-table border stripe 
         emptyText="暂无更多数据">
               <uni-tr>
                  <uni-th width='140'
                  <uni-th width='120'
                  align="center">操作</uni-th>
                   <uni-th align="center" width='120'>产品</uni-th>
                  <uni-th align="center" width='220'>仓库</uni-th>
                  <uni-th align="center" width='120'>皮重</uni-th>
                  <uni-th align="center" width='120'>毛重</uni-th>
                  <uni-th align="center" width='120'>净重</uni-th>
                  <uni-th align="center" width='120'>数量</uni-th>
                  <uni-th align="center" width='200'>仓库</uni-th>
                  <uni-th align="center" width='100'>皮重</uni-th>
                  <uni-th align="center" width='100'>毛重</uni-th>
                  <uni-th align="center" width='100'>净重</uni-th>
                  <uni-th align="center" width='100'>数量</uni-th>
                   <!-- <uni-th align="center">仓库</uni-th> -->
                  <!-- <uni-th align="center">状态</uni-th> -->
                  
@@ -162,21 +172,21 @@
            :showCancelButton="true">
            <view class="slot-content">
               是否确认装卸？
               <view v-if="isNumOk || isClean">
               <view v-if="isNumOk || isClean||isFlagNum">
                  <text>产品名称：{{activeObj.productName}}</text>
                  <view class="queren">
                     <text>请输入</text>：
                       <u--input
                          type='digit'
                          border="bottom"
                        :placeholder="isNumOk ?  '数量' :'折吨'"
                        :placeholder="/聚氯乙烯树脂/.test(activeObj.productName) ? '实际吨数' :  isNumOk ?  '数量' :'折吨'"
                        v-model="checkNum"
                     >
                     </u--input>
                     <text> {{isNumOk ? '件' : '吨' }}</text>
                     </view>
                     <!-- pvc 并且是大包 -->
                     <view class="pvcBig" v-if="activeObj.productName === 'PVC' && activeObj.packingType === 5">
                     <!-- 聚氯乙烯树脂 并且是大包 -->
                     <view class="pvcBig" v-if="activeObj.productName === '聚氯乙烯树脂' && activeObj.packingType === 5">
                        
                     </view>
                     <view v-if="isNumOk && activeObj.productQuantity">当前数量：{{activeObj.productQuantity}}件</view>
@@ -230,7 +240,7 @@
</template>

<script>
   import { BaseUrl } from '@/api/publicInterface.js'
   import { mapState, mapMutations, mapGetters } from 'vuex';
   export default {
      props: {
         loadUnloadData: {
@@ -247,6 +257,8 @@
               }else{
                  if(this.errorStatusList.includes(item.status)){
                     return false
                  }else if (item.productName ==='二氯乙烷(EDC)' && item.checkStatus !== 7){
                     return false;
                  }else{
                     return true;
                  }
@@ -254,7 +266,16 @@
               
            }

         }
         },
         messageText(){
            if(this.messageObj.carNo){
               return `时间:${this.messageObj.now}，${this.messageObj.carNo}，产品${this.messageObj.productNames}在${this.messageObj.bunkerName}入场了，请及时检查！`
            }else{
               return '暂无消息'
            }

         },
           ...mapGetters(['websocketData'])
      
      },
      watch: {
@@ -265,15 +286,42 @@
            },
            deep: true,
            immediate: true
         },
         //监听消息
         'websocketData': {
        handler(v) {
          console.log(v, '接受的ws数据');
          if(v) {
            if (v.startsWith('kgTipHead')) {
            console.log('vvvvv',v.slice(11))
               let nowWeighObj = JSON.parse(v.slice(11));
            console.log(nowWeighObj,'nowWeight');
            this.messageObj = nowWeighObj;
            //   this.messageList = JSON.parse(v.slice(5));
            //   this.messageList = {
            //     ...this.messageList,
            //     title: this.messageList.title.slice(0, 8) + '...',
            //     content: removeTags(this.messageList.content).trim().slice(0, 8) + '...'
            //   }
            //   this.messagePushShow = true;
            } 
          }
        },
        deep: true,
        immediate: true
         }
      },
      data() {
         return {
            proType:['散装','液氣瓶装','罐装','PVC25','PVC80','PVC1150','PVc1200'],
            dataForm: {
               firstClass: "",
               secondClass: "",
               orderType: '',
               bunkerId:""
               bunkerIds:""
            },
            messageObj:{
               carNo:'',
            },
            isEmptyCar:null, //是否空车出厂
            checkStatusList:[
@@ -284,6 +332,7 @@
            typeText:'', // 确认装卸三种类型
            isNumOk:false, //计件
            isClean:false, // 折吨
            isFlagNum:false,// PVCV
            // 场地操作菜单
            firstClassActionsList: [],
            firstClassShow: false,
@@ -342,10 +391,18 @@
               uni.hideLoading()
               if (res.code === 0) {
                  this.firstClassActionsList = res.data;
                  this.firstClassActionsList.unshift({name:'全部',id:res.data.map(item=>item.id).join(',')})
                  if(res.data.length){
                     this.dataForm.bunkerId = res.data[0].id;
                        uni.setStorageSync('bunkerId',res.data[0].id)
                     this.dataForm.firstClass = res.data[0].name;
                     if(!uni.getStorageSync('bunkerIds')){
                        this.dataForm.firstClass = '全部'
                        this.dataForm.bunkerIds = res.data.map(item=>item.id).join(',')
                         uni.setStorageSync('bunkerIds',res.data.map(item=>item.id).join(','))
                     }else{
                        this.dataForm.bunkerIds = uni.getStorageSync('bunkerIds');
                        uni.setStorageSync('bunkerIds',this.dataForm.bunkerIds)
                     }
						
						
                     this.getDetailData();
               
                  }
@@ -353,7 +410,7 @@
                  this.$u.toast('加载失败')
               }
            }).then(() => {
               this.getUserInfo()
				
            })
         },
         firstClassSelect() {
@@ -366,7 +423,7 @@
                 uni.showLoading({
                    title:'加载中'
                })
               this.$reqGet('getTaskCoalListByBunkerId', { bunkerId:this.dataForm.bunkerId }).then(res => {
               this.$reqGet('getTaskCoalListByBunkerId', { bunkerIds:this.dataForm.bunkerIds }).then(res => {
               uni.hideLoading();
               if (res.code === 0) {
                  this.detailData = res.data.map(item=>{
@@ -389,8 +446,9 @@
         },
         firstClassSelectClick(val) {
            this.dataForm.firstClass = val.name;
            this.dataForm.bunkerId= val.id;
            uni.setStorageSync('bunkerId', val.id);
            this.dataForm.bunkerIds= val.id;
            uni.removeStorageSync('bunkerIds')
            uni.setStorageSync('bunkerIds', val.id);
            this.getDetailData();
            this.filedId = val.id
         },
@@ -425,37 +483,43 @@
                  
            //    }
            // })
         //  计件：   0 pvc type 
         //  计件：   0 聚氯乙烯树脂 type 
         //  折吨: 
            this.activeObj = item;
            if( (parintItem.orderType === '外购' ||parintItem.orderType === '外购退' ) && item.isWeight === 0){
               this.isNumOk = true;
               this.isClean = false;
               this.isFlagNum = false;
               //回显计数量
                this.checkNum  = item.productQuantity ? item.productQuantity : '';
            }else if( parintItem.orderType ==='外购' &&  item.isWeight === 1){
               this.isClean = true;
               this.isNumOk = false;
                 this.isFlagNum = false;
            }else{
               this.isNumOk = false;
               this.isClean = false;
                 this.isFlagNum = false;
            }
            //pvc
             if(parintItem.orderType ==='外销' && item.productName ==='PVC' && (item.packingType === 3 || item.packingType === 4)){
               this.isNumOk = true;
            //聚氯乙烯树脂
             if(parintItem.orderType ==='外销' && (/聚氯乙烯树脂/.test(item.productName) || item.productName === 'PVC')  && (item.packingType === 3 || item.packingType === 4)){
               this.isNumOk = false;
               this.isClean  = false;
               this.isFlagNum = true;;
            }
            //瓶装液氯条件
            //EDC 质检完成方可确认
            if(item.packingType === 1){ 
               this.isNumOk = true;
               this.isClean = false;
                this.isFlagNum = false;
            }
            //
            //pvc大包自动计算折吨
            if(item.productName === 'PVC' && item.packingType === 5){
            if((/聚氯乙烯树脂/.test(item.productName) || item.productName === 'PVC')  && item.packingType === 5){
               this.isNumOk = true;
               this.isClean = false;
                this.isFlagNum = false;
            }
            if(parintItem.orderType === '外购'){
               this.isEmptyCar = '1';
@@ -479,11 +543,11 @@
                uni.showLoading({
                    title:'加载中'
                });
            console.log(this.activeObj,this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 7,'12313')
            if(this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 7){
            console.log(this.activeObj,this.activeObj.productName ==='二氯乙烷(EDC)' && this.activeObj.checkStatus !== 7,'12313')
            if(this.activeObj.productName ==='二氯乙烷(EDC)' && this.activeObj.checkStatus !== 7){
               console.log('触发，’13131')
               this.enterZx = false;
               this.$u.toast(`请检查当前EDC订单质检状态后在确认装卸!`);
               this.$u.toast(`请检查当前二氯乙烷(EDC)DC订单质检状态后在确认装卸!`);
               
            }else if( this.isEmptyCar === null){
               this.$u.toast(`请检查${this.isNumOk ? '计件数量' :'折吨'}，以及是否空车出厂项!`);
@@ -494,7 +558,9 @@
               productQuantity:this.isNumOk ? this.checkNum : '',
               discount:this.isClean ? this.checkNum : null,
               isEmptyCar:this.isEmptyCar,
               isPretendDischar:this.activeObj.isPretendDischar
               isPretendDischar:this.activeObj.isPretendDischar,
               realityMeasure:this.isFlagNum ? this.checkNum : null,
               productId:this.isFlagNum ? this.activeObj.productId : null,
             },'json').then(res=>{
               uni.hideLoading();
               console.log(res,'rez')
@@ -543,18 +609,12 @@
               uni.hideLoading()
               if (res.code === 0) {
                  this.firstClassActionsList = res.data;
                  if(res.data.length === 1){
                     this.dataForm.bunkerId = res.data[0].id;
                     uni.setStorageSync('bunkerId', res.data[0].id)
                     this.dataForm.firstClass = res.data[0].name;
               
                  }
               } else {
                  this.$u.toast('加载失败')
               }
            }).then(() => {
            
               this.getUserInfo()
            });
         

@@ -572,16 +632,31 @@
  /deep/ .uni-table{
   min-width: 0!important;
   margin-left: 20rpx;
   width: auto;
  }
   
}
.notice-bar{
      margin-left: vww(10);
      margin-bottom: 20rpx;
      margin-top: 20rpx;
	
         width: 98%;
         .u-notice-bar{
            border-radius: 20rpx;
               margin-top: 20rpx;
               height: 40rpx;
         }
}
      // 自主配送
         .self-deliver {
         position: relative;
            position: relative;
            text-indent: 20rpx;
            top: vww(10);
            width: 98%;
            width: 95%;
            height: vww(40);
            margin: vww(8) 10rpx;
            margin: vww(13) 10rpx;
            margin-left: 20rpx;
            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);
@@ -591,9 +666,10 @@
            justify-content: space-between;
            /deep/.u-button {
               width: 100%;
               // height: 28px !important;
               height: 28px !important;
               line-height: 40px;
               padding: 0 12px;
               text-indent: 0!important;
               font-size: 28rpx;
               font-weight: 300;
               color: #ffffff;
@@ -657,14 +733,15 @@
      position: relative;
      top: vww(-160);
      .top-tag{
             width: 33%;
             width: 60%;
            margin-left: 55%;
            height: 100rpx;
            margin-left: 65%;
            margin-left: 50%;
            display: flex;
            /* margin-top: 40rpx; */
            color: #fff;
            align-items: center;
            justify-content: space-between;
				
               }

               .div-box{
@@ -712,7 +789,7 @@
               }
            }
            .history-information {
         margin-bottom:50rpx;
         margin-bottom:30rpx;
         margin-top: 10rpx;
         background: #ffffff;
         border-radius: 20rpx;