Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/layout/index/top/index.vue

@@ -21,7 +21,7 @@
       <!-- 使用租户 -->
       
       <div class="hidden-content">
-        <el-input ref="hiddenFocus" type="password" class="input-Style" readonly 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>
         <div v-show="isOpenCodeGun" class="code-scan-text">扫码枪已连接</div>
         <div v-show="!isOpenCodeGun" @click="setCodeGun" class="code-scan-text">点我扫码</div>
@@ -51,7 +51,7 @@
       </div>
       <div class="compName-row">
         <!-- <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
           v-for="item in compNameoptions"
           :key="item"

src/views/warehouse/warehouseManagementAdd.vue

@@ -38,7 +38,7 @@
         <!--其他负责人-->
         <ws-form-item label="其他负责人" span="1" prop="otherPersonCharge">
           <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他负责人" @change="selectstaffOther"
-            multiple filterable clearable>
+            multiple filterable clearable collapse-tags>
             <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName"
               :value="item.staffMobilePhone" />
           </el-select>

src/views/warehouse/warehouseManagementEdit.vue

@@ -41,7 +41,7 @@
           <!--其他负责人-->
           <ws-form-item label="其他负责人" v-if="warehouseType == 1" span="1" prop="otherPersonCharge">
             <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他负责人" @change="selectstaffOther"
-              :filter-method="dataFilter1" filterable clearable multiple>
+              :filter-method="dataFilter1" filterable clearable multiple collapse-tags>
               <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName"
                 :value="item.staffMobilePhone " />
             </el-select>

src/views/warehouse/warehouseManagementGross.vue

@@ -27,7 +27,7 @@
           <div class="top">
             <div class="car-type">毛重</div>
             <div class="weight">
-              {{ deptBudgetList.grossWeight }} <span class="kg-style">kg</span>
+              {{ grossWeight }} <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>
@@ -517,6 +517,7 @@
             return time.getTime() > Date.now()
           },
         },
+
         accessoryTFs: false,
         allowEdit: true,
         param: 9600,
@@ -1023,6 +1024,7 @@
           })
           return
         }
+
         // if (
         //   this.deptBudgetList.contractNo.length < 6 ||
         //   this.deptBudgetList.contractNo.length > 20

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -28,7 +28,7 @@
             <div class="car-type">皮重</div>
             <!-- <div class="weight">{{deptBudgetList.grossWeight}} <span class="kg-style">kg</span></div> -->
             <div class="weight">
-              {{ dataList.tare }} <span class="kg-style">kg</span>
+              {{ tare }} <span class="kg-style">kg</span>
             </div>
             <div class="car-no">{{ dataList.carNo }}</div>
           </div>
@@ -541,6 +541,7 @@
             value: '3',
           },
         ],
+        tare:"",
       }
     },
     mounted() {},
@@ -560,6 +561,7 @@
       this.dataList.warehouseName = this.$route.query.warehouseName
       this.dataList.binNumber = this.$route.query.binNumber
       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.grade = this.$route.query.grade
       this.dataList.agent = this.$route.query.agent
@@ -1448,6 +1450,7 @@
         })
       },
       tarechange(e) {
+        this.tare = this.dataList.tare
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
             this.dataList.grossWeight - this.dataList.tare

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -27,7 +27,7 @@
           <div class="top">
             <div class="car-type">毛重</div>
             <div class="weight">
-              {{ dataList.grossWeight }}
+              {{ grossWeight }}
               <span class="kg-style">kg</span>
             </div>
             <!-- <div class="weight">{{dataList.tare}} <span class="kg-style">kg</span></div> -->
@@ -483,6 +483,7 @@
         param: 9600,
         allowEdit: true,
         result1: '00',
+        grossWeight:"",//显示的毛重
       }
     },
     mounted() {},
@@ -496,6 +497,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.dataList.contractNo = this.$route.query.contractNo
       this.dataList.baseId = this.$route.query.baseId
       this.dataList.positionId = this.$route.query.positionId
@@ -1213,6 +1215,7 @@
         }
       },
       grossWeightchange(e) {
+        this.grossWeight = this.dataList.grossWeight
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
             this.dataList.grossWeight - this.dataList.tare

src/views/warehouse/warehouseManagementRecord.vue

@@ -17,6 +17,7 @@
 				<span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
 				<div class="ware" v-show="warehouseType==1">
 					<!-- {{binNumber}}仓位(容量{{capacity}}吨) -->
+					<span class="binNo">仓位号：</span>
 					<el-select filterable clearable v-model="binNumber" placeholder="请选择仓位" class="typeselect"
               @change="binNumberChange">
 			  <el-option  key="" label="全部仓位"
@@ -1156,4 +1157,9 @@
 	/deep/.el-table td , /deep/.el-table .el-table__header .cell{
 		text-align: center;
 	}
+	.binNo{
+		color: #333;
+		font-size: 18px;
+		margin-left: 20px;
+	}
 </style>

src/views/warehouse/warehouseManagementTare.vue

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