修改样式，修复已知bug

qingyiay

2023-04-24 bb52e0d4baffe8e0486c951e525b6614bd4aaa28

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

@@ -20,16 +20,60 @@
               </view> -->
            </view>
         </view>
         <view class="bottom" v-if="weighList.orderType == '内购' || weighList.orderType == '转出'">
         <view class="bottom" v-if="weighList.orderType == '内购' || weighList.orderType == '转入'">
            <view>
               <view style="font-weight: 600;">原发信息</view>
               <text>皮重{{ primarySkin || '' }}毛重{{ primaryHair || '' }}净重{{ primaryClean || '' }}</text>

               <text>毛重:{{ primaryHair || '' }}皮重:{{ primarySkin || '' }}净重:{{ primaryClean || '' }}</text>
            </view>
         </view>
         <view class="bottom" v-else-if="weighList.orderType == '外购' && weighList.hair == 0">
            <text>
               毛重:{{ coalContactHair || '' }}皮重:{{ coalContactSkin || '' }}净重:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }}
            </text>
         </view>
         <view class="bottom"><text>TIP:当前状态为正常时可以称重</text></view>
      </view>
      <view class="two">
         <p>订单编号：{{ weighList.code || '' }}</p>
         <uni-table border stripe emptyText="暂无更多数据">
            <uni-tr>
               <uni-th align="left">订单编号</uni-th>
               <uni-td align="right">{{ weighList.code || '' }}</uni-td>
            </uni-tr>
            <uni-tr>
               <uni-th align="left">订单类型</uni-th>
               <uni-td align="right">{{ weighList.orderType || '' }}</uni-td>
            </uni-tr>
            <uni-tr>
               <uni-th align="left">订单余量</uni-th>
               <uni-td align="right">{{ weighList.orderSurplus || 0 }}</uni-td>
            </uni-tr>
            <uni-tr>
               <uni-th align="left">毛重</uni-th>
               <uni-td align="right">{{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}</uni-td>
            </uni-tr>
            <uni-tr>
               <uni-th align="left">皮重</uni-th>
               <uni-td align="right">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</uni-td>
            </uni-tr>
            <uni-tr>
               <uni-th align="left">净重</uni-th>
               <uni-td align="right">{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</uni-td>
            </uni-tr>
            <uni-tr>
               <uni-th align="left">煤种名称</uni-th>
               <uni-td align="right">{{ weighList.coalName || '' }}</uni-td>
            </uni-tr>
            <uni-tr>
               <uni-th align="left">矿场名称</uni-th>
               <uni-td align="right">{{ weighList.deptName || '' }}</uni-td>
            </uni-tr>
            <uni-tr>
               <uni-th align="left">煤场名称</uni-th>
               <uni-td align="right">{{ weighList.filedName || '' }}</uni-td>
            </uni-tr>
         </uni-table>
         <!-- <p>订单编号：{{ weighList.code || '' }}</p>
         <p>订单类型：{{ weighList.orderType || '' }}</p>
         <p>订单余量：{{ weighList.orderSurplus || 0 }}</p>
         <p>皮重：{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</p>
@@ -37,7 +81,7 @@
         <p>净重：{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</p>
         <p>煤种名称：{{ weighList.coalName || '' }}</p>
         <p>单位名称：{{ weighList.deptName || '' }}</p>
         <p>矿场名称：{{ weighList.filedName || '' }}</p>
         <p>矿场名称：{{ weighList.filedName || '' }}</p> -->
      </view>
      <view class="three">
         <!-- 放空 -->
@@ -65,11 +109,24 @@
            @cancel="evacuationCancel"
         ></u-modal>
      </view>
      <!-- 外购类型手动输入弹窗 -->
      <view class="">
         <u-modal :show="firstHairCustomernameShow" title="填写重量" @confirm="OutsourcingConfirm">
         <u-modal :show="firstHairCustomernameShow" title="填写原发重量" @confirm="OutsourcingConfirm">
            <view class="">
               <view class=""><u--input placeholder="请输入毛重" border="surround" v-model="CoalContactHair" type="digit"></u--input></view>
               <view class=""><u--input placeholder="请输入皮重" border="surround" v-model="CoalContactSkin" type="digit"></u--input></view>
               <text>毛重:</text>
               <view class=""><u--input placeholder="请输入毛重" v-model="coalContactHair" type="digit"></u--input></view>
               <text>皮重:</text>
               <view class=""><u--input placeholder="请输入皮重" v-model="coalContactSkin" type="digit"></u--input></view>
            </view>
         </u-modal>
      </view>
      <!-- 手动输入之后的二次弹窗 -->
      <view class="secondary-confirmation">
         <u-modal :show="secondConfirmShow" title="请确认原发重量" :showCancelButton="true" @confirm="secondConfirm" @cancel="secondCancel">
            <view class="secondary-confirmation__main">
               <view class="secondary-child">毛重:{{ coalContactHair }}</view>
               <view class="secondary-child">皮重:{{ coalContactSkin }}</view>
               <view class="secondary-child">净重:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) }}</view>
            </view>
         </u-modal>
      </view>
@@ -105,12 +162,15 @@
            equipmentCode: '',
            weigh: 0,
            tmCode: '',
            sceneInOut: ''
            sceneInOut: '',
            coalContactClean: 0,
            coalContactHair: 0,
            coalContactSkin: 0
         },
         takeCoalId: null,
         weighHouseCode: '',
         isConfirmWeighLoading: false, //确定称重按钮
         realTimeWeigh: '',
         realTimeWeigh: 0,
         weighList: {},
         // 临时称重对象
         temporaryWeighObj: {
@@ -131,8 +191,10 @@
         isweigh: false,
         // 外购类型称重出现弹窗填写毛，皮，
         firstHairCustomernameShow: false,
         CoalContactHair: '',
         CoalContactSkin: ''
         coalContactHair: '',
         coalContactSkin: '',
         // 二次确认
         secondConfirmShow: false
      };
   },
   watch: {
@@ -141,6 +203,7 @@
            if (this.weighList.skin == 0) {
               // this.temporaryWeighObj.skin = this.realTimeWeigh;
               this.temporaryWeighObj.skin = newV;
               this.isweigh = this.temporaryWeighObj.skin > this.weighList.orderSurplus;
            } else {
               // this.temporaryWeighObj.hair = this.realTimeWeigh;
               this.temporaryWeighObj.hair = newV;
@@ -151,6 +214,7 @@
            if (this.weighList.hair == 0) {
               // this.temporaryWeighObj.hair = this.realTimeWeigh;
               this.temporaryWeighObj.hair = newV;
               this.isweigh = this.temporaryWeighObj.hair > this.weighList.orderSurplus;
            } else {
               // this.temporaryWeighObj.skin = this.realTimeWeigh;
               this.temporaryWeighObj.skin = newV;
@@ -165,12 +229,13 @@
            this.weighData.weigh = this.realTimeWeigh = v;
            console.log(this.realTimeWeigh, '真实重量改变了');
         },
         immediate: true,
         deep: true
         deep: true,
         immediate: true
      }
   },
   onShow() {
      this.init();
      this.realTimeWeigh = 0;
      // this.initWebSocket();
   },
   computed: {
@@ -210,17 +275,31 @@
               this.weighData.tmId = res.data.id;
               this.weighData.carNo = res.data.carNo;
               this.weighData.tmCode = res.data.code;
               if (this.weighList.orderType == '外销' && this.weighList.hair == 0) {
               if (this.weighList.orderType == '外购' && this.weighList.hair == 0) {
                  this.firstHairCustomernameShow = true;
               }
            }
         });
      },
      // 外购类型输入点击确认之后二次确认
      OutsourcingConfirm() {
         this.weighData.CoalContactSkin = Number(this.CoalContactSkin);
         this.weighData.CoalContactHair = Number(this.CoalContactHair);
         this.weighData.CoalContactclean = Number(this.CoalContactHair) - Number(this.CoalContactSkin);
         this.saveWeigh();
         this.weighData.coalContactSkin = Number(this.coalContactSkin);
         this.weighData.coalContactHair = Number(this.coalContactHair);
         this.weighData.coalContactClean = Number((Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2));
         if (Number(this.coalContactSkin) == 0 || Number(this.coalContactHair) == 0) {
            this.$u.toast('重量不能为0,请重新填写');
         } else {
            this.secondConfirmShow = true;
         }
      },
      // 二次确认弹窗 点击确定
      secondConfirm() {
         this.secondConfirmShow = false;
         this.firstHairCustomernameShow = false;
      },
      // 二次弹窗点击取消
      secondCancel() {
         this.secondConfirmShow = false;
      },
      /**
       * @确认称重等待后端提供实时称重接口，获取皮重，毛重
@@ -355,12 +434,12 @@
   display: flex;
   flex-direction: column;
   .one {
      flex: 2;
      flex: 3;
      border: vww(2) solid #dddddd;
      margin: vww(20) vww(20) 0 vww(20);
      border-radius: vww(15);
      .top {
         height: 80%;
         height: 75%;
         display: flex;
         .top_left {
            flex: 3;
@@ -381,8 +460,13 @@
      }
      .bottom {
         text-align: center;
         position: relative;
         top: vww(-30);
         height: 25%;
         display: flex;
         justify-content: space-between;
         align-items: center;
         flex-direction: column;
         // position: relative;
         // top: vww(-10);
      }
   }
   .two {
@@ -391,6 +475,29 @@
      margin: vww(20);
      border-radius: vww(10);
      padding: vww(20);
      .uni-table {
         .uni-table-tr {
            padding: 0;
            border: vww(1) solid #c6c6c6;
            .uni-table-th {
               font-size: vww(14);
               height: vww(30);
               line-height: vww(30);
               padding: vww(5) vww(10);
               color: #111111;
               font-weight: 500;
               background: #e2e2e2;
            }
            .uni-table-td {
               font-size: vww(14);
               font-weight: 400;
               height: vww(30);
               line-height: vww(30);
               padding: vww(5) vww(10);
               color: #111111;
            }
         }
      }
      p {
         text-align: center;
         font-size: vww(20);
@@ -417,4 +524,14 @@
      flex: 0.5;
   }
}
.secondary-confirmation__main {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
   align-items: center;
   .secondary-child {
      display: flex;
      justify-content: space-between;
   }
}
</style>