feat:修改逻辑条件

yangan

2024-11-07 8d80e8c9a3feb6c7e4c3d5dd9aa18f74885d1435

 pages/loadUnload-page/selectTarget/selectTarget.vue

@@ -348,13 +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="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 class="queren" v-show="isCleanFlag === '1'">
                     <text v-if="isNumOk">确认量：</text>
                     <text v-if="isNumOk || isFlagNum || blend">请输入：</text>
                     <text v-if="isNumOk || isFlagNum">确认量：</text>
                     <text v-if="isClean  || blend">请输入：</text>
                       <u--input
                          type='digit'
                         :disabled="yelvFlag"
@@ -367,14 +375,8 @@
                     <text v-if="isClean"> {{'吨' }}</text>
                     </view>
                     <!-- v-if="activeObj.containerNumber" -->
                     <view style="display: flex;"><span>集装箱号： </span>
                        <u--input v-model="activeObj.containerNumber"
                        clearable
                        style="border: solid 1px #ccc;"
                        placeholder="输入集装箱号"
                        prefixIconStyle="color: #909399"></u--input>
                     </view>
                     <view><text style="color: red;">请认真核对集装箱号再提交！</text></view>
							
						
                     <!-- 是否输入折吨 -->
                      <view style="display:flex;margin-top:20rpx" v-if="isClean">是否需要折吨： <u-radio-group
                        v-model="isCleanFlag"
@@ -1022,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订单质检状态后在确认装卸!`);
@@ -1031,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;