日计划订单增加创建时间，称重明细页面增加未验质说明

yangan

2023-11-15 d96fc1b0dbc3e9e8928a84cca58a568eb16bcb76

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

@@ -60,31 +60,37 @@
               <view class="suffix">{{ weighList.filedName || '' }}</view>
            </view>
            <!-- <view class="main-information">
               <view class="prefix">煤种名称:</view>
               <view class="prefix">物料名称:</view>
               <view class="suffix">{{ weighList.coalName || '' }}</view>
            </view> -->
            <view class="main-information">
               <view class="prefix">订单类型:</view>
               <view class="suffix">{{ weighList.orderType || '' }}</view>
            </view>
            <view class="main-information">
            <!-- <view class="main-information"  v-if="isweight">
               <view class="prefix">皮重:</view>
               <view class="suffix">
                  {{currentSkin}}
               </view>
            </view>
            <view class="main-information">
            <view class="main-information"  v-if="isweight">
               <view class="prefix">毛重:</view>
               <view class="suffix">
                  {{currentHair}}
               </view>
            </view>
            <view class="main-information">
            <view class="main-information" v-if="isweight">
               <view class="prefix">净重:</view>
               <view class="suffix">
                  {{ currentClean}}
               </view>
            </view>
            <view class="main-information" v-else>
               <view class="prefix">净重:</view>
               <view class="suffix">
                  {{ isWeightclean}}
               </view>
            </view> -->
            <!-- <view class="main-information">
               <view class="prefix">订单余量:</view>
               <view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
@@ -143,6 +149,8 @@
   import weighItem from '@/components/weighItem.vue'
   export default {
      onLoad(params) {

         this.isWeighing = params.isWeighing; // 当前是不是回磅的
         this.takeCoalId = params.takeCoalId;
         this.weighData.sceneId = params.sceneId;
         this.weighData.gateCameraId = params.gateCameraId;
@@ -164,6 +172,7 @@
      },
      data() {
         return {
            isWeighing:'',
            weighData: {
               //确认称重接口参数
               deptId: '',
@@ -192,7 +201,8 @@
            temporaryWeighObj: {
               skin: null,
               hair: null,
               clean: null
               clean: null,
               isWeightclean:null,
            },
            infraredStatus: false, // 红外状态，
            // 放空控制
@@ -228,16 +238,16 @@
         globalweigh: {
            handler: function(newV) {
               this.weighData.weigh = this.realTimeWeigh = newV;
               if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList
                  .orderType == '转出') {
               if  ((this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList
                  .orderType == '转出')) {
                  if (!this.showWeigh.skin) {
                     this.temporaryWeighObj.skin = newV;
                  } else {
                     this.temporaryWeighObj.hair = newV;
                     this.isweigh = Number(this.currentClean) < 0;
                  }
               } else if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                  .orderType == '转入') {
               } else if ( (this.isweight) && (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                  .orderType == '转入')) {
                  if (!this.showWeigh.hair) {
                     this.temporaryWeighObj.hair = newV;
                  } else {
@@ -246,9 +256,31 @@
                        .showWeigh
                        .skin > 0;
                  }
               }
               }else if((this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                  .orderType == '转入') && (!this.isweight)){
                     if (!this.showWeigh.skin) {
                     this.temporaryWeighObj.skin = newV;
                     this.temporaryWeighObj.isWeightclean = newV;
                  } else {
                     this.temporaryWeighObj.isWeightclean = newV;

                     this.isweigh = Number(this.currentClean) < 0;
                  }
                  }
            },
            deep: true
         }
      },
      onPullDownRefresh() {
         if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
            if (!this.is_open_socket) {
               this.$store.dispatch('websocketInit')
               this.changeisconnect(false);
               console.log('称重的ws');
               uni.stopPullDownRefresh();
            } else {
               uni.stopPullDownRefresh();
            }
         }
      },
      onShow() {
@@ -256,7 +288,9 @@
         // this.realTimeWeigh = 0
      },
      computed: {
         ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning']),
         ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
            'globalisLogin', 'is_open_socket'
         ]),
         token() {
            return uni.getStorageSync('token');
         },
@@ -307,6 +341,22 @@
                  .currentHair - this.currentSkin).toFixed(2) : ''
            }

         },
         isWeightclean(){
            console.log(this.temporaryWeighObj,'his.temporaryWeighObj')
            return this.temporaryWeighObj.skin || ''
         },
         isweight(){
            if(this.isWeighing){
               if(this.isWeighing == '不回磅'){
                  return false
               }else{
                  return true
               }

            }else{
               return true
            }
         }
      },
      methods: {
@@ -705,7 +755,7 @@
      .bottom-block {
         width: calc(100% - 60rpx);
         box-sizing: border-box;
         height: 630rpx;
         height: 420rpx;
         margin: 0 vww(15) vww(15) vww(15);
         background: #ffffff;
         box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
@@ -716,8 +766,8 @@

         .block-main {
            width: 94%;
            height: 565rpx;
            margin-top: vww(10);
            height: 420rpx;
            margin-top: vww(5);
            @include flex;
            justify-content: space-around;
            align-items: flex-start;