fix:库管装卸isWeight == 2去除判断

yangan

2024-11-20 d82330e20ab70d21c077462c21a270a569b9beab

 pages/loadUnload-page/selectTarget/selectTarget.vue

@@ -108,7 +108,14 @@
                           </view>
                        </view>
                        <view class="senddate">{{ item.orderCode }}</view>
								
                        <!-- v-if="item.isWeight === 0 && item.tmTaskCoalList.length >1 && item.packingType !== 1"  -->
                        <view class="rightBtn"><u-button type='primary'  v-if="  item.tmTaskCoalList.length >1 && !item.tmTaskCoalList.find(item=>item.isWeight !== 0) &&  item.packingType !== 1" text='一键确认' @click.native.stop="allOkBtn(item)"></u-button></view>
                     </view>
                     <view class="fourth">
                        <view class="senddate">{{ proType[item.packingType] }}</view>
                     </view>

                                     <view class="table">
         <uni-table border stripe 
         emptyText="暂无更多数据">
@@ -116,8 +123,6 @@
                  <uni-th width='120'
                  align="center">操作</uni-th>
                   <uni-th align="center" width='800'>产品</uni-th>
                      <uni-th align="center" width='110'>等级</uni-th>
                   <uni-th align="center" width='110'>包装</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>
@@ -125,6 +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='150'>计重方式</uni-th> 
               
                   <!-- <uni-th align="center"  width='100'>实际量</uni-th>  -->
                  
@@ -134,15 +140,10 @@
               <view class="btnBox"> 
                  <!--   -->
                  <!-- <u-button   text='查看'  @click="viewDetail(subItem)"></u-button> -->
                  <u-button type='primary' text='确认装卸'  size='mini' v-if="subItem.flag && isBtnShow(item)" @click.native.stop="enterOk(item,subItem)"></u-button>
                  <u-button type='primary' text='确认装卸'  size='mini' v-if="subItem.flag && isBtnShow(item) && !( item.tmTaskCoalList.length >1 && !item.tmTaskCoalList.find(item=>item.isWeight !== 0) &&  item.packingType !== 1)" @click.native.stop="enterOk(item,subItem)"></u-button>
                  </view></uni-td>
                  <uni-td align="left">
                     <view>{{ subItem.productName }}</view></uni-td>
                     <uni-td align="center">
                     <view>{{ subItem.productGrade }}</view></uni-td>
                     <uni-td align="center">
                  <view>{{ proType[item.packingType] }}</view>
               </uni-td>
                     <view>{{ subItem.productName  +  ( subItem.productGrade  ? '-' + subItem.productGrade :'')   }}</view></uni-td>
               <!-- <uni-td>
                  <view>{{ subItem.bunkerName }}</view>
               </uni-td>  
@@ -164,7 +165,12 @@
               <uni-td align="right">
                  <view class="name">{{ subItem.planMeasure }}</view>
               </uni-td>
					
               <uni-td align="right">
                     <u-tag :text="'计数'" plain v-if="subItem.isWeight==0"></u-tag>
                     <u-tag  :text="'称重'"  plain v-else-if="subItem.isWeight==1"></u-tag>
                     <u-tag :text="'称重计数'"  plain v-else-if="subItem.isWeight==2"></u-tag>
                     <u-tag v-else></u-tag>
               </uni-td>
               <!-- <uni-td>
                  <view class="name">{{ subItem.realityMeasure }}</view>
               </uni-td> -->
@@ -207,7 +213,7 @@
                        <view class=""></view>
                     </view>
                     <view class="second">
                        <view class="coal-name">{{ item.productNames || item.productName }}</view>
                        <view class="coal-name">{{ item.productNames?limitString(item.productNames,20,'...'):'' || ''}}</view>
                        <view class="order-type">{{ item.orderType || '' }}</view>
                     </view>
                     <view class="third">
@@ -241,6 +247,9 @@
                        </view>
                        <view class="senddate">{{ item.orderCode }}</view>
                     </view>
                     <view class="fourth">
                        <view class="senddate">{{ proType[item.packingType] }}</view>
                     </view>
                                     <view class="table">
         <uni-table border stripe 
         emptyText="暂无更多数据">
@@ -248,15 +257,14 @@
                  <uni-th width='120'
                  align="center">操作</uni-th>
                   <uni-th align="center" width='800'>产品</uni-th>
                      <uni-th align="center" width='90'>等级</uni-th>
                   <uni-th align="center" width='90'>包装</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"  width='100'>确认量</uni-th> 
                   <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='150'>计重方式</uni-th> 
                  
                  
               </uni-tr>
@@ -264,19 +272,14 @@
                   <uni-td  align="center">
               <view class="btnBox"> 
                  <!--   -->
                  <u-button type='primary' text='修改' size='mini'   @click="editOrder(subItem)"></u-button>
                  <!-- <u-button type='primary' text='修改' size='mini' v-if="subItem.isWeight === 0 || subItem.isWeight === 2 "   @click="editOrder(subItem)"></u-button> -->
                  <u-button type='primary' text='拼单' size='mini'  v-if="isPinShow(item)" @click="pinDan(subItem)"></u-button>
                  </view></uni-td>
                  <uni-td w align="center">
                     <view>{{ subItem.productName }}</view></uni-td>
                     <uni-td align="center">
                     <view>{{ subItem.productGrade }}</view></uni-td>
                     <uni-td>
                  <view>{{ proType[item.packingType] }}</view>
               </uni-td>
                  <uni-td align="left">
                     <view>{{ subItem.productName  +  ( subItem.productGrade  ? '-' + subItem.productGrade :'')   }}</view></uni-td>
               <!-- <uni-td>
                  <view>{{ subItem.bunkerName }}</view>
               </uni-td>
               </uni-td>  
               <uni-td>
                  <view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || ''  }}</view>
               </uni-td>
@@ -289,11 +292,17 @@
               <uni-td>
                  <view class="name">{{ subItem.productQuantity }}</view>
               </uni-td> -->
               <uni-td>
               <uni-td align="right">
                  <view class="name">{{ subItem.productQuantity }}</view>
               </uni-td>
               <uni-td>
               <uni-td align="right">
                  <view class="name">{{ subItem.planMeasure }}</view>
               </uni-td>
               <uni-td align="right">
                  <u-tag :text="'计数'" plain v-if="subItem.isWeight==0"></u-tag>
                     <u-tag  :text="'称重'"  plain v-else-if="subItem.isWeight==1"></u-tag>
                     <u-tag :text="'称重计数'"  plain v-else-if="subItem.isWeight==2"></u-tag>
                     <u-tag v-else></u-tag>
               </uni-td>
            
            <!--     <uni-td align="center">
@@ -339,21 +348,35 @@
                  <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.realityMeasure)}}</view>
                  </view>
                     <view >实际量：{{ Number(activeObj.productQuantity)}}</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"
                          border="bottom"
                        :placeholder="/聚氯乙烯树脂/.test(activeObj.productName) ? '实际吨数' :  isNumOk ?  '数量' : blend ? '数量' : '折吨'"
                        :placeholder="/聚氯乙烯树脂/.test(activeObj.productName) ? '实际吨数' :  isNumOk ?  '确认数量' : blend ? '确认数量' : '折吨'"
                        v-model="checkNum"
                     >
                     </u--input>
                     <text> {{isNumOk ? activeObj.productUnit : '吨' }}</text>
                     <text v-if="isNumOk || isFlagNum || blend"> {{ activeObj.productUnit  ||  '件' }}</text>
                     <text v-if="isClean"> {{activeObj.productUnit  ||  '吨' }}</text>
                     </view>
                     <!-- v-if="activeObj.containerNumber" -->
							
						
                     <!-- 是否输入折吨 -->
                      <view style="display:flex;margin-top:20rpx" v-if="isClean">是否需要折吨： <u-radio-group
                        v-model="isCleanFlag"
@@ -387,8 +410,10 @@
                     <view class="pvcBig" v-if="activeObj.productName === '聚氯乙烯树脂' && activeObj.packingType === 5">
                        
                     </view>
                     <view v-if="isNumOk && activeObj.productQuantity">当前数量：{{activeObj.productQuantity}}{{ 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
@@ -457,6 +482,19 @@
               </view>
               
            </view>
         </u-modal>
         <u-modal :show="showConfim" @confirm="confirmEnter"  :showCancelButton="true"   @cancel="showConfim = false;isOkNum = ''" ref="uModal" :asyncClose="true">
            <view class="modalBody">
               <view style="text-align: center;"> 是否确定一键装卸？</view>	
            <view style="display: flex;align-items: center;"><text> 到货:</text>  <u--input
                           style="display: inline-block;width: 200rpx;border-bottom: solid 1px #ccc;"
                          type="digit"
                        :placeholder="'数量'"
                        v-model="isOkNum"
                     >
                     </u--input> 件</view>
            </view>
				
         </u-modal>
      <!-- 仓库 -->
      <!-- <u-action-sheet :actions="secondClassActionsList"
@@ -566,6 +604,7 @@
      data() {
         return {
            enterXg:false,
            isOkNum:'',
            fileList1:[],
            activeObjedit:{},
            discountJpg:'',
@@ -576,13 +615,16 @@
            ],
            isCleanFlag:'1',
            checkNumEdit:'',
            showConfim:false,
            remarkContent:'',
            dataForm: {
               firstClass: "",
               secondClass: "",
               orderType: '',
               bunkerIds:""
            },
            historyData:[], 
            historyData:[],
            paramsItem:{}, 
            messageObj:{
               carNo:'',
            },
@@ -595,6 +637,7 @@
            typeText:'', // 确认装卸三种类型
            isNumOk:false, //计件
            isClean:false, // 折吨   
            yelvFlag:false,
            isFlagNum:false,// PVCV
            // 场地操作菜单
            firstClassActionsList: [],
@@ -849,7 +892,15 @@

         },
         open(){},
         allOkBtn(item){
            //点击一键确认
             this.paramsItem = item;
				
            this.showConfim = true;

         },
         enterOk(parintItem,item){
            this.yelvFlag = false;
            console.log(parintItem,'priintItem')
            // uni.request({
            //    url: `${BaseUrl}/admin/dict/type/tray_weight`,
@@ -878,7 +929,8 @@
               this.blend = true;
               this.isNumOk = false;
               this.isClean = false;
               this.isCleanFlag = '0';
               this.checkNum = item.productQuantity;
               // this.isCleanFlag = '0';
                this.isFlagNum = false;
            }
            else { 
@@ -886,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';
@@ -911,13 +965,15 @@
               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.checkNum = item.productQuantity;
               this.blend = false;
               this.isCleanFlag = '1';
                this.isFlagNum = false;
@@ -935,6 +991,7 @@
               this.isNumOk = false;
               this.isClean = false;
               this.blend = false;
               this.checkNum = item.productQuantity;
                this.isFlagNum = true;
                this.isCleanFlag = '1';
            }
@@ -967,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订单质检状态后在确认装卸!`);
@@ -976,10 +1031,6 @@
            }else if( this.isEmptyCar === null){
               this.$u.toast(`请检查${this.isNumOk ? '计件数量' :'折吨'}，以及是否空车出厂项!`);
               //装卸 为 2 ，但是必须得称重
            }else if( (this.activeObj.isWeight === 2 || this.activeObj.packingType === 1) && (!this.activeObj.skin  &&    !this.activeObj.hair) ){
               console.log('》》》》》》》》》》》触发')
               this.enterZx = false;
               this.$u.toast(`请先称重后装卸确认！`);
            }
            else{
               this.enterZx = false;
@@ -992,6 +1043,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')
@@ -1021,6 +1073,26 @@
         //判断是否是 三种特殊类型对应弹窗
         judgeTypeFun(name){
         

         },
         //确认
         confirmEnter(){
            this.$reqPost('oneClickLoading',{tmId:this.paramsItem.id,kgNum:this.isOkNum},'params').then((res) => {
               if(res.code == 0){
               console.log(res,'res')
               this.$u.toast('一键确认成功')
               this.showConfim = false;
               setTimeout(() => {
                  this.getDetailData();
               }, 500);
               }else{
                  this.showConfim = false;
                  this.$u.toast(res.msg ? res.msg : '一键确认失败');
               }
				
            }).catch(err=>{
               this.$u.toast(err ? err : '操作异常')
            })

         },
         //查看最近一次的原盐钙镁
@@ -1063,6 +1135,11 @@

<style lang="scss"
   scoped>
   .modalBody{
      display: flex;
      flex-direction: column;
      justify-content: center;
   }
::-webkit-scrollbar{
        display: none;
   }
@@ -1074,6 +1151,11 @@
   width: auto;
  }
   
}
.rightBtn{
   position: absolute;
   right: 100rpx;
   bottom: 5rpx;
}
.notice-bar{
      margin-left: vww(10);
@@ -1231,6 +1313,7 @@
               }
            }
            .history-information {
               position: relative;
         margin-bottom:30rpx;
         margin-top: 10rpx;
         background: #ffffff;
@@ -1308,6 +1391,7 @@
            font-size: 30rpx;
            font-weight: 300;
            color: #515151;
            position: relative;
            margin: vww(10) vww(10) 0;
            @include flex;