前端

public/static/payprint.html

@@ -174,7 +174,7 @@
       }
 
       .part2 {
-        height: 135vh;
+        height: 140vh;
         /* background: red; */
       }
 
@@ -201,7 +201,7 @@
               <div class="header1">
                 付款回执单
               </div>
-              <img :src=" printData1[index].paymentScreenshot" class="paymentScreenshot" />
+              <img :src="printData1[index].codeUrl" class="paymentScreenshot" />
             </div>
             <div class="center" v-if="isShowPrintType3">
               <div class="header1">{{ printData1[index].compName}}结算凭证</div>

src/components/balanceAlert.vue

@@ -3,83 +3,78 @@
   <div class="content">
     <div class="title" v-if="information.indexOf('毛重') > -1">毛重</div>
     <div class="title" v-else>皮重</div>
-    <div class="number" v-if="information.indexOf('毛重') > -1">{{grossWeightVal}} kg</div>
-    <div class="number" v-else>{{tareVal}} KG</div>
-    
+    <div class="contentInfo">
+      <div class="uncertain">浮动重量</div>
+      <div class="number" v-if="information.indexOf('毛重') > -1">
+        {{ grossWeightVal }} kg
+      </div>
+      <div class="number" v-else>{{ tareVal }} kg</div>
+    </div>
+
     <div class="btn" @click="sendVal">确定</div>
   </div>
 </template>
 
 <script>
-
 export default {
   name: 'balanceAlert',
   props: ['deptBudgetList', 'information'],
-  data () {
+  data() {
     return {
-     param: 9600,
-     grossWeightVal:'',
-     tareVal:''
+      param: 9600,
+      grossWeightVal: '',
+      tareVal: '',
     }
   },
-  activated(){
-   
-  },
-  mounted(){
- console.log('11111111111111111111111111111111111')
+  activated() {},
+  mounted() {
+    console.log('11111111111111111111111111111111111')
     console.log(this.deptBudgetList)
     this.openPort()
   },
-  computed: {
-    
-  },
-  created () {
-    
-  },
+  computed: {},
+  created() {},
   methods: {
-    sendVal(){
+    sendVal() {
       console.log(this.grossWeightVal)
-       console.log(this.tareVal)
-       console.log(this.deptBudgetList)
-      if(this.information.indexOf('毛重') > -1){
-        this.$emit('balanceListen',this.grossWeightVal)
-      }else{
-        this.$emit('balanceListen',this.tareVal)
+      console.log(this.tareVal)
+      console.log(this.deptBudgetList)
+      if (this.information.indexOf('毛重') > -1) {
+        this.$emit('balanceListen', this.grossWeightVal)
+      } else {
+        this.$emit('balanceListen', this.tareVal)
       }
-      
     },
-   async closePort() {
+    async closePort() {
       console.log('closePort')
       this.reader.cancel()
     },
-     async openPort() {
+    async openPort() {
       console.log('openPort', navigator)
-        if ('serial' in navigator) {
-          if (!this.$store.state.app.reader) {
-            // The Web Serial API is supported.
-            console.log('the Web Serial API is supported.')
-            const port = await navigator.serial.requestPort()
-            if(this.deptBudgetList.warehouseName == '白城内陆港'){
-              this.param = 1200
-            }
-            else{
-              this.param = 9600
-            }
-            console.log(this.param)
-            await port.open({
-              baudRate: this.param,
-            }) // set baud rate
-            this.reader = port.readable.getReader()
-            console.log('port  ', port)
-            this.$store.dispatch('app/setReader', this.reader)
-            console.log('reader  ', this.reader)
+      if ('serial' in navigator) {
+        if (!this.$store.state.app.reader) {
+          // The Web Serial API is supported.
+          console.log('the Web Serial API is supported.')
+          const port = await navigator.serial.requestPort()
+          if (this.deptBudgetList.warehouseName == '白城内陆港') {
+            this.param = 1200
           } else {
-            console.log('afterport', this.$store.state.app.reader)
-            this.reader = this.$store.state.app.reader
+            this.param = 9600
           }
+          console.log(this.param)
+          await port.open({
+            baudRate: this.param,
+          }) // set baud rate
+          this.reader = port.readable.getReader()
+          console.log('port  ', port)
+          this.$store.dispatch('app/setReader', this.reader)
+          console.log('reader  ', this.reader)
+        } else {
+          console.log('afterport', this.$store.state.app.reader)
+          this.reader = this.$store.state.app.reader
+        }
         // 监听来自串行设备的数据
         while (true) {
-          
           const { value, done } = await this.reader.read()
           // console.log("value",value);
           if (done) {
@@ -112,21 +107,28 @@ export default {
           //   }
           // }
           if(value.length > 3){
-            console.log('value:', value)
+            console.log('value23:', value)
+             if(value.length <= 6){
+              continue
+             }
           }
           else if(this.deptBudgetList.warehouseName == '白城内陆港'){
-            continue
+            console.log('value:', value)
+            var start = (new Date()).getTime();
+            while((new Date()).getTime() - start < 400) {
+
+            }
+            continue;
           }
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
               this.deptBudgetList.warehouseName == '克东千红库' ||
               this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库' ||
-              this.deptBudgetList.warehouseName == '哈尔滨依兰库'||
-              this.deptBudgetList.warehouseName == '龙江金信库'||
+              this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
+              this.deptBudgetList.warehouseName == '龙江金信库' ||
               this.deptBudgetList.warehouseName == '白城内陆港')
           ) {
-            
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {
@@ -170,70 +172,66 @@ export default {
               }
             }
           } else {
-            if(value.length > 10){
-               for (var i = 0; i < value.length; i++) {
-                  var tmp = String.fromCharCode(value[i])
-                  
-                  // if (value[0] != 49 && value[0] != 2) {
-                  //   // if (
-                  //   //   value[value.length - 1] == 48 &&
-                  //   //   value[value.length - 2] == 48
-                  //   // ) {
-                  //   //   flag1 = true
-                  //   // } else {
-                  //   //   break
-                  //   // }
-                  //   // flag1 = true
-                  //   if (i == 0) {
-                  //     this.result1 = tmp + '0'
-                  //   }
-                  // }
-                  // else{
-                  //   if (tmp == String.fromCharCode(32)) {
-                  //     flag = true
-                  //   }
-                  // }
-                  if (tmp == String.fromCharCode(32)) {
-                      flag = true
-                    }
-                  if (
-                    flag &&
-                    result.length < 7 &&
-                    tmp != String.fromCharCode(32) 
-                    // &&
-                    // !(
-                    //   value[value.length - 1] == 48 && value[value.length - 2] == 48
-                    // )
-                  ) {
-                    if(i > 0&& value[i] == 48&& value[i-1] == 32 && result){
-                      break
-                    }
-                    else{
-                      result += tmp
-                    }
-                    
+            if (value.length > 10) {
+              for (var i = 0; i < value.length; i++) {
+                var tmp = String.fromCharCode(value[i])
+
+                // if (value[0] != 49 && value[0] != 2) {
+                //   // if (
+                //   //   value[value.length - 1] == 48 &&
+                //   //   value[value.length - 2] == 48
+                //   // ) {
+                //   //   flag1 = true
+                //   // } else {
+                //   //   break
+                //   // }
+                //   // flag1 = true
+                //   if (i == 0) {
+                //     this.result1 = tmp + '0'
+                //   }
+                // }
+                // else{
+                //   if (tmp == String.fromCharCode(32)) {
+                //     flag = true
+                //   }
+                // }
+                if (tmp == String.fromCharCode(32)) {
+                  flag = true
+                }
+                if (
+                  flag &&
+                  result.length < 7 &&
+                  tmp != String.fromCharCode(32)
+                  // &&
+                  // !(
+                  //   value[value.length - 1] == 48 && value[value.length - 2] == 48
+                  // )
+                ) {
+                  if (i > 0 && value[i] == 48 && value[i - 1] == 32 && result) {
+                    break
+                  } else {
+                    result += tmp
                   }
-                  // if (flag1 && tmp != String.fromCharCode(32)) {
-                  //   // if (
-                  //   //   value[value.length - 1] == 48 &&
-                  //   //   value[value.length - 2] == 48
-                  //   // ) {
-                  //   //   if (i == 0) {
-                  //   //     this.result1 = tmp + '0'
-                  //   //   }
-                  //   // }
-                  //   if (i == 0) {
-                  //     this.result1 = tmp + '0'
-                  //   }
-                  // }
                 }
+                // if (flag1 && tmp != String.fromCharCode(32)) {
+                //   // if (
+                //   //   value[value.length - 1] == 48 &&
+                //   //   value[value.length - 2] == 48
+                //   // ) {
+                //   //   if (i == 0) {
+                //   //     this.result1 = tmp + '0'
+                //   //   }
+                //   // }
+                //   if (i == 0) {
+                //     this.result1 = tmp + '0'
+                //   }
+                // }
+              }
             }
-            
+
             if (this.information.indexOf('毛重') > -1) {
               if (parseInt(result) || parseInt(result) == 0) {
-                this.grossWeightVal = parseInt(
-                  result + this.result1
-                )
+                this.grossWeightVal = parseInt(result + this.result1)
               }
             } else {
               if (parseInt(result) || parseInt(result) == 0) {
@@ -249,33 +247,46 @@ export default {
         console.log('the Web Serial API is not supported.', navigator)
       }
     },
-  }
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-  .content{
-    background: black;
-    color: #2AFF7C;
-    font-size: 32px;
-    text-align: right;
-    padding: 20px;
-    border-radius: 10px;
-    margin: 0 20px 20px 20px;
-  }
-  .title{
-    text-align: center;
-  }
-  .number{
-    // font-size: 60px;
-  }
-  .btn{
+.content {
+  height: 350px;
+  position: relative;
+  background: black;
+  color: #2aff7c;
+  font-size: 32px;
+  text-align: right;
+  padding: 20px;
+  border-radius: 10px;
+  margin: 0 20px 20px 20px;
+  .btn {
+    position: absolute;
+    bottom: 20px;
+    right: 20px;
     border: 1px solid #2aff7c;
-        width: 50%;
-    // margin: 30px auto;
+    width: 200px;
     border-radius: 10px;
     display: flex;
     align-items: center;
     justify-content: center;
   }
+  .contentInfo {
+    display: flex;
+    .uncertain {
+      width: 35%;
+      text-align: left;
+    }
+    .number {
+      width: 65%;
+      text-align: right;
+    }
+  }
+}
+.title {
+  text-align: right;
+  margin-bottom: 20px;
+}
 </style>

src/layout/index/top/index.vue

@@ -329,13 +329,14 @@
         userCompany: localStorage.getItem('ws-pf_compId'),
         userName: localStorage.getItem('ws-pf_staffName'),
       }
-      
-    },
-    mounted() {
-      listenfullscreen(this.setScreen)
+         listenfullscreen(this.setScreen)
       getcomp({userMobilePhone:this.UserInfo.loginInfo.userMobilePhone}).toPromise().then((res)=>{
         this.compNameoptions=res
       })
+    },
+    
+    mounted() {
+   
       // this.complogin({username: Cookies.get('ws_login_account'),
       // password: Cookies.get('ws_login_pwd'),
       // companyName: this.compName})
@@ -408,12 +409,13 @@
         //  this.barCode = ''
         //判断当前账号公司是否是二维码上公司
         if (this.userINfo.userCompany != _userCompId) {
+          console.log("请切换公司在试！")
           this.$message.error('当前身份不可操作');
            this.barCode = ''
           return
         }
         //判断二维码上的仓库当前账号是否有权限操作
-        this.getLook(this.cangid, this.userINfo.userName)
+        this.getLook(this.cangid,localStorage.getItem('ws-pf_staffName'))
         
       },
       compNameChange(){
@@ -550,6 +552,7 @@
                   //扫码枪扫码后显示弹框
                    this.getQRCodeData(this.tmp)
               }else{
+                console.log("你没有该权限，不可操作")
                  this.$message.error('当前身份不可操作');
                  this.barCode = ''
                  return

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -22,15 +22,25 @@
           <span v-show="this.$route.query.warehouseType == 2">(临)</span>
         </h2>
         <div class="balance-row">
-          <BalanceAlert v-if='isShowBalance' class="left" ref="weightChild" :deptBudgetList='deptBudgetList'
+          <BalanceAlert class="left" ref="weightChild" :deptBudgetList='deptBudgetList'
             :information='information' v-on:balanceListen="setVal"></BalanceAlert>
           <div class="top">
-            <div class="car-type">皮重</div>
+            <!-- <div class="car-type">皮重</div> -->
             <!-- <div class="weight">{{deptBudgetList.grossWeight}} <span class="kg-style">kg</span></div> -->
-            <div class="weight">
+             <div class="confirmInfo">
+              <div class="confirmWeight">确定重量</div>
+              <div class="weight">
+                {{ tare }} <span class="kg-style">kg</span>
+              </div>
+            </div>
+            <!-- <div class="weight">
               {{ tare }} <span class="kg-style">kg</span>
+            </div> -->
+            <!-- <div class="car-no">{{ dataList.carNo }}</div> -->
+            <div class="confirmInfo">
+              <div class="confirmCarNo">车牌号</div>
+              <div class="car-no">{{ dataList.carNo }}</div>
             </div>
-            <div class="car-no">{{ dataList.carNo }}</div>
           </div>
         </div>
 
@@ -107,7 +117,7 @@
                   value-format="yyyy-MM-dd">
                 </el-date-picker>
               </ws-form-item>
-             <!-- 经办人  -->
+              <!-- 经办人  -->
               <ws-form-item label="经办人" span="1" prop="agent">
                 <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable clearable @change="selectstaff">
                   <el-option v-for="item in options" :key="item.value" :label="item.staffName"
@@ -216,7 +226,7 @@
                   <el-option v-for="item in options2" :key="item.constKey"
                     :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                 </el-select>
-                 <span style='padding-left:10px;'>发货重量（吨）：{{dataList.loadNetWeight}}</span>  
+                <span style='padding-left:10px;'>发货重量（吨）：{{dataList.loadNetWeight}}</span>
               </ws-form-item>
               <!--船名  -->
               <ws-form-item label="船名" span="1" prop="carNo" v-if="deptBudgetList.outType == '散船'">
@@ -421,7 +431,7 @@
     data() {
       return {
         //有没有称
-        isShowBalance: false,
+        // isShowBalance: false,
         information: '皮重检斤',
         deptBudgetList2: [],
         isSelectType: true,
@@ -541,7 +551,7 @@
             value: '3',
           },
         ],
-        tare:"",
+        tare: "",
       }
     },
     mounted() {},
@@ -587,7 +597,7 @@
       this.dataList.cost = this.$route.query.cost
       this.dataList.freight = this.$route.query.freight
       this.dataList.type = this.$route.query.type
-      this.dataList.outType = this.$route.query.outType//运输方式
+      this.dataList.outType = this.$route.query.outType //运输方式
       this.dataList.buckleWeightRatio = this.$route.query.buckleWeightRatio
       this.dataList.tidalGrainWater = this.$route.query.tidalGrainWater
       this.dataList.solidGrainWater = this.$route.query.solidGrainWater
@@ -603,10 +613,9 @@
         this.cost = this.dataList.cost
       }
       this.getList()
-      if (this.$route.query.automaticWeightAcquisition == '1') {
-        this.isShowBalance = true
-      }
-
+      // if (this.$route.query.automaticWeightAcquisition == '1') {
+      //   this.isShowBalance = true
+      // }
     },
     methods: {
       setVal(data) {
@@ -614,7 +623,7 @@
           this.dataList.grossWeight = data
         } else {
           this.tare = data
-           this.dataList.tare = data
+          this.dataList.tare = data
         }
       },
       openPort() {
@@ -661,11 +670,11 @@
             this.dataList.carId = this.tranCarInfoList[i].id
             this.dataList.freight = this.tranCarInfoList[i].tranPrice
           }
-          if(this.dataList.inOutType=='移库入库'){
-            if(!this.dataList.cost){
-              this.dataList.cost=this.tranCarInfoList[i].cost
+          if (this.dataList.inOutType == '移库入库') {
+            if (!this.dataList.cost) {
+              this.dataList.cost = this.tranCarInfoList[i].cost
             }
-            this.dataList.loadNetWeight=this.tranCarInfoList[i].loadNetWeight
+            this.dataList.loadNetWeight = this.tranCarInfoList[i].loadNetWeight
           }
         }
       },
@@ -681,6 +690,7 @@
             }
           }
         }
+        if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
             if (this.outContractNo[i].inOutType == '采购入库') {
@@ -1770,6 +1780,7 @@
     height: 2000px;
     margin: 0 auto;
   }
+
   .inspector {
     width: 50%;
   }
@@ -1787,6 +1798,7 @@
   /deep/.el-form-item {
     width: 50%;
   }
+
   /deep/.ws-info-table .el-form-item .el-form-item__label {
     text-align: center;
   }
@@ -1847,28 +1859,47 @@
   }
 
   .top {
-    width: 100%;
+    position: absolute;
+    top: 270px;
+    width: 69%;
     background: black;
     color: #2aff7c;
     font-size: 32px;
     text-align: right;
-    padding: 20px;
+    // padding: 20px;
     border-radius: 10px;
-    margin: 0 20px 0 20px;
+    margin: 0 20px 0 40px;
 
     .car-type {
       text-align: left;
     }
+    .confirmInfo {
+      display: flex;
 
+      .confirmWeight {
+        width: 50%;
+        text-align: left;
+        line-height: 90px;
+      }
+      .weight {
+        font-size: 68px;
+        width: 50%;
+        text-align: right;
+      }
+      .confirmCarNo {
+        width: 50%;
+        text-align: left;
+      }
+      .car-no {
+        width: 50%;
+        text-align: right;
+      }
+    }
     .kg-style {
       font-size: 30px;
     }
   }
 
-  .weight {
-    font-size: 68px;
-  }
-
   //下面列表
   .neifor {
     width: 80%;
@@ -1898,8 +1929,8 @@
     margin: 20px 0;
 
     .left {
-      width: 500px;
-      margin-bottom: 0;
+       position: relative;
+       width: 90%;
     }
   }
 </style>

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -15,23 +15,32 @@
     <ws-form ref="dataList" :model="dataList" :rules="rules">
       <div class="basicInformation">
         <h2>
-          {{ this.deptBudgetList1.warehouseName }}库
+          {{ this.deptBudgetList1.warehouseName }}
           <span class="position" v-show="this.$route.query.warehouseType == 1">
             {{ this.deptBudgetList1.binNumber }}仓位
           </span>
           <span v-show="this.$route.query.warehouseType == 2"> (临) </span>
         </h2>
         <div class="balance-row">
-          <BalanceAlert v-if='isShowBalance' class="left" ref="weightChild" :deptBudgetList='deptBudgetList'
+          <BalanceAlert class="left" ref="weightChild" :deptBudgetList='deptBudgetList'
             :information='information' v-on:balanceListen="setVal"></BalanceAlert>
           <div class="top">
-            <div class="car-type">毛重</div>
-            <div class="weight">
+            <div class="confirmInfo">
+              <div class="confirmWeight">确定重量</div>
+              <div class="weight">
+                {{ grossWeight }} <span class="kg-style">kg</span>
+              </div>
+            </div>
+            <!-- <div class="weight">
               {{grossWeight }}
               <span class="kg-style">kg</span>
-            </div>
+            </div> -->
             <!-- <div class="weight">{{dataList.tare}} <span class="kg-style">kg</span></div> -->
-            <div class="car-no">{{ dataList.carNo }}</div>
+            <div class="confirmInfo">
+              <div class="confirmCarNo">车牌号</div>
+              <div class="car-no">{{ dataList.carNo }}</div>
+            </div>
+            <!-- <div class="car-no">{{ dataList.carNo }}</div> -->
           </div>
         </div>
         <div class="small-title">基本信息</div>
@@ -41,7 +50,7 @@
               <!--任务编号-->
               <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
                 <el-select filterable clearable v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
-                  @change="contractNoChange" >
+                  @change="contractNoChange">
                   <el-option v-for="item in deptBudgetList2" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
                     :value="item.inOutTaskNo" />
                 </el-select>
@@ -184,15 +193,19 @@
               dataList.outType == '汽运' ||
               dataList.outType == '集装箱船'
             ">
-                <ws-input v-if="!carstatus || carjudge" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
-                <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="dataList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
-                  <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
+                <ws-input v-if="!carstatus || carjudge" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7"
+                  size="small" />
+                <el-select v-else filterable clearable v-model="dataList.carNo"
+                  placeholder="请选择车牌号" class="typeselect" @change="carChange">
+                  <el-option v-for="item in options2" :key="item.constKey"
+                    :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                 </el-select>
-                 <!-- <span style='padding-left:10px;'>发货重量（吨）：{{dataList.loadNetWeight}}</span> -->
-                  <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
+                <!-- <span style='padding-left:10px;'>发货重量（吨）：{{dataList.loadNetWeight}}</span> -->
+                <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
               </ws-form-item>
               <ws-form-item label="发货重量（吨）：" span="1" prop="loadNetWeight">
-                 <ws-input v-model="dataList.loadNetWeight" placeholder="暂无获取到发货重量" maxlength="10" disabled size="small" />
+                <ws-input v-model="dataList.loadNetWeight" placeholder="暂无获取到发货重量" maxlength="10" disabled
+                  size="small" />
               </ws-form-item>
 
               <ws-form-item label="车号" span="1" prop="carNo" v-if="dataList.outType == '火运'">
@@ -370,7 +383,7 @@
     },
     data() {
       return {
-        isShowBalance: false,
+        // isShowBalance: false,
         deptBudgetList2: [],
         //弹出框
         dialogViewSpareMoney: false,
@@ -400,7 +413,7 @@
             value: '3',
           },
         ],
-        information:'毛重检斤',
+        information: '毛重检斤',
         readonly: true,
         typeList: ['干粮', '潮粮'],
         qualityInspectorList: [],
@@ -449,6 +462,7 @@
         },
         contractList: [],
         dataList: {
+          outType: '',
           id: '',
           grossWeight: '',
           contractNo: '',
@@ -460,7 +474,7 @@
           inOutDate: '',
           inOutType: '',
           goodsName: '',
-          selfLoading:"0",
+          selfLoading: "0",
           warehouseInOutDetail: {
             qualityInspector: '',
           },
@@ -486,9 +500,9 @@
         param: 9600,
         allowEdit: true,
         result1: '00',
-        grossWeight:"",//显示的毛重
-        carChange1:"手动填写",
-        carjudge:false
+        grossWeight: "", //显示的毛重
+        carChange1: "手动填写",
+        carjudge: false
       }
     },
     mounted() {},
@@ -502,7 +516,7 @@
       this.deptBudgetList1.binNumber = this.$route.query.binNumber
       this.dataList.id = this.$route.query.id
       this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
-      this.grossWeight =  this.dataList.grossWeight
+      this.grossWeight = this.dataList.grossWeight
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.baseId = this.$route.query.baseId
       this.dataList.positionId = this.$route.query.positionId
@@ -517,7 +531,7 @@
       this.dataList.grade = this.$route.query.grade
       this.dataList.agent = this.$route.query.agent
       this.dataList.carNo = this.$route.query.carNo
-      this.dataList.carId = this.$route.query.carId//派车id初始化默认一下（解决第一次进来无carid）
+      this.dataList.carId = this.$route.query.carId //派车id初始化默认一下（解决第一次进来无carid）
       this.dataList.inOutDate = this.$route.query.inOutDate
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.inOutType = this.$route.query.inOutType
@@ -531,21 +545,23 @@
       this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
       this.dataList.outType = this.$route.query.outType//运输方式
       this.dataList.selfLoading = this.$route.query.selfLoading//
-      if (this.$route.query.automaticWeightAcquisition == '1') {
-        this.isShowBalance = true
-      }
+      // if (this.$route.query.automaticWeightAcquisition == '1') {
+      //   this.isShowBalance = true
+      // }
+
       this.getList()
     },
     methods: {
+      dataFilter2(){},
       //切换车牌号输入状态
-      carNoTypeChange(){
-         this.carjudge = !this.carjudge
-        if(!this.carjudge){
-            this.dataList.selfLoading = "0"
-            this.carChange1="手动填写"
-        }else{
-            this.dataList.selfLoading = "1"
-            this.carChange1="识别下拉"
+      carNoTypeChange() {
+        this.carjudge = !this.carjudge
+        if (!this.carjudge) {
+          this.dataList.selfLoading = "0"
+          this.carChange1 = "手动填写"
+        } else {
+          this.dataList.selfLoading = "1"
+          this.carChange1 = "识别下拉"
         }
       },
       setVal(data) {
@@ -612,12 +628,12 @@
           if (this.tranCarInfoList[i].carNo == this.dataList.carNo) {
             this.dataList.tranCarNo = this.tranCarInfoList[i].tranCarNo
             this.dataList.carId = this.tranCarInfoList[i].id
-             if(this.dataList.inOutType=='移库入库'){
-            if(!this.dataList.cost){
-              this.dataList.cost=this.tranCarInfoList[i].cost
+            if (this.dataList.inOutType == '移库入库') {
+              if (!this.dataList.cost) {
+                this.dataList.cost = this.tranCarInfoList[i].cost
+              }
+              this.dataList.loadNetWeight = this.tranCarInfoList[i].loadNetWeight
             }
-            this.dataList.loadNetWeight=this.tranCarInfoList[i].loadNetWeight
-          }
           }
         }
       },
@@ -663,7 +679,7 @@
             }
           }
         }
-
+        if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
             if (this.outContractNo[i].inOutType == '销售出库') {
@@ -1144,7 +1160,7 @@
             return
           }
         }
-        if(!this.carstatus){//若自运的合同该字段置空
+        if (!this.carstatus) { //若自运的合同该字段置空
           this.deptBudgetList.selfLoading = ""
         }
         this.$confirm(`确定提交毛重检斤`, {
@@ -1565,28 +1581,47 @@
   }
 
   .top {
-    width: 100%;
+    position: absolute;
+    top: 270px;
+    width: 69%;
     background: black;
     color: #2aff7c;
     font-size: 32px;
     text-align: right;
-    padding: 20px;
+    // padding: 20px;
     border-radius: 10px;
-    margin: 0 20px 0 20px;
+    margin: 0 20px 0 40px;
 
     .car-type {
       text-align: left;
     }
+    .confirmInfo {
+      display: flex;
+
+      .confirmWeight {
+        width: 50%;
+        text-align: left;
+        line-height: 90px;
+      }
+      .weight {
+        font-size: 68px;
+        width: 50%;
+        text-align: right;
+      }
+      .confirmCarNo {
+        width: 50%;
+        text-align: left;
+      }
+      .car-no {
+        width: 50%;
+        text-align: right;
+      }
+    }
 
     .kg-style {
       font-size: 30px;
     }
   }
-
-  .weight {
-    font-size: 68px;
-  }
-
   //下面列表
   .neifor {
     width: 80%;
@@ -1610,13 +1645,14 @@
   .el-input__inner {
     width: 150px;
   }
+
   .balance-row {
     display: flex;
     margin: 20px 0;
 
     .left {
-      width: 500px;
-      margin-bottom: 0;
+      position: relative;
+      width: 90%;
     }
   }
 </style>

src/views/warehouse/warehouseManagementTare.vue

@@ -21,15 +21,25 @@
           <span v-show="this.deptBudgetList.warehouseType == 2">(临)</span>
         </h2>
         <div class="balance-row">
-          <BalanceAlert v-if='isShowBalance' class="left" ref="weightChild" :deptBudgetList='deptBudgetList'
+          <BalanceAlert class="left" ref="weightChild" :deptBudgetList='deptBudgetList'
             :information='information' v-on:balanceListen="setVal"></BalanceAlert>
           <div class="top">
-            <div class="car-type">皮重</div>
+            <!-- <div class="car-type">皮重</div> -->
             <!-- <div class="weight">{{deptBudgetList.grossWeight}} <span class="kg-style">kg</span></div> -->
-            <div class="weight">
+              <div class="confirmInfo">
+              <div class="confirmWeight">确定重量</div>
+              <div class="weight">
+                {{ tare }} <span class="kg-style">kg</span>
+              </div>
+            </div>
+            <!-- <div class="weight">
               {{ tare }} <span class="kg-style">kg</span>
+            </div> -->
+            <div class="confirmInfo">
+              <div class="confirmCarNo">车牌号</div>
+              <div class="car-no">{{ deptBudgetList.carNo }}</div>
             </div>
-            <div class="car-no">{{ deptBudgetList.carNo }}</div>
+            <!-- <div class="car-no">{{ deptBudgetList.carNo }}</div> -->
           </div>
         </div>
         <div class="small-title">基本信息</div>
@@ -55,7 +65,7 @@
                 </ws-select>
               </ws-form-item>
               <ws-form-item label="皮重（公斤）" span="1" prop="tare" class="readonly">
-                <ws-input :disabled="allowEdit" @input="tarechange" v-model="tare" type="number"
+                <ws-input :disabled="allowEdit" @input="tarechange" v-model="deptBudgetList.tare" type="number"
                   @mousewheel.native.prevent placeholder="请输入皮重" maxlength="100" size="small" />
                 <el-button type="primary" v-if="information == '皮重检斤'" @click="openPort">重新获取</el-button>
               </ws-form-item>
@@ -171,9 +181,12 @@
                 </el-select>
               </ws-form-item>
 
-              <ws-form-item label="车牌号" span="1" prop="carNo" v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
-                <ws-input v-if="!carstatus || carjudge" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
-                <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
+              <ws-form-item label="车牌号" span="1" prop="carNo"
+                v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
+                <ws-input v-if="!carstatus || carjudge" v-model="deptBudgetList.carNo" placeholder="请输入车牌号"
+                  maxlength="7" size="small" />
+                <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="deptBudgetList.carNo"
+                  placeholder="请选择车牌号" class="typeselect" @change="carChange">
                   <el-option v-for="item in options2" :key="item.constKey"
                     :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                 </el-select>
@@ -333,7 +346,7 @@
     },
     data() {
       return {
-        isShowBalance: false,
+        // isShowBalance: false,
         deptBudgetList1: [],
         isSelectType: true,
         carstatus: false,
@@ -396,7 +409,7 @@
           grossWeight: '',
           tare: '',
           inOutDate: '',
-          selfLoading:"0",
+          selfLoading: "0",
         },
         weightbills: {},
         historyList: [],
@@ -428,10 +441,10 @@
             value: '3',
           },
         ],
-        tare:"0",//显示的皮重
-        carChange1:"手动填写",
-        carjudge:false,
-        options2:[],
+        tare: "0", //显示的皮重
+        carChange1: "手动填写",
+        carjudge: false,
+        options2: [],
       }
     },
     mounted() {
@@ -462,20 +475,20 @@
         .then((response) => {
           this.deptBudgetList1 = response
         })
-      if (this.$route.query.automaticWeightAcquisition == '1') {
-        this.isShowBalance = true
-      }
+      // if (this.$route.query.automaticWeightAcquisition == '1') {
+      //   this.isShowBalance = true
+      // }
     },
     methods: {
       //切换车牌号输入状态
-      carNoTypeChange(){
+      carNoTypeChange() {
         this.carjudge = !this.carjudge
-        if(!this.carjudge){
-            this.deptBudgetList.selfLoading = "0"
-            this.carChange1="手动填写"
-        }else{
-            this.deptBudgetList.selfLoading = "1"
-            this.carChange1="识别下拉"
+        if (!this.carjudge) {
+          this.deptBudgetList.selfLoading = "0"
+          this.carChange1 = "手动填写"
+        } else {
+          this.deptBudgetList.selfLoading = "1"
+          this.carChange1 = "识别下拉"
         }
       },
       setVal(data) {
@@ -483,7 +496,7 @@
           this.deptBudgetList.grossWeight = data
         } else {
           this.tare = data
-          this.deptBudgetList = data
+          this.deptBudgetList.tare = data
         }
       },
       openPort() {
@@ -524,6 +537,7 @@
             }
           }
         }
+        if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (
             this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
@@ -1427,7 +1441,7 @@
             return
           }
         }
-        if(!this.carstatus){//若自运的合同该字段置空
+        if (!this.carstatus) { //若自运的合同该字段置空
           this.deptBudgetList.selfLoading = ""
         }
         this.$confirm(`确定提交出库信息`, {
@@ -1509,7 +1523,7 @@
         })
       },
       tarechange(e) {
-        this.deptBudgetList.tare = this.tare
+        this.tare = this.deptBudgetList.tare 
         if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
           this.deptBudgetList.netWeight = Number(
             this.deptBudgetList.grossWeight - this.deptBudgetList.tare
@@ -1841,18 +1855,42 @@
   }
 
   .top {
-    width: 100%;
+    position: absolute;
+    top: 270px;
+    width: 69%;
     background: black;
     color: #2aff7c;
     font-size: 32px;
     text-align: right;
-    padding: 20px;
+    // padding: 20px;
     border-radius: 10px;
-    margin: 0 20px 20px 20px;
+    margin: 0 20px 20px 40px;
 
     .car-type {
       text-align: left;
     }
+    .confirmInfo {
+      display: flex;
+
+      .confirmWeight {
+        width: 50%;
+        text-align: left;
+        line-height: 90px;
+      }
+      .weight {
+        font-size: 68px;
+        width: 50%;
+        text-align: right;
+      }
+      .confirmCarNo {
+        width: 50%;
+        text-align: left;
+      }
+      .car-no {
+        width: 50%;
+        text-align: right;
+      }
+    }
 
     .kg-style {
       font-size: 30px;
@@ -1888,7 +1926,8 @@
     margin: 20px 0 0 0;
 
     .left {
-      width: 500px;
+      position: relative;
+      width: 90%;
     }
   }
 </style>