Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

# Conflicts:
#	src/views/houseSelfCollect/weightCheck.vue
#	src/views/warehouse/warehouseManagementGross.vue
#	src/views/warehouse/warehouseManagementNoWeightOut.vue

public/static/payprint.html

@@ -174,7 +174,7 @@
       }
 
       .part2 {
-        height: 135vh;
+        height: 140vh;
         /* background: red; */
       }
 

src/views/houseSelfCollect/weightCheck.vue

@@ -693,18 +693,37 @@ export default {
               weight: this.weighingList.grossWeight,
             }
           }
-          this.deptBudgetTotal = this.mList.length
-        }
-      } else {
-        this.index = 1
-        this.carList = this.pList
-        this.carList1 = this.pList
-        if (this.pList.length != 0) {
-          let _item = this.pList.filter(function (val1) {
-            if (val1.id == that.$route.query.id) {
-              return val1
+
+
+        } else {
+          this.index = 1
+          this.carList = this.pList
+          this.carList1 = this.pList
+          if (this.pList.length != 0) {
+            let _item = this.pList.filter(function(val1) {
+              if (val1.id == that.$route.query.id) {
+                return val1
+              }
+            })
+            if (_item.length != 0) {
+              this.setCurrent(_item[0])
+              this.weighingList = _item[0]
+              this.carWeightInfo = {
+                carNumber: _item[0].carNumber,
+                type: this.information,
+                weight: this.weighingList.tare
+              }
+            } else {
+              this.setCurrent(this.pList[0])
+
+              this.weighingList = this.pList[0]
+              this.carWeightInfo = {
+                carNumber: this.pList[0].carNumber,
+                type: this.information,
+                weight: this.weighingList.tare
+              }
             }
-          })
+          }
           if (_item.length != 0) {
             this.setCurrent(_item[0])
             this.weighingList = _item[0]

src/views/warehouse/warehouseManagementGross.vue

@@ -2421,21 +2421,237 @@ export default {
           }
         }
       }
-    },
-    typeChange(e) {},
-    pureweight(status) {
-      console.log(this.deptBudgetList)
-      if (
-        this.deptBudgetList.netWeight &&
-        this.deptBudgetList.tidalGrainWater &&
-        this.deptBudgetList.solidGrainWater &&
-        this.deptBudgetList.buckleWeightRatio
-      ) {
-        this.deptBudgetList.pureWeight =
-          (this.deptBudgetList.netWeight *
-            (100 -
-              (this.deptBudgetList.tidalGrainWater -
-                this.deptBudgetList.solidGrainWater) *
+        this.$confirm(`是否保存毛重检斤`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+            this.$refs.deptBudgetList.validate((valid) => {
+              if (valid) {
+                this.deptBudgetList.compId = localStorage.getItem('ws-pf_compId')
+                this.deptBudgetList.secretaryWeigher =
+                  localStorage.getItem('ws-pf_staffName')
+                this.deptBudgetList.inOutFlag = 2
+                this.deptBudgetList.statusFlag = 1
+                let _data = JSON.parse(
+                  localStorage.getItem('winseaview-userInfo')
+                )
+                this.deptBudgetList.backOffice =
+                  _data.content.showCompName + '-' + _data.content.staffName
+                this.deptBudgetList.grossWeight /= 1000
+                this.deptBudgetList.tare /= 1000
+                this.deptBudgetList.netWeight /= 1000
+                this.deptBudgetList.pureWeight /= 1000
+                this.deptBudgetList.deductionAmount *= 1000
+                this.deptBudgetList.deductionWeight /= 1000
+                addstorageputList(this.deptBudgetList)
+                  .toPromise()
+                  .then((response) => {
+                    if (this.reader) {
+                      this.reader.cancel()
+                    }
+                    this.$message.success('保存成功')
+                    this.$router.push({
+                      path: 'warehouseManagementList',
+                    })
+                  })
+              } else {
+                EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                return false
+              }
+            })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      tarechange(e) {
+        if (
+          this.deptBudgetList.grossWeight &&
+          this.deptBudgetList.tare &&
+          (this.deptBudgetList.deductionWeight ||
+            this.deptBudgetList.deductionWeight == 0)
+        ) {
+          this.deptBudgetList.netWeight = Number(
+            this.deptBudgetList.grossWeight -
+            this.deptBudgetList.tare -
+            this.deptBudgetList.deductionWeight
+          ).toFixed(2)
+        }
+      },
+      grossWeightchange(e) {
+        this.grossWeight =  this.deptBudgetList.grossWeight
+        if (
+          this.deptBudgetList.grossWeight &&
+          this.deptBudgetList.tare &&
+          (this.deptBudgetList.deductionWeight ||
+            this.deptBudgetList.deductionWeight == 0)
+        ) {
+          this.deptBudgetList.netWeight = Number(
+            this.deptBudgetList.grossWeight -
+            this.deptBudgetList.tare -
+            this.deptBudgetList.deductionWeight
+          ).toFixed(2)
+        }
+      },
+      contractNoChange(e) {
+        this.disabled1 = true
+        for (let i = 0; i < this.deptBudgetList1.length; i++) {
+          console.log(this.deptBudgetList1[i])
+          if (this.deptBudgetList1[i].inOutTaskNo == e) {
+            var data = this.deptBudgetList1[i]
+
+            if (this.deptBudgetList1[i].contractNo) {
+              this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
+            } else {
+              this.deptBudgetList.contractNo = this.deptBudgetList1[i].moveTaskNo
+            }
+          }
+        }
+        if(!data) return
+        for (var i = 0; i < this.outContractNo.length; i++) {
+          if (
+            this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
+          ) {
+            console.log(this.outContractNo[i])
+            this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
+            this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
+            this.deptBudgetList.grade = this.outContractNo[i].grade
+            if (this.outContractNo[i].inOutType == '采购入库') {
+              if (!this.outContractNo[i].unitContractPrice) {
+                this.deptBudgetList.tips = '卖方' + this.outContractNo[i].seller
+              } else {
+                this.deptBudgetList.tips =
+                  '卖方' +
+                  this.outContractNo[i].seller +
+                  '（ ' +
+                  this.outContractNo[i].unitContractPrice +
+                  '元/吨）'
+              }
+              this.deptBudgetList.inOutTypeKey = 1
+            } else if (this.outContractNo[i].inOutType == '移库入库') {
+              this.deptBudgetList.goodsName = data.goodsName
+              this.deptBudgetList.goodsNameKey = data.goodsNameKey
+              this.deptBudgetList.grade = data.grade
+              if (this.outContractNo[i].unitContractPrice) {
+                this.deptBudgetList.tips =
+                  '出货库' +
+                  data.sendWarehouse +
+                  ' （' +
+                  this.outContractNo[i].unitContractPrice +
+                  '元/吨）'
+              } else {
+                this.deptBudgetList.tips = '出货库' + data.sendWarehouse
+              }
+
+              this.deptBudgetList.inOutTypeKey = 3
+            } else if (this.outContractNo[i].inOutType == '移库出库') {
+              this.deptBudgetList.tips = '入货库' + data.receiveWarehouse
+            } else if (this.outContractNo[i].inOutType == '暂存入库') {
+              this.deptBudgetList.inOutTypeKey = 4
+            } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
+              this.deptBudgetList.inOutTypeKey = 5
+            } else if (this.outContractNo[i].inOutType == '退库') {
+              if (this.outContractNo[i].contractNo) {
+                this.deptBudgetList.tips = '买方' + this.outContractNo[i].buyer
+              } else {
+                this.deptBudgetList.tips = '出货库' + data.sendWarehouse
+              }
+              this.deptBudgetList.inOutTypeKey = 6
+            }
+            // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
+            this.cost = this.outContractNo[i].contractPrice
+            if (this.cost) {
+              this.isGetCost = true
+              this.deptBudgetList.cost =
+                this.cost - this.deptBudgetList.deductionAmount
+            } else {
+              this.isGetCost = false
+              this.deptBudgetList.cost = this.deptBudgetList.cost
+            }
+            this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
+            if (this.outContractNo[i].inOutType == '移库入库') {
+              this.isSelectType = false
+            } else {
+              this.isSelectType = true
+            }
+            if (this.outContractNo[i].priceType == '随行就市') {
+              this.disabled1 = !this.disabled1
+            }
+            if (this.outContractNo[i].deliverType == '1') {
+              this.carstatus = true
+            } else {
+              this.carstatus = false
+            }
+            if (this.outContractNo[i].tranCarInfoList) {
+              this.options2 = this.outContractNo[i].tranCarInfoList
+              this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
+              // this.carstatus = true
+            }
+          }
+        }
+      },
+      contractNoChange1(e) {
+        for (var i = 0; i < this.outContractNo.length; i++) {
+          if (this.outContractNo[i].contractNo == e) {
+            if (this.outContractNo[i].inOutType == '采购入库') {
+              this.deptBudgetList.inOutTypeKey = 1
+            } else if (this.outContractNo[i].inOutType == '移库入库') {
+              this.deptBudgetList.inOutTypeKey = 3
+            } else if (this.outContractNo[i].inOutType == '暂存入库') {
+              this.deptBudgetList.inOutTypeKey = 4
+            } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
+              this.deptBudgetList.inOutTypeKey = 5
+            } else if (this.outContractNo[i].inOutType == '退库') {
+              this.deptBudgetList.inOutTypeKey = 6
+            }
+            this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
+            this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
+            this.deptBudgetList.grade = this.outContractNo[i].grade
+            // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
+            this.cost = this.outContractNo[i].contractPrice
+            if (this.cost) {
+              this.isGetCost = true
+              this.deptBudgetList.cost =
+                this.cost - this.deptBudgetList.deductionAmount
+            } else {
+              this.isGetCost = false
+              this.deptBudgetList.cost = this.deptBudgetList.cost
+            }
+            this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
+            if (this.outContractNo[i].inOutType == '移库入库') {
+              this.isSelectType = false
+            } else {
+              this.isSelectType = true
+            }
+            if (this.outContractNo[i].deliverType == '1') {
+              this.carstatus = true
+            } else {
+              this.carstatus = false
+            }
+            if (this.outContractNo[i].tranCarInfoList) {
+              this.options2 = this.outContractNo[i].tranCarInfoList
+              this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
+              this.carstatus = true
+            }
+          }
+        }
+      },
+      typeChange(e) {},
+      pureweight(status) {
+        console.log(this.deptBudgetList)
+        if (
+          this.deptBudgetList.netWeight &&
+          this.deptBudgetList.tidalGrainWater &&
+          this.deptBudgetList.solidGrainWater &&
+          this.deptBudgetList.buckleWeightRatio
+        ) {
+          this.deptBudgetList.pureWeight =
+            (this.deptBudgetList.netWeight *
+              (100 -
+                (this.deptBudgetList.tidalGrainWater -
+                  this.deptBudgetList.solidGrainWater) *
                 this.deptBudgetList.buckleWeightRatio)) /
           100
       }

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -117,7 +117,7 @@
                   value-format="yyyy-MM-dd">
                 </el-date-picker>
               </ws-form-item>
-             <!-- 经办人  -->
+              <!-- 经办人  -->
               <ws-form-item label="经办人" span="1" prop="agent">
                 <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable clearable @change="selectstaff">
                   <el-option v-for="item in options" :key="item.value" :label="item.staffName"
@@ -226,7 +226,7 @@
                   <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>
               </ws-form-item>
               <!--船名  -->
               <ws-form-item label="船名" span="1" prop="carNo" v-if="deptBudgetList.outType == '散船'">
@@ -551,7 +551,7 @@
             value: '3',
           },
         ],
-        tare:"",
+        tare: "",
       }
     },
     mounted() {},
@@ -597,7 +597,7 @@
       this.dataList.cost = this.$route.query.cost
       this.dataList.freight = this.$route.query.freight
       this.dataList.type = this.$route.query.type
-      this.dataList.outType = this.$route.query.outType//运输方式
+      this.dataList.outType = this.$route.query.outType //运输方式
       this.dataList.buckleWeightRatio = this.$route.query.buckleWeightRatio
       this.dataList.tidalGrainWater = this.$route.query.tidalGrainWater
       this.dataList.solidGrainWater = this.$route.query.solidGrainWater
@@ -623,7 +623,7 @@
           this.dataList.grossWeight = data
         } else {
           this.tare = data
-           this.dataList.tare = data
+          this.dataList.tare = data
         }
       },
       openPort() {
@@ -670,11 +670,11 @@
             this.dataList.carId = this.tranCarInfoList[i].id
             this.dataList.freight = this.tranCarInfoList[i].tranPrice
           }
-          if(this.dataList.inOutType=='移库入库'){
-            if(!this.dataList.cost){
-              this.dataList.cost=this.tranCarInfoList[i].cost
+          if (this.dataList.inOutType == '移库入库') {
+            if (!this.dataList.cost) {
+              this.dataList.cost = this.tranCarInfoList[i].cost
             }
-            this.dataList.loadNetWeight=this.tranCarInfoList[i].loadNetWeight
+            this.dataList.loadNetWeight = this.tranCarInfoList[i].loadNetWeight
           }
         }
       },
@@ -690,6 +690,7 @@
             }
           }
         }
+        if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
             if (this.outContractNo[i].inOutType == '采购入库') {
@@ -1779,6 +1780,7 @@
     height: 2000px;
     margin: 0 auto;
   }
+
   .inspector {
     width: 50%;
   }
@@ -1796,6 +1798,7 @@
   /deep/.el-form-item {
     width: 50%;
   }
+
   /deep/.ws-info-table .el-form-item .el-form-item__label {
     text-align: center;
   }

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -50,7 +50,7 @@
               <!--任务编号-->
               <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
                 <el-select filterable clearable v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
-                  @change="contractNoChange" >
+                  @change="contractNoChange">
                   <el-option v-for="item in deptBudgetList2" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
                     :value="item.inOutTaskNo" />
                 </el-select>
@@ -193,15 +193,19 @@
               dataList.outType == '汽运' ||
               dataList.outType == '集装箱船'
             ">
-                <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" />
+                <ws-input v-if="!carstatus || carjudge" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7"
+                  size="small" />
+                <el-select v-else filterable clearable 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> -->
-                  <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
+                <!-- <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-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 == '火运'">
@@ -409,7 +413,7 @@
             value: '3',
           },
         ],
-        information:'毛重检斤',
+        information: '毛重检斤',
         readonly: true,
         typeList: ['干粮', '潮粮'],
         qualityInspectorList: [],
@@ -458,6 +462,7 @@
         },
         contractList: [],
         dataList: {
+          outType: '',
           id: '',
           grossWeight: '',
           contractNo: '',
@@ -469,7 +474,7 @@
           inOutDate: '',
           inOutType: '',
           goodsName: '',
-          selfLoading:"0",
+          selfLoading: "0",
           warehouseInOutDetail: {
             qualityInspector: '',
           },
@@ -495,9 +500,9 @@
         param: 9600,
         allowEdit: true,
         result1: '00',
-        grossWeight:"",//显示的毛重
-        carChange1:"手动填写",
-        carjudge:false
+        grossWeight: "", //显示的毛重
+        carChange1: "手动填写",
+        carjudge: false
       }
     },
     mounted() {},
@@ -511,7 +516,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.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
@@ -526,7 +531,7 @@
       this.dataList.grade = this.$route.query.grade
       this.dataList.agent = this.$route.query.agent
       this.dataList.carNo = this.$route.query.carNo
-      this.dataList.carId = this.$route.query.carId//派车id初始化默认一下（解决第一次进来无carid）
+      this.dataList.carId = this.$route.query.carId //派车id初始化默认一下（解决第一次进来无carid）
       this.dataList.inOutDate = this.$route.query.inOutDate
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.inOutType = this.$route.query.inOutType
@@ -543,19 +548,20 @@
       // if (this.$route.query.automaticWeightAcquisition == '1') {
       //   this.isShowBalance = true
       // }
+
       this.getList()
     },
     methods: {
       dataFilter2(){},
       //切换车牌号输入状态
-      carNoTypeChange(){
-         this.carjudge = !this.carjudge
-        if(!this.carjudge){
-            this.dataList.selfLoading = "0"
-            this.carChange1="手动填写"
-        }else{
-            this.dataList.selfLoading = "1"
-            this.carChange1="识别下拉"
+      carNoTypeChange() {
+        this.carjudge = !this.carjudge
+        if (!this.carjudge) {
+          this.dataList.selfLoading = "0"
+          this.carChange1 = "手动填写"
+        } else {
+          this.dataList.selfLoading = "1"
+          this.carChange1 = "识别下拉"
         }
       },
       setVal(data) {
@@ -622,12 +628,12 @@
           if (this.tranCarInfoList[i].carNo == this.dataList.carNo) {
             this.dataList.tranCarNo = this.tranCarInfoList[i].tranCarNo
             this.dataList.carId = this.tranCarInfoList[i].id
-             if(this.dataList.inOutType=='移库入库'){
-            if(!this.dataList.cost){
-              this.dataList.cost=this.tranCarInfoList[i].cost
+            if (this.dataList.inOutType == '移库入库') {
+              if (!this.dataList.cost) {
+                this.dataList.cost = this.tranCarInfoList[i].cost
+              }
+              this.dataList.loadNetWeight = this.tranCarInfoList[i].loadNetWeight
             }
-            this.dataList.loadNetWeight=this.tranCarInfoList[i].loadNetWeight
-          }
           }
         }
       },
@@ -673,7 +679,7 @@
             }
           }
         }
-
+        if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
             if (this.outContractNo[i].inOutType == '销售出库') {
@@ -1154,7 +1160,7 @@
             return
           }
         }
-        if(!this.carstatus){//若自运的合同该字段置空
+        if (!this.carstatus) { //若自运的合同该字段置空
           this.deptBudgetList.selfLoading = ""
         }
         this.$confirm(`确定提交毛重检斤`, {
@@ -1639,6 +1645,7 @@
   .el-input__inner {
     width: 150px;
   }
+
   .balance-row {
     display: flex;
     margin: 20px 0;

src/views/warehouse/warehouseManagementTare.vue

@@ -181,9 +181,12 @@
                 </el-select>
               </ws-form-item>
 
-              <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">
+              <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>
@@ -406,7 +409,7 @@
           grossWeight: '',
           tare: '',
           inOutDate: '',
-          selfLoading:"0",
+          selfLoading: "0",
         },
         weightbills: {},
         historyList: [],
@@ -438,10 +441,10 @@
             value: '3',
           },
         ],
-        tare:"0",//显示的皮重
-        carChange1:"手动填写",
-        carjudge:false,
-        options2:[],
+        tare: "0", //显示的皮重
+        carChange1: "手动填写",
+        carjudge: false,
+        options2: [],
       }
     },
     mounted() {
@@ -478,14 +481,14 @@
     },
     methods: {
       //切换车牌号输入状态
-      carNoTypeChange(){
+      carNoTypeChange() {
         this.carjudge = !this.carjudge
-        if(!this.carjudge){
-            this.deptBudgetList.selfLoading = "0"
-            this.carChange1="手动填写"
-        }else{
-            this.deptBudgetList.selfLoading = "1"
-            this.carChange1="识别下拉"
+        if (!this.carjudge) {
+          this.deptBudgetList.selfLoading = "0"
+          this.carChange1 = "手动填写"
+        } else {
+          this.deptBudgetList.selfLoading = "1"
+          this.carChange1 = "识别下拉"
         }
       },
       setVal(data) {
@@ -534,6 +537,7 @@
             }
           }
         }
+        if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (
             this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
@@ -1437,7 +1441,7 @@
             return
           }
         }
-        if(!this.carstatus){//若自运的合同该字段置空
+        if (!this.carstatus) { //若自运的合同该字段置空
           this.deptBudgetList.selfLoading = ""
         }
         this.$confirm(`确定提交出库信息`, {