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

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -310,10 +310,10 @@
                 <ws-form-item v-if="serviceManagementType == 1 && deptBudgetList.outType == '汽运'" label="车牌号" span="1"
                   prop="carNo">
                   <ws-input :disabled="disabled2"
-                    v-if="options2.length == 0 && serviceManagementType == 1 && deptBudgetList.inOutType != '移库入库' || statusTypetext != '初检'"
+                    v-if="options2.length == 0 && serviceManagementType == 1 && deptBudgetList.inOutType != '移库入库'&&deptBudgetList.inOutType != '退库' || statusTypetext != '初检'||deptBudgetList.inOutType == '退库'&&tranTaskFlag!=1"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
                   <el-select :disabled="disabled2"
-                    v-if="carstatus && options2.length > 0 && serviceManagementType != 3 || carstatus && options2.length == 0 && serviceManagementType != 3 && deptBudgetList.inOutType == '移库入库'"
+                    v-if="carstatus && options2.length > 0 && serviceManagementType != 3 || carstatus && options2.length == 0 && serviceManagementType != 3 && deptBudgetList.inOutType == '移库入库'||deptBudgetList.inOutType == '退库'&&tranTaskFlag==1"
                     filterable clearable v-model="deptBudgetList.carNo1" placeholder="请选择车牌号" class="typeselect"
                     @change="carChange($event, 0)">
                     <el-option v-for="(item, index) in options2" :key="index"
@@ -1681,6 +1681,7 @@ export default {
         qualityPriceIncrease: 0,
         qualityPriceDeduction: 0,
         paramType: 1,
+        tranTaskFlag:0,
         warehouseInOutDetail: {
           grade: '',
           reGrade: '',
@@ -3960,6 +3961,8 @@ export default {
           this.deptBudgetList.tips = '出货库' + data.sendWarehouse
         }
         this.deptBudgetList.inOutTypeKey = 6
+        //退库有无运输任务标识
+				this.tranTaskFlag=this.outContractNo.tranTaskFlag
       }
       if(this.outContractNo.contractPrice){
           this.cost = this.outContractNo.contractPrice

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -550,7 +550,7 @@
             var tmp1 = 'C00'
             this.deptBudgetList.count++
             console.log(this.deptBudgetList.tranCarInfoList,this.deptBudgetList.tranCarInfoList1.length)
-            if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 10) {
+            if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 9) {
               this.deptBudgetList.tranCarInfoList1.push({
                 driverName: '',
                 driverPhone: '',
@@ -569,8 +569,8 @@
                 tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length+1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 100 && (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) >=
-              10) {
+            } else if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 99 && (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) >=
+              9) {
               tmp1 = 'C0'
               this.deptBudgetList.count++
               this.deptBudgetList.tranCarInfoList1.push({
@@ -592,7 +592,7 @@
                 tranPrice: this.deptBudgetList.tranPrice
               })
             } else if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 1000 && (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) >=
-              100) {
+              99) {
                 console.log(111111)
               tmp1 = 'C'
               this.deptBudgetList.count++
@@ -625,7 +625,7 @@
           } else {
             var tmp1 = 'C00'
             this.deptBudgetList.count++
-            if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 10) {
+            if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 9) {
               this.deptBudgetList.tranCarInfoList1.push({
                 driverName: '',
                 driverPhone: '',
@@ -644,8 +644,8 @@
                 tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length+1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 100 && (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) >=
-              10) {
+            } else if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 99 && (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) >=
+              9) {
               tmp1 = 'C0'
               this.deptBudgetList.count++
               this.deptBudgetList.tranCarInfoList1.push({
@@ -667,7 +667,7 @@
                 tranPrice: this.deptBudgetList.tranPrice
               })
             } else if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 1000 && (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) >=
-              100) {
+              99) {
               tmp1 = 'C'
               this.deptBudgetList.count++
               this.deptBudgetList.tranCarInfoList1.push({
@@ -892,10 +892,18 @@
                 }
               }
             }
+            this.deptBudgetList = response
             if(response.billingMethod){
               this.pricetype=response.billingMethod
+              if(this.pricetype==1){
+                this.deptBudgetList.tranPrice=response.tranPrice
+
+              }else{
+                this.deptBudgetList.tranPrice=response.tranPriceCar
+
+              }
             }
-            this.deptBudgetList = response
+            
             this.fhaddress = response.sendPrivate + response.sendCity + response.sendArea + response
               .sendDetailedAddress
             this.shaddress = response.receivePrivate + response.receiveCity + response.receiveArea + response
@@ -921,7 +929,7 @@
                 fleetFlag:0,
                 tranType: '1',
                 tranCarNo: carno,
-                billingMethod:1,
+                billingMethod:this.pricetype,
                 tranPrice: this.deptBudgetList.tranPrice
               }, ]
           })

src/views/warehousenew/warehouseManagementList.vue

@@ -1211,19 +1211,25 @@
               if(this.totalReserves[j].cost && this.totalReserves[j].stockNum){
                 this.totalReserves[j].totalMoney = (Number(this.totalReserves[j].cost) *  Number(this.totalReserves[j].stockNum)).toFixed(3)
                 this.totalMoney = (Number(this.totalMoney) + Number(this.totalReserves[j].totalMoney)).toFixed(3)
+                for(let r = 0;r<response.warehouseNumViewList.length;r++){
+                    if(this.totalReserves[j].goodsName == response.warehouseNumViewList[r].goodsName){
+                      this.$message.error('当前仓库无潮粮库存,无需折算!')
+                      this.value = '0'
+                      return
+                    }
+                }
               }
             }
-            // debugger
             if(response.warehouseNumViewList.length != 0){
               var result = []
-            for(let i = 0; i < response.warehouseNumViewList.length ; i++){
-              let param ={}
-              if (response.warehouseNumViewList[i].pureWeight) {
-                param.goodsName =response.warehouseNumViewList[i].goodsName
-                param.stockNum = Number(response.warehouseNumViewList[i].pureWeight).toFixed(3)
-                param.conversionCost = (Number(this.totalMoney) / Number(param.stockNum)).toFixed(3)
-                result.push(param)
-              } 
+              for(let i = 0; i < response.warehouseNumViewList.length ; i++){
+                let param ={}
+                if (response.warehouseNumViewList[i].pureWeight) {
+                  param.goodsName =response.warehouseNumViewList[i].goodsName
+                  param.stockNum = Number(response.warehouseNumViewList[i].pureWeight).toFixed(3)
+                  param.conversionCost = (Number(this.totalMoney) / Number(param.stockNum)).toFixed(3)
+                  result.push(param)
+                } 
              }
              console.log(result)
              this.totalReserves = result