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

src/util/date.js

@@ -70,6 +70,11 @@ export function defaultDate(type) {
       dateFormat(new Date(date.getFullYear(), date.getMonth()-1, 1), "yyyy-MM-dd"),
       dateFormat(new Date((date.getMonth() + 1) === 12?date.getFullYear()+1:date.getFullYear(), (date.getMonth() + 1), date.getDate()), "yyyy-MM-dd")
     ];
+  } else if (type == 4){
+    return[
+      dateFormat(new Date(date.getFullYear(), date.getMonth(), 1), "yyyy-MM-dd"),
+      dateFormat(new Date(date.getFullYear(), date.getMonth() + 1, 0), "yyyy-MM-dd")
+    ];
   }else {
     return [
       dateFormat(startDate, "yyyy-MM-dd") + " 00:00:00",

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -1053,6 +1053,16 @@ export default {
   watch: {
     goodsForm: {
       handler(newValue, oldValue) {
+        if (this.roleName.indexOf('客户') !== -1 || this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('admin') !== -1){
+          this.findObject(this.goodsOptionForm.column, "remarks").display = true
+        }else {
+          this.findObject(this.goodsOptionForm.column, "remarks").display = false
+        }
+        if (this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('车队') !== -1 || this.roleName.indexOf('司机') !== -1){
+          this.findObject(this.goodsOptionFormTwo.column, "fleetRemarks").display = true
+        }else {
+          this.findObject(this.goodsOptionFormTwo.column, "fleetRemarks").display = false
+        }
         if (!this.typeTwo){
           this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status === 5
           if (this.roleName.indexOf('客户') !== -1 || this.roleName.indexOf('司机') !== -1){
@@ -1068,8 +1078,9 @@ export default {
                 this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false
                 this.findObject(this.goodsOptionFormTwo.column, "driverTel").disabled = false
                 this.findObject(this.goodsOptionFormTwo.column, "freightPay").disabled = false
+                this.findObject(this.goodsOptionFormTwo.column, "fleetRemarks").disabled = false
               }
-            }else if (this.goodsForm.status === 2){
+            } else if (this.goodsForm.status === 2){
               this.goodsOptionFormTwo.disabled = false
               if (this.roleName.indexOf('车队') !== -1 || this.roleName.indexOf('admin') !== -1){
                 this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = true
@@ -1077,12 +1088,14 @@ export default {
                 this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false
                 this.findObject(this.goodsOptionFormTwo.column, "driverTel").disabled = false
                 this.findObject(this.goodsOptionFormTwo.column, "freightPay").disabled = true
+                this.findObject(this.goodsOptionFormTwo.column, "fleetRemarks").disabled = false
               }else {
                 this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = true
                 this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = true
                 this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = true
                 this.findObject(this.goodsOptionFormTwo.column, "driverTel").disabled = true
                 this.findObject(this.goodsOptionFormTwo.column, "freightPay").disabled = true
+                this.findObject(this.goodsOptionFormTwo.column, "fleetRemarks").disabled = true
               }
             }else{
               this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = true
@@ -1090,6 +1103,7 @@ export default {
               this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = true
               this.findObject(this.goodsOptionFormTwo.column, "driverTel").disabled = true
               this.findObject(this.goodsOptionFormTwo.column, "freightPay").disabled = true
+              this.findObject(this.goodsOptionFormTwo.column, "fleetRemarks").disabled = true
             }
           }
         }
@@ -1749,6 +1763,9 @@ export default {
         }, {
           label: '应付运费',
           prop: 'freightPay'
+        }, {
+          label: '备注',
+          prop: 'fleetRemarks'
         }]
       },
       entrustOptionTwoBackup: {
@@ -2088,7 +2105,6 @@ export default {
       this.findObject(this.goodsOptionFormTwo.column, "freightPay").display = false
     }
     if (this.roleName.indexOf('车队') !== -1){
-      console.log(this.goodsOptionFormTwo.column)
       this.findObject(this.goodsOptionForm.column, "freightCollect").display = false
     }
     if (this.roleName.indexOf('司机') !== -1){

src/views/landTransportation/bulkCargo/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
     <basic-container v-show="show">
-      <div class="home-container" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1 || roleName.indexOf('administrator') !== -1 || roleName.indexOf('admin') !== -1">
+      <div class="home-container"
+           v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1 || roleName.indexOf('administrator') !== -1 || roleName.indexOf('admin') !== -1">
         <div style="display: flex;justify-content: center;">
           <div class="content">
             <div class="content-item" @click="handleClick('')">
@@ -82,7 +83,9 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '4,6'?'selected':''">{{ totalData.three }}</span>
+                  <span class="card-content-num" :class="activeName === '4,6'?'selected':''">{{
+                      totalData.three
+                    }}</span>
                   <span class="card-content-text" :class="activeName === '4,6'?'selected':''">未完工</span>
                 </div>
               </div>
@@ -157,7 +160,9 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '4,6'?'selected':''">{{ totalData.three }}</span>
+                  <span class="card-content-num" :class="activeName === '4,6'?'selected':''">{{
+                      totalData.three
+                    }}</span>
                   <span class="card-content-text" :class="activeName === '4,6'?'selected':''">未完工</span>
                 </div>
               </div>
@@ -218,7 +223,9 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '4,6'?'selected':''">{{ totalData.three }}</span>
+                  <span class="card-content-num" :class="activeName === '4,6'?'selected':''">{{
+                      totalData.three
+                    }}</span>
                   <span class="card-content-text" :class="activeName === '4,6'?'selected':''">未完工</span>
                 </div>
               </div>
@@ -249,6 +256,7 @@
           :data="dataList"
           ref="crud"
           :option="option"
+          :search.sync="query"
           @on-load="onLoad"
           @row-del="rowDel"
           @search-reset="query={};activeName = ''"
@@ -257,7 +265,8 @@
           @saveColumn="saveColumn"
           @search-criteria-switch="searchCriteriaSwitch"
           @search-change="searchChange">
-        <template slot="menuLeft" slot-scope="{size}" v-if="roleName.indexOf('客户') !== -1 || roleName.indexOf('分管调度') !== -1 || roleName.indexOf('administrator') !== -1 || roleName.indexOf('admin') !== -1">
+        <template slot="menuLeft" slot-scope="{size}"
+                  v-if="roleName.indexOf('客户') !== -1 || roleName.indexOf('分管调度') !== -1 || roleName.indexOf('administrator') !== -1 || roleName.indexOf('admin') !== -1">
           <el-button type="primary" icon="el-icon-plus" :size="size" @click="rowSave">创建单据</el-button>
           <el-button type="success" :size="size" :disabled="selectionList.length !== 1" @click="copyDocument">复制单据
           </el-button>
@@ -273,11 +282,11 @@
               :label="'shortName'"
           ></crop-select>
         </template>
-<!--        <template slot="corpNameSearch" slot-scope="{ row,index}">-->
-<!--          <crop-select-->
-<!--              v-model="row.corpId"-->
-<!--          ></crop-select>-->
-<!--        </template>-->
+        <!--        <template slot="corpNameSearch" slot-scope="{ row,index}">-->
+        <!--          <crop-select-->
+        <!--              v-model="row.corpId"-->
+        <!--          ></crop-select>-->
+        <!--        </template>-->
         <template slot="addressDetail" slot-scope="{ row,index}">
           <el-tooltip class="item" effect="dark" placement="top">
             <div v-html="ToBreak(row.addressDetail)" slot="content"></div>
@@ -317,10 +326,14 @@
                 @click.stop="rowCell(row,index)">{{ row.orderNo }}</span>
         </template>
         <template slot="contractNo" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.contractNo }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{
+              row.contractNo
+            }}</span>
         </template>
         <template slot="fleetNameDetail" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.fleetNameDetail }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{
+              row.fleetNameDetail
+            }}</span>
         </template>
       </avue-crud>
     </basic-container>
@@ -344,6 +357,7 @@ import {getQueryString} from "@/util/util";
 import {businessStatisticsFrequency} from "@/api/wel";
 import {gaude, location} from "@/api/gaude";
 import {customerList, fleetList} from "@/api/basicData/customerInformation";
+import {defaultDate} from "@/util/date";
 
 export default {
   name: "index",
@@ -373,7 +387,7 @@ export default {
       key: 0,
       totalData: {},
       option: {},
-      optionList:{},
+      optionList: {},
       //客户
       optionListOne: {
         align: 'center',
@@ -393,10 +407,10 @@ export default {
         showSummary: true,
         summaryText: "合计",
         sumColumnList: [{
-            name: 'freightCollect',
-            type: 'sum',
-            decimals: 2
-          },{
+          name: 'freightCollect',
+          type: 'sum',
+          decimals: 2
+        }, {
           name: 'freightPay',
           type: 'sum',
           decimals: 2
@@ -444,7 +458,7 @@ export default {
             overHidden: true,
             index: 3,
             width: 80
-          },{
+          }, {
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
@@ -508,7 +522,7 @@ export default {
             overHidden: true,
             search: true,
             width: 90
-          },{
+          }, {
             label: '备注',
             index: 13,
             overHidden: true,
@@ -542,7 +556,7 @@ export default {
           }]
       },
       //调度
-      optionListTwo:{
+      optionListTwo: {
         align: 'center',
         stripe: true,
         index: true,
@@ -563,7 +577,7 @@ export default {
           name: 'freightCollect',
           type: 'sum',
           decimals: 2
-        },{
+        }, {
           name: 'freightPay',
           type: 'sum',
           decimals: 2
@@ -596,7 +610,7 @@ export default {
               label: "realName",
               value: "id"
             }
-          },{
+          }, {
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
@@ -629,7 +643,7 @@ export default {
             prop: 'fleetShortName',
             searchProp: 'fleetId',
             type: 'select',
-            dicData:[],
+            dicData: [],
             cascader: ['plateNo'],
             props: {
               label: "cname",
@@ -642,7 +656,7 @@ export default {
             width: 90,
             index: 8,
             prop: 'plateNo'
-          },{
+          }, {
             label: '车型',
             width: 90,
             index: 9,
@@ -666,13 +680,13 @@ export default {
             overHidden: true,
             search: true,
             width: 90
-          },{
+          }, {
             label: '应付运费',
             prop: 'freightPay',
             overHidden: true,
             width: 100,
             index: 13,
-          },{
+          }, {
             label: '备注',
             index: 14,
             overHidden: true,
@@ -705,7 +719,7 @@ export default {
             search: true,
           }]
       },
-      optionListThree:{
+      optionListThree: {
         align: 'center',
         stripe: true,
         index: true,
@@ -726,7 +740,7 @@ export default {
           name: 'freightCollect',
           type: 'sum',
           decimals: 2
-        },{
+        }, {
           name: 'freightPay',
           type: 'sum',
           decimals: 2
@@ -759,7 +773,7 @@ export default {
             overHidden: true,
             index: 2,
             width: 80
-          },{
+          }, {
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
@@ -859,7 +873,7 @@ export default {
             overHidden: true,
             width: 100,
             index: 13,
-          },{
+          }, {
             label: '备注',
             index: 14,
             overHidden: true,
@@ -867,7 +881,7 @@ export default {
             prop: 'remarks',
           }]
       },
-      optionListFour:{
+      optionListFour: {
         align: 'center',
         stripe: true,
         index: true,
@@ -888,7 +902,7 @@ export default {
           name: 'freightCollect',
           type: 'sum',
           decimals: 2
-        },{
+        }, {
           name: 'freightPay',
           type: 'sum',
           decimals: 2
@@ -921,7 +935,7 @@ export default {
             overHidden: true,
             index: 2,
             width: 80
-          },{
+          }, {
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
@@ -1040,25 +1054,28 @@ export default {
     // this.option = this.optionListOne
     // this.option = this.optionListTwo
     // this.option = this.optionListThree
-    if (this.roleName.indexOf('客户') !== -1 || this.roleName.indexOf('admin') !== -1){
+    this.query = {
+      arrivalTime: [defaultDate(4)[0] + ' 00:00:00',defaultDate(4)[1] + ' 23:59:59']
+    }
+    if (this.roleName.indexOf('客户') !== -1 || this.roleName.indexOf('admin') !== -1) {
       this.activeName = '0'
       this.optionList = this.optionListOne
-    }else if (this.roleName.indexOf('平台') !== -1){
+    } else if (this.roleName.indexOf('平台') !== -1) {
       this.activeName = '0'
       this.optionList = this.optionListTwo
-    }else if (this.roleName.indexOf('车队') !== -1){
+    } else if (this.roleName.indexOf('车队') !== -1) {
       this.activeName = '2'
       this.optionList = this.optionListThree
-    }else {
+    } else {
       this.activeName = '3'
       this.optionList = this.optionListFour
     }
     this.option = await this.getColumnData(this.getColumnName(85.7), this.optionList);
     this.key++
-    fleetList().then(res=>{
+    fleetList().then(res => {
       this.findObject(this.option.column, "fleetShortName").dicData = res.data.data
     })
-    getSalesman().then(res=>{
+    getSalesman().then(res => {
       this.findObject(this.option.column, "salesmanName").dicData = res.data.data
     })
     let i = 0;
@@ -1066,7 +1083,7 @@ export default {
       if (item.search) i++
     })
     if (this.roleName.indexOf('经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('总调度') !== -1) {
-    //   this.option.menu = false
+      //   this.option.menu = false
       this.option.header = false
     }
     if (i % 3 !== 0) {
@@ -1076,7 +1093,7 @@ export default {
     }
   },
   mounted() {
-    businessStatisticsFrequency().then(res=>{
+    businessStatisticsFrequency().then(res => {
       // let this_ = this
       // this_.entrustTimer = setInterval(function () {
       //   if (JSON.parse(localStorage.getItem("saber-token")).content) {
@@ -1106,7 +1123,7 @@ export default {
       this.infoWindow.open(this.map, e.target.getPosition());
     },
     initMap(data, plateNo) {
-      console.log(data,plateNo)
+      console.log(data, plateNo)
       this.map = new AMap.Map("container", {resizeEnable: true});
       this.infoWindow = new AMap.InfoWindow({
         ffset: new AMap.Pixel(0, -30),
@@ -1199,6 +1216,11 @@ export default {
         statusIds: this.activeName,
         ...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
@@ -1276,9 +1298,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.selected{
+.selected {
   color: #1e9fff !important;
 }
+
 .home-container {
   padding: 0px 5px 5px 5px;
   box-sizing: border-box;
@@ -1422,18 +1445,22 @@ export default {
     }
   }
 }
+
 #container {
   height: 80vh;
   width: 100%;
 }
+
 ::v-deep .el-dialog {
   margin-top: 5vh !important;
   margin-bottom: 0 !important;
 }
+
 ::v-deep .amap-info-close {
   right: 10px !important;
   top: 12px !important;
 }
+
 ::v-deep .amap-info-content {
   padding: 5px 5px 5px 5px !important;
 }