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,7 +126,7 @@
                  <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='150'>计重方式</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>
@@ -228,6 +226,10 @@
                        <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>
                        <view class="third-line">
                           <view class="third-line_text">皮重:</view>
                           <view> {{item.skin}}</view>
                        </view>
                     </view>
                     <view class="fourth">
@@ -351,10 +353,11 @@
                  <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><text style="color: red;">请认真核对集装箱号再提交!</text></view> -->
                     </view>
                  <!-- <view v-if="/聚氯乙烯树脂/.test(activeObj.productName)">
                     <view>计划量:{{Number(activeObj.planMeasure)}}</view>
@@ -559,7 +562,7 @@
               if(!item){
                  return false
               }else{
                  if(   item.status === 6){
                  if(   item.status === 6 || item.isPindan == 1){
                     return false
                  }else{
                     return true;
@@ -823,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({
@@ -913,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`,
@@ -1015,6 +1030,8 @@
            // }
         this.enterZx = true;
            }
            
         },
         closeModal(){
@@ -1028,6 +1045,7 @@
         cancelModal(){
            this.enterZx = false;
            this.checkNum = '';
            this.discountReason = ''; //情况备注
            this.isEmptyCar = null;
         },
         cancelModaledit(){