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

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -218,6 +218,7 @@
               } else {
                 this.checked = false
               }
+              localStorage.setItem('houseSelfCollect_house', JSON.stringify(this.warehouseList[0]))
             }
 
             // this.tableData = response.records
@@ -248,14 +249,13 @@
           })
           .toPromise()
           .then(response => {
-            let _data = localStorage.getItem('houseSelfCollect_house1')
-            _data = JSON.parse(localStorage.getItem('houseSelfCollect_house1'))
+            let _data = JSON.parse(localStorage.getItem('houseSelfCollect_house'))
             if (_data.allowEdit == 0) {
               _data.allowEdit = 1
             } else {
               _data.allowEdit = 0
             }
-            localStorage.setItem('houseSelfCollect_house1', JSON.stringify(_data))
+            localStorage.setItem('houseSelfCollect_house', JSON.stringify(_data))
             this.getWarehouseSelf()
             // this.tableData = response.records
           })

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -220,7 +220,7 @@
         style="width: 100%"
         class="flex position"
         v-for="(item, index) in freightspace1"
-      >
+      :key="index">
         <div class="gathering">
           <div class="driver">
             收款人账户信息-{{ index + 1 }}
@@ -377,10 +377,12 @@
               span="1"
               prop="bankDepositBranch"
             >
-              <ws-select
+              <el-select
                 v-model="item.bankDepositBranch"
-                placeholder=""
+                placeholder="请输入开户支行"
+                filterable
                 class="typeselect"
+                :allow-create = "allow"
                 @change="
                   (value) => {
                     selectbankDepositBranch(value, index)
@@ -393,7 +395,7 @@
                   :label="items"
                   :value="items"
                 />
-              </ws-select>
+              </el-select>
             </ws-form-item>
           </ws-info-table>
         </div>
@@ -603,6 +605,7 @@ export default {
       ],
       name: '',
       age: '',
+      allow:true
     }
   },
   activated() {
@@ -863,67 +866,67 @@ export default {
         //   return
         // }
       }
-      // for (var i = 0; i < this.freightspace1.length; i++) {
-      //   if (this.freightspace1[i].bankCard == '') {
-      //     EventBus.$emit('error', '银行卡账号不能为空')
-      //     return
-      //   }
-      //   if (this.freightspace1[i].bankDeposit == '') {
-      //     EventBus.$emit('error', '开户行不能为空')
-      //     return
-      //   }
-      //   if (this.freightspace1[i].bankDepositBranch == '') {
-      //     EventBus.$emit('error', '开户支行不能为空')
-      //     return
-      //   }
-      //   if (
-      //     this.freightspace1[i].accountTypeFlag == 1 &&
-      //     this.freightspace1[i].payeeName == ''
-      //   ) {
-      //     EventBus.$emit('error', '收款人姓名不能为空')
-      //     return
-      //   }
-      //   if (
-      //     this.freightspace1[i].accountTypeFlag == 1 &&
-      //     this.freightspace1[i].payeeNumberCard == ''
-      //   ) {
-      //     EventBus.$emit('error', '收款人身份证号码不能为空')
-      //     return
-      //   }
-      //   if (
-      //     (this.freightspace1[i].accountTypeFlag == 1 &&
-      //       this.freightspace1[i].payeeName.length < 2) ||
-      //     (this.freightspace1[i].accountTypeFlag == 1 &&
-      //       this.freightspace1[i].payeeName.length > 10)
-      //   ) {
-      //     EventBus.$emit('error', '收款人姓名输入错误')
-      //     return
-      //   }
-      //   console.log(this.freightspace1[i].payeeNumberCard != 18)
-      //   if (
-      //     this.freightspace1[i].accountTypeFlag == 1 &&
-      //     this.freightspace1[i].payeeNumberCard.length != 18
-      //   ) {
-      //     EventBus.$emit('error', '收款人身份证号输入错误')
-      //     return
-      //   }
-      //   if (
-      //     this.freightspace1[i].accountTypeFlag == 2 &&
-      //     this.freightspace1[i].compName == ''
-      //   ) {
-      //     EventBus.$emit('error', '企业名称不能为空')
-      //     return
-      //   }
-      //   if (
-      //     (this.freightspace1[i].accountTypeFlag == 2 &&
-      //       this.freightspace1[i].compName.length < 2) ||
-      //     (this.freightspace1[i].accountTypeFlag == 2 &&
-      //       this.freightspace1[i].compName.length > 30)
-      //   ) {
-      //     EventBus.$emit('error', '企业名称输入有误')
-      //     return
-      //   }
-      // }
+      for (var i = 0; i < this.freightspace1.length; i++) {
+        if (!this.freightspace1[i].bankCard) {
+          EventBus.$emit('error', '银行卡账号不能为空')
+          return
+        }
+        if (!this.freightspace1[i].bankDeposit) {
+          EventBus.$emit('error', '开户行不能为空')
+          return
+        }
+        if (!this.freightspace1[i].bankDepositBranch) {
+          EventBus.$emit('error', '开户支行不能为空')
+          return
+        }
+        if (
+          this.freightspace1[i].accountTypeFlag == 1 &&
+          this.freightspace1[i].payeeName == ''
+        ) {
+          EventBus.$emit('error', '收款人姓名不能为空')
+          return
+        }
+        if (
+          this.freightspace1[i].accountTypeFlag == 1 &&
+          this.freightspace1[i].payeeNumberCard == ''
+        ) {
+          EventBus.$emit('error', '收款人身份证号码不能为空')
+          return
+        }
+        if (
+          (this.freightspace1[i].accountTypeFlag == 1 &&
+            this.freightspace1[i].payeeName.length < 2) ||
+          (this.freightspace1[i].accountTypeFlag == 1 &&
+            this.freightspace1[i].payeeName.length > 10)
+        ) {
+          EventBus.$emit('error', '收款人姓名输入错误')
+          return
+        }
+        console.log(this.freightspace1[i].payeeNumberCard != 18)
+        if (
+          this.freightspace1[i].accountTypeFlag == 1 &&
+          this.freightspace1[i].payeeNumberCard.length != 18
+        ) {
+          EventBus.$emit('error', '收款人身份证号输入错误')
+          return
+        }
+        if (
+          this.freightspace1[i].accountTypeFlag == 2 &&
+          this.freightspace1[i].compName == ''
+        ) {
+          EventBus.$emit('error', '企业名称不能为空')
+          return
+        }
+        if (
+          (this.freightspace1[i].accountTypeFlag == 2 &&
+            this.freightspace1[i].compName.length < 2) ||
+          (this.freightspace1[i].accountTypeFlag == 2 &&
+            this.freightspace1[i].compName.length > 30)
+        ) {
+          EventBus.$emit('error', '企业名称输入有误')
+          return
+        }
+      }
       // if (!this.addressUrls.travel) {
       //   EventBus.$emit('error', '行驶证不能为空')
       //   return

src/views/warehouse/warehouseManagementDelivery.vue

@@ -312,14 +312,14 @@
             "
           >
             <ws-input
-              v-if="!carstatus"
+              v-if="!carstatus || carjudge"
               v-model="deptBudgetList.carNo"
               placeholder="请输入车牌号"
               maxlength="7"
               size="small"
             />
             <el-select
-              v-if="carstatus"
+              v-else
               filterable
               clearable
               :filter-method="dataFilter2"
@@ -335,6 +335,7 @@
                 :value="item.carNo"
               />
             </el-select>
+            <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
           </ws-form-item>
               <!--船名  -->
               <ws-form-item
@@ -701,6 +702,7 @@ export default {
         type:'干粮',
         addressUrl:'',
         warehouseInOutDetail: {},
+         selfLoading:"0",
       },
       historyList: [],
 
@@ -711,6 +713,8 @@ export default {
       },
       accessoryTFs: false,
       deptBudgetList1:[],
+      carChange1:"手动填写",
+      carjudge:false
     }
   },
   mounted() {
@@ -724,6 +728,17 @@ export default {
   
   },
   methods: {
+    //切换车牌号输入状态
+      carNoTypeChange(){
+         this.carjudge = !this.carjudge
+        if(!this.carjudge){
+            this.deptBudgetList.selfLoading = "0"
+            this.carChange1="手动填写"
+        }else{
+            this.deptBudgetList.selfLoading = "1"
+            this.carChange1="识别下拉"
+        }
+      },
     imgBig(item){
       console.log(item)
       this.img=item
@@ -1586,6 +1601,9 @@ export default {
           return
         }
       }
+      if(!this.carstatus){//若自运的合同该字段置空
+          this.deptBudgetList.selfLoading = ""
+        }
       this.$confirm(`确定提交出库信息`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',

src/views/warehouse/warehouseManagementGross.vue

@@ -1065,7 +1065,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.waterContent < 0 ||
             this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.waterContent
@@ -1079,7 +1079,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1096,7 +1096,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.impurity < 0 ||
             this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
                 '.'
@@ -1109,7 +1109,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1125,7 +1125,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -1139,7 +1139,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1156,7 +1156,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 0 ||
             this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
                 '.'
@@ -1169,7 +1169,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1186,7 +1186,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.imperfectGrain
@@ -1200,7 +1200,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return

src/views/warehouse/warehouseManagementIossRecord.vue

@@ -74,7 +74,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="qualityInspector" label="内勤">
+        <el-table-column prop="qualityInspector" label="操作人">
         </el-table-column>
         <el-table-column prop="createDate" label="录入时间"> </el-table-column>
       </el-table>

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -84,7 +84,7 @@
 					<el-table-column prop="titleNoOther" label="封号-2">
 					</el-table-column>
           <el-table-column prop="agent" label="经办人"> </el-table-column>
-          <el-table-column prop="backOffice" label="内勤"> </el-table-column>
+          <el-table-column prop="backOffice" label="操作人"> </el-table-column>
           <el-table-column prop="updateDate" label="保存时间">
           </el-table-column>
           <el-table-column prop="address" label="操作" width="200">

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -70,7 +70,7 @@
             <el-table-column prop="shipName" label="船名">
             </el-table-column>
             <el-table-column prop="agent" label="经办人"> </el-table-column>
-            <el-table-column prop="backOffice" label="内勤"> </el-table-column>
+            <el-table-column prop="backOffice" label="操作人"> </el-table-column>
             <el-table-column prop="updateDate" label="保存时间">
             </el-table-column>
             <el-table-column prop="address" label="操作" width="200">

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -184,13 +184,15 @@
               dataList.outType == '汽运' ||
               dataList.outType == '集装箱船'
             ">
-                <ws-input v-if="!carstatus" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
-                <el-select v-if="carstatus" 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 :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" />
                 </el-select>
-                 <span style='padding-left:10px;'>发货重量（吨）：{{dataList.loadNetWeight}}</span>
+                 <!-- <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-form-item>
 
               <ws-form-item label="车号" span="1" prop="carNo" v-if="dataList.outType == '火运'">
@@ -458,6 +460,7 @@
           inOutDate: '',
           inOutType: '',
           goodsName: '',
+          selfLoading:"0",
           warehouseInOutDetail: {
             qualityInspector: '',
           },
@@ -484,6 +487,8 @@
         allowEdit: true,
         result1: '00',
         grossWeight:"",//显示的毛重
+        carChange1:"手动填写",
+        carjudge:false
       }
     },
     mounted() {},
@@ -523,6 +528,7 @@
       this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
       this.dataList.statusFlag = this.$route.statusFlag
       this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
+      this.dataList.selfLoading = this.$route.query.selfLoading//
       console.log(this.dataList)
       if (this.$route.query.automaticWeightAcquisition == '1') {
         this.isShowBalance = true
@@ -530,6 +536,17 @@
       this.getList()
     },
     methods: {
+      //切换车牌号输入状态
+      carNoTypeChange(){
+         this.carjudge = !this.carjudge
+        if(!this.carjudge){
+            this.dataList.selfLoading = "0"
+            this.carChange1="手动填写"
+        }else{
+            this.dataList.selfLoading = "1"
+            this.carChange1="识别下拉"
+        }
+      },
       setVal(data) {
         if (this.information == '毛重检斤') {
           this.dataList.grossWeight = data
@@ -724,7 +741,6 @@
       typeChange(e) {},
       //提交按钮
       submit() {
-
         if (this.reader) {
           this.reader.cancel()
         }
@@ -963,7 +979,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.waterContent < 1 ||
+            this.dataList.warehouseInOutDetail.waterContent < 0 ||
             this.dataList.warehouseInOutDetail.waterContent > 40 ||
             (String(this.dataList.warehouseInOutDetail.waterContent).indexOf(
                 '.'
@@ -976,7 +992,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -993,7 +1009,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.impurity < 1 ||
+            this.dataList.warehouseInOutDetail.impurity < 0 ||
             this.dataList.warehouseInOutDetail.impurity > 40 ||
             (String(this.dataList.warehouseInOutDetail.impurity).indexOf('.') !=
               -1 &&
@@ -1005,7 +1021,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1021,7 +1037,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.dataList.warehouseInOutDetail.mildewGrain < 0 ||
             this.dataList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.dataList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -1034,7 +1050,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1051,7 +1067,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.dataList.warehouseInOutDetail.jiaorenli < 0 ||
             this.dataList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.dataList.warehouseInOutDetail.jiaorenli).indexOf('.') !=
               -1 &&
@@ -1063,7 +1079,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1080,7 +1096,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.dataList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.dataList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(this.dataList.warehouseInOutDetail.imperfectGrain).indexOf(
                 '.'
@@ -1093,7 +1109,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1129,6 +1145,9 @@
             return
           }
         }
+        if(!this.carstatus){//若自运的合同该字段置空
+          this.deptBudgetList.selfLoading = ""
+        }
         this.$confirm(`确定提交毛重检斤`, {
             cancelButtonText: '取消',
             confirmButtonText: '确定',

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -280,14 +280,14 @@
             "
           >
             <ws-input
-              v-if="!carstatus"
+              v-if="!carstatus || carjudge"
               v-model="dataList.carNo"
               placeholder="请输入车牌号"
               maxlength="7"
               size="small"
             />
             <el-select
-              v-if="carstatus"
+              v-else
               filterable
               clearable
               :filter-method="dataFilter2"
@@ -303,6 +303,7 @@
                 :value="item.carNo"
               />
             </el-select>
+             <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
           </ws-form-item>
               <!--船名  -->
               <ws-form-item
@@ -676,6 +677,7 @@ export default {
         pureWeight:'',
         deductionAmount:'',
         deductionWeigh:'',
+        selfLoading:"0"
       },
       historyList: [],
 
@@ -685,6 +687,8 @@ export default {
         },
       },
       accessoryTFs: false,
+        carChange1:"手动填写",
+        carjudge:false
     }
   },
   activated() {
@@ -720,9 +724,21 @@ export default {
     this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
     this.dataList.statusFlag = this.$route.statusFlag
     this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
+     this.dataList.selfLoading = this.$route.query.selfLoading
     console.log(this.dataList)
   },
   methods: {
+    //切换车牌号输入状态
+      carNoTypeChange(){
+        this.carjudge = !this.carjudge
+        if(!this.carjudge){
+            this.dataList.selfLoading = "0"
+            this.carChange1="手动填写"
+        }else{
+            this.dataList.selfLoading = "1"
+            this.carChange1="识别下拉"
+        }
+      },
     imgBig(item){
       console.log(item)
       this.img=item
@@ -1213,6 +1229,9 @@ export default {
           return
         }
       }
+      if(!this.carstatus){//若自运的合同该字段置空
+          this.dataList.selfLoading = ""
+        }
       this.$refs.dataList.validate((valid) => {
         if (valid) {
           this.dataList.compId = localStorage.getItem('ws-pf_compId')

src/views/warehouse/warehouseManagementTare.vue

@@ -171,17 +171,13 @@
                 </el-select>
               </ws-form-item>
 
-              <ws-form-item label="车牌号" span="1" prop="carNo" v-if="
-              deptBudgetList.outType == '汽运' ||
-              deptBudgetList.outType == '集装箱船'
-            ">
-                <ws-input v-if="!carstatus" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
-                  size="small" />
-                <el-select v-if="carstatus" 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>
+                <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
               </ws-form-item>
 
               <ws-form-item label="车号" span="1" prop="carNo" v-if="deptBudgetList.outType == '火运'">
@@ -400,6 +396,7 @@
           grossWeight: '',
           tare: '',
           inOutDate: '',
+          selfLoading:"0",
         },
         weightbills: {},
         historyList: [],
@@ -432,6 +429,8 @@
           },
         ],
         tare:"",//显示的皮重
+        carChange1:"手动填写",
+        carjudge:false
       }
     },
     mounted() {
@@ -468,6 +467,17 @@
       }
     },
     methods: {
+      //切换车牌号输入状态
+      carNoTypeChange(){
+        this.carjudge = !this.carjudge
+        if(!this.carjudge){
+            this.deptBudgetList.selfLoading = "0"
+            this.carChange1="手动填写"
+        }else{
+            this.deptBudgetList.selfLoading = "1"
+            this.carChange1="识别下拉"
+        }
+      },
       setVal(data) {
         if (this.information == '毛重检斤') {
           this.deptBudgetList.grossWeight = data
@@ -1246,7 +1256,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.waterContent < 0 ||
             this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.waterContent
@@ -1260,7 +1270,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1277,7 +1287,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.impurity < 0 ||
             this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
                 '.'
@@ -1290,7 +1300,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1306,7 +1316,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -1320,7 +1330,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1337,7 +1347,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 0 ||
             this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
                 '.'
@@ -1350,7 +1360,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1367,7 +1377,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.imperfectGrain
@@ -1381,7 +1391,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1418,6 +1428,9 @@
             return
           }
         }
+        if(!this.carstatus){//若自运的合同该字段置空
+          this.deptBudgetList.selfLoading = ""
+        }
         this.$confirm(`确定提交出库信息`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',