feat:修改逻辑条件

yangan

2024-11-07 8d80e8c9a3feb6c7e4c3d5dd9aa18f74885d1435

 pages/loadUnload-page/selectTarget/selectTarget.vue

@@ -130,7 +130,7 @@
                  <uni-th align="center" width='100'>数量</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='150'>计重方式</uni-th> 
               
                   <!-- <uni-th align="center"  width='100'>实际量</uni-th>  -->
                  
@@ -264,7 +264,7 @@
                  <uni-th align="center" width='100'>数量</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='150'>计重方式</uni-th> 
                  
                  
               </uni-tr>
@@ -348,12 +348,21 @@
                  <view v-if="activeObj.skin">皮重：{{activeObj.skin.toFixed(2) || ''}}</view>
                  <view v-if="activeObj.hair">毛重：{{activeObj.hair.toFixed(2) || ''}}</view>
                  </view>
                  <view v-if="/聚氯乙烯树脂/.test(activeObj.productName)">
                  <view v-if="activeObj.isContainerNum"><span>集装箱号： </span>
                        <u--input v-model="activeObj.containerNumber"
                        clearable
                        style="border: solid 1px #ccc;"
                        placeholder="输入集装箱号"
                        prefixIconStyle="color: #909399"></u--input>
                        <view><text style="color: red;">请认真核对集装箱号再提交！</text></view>
                     </view>
                  <!-- <view v-if="/聚氯乙烯树脂/.test(activeObj.productName)">
                     <view>计划量：{{Number(activeObj.planMeasure)}}</view>
                     <view >实际量：{{ Number(activeObj.productQuantity)}}</view>
                  </view>
                  </view> -->
                  <view class="queren" v-show="isCleanFlag === '1'">
                     <text>请输入</text>：
                     <text v-if="isNumOk || isFlagNum">确认量：</text>
                     <text v-if="isClean  || blend">请输入：</text>
                       <u--input
                          type='digit'
                         :disabled="yelvFlag"
@@ -362,8 +371,12 @@
                        v-model="checkNum"
                     >
                     </u--input>
                     <text> {{isNumOk ? activeObj.productUnit : '吨' }}</text>
                     <text v-if="isNumOk || isFlagNum || blend"> {{isNumOk ? activeObj.productUnit : '件' }}</text>
                     <text v-if="isClean"> {{'吨' }}</text>
                     </view>
                     <!-- v-if="activeObj.containerNumber" -->
							
						
                     <!-- 是否输入折吨 -->
                      <view style="display:flex;margin-top:20rpx" v-if="isClean">是否需要折吨： <u-radio-group
                        v-model="isCleanFlag"
@@ -397,8 +410,10 @@
                     <view class="pvcBig" v-if="activeObj.productName === '聚氯乙烯树脂' && activeObj.packingType === 5">
                        
                     </view>
                     <view v-if="isNumOk && activeObj.planMeasure">计划量：{{activeObj.planMeasure}}{{ activeObj.productUnit || '件' }}</view>
                     <view v-if="activeObj.containerNumber"><span>集装箱号：</span>{{activeObj.containerNumber}}</view>
							
							
                     <view v-if=" activeObj.planMeasure">计划量：{{activeObj.planMeasure}}{{ activeObj.productUnit || '件' }}</view>
							
                     
               </view>
                     <view style="display:flex;margin-top:20rpx">是否空车出厂: <u-radio-group
@@ -914,6 +929,7 @@
               this.blend = true;
               this.isNumOk = false;
               this.isClean = false;
               this.checkNum = item.productQuantity;
               // this.isCleanFlag = '0';
                this.isFlagNum = false;
            }
@@ -922,11 +938,13 @@
               this.isCleanFlag = '1';
               this.blend = false;
               this.isClean = false;
               this.checkNum = item.productQuantity;
                this.isFlagNum = false;
            }
            if( (parintItem.orderType === '外购' ||parintItem.orderType === '外购退' ) && item.isWeight === 0){
               this.isNumOk = true;
               this.isClean = false;
               this.checkNum = item.productQuantity;
               this.blend = false;
               this.isFlagNum = false;
               this.isCleanFlag = '1';
@@ -947,14 +965,14 @@
               this.isCleanFlag = '1';
               this.blend = false;
               this.isFlagNum = true;;
               this.checkNum = item.planMeasure;
               this.checkNum = item.productQuantity;
            }
            //瓶装液氯条件
            //EDC 质检完成方可确认
            if(item.packingType === 1){ 
               this.isNumOk = true;
               this.isClean = false;
               this.yelvFlag = true;
               // this.yelvFlag = true;
               this.checkNum = item.productQuantity;
               this.blend = false;
               this.isCleanFlag = '1';
@@ -973,6 +991,7 @@
               this.isNumOk = false;
               this.isClean = false;
               this.blend = false;
               this.checkNum = item.productQuantity;
                this.isFlagNum = true;
                this.isCleanFlag = '1';
            }
@@ -1005,8 +1024,6 @@
                uni.showLoading({
                    title:'加载中'
                });
            console.log(this.activeObj,(this.activeObj.isWeight === 2 || this.activeObj.packingType === 1) && (this.activeObj.skin  ||   this.activeObj.hair),'activeObj')
            console.log(this.activeObj,this.activeObj.productName ==='二氯乙烷(EDC)' && this.activeObj.checkStatus !== 7,'12313')
            if(this.activeObj.productName ==='二氯乙烷(EDC)' && this.activeObj.checkStatus !== 7){
               this.enterZx = false;
               this.$u.toast(`请检查当前二氯乙烷(EDC)DC订单质检状态后在确认装卸!`);
@@ -1014,6 +1031,10 @@
            }else if( this.isEmptyCar === null){
               this.$u.toast(`请检查${this.isNumOk ? '计件数量' :'折吨'}，以及是否空车出厂项!`);
               //装卸 为 2 ，但是必须得称重
            }else if( (this.activeObj.isWeight === 2 ) && (!this.activeObj.skin  &&    !this.activeObj.hair) ){
               console.log('》》》》》》》》》》》触发')
               this.enterZx = false;
               this.$u.toast(`请先称重后装卸确认！`);
            }
            else{
               this.enterZx = false;
@@ -1026,6 +1047,7 @@
               realityMeasure:this.isFlagNum ? this.checkNum : null,
               productId:this.isFlagNum ? this.activeObj.productId : null,
               discountJpg:this.discountJpg,
               containerNumber:this.activeObj.containerNumber ? this.activeObj.containerNumber : null
             },'json').then(res=>{
               uni.hideLoading();
               console.log(res,'rez')