app端物资明细字段，增加榜单类型

yangan

2023-11-09 81062e5937779fd4ee4004412ca89942b67017b4

 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue

@@ -1,28 +1,27 @@
<template>
   <view class="bill-of-lading-details">
      <view class="top-banner"
         style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
         :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/loadingbanner.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
      </view>
      <view class="top-information">
         <view class="cutomer-name"
            v-if="orderType == '转入' || orderType == '转出'">煤场:{{ coalDetailsData.toFiledName || '' }}</view>
            v-if="orderType == '转入' || orderType == '转出'">仓库:{{ coalDetailsData.toFiledName || '' }}</view>
         <view class="cutomer-name"
            v-else>客户:{{ coalDetailsData.customerName || '' }}</view>
         <view class="fild-name">
            <view class="">矿场:{{ coalDetailsData.deptName || '暂无' }}</view>
            <view class="">基地:{{ coalDetailsData.deptName || '暂无' }}</view>
            <view class=""
               v-if="orderType == '转入' || orderType == '转出'">煤场:{{ coalDetailsData.filedName || '' }}</view>
               v-if="orderType == '转入' || orderType == '转出'">仓库:{{ coalDetailsData.filedName || '' }}</view>
            <view class=""
               v-else>煤场:{{ coalDetailsData.filedName || '暂无' }}</view>
               v-else>仓库:{{ coalDetailsData.filedName || '暂无' }}</view>
         </view>
      </view>
      <view class="block-information">
         <view class="block-main">
            <view class="basic">
               <view class="coalName">{{ coalDetailsData.coalName||'' }}</view>
               <view class="coalName"><text> {{ coalDetailsData.coalName||'' }}</text></view>
               <view class="status-button"
                  style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
                              background-size: cover;">
                  :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/statusbutton.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
                  {{ coalStatus[coalDetailsData.statusWeigh] || '' }}
               </view>
            </view>
@@ -32,7 +31,7 @@
                     size="40"></u-icon></view>
               <view class="send-date">{{ coalDetailsData.sendDate }}</view>
            </view>
            <view class="coal-code">提煤单编号:&nbsp;&nbsp;{{ coalDetailsData.code || '' }}</view>
            <view class="coal-code">通知单编号:&nbsp;&nbsp;{{ coalDetailsData.code || '' }}</view>
            <view class="order-code">
               订单编号:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ coalDetailsData.orderCode || '' }}</view>
            <view class="coal-code"
@@ -40,32 +39,13 @@
               style="color: rgb(73, 123, 251);">
               查看明细
            </view>
            <view class="weigh-item"
               v-for='item in showWeigh'
               :key="item.id">
               <view class="item">
                  <view class="concrete"
                     style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
                     皮</view>
                  <view class="num">{{ item.skin }}</view>
               </view>
               <view class="item">
                  <view class="concrete"
                     style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
                     毛</view>
                  <view class="num">{{ item.hair }}</view>
               </view>
               <view class="item">
                  <view class="concrete"
                     style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
                     净</view>
                  <view class="num">{{ item.clean }}</view>
               </view>
            </view>

         </view>
      </view>


      <!--  称重历史-->
      <weigh-item :list="showWeigh"></weigh-item>
      <!-- 时间线 -->
      <view class="timeLine">
         <u-steps :current="dayRZ.length - 1"
            direction="column"
@@ -79,7 +59,7 @@

      </view>
      <view class="utilsBox">
         <view class="utils_chil utils_chilTop">
         <view class="utils_chil utils_chilTop" v-if="!isReservation">
            <view class="top-button">
               <u-button text="签到"
                  type="primary"
@@ -87,12 +67,12 @@
                  @click="arriveClick"
                  shape="circle"
                  :disabled="coalDetailsData.status >= 2"></u-button>
               <u-button text="入场申请"
               <u-button text="打印磅单"
                  type="primary"
                  plain
                  @click="rcsqClick"
                  @click="printOrder"
                  shape="circle"
                  :disabled="coalDetailsData.status >= 3"></u-button>
                  :disabled="currentPageCoalStatus !== 4"></u-button>
            </view>
            <view class="bottom-button">
               <u-button text="放空"
@@ -110,12 +90,14 @@
            </view>
         </view>
      </view>
      <view class="weigh-ability">
         <view class="weigh-button"><u-button text="展示提煤单"
      <view class="weigh-ability" v-if="!isReservation">
         <!-- <view class="weigh-button"><u-button text="展示通知单"
               @click="showCaolPickUpBill"
               type="primary"
               shape="circle"></u-button></view>
         <view class="weigh-button"><u-button text="上磅计量"
               shape="circle"></u-button></view> -->
         <view class="weigh-button"><u-button 
                :disabled="!isapproach"
                text="上磅计量"
               @click="cengZhongClick"
               type="primary"
               shape="circle"></u-button></view>
@@ -131,7 +113,7 @@
      <view class="completeOutSale">
         <u-modal :show="completeOutSaleShow"
            title="确认"
            content="是否完成外销提煤单"
            content="是否完成外销通知单"
            :showCancelButton="true"
            @confirm="completeOutSaleConfirm"
            @cancel="completeOutSaleCancel"></u-modal>
@@ -140,9 +122,14 @@
</template>

<script>
   import { onlineurl } from '@/api/request.js'
   import { webSocketUrl } from '@/api/request.js';
   import { mapState, mapMutations } from 'vuex';
   import weighItem from '@/components/weighItem.vue'
   export default {
      components: {
         weighItem
      },
      onLoad(value) {
         this.orderPlanId = value.orderPlanId;
         this.yyId = value.yyId;
@@ -155,9 +142,10 @@
         return {
            orderPlanId: null,
            yyId: null,
            chengZhongFlag:true, // 上榜称重状态
            dayRZ: [],
            coalDetailsData: {}, // 提煤单详情
            currentPageCoalStatus: 0, // 当前页面提煤单状态
            coalDetailsData: {}, // 通知单详情
            currentPageCoalStatus: 0, // 当前页面通知单状态
            // 获取所在磅房参数
            getWeightHouseObj: {
               deptId: '',
@@ -182,7 +170,7 @@
               openId: null,
               openName: ''
            },
            coalStatus: ['未称重', '称重中', '验质中', '称重完成'], // 状态
            coalStatus: ['未称重', '称重中', '验质中', '称重完成', '验质完成'], // 状态
            weighHouseCode: '',
            // 放空弹窗控制变量
            evacuationModalShow: false,
@@ -212,9 +200,11 @@
               clean: ""
            },
            completeOutSaleShow: false,
            reservationIsShow:false,
            overTmWaixiao: null,
            // 判读网络状态，
            normalCode: null
            normalCode: true,
            onlineurl,
         };
      },
      onShow() {
@@ -254,6 +244,10 @@
         // 展示皮毛净
         showWeigh() {
            return this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData.tmTaskCoalItems : []
         },
         //司机领取状态按钮全不展示 
         isReservation(){
            return this.reservationIsShow < 1;
         }
      },
      methods: {
@@ -274,7 +268,7 @@
               }
            });
            this.coalDayPage(); //获取日志
            this.getTakeCoal(); //获取提煤单详情
            this.getTakeCoal(); //获取通知单详情
            this.getgetService(); //获取客服
         },
         // 获取客服openid
@@ -291,7 +285,7 @@
               }
            });
         },
         // 获取提煤单详情
         // 获取通知单详情
         getTakeCoal() {
            uni.showLoading({
               title: '加载中'
@@ -299,7 +293,7 @@
            this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
               uni.hideLoading();
               if (res.code == 0) {
                  console.log(res, '提煤单详情');
                  console.log(res, '通知单详情');
                  this.coalDetailsData = res.data;
                  this.orderType = this.coalDetailsData.orderType;
                  // 判断是否完成外销订单
@@ -320,8 +314,9 @@
                  // 获取客服openId参数赋值
                  this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
                  this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
                  // 获取提煤单状态
                  // 获取通知单状态
                  this.currentPageCoalStatus = this.coalDetailsData.statusWeigh;
                  this.reservationIsShow = this.coalDetailsData.status;
                  // 获取原发信息
                  this.primarySkin = this.coalDetailsData.skinTwo;
                  this.primaryHair = this.coalDetailsData.hairTwo;
@@ -375,7 +370,7 @@
               this.$u.toast('服务器错误,请稍后重试')
            }
         },
         // 展示提煤单详情
         // 展示通知单详情
         showCaolPickUpBill() {
            uni.navigateTo({
               url: `/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill?orderPlanId=${this.orderPlanId}`
@@ -443,14 +438,6 @@
               }
            });
         },
         calling() {
            // wx.join1v1Chat({
            //    caller: { nickname: this.name, openid: this.openid }, //oZjXk5RRmbroAfl1m5aZ6hRNvqh4
            //    listener: { nickname: this.serviceInfoObj.openName, openid: 'orutI5YT0yEvARVngdsTmBpisWmw' }, // 这里的openid是fyy的，充当固定的客服openid
            //    backgroundType: 2,
            //    roomType: 'voice'
            // });
         },
         // 称重
         cengZhongClick() {
            this.$reqGet('getWeighHouse', this.getWeightHouseObj).then(res => {
@@ -466,7 +453,8 @@
                     res.data.id
                  }&gateCameraId=${res.data.lastEquipmentId}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}&primarySkin=${
                     this.primarySkin
                  }&primaryHair=${this.primaryHair}&psrimaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}`
                  }&primaryHair=${this.primaryHair}&psrimaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}
                  &isWeighing=${this.coalDetailsData.weighingType}`
                  });
               } else {
                  this.$u.toast('未在磅房，请前往磅房后再试！！');
@@ -513,7 +501,19 @@
         // 查看质量明细
         jumpWeighDetail() {
            uni.navigateTo({
               url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}`
               url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}&flag=${true}`
            })
         },
         //打印磅单
         printOrder(){
            this.$reqGet('printerHandler',{tmId:this.orderPlanId}).then(res => {
               if (res.data) {
                  uni.hideLoading();
                  // this.orderPlanData = res.data
               } else {
                  uni.hideLoading();
                  this.$u.toast('加载失败')
               }
            })
         }
      }
@@ -611,9 +611,6 @@
            height: 100%;
            min-height: 380rpx;
            margin: vww(18) vww(7) vww(11) vww(17);
            // flex-direction: column;
            // justify-content: space-between;
            // align-items: flex-start;
         }

         .status-button {
@@ -636,12 +633,15 @@

            .coalName,
            .order-type {
               width: 45%;
               height: 30rpx;
               width: 370rpx;
               height: 55rpx;
               font-size: 30rpx;
               font-weight: 300;
               color: #515151;
               position: relative;
               overflow: hidden; //溢出隐藏
               text-overflow: ellipsis;   //超出部分省略号
               white-space: nowrap; //不换行
            }

            .black-block {
@@ -678,37 +678,58 @@
            color: #7d7d7d;
         }

         .weigh-item {
            width: 100%;
            height: vww(36);
            @include flex;
            justify-content: space-around;

            .item {
               min-width: vww(50);
               height: vww(45);
               font-size: 21rpx;
               font-weight: 400;
               color: #ffffff;
               text-align: center;
               line-height: vww(30);
      }

      // 称重历史
      .weigh-history {
         @extend .block-information;

         .block-main {
            @extend .block-main;
            gap: 10rpx 20rpx;

            .weigh-item {
               width: 100%;
               height: vww(80);
               @include flex;
               flex-direction: column;
               justify-content: space-around;
               align-items: flex-start;

               .concrete {
                  width: vww(36);
               .item-block {
                  width: 100%;
                  height: vww(36);
               }
                  @include flex;
                  justify-content: space-around;

               .num {
                  font-size: 40rpx;
                  font-weight: 300;
                  color: #303030;
                  .item {
                     min-width: vww(50);
                     height: vww(45);
                     font-size: 21rpx;
                     font-weight: 400;
                     color: #ffffff;
                     text-align: center;
                     line-height: vww(30);
                     @include flex;

                     .concrete {
                        width: vww(36);
                        height: vww(36);
                     }

                     .num {
                        font-size: 40rpx;
                        font-weight: 300;
                        color: #303030;
                     }
                  }
               }
            }
         }
      }


      // 时间线
      .timeLine {
         height: 300rpx;
         min-height: 300rpx;