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

src/api/basicData/customerInformation.js

@@ -9,6 +9,14 @@ export function customerList(data) {
     params: data
   })
 }
+//车队资料查询
+export function fleetList(data) {
+  return request({
+    url: '/api/blade-client/corpsdesc/fleetList',
+    method: 'get',
+    params: data
+  })
+}
 //客户资料列表查询
 export function allCropList(data) {
   return request({

src/enums/column-name.js

@@ -552,6 +552,10 @@ const columnName = [{
   name: '首页-今日业务'
 },
 {
+  code: 140.1,
+  name: '首页-今日业务-散货'
+},
+{
   code: 141,
   name: '客户分类-列表'
 },

src/views/basicData/customerManagement/companyMaterial/configuration/bankOfDeposit.json

@@ -79,6 +79,18 @@
           "trigger": "blur"
         }
       ]
+    },{
+      "label": "科目编码",
+      "prop": "subjectNumber",
+      "index": 5,
+      "width":100,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入科目编码",
+          "trigger": "blur"
+        }
+      ]
     }
   ]
 }

src/views/businessManagement/purchaseOrder/index.vue

@@ -326,16 +326,25 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let queryParams = this.search
+        let queryParams = JSON.parse(JSON.stringify(this.search))
+        console.log(this.search)
         if (queryParams.requiredArrivalDate) {
           this.$set(queryParams, 'requiredArrivalStartDate', queryParams.requiredArrivalDate[0] + " " + "00:00:00")
           this.$set(queryParams, 'requiredArrivalEndDate', queryParams.requiredArrivalDate[1] + " " + "23:59:59")
-          this.$delete(queryParams, 'requiredArrivalDate')
+          delete queryParams.requiredArrivalDate
+        }else {
+          delete queryParams.requiredArrivalDate
+          delete queryParams.requiredArrivalStartDate
+          delete queryParams.requiredArrivalEndDate
         }
-        if (queryParams.createTime) {
+        if (queryParams.createTime.length>1) {
           queryParams.createStartTime = queryParams.createTime[0] + " " + "00:00:00"
           queryParams.createEndTime = queryParams.createTime[1] + " " + "23:59:59"
-          this.$delete(queryParams, 'createTime')
+          delete queryParams.createTime
+        }else {
+          delete queryParams.createTime
+          delete queryParams.createStartTime
+          delete queryParams.createEndTime
         }
         const routeData = this.$router.resolve({
           path: '/api/trade-purchase/purchase-order/selOrderExport',      //跳转目标窗口的地址
@@ -343,7 +352,7 @@ export default {
             ...queryParams    //括号内是要传递给新窗口的参数
           }
         })
-        window.open(routeData.href.slice(1,routeData.href.length-1)+'&'+`${this.website.tokenHeader}=${getToken()}`);
+        window.open(routeData.href.slice(1,routeData.href.length)+'&'+`${this.website.tokenHeader}=${getToken()}`);
       }).catch(() => {
         this.$message({
           type: 'info',

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -284,6 +284,17 @@
                   trigger: 'blur'
                 }
               ]
+            },{
+              label: '科目编码',
+              prop: 'subjectNumber',
+              span: 8,
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
             },
             {
               label: '往来单位',
@@ -509,6 +520,7 @@
           if(item.accountNo == value){
             this.$set(this.form,"accountBank",item.accountBank)
             this.$set(this.form,"accountName",item.accountName)
+            this.$set(this.form,"subjectNumber",item.subjectNumber)
             isTrue = true
           }
         })
@@ -516,6 +528,7 @@
           if (!isTrue) {
             this.$set(this.form, 'accountBank', null)
             this.$set(this.form, 'accountName', null)
+            this.$set(this.form,"subjectNumber",null)
           }
         })
       },

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -306,6 +306,17 @@
                   trigger: 'blur'
                 }
               ]
+            }, {
+              label: '科目编码',
+              prop: 'subjectNumber',
+              span: 8,
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
             },
             {
               label: '往来单位',
@@ -528,6 +539,7 @@
           if(item.accountNo == value){
             this.$set(this.form,"accountBank",item.accountBank)
             this.$set(this.form,"accountName",item.accountName)
+            this.$set(this.form,"subjectNumber",item.subjectNumber)
             isTrue = true
           }
         })
@@ -535,6 +547,7 @@
           if (!isTrue) {
             this.$set(this.form, 'accountBank', null)
             this.$set(this.form, 'accountName', null)
+            this.$set(this.form,"subjectNumber",null)
           }
         })
       },
@@ -841,6 +854,7 @@
               this.form.accountNo = this.form.bankList[0].accountNo
               this.form.accountName = this.form.bankList[0].accountName
               this.form.accountBank = this.form.bankList[0].accountBank
+              this.form.subjectNumber = this.form.bankList[0].subjectNumber
             }
           })
         }

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -40,15 +40,16 @@
           <el-button
               type="warning"
               size="small"
-              v-if="goodsForm.status > 0"
+              v-if="goodsForm.status > 0 && !(roleName.indexOf('总调度') !== -1)"
               :disabled="
-            !(roleName.indexOf('平台') !== -1||roleName.indexOf('经理') !== -1||roleName.indexOf('部门经理') !== -1||roleName.indexOf('总经理') !== -1) && !(roleName.indexOf('admin') !== -1)"
+            !(roleName.indexOf('分管调度') !== -1||roleName.indexOf('经理') !== -1||roleName.indexOf('部门经理') !== -1||roleName.indexOf('总经理') !== -1) && !(roleName.indexOf('admin') !== -1)"
               @click="confirmChange"
           >变更
           </el-button>
           <el-button
               type="success"
               v-if="goodsForm.status === 0 && typeTwo === false"
+              v-show="roleName.indexOf('业务员') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)"
               size="small"
               :loading="type"
               @click="submit(true)"
@@ -56,11 +57,11 @@
           </el-button>
           <el-button
               type="success"
-              v-if="goodsForm.status > 0 && goodsForm.status !== 5 && roleName.indexOf('客户') === -1"
+              v-if="goodsForm.status > 0 && goodsForm.status !== 5"
               size="small"
               :loading="type"
               v-show="
-              (roleName.indexOf('平台') !== -1 && goodsForm.status === 1)
+              (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1 && goodsForm.status === 1||goodsForm.status === 2)
               || (roleName.indexOf('车队') !== -1 && goodsForm.status === 2)
               || (roleName.indexOf('司机') !== -1 && goodsForm.status === 3)
               || (roleName.indexOf('司机') !== -1 && goodsForm.status === 4)
@@ -73,7 +74,7 @@
           </el-button>
           <el-button
               type="warning"
-              v-if="goodsForm.status === 2 && roleName.indexOf('平台') !== -1 "
+              v-if="goodsForm.status === 2 && roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1 "
               size="small"
               @click="cancelScheduling(false)"
           >取消调度
@@ -87,7 +88,7 @@
           </el-button>
           <el-button
               type="success"
-              v-if="goodsForm.status === 1 && roleName.indexOf('客户') !== -1"
+              v-if="goodsForm.status === 1 && roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1"
               size="small"
               @click="submit(false)"
           >取消提交
@@ -96,6 +97,7 @@
           <el-button
               type="primary"
               :disabled="goodsForm.status === 5"
+              v-show="(roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)||roleName.indexOf('分管调度') !== -1||roleName.indexOf('administrator') !== -1||roleName.indexOf('admin') !== -1"
               size="small"
               :loading="type"
               v-if="!typeTwo"
@@ -114,14 +116,10 @@
         </div>
       </div>
     </div>
-    <containerTitle
-        title="业务类型"
-        style="margin-top: 50px"></containerTitle>
-    <basic-container>
+    <trade-card title="业务类型" style="margin-top: 50px">
       <avue-form v-model="goodsForm" :option="goodsOptionFormC" ref="goodsFormE"></avue-form>
-    </basic-container>
-    <containerTitle title="委托信息"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="委托信息">
       <avue-form :option="goodsOptionForm" ref="goodsForm" v-model="goodsForm">
         <template slot-scope="scope" slot="corpId">
           <crop-select
@@ -138,7 +136,7 @@
           />
         </template>
         <template slot-scope="scope" slot="salesman">
-          <el-select v-model="goodsForm.salesman" placeholder="请选择" :disabled="goodsForm.status !== 0"
+          <el-select v-model="goodsForm.salesman" filterable clearable placeholder="请选择" :disabled="goodsForm.status !== 0"
                      @change="changeSelect">
             <el-option
                 v-for="item in salesmanList"
@@ -165,7 +163,7 @@
               :disabled="goodsForm.status !== 0"/>
         </template>
       </avue-form>
-    </basic-container>
+    </trade-card>
     <containerTitle v-if="false" title="箱信息"></containerTitle>
     <basic-container v-if="goodsForm.status === 0 || !goodsForm.status" v-show="false">
       <avue-crud :data="entrustList"
@@ -360,8 +358,7 @@
       </el-table>
     </basic-container>
     </span>
-    <containerTitle title="装货地址"></containerTitle>
-    <basic-container>
+    <trade-card title="装货地址">
       <el-table
           ref="singleTable"
           border="1"
@@ -570,9 +567,8 @@
           </template>
         </el-table-column>
       </el-table>
-    </basic-container>
-    <containerTitle title="卸货地址"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="卸货地址">
       <el-table
           border="1"
           ref="singleTable"
@@ -806,11 +802,10 @@
           </template>
         </el-table-column>
       </el-table>
-    </basic-container>
-    <containerTitle title="车辆信息"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="车辆信息">
       <avue-form :option="goodsOptionFormTwo" v-model="goodsForm"></avue-form>
-    </basic-container>
+    </trade-card>
     <span v-if="false">
       <containerTitle title="车辆信息"></containerTitle>
       <basic-container>
@@ -828,9 +823,7 @@
       </avue-crud>
     </basic-container>
     </span>
-    <containerTitle title="杂费明细"
-                    v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1"></containerTitle>
-    <basic-container v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1">
+    <trade-card title="杂费明细" v-if="roleName.indexOf('平台') !== -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"></el-tab-pane>
@@ -969,7 +962,7 @@
           </el-button>
         </template>
       </avue-crud>
-    </basic-container>
+    </trade-card>
     <containerTitle title="上传附件"></containerTitle>
     <c-upload
         typeUpload="CD"
@@ -1584,7 +1577,7 @@ export default {
           prop: 'dispatchNumber',
           span: 6,
           rules: [{
-            required: true,
+            required: false,
             message: " ",
             trigger: "blur"
           }],
@@ -1688,7 +1681,7 @@ export default {
           label: '车队',
           prop: 'fleetId',
           type: 'select',
-          dicData:[],
+          dicUrl: "/api/blade-client/corpsdesc/fleetList",
           cascader: ['plateNo'],
           props: {
             label: "cname",
@@ -2069,11 +2062,6 @@ export default {
       this.findObject(this.goodsOptionFormTwo.column, "freightPay").display = false
       this.findObject(this.goodsOptionForm.column, "freightCollect").display = false
     }
-    customerList({
-      size:500,current:1,corpType:'CD'
-    }).then(res=>{
-      this.findObject(this.goodsOptionFormTwo.column, "fleetId").dicData = res.data.data.records
-    })
     allCropList({
       corpType: 'GC'
     }).then(res => {
@@ -2190,6 +2178,9 @@ export default {
       } else {
         detailDelegationList({id: this.id, kind: '1'}).then(res => {
           this.goodsForm = res.data.data
+          if (this.roleName.indexOf('经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('总调度') !== -1) {
+            this.goodsForm.status = 5
+          }
           this.tableData = res.data.data.loadingAddressList || []
           this.tableDataTwo = res.data.data.unloadedAddressList || []
           this.entrustList = res.data.data.itemList

src/views/landTransportation/bulkCargo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <basic-container v-show="show">
-      <div class="home-container">
+      <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('')">
@@ -104,6 +104,142 @@
           </div>
         </div>
       </div>
+      <div class="home-container" v-if="roleName.indexOf('车队') !== -1">
+        <div style="display: flex;justify-content: center;">
+          <div class="content">
+            <div class="content-item" @click="handleClick('')">
+              <div class="card">
+                <div class="card-title card-title1">
+                <span>
+                  全
+                </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num" :class="!activeName?'selected':''">{{ totalData.all }}</span>
+                  <span class="card-content-text" :class="!activeName?'selected':''">全部</span>
+                </div>
+              </div>
+            </div>
+            <div class="divider"/>
+            <div class="content-item" @click="handleClick('2')">
+              <div class="card">
+                <div class="card-title card-title3">
+                <span>
+                  派
+                </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num" :class="activeName === '2'?'selected':''">{{ totalData.one }}</span>
+                  <span class="card-content-text" :class="activeName === '2'?'selected':''">未派车</span>
+                </div>
+              </div>
+            </div>
+            <div class="divider"/>
+            <div class="content-item" @click="handleClick('3')">
+              <div class="card">
+                <div class="card-title card-title4">
+                <span>
+                  受
+                </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num" :class="activeName === '3'?'selected':''">{{ totalData.two }}</span>
+                  <span class="card-content-text" :class="activeName === '3'?'selected':''">未受理</span>
+                </div>
+              </div>
+            </div>
+            <div class="divider"/>
+            <div class="content-item" @click="handleClick('4,6')">
+              <div class="card">
+                <div class="card-title card-title5">
+                <span>
+                  完
+                </span>
+                </div>
+                <div class="card-content">
+                  <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>
+            </div>
+            <div class="divider"/>
+            <div class="content-item" @click="handleClick('5')">
+              <div class="card">
+                <div class="card-title card-title6">
+                    <span>
+                      工
+                    </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num" :class="activeName === '5'?'selected':''">{{ totalData.four }}</span>
+                  <span class="card-content-text" :class="activeName === '5'?'selected':''">已关闭</span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="home-container" v-if="roleName.indexOf('司机') !== -1">
+        <div style="display: flex;justify-content: center;">
+          <div class="content">
+            <div class="content-item" @click="handleClick('')">
+              <div class="card">
+                <div class="card-title card-title1">
+                <span>
+                  全
+                </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num" :class="!activeName?'selected':''">{{ totalData.all }}</span>
+                  <span class="card-content-text" :class="!activeName?'selected':''">全部</span>
+                </div>
+              </div>
+            </div>
+            <div class="divider"/>
+            <div class="content-item" @click="handleClick('3')">
+              <div class="card">
+                <div class="card-title card-title4">
+                <span>
+                  受
+                </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num" :class="activeName === '3'?'selected':''">{{ totalData.two }}</span>
+                  <span class="card-content-text" :class="activeName === '3'?'selected':''">未受理</span>
+                </div>
+              </div>
+            </div>
+            <div class="divider"/>
+            <div class="content-item" @click="handleClick('4,6')">
+              <div class="card">
+                <div class="card-title card-title5">
+                <span>
+                  完
+                </span>
+                </div>
+                <div class="card-content">
+                  <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>
+            </div>
+            <div class="divider"/>
+            <div class="content-item" @click="handleClick('5')">
+              <div class="card">
+                <div class="card-title card-title6">
+                    <span>
+                      工
+                    </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num" :class="activeName === '5'?'selected':''">{{ totalData.four }}</span>
+                  <span class="card-content-text" :class="activeName === '5'?'selected':''">已关闭</span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
     </basic-container>
     <basic-container v-show="show">
       <avue-crud
@@ -121,7 +257,7 @@
           @saveColumn="saveColumn"
           @search-criteria-switch="searchCriteriaSwitch"
           @search-change="searchChange">
-        <template slot="menuLeft" slot-scope="{size}">
+        <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>
@@ -155,14 +291,15 @@
           </el-tooltip>
         </template>
         <template slot-scope="{row,index}" slot="menu">
-          <!--          <el-button type="text"-->
-          <!--                     icon="el-icon-edit"-->
-          <!--                     size="small"-->
-          <!--                     @click.stop="rowCell(row,index)">编辑-->
-          <!--          </el-button>-->
+          <el-button type="text"
+                     icon="el-icon-edit"
+                     size="small"
+                     @click.stop="rowCell(row,index)">查看
+          </el-button>
           <el-button type="text"
                      icon="el-icon-delete"
                      size="small"
+                     :disabled="roleName.indexOf('经理') !== -1 || roleName.indexOf('部门经理') !== -1 || roleName.indexOf('总经理') !== -1 || roleName.indexOf('总调度') !== -1"
                      v-if="row.status < 1"
                      @click.stop="$refs.crud.rowDel(row,index)">删除
           </el-button>
@@ -206,7 +343,7 @@ import {getSalesman, removeDelegationList, selectInvoiceList, totalList} from "@
 import {getQueryString} from "@/util/util";
 import {businessStatisticsFrequency} from "@/api/wel";
 import {gaude, location} from "@/api/gaude";
-import {customerList} from "@/api/basicData/customerInformation";
+import {customerList, fleetList} from "@/api/basicData/customerInformation";
 
 export default {
   name: "index",
@@ -243,7 +380,7 @@ export default {
         stripe: true,
         index: true,
         menu: true,
-        menuWidth: 80,
+        menuWidth: 120,
         addBtn: false,
         editBtn: false,
         delBtn: false,
@@ -340,7 +477,6 @@ export default {
             searchProp: 'fleetId',
             type: 'select',
             cascader: ['plateNo'],
-            dicUrl: "/api/blade-client/corpsdesc/list?size=500&current=1&corpType=CD",
             props: {
               label: "cname",
               value: "id",
@@ -402,13 +538,6 @@ export default {
             index: 15,
             width: 135,
             search: true,
-          },{
-            label: '订单号',
-            prop: 'orderNo',
-            index: 16,
-            overHidden: true,
-            width: 100,
-            search: true,
           }]
       },
       //调度
@@ -417,7 +546,7 @@ export default {
         stripe: true,
         index: true,
         menu: true,
-        menuWidth: 80,
+        menuWidth: 120,
         addBtn: false,
         editBtn: false,
         delBtn: false,
@@ -500,7 +629,6 @@ export default {
             type: 'select',
             dicData:[],
             cascader: ['plateNo'],
-            dicUrl: "/api/blade-client/corpsdesc/list?size=500&current=1&corpType=CD",
             props: {
               label: "cname",
               value: "id",
@@ -509,30 +637,29 @@ export default {
             filterable: true,
             search: true,
           }, {
-            label: '车体积',
+            label: '车号',
             width: 100,
             index: 8,
+            prop: 'plateNo'
+          },{
+            label: '车体积',
+            width: 100,
+            index: 9,
             prop: 'fleetVolum'
           },{
             label: '货物体积',
             width: 100,
-            index: 9,
+            index: 10,
             prop: 'volumeSum'
           }, {
-            label: '运费',
-            index: 10,
+            label: '应收运费',
+            index: 11,
             width: 86,
             prop: 'freightCollect'
-          },{
-            label: '应付运费',
-            prop: 'freightPay',
-            overHidden: true,
-            width: 100,
-            index: 13,
           }, {
             label: '状态',
             prop: 'status',
-            index: 11,
+            index: 12,
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status_two",
             props: {
               label: "dictValue",
@@ -543,18 +670,24 @@ export default {
             overHidden: true,
             search: true,
             width: 140
+          },{
+            label: '应付运费',
+            prop: 'freightPay',
+            overHidden: true,
+            width: 100,
+            index: 13,
           }, {
             label: '公司名称',
             prop: 'corpName',
             overHidden: true,
-            index: 12,
+            index: 14,
             width: 112,
             search: true,
           }, {
             label: '制单人',
             prop: 'createUserName',
             overHidden: true,
-            index: 13,
+            index: 15,
             width: 80,
           }, {
             label: '制单日期',
@@ -565,16 +698,9 @@ export default {
             defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index: 14,
+            index: 16,
             width: 135,
             search: true,
-          },{
-            label: '订单号',
-            prop: 'orderNo',
-            index: 15,
-            overHidden: true,
-            width: 100,
-            search: true,
           }]
       },
       optionListThree:{
@@ -582,7 +708,7 @@ export default {
         stripe: true,
         index: true,
         menu: true,
-        menuWidth: 80,
+        menuWidth: 120,
         addBtn: false,
         editBtn: false,
         delBtn: false,
@@ -664,7 +790,6 @@ export default {
             searchProp: 'fleetId',
             type: 'select',
             cascader: ['plateNo'],
-            dicUrl: "/api/blade-client/corpsdesc/list?size=500&current=1&corpType=CD",
             props: {
               label: "cname",
               value: "id",
@@ -743,14 +868,6 @@ export default {
             overHidden: true,
             width: 140,
             prop: 'remarks',
-          },
-          {
-            label: '订单号',
-            prop: 'orderNo',
-            index: 15,
-            overHidden: true,
-            width: 100,
-            search: true,
           }]
       },
       optionListFour:{
@@ -758,7 +875,7 @@ export default {
         stripe: true,
         index: true,
         menu: true,
-        menuWidth: 80,
+        menuWidth: 120,
         addBtn: false,
         editBtn: false,
         delBtn: false,
@@ -913,14 +1030,6 @@ export default {
             overHidden: true,
             width: 140,
             prop: 'remarks',
-          },
-          {
-            label: '订单号',
-            prop: 'orderNo',
-            index: 15,
-            overHidden: true,
-            width: 100,
-            search: true,
           }]
       },
       home: false,
@@ -951,11 +1060,8 @@ export default {
     }
     this.option = await this.getColumnData(this.getColumnName(85.7), this.optionList);
     this.key++
-
-    customerList({
-      size:500,current:1,corpType:'CD'
-    }).then(res=>{
-      this.findObject(this.option.column, "fleetName").dicData = res.data.data.records
+    fleetList().then(res=>{
+      this.findObject(this.option.column, "fleetName").dicData = res.data.data
     })
     getSalesman().then(res=>{
       this.findObject(this.option.column, "salesmanName").dicData = res.data.data
@@ -965,7 +1071,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) {
@@ -1160,7 +1266,7 @@ export default {
       if (type) {
         this.home = false
         this.$router.push({
-          path: '/landTransportation/placeAnOrder/index'
+          path: '/landTransportation/bulkCargo/index'
         });
       }
       this.id = ''

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -85,14 +85,10 @@
         </div>
       </div>
     </div>
-    <containerTitle
-        title="业务类型"
-        style="margin-top: 50px"></containerTitle>
-    <basic-container>
+    <trade-card title="业务类型" style="margin-top: 50px">
       <avue-form v-model="goodsForm" :option="goodsOptionFormC" ref="goodsFormE"></avue-form>
-    </basic-container>
-    <containerTitle title="委托信息"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="委托信息">
       <avue-form :option="goodsOptionForm" ref="goodsForm" v-model="goodsForm">
         <template slot-scope="scope" slot="corpId">
           <crop-select
@@ -138,9 +134,8 @@
           />
         </template>
       </avue-form>
-    </basic-container>
-    <containerTitle title="其他信息"></containerTitle>
-    <basic-container :showBtn="true" ref="other">
+    </trade-card>
+    <trade-card title="其他信息" ref="other">
       <avue-form :option="goodsOptionFormTwo" v-model="goodsForm">
         <template slot-scope="scope" slot="corpId">
           <crop-select
@@ -187,9 +182,8 @@
           />
         </template>
       </avue-form>
-    </basic-container>
-    <containerTitle title="箱信息"></containerTitle>
-    <basic-container v-if="goodsForm.status === 0 || !goodsForm.status">
+    </trade-card>
+    <trade-card title="箱信息" v-if="goodsForm.status === 0 || !goodsForm.status">
       <avue-crud :data="entrustList"
                  :option="entrustOptionTwo"
                  @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
@@ -221,8 +215,8 @@
           {{ column.label }}<span style="color:#F56C6C">*</span>
         </template>
       </avue-crud>
-    </basic-container>
-    <basic-container v-if="goodsForm.status !== 0 && goodsForm.status">
+    </trade-card>
+    <trade-card title="箱信息" v-if="goodsForm.status !== 0 && goodsForm.status">
       <avue-crud
           :data="entrustList"
           :option="entrustOptionTwoT"
@@ -242,9 +236,8 @@
           <span v-else>{{ row.fleetName }}</span>
         </template>
       </avue-crud>
-    </basic-container>
-    <containerTitle title="起止地信息"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="起止地信息">
       <el-table
           ref="singleTable"
           :data="tableData"
@@ -377,9 +370,8 @@
           </template>
         </el-table-column>
       </el-table>
-    </basic-container>
-    <containerTitle title="车辆信息"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="车辆信息">
       <avue-crud
           :data="vehicleList"
           ref="crudContact"
@@ -392,9 +384,8 @@
                       @click="openTrack(row)">{{ row.plateNo }}</span>
         </template>
       </avue-crud>
-    </basic-container>
-    <containerTitle title="杂费明细"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="杂费明细">
       <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>-->
@@ -520,7 +511,7 @@
           </el-button>
         </template>
       </avue-crud>
-    </basic-container>
+    </trade-card>
     <containerTitle title="上传附件"></containerTitle>
     <c-upload
         typeUpload="CD"

src/views/landTransportation/reportAnalysis/index.vue

@@ -748,7 +748,7 @@ export default {
             ...queryParams    //括号内是要传递给新窗口的参数
           }
         })
-        window.open(routeData.href.slice(1,routeData.href.length-1)+'&'+`${this.website.tokenHeader}=${getToken()}`);
+        window.open(routeData.href.slice(1,routeData.href.length)+'&'+`${this.website.tokenHeader}=${getToken()}`);
       }).catch(() => {
         this.$message({
           type: 'info',

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

@@ -2,12 +2,43 @@
   <div class="home-container">
     <el-card class="home-container__card">
       <div>
-        <div class="content" v-loading="loading">
-          <avue-crud :data="tableData" :option="option" :key="key" ref="crud" @refresh-change="refresh"
+        <div class="content" v-loading="loading" v-if="!(roleName.indexOf('司机') !== -1)">
+          <!--散货-->
+          <avue-crud
+              v-if="mold == 2"
+              :data="tableData"
+              :key="key"
+              :option="optionTwo"
+              ref="crud"
+              @refresh-change="refresh"
+              @resetColumn="resetColumnTwo('crud','optionTwo','bulkCargoList',140.1)"
+              @saveColumn="saveColumnTwo('crud','optionTwo','bulkCargoList',140.1)">
+            <template slot="addressDetail" slot-scope="{ row,index}">
+              <el-tooltip class="item" effect="dark" placement="top">
+                <div v-html="ToBreak(row.addressDetail)" slot="content"></div>
+                <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.addressDetail }}</div>
+              </el-tooltip>
+            </template>
+            <template slot="unloadingPlace" slot-scope="{ row,index}">
+              <el-tooltip class="item" effect="dark" placement="top">
+                <div v-html="ToBreak(row.unloadingPlace)" slot="content"></div>
+                <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.unloadingPlace }}</div>
+              </el-tooltip>
+            </template>
+            <template slot="dispatchNumber" slot-scope="{row}">
+                <span class="el-button--text" style="cursor: pointer"
+                      @click="openTrackTwo(row,0)">{{ row.dispatchNumber }}</span>
+            </template>
+            <template slot="menuLeft">
+              <span>今日业务详情{{ mold == 1 ? '（集装箱）' : mold == 2 ? '（散货）' : mold == 3 ? '（特种）' : '' }}</span>
+            </template>
+          </avue-crud>
+          <!--集装箱-->
+          <avue-crud v-else :data="tableData" :option="option" :key="key" ref="crud" @refresh-change="refresh"
                      @resetColumn="resetColumn"
                      @saveColumn="saveColumn">
             <template slot="menuLeft">
-              <span>今日业务详情{{mold == 1?'（集装箱）':mold == 2?'（散货）':mold == 3?'（特种）':''}}</span>
+              <span>今日业务详情{{ mold == 1 ? '（集装箱）' : mold == 2 ? '（散货）' : mold == 3 ? '（特种）' : '' }}</span>
             </template>
             <template slot="billNo" slot-scope="{row}">
                 <span class="el-button--text" style="cursor: pointer"
@@ -60,11 +91,12 @@ export default {
   },
   data() {
     return {
-      entrustTimer:null,
+      entrustTimer: null,
       roleName: localStorage.getItem("roleName").split(','),
       dialogVisible: false,
       loading: false,
-      mold:0,
+      mold: 0,
+      status: 1,
       tableData: [],
       map: null,
       infoWindow: null,
@@ -160,13 +192,341 @@ export default {
           },
         ]
       },
+      optionTwo: {},
+      bulkCargoList: {},
+      // 客户
+      bulkCargoListOne: {
+        stripe: true,
+        index: true,
+        menu: false,
+        refreshBtn: true,
+        addBtn: false,
+        height: 390,
+        align: 'center',
+        column: [{
+          label: '货运日期',
+          prop: 'arrivalTime',
+          type: "date",
+          format: "yyyy-MM-dd HH:mm",
+          index: 1,
+          width: 150,
+          overHidden: true,
+        }, {
+          label: '业务员',
+          prop: 'salesmanName',
+          index: 2,
+          width: 60,
+          overHidden: true,
+        }, {
+          label: '物流运输',
+          prop: 'dispatchDeptName',
+          overHidden: true,
+          index: 3,
+          width: 100
+        }, {
+          label: '派车单号',
+          width: 140,
+          index: 4,
+          overHidden: true,
+          prop: 'dispatchNumber'
+        }, {
+          label: '合同号',
+          width: 140,
+          index: 5,
+          overHidden: true,
+          prop: 'contractNo'
+        }, {
+          label: '装货地址',
+          prop: 'addressDetail',
+          index: 6,
+          width: 132,
+        }, {
+          label: '卸货地址',
+          prop: 'unloadingPlace',
+          index: 7,
+          width: 132,
+        }, {
+          label: '车体积',
+          width: 100,
+          index: 8,
+          prop: 'fleetVolum'
+        }, {
+          label: '车队',
+          prop: 'fleetShortName',
+          index: 9,
+          width: 100,
+          overHidden: true,
+        }, {
+          label: '车号',
+          prop: 'plateNo',
+          index: 10,
+          width: 100,
+          overHidden: true,
+        }, {
+          label: '状态',
+          prop: 'status',
+          index: 11,
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status_two",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          dataType: "string",
+          type: 'select',
+          overHidden: true,
+          width: 140
+        }, {
+          label: '应收运费',
+          prop: 'freightCollect',
+          index: 12,
+          width: 100,
+          overHidden: true,
+        }, {
+          label: '应收杂费',
+          prop: 'extraAmountD',
+          index: 13,
+          width: 100,
+          overHidden: true,
+        }, {
+          label: '备注',
+          prop: 'remarks',
+          index: 14,
+          width: 100,
+          overHidden: true,
+        }]
+      },
+      // 平台
+      bulkCargoListTwo: {
+        stripe: true,
+        index: true,
+        menu: false,
+        refreshBtn: true,
+        addBtn: false,
+        height: 390,
+        align: 'center',
+        column: [{
+          label: '货运日期',
+          prop: 'arrivalTime',
+          type: "date",
+          format: "yyyy-MM-dd HH:mm",
+          index: 1,
+          width: 150,
+          overHidden: true,
+        }, {
+          label: '业务员',
+          prop: 'salesmanName',
+          index: 2,
+          width: 60,
+          overHidden: true,
+        },{
+          label: '运输调度',
+          prop: 'dispatcherName',
+          overHidden: true,
+          index: 3,
+          width: 100,
+        }, {
+          label: '派车单号',
+          width: 140,
+          index: 4,
+          overHidden: true,
+          prop: 'dispatchNumber'
+        }, {
+          label: '合同号',
+          width: 140,
+          index: 5,
+          overHidden: true,
+          prop: 'contractNo'
+        }, {
+          label: '装货地址',
+          prop: 'addressDetail',
+          index: 6,
+          width: 132,
+        }, {
+          label: '卸货地址',
+          prop: 'unloadingPlace',
+          index: 7,
+          width: 132,
+        }, {
+          label: '车体积',
+          width: 100,
+          index: 8,
+          prop: 'fleetVolum'
+        }, {
+          label: '车队',
+          prop: 'fleetShortName',
+          index: 9,
+          width: 100,
+          overHidden: true,
+        }, {
+          label: '车号',
+          prop: 'plateNo',
+          index: 10,
+          width: 100,
+          overHidden: true,
+        }, {
+          label: '状态',
+          prop: 'status',
+          index: 11,
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status_two",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          dataType: "string",
+          type: 'select',
+          overHidden: true,
+          width: 140
+        }, {
+          label: '应收运费',
+          prop: 'freightCollect',
+          index: 12,
+          width: 100,
+          overHidden: true,
+        }, {
+          label: '应收杂费',
+          prop: 'extraAmountD',
+          index: 13,
+          width: 100,
+          overHidden: true,
+        },{
+          label: '应付杂费',
+          prop: 'extraAmountC',
+          index: 14,
+          width: 100,
+          overHidden: true
+        },{
+          label: '客户名称',
+          prop: 'corpShortName',
+          index: 15,
+          width: 100,
+          overHidden: true,
+        }, {
+          label: '备注',
+          prop: 'remarks',
+          index: 16,
+          width: 100,
+          overHidden: true,
+        }]
+      },
+      // 车队
+      bulkCargoListThree: {
+        stripe: true,
+        index: true,
+        menu: false,
+        refreshBtn: true,
+        addBtn: false,
+        height: 390,
+        align: 'center',
+        column: [{
+          label: '货运日期',
+          prop: 'arrivalTime',
+          type: "date",
+          format: "yyyy-MM-dd HH:mm",
+          index: 1,
+          width: 150,
+          overHidden: true,
+        }, {
+          label: '物流运输',
+          prop: 'dispatchDeptName',
+          overHidden: true,
+          index: 2,
+          width: 100
+        },{
+          label: '运输调度',
+          prop: 'dispatcherName',
+          overHidden: true,
+          index: 3,
+          width: 100,
+        }, {
+          label: '派车单号',
+          width: 140,
+          index: 4,
+          overHidden: true,
+          prop: 'dispatchNumber'
+        }, {
+          label: '合同号',
+          width: 140,
+          index: 5,
+          overHidden: true,
+          prop: 'contractNo'
+        }, {
+          label: '装货地址',
+          prop: 'addressDetail',
+          index: 6,
+          width: 132,
+        }, {
+          label: '卸货地址',
+          prop: 'unloadingPlace',
+          index: 7,
+          width: 132,
+        }, {
+          label: '车体积',
+          width: 100,
+          index: 8,
+          prop: 'fleetVolum'
+        }, {
+          label: '车队',
+          prop: 'fleetShortName',
+          index: 9,
+          width: 100,
+          overHidden: true,
+        }, {
+          label: '车号',
+          prop: 'plateNo',
+          index: 10,
+          width: 100,
+          overHidden: true,
+        }, {
+          label: '状态',
+          prop: 'status',
+          index: 11,
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status_two",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          dataType: "string",
+          type: 'select',
+          overHidden: true,
+          width: 140
+        }, {
+          label: '应付运费',
+          prop: 'freightPay',
+          index: 12,
+          width: 100,
+          overHidden: true,
+        },{
+          label: '应付杂费',
+          prop: 'extraAmountC',
+          index: 13,
+          width: 100,
+          overHidden: true
+        }, {
+          label: '备注',
+          prop: 'remarks',
+          index: 14,
+          width: 100,
+          overHidden: true,
+        }]
+      },
     };
   },
   async mounted() {
     this.option = await this.getColumnData(this.getColumnName(140), this.optionList);
+    if (this.roleName.indexOf('客户') !== -1) {
+      this.bulkCargoList = this.bulkCargoListOne
+    } else if (this.roleName.indexOf('平台') !== -1) {
+      this.bulkCargoList = this.bulkCargoListTwo
+    } else if (this.roleName.indexOf('车队') !== -1) {
+      this.bulkCargoList = this.bulkCargoListThree
+    } else {
+      this.bulkCargoList = this.bulkCargoListOne
+    }
+    this.optionTwo = await this.getColumnData(this.getColumnName(140.1), this.bulkCargoList);
     this.key++
-    this.init();
-    if (this.roleName.indexOf('平台') !== -1||this.roleName.indexOf('总调度') !== -1||this.roleName.indexOf('分管调度') !== -1) {
+    await this.getsalesTrend()
+    this.init()
+    if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1) {
       for (let item of this.option.column) {
         if (item.prop === 'extraAmountC') return
       }
@@ -177,7 +537,7 @@ export default {
             index: 2,
             width: 60,
             overHidden: true,
-          },{
+          }, {
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
@@ -190,7 +550,7 @@ export default {
             index: 16,
             width: 100,
             overHidden: true,
-          },{
+          }, {
             label: '应付杂费',
             prop: 'extraAmountC',
             index: 14,
@@ -236,7 +596,7 @@ export default {
             index: 13,
             width: 100,
             overHidden: true,
-          },{
+          }, {
             label: '应付杂费',
             prop: 'extraAmountC',
             index: 13,
@@ -256,7 +616,7 @@ export default {
             index: 2,
             width: 60,
             overHidden: true,
-          },{
+          }, {
             label: '物流运输',
             prop: 'dispatchDeptName',
             overHidden: true,
@@ -315,18 +675,18 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
         this.key++
-        if (this.roleName.indexOf('平台') !== -1||this.roleName.indexOf('总调度') !== -1||this.roleName.indexOf('分管调度') !== -1) {
+        if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1) {
           for (let item of this.option.column) {
             if (item.prop === 'extraAmountC') return
           }
           this.option.column.push(
-               {
+              {
                 label: '业务员',
                 prop: 'salesmanName',
                 index: 2,
                 width: 60,
                 overHidden: true,
-              },{
+              }, {
                 label: '运输调度',
                 prop: 'dispatcherName',
                 overHidden: true,
@@ -339,7 +699,7 @@ export default {
                 index: 16,
                 width: 100,
                 overHidden: true,
-              },{
+              }, {
                 label: '应付杂费',
                 prop: 'extraAmountC',
                 index: 14,
@@ -385,7 +745,7 @@ export default {
                 index: 13,
                 width: 100,
                 overHidden: true,
-              },{
+              }, {
                 label: '应付杂费',
                 prop: 'extraAmountC',
                 index: 13,
@@ -405,7 +765,7 @@ export default {
                 index: 2,
                 width: 60,
                 overHidden: true,
-              },{
+              }, {
                 label: '物流运输',
                 prop: 'dispatchDeptName',
                 overHidden: true,
@@ -437,6 +797,37 @@ export default {
         }
       }
     },
+    //自定义列保存
+    async saveColumnTwo(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+       * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //自定义列重置
+    async resetColumnTwo(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    openTrackTwo(row, index){
+      if (index == 0){
+        this.$router.push({
+          path: '/landTransportation/bulkCargo/index',
+          query: {id: row.orderId},
+        });
+      }
+    },
     openTrack(row, index) {
       if (index == 0) {
         this.$router.push({
@@ -503,14 +894,16 @@ export default {
       this.map.setFitView();
     },
     init() {
-      this.getsalesTrend();
-      frequency().then(res=>{
+      frequency().then(res => {
         let this_ = this
         this_.entrustTimer = setInterval(function () {
           if (JSON.parse(localStorage.getItem("saber-token")).content) {
-            this_.getsalesTrend();
+            this_.getsalesTrend({
+              status:this_.status,
+              mold:this_.mold
+            });
           }
-        }, Number(res.data.data[0].dictKey)*1000)
+        }, Number(res.data.data[0].dictKey) * 1000)
       })
     },
     query(data) {
@@ -518,6 +911,7 @@ export default {
     },
     getsalesTrend(data = {status: 0, mold: 1}) {
       this.mold = data.mold
+      this.status = data.status
       this.loading = true;
       active(data).then(res => {
         this.tableData = res.data.data
@@ -528,7 +922,10 @@ export default {
       if (val) return val.replace(/\n/g, '<br/>')
     },
     refresh() {
-      this.getsalesTrend()
+      this.getsalesTrend({
+        status:this.status,
+        mold:this.mold
+      })
     }
   }
 };