修改首页字段

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/views/landTransportation/bulkCargo/detailPage.vue

@@ -48,7 +48,8 @@
           </el-button>
           <el-button
               type="success"
-              v-if="goodsForm.status === 0 && typeTwo === false && roleName.indexOf('业务员') !== -1"
+              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)"
@@ -60,7 +61,7 @@
               size="small"
               :loading="type"
               v-show="
-              (roleName.indexOf('平台') !== -1 && 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)
@@ -96,7 +97,7 @@
           <el-button
               type="primary"
               :disabled="goodsForm.status === 5"
-              v-show="(roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)||roleName.indexOf('分管调度') !== -1"
+              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"
@@ -1680,7 +1681,7 @@ export default {
           label: '车队',
           prop: 'fleetId',
           type: 'select',
-          dicData:[],
+          dicUrl: "/api/blade-client/corpsdesc/fleetList",
           cascader: ['plateNo'],
           props: {
             label: "cname",
@@ -2061,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 => {

src/views/landTransportation/bulkCargo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <basic-container v-show="show">
-      <div class="home-container" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -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('')">
@@ -257,7 +257,7 @@
           @saveColumn="saveColumn"
           @search-criteria-switch="searchCriteriaSwitch"
           @search-change="searchChange">
-        <template slot="menuLeft" slot-scope="{size}" v-if="roleName.indexOf('客户') !== -1 || roleName.indexOf('分管调度') !== -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>
@@ -343,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",
@@ -477,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",
@@ -630,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",
@@ -792,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",
@@ -1063,10 +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

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

@@ -277,7 +277,7 @@ export default {
           width: 140
         }, {
           label: '应收运费',
-          prop: 'landAmountD',
+          prop: 'freightCollect',
           index: 12,
           width: 100,
           overHidden: true,
@@ -378,7 +378,7 @@ export default {
           width: 140
         }, {
           label: '应收运费',
-          prop: 'landAmountD',
+          prop: 'freightCollect',
           index: 12,
           width: 100,
           overHidden: true,
@@ -491,7 +491,7 @@ export default {
           width: 140
         }, {
           label: '应付运费',
-          prop: 'landAmountC',
+          prop: 'freightPay',
           index: 12,
           width: 100,
           overHidden: true,