zhongtianhaoyuan 3 years ago
parent
commit
9525e5e05e

+ 2 - 2
src/layout/index/top/index.vue

@@ -21,7 +21,7 @@
       <!-- 使用租户 -->
       <!-- 使用租户 -->
       
       
       <div class="hidden-content">
       <div class="hidden-content">
-        <el-input ref="hiddenFocus" type="password" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur" autocomplete="off" 
+        <el-input ref="hiddenFocus" type="password" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur" autocomplete="off" auto-complete="new-password"
           @keyup.enter.native="payCode" placeholder="扫码枪内容"></el-input>
           @keyup.enter.native="payCode" placeholder="扫码枪内容"></el-input>
         <div v-show="isOpenCodeGun" class="code-scan-text">扫码枪已连接</div>
         <div v-show="isOpenCodeGun" class="code-scan-text">扫码枪已连接</div>
         <div v-show="!isOpenCodeGun" @click="setCodeGun" class="code-scan-text">点我扫码</div>
         <div v-show="!isOpenCodeGun" @click="setCodeGun" class="code-scan-text">点我扫码</div>
@@ -51,7 +51,7 @@
       </div>
       </div>
       <div class="compName-row">
       <div class="compName-row">
         <!-- <span class="compName">{{compName}}</span> -->
         <!-- <span class="compName">{{compName}}</span> -->
-        <el-select style='width:260px;' @change='compNameChange' v-model="compName" placeholder="请选择" filterable clearable>
+        <el-select style='width:260px;' @change='compNameChange' v-model="compName" placeholder="请选择">
         <el-option
         <el-option
           v-for="item in compNameoptions"
           v-for="item in compNameoptions"
           :key="item"
           :key="item"

+ 3 - 1
src/views/warehouse/warehouseManagementGross.vue

@@ -51,7 +51,7 @@
           <div class="top">
           <div class="top">
             <div class="car-type">毛重</div>
             <div class="car-type">毛重</div>
             <div class="weight">
             <div class="weight">
-              {{ deptBudgetList.grossWeight }} <span class="kg-style">kg</span>
+              {{ grossWeight }} <span class="kg-style">kg</span>
             </div>
             </div>
             <!-- <div v-else class="weight">{{weighingList.tare}} <span class="kg-style">kg</span></div> -->
             <!-- <div v-else class="weight">{{weighingList.tare}} <span class="kg-style">kg</span></div> -->
             <div class="car-no">{{ deptBudgetList.carNo }}</div>
             <div class="car-no">{{ deptBudgetList.carNo }}</div>
@@ -933,6 +933,7 @@ export default {
           value: '3',
           value: '3',
         },
         },
       ],
       ],
+      grossWeight:0,//显示的毛重
     }
     }
   },
   },
   mounted() {
   mounted() {
@@ -2250,6 +2251,7 @@ export default {
       }
       }
     },
     },
     grossWeightchange(e) {
     grossWeightchange(e) {
+      this.grossWeight = this.deptBudgetList.grossWeight
       if (
       if (
         this.deptBudgetList.grossWeight &&
         this.deptBudgetList.grossWeight &&
         this.deptBudgetList.tare &&
         this.deptBudgetList.tare &&

+ 4 - 1
src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -28,7 +28,7 @@
             <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">{{deptBudgetList.grossWeight}} <span class="kg-style">kg</span></div> -->
             <div class="weight">
             <div class="weight">
-              {{ dataList.tare }} <span class="kg-style">kg</span>
+              {{ tare }} <span class="kg-style">kg</span>
             </div>
             </div>
             <div class="car-no">{{ dataList.carNo }}</div>
             <div class="car-no">{{ dataList.carNo }}</div>
           </div>
           </div>
@@ -540,6 +540,7 @@
             value: '3',
             value: '3',
           },
           },
         ],
         ],
+        tare:"",
       }
       }
     },
     },
     mounted() {},
     mounted() {},
@@ -559,6 +560,7 @@
       this.dataList.warehouseName = this.$route.query.warehouseName
       this.dataList.warehouseName = this.$route.query.warehouseName
       this.dataList.binNumber = this.$route.query.binNumber
       this.dataList.binNumber = this.$route.query.binNumber
       this.dataList.tare = Math.round(this.$route.query.tare * 1000)
       this.dataList.tare = Math.round(this.$route.query.tare * 1000)
+      this.tare = this.dataList.tare
       this.dataList.netWeight = Math.round(this.$route.query.netWeight * 1000)
       this.dataList.netWeight = Math.round(this.$route.query.netWeight * 1000)
       this.dataList.grade = this.$route.query.grade
       this.dataList.grade = this.$route.query.grade
       this.dataList.agent = this.$route.query.agent
       this.dataList.agent = this.$route.query.agent
@@ -1441,6 +1443,7 @@
         })
         })
       },
       },
       tarechange(e) {
       tarechange(e) {
+        this.tare = this.dataList.tare
         if (this.dataList.grossWeight && this.dataList.tare) {
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
           this.dataList.netWeight = Number(
             this.dataList.grossWeight - this.dataList.tare
             this.dataList.grossWeight - this.dataList.tare

+ 4 - 1
src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -27,7 +27,7 @@
           <div class="top">
           <div class="top">
             <div class="car-type">毛重</div>
             <div class="car-type">毛重</div>
             <div class="weight">
             <div class="weight">
-              {{ dataList.grossWeight }}
+              {{ grossWeight }}
               <span class="kg-style">kg</span>
               <span class="kg-style">kg</span>
             </div>
             </div>
             <!-- <div class="weight">{{dataList.tare}} <span class="kg-style">kg</span></div> -->
             <!-- <div class="weight">{{dataList.tare}} <span class="kg-style">kg</span></div> -->
@@ -482,6 +482,7 @@
         param: 9600,
         param: 9600,
         allowEdit: true,
         allowEdit: true,
         result1: '00',
         result1: '00',
+        grossWeight:"",//显示的毛重
       }
       }
     },
     },
     mounted() {},
     mounted() {},
@@ -495,6 +496,7 @@
       this.deptBudgetList1.binNumber = this.$route.query.binNumber
       this.deptBudgetList1.binNumber = this.$route.query.binNumber
       this.dataList.id = this.$route.query.id
       this.dataList.id = this.$route.query.id
       this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
       this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
+      this.grossWeight =  this.dataList.grossWeight
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.baseId = this.$route.query.baseId
       this.dataList.baseId = this.$route.query.baseId
       this.dataList.positionId = this.$route.query.positionId
       this.dataList.positionId = this.$route.query.positionId
@@ -1206,6 +1208,7 @@
         }
         }
       },
       },
       grossWeightchange(e) {
       grossWeightchange(e) {
+        this.grossWeight = this.dataList.grossWeight
         if (this.dataList.grossWeight && this.dataList.tare) {
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
           this.dataList.netWeight = Number(
             this.dataList.grossWeight - this.dataList.tare
             this.dataList.grossWeight - this.dataList.tare

+ 3 - 1
src/views/warehouse/warehouseManagementTare.vue

@@ -27,7 +27,7 @@
             <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">{{deptBudgetList.grossWeight}} <span class="kg-style">kg</span></div> -->
             <div class="weight">
             <div class="weight">
-              {{ deptBudgetList.tare }} <span class="kg-style">kg</span>
+              {{ tare }} <span class="kg-style">kg</span>
             </div>
             </div>
             <div class="car-no">{{ deptBudgetList.carNo }}</div>
             <div class="car-no">{{ deptBudgetList.carNo }}</div>
           </div>
           </div>
@@ -431,6 +431,7 @@
             value: '3',
             value: '3',
           },
           },
         ],
         ],
+        tare:"",//显示的皮重
       }
       }
     },
     },
     mounted() {
     mounted() {
@@ -1496,6 +1497,7 @@
         })
         })
       },
       },
       tarechange(e) {
       tarechange(e) {
+        this.tare = this.deptBudgetList.tare
         if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
         if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
           this.deptBudgetList.netWeight = Number(
           this.deptBudgetList.netWeight = Number(
             this.deptBudgetList.grossWeight - this.deptBudgetList.tare
             this.deptBudgetList.grossWeight - this.deptBudgetList.tare