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

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -612,7 +612,6 @@
             })
             .toPromise()
             .then((response) => {
-              debugger
               this.dialogDataList = [] //点击确认时先清空要打印的数组
               this.dialogData = response
               if (response.compName == '黑龙江秋收有限公司') {
@@ -635,7 +634,7 @@
                 this.dialogDataList.push(_datas)
               } else {
                 this.dialogData.companyName = this.companyName
-                if(this.dialogData&&this.dialogData.contractManagement){
+                if(this.dialogData&&this.dialogData.contractManagement&& this.warehousingType != 3){
                   this.dialogData.customer = this.dialogData.contractManagement.seller
                 }
                 this.dialogDataList.push(this.dialogData)

src/views/profitable/cashout.vue

@@ -510,13 +510,13 @@
         }
         if(this.deptBudgetList.purpose=='合同费用'&&this.deptBudgetList.type=='非粮款'||this.deptBudgetList.purpose=='库点费用'&&this.deptBudgetList.flag!="是"){
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
-            if(!this.feeDetailsDistributions[i].goodsSource){
-              this.$message({
-                message: '货源不能为空!',
-                type: 'warning',
-              })
-              return
-            }
+            // if(!this.feeDetailsDistributions[i].goodsSource){
+            //   this.$message({
+            //     message: '货源不能为空!',
+            //     type: 'warning',
+            //   })
+            //   return
+            // }
             if(!this.feeDetailsDistributions[i].distributionMoney&&this.mode!="暂不分配"){
               this.$message({
                 message: '分配金额不能为空!',

src/views/profitable/warehouseprofits.vue

@@ -121,9 +121,6 @@
       this.getPassYearFormatDate()
       this.getList()
       // this.makeWordData = this.getData(2)
-      
-      
-      
     },
     methods: {
       datechange(e){
@@ -138,8 +135,8 @@
         this.datalist2=[]
         this.datalist1=[]
         getwarehousechart({
-          startDate:this.startDate,
-          endDate:this.endDate
+          warehouseStartDate:this.startDate,
+          warehouseEndDate:this.endDate
         })
         .toPromise()
         .then((response) => {

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -92,7 +92,6 @@
             </div>
           
           <div class="myTest">
-            
             <el-form-item v-if='pricetype==1' label="当前运输单价(元/吨):" prop="tranPrice" label-width="150px" class="input-item-margin">
               <el-input v-model="deptBudgetList.tranPrice" maxlength="70" disabled />
             </el-form-item>
@@ -259,8 +258,6 @@
               <span v-if="!item.id" width="22" height="22" class="del"
                 @click="del(index, item,1)" src="../../../public/img/del.png" alt="">×</span>
             </div>
-
-
           </div>
           <div style="text-align: right; color: #8890b1; font-size: 16px">
             共{{ total }}/{{ deptBudgetList.weight }}
@@ -701,7 +698,6 @@
         });
       },
       priceSubmit(status) {
-        console.log(status,this.deptBudgetList.tranPriceIng,this.deptBudgetList.tranPriceIngCar)
         if(status==1&&!this.deptBudgetList.tranPriceIng){
           this.$message({
             message: '请输入运输单价元/吨！',
@@ -753,11 +749,18 @@
       },
       //提交按钮
       submit() {
-        if (!this.deptBudgetList.tranPrice&&this.deptBudgetList.tranPrice!= 0) {
+        if (!this.deptBudgetList.tranPrice&&this.deptBudgetList.tranPrice!= 0 && this.pricetype==1) {
           this.$message({
             message: '请设置运输单价！',
             type: 'warning',
           })
+          return
+        } else if(!this.deptBudgetList.tranPriceCar&&this.deptBudgetList.tranPriceCar!= 0 && this.pricetype!=1){
+          this.$message({
+            message: '请设置运输单价！',
+            type: 'warning',
+          })
+          return
         } else {
           for (var i = this.index; i < this.deptBudgetList.tranCarInfoList.length; i++) {
             if (!this.deptBudgetList.tranCarInfoList[i].driver&&this.deptBudgetList.tranCarInfoList[i].fleetFlag==0) {

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -92,7 +92,7 @@
       <div class="small-title" style="font-size: 16px">派车</div>
        <div class="myTest">
             <!--当前运输单价-->
-          <ws-form-item label="当前运输单价(元/吨):" span="1" prop="tranPrice">
+          <ws-form-item label="当前运输单价(元/吨):" span="1" prop="tranPrice" v-if="deptBudgetList.tranPrice">
               <ws-input
                 v-model="deptBudgetList.tranPrice"
                 maxlength="70"
@@ -101,6 +101,15 @@
                 style="width:70px"
               />
           </ws-form-item>
+          <ws-form-item label="当前运输单价(元/车):" span="1" prop="tranPriceCar" v-if="deptBudgetList.tranPriceCar">
+              <ws-input
+                v-model="deptBudgetList.tranPriceCar"
+                maxlength="70"
+                :disabled="readonly"
+                size="small"
+                style="width:70px"
+              />
+          </ws-form-item>
        </div>
       <div
         style="width: 100%"