gjy 2 years ago
parent
commit
7509415289

+ 23 - 13
src/views/outboundManagement/weighingManagementNew.vue

@@ -148,6 +148,8 @@
                       </ws-form-item>
                       <ws-form-item v-if="fleetNameList.length > 0 && tpyeNo == 1" label="车队" span="1" prop="fleetName">
                         <el-select @change="fleetNameChange" :disabled="recheck" v-model="weighingList.fleet" placeholder="非车队车辆">
+                          <el-option  key="" label="非车队"
+                            value="非车队" />
                           <el-option v-for="item in fleetNameList" :key="item.value" :label="item.fleetName"
                             :value="item.fleetName" />
                         </el-select>
@@ -1172,6 +1174,8 @@
 
       },
       print() {
+        this.weighingList.warehouseType = this.warehouseType
+        console.log(this.weighingList,this.weighingList.binNumbe ,this.weighingList.warehouseType)
         this.carjudge=false
         this.carChange1 = '手动填写'
         // if(this.tpyeNo==2){
@@ -1320,7 +1324,7 @@
         }
         this.weighingList.compId = localStorage.getItem('ws-pf_compId')
         this.weighingList.warehouseName = this.warehouseName
-        this.weighingList.warehouseType = this.warehouseType
+        
         this.$confirm('确定保存检斤信息?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -1950,21 +1954,27 @@
       },
       fleetNameChange(e){
         console.log(e,this.fleetNameList)
-        for (let i = 0; i < this.fleetNameList.length; i++) {
-          if (this.fleetNameList[i].carNo == this.weighingList.fleet) {
-            this.weighingList.freight = this.fleetNameList[i].tranPrice
-            this.carjudge=true
-            if (this.carjudge) {
-              this.weighingList.selfLoading = '1'
-              this.carChange1 = '识别下拉'
-            } else {
-              this.weighingList.selfLoading = '0'
-              this.carChange1 = '手动填写'
+        if(e=='非车队'){
+          this.carjudge=false
+          this.weighingList.selfLoading = '0'
+          this.carChange1 = '手动填写'
+        }else{
+          for (let i = 0; i < this.fleetNameList.length; i++) {
+            if (this.fleetNameList[i].carNo == this.weighingList.fleetName) {
+              this.weighingList.freight = this.fleetNameList[i].tranPrice
+              this.carjudge=true
+              if (this.carjudge) {
+                this.weighingList.selfLoading = '1'
+                this.carChange1 = '识别下拉'
+              } else {
+                this.weighingList.selfLoading = '0'
+                this.carChange1 = '手动填写'
+              }
+              this.$forceUpdate()
             }
-            console.log(this.weighingList.selfLoading)
-            this.$forceUpdate()
           }
         }
+        
       },
       // 获取当前年月日
       getTime() {

+ 1 - 1
src/views/tranManagement/tranManagementReceivingloading.vue

@@ -818,7 +818,7 @@ export default {
   left: 0;
 }
 .el-form {
-  padding: 0 5%;
+  padding: 42px 5%;
 }
 .el-button--primary {
   background-color: #5878e8;