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

src/components/balanceAlert.vue

@@ -40,6 +40,7 @@ export default {
     sendVal(){
       console.log(this.grossWeightVal)
        console.log(this.tareVal)
+       console.log(this.deptBudgetList)
       if(this.information.indexOf('毛重') > -1){
         this.$emit('balanceListen',this.grossWeightVal)
       }else{

src/views/warehouse/warehouseManagementGross.vue

@@ -671,6 +671,7 @@
         for (let i = 0; i < this.tranCarInfoList.length; i++) {
           if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
             this.deptBudgetList.tranCarNo = this.tranCarInfoList[i].tranCarNo
+            this.deptBudgetList.carId = this.tranCarInfoList[i].id
             this.deptBudgetList.freight = Math.round(
               this.tranCarInfoList[i].tranPrice
             )
@@ -1628,7 +1629,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.waterContent < 0 ||
             this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.waterContent
@@ -1642,7 +1643,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1659,7 +1660,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.impurity < 0 ||
             this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
                 '.'
@@ -1672,7 +1673,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1688,7 +1689,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -1702,7 +1703,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1719,7 +1720,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 0 ||
             this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
                 '.'
@@ -1732,7 +1733,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1749,7 +1750,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.imperfectGrain
@@ -1763,7 +1764,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -292,7 +292,9 @@
               deductionAmount: row.deductionAmount,
               deductionWeight: row.deductionWeight,
               allowEdit: row.allowEdit,
-              automaticWeightAcquisition: row.automaticWeightAcquisition
+              automaticWeightAcquisition: row.automaticWeightAcquisition,
+              outType:row.outType,//运输类型
+              carId:row.carId,//派车id
             },
           })
         } else if (row.inOutFlag == 1) {
@@ -340,7 +342,9 @@
               deductionAmount: row.deductionAmount,
               deductionWeight: row.deductionWeight,
               allowEdit: row.allowEdit,
-              automaticWeightAcquisition: row.automaticWeightAcquisition
+              automaticWeightAcquisition: row.automaticWeightAcquisition,
+              outType:row.outType,//运输类型
+              carId:row.carId,//派车id
             },
           })
         }

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">
-              {{ tare }} <span class="kg-style">kg</span>
+              {{ dataList.tare }} <span class="kg-style">kg</span>
             </div>
             <div class="car-no">{{ dataList.carNo }}</div>
           </div>
@@ -41,7 +41,7 @@
               <!--任务编号-->
               <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
                 <el-select filterable clearable v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
-                  @change="contractNoChange" filterable clearable>
+                  @change="contractNoChange">
                   <el-option v-for="item in deptBudgetList2" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
                     :value="item.inOutTaskNo" />
                 </el-select>
@@ -107,7 +107,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"
@@ -570,6 +570,7 @@
       this.dataList.titleNo = this.$route.query.titleNo
       this.dataList.titleNoOther = this.$route.query.titleNoOther
       this.dataList.carNo = this.$route.query.carNo
+      this.dataList.carId = this.$route.query.carId
       this.dataList.inOutDate = this.$route.query.inOutDate
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.inOutType = this.$route.query.inOutType
@@ -586,6 +587,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.buckleWeightRatio = this.$route.query.buckleWeightRatio
       this.dataList.tidalGrainWater = this.$route.query.tidalGrainWater
       this.dataList.solidGrainWater = this.$route.query.solidGrainWater
@@ -655,6 +657,7 @@
         for (let i = 0; i < this.tranCarInfoList.length; i++) {
           if (this.tranCarInfoList[i].carNo == this.dataList.carNo) {
             this.dataList.tranCarNo = this.tranCarInfoList[i].tranCarNo
+            this.dataList.carId = this.tranCarInfoList[i].id
             this.dataList.freight = this.tranCarInfoList[i].tranPrice
           }
           if(this.dataList.inOutType=='移库入库'){
@@ -848,7 +851,6 @@
       },
       //提交按钮
       submit() {
-
         if (this.reader) {
           this.reader.cancel()
         }
@@ -1768,11 +1770,6 @@
     height: 2000px;
     margin: 0 auto;
   }
-
-  /deep/.el-form-item__label {
-    width: 160px;
-  }
-
   .inspector {
     width: 50%;
   }

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -517,6 +517,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.inOutDate = this.$route.query.inOutDate
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.inOutType = this.$route.query.inOutType
@@ -528,6 +529,7 @@
       this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
       this.dataList.statusFlag = this.$route.statusFlag
       this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
+      this.dataList.outType = this.$route.query.outType//运输方式
       this.dataList.selfLoading = this.$route.query.selfLoading//
       console.log(this.dataList)
       if (this.$route.query.automaticWeightAcquisition == '1') {
@@ -1148,6 +1150,7 @@
         if(!this.carstatus){//若自运的合同该字段置空
           this.deptBudgetList.selfLoading = ""
         }
+        console.log("查看carId",this.dataList)
         this.$confirm(`确定提交毛重检斤`, {
             cancelButtonText: '取消',
             confirmButtonText: '确定',

src/views/warehouse/warehouseManagementRecord.vue

@@ -122,7 +122,7 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="binNumber" label="仓位号" width="60px"> </el-table-column>
-					<el-table-column prop="goodsName" label="货名" width="60px"> </el-table-column>
+					<el-table-column prop="goodsName" label="货名" width="100"> </el-table-column>
 					<!-- <el-table-column prop="type" label="类型" width="60px"> </el-table-column> -->
 					<el-table-column prop="grossWeight" label="毛重（吨）" >
 						
@@ -131,7 +131,7 @@
 					<el-table-column prop="deductionWeight" label="扣重（吨）"> </el-table-column>
 					<el-table-column prop="netWeight" label="净重（吨）"></el-table-column>
 					<el-table-column prop="pureWeight" label="纯重（吨）"> </el-table-column>
-					<el-table-column prop="deductionAmount" label="扣款（元/吨）" width="150"> </el-table-column>
+					<el-table-column prop="deductionAmount" label="扣款（元/吨）" width="100"> </el-table-column>
 					<el-table-column prop="grade" label="品级" width="80px">
 						<template slot-scope="scope">
 							<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
@@ -154,7 +154,7 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="inOutType" label="类型"> </el-table-column>
-					<el-table-column prop="contractNo" label="合同编号">
+					<el-table-column prop="contractNo" label="合同编号" width="180">
 						<template slot-scope="scope">
 							<span style="color: #8890b1">{{ scope.row.contractNo }}</span>
 						</template>

src/views/warehouse/warehouseManagementTare.vue

@@ -430,7 +430,8 @@
         ],
         tare:"",//显示的皮重
         carChange1:"手动填写",
-        carjudge:false
+        carjudge:false,
+        options2:[],
       }
     },
     mounted() {
@@ -776,7 +777,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.waterContent < 0 ||
             this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.waterContent
@@ -790,7 +791,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -807,7 +808,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.impurity < 0 ||
             this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
                 '.'
@@ -820,7 +821,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -836,7 +837,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -850,7 +851,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -867,7 +868,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 0 ||
             this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
                 '.'
@@ -880,7 +881,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -897,7 +898,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.imperfectGrain
@@ -911,7 +912,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return