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

src/api/landTransportation/index.js

@@ -307,4 +307,20 @@ export function incidentalSubmit(data) {
         data:data
     })
 }
+//变更提交
+export function changeSubmission(data) {
+    return request({
+        url: '/api/blade-land/order/change',
+        method: 'post',
+        data:data
+    })
+}
+//变更校验
+export function validChange(data) {
+    return request({
+        url: '/api/blade-land/order/valid-change',
+        method: 'get',
+        params:data
+    })
+}
 

src/components/upload/index.vue

@@ -16,7 +16,8 @@
               icon="el-icon-edit"
               @click="addDetail"
               :disabled="disabled"
-          >上传
+              v-if="display"
+          >上传{{display}}
           </el-button>
         </template>
         <template slot="url" slot-scope="{ row }">
@@ -271,6 +272,9 @@ export default {
     disabled: {
       type: Boolean
     },
+    display: {
+      type: Boolean
+    },
     basic: {
       type: Boolean
     }

src/page/index/top/top-notice.vue

@@ -21,7 +21,7 @@
       </avue-notice>
     </el-scrollbar>
     <div slot="reference" @click="init">
-      <el-badge  :value="badge">
+      <el-badge  :value="badge>99?'99+':badge">
         <i class="el-icon-bell"></i>
       </el-badge>
     </div>

src/views/basicData/landTransportation/driverInformation/index.vue

@@ -301,14 +301,15 @@ export default {
           label: '驾驶证有效期',
           prop: 'driveExpire',
           type: "date",
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd',
+          searchRange: true,
+          search: true,
+          span: 8,
+          searchSpan: 8,
+          searchDefaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 1,
           width: 140,
-          span: 8,
-          cell: true,
-          overHidden: true,
-          search:true,
         },{
           label: '资格证证件号',
           prop: 'qualifiedNo',
@@ -322,14 +323,15 @@ export default {
           label: '资格证有效期',
           prop: 'qualifiedExpire',
           type: "date",
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd',
-          index: 1,
-          width: 140,
+          searchRange: true,
+          search: true,
           span: 8,
-          cell: true,
-          overHidden: true,
-          search:true,
+          searchSpan: 8,
+          searchDefaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          index: 1,
+          width: 140
         },{
           label: '押运证证件号',
           prop: 'escortNo',
@@ -343,14 +345,14 @@ export default {
           label: '押运证有效期',
           prop: 'escortExpire',
           type: "date",
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd',
-          index: 1,
           width: 140,
+          searchRange: true,
+          search: true,
           span: 8,
-          cell: true,
-          overHidden: true,
-          search:true,
+          searchSpan: 8,
+          searchDefaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
         }, {
           label: '信用等级',
           width: 150,
@@ -561,7 +563,23 @@ export default {
     },
     //搜索
     searchChange(params,done) {
-      this.onLoad(this.page,params)
+      let data = params
+      if (data.driveExpire){
+        data.beginDriveExpire = data.driveExpire[0]
+        data.endDriveExpire = data.driveExpire[1]
+      }
+      if (data.qualifiedExpire){
+        data.beginQualifiedExpire = data.qualifiedExpire[0]
+        data.endQualifiedExpire = data.qualifiedExpire[1]
+      }
+      if (data.escortExpire){
+        data.beginEscortExpire = data.escortExpire[0]
+        data.endEscortExpire = data.escortExpire[1]
+      }
+      delete data.driveExpire
+      delete data.qualifiedExpire
+      delete data.escortExpire
+      this.onLoad(this.page,data)
       done();
     },
     //列表删除

src/views/basicData/landTransportation/vehicleInformation/index.vue

@@ -103,7 +103,7 @@ export default {
             prop: 'excelTemplate',
             formslot: true,
             span: 24,
-          },{
+          }, {
             label: '模板上传',
             prop: 'excelFile',
             type: 'upload',
@@ -118,13 +118,13 @@ export default {
           }
         ]
       },
-      excelForm:{},
+      excelForm: {},
       option: {
         dialogWidth: '85%',
         searchIcon: true,
         searchIndex: 2,
         searchMenuSpan: 24,
-        stripe:true,
+        stripe: true,
         searchLabelWidth: 100,
         align: 'center',
         index: true,
@@ -345,7 +345,6 @@ export default {
           width: 140,
           cell: true,
           overHidden: true,
-          search: true,
           span: 8,
           searchSpan: 8,
         }, {
@@ -355,7 +354,6 @@ export default {
           width: 140,
           cell: true,
           overHidden: true,
-          search: true,
           span: 8,
           searchSpan: 8,
         }, {
@@ -365,7 +363,6 @@ export default {
           width: 140,
           cell: true,
           overHidden: true,
-          search: true,
           span: 8,
           searchSpan: 8,
         }, {
@@ -375,7 +372,6 @@ export default {
           width: 140,
           cell: true,
           overHidden: true,
-          search: true,
           span: 8,
           searchSpan: 8,
         }, {
@@ -402,20 +398,23 @@ export default {
           searchDefaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-        }, {
-          label: '信用等级',
-          width: 150,
-          span: 8,
-          prop: 'salesman',
-          search: true,
-          overHidden: true,
-          type: "select",
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=credit_rating",
-          props: {
-            label: "dictValue",
-            value: "dictKey"
-          },
         },
+
+          //   {
+          //   label: '信用等级',
+          //   width: 150,
+          //   span: 8,
+          //   searchSpan: 8,
+          //   prop: 'salesman',
+          //   search: true,
+          //   overHidden: true,
+          //   type: "select",
+          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=credit_rating",
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictKey"
+          //   },
+          // },
           {
             label: '附件',
             prop: 'fileList',
@@ -425,7 +424,7 @@ export default {
             span: 24,
             children: {
               align: 'center',
-              stripe:true,
+              stripe: true,
               headerAlign: 'center',
               rowAdd: (done) => {
                 // this.$message.success('新增回调');
@@ -474,23 +473,23 @@ export default {
             children: {
               align: 'center',
               headerAlign: 'center',
-              addBtn:false,
-              stripe:true,
-              delBtn:false,
-              cellBtn:false,
+              addBtn: false,
+              stripe: true,
+              delBtn: false,
+              cellBtn: false,
               column: [
                 {
                   label: '司机名',
                   prop: "driverName",
-                  cell:false
-                },{
+                  cell: false
+                }, {
                   label: '变更人',
                   prop: "changeUserName",
-                  cell:false
+                  cell: false
                 }, {
                   label: '变更日期',
                   prop: "changeTime",
-                  cell:false
+                  cell: false
                 }]
             }
           }
@@ -508,7 +507,7 @@ export default {
       headers: {"Blade-Auth": "Bearer " + getToken()},
       ids: [], // id集合
       form: {},
-      excelBox:false
+      excelBox: false
     }
   },
   created() {
@@ -608,7 +607,33 @@ export default {
     // 搜索
     searchChange(params, done) {
       this.page.currentPage = 1;
-      this.onLoad(this.page, params);
+      let data = params
+      if (data.purchaseDate) {
+        data.beginPurchaseDate = params.purchaseDate[0]
+        data.endPurchaseDate = params.purchaseDate[1]
+      }
+      if (data.registerDate) {
+        data.beginRegisterDate = params.registerDate[0]
+        data.endRegisterDate = params.registerDate[1]
+      }
+      if (data.scrapDate) {
+        data.beginScrapDate = params.scrapDate[0]
+        data.endScrapDate = params.scrapDate[1]
+      }
+      if (data.inspectExpired) {
+        data.beginInspectExpired = params.inspectExpired[0]
+        data.endInspectExpired = params.inspectExpired[1]
+      }
+      if (data.insuranceExpired) {
+        data.beginInsuranceExpired = params.insuranceExpired[0]
+        data.endInsuranceExpired = params.insuranceExpired[1]
+      }
+      delete data.purchaseDate
+      delete data.registerDate
+      delete data.scrapDate
+      delete data.inspectExpired
+      delete data.insuranceExpired
+      this.onLoad(this.page, data);
       done()
     },
     // 重置

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -70,12 +70,14 @@
         <template slot-scope="scope" slot="polId">
           <port-info
               v-model="goodsForm.polId"
+              type="id"
               :disabled="goodsForm.status >= 1"
           />
         </template>
         <template slot-scope="scope" slot="podId">
           <port-info
               v-model="goodsForm.podId"
+              type="id"
               :disabled="goodsForm.status >= 1"
           />
         </template>
@@ -456,6 +458,7 @@
         typeUpload="CD"
         :data="orderFilesList"
         disabled
+        :display="false"
         deleteUrl="/api/blade-client/common-file/remove"
         :enumerationValue="86.2"
     ></c-upload>
@@ -1150,7 +1153,6 @@ export default {
           }, {
             label: '预配箱量',
             prop: 'expectCtnQty',
-            type: 'date'
           }, {
             label: '起运港',
             prop: 'polId'

src/views/landTransportation/dispatchingCars/index.vue

@@ -59,6 +59,7 @@
           :option="option"
           @on-load="onLoad"
           @row-del="rowDel"
+          @search-reset="query={};activeName = ''"
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
           @search-criteria-switch="searchCriteriaSwitch"
@@ -273,6 +274,7 @@ export default {
   activated() {
     if (this.$route.query.orderId){
       this.rowCell({id:this.$route.query.orderId},0)
+      this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
     }
     // if (this.$route.query.params){
     //   this.rowCell({id:this.$route.query.params},0)
@@ -332,6 +334,7 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
         itemStatus: this.activeName,
+        status: this.activeName,
         kind: '2',
         ...params,
         ...Object.assign(params, this.query)

src/views/landTransportation/driver/index.vue

@@ -73,6 +73,7 @@
           @on-load="onLoad"
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
+          @search-reset="query={};activeName=''"
           @search-change="searchChange"
           @search-criteria-switch="searchCriteriaSwitch"
           @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
@@ -623,6 +624,7 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
         tag: '4',
+        status:this.activeName,
         ...params,
         ...Object.assign(params, this.query)
       }

src/views/landTransportation/motorcadeDriver/index.vue

@@ -88,6 +88,7 @@
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
           @search-change="searchChange"
+          @search-reset="query={};activeName = ''"
           @search-criteria-switch="searchCriteriaSwitch"
           @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
           @row-update="rowSave">

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -13,10 +13,19 @@
       <div>
         <el-button
             class="el-button--small-yh add-customer-btn"
+            type="warning"
+            size="small"
+            v-if="goodsForm.status > 0"
+            :style="{marginRight: goodsForm.status == 2?'80px':'180px'}"
+            @click="confirmChange"
+        >变更
+        </el-button>
+        <el-button
+            class="el-button--small-yh add-customer-btn"
             type="success"
-            v-if="goodsForm.status === 0"
+            v-if="goodsForm.status === 0 && typeTwo === false"
             size="small"
-            style="margin-right: 70px;"
+            style="margin-right: 80px;"
             @click="submit(true)"
         >提交
         </el-button>
@@ -25,18 +34,30 @@
             type="success"
             v-if="goodsForm.status === 1"
             size="small"
-            style="margin-right: 70px;"
+            style="margin-right: 80px;"
             @click="submit(false)"
         >取消提交
         </el-button>
-        <el-button
-            class="el-button--small-yh add-customer-btn"
-            type="primary"
-            :disabled="goodsForm.status === 1 || type"
-            size="small"
-            @click="editCustomer"
-        >保存
-        </el-button>
+        <div class="el-button&#45;&#45;small-yh add-customer-btn">
+          <el-button
+              type="primary"
+              :disabled="goodsForm.status > 1"
+              size="small"
+              :loading="type"
+              v-if="!typeTwo"
+              @click="editCustomer"
+          >保存
+          </el-button>
+          <el-button
+              type="primary"
+              :disabled="goodsForm.status === 1"
+              size="small"
+              v-else
+              :loading="type"
+              @click="changeSaving"
+          >变更保存
+          </el-button>
+        </div>
       </div>
     </div>
     <containerTitle
@@ -168,9 +189,9 @@
         <!--        <template slot="landWeightHeader" slot-scope="{column}">-->
         <!--          {{ column.label }}<span style="color:#F56C6C">*</span>-->
         <!--        </template>-->
-<!--        <template slot="landAmountDHeader" slot-scope="{column}">-->
-<!--          {{ column.label }}<span style="color:#F56C6C">*</span>-->
-<!--        </template>-->
+        <!--        <template slot="landAmountDHeader" slot-scope="{column}">-->
+        <!--          {{ column.label }}<span style="color:#F56C6C">*</span>-->
+        <!--        </template>-->
         <template slot="arrivalTimeHeader" slot-scope="{column}">
           {{ column.label }}<span style="color:#F56C6C">*</span>
         </template>
@@ -328,7 +349,7 @@
     <basic-container>
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
         <el-tab-pane label="应收" name="1"></el-tab-pane>
-<!--        <el-tab-pane label="应付" name="2"></el-tab-pane>-->
+        <!--        <el-tab-pane label="应付" name="2"></el-tab-pane>-->
       </el-tabs>
       <avue-crud
           v-if="activeIndex === '1'"
@@ -361,21 +382,21 @@
           <span v-else>{{ row.feeName }}</span>
         </template>
         <template slot-scope="{row,index}" slot="menu">
-<!--          <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              :disabled="goodsForm.status === 1"-->
-<!--              :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"-->
-<!--              @click="rowCell(row,index)"-->
-<!--          >{{ row.$cellEdit ? '保存' : '编辑' }}-->
-<!--          </el-button>-->
-<!--          <el-button type="text"-->
-<!--                     icon="el-icon-delete"-->
-<!--                     size="small"-->
-<!--                     :disabled="goodsForm.status === 1"-->
-<!--                     @click="$refs.collection.rowDel(row,index)"-->
-<!--          >删除-->
-<!--          </el-button>-->
+          <!--          <el-button-->
+          <!--              type="text"-->
+          <!--              size="small"-->
+          <!--              :disabled="goodsForm.status === 1"-->
+          <!--              :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"-->
+          <!--              @click="rowCell(row,index)"-->
+          <!--          >{{ row.$cellEdit ? '保存' : '编辑' }}-->
+          <!--          </el-button>-->
+          <!--          <el-button type="text"-->
+          <!--                     icon="el-icon-delete"-->
+          <!--                     size="small"-->
+          <!--                     :disabled="goodsForm.status === 1"-->
+          <!--                     @click="$refs.collection.rowDel(row,index)"-->
+          <!--          >删除-->
+          <!--          </el-button>-->
           <el-button
               size="small"
               type="text"
@@ -385,12 +406,12 @@
           </el-button>
         </template>
         <template slot="menuLeft">
-<!--          <el-button-->
-<!--              type="primary"-->
-<!--              icon="el-icon-plus"-->
-<!--              :disabled="goodsForm.status !== 0"-->
-<!--              @click="addRowCollection"-->
-<!--              size="small">录入明细</el-button>-->
+          <!--          <el-button-->
+          <!--              type="primary"-->
+          <!--              icon="el-icon-plus"-->
+          <!--              :disabled="goodsForm.status !== 0"-->
+          <!--              @click="addRowCollection"-->
+          <!--              size="small">录入明细</el-button>-->
         </template>
       </avue-crud>
       <avue-crud
@@ -447,7 +468,8 @@
               icon="el-icon-plus"
               :disabled="goodsForm.status === 1"
               @click="addRowPayment"
-              size="small">录入明细</el-button>
+              size="small">录入明细
+          </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -487,7 +509,7 @@ import {
   detailDelegationList,
   removeCollection,
   saveSaveList,
-  addressList, cancelSubmission, getCorp, getSalesman, getFee
+  addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange
 } from "@/api/landTransportation";
 import {getDeptTree} from "@/api/system/dept";
 import website from "@/config/website";
@@ -503,9 +525,10 @@ export default {
       activeIndex: '1',
       KeyBox: 0,
       KeyBoxTwo: 0,
+      typeTwo: false,
       type: false,
       enclosure: false,
-      orderList:[],
+      orderList: [],
       goodsForm: {},
       modelKey: 1,
       orderFilesList: [],
@@ -626,22 +649,22 @@ export default {
           defaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index:3,
+          index: 3,
           width: 140,
         }, {
           label: '车号',
           width: 150,
-          index:4,
+          index: 4,
           prop: 'plateNo'
         }, {
           label: '司机',
           width: 115,
-          index:5,
+          index: 5,
           prop: 'driverName'
         }, {
           label: '电话',
           width: 160,
-          index:6,
+          index: 6,
           prop: 'tel'
         }, {
           label: '完工日期',
@@ -1611,7 +1634,12 @@ export default {
             }
           })
         }
-        this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status === 1
+
+
+        this.goodsOptionFormC.disabled = true
+        this.goodsOptionForm.disabled = true
+        this.goodsOptionFormTwo.disabled = true
+        this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status >= 1
         delete this.goodsForm.orderAddressList
         delete this.goodsForm.itemList
         delete this.goodsForm.orderFeeList
@@ -1694,7 +1722,6 @@ export default {
         orderFeeList: this.collectionList.concat(this.paymentList)
       }).then(res => {
         this.$message.success('保存成功');
-        this.goodsForm = {}
         if (!this.goodsForm.id) {
           this.id = res.data.data
           this.refreshData()
@@ -1703,6 +1730,53 @@ export default {
         }
       })
     },
+    //确认变更
+    confirmChange() {
+      validChange().then(res => {
+        console.log(res)
+        this.goodsForm.status = 0
+        this.goodsOptionFormC.disabled = false
+        this.goodsOptionForm.disabled = false
+        this.goodsOptionFormTwo.disabled = false
+        this.typeTwo = true
+      })
+    },
+    //变更保存
+    changeSaving() {
+      this.$refs['goodsFormE'].validate((valid, doneE) => {
+        doneE()
+        if (valid) {
+          this.$refs['goodsForm'].validate((valid, done) => {
+            done();
+            if (valid) {
+              let data = JSON.parse(JSON.stringify(this.tableData))
+              data.forEach((item, index) => {
+                item.sort = index + 1
+              })
+              this.type = true
+              delete this.goodsForm.status
+              changeSubmission({
+                ...this.goodsForm,
+                kind: '1',
+                orderAddressList: data,
+                fileList: this.orderFilesList,
+                itemList: this.entrustList,
+                orderItemList: this.vehicleList,
+                orderFeeList: this.collectionList.concat(this.paymentList)
+              }).then(res => {
+                this.$message.success('保存成功');
+                this.typeTwo = false
+                this.refreshData()
+              })
+            } else {
+              return false;
+            }
+          });
+        } else {
+          return false;
+        }
+      })
+    },
     //提交委托
     submit(type) {
       if (type) {
@@ -1778,7 +1852,8 @@ export default {
           this.refreshData()
         })
       }
-    },
+    }
+    ,
     //收费新增
     addRowCollection() {
       this.$refs.collection.rowCellAdd({
@@ -1786,14 +1861,16 @@ export default {
         type: '1',
         $cellEdit: true
       });
-    },
+    }
+    ,
     //打开附件
-    annexOpen(row, index){
+    annexOpen(row, index) {
       this.enclosure = true
-      getFee({id:row.id}).then(res=>{
+      getFee({id: row.id}).then(res => {
         this.orderList = res.data.data
       })
-    },
+    }
+    ,
     //付费新增
     addRowPayment() {
       this.$refs.payment.rowCellAdd({
@@ -1801,15 +1878,18 @@ export default {
         type: '2',
         $cellEdit: true
       });
-    },
+    }
+    ,
     //选择费用
     selectValue(value, row) {
       this.$set(row, 'feeName', value.cname)
-    },
+    }
+    ,
     //选择客户信息触发
     getfleetId(data, row) {
       this.$set(row, 'corpName', data.cname)
-    },
+    }
+    ,
     //收款信息移除
     makeDel(row, index) {
       this.$confirm('此操作将永久删除该单据, 是否继续?', '提示', {
@@ -1825,7 +1905,8 @@ export default {
           message: '已取消删除'
         });
       });
-    },
+    }
+    ,
     //付款信息移除
     feeDel(row, index) {
       this.$confirm('此操作将永久删除该单据, 是否继续?', '提示', {
@@ -1841,24 +1922,26 @@ export default {
           message: '已取消删除'
         });
       });
-    },
+    }
+    ,
     //选择公司名称带出所属公司
     getCorpData(row) {
       this.goodsForm.belongCompany = row.belongCompany
       this.goodsForm.salesman = ''
       //查询业务员
       this.salesmanQuery()
-    },
+    }
+    ,
     //选择地址客户带出地址
     withAddress(row, scope) {
-      this.$set(this.tableData[scope.$index],'contacts',row.attn)
-      this.$set(this.tableData[scope.$index],'tel',row.tel)
-      this.$set(this.tableData[scope.$index],'address',row.storageAddr)
+      this.$set(this.tableData[scope.$index], 'contacts', row.attn)
+      this.$set(this.tableData[scope.$index], 'tel', row.tel)
+      this.$set(this.tableData[scope.$index], 'address', row.storageAddr)
       // this.tableData[scope.$index].contacts = row.attn
       // this.tableData[scope.$index].tel = row.tel
       // this.tableData[scope.$index].address = row.storageAddr
       if (!scope.row.key) scope.row.key = 0
-      this.$set(this.tableData[scope.$index],'corpName',row.cname)
+      this.$set(this.tableData[scope.$index], 'corpName', row.cname)
       // this.tableData[scope.$index].corpName = row.cname
       if (row.belongtoarea) {
         addressList(row.belongtoarea.split(',')[0]).then(res => {
@@ -1866,7 +1949,8 @@ export default {
           scope.row.key++
         })
       }
-    },
+    }
+    ,
     //自定义表头
     renderHeader(h) {
       return (
@@ -1877,7 +1961,8 @@ export default {
             </el-tooltip>
           </div>
       )
-    },
+    }
+    ,
     //自定义表头
     customTitle(h, {column, $index}) {
       let text = column.label

src/views/landTransportation/placeAnOrder/index.vue

@@ -115,6 +115,7 @@
           :option="option"
           @on-load="onLoad"
           @row-del="rowDel"
+          @search-reset="query={};activeName = ''"
           @selection-change="selectionChange"
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
@@ -405,6 +406,7 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
         itemStatus: this.activeName,
+        status: this.activeName,
         kind: '1',
         ...Object.assign(params, this.query)
       }

src/views/landTransportation/reportAnalysis/index.vue

@@ -14,6 +14,9 @@
           @search-criteria-switch="searchCriteriaSwitch"
           @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
           @row-update="rowSave">
+        <template slot="menuLeft">
+          <el-button type="info" size="small" @click="outExport" icon="el-icon-download">导出</el-button>
+        </template>
         <template slot-scope="{row}" slot="fleetId">
           <span>{{ row.fleetName }}</span>
         </template>
@@ -136,6 +139,7 @@ import {
   incidentalConfirm,
   cancelConfirm, standingBookCollection
 } from "@/api/landTransportation";
+import {getToken} from "@/util/auth";
 
 export default {
   name: "index",
@@ -346,9 +350,8 @@ export default {
             width: 140,
             search: true,
           }, {
-            label: '尺寸箱型',
+            label: '箱型箱量',
             width: 100,
-            search: true,
             index: 8,
             overHidden: true,
             prop: 'ctnDetail'
@@ -428,6 +431,23 @@ export default {
     }
   },
   methods: {
+    //导出
+    outExport() {
+      this.$confirm('是否导出数据明细？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        window.open(
+            `/api/blade-land/order/acct-export?${this.website.tokenHeader}=${getToken()}`
+        );
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消' //
+        });
+      })
+    },
     //自定义列保存
     async saveColumnCollection() {
       /**
@@ -512,9 +532,9 @@ export default {
     // 获得高度
     searchCriteriaSwitch(type) {
       if (type) {
-        this.goodsOptionCrud.height = this.goodsOptionCrud.height - 184
+        this.goodsOptionCrud.height = this.goodsOptionCrud.height - 90
       } else {
-        this.goodsOptionCrud.height = this.goodsOptionCrud.height + 184
+        this.goodsOptionCrud.height = this.goodsOptionCrud.height + 90
       }
       this.$refs.crud.getTableHeight()
     },

src/views/statisticAnalysis/dataDetail/index.vue

@@ -283,7 +283,7 @@ export default {
           endCreateTime: '',
         }
       }
-      // return console.log(this.search)
+      return console.log(this.search)
       this.$confirm('是否导出数据明细？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/wel/home/landTransportation/components/sales-reached.vue

@@ -3,7 +3,7 @@
     <el-card class="home-container__card">
       <div class="title">
         <span>
-          今日业务量
+          今日业务总量
         </span>
         <span>
           <i
@@ -14,7 +14,7 @@
         </span>
       </div>
       <div class="content" v-loading="loading">
-        <div style="width: 100%;height: 350px;display: flex;justify-content: space-around;flex-wrap: wrap">
+        <div style="width: 100%;height: 300px;display: flex;justify-content: space-around;flex-wrap: wrap">
           <div id="totalContainer" style="width: 26%;height: 210px;"></div>
           <div id="totalBulkCargo" style="width: 26%;height: 210px;"></div>
           <div id="specialTotal" style="width: 26%;height: 210px;"></div>
@@ -86,15 +86,15 @@ export default {
     getSysType() {
       this.loading = true
       bizCount({mold:1}).then(res=>{
-        this.rankingTwo('totalContainer', '集装箱总量:'+res.data.data.flow.all, res.data.data.flow.list)
+        this.rankingTwo('totalContainer', '集装箱:'+res.data.data.flow.all, res.data.data.flow.list)
         // this.rankingTwo('totalContainerTwo', '集装箱总量:'+res.data.data.dept.all, res.data.data.dept.list)
       })
       bizCount({mold:2}).then(res=>{
-        this.rankingTwo('totalBulkCargo', '散货总量:'+res.data.data.flow.all,  res.data.data.flow.list)
+        this.rankingTwo('totalBulkCargo', '散货:'+res.data.data.flow.all,  res.data.data.flow.list)
         // this.rankingTwo('totalBulkCargoTwo', '散货总量:'+res.data.data.dept.all, res.data.data.dept.list)
       })
       bizCount({mold:3}).then(res=>{
-        this.rankingTwo('specialTotal', '特种车辆总量:'+res.data.data.flow.all,res.data.data.flow.list)
+        this.rankingTwo('specialTotal', '特种车辆:'+res.data.data.flow.all,res.data.data.flow.list)
         // this.rankingTwo('specialTotalTwo', '特种车辆总量:'+res.data.data.dept.all,res.data.data.dept.list)
       })
       this.loading = false

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -25,12 +25,14 @@
             <el-table-column
               align="center"
               label="货运日期"
+              width="150"
               show-overflow-tooltip
               prop="arrivalTime"
             ></el-table-column>
             <el-table-column
               align="center"
               label="业务员"
+              width="60"
               show-overflow-tooltip
               prop="salesmanName"
             ></el-table-column>
@@ -48,22 +50,19 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="提单号"
-              show-overflow-tooltip
-              prop="billNo">
-              <template slot-scope="{row}">
-                <span class="el-button--text" style="cursor: pointer"
-                      @click="openTrack(row,0)">{{ row.billNo }}</span>
-              </template>
+              label="票据号"
+              prop="receiptNo"
+            >
             </el-table-column>
             <el-table-column
               align="center"
-              label="车号"
+              label="提单号"
+              width="130"
               show-overflow-tooltip
               prop="billNo">
               <template slot-scope="{row}">
                 <span class="el-button--text" style="cursor: pointer"
-                      @click="openTrack(row,1)">{{ row.plateNo }}</span>
+                      @click="openTrack(row,0)">{{ row.billNo }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -76,9 +75,27 @@
               align="center"
               label="箱型箱量"
               show-overflow-tooltip
-              prop="ctnType"
+              prop="ctnDetail"
             ></el-table-column>
             <el-table-column
+                align="center"
+                label="车队"
+                width="190"
+                show-overflow-tooltip
+                prop="fleetName"
+            ></el-table-column>
+            <el-table-column
+                align="center"
+                label="车号"
+                width="100"
+                show-overflow-tooltip
+                prop="billNo">
+              <template slot-scope="{row}">
+                <span class="el-button--text" style="cursor: pointer"
+                      @click="openTrack(row,1)">{{ row.plateNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
               align="center"
               label="运费"
               show-overflow-tooltip
@@ -87,10 +104,24 @@
             <el-table-column
               align="center"
               label="其他费用(总)"
+              width="100"
               show-overflow-tooltip
               prop="allFeeD"
             ></el-table-column>
             <el-table-column
+              align="center"
+              label="应付杂费"
+              v-if="roleName.indexOf('平台') !== -1"
+              show-overflow-tooltip
+              prop="extraAmountC"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="应收杂费"
+              show-overflow-tooltip
+              prop="extraAmountD"
+            ></el-table-column>
+            <el-table-column
                 width="100"
                 label="状态"
                 show-overflow-tooltip
@@ -107,7 +138,15 @@
             </el-table-column>
             <el-table-column
                 align="center"
+                label="客户名称"
+                width="190"
+                show-overflow-tooltip
+                prop="corpName"
+            ></el-table-column>
+            <el-table-column
+                align="center"
                 label="备注"
+                width="190"
                 show-overflow-tooltip
                 prop="remarks"
             ></el-table-column>
@@ -177,6 +216,7 @@ export default {
   },
   data() {
     return {
+      roleName: localStorage.getItem("roleName").split(','),
       dialogVisible: false,
       loading: false,
       tableData: [],

src/views/wel/home/landTransportation/landTransportation.vue

@@ -58,7 +58,7 @@ export default {
   width: 100%;
   height: 95.5vh;
   grid-template-columns: repeat(auto-fill, 10%);
-  grid-template-rows: 140px 300px 480px;
+  grid-template-rows: 140px 260px 480px;
   grid-template-areas:
     "a a a a a a a a a a"
     "b b b b b b b b b b"