feat:样式修改

yangan

2024-11-04 3713f1e122891450d99af7df3bbcd234a3a4da05

 pages/loadUnload-page/selectTarget/selectTarget.vue

@@ -67,7 +67,9 @@
                 ref="collapseHeight"
               class="collItem"
               :title="'待装卸收发单'">   
               <view class="history-information"    v-for="item,i in detailData" 		
               <view class="history-information"  
                 @click="viewDetail(item)"
                  v-for="item,i in detailData" 		
         :key="i">
                     <view class="first">
                        <view class="">{{ item.carNo || '' }}</view>
@@ -106,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="暂无更多数据">
@@ -114,14 +123,15 @@
                  <uni-th width='120'
                  align="center">操作</uni-th>
                   <uni-th align="center" width='800'>产品</uni-th>
                      <uni-th align="center" width='85'>等级</uni-th>
                   <uni-th align="center" width='85'>包装</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='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>  -->
                  
               </uni-tr>
@@ -129,19 +139,14 @@
                   <uni-td  align="center">
               <view class="btnBox"> 
                  <!--   -->
                  <u-button   text='查看'  @click="viewDetail(subItem)"></u-button>
                  <u-button type='primary' text='确认装卸'  v-if="subItem.flag && isBtnShow(item)" @click="enterOk(item,subItem)"></u-button>
                  <!-- <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>
                  </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>
               </uni-td>  
               <uni-td>
                  <view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || ''  }}</view>
               </uni-td>
@@ -155,7 +160,16 @@
                  <view class="name">{{ subItem.productQuantity }}</view>
               </uni-td> -->
               <uni-td align="right">
                  <view class="name">{{ subItem.productQuantity }}</view>
               </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>
                  <view class="name">{{ subItem.realityMeasure }}</view>
@@ -199,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">
@@ -233,40 +247,39 @@
                        </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="暂无更多数据">
               <uni-tr>
                  <uni-th width='120'
                  align="center">操作</uni-th>
                   <uni-th align="center" width='300'>产1品</uni-th>
                      <uni-th align="center" width='100'>产品等级</uni-th>
                   <uni-th align="center" width='100'>包装类型</uni-th>
                   <uni-th align="center" width='800'>产品</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">计划量</uni-th> 
                   <uni-th align="center">实际量</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>
               <uni-tr v-for="(subItem, index) in item.tmTaskCoalList" :key="index">
                   <uni-td  align="center">
               <view class="btnBox"> 
                  <!--   -->
                  <u-button type='primary' text='拼单'  v-if="isPinShow(item)" @click="pinDan(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>
@@ -279,15 +292,21 @@
               <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 align="right">
                  <view class="name">{{ subItem.planMeasure }}</view>
               </uni-td>
               <uni-td>
                  <view class="name">{{ subItem.realityMeasure }}</view>
               <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">
               <view>{{ subItem.bunkerName }}</view></uni-td> -->
				
            <!--     <uni-td align="center">
               <view>{{ subItem.bunkerName }}</view></uni-td>  -->
                 <!-- <uni-td align="center">
               <view  class="name">{{ subItem.statusView }}</view></uni-td> -->
                
@@ -312,43 +331,79 @@
         @close='firstClassClose'
         @select="firstClassSelectClick"></u-action-sheet>
         <u-modal :show="enterZx"
            :title="'提示'"
            :title="'确认装卸'"
            @close="closeModal"
            :width='700'
            :width='740'
            @cancel="cancelModal"
            @confirm="confirmModal"
            :closeOnClickOverlay="true"
            :showCancelButton="true">
            <view class="slot-content">
               是否确认装卸？
               <view v-if="isNumOk || isClean||isFlagNum">

				
               <view v-if="isNumOk || isClean||isFlagNum || blend"> 
                  <view>产品名称：{{activeObj.productName}}</view>
                  <view>仓库：{{activeObj.bunkerName}}</view>
                  <view>皮重：{{ Number(activeObj.skin).toFixed(2) || ''}}</view>
                  <view>毛重：{{Number(activeObj.hair).toFixed(2) || ''}}</view>
                  <view >净重：{{ Number(activeObj.clean).toFixed(2) || ''}}</view>
                   <view>计划量：{{activeObj.planMeasure  || '暂无'}}</view>
                    <view>实际量：{{activeObj.realityMeasure  || '暂无'}}</view>
                  <view class="queren">
                     <text>请输入</text>：
                  <view v-if="activeObj.isWeight === 1 || activeObj.isWeight === 2">
                  <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>计划量：{{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>
                       <u--input
                          type='digit'
                         :disabled="yelvFlag"
                          border="bottom"
                        :placeholder="/聚氯乙烯树脂/.test(activeObj.productName) ? '实际吨数' :  isNumOk ?  '数量' :'折吨'"
                        :placeholder="/聚氯乙烯树脂/.test(activeObj.productName) ? '实际吨数' :  isNumOk ?  '确认数量' : blend ? '确认数量' : '折吨'"
                        v-model="checkNum"
                     >
                     </u--input>
                     <text> {{isNumOk ? '件' : '吨' }}</text>
                     <text v-if="isNumOk || isFlagNum || blend"> {{isNumOk ? activeObj.productUnit : '件' }}</text>
                     <text v-if="isClean"> {{'吨' }}</text>
                     </view>
                     <!-- 是否输入折吨 -->
                      <view style="display:flex;margin-top:20rpx" v-if="isClean">是否需要折吨： <u-radio-group
                        v-model="isCleanFlag"
                         placement="row"
                         @change="isCleanChange"
                         iconPlacement="right"
                         style="justify-content: space-evenly"
                     >
                        <u-radio
                        :key="1"
                        :label="'是'"
                        :name="'1'"
                        shape="circle"
                        iconSize="32"
                        label-size="32"
                        size="40"
                        >
                        </u-radio>
                        <u-radio
                        :key="0"
                        :label="'否'"
                        :name="'0'"
                        shape="circle"
                        iconSize="32"
                        label-size="32"
                        size="40"
                        >
                        </u-radio>
                     </u-radio-group></view>
                     <!-- 聚氯乙烯树脂 并且是大包 -->
                     <view class="pvcBig" v-if="activeObj.productName === '聚氯乙烯树脂' && activeObj.packingType === 5">
                        
                     </view>
                     <view v-if="isNumOk && activeObj.productQuantity">当前数量：{{activeObj.productQuantity}}件</view>
                     <view v-if=" activeObj.planMeasure">计划量：{{activeObj.planMeasure}}{{ activeObj.productUnit || '件' }}</view>
                     <view v-if="activeObj.containerNumber"><span>集装箱号：</span>{{activeObj.containerNumber}}</view>
                     
               </view>
                     <view>是否空车出厂: <u-radio-group
                     <view style="display:flex;margin-top:20rpx">是否空车出厂: <u-radio-group
                        v-model="isEmptyCar"
                         placement="row"
                         iconPlacement="right"
@@ -375,7 +430,58 @@
                        >
                        </u-radio>
                     </u-radio-group></view>
                     <view v-if="isClean && isCleanFlag === '1'"><text>折吨照片:</text><u-upload :fileList="fileList1"
                        @afterRead="afterRead"
                        @delete="deletePic"
                        name="1"
                        multiple
                        :maxCount="2"
                        width="250"
                        height="150"
                        :previewFullImage="true"></u-upload></view>
							
            </view>
         </u-modal>
         <!-- 修改弹窗 -->
         <u-modal :show="enterXg"
            :title="'修改确认信息'"
            @close="closeModaledit"
            :width='740'
            @cancel="cancelModaledit"
            @confirm="confirmModaledit"
            :closeOnClickOverlay="true"
            :showCancelButton="true">
            <view class="slot-content">
               <view> 
                  <view>产品名称：{{activeObjedit.productName}}</view>
                  <view class="queren">
                     <text>修改数量</text>：
                       <u--input
                          type='digit'
                          border="bottom"
                        :placeholder="'数量'"
                        v-model="checkNumEdit"
                     >
                     </u--input>
                     </view>
                     <view >原确认数量：{{activeObjedit.productQuantity}}件</view>
	
               </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"
@@ -396,6 +502,7 @@

<script>
   import { mapState, mapMutations, mapGetters } from 'vuex';
   import { BaseUrl } from '@/api/publicInterface.js'
   import combinedTitle from '@/components/combined-title/combined-title.vue';
   export default {
      props: {
@@ -407,7 +514,6 @@
      computed:{
         isBtnShow(){
            return function(item){
               console.log(item,'itemssss')
               if(!item){
                  return false
               }else{
@@ -425,11 +531,10 @@
         },
         isPinShow(){
            return function(item){
               console.log(item,'itemssss')
               if(!item){
                  return false
               }else{
                  if(   !item.orderType === '外销' || item.status === 6){
                  if(   item.status === 6){
                     return false
                  }else{
                     return true;
@@ -485,11 +590,20 @@
      },
      data() {
         return {
            proType:['散装','液氣瓶装','罐装','PVC25','PVC80','PVC1150','PVc1200'],
            enterXg:false,
            isOkNum:'',
            fileList1:[],
            activeObjedit:{},
            discountJpg:'',
            proType:['散装','液氯瓶装','罐装','PVC25','PVC80','PVC1150','PVc1200'],
            coalStatus: ['领取', '预约', '签到', '入场', '称皮', '称毛', '离场', '入磅房', '出磅房', '入仓库', '出仓库', '放空', '作废', '入场申请',
               '进入场院', '异常审核中', '返回加减吨', '超时', '打印中', '打印中', '填写', '放空确认中', '超最大毛重确认中','补打','入场检查','质检中',
               '离场检查','已打印','装卸','返回加减吨确认中'
            ],
            isCleanFlag:'1',
            checkNumEdit:'',
            showConfim:false,
            remarkContent:'',
            dataForm: {
               firstClass: "",
               secondClass: "",
@@ -497,6 +611,7 @@
               bunkerIds:""
            },
            historyData:[],
            paramsItem:{}, 
            messageObj:{
               carNo:'',
            },
@@ -508,7 +623,8 @@
            enterZx:false,
            typeText:'', // 确认装卸三种类型
            isNumOk:false, //计件
            isClean:false, // 折吨
            isClean:false, // 折吨   
            yelvFlag:false,
            isFlagNum:false,// PVCV
            // 场地操作菜单
            firstClassActionsList: [],
@@ -518,6 +634,7 @@
            secondClassShow: false,
            coalList: [],
            checkedCoal: [],
            blend:false,
            checkNum:'',
            activeObj:{},
            userInfo: {},
@@ -567,7 +684,7 @@
         },
         //获取已装卸收发单
         getTodayOrder(){
            this.$reqGet('getTodayConfirmedTaskCoalList',{ bunkerIds:this.dataForm.bunkerIds }).then(res=>{
            this.$reqGet('getTodayConfirmedTaskCoalList',{ bunkerIds:this.dataForm.bunkerIds,productIds:uni.getStorageSync('productIds')}).then(res=>{
             if(res.code === 0){
               this.historyData = res.data;
             }else{
@@ -614,6 +731,10 @@
            
            })
         },
         deletePic(event) {
            this.changeisUploadimg(true);
            this[`fileList${event.name}`].splice(event.index, 1);
         },
         firstClassSelect() {
            this.firstClassShow = true
         },
@@ -624,7 +745,7 @@
                 uni.showLoading({
                    title:'加载中'
                })
               this.$reqGet('getTaskCoalListByBunkerId', { bunkerIds:this.dataForm.bunkerIds }).then(res => {
               this.$reqGet('getTaskCoalListByBunkerId', { bunkerIds:this.dataForm.bunkerIds, productIds:uni.getStorageSync('productIds')}).then(res => {
               uni.hideLoading();
               if (res.code === 0) {
                  this.detailData = res.data.map(item=>{
@@ -647,11 +768,11 @@
            })

         },
                  viewDetail(item){
                  viewDetail(value){
            //查看收发单详情
            uni.navigateTo({
               url: `/subPages/loadUnlaodPageDetail/detail?id=${item.id}&checkId=${item.checkId}`
            });
               uni.navigateTo({
               url: `/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore?id=${value.id}&orderType=${value.orderType}`,
               })
                  },
         firstClassSelectClick(val) {
            this.dataForm.firstClass = val.name;
@@ -676,8 +797,97 @@
         close(){

         },
         uploadFilePromise(url, num) {
            return new Promise((resolve, reject) => {
               let a = uni.uploadFile({
                  url: '/admin/sys-file/uploadUnToken',
                  filePath: url,
                  name: 'file',
                  success: res => {
                     if (num == 1) {
                        this.discountJpg = JSON.parse(res.data)
                           .data.url;
                        resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                     }
                  }
               });
            });
         },
         async afterRead(event) {
            // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
            let lists = [].concat(event.file);
            let fileListLen = this[`fileList${event.name}`].length;
            lists.map(item => {
               this[`fileList${event.name}`].push({
                  ...item,
                  status: 'uploading',
                  message: '上传中'
               });
            });
            for (let i = 0; i < lists.length; i++) {
               const result = await this.uploadFilePromise(lists[i].url, event.name);
               let item = this[`fileList${event.name}`][fileListLen];
               this[`fileList${event.name}`].splice(
                  fileListLen,
                  1,
                  Object.assign(item, {
                     status: 'success',
                     message: '上传成功',
                     url: result
                  })
               );
               fileListLen++;
            }
         },
         confirmModaledit(){
            if(!this.checkNumEdit){
               this.$u.toast('请输入要修改后的数量')
               this.enterXg = false;
            }else{
               this.$reqPost('confirmLoadAndUnloadModify',{
               id: this.activeObjedit.id,
               productQuantity:this.checkNumEdit,
            },'json').then((res) => {
               this.$u.toast('操作成功')
               this.enterXg = false;
               this.getDetailData();
               this.getTodayOrder();	
            })
            }
            console.log('123')
			

         },
         isCleanChange(val){
            console.log(val,'触发')
            if(val === '0'){
               this.checkNum = '';
            }

         },
         editOrder(item){
				
            console.log(item,'item')
            this.activeObjedit = item;
            if(item.isWeight === 1){
               this.$u.toast('称重产品不支持修改！')
            }else{
               //弹窗支持修改
               this.enterXg = true;
					
            }

         },
         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`,
@@ -694,48 +904,90 @@
            // })
         //  计件：   0 聚氯乙烯树脂 type 
         //  折吨: 
            this.fileList1 = [];
            this.activeObj = item;
            if(item.isWeight === 1){
               this.isNumOk = false;
               this.isClean = true;
               this.blend = false;
               this.isCleanFlag = '0';
                this.isFlagNum = false;
            } else if(item.isWeight ===2 ){
               this.blend = true;
               this.isNumOk = false;
               this.isClean = false;
               this.checkNum = item.productQuantity;
               // this.isCleanFlag = '0';
                this.isFlagNum = false;
            }
            else { 
               this.isNumOk = true;
               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';
               //回显计数量
                this.checkNum  = item.productQuantity ? item.productQuantity : '';
            }else if( parintItem.orderType ==='外购' &&  item.isWeight === 1){
               this.isClean = true;
               this.isCleanFlag = '0';
               this.isNumOk = false;
                 this.isFlagNum = false;
            }else{
               this.isNumOk = false;
               this.isClean = false;
               this.blend = false;
                 this.isFlagNum = false;
            }

            //聚氯乙烯树脂
             if(parintItem.orderType ==='外销' && (/聚氯乙烯树脂/.test(item.productName) || item.productName === 'PVC')  && (item.packingType === 3 || item.packingType === 4)){
               this.isNumOk = false;
               this.isClean  = false;
               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;
            }
            //
            //pvc大包自动计算折吨
            if((/聚氯乙烯树脂/.test(item.productName) || item.productName === 'PVC')  && item.packingType === 5){
               this.isNumOk = false;
               this.isClean = false;
                this.isFlagNum = true;
            }
				
            if(parintItem.orderType === '外购'){
               this.isEmptyCar = '1';
            }else if(parintItem.orderType === '外销' || parintItem.orderType === '外购退'){
               this.isEmptyCar = '0';
            }
				
            if((/聚氯乙烯树脂/.test(item.productName) || item.productName === 'PVC')  && item.packingType === 5){
               this.isNumOk = false;
               this.isClean = false;
               this.blend = false;
               this.checkNum = item.productQuantity;
                this.isFlagNum = true;
                this.isCleanFlag = '1';
            }
            //外销不用 输入折吨
            // if(parintItem.orderType ==='外销'){
            //    this.isClean  = false;
            //    this.blend = false;

            // }
         this.enterZx = true;
            
         },
@@ -744,33 +996,42 @@
            this.checkNum = '';
            this.isEmptyCar = null;
         },
         closeModaledit(){
            this.enterXg = false;
         },
         cancelModal(){
            this.enterZx = false;
            this.checkNum = '';
            this.isEmptyCar = null;
         },
         cancelModaledit(){
            this.enterXg = false;
         },
         confirmModal(){
                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){
               console.log('触发，’13131')
               this.enterZx = false;
               this.$u.toast(`请检查当前二氯乙烷(EDC)DC订单质检状态后在确认装卸!`);
               
            }else if( this.isEmptyCar === null){
               this.$u.toast(`请检查${this.isNumOk ? '计件数量' :'折吨'}，以及是否空车出厂项!`);
            }else{
               //装卸 为 2 ，但是必须得称重
            }
            else{
               this.enterZx = false;
               this.$reqPost('confirmLoadAndUnload',{ 
               id: this.activeObj.id,
               productQuantity:this.isNumOk ? this.checkNum : '',
               productQuantity:(this.isNumOk || this.blend) ? this.checkNum : '',
               discount:this.isClean ? this.checkNum : null,
               isEmptyCar:this.isEmptyCar,
               isPretendDischar:this.activeObj.isPretendDischar,
               realityMeasure:this.isFlagNum ? this.checkNum : null,
               productId:this.isFlagNum ? this.activeObj.productId : null,
               discountJpg:this.discountJpg,
             },'json').then(res=>{
               uni.hideLoading();
               console.log(res,'rez')
@@ -781,10 +1042,11 @@
                  uni.hideLoading();
               }else{
                 this.$u.toast('操作成功');
               }
               setTimeout(() => {
                 setTimeout(() => {
                  this.getDetailData();
               }, 500);
               }
					
            
            }).catch((err) => {
                this.$u.toast(err.msg || '失败');
@@ -801,6 +1063,26 @@
         

         },
         //确认
         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 : '操作异常')
            })

         },
         //查看最近一次的原盐钙镁
         todoDetail(){
            console.log()
@@ -812,7 +1094,7 @@
         pinDan(item){
            console.log('pindan')
            uni.navigateTo({
                  url: `/subPages/splicingOrders/index?taskCoalId=${item.id}`
                  url: `/subPages/splicingOrders/index?taskCoalId=${item.id}&orderType=${item.orderType}`
               })
         }

@@ -841,6 +1123,11 @@

<style lang="scss"
   scoped>
   .modalBody{
      display: flex;
      flex-direction: column;
      justify-content: center;
   }
::-webkit-scrollbar{
        display: none;
   }
@@ -852,6 +1139,11 @@
   width: auto;
  }
   
}
.rightBtn{
   position: absolute;
   right: 100rpx;
   bottom: 5rpx;
}
.notice-bar{
      margin-left: vww(10);
@@ -939,6 +1231,9 @@
      min-width: 100rpx;
      // display: flex;
      justify-content: space-around;
      :v-deep   .u-button__text{
         font-size: 12px!important;
      }
       text{
         color: #035cfb;
      }
@@ -948,7 +1243,7 @@
      margin: 10px;
      // margin-top: vww(100);
      position: relative;
      top: vww(-160);
      top: vww(-200);
      .top-tag{
             width: 60%;
            margin-left: 55%;
@@ -1006,6 +1301,7 @@
               }
            }
            .history-information {
               position: relative;
         margin-bottom:30rpx;
         margin-top: 10rpx;
         background: #ffffff;
@@ -1083,6 +1379,7 @@
            font-size: 30rpx;
            font-weight: 300;
            color: #515151;
            position: relative;
            margin: vww(10) vww(10) 0;
            @include flex;