feat:增加类型显示

yangan

昨天 a28d0135ee42809b2c5863609da37155d3ecba5b

 pages/loadUnload-page/selectTarget/selectTarget.vue

@@ -68,7 +68,6 @@
               class="collItem"
               :title="'待装卸收发单'">   
               <view class="history-information"  
                 @click="viewDetail(item)"
                  v-for="item,i in detailData"       
         :key="i">
                     <view class="first">
@@ -115,7 +114,6 @@
                     <view class="fourth">
                        <view class="senddate">{{ proType[item.packingType] }}</view>
                     </view>

                                     <view class="table">
         <uni-table border stripe 
         emptyText="暂无更多数据">
@@ -128,9 +126,9 @@
                  <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'>{{item.orderType === '外销' ? '皮重' : '毛重'}}</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>  -->
                  
@@ -139,8 +137,8 @@
                   <uni-td  align="center">
               <view class="btnBox"> 
                  <!--   -->
                  <!-- <u-button   text='查看'  @click="viewDetail(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>
                  <u-button  size='mini' v-if="item.isPindan === 1 && $store.state.pvcIdList.includes(subItem.productId) "   type='primary' text='查看拼单'  @click.native.stop="toViewPindan(item)"></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) && subItem.isPindan!==2" @click.native.stop="enterOk(item,subItem)"></u-button>
                  </view></uni-td>
                  <uni-td align="left">
                     <view>{{ subItem.productName  +  ( subItem.productGrade  ? '-' + subItem.productGrade :'')   }}</view></uni-td>
@@ -160,7 +158,7 @@
                  <view class="name">{{ subItem.productQuantity }}</view>
               </uni-td> -->
               <uni-td align="right">
                  <view class="name">{{ subItem.productQuantity }}</view>
                  <view class="name">{{ item.orderType === '外销' ? subItem.skin : subItem.hair }}</view>
               </uni-td>
               <uni-td align="right">
                  <view class="name">{{ subItem.planMeasure }}</view>
@@ -229,6 +227,10 @@
                           <view class="third-line_text">质检状态:</view>
                           <view> <u-tag :text="checkStatusList[item.checkStatus]" plain > </u-tag></view>
                        </view>
                        <view class="third-line">
                           <view class="third-line_text">皮重:</view>
                           <view> {{item.skin}}</view>
                        </view>
                     </view>
                     <view class="fourth">
                        
@@ -264,7 +266,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 +350,22 @@
                  <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
                        readonly
                        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 +374,12 @@
                        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"
@@ -397,8 +413,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
@@ -428,6 +446,18 @@
                        >
                        </u-radio>
                     </u-radio-group></view>
                     <!-- 折吨原因 -->
                     <view class="queren" style="display: flex;" v-if="isClean && isCleanFlag === '1'">
                        <text>折吨原因：
                           </text><u--input
                           clearable
                           type='text'
                           border="bottom"
                           v-model="discountReason"  
                           placeholder="请输入折吨原因"
                           />

                     </view>
                     <view v-if="isClean && isCleanFlag === '1'"><text>折吨照片:</text><u-upload :fileList="fileList1"
                        @afterRead="afterRead"
                        @delete="deletePic"
@@ -532,7 +562,7 @@
               if(!item){
                  return false
               }else{
                  if(   item.status === 6){
                  if(   item.status === 6 || item.isPindan == 1){
                     return false
                  }else{
                     return true;
@@ -591,6 +621,7 @@
            enterXg:false,
            isOkNum:'',
            fileList1:[],
            discountReason:'',
            activeObjedit:{},
            discountJpg:'',
            proType:['散装','液氯瓶装','罐装','PVC25','PVC80','PVC1150','PVc1200'],
@@ -795,6 +826,12 @@
         close(){

         },
         toViewPindan(item){
            uni.navigateTo({
               url: `/subPages/pvcSplicePage/view?item=${JSON.stringify(item) }`
            });

         },
         uploadFilePromise(url, num) {
            return new Promise((resolve, reject) => {
               let a = uni.uploadFile({
@@ -885,7 +922,13 @@

         },
         enterOk(parintItem,item){
            this.yelvFlag = false;
            if(parintItem.isPindan === 1 && this.$store.state.pvcIdList.includes( item.productId) ){
               uni.navigateTo({
               url: `/subPages/pvcSplicePage/kuguan?id=${parintItem.id}&item=${JSON.stringify(parintItem)}`
            });

            }else{
               this.yelvFlag = false;
            console.log(parintItem,'priintItem')
            // uni.request({
            //    url: `${BaseUrl}/admin/dict/type/tray_weight`,
@@ -914,6 +957,7 @@
               this.blend = true;
               this.isNumOk = false;
               this.isClean = false;
               this.checkNum = item.productQuantity;
               // this.isCleanFlag = '0';
                this.isFlagNum = false;
            }
@@ -922,11 +966,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 +993,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 +1019,7 @@
               this.isNumOk = false;
               this.isClean = false;
               this.blend = false;
               this.checkNum = item.productQuantity;
                this.isFlagNum = true;
                this.isCleanFlag = '1';
            }
@@ -983,6 +1030,8 @@

            // }
         this.enterZx = true;
            }
			
            
         },
         closeModal(){
@@ -996,6 +1045,7 @@
         cancelModal(){
            this.enterZx = false;
            this.checkNum = '';
            this.discountReason = ''; //情况备注
            this.isEmptyCar = null;
         },
         cancelModaledit(){
@@ -1005,8 +1055,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订单质检状态后在确认装卸!`);
@@ -1026,6 +1074,8 @@
               realityMeasure:this.isFlagNum ? this.checkNum : null,
               productId:this.isFlagNum ? this.activeObj.productId : null,
               discountJpg:this.discountJpg,
               containerNumber:this.activeObj.containerNumber ? this.activeObj.containerNumber : null,
               discountReason:this.discountReason,
             },'json').then(res=>{
               uni.hideLoading();
               console.log(res,'rez')