Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -847,10 +847,10 @@
       </avue-crud>
     </basic-container>
     </span>
-    <trade-card title="杂费明细" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1 || roleName.indexOf('admin') !== -1">
+    <trade-card title="杂费明细" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1 || roleName.indexOf('admin') !== -1 || roleName.indexOf('车队') !== -1">
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
-        <el-tab-pane label="应收" name="1"></el-tab-pane>
-        <el-tab-pane label="应付" name="2" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('admin') !== -1"></el-tab-pane>
+        <el-tab-pane label="应收" name="1" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1 || roleName.indexOf('admin') !== -1"></el-tab-pane>
+        <el-tab-pane label="应付" name="2" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('admin') !== -1 || roleName.indexOf('车队') !== -1"></el-tab-pane>
       </el-tabs>
       <avue-crud
           v-if="activeIndex === '1'"
@@ -858,7 +858,6 @@
           :option="collectionOption"
           :key="key"
           ref="collection"
-          :disabled="goodsForm.status === 5"
           @resetColumn="resetColumnCollection"
           @saveColumn="saveColumnCollection"
           @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
@@ -868,7 +867,7 @@
           <crop-select
               v-if="row.$cellEdit"
               v-model="row.corpId"
-              :disabled="goodsForm.status === 5"
+              :disabled="!((roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1)"
               @getCorpData="(data)=>{getfleetId(data,row)}"
           ></crop-select>
           <span v-else>{{ row.corpName }}</span>
@@ -877,7 +876,7 @@
           <breakdown-select
               v-if="row.$cellEdit"
               v-model="row.feeId"
-              :disabled="goodsForm.status === 5"
+              :disabled="!((roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1)"
               @selectValue="(value) => selectValue(value,row)"
               :configuration="breakConfiguration">
           </breakdown-select>
@@ -887,8 +886,7 @@
           <el-button
               type="text"
               size="small"
-              v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1 || (roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)"
-              :disabled="goodsForm.status === 5"
+              v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1"
               :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
               @click="rowCell(row,index)"
           >{{ row.$cellEdit ? '保存' : '编辑' }}
@@ -896,8 +894,7 @@
           <el-button type="text"
                      icon="el-icon-delete"
                      size="small"
-                     v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1 || (roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)"
-                     :disabled="goodsForm.status === 5"
+                     v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1"
                      @click="$refs.collection.rowDel(row,index)"
           >删除
           </el-button>
@@ -913,8 +910,7 @@
           <el-button
               type="primary"
               icon="el-icon-plus"
-              v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1 || (roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)"
-              :disabled="goodsForm.status === 5"
+              v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1"
               @click="addRowCollection"
               size="small">录入明细
           </el-button>
@@ -936,7 +932,7 @@
           <crop-select
               v-if="row.$cellEdit"
               v-model="row.corpId"
-              :disabled="goodsForm.status === 5"
+              :disabled="!((roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1)"
               @getCorpData="(data)=>{getfleetId(data,row)}"
           ></crop-select>
           <span v-else>{{ row.corpName }}</span>
@@ -945,7 +941,7 @@
           <breakdown-select
               v-if="row.$cellEdit"
               v-model="row.feeId"
-              :disabled="goodsForm.status === 5"
+              :disabled="!((roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1)"
               @selectValue="(value) => selectValue(value,row)"
               :configuration="breakConfiguration"
           >
@@ -956,7 +952,7 @@
           <el-button
               type="text"
               size="small"
-              :disabled="goodsForm.status === 5"
+              v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1"
               :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
               @click="paymentRowCell(row,index)"
           >{{ row.$cellEdit ? '保存' : '编辑' }}
@@ -964,7 +960,7 @@
           <el-button type="text"
                      icon="el-icon-delete"
                      size="small"
-                     :disabled="goodsForm.status === 5"
+                     v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1"
                      @click="$refs.payment.rowDel(row,index)"
           >删除
           </el-button>
@@ -980,7 +976,7 @@
           <el-button
               type="primary"
               icon="el-icon-plus"
-              :disabled="goodsForm.status === 5"
+              v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1"
               @click="addRowPayment"
               size="small">录入明细
           </el-button>
@@ -1064,7 +1060,7 @@ export default {
           this.findObject(this.goodsOptionFormTwo.column, "fleetRemarks").display = false
         }
         if (!this.typeTwo){
-          this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status === 5
+          // this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status === 5
           if (this.roleName.indexOf('客户') !== -1 || this.roleName.indexOf('司机') !== -1){
             this.goodsOptionFormTwo.disabled = true
           } else {
@@ -1952,6 +1948,7 @@ export default {
         }, {
           label: '车号',
           prop: 'plateNo',
+          width: 100,
           index: 2
         }, {
           label: '费用名称',
@@ -2045,6 +2042,7 @@ export default {
         }, {
           label: '车号',
           prop: 'plateNo',
+          width: 100,
           index: 2
         }, {
           label: '费用名称',
@@ -2101,6 +2099,8 @@ export default {
     };
   },
   async created() {
+    this.activeIndex = this.roleName.indexOf('车队') !== -1?'2':'1'
+    console.log(this.activeIndex)
     if (this.roleName.indexOf('客户') !== -1){
       this.findObject(this.goodsOptionFormTwo.column, "freightPay").display = false
     }
@@ -2211,7 +2211,7 @@ export default {
               }
             })
           }
-          this.goodsOptionFormTwo.disabled = this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status !== 0
+          this.goodsOptionFormTwo.disabled = this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.goodsForm.status !== 0
           delete this.goodsForm.orderAddressList
           delete this.goodsForm.itemList
           delete this.goodsForm.orderFeeList
@@ -2247,7 +2247,7 @@ export default {
               }
             })
           }
-          this.goodsOptionFormTwo.disabled = this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status !== 0
+          this.goodsOptionFormTwo.disabled = this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.goodsForm.status !== 0
           delete this.goodsForm.orderAddressList
           delete this.goodsForm.itemList
           delete this.goodsForm.orderFeeList
@@ -2495,7 +2495,7 @@ export default {
         this.goodsOptionFormC.disabled = true
         this.goodsOptionForm.disabled = true
         this.goodsOptionFormTwo.disabled = true
-        this.goodsOptionFormTwo.disabled = this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status >= 1
+        this.goodsOptionFormTwo.disabled = this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.goodsForm.status >= 1
         delete this.goodsForm.orderAddressList
         delete this.goodsForm.itemList
         delete this.goodsForm.orderFeeList
@@ -2848,6 +2848,7 @@ export default {
           type: '1',
           $cellEdit: true,
           corpId: this.goodsForm.corpId,
+          corpName: this.goodsForm.corpName,
           plateNo: this.goodsForm.plateNo
         });
       } else {
@@ -2862,6 +2863,7 @@ export default {
           type: '2',
           $cellEdit: true,
           corpId: this.goodsForm.corpId,
+          corpName: this.goodsForm.corpName,
           plateNo: this.goodsForm.plateNo
         });
       } else {

src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -1069,6 +1069,13 @@ export default {
       this.activeName = tab
       this.onLoad(this.page)
     },
+    //删除对象空值
+    removeProperty(obj) {
+      Object.keys(obj).forEach(item => {
+        if (obj[item] === '' || obj[item] === undefined || obj[item] === null || obj[item] === 'null') delete obj[item]
+      })
+      return obj
+    },
     //查询
     onLoad(page, params) {
       motorcadeDriver(4).then(res => {
@@ -1086,6 +1093,7 @@ export default {
         queryParams.endArrivalTime = queryParams.arrivalTime[1]
         delete queryParams.arrivalTime
       }
+      queryParams = this.removeProperty(queryParams)
       this.loading = true;
       if (this.loading) this.dialogVisibleTwo = false
       standingBookCollection(queryParams).then(res => {

src/views/landTransportation/dispatchingCars/index.vue

@@ -56,6 +56,7 @@
           :data="dataList"
           :page.sync="page"
           ref="crud"
+          :search.sync="query"
           :option="option"
           @on-load="onLoad"
           @row-del="rowDel"
@@ -119,6 +120,7 @@
 import detailPage from './detailPage'
 import {removeDelegationList, selectInvoiceList, totalList} from "@/api/landTransportation";
 import {businessStatisticsFrequency} from "@/api/wel";
+import {defaultDate} from "@/util/date";
 export default {
   name: "index",
   components: {
@@ -310,6 +312,9 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(86), this.optionList);
+    this.query = {
+      arrivalTime: [defaultDate(4)[0] + ' 00:00:00',defaultDate(4)[1] + ' 23:59:59']
+    }
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
@@ -382,6 +387,11 @@ export default {
         ...params,
         ...Object.assign(params, this.query)
       }
+      if (queryParams.arrivalTime) {
+        queryParams.beginArrivalTime = queryParams.arrivalTime[0]
+        queryParams.endArrivalTime = queryParams.arrivalTime[1]
+      }
+      delete queryParams.arrivalTime
       this.loading = true;
       selectInvoiceList(queryParams).then(res => {
         this.dataList = res.data.data.records

src/views/landTransportation/driver/index.vue

@@ -70,6 +70,7 @@
           :table-loading="loading"
           :page.sync="page"
           ref="crud"
+          :search.sync="query"
           @on-load="onLoad"
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
@@ -179,6 +180,7 @@ import {
   fleetList, motorcadeDriver, fleetDriverSave, getAttachment, saveAttached, arrival,borrow
 } from "@/api/landTransportation";
 import {businessStatisticsFrequency} from "@/api/wel";
+import {defaultDate} from "@/util/date";
 
 export default {
   name: "index",
@@ -565,6 +567,9 @@ export default {
   },
   async created() {
     this.goodsOptionCrud = await this.getColumnData(this.getColumnName(88), this.optionList);
+    this.query = {
+      arrivalTime: [defaultDate(4)[0] + ' 00:00:00',defaultDate(4)[1] + ' 23:59:59']
+    }
     this.key++
     let i = 0;
     this.goodsOptionCrud.column.forEach(item => {
@@ -663,6 +668,11 @@ export default {
         ...params,
         ...Object.assign(params, this.query)
       }
+      if (queryParams.arrivalTime) {
+        queryParams.beginArrivalTime = queryParams.arrivalTime[0]
+        queryParams.endArrivalTime = queryParams.arrivalTime[1]
+      }
+      delete queryParams.arrivalTime
       this.loading = true;
       driverQueryCollection(queryParams).then(res => {
         this.goodsList = res.data.data.records

src/views/landTransportation/motorcadeDriver/index.vue

@@ -84,6 +84,7 @@
           :table-loading="loading"
           :page.sync="page"
           ref="crud"
+          :search.sync="query"
           @on-load="onLoad"
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
@@ -220,6 +221,7 @@ import {
 } from "@/api/landTransportation";
 import {location} from "@/api/gaude";
 import {businessStatisticsFrequency} from "@/api/wel";
+import {defaultDate} from "@/util/date";
 
 export default {
   name: "index",
@@ -250,7 +252,7 @@ export default {
             value: "plateNo"
           },
           change: (data) => {
-            fleetList().then(res => {
+            fleetList({fleetId:this.formDataList.fleetId}).then(res => {
               for (let item in res.data.data) {
                 if (data.value === res.data.data[item].plateNo) {
                   this.formData.driverId = res.data.data[item].driverId
@@ -736,6 +738,9 @@ export default {
   },
   async created() {
     this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(87), this.optionList);
+    this.query = {
+      arrivalTime: [defaultDate(4)[0] + ' 00:00:00',defaultDate(4)[1] + ' 23:59:59']
+    }
     this.key++
     this.findObject(this.entrustOptionTwoT.column, "plateNo").change = (data) => {
       fleetList({fleetId:data.row.fleetId}).then(res => {
@@ -897,6 +902,11 @@ export default {
         ...params,
         ...Object.assign(params, this.query)
       }
+      if (queryParams.arrivalTime) {
+        queryParams.beginArrivalTime = queryParams.arrivalTime[0]
+        queryParams.endArrivalTime = queryParams.arrivalTime[1]
+      }
+      delete queryParams.arrivalTime
       this.loading = true;
       driverQueryCollection(queryParams).then(res => {
         this.goodsList = res.data.data.records

src/views/landTransportation/placeAnOrder/index.vue

@@ -112,6 +112,7 @@
           :page.sync="page"
           :data="dataList"
           ref="crud"
+          :search.sync="query"
           :option="option"
           @on-load="onLoad"
           @row-del="rowDel"
@@ -183,6 +184,7 @@ import detailPage from './detailPage'
 import {removeDelegationList, selectInvoiceList, totalList} from "@/api/landTransportation";
 import {getQueryString} from "@/util/util";
 import {businessStatisticsFrequency} from "@/api/wel";
+import {defaultDate} from "@/util/date";
 
 export default {
   name: "index",
@@ -388,6 +390,9 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(85), this.optionList);
+    this.query = {
+      arrivalTime: [defaultDate(4)[0] + ' 00:00:00',defaultDate(4)[1] + ' 23:59:59']
+    }
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
@@ -485,6 +490,11 @@ export default {
         kind: '1',
         ...Object.assign(params, this.query)
       }
+      if (queryParams.arrivalTime) {
+        queryParams.beginArrivalTime = queryParams.arrivalTime[0]
+        queryParams.endArrivalTime = queryParams.arrivalTime[1]
+      }
+      delete queryParams.arrivalTime
       this.loading = true;
       selectInvoiceList(queryParams).then(res => {
         this.dataList = res.data.data.records