gjy 2 yıl önce
ebeveyn
işleme
c3d01a5433

+ 31 - 1
src/components/balanceAlert.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="content">
+    <el-radio-group v-if="deptBudgetList.warehouseName=='榆树库'" @change="radiochange" v-model="radio">
+    <el-radio :label="1">大秤</el-radio>
+    <el-radio :label="2">小秤</el-radio>
+  </el-radio-group>
     <div class="title" v-if="information.indexOf('毛重') > -1">毛重</div>
     <div class="title" v-else>皮重</div>
     <div class="contentInfo">
@@ -21,7 +25,8 @@ export default {
     return {
       param: 9600,
       grossWeightVal: '',
-      tareVal: ''
+      tareVal: '',
+      radio:1
     }
   },
   activated() {},
@@ -43,14 +48,23 @@ export default {
         this.$emit('balanceListen', this.tareVal)
       }
     },
+    radiochange(e){
+      console.log(e)
+      localStorage.setItem('balanceStatus',e)
+      this.openPort()
+    },
     async closePort() {
       console.log('closePort')
       this.reader.cancel()
     },
     async openPort() {
+      console.log(localStorage.getItem('balanceStatus'),this.deptBudgetList.warehouseName)
       console.log('openPort', navigator)
       if ('serial' in navigator) {
         if (!this.$store.state.app.reader) {
+          if(localStorage.getItem('balanceStatus')){
+            this.radio=localStorage.getItem('balanceStatus')
+          }
           // The Web Serial API is supported.
           console.log('the Web Serial API is supported.')
           const port = await navigator.serial.requestPort()
@@ -66,6 +80,8 @@ export default {
             this.param = 2400
           } else if(this.deptBudgetList.warehouseName == '大庆朝阳沟库' ){
             this.param = 4800
+          }else if(this.deptBudgetList.warehouseName == '榆树库' &&this.radio==2){
+            this.param = 1200
           } else {
             this.param = 9600
           }
@@ -323,6 +339,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/.el-radio-group{
+  position:absolute;
+  top:29px;
+}
+/deep/.el-radio{
+  color:#fff;
+}
+/deep/.el-radio__input.is-checked+.el-radio__label{
+  color:#2aff7c;
+}
+/deep/.el-radio__input.is-checked .el-radio__inner {
+  background: #2aff7c !important;
+  border-color: #2aff7c !important;
+}
 .content {
   height: 350px;
   position: relative;

+ 1 - 2
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -2534,7 +2534,6 @@ export default {
 
     .top {
       background: black;
-      color: #2aff7c;
       font-size: 32px;
       text-align: right;
       padding: 0 10px 0 20px;
@@ -2555,7 +2554,7 @@ export default {
 
       .confirmInfo {
         display: flex;
-
+        color: #2aff7c;
         .car-type {
           text-align: left;
           width: 50%;

+ 1 - 1
src/views/profitable/earnestmoney.vue

@@ -193,7 +193,7 @@
                 }
                 
               }
-              this.money=shouru-zhichu
+              this.money=(shouru-zhichu).toFixed(3)
             }
           })
         //  this.getPassYearFormatDate()

+ 1 - 0
src/views/taskManagement/tranManagementTransport.vue

@@ -40,6 +40,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="taskNo" label="运输任务编号" width="140"></el-table-column>
+      <!-- <el-table-column prop="taskNo" label="任务类型" width="140"></el-table-column> -->
       <el-table-column prop="contractNo" label="合同编号" width="160"></el-table-column>
       <el-table-column prop=" weight" class="table_td" label="货物(吨数)" width="130">
         <template slot-scope="scope">{{ scope.row.goodsName }}({{ scope.row.weight }})</template>