feat:小程序修改问题若干

yangan

2024-06-29 6a232ec3d1d75af66b5afb475895d585a494cbaf

 pages/loadUnload-page/selectTarget/selectTarget.vue

@@ -65,7 +65,7 @@
                        <view class=""></view>
                     </view>
                     <view class="second">
                        <view class="coal-name">{{ item.productName || '' }}</view>
                        <view class="coal-name">{{ item.productNames || item.productName }}</view>
                        <view class="order-type">{{ item.orderType || '' }}</view>
                     </view>
                     <view class="third">
@@ -73,11 +73,7 @@
                           <view class="third-line_text">客户名称:</view>
                           <view>{{ item.customerName }}</view>
                        </view>
                        <view class="third-line">
                           <view class="third-line_text">仓库:</view>
                           <view >{{ item.bunkerName }}</view>
                        </view>
                        <view class="third-line">
                        <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>
@@ -105,8 +101,7 @@
                  <uni-th width='140'
                  align="center">操作</uni-th>
                   <uni-th align="center" width='120'>产品</uni-th>
                  <uni-th align="center">车牌号</uni-th>
                  <uni-th align="center">类型</uni-th>
                  <uni-th align="center">仓库</uni-th>
                  <uni-th align="center">皮重</uni-th>
                  <uni-th align="center">毛重</uni-th>
                  <uni-th align="center">净重</uni-th>
@@ -120,14 +115,12 @@
               <view class="btnBox"> 
                  <!--   -->
                  <u-button   text='查看'  @click="viewDetail(subItem)"></u-button>
                  <u-button type='primary' text='确认装卸'  v-if="subItem.flag" @click="enterOk(subItem)"></u-button>
                  <u-button type='primary' text='确认装卸'  v-if="subItem.flag" @click="enterOk(item,subItem)"></u-button>
                  </view></uni-td>
                  <uni-td align="center">
                     <view>{{ subItem.productName }}</view></uni-td>
                     <uni-td align="center">
                     <view style="width:150rpx">{{ subItem.carNo }}</view></uni-td>
               <uni-td>
                  <view class="name">{{ subItem.orderType }}</view>
                  <view class="name">{{ subItem.bunkerName }}</view>
               </uni-td>
               <uni-td>
                  <view class="name">{{ subItem.skin }}</view>
@@ -171,12 +164,11 @@
               是否确认装卸？
               <view v-if="isNumOk || isClean">
                  <text>产品名称：{{activeObj.productName}}</text>
						
                  <view class="queren">
                     <text>请输入</text>：
                       <u--input
                          type='digit'
                          border="bottom"
                         :disabled="activeObj.productName === 'PVC' && activeObj.packingType === 5"
                        :placeholder="isNumOk ?  '数量' :'折吨'"
                        v-model="checkNum"
                     >
@@ -189,8 +181,35 @@
                     </view>
                     <view v-if="isNumOk && activeObj.productQuantity">当前数量：{{activeObj.productQuantity}}件</view>
                     <view v-if="activeObj.containerNumber"><span>集装箱号：</span>{{activeObj.containerNumber}}</view>
							
               </view>

                     <view>是否空车出厂: <u-radio-group
                        v-model="isEmptyCar"
                         placement="row"
                         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>
         </u-modal>
      <!-- 煤仓 -->
@@ -211,6 +230,7 @@
</template>

<script>
   import { BaseUrl } from '@/api/publicInterface.js'
   export default {
      props: {
         loadUnloadData: {
@@ -236,8 +256,9 @@
               orderType: '',
               bunkerId:""
            },
            isEmptyCar:null, //是否空车出厂
            checkStatusList:[
               '待取样','已取样','合格','不合格'
               '待取样','已取样','质检中','待复核','复核中','待审定','审定中','已完成'
            ],
            index: '',
            enterZx:false,
@@ -259,6 +280,7 @@
            filedId: "",
            selectedCoal: [],
            orderTypeShow: false,
            pvcWeight:'',
            orderTypeList: [{
                  name: '外销',
                  id: Math.floor(Math.random() * 100) + 1,
@@ -274,6 +296,9 @@
         };
      },
      methods: {
            getPVCWeight(){
			
         },
         viewDetail(item){
            //查看收发单详情
            uni.navigateTo({
@@ -287,6 +312,7 @@
               this.userInfo.password = null
            })
         },
		
         // 获取煤场
         getDeptIdFiled() {
            uni.showLoading({
@@ -332,8 +358,12 @@
                  });
                  console.log(this.detailData,'detailData')
               }else if(res.code === 1){
                  this.detailData = [];
                  this.$u.toast(res.msg ? res.msg : '操作失败！！')
               }
            }).catch(err=>{
               this.detailData = [];
               this.$u.toast(res.msg ? res.msg : '操作失败！！')
            })

         },
@@ -359,24 +389,62 @@
         close(){

         },

					

			
         open(){},
         enterOk(item){
            console.log('123外购退 和 外购',item)
         enterOk(parintItem,item){
            console.log(parintItem,'priintItem')
            uni.request({
               url: `${BaseUrl}/admin/dict/type/tray_weight`,
               method: 'GET',
               header: {
               Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
               clientToc: 'Y',
               'CLIENT_TOC': 'Y',
            },
               success: (res) => {
                  this.pvcWeight = res.data.data.find(item=>item.label === '5') ? Number(res.data.data.find(item=>item.label == '5').value) : '';
						
               }
            })
         //  计件：   0 pvc type 
         //  折吨: 
            this.activeObj = item;
            if( (item.orderType === '外购' ||item.orderType === '外购退' ) &&  item.productQuantity){
            if( (parintItem.orderType === '外购' ||parintItem.orderType === '外购退' ) && item.isWeight === 0){
               this.isNumOk = true;
               this.isClean = false;
            }else if( item.orderType ==='外购' &&  item.isWeight === 1){
               //回显计数量
                this.checkNum  = item.productQuantity ? item.productQuantity : '';
            }else if( parintItem.orderType ==='外购' &&  item.isWeight === 1){
               this.isClean = true;
               this.isNumOk = false;
            }else{
               this.isNumOk = false;
               this.isClean = false;
            }
            //pvc
             if(parintItem.orderType ==='外销' && item.productName ==='PVC' && (item.packingType === 3 || item.packingType === 4)){
               this.isNumOk = true;
               this.isClean  = false;
            }
            //瓶装液氯条件
            //EDC 质检完成方可确认
            if(item.packingType === 1){ 
               this.isNumOk = true;
               this.isClean = false;
            }
            //
            //pvc大包自动计算折吨
            if(item.productName === 'PVC' && item.packingType === 5){
               this.checkNum =  (Number(item.productQuantity) * 60)

               this.isNumOk = true;
               this.isClean = false;
            }
            if(parintItem.orderType === '外购'){
               this.isEmptyCar = '1';
            }else if(parintItem.orderType === '外销' || parintItem.orderType === '外购退'){
               this.isEmptyCar = '0';
            }
         this.enterZx = true;
            
@@ -384,22 +452,36 @@
         closeModal(){
            this.enterZx = false;
            this.checkNum = '';
            this.isEmptyCar = null;
         },
         cancelModal(){
            this.enterZx = false;
            this.checkNum = '';
            this.isEmptyCar = null;
         },
         confirmModal(){
            this.enterZx = false;
                uni.showLoading({
                    title:'加载中'
                })
            this.$reqPost('confirmLoadAndUnload',{ 
                });
            if(this.activeObj.productName ==='EDC'){
               if( this.activeObj.checkStatus !== 7){
                        this.$u.toast(`请检查当前EDC订单质检状态后在确认装卸!`);
                        return
               }
					
            }else if( this.isEmptyCar === null){
               this.$u.toast(`请检查${this.isNumOk ? '计件数量' :'折吨'}，以及是否空车出厂项!`);
               return
            }else{
               this.enterZx = false;
               this.$reqPost('confirmLoadAndUnload',{ 
               id: this.activeObj.id,
               productQuantity:this.isNumOk ? this.checkNum :this.activeObj.skin,
               productQuantity:this.isNumOk ? this.checkNum : '',
               discount:this.isClean ? this.checkNum : null,
               isEmptyCar:this.isEmptyCar,
               isPretendDischar:this.activeObj.isPretendDischar
             },'json').then(res=>{
               uni.hideLoading();
               console.log(res,'rez')
               this.checkNum = '';
               if(res.code === 1){
@@ -416,9 +498,12 @@
            }).catch((err) => {
                this.$u.toast(err.msg || '失败');
            }).finally(() => {
				
            uni.hideLoading();
                   
            })
            }
				
				
         },
         //判断是否是 三种特殊类型对应弹窗
         judgeTypeFun(name){
@@ -433,8 +518,6 @@
               })

         }

			

      },
      onShow(){
@@ -455,14 +538,20 @@
                  this.$u.toast('加载失败')
               }
            }).then(() => {
				
               this.getUserInfo()
            })
      }
            });
			

      },
   }
</script>

<style lang="scss"
   scoped>
::-webkit-scrollbar{
        display: none;
   }
   .table{
   width: 100%;
  /deep/ .uni-table{
@@ -657,7 +746,7 @@

         .third {
            width: 96%;
            height:  120rpx;
            height:  auto;
            font-size: 30rpx;
            font-weight: 300;
            color: #515151;