货代 修改配箱 君海 画库存账统计 陆运应收应付 收付对账

src/components/bill/billDetailListFleetC.vue

@@ -96,6 +96,16 @@ export default {
     }
   },
   async created() {
+    if (this.params.srcType == 3) {
+      this.option.column.forEach(e => {
+        if (e.prop == 'settlementAmount') {
+          e.label = '已对账'
+        }
+        if (e.prop == 'thisAmount') {
+          e.label = '未对账'
+        }
+      })
+    }
     // this.option = await this.getColumnData(this.getColumnName(45), option);
   },
   methods: {
@@ -198,6 +208,7 @@ export default {
       getBillList(page.currentPage, page.pageSize, params).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
+        this.$refs.crud.refreshTable();
       }).finally(() => {
         this.loading = false;
       })

src/components/bill/billDetailListFleetD.vue

@@ -58,7 +58,7 @@ export default {
     dataList: {
       type: Array,
       default: []
-    }
+    },
   },
   data() {
     return {
@@ -96,6 +96,17 @@ export default {
     }
   },
   async created() {
+    if(this.params.srcType==3){
+      this.option.column.forEach(e=>{
+      if(e.prop=='settlementAmount'){
+        e.label='已对账'
+      }
+      if(e.prop=='thisAmount'){
+        e.label='未对账'
+      }
+    })
+    }
+  
     // this.option = await this.getColumnData(this.getColumnName(45), option);
   },
   methods: {
@@ -198,6 +209,7 @@ export default {
       getBillList(page.currentPage, page.pageSize, params).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
+        this.$refs.crud.refreshTable();
       }).finally(() => {
         this.loading = false;
       })

src/components/bill/config/mainListFleetC.json

@@ -22,6 +22,7 @@
   "index": true,
   "selection": true,
   "menu": true,
+  "columnBtn":false,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",
@@ -41,7 +42,15 @@
       "prop": "feeName",
       "overHidden": true,
       "search": true,
-      "width": 150,
+      "type": "select",
+      "filterable": true,
+      "remote": true,
+      "dicUrl": "/api/blade-client/feesdesc/page?cname={{key}}",
+      "props": {
+          "label": "cname",
+          "value": "cname",
+          "res": "data.records"
+      },
       "index": 1
     },
     {
@@ -49,7 +58,6 @@
       "prop": "srcOrderNo",
       "overHidden": true,
       "search": true,
-      "width": 150,
       "index": 2
     },
     {
@@ -57,34 +65,29 @@
       "prop": "srcBillNo",
       "overHidden": true,
       "search": true,
-      "width": 150,
       "index": 3
     },
     {
       "label": "车号",
       "prop": "plateNo",
       "overHidden": true,
-      "width": 150,
       "index": 4
     },
     {
       "label": "金额",
       "prop": "amount",
       "overHidden": true,
-      "width": 150,
       "index": 5
     },
     {
       "label": "已付",
       "prop": "settlementAmount",
-      "width": 150,
       "overHidden": true,
       "index": 6
     },
     {
       "label": "未付金额",
       "prop": "thisAmount",
-      "width": 150,
       "overHidden": true,
       "index": 7
     },
@@ -93,7 +96,15 @@
       "prop": "fleetName",
       "overHidden": true,
       "search": true,
-      "width": 150,
+      "type": "select",
+      "filterable": true,
+      "remote": true,
+      "dicUrl": "/api/blade-client/corpsdesc/list?corpType=CD&cname={{key}}",
+      "props": {
+          "label": "cname",
+          "value": "cname",
+          "res": "data.records"
+      },
       "index": 8
     },
    {
@@ -106,7 +117,6 @@
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "searchDefaultTime": ["00:00:00", "23:59:59"],
-      "width": 100,
       "index": 9
     }
   ]

src/components/bill/config/mainListFleetD.json

@@ -22,6 +22,7 @@
   "index": true,
   "selection": true,
   "menu": true,
+  "columnBtn":false,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",
@@ -41,7 +42,15 @@
       "prop": "feeName",
       "overHidden": true,
       "search": true,
-      "width": 150,
+      "type": "select",
+      "filterable": true,
+      "remote": true,
+      "dicUrl": "/api/blade-client/feesdesc/page?cname={{key}}",
+      "props": {
+          "label": "cname",
+          "value": "cname",
+          "res": "data.records"
+      },
       "index": 1
     },
     {
@@ -49,7 +58,6 @@
       "prop": "srcOrderNo",
       "overHidden": true,
       "search": true,
-      "width": 150,
       "index": 2
     },
     {
@@ -57,34 +65,29 @@
       "prop": "srcBillNo",
       "overHidden": true,
       "search": true,
-      "width": 150,
       "index": 3
     },
     {
       "label": "车号",
       "prop": "plateNo",
       "overHidden": true,
-      "width": 150,
       "index": 4
     },
     {
       "label": "金额",
       "prop": "amount",
       "overHidden": true,
-      "width": 150,
       "index": 5
     },
     {
       "label": "已收",
       "prop": "settlementAmount",
-      "width": 150,
       "overHidden": true,
       "index": 6
     },
     {
       "label": "未收金额",
       "prop": "thisAmount",
-      "width": 150,
       "overHidden": true,
       "index": 7
     },
@@ -93,7 +96,15 @@
       "prop": "fleetName",
       "overHidden": true,
       "search": true,
-      "width": 150,
+      "type": "select",
+      "filterable": true,
+      "remote": true,
+      "dicUrl": "/api/blade-client/corpsdesc/list?corpType=CD&cname={{key}}",
+      "props": {
+          "label": "cname",
+          "value": "cname",
+          "res": "data.records"
+      },
       "index": 8
     },
    {
@@ -106,7 +117,6 @@
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "searchDefaultTime": ["00:00:00", "23:59:59"],
-      "width": 100,
       "index": 9
     }
   ]

src/enums/column-name.js

@@ -2002,6 +2002,9 @@ const columnName = [{
 }, {
   code: 451,
   name: '陆运-付款对账-付款结算-明细'
+}, {
+  code: 452,
+  name: '君海-决策分析-库存账统计(F)'
 },
 ]
 export const getColumnName = (key) => {

src/router/views/index.js

@@ -3967,7 +3967,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/financialManagement/receiptSettleFleet/receiptSettle',
-    name: '车队应收',
+    name: '陆运应收',
     meta: {
       i18n: '/financialManagement/receiptSettleFleet/receiptSettle',
       keepAlive: true,
@@ -3981,7 +3981,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/financialManagement/paymentSettleFleet/paymentSettle',
-    name: '车队应付',
+    name: '陆运应付',
     meta: {
       i18n: '/financialManagement/paymentSettleFleet/paymentSettle',
       keepAlive: true,
@@ -3989,4 +3989,46 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/paymentSettleFleet/paymentSettle')
   }]
 },
+{
+  path: '/financialManagement/reconciliationD/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/financialManagement/reconciliationD/index',
+    name: '收款对账',
+    meta: {
+      i18n: '/financialManagement/reconciliationD/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/reconciliationD/index')
+  }]
+},
+{
+  path: '/financialManagement/reconciliationC/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/financialManagement/reconciliationC/index',
+    name: '付款对账',
+    meta: {
+      i18n: '/financialManagement/reconciliationC/index', 
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/reconciliationC/index')
+  }]
+},
+{
+  path: '/iosBasicData/inventoryAccount/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/iosBasicData/inventoryAccount/index',
+    name: '库存账统计(F)',
+    meta: {
+      i18n: '/iosBasicData/inventoryAccount/index', 
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/inventoryAccount/index')
+  }]
+},
 ]

src/views/approveDataH/configuration/mainList.json

@@ -143,6 +143,13 @@
       "index": 12
     },
     {
+      "label": "已审",
+      "prop": "level",
+      "overHidden": true,
+      "width": 100,
+      "index": 12.1
+    },
+    {
       "label": "业务日期",
       "prop": "billTime",
       "type": "date",

src/views/financialManagement/paymentSettleFleet/configuration/detailsPage.json

@@ -19,6 +19,7 @@
   "stripe": true,
   "selection": false,
   "menuWidth": 150,
+  "columnBtn":false,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",
@@ -30,6 +31,10 @@
     {
       "name": "thisAmount",
       "type": "sum"
+    },
+    {
+      "name": "settlementAmount",
+      "type": "sum"
     }
   ],
   "column": [
@@ -76,7 +81,7 @@
       "index": 6
     },
     {
-      "label": "本次金额",
+      "label": "未付金额",
       "prop": "thisAmount",
       "overHidden": true,
       "width": 150,

src/views/financialManagement/paymentSettleFleet/configuration/mainList.json

@@ -81,6 +81,8 @@
       "search": true,
       "unlinkPanels": true,
       "searchRange": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
       "width": 150,
       "index": 6
     },

src/views/financialManagement/paymentSettleFleet/paymentSettle.vue

@@ -252,7 +252,7 @@ export default {
         params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
         this.$delete(params, 'completionTime')
       }
-      params.billType = "收费"
+      params.billType = "付费"
       params.settlementType = 1
       const routeData = this.$router.resolve({
         path: '/api/trade-finance/settlement/expenseExport',      //跳转目标窗口的地址

src/views/financialManagement/paymentSettleFleet/paymentSettleDetailsPage.vue

@@ -25,8 +25,9 @@
       <basic-container>
         <avue-form class="trading-form" ref="form" v-model="form" :option="option">
           <template slot="corpId">
-            <crop-select v-model="form.corpId" corpType="CD" :disabled="!financeDisabled || editDisable||dataList.length>0"
-              @getCorpData="returnBack" style="width: 100%"></crop-select>
+            <crop-select v-model="form.corpId" corpType="CD"
+              :disabled="!financeDisabled || editDisable || dataList.length > 0" @getCorpData="returnBack"
+              style="width: 100%"></crop-select>
           </template>
           <template slot="salesCompany">
             <crop-select v-model="form.salesCompany" corpType="GS" :disabled="!financeDisabled || editDisable"
@@ -411,7 +412,7 @@ export default {
       }
       this.params = {
         fleetId: this.form.corpId,
-        dc: '2'
+        srcType: '1,2'
       }
       this.billDetailDialog = true;
     },
@@ -583,7 +584,7 @@ export default {
       getDetails(id).then(res => {
         if (res.data.data.financeStatus == "结算完成") {
           this.option.disabled = true
-        }else{
+        } else {
           this.option.disabled = false
         }
         this.afterEcho(res.data.data)

src/views/financialManagement/receiptSettleFleet/configuration/detailsPage.json

@@ -19,6 +19,7 @@
   "stripe": true,
   "selection": false,
   "menuWidth": 150,
+  "columnBtn":false,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",
@@ -30,6 +31,10 @@
     {
       "name": "thisAmount",
       "type": "sum"
+    },
+    {
+      "name": "settlementAmount",
+      "type": "sum"
     }
   ],
   "column": [
@@ -76,7 +81,7 @@
       "index": 6
     },
     {
-      "label": "本次金额",
+      "label": "未收金额",
       "prop": "thisAmount",
       "overHidden": true,
       "width": 150,

src/views/financialManagement/receiptSettleFleet/configuration/mainList.json

@@ -81,6 +81,8 @@
       "search": true,
       "unlinkPanels": true,
       "searchRange": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
       "width": 150,
       "index": 6
     },

src/views/financialManagement/receiptSettleFleet/receiptSettleDetailsPage.vue

@@ -25,8 +25,9 @@
       <basic-container>
         <avue-form class="trading-form" ref="form" v-model="form" :option="option">
           <template slot="corpId">
-            <crop-select v-model="form.corpId" corpType="KG" :disabled="!financeDisabled || editDisable||dataList.length>0"
-              @getCorpData="returnBack" style="width: 100%"></crop-select>
+            <crop-select v-model="form.corpId" corpType="KG"
+              :disabled="!financeDisabled || editDisable || dataList.length > 0" @getCorpData="returnBack"
+              style="width: 100%"></crop-select>
           </template>
           <template slot="salesCompany">
             <crop-select v-model="form.salesCompany" corpType="GS" :disabled="!financeDisabled || editDisable"
@@ -305,9 +306,6 @@ export default {
           if (item.prop == 'caseOverPayment' || item.prop == 'overPayment') {
             item.display = true
           }
-          if (item.prop == 'foreignAmount') {
-            item.display = false
-          }
         })
       }
     })
@@ -318,6 +316,7 @@ export default {
     this.detailData.disabled && (this.editDisable = true)
     if (this.detailData.id) {
       this.buttonLoading = true
+      this.option.disabled = true
       this.id = this.detailData.id;//字符串转数字  超长用BigInt
       this.getDetail(this.id)
     } else {
@@ -411,7 +410,7 @@ export default {
       }
       this.params = {
         corpId: this.form.corpId,
-        dc: '1'
+        srcType: '1,2'
       }
       this.billDetailDialog = true;
     },
@@ -581,11 +580,14 @@ export default {
     getDetail(id) {
       this.buttonLoading = true
       getDetails(id).then(res => {
-        if (res.data.data.financeStatus == "结算完成") {
-          this.option.disabled = true
-        }else{
-          this.option.disabled = false
+        if (!this.editDisable) {
+          if (res.data.data.financeStatus == "结算完成") {
+            this.option.disabled = true
+          } else {
+            this.option.disabled = false
+          }
         }
+
         this.afterEcho(res.data.data)
       }).finally(() => {
         this.buttonLoading = false
@@ -608,7 +610,7 @@ export default {
         // this.findObject(this.option.column, "amount").disabled = false
       } else {
         this.findObject(this.option.column, "amount").disabled = true
-        this.findObject(this.option.column, "foreignAmount").disabled = true
+        // this.findObject(this.option.column, "foreignAmount").disabled = true
       }
 
       if (data.itemsList) {

src/views/financialManagement/reconciliationC/configuration/detailsPage.json

@@ -19,6 +19,7 @@
   "stripe": true,
   "selection": false,
   "menuWidth": 150,
+  "columnBtn":false,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",
@@ -30,76 +31,81 @@
     {
       "name": "thisAmount",
       "type": "sum"
+    },
+    {
+      "name": "settlementAmount",
+      "type": "sum"
     }
   ],
   "column": [
     {
+      "label": "费用名称",
+      "prop": "itemName",
+      "overHidden": true,
+      "width": 150,
+      "index": 1
+    },
+    {
       "label": "来源订单号",
       "prop": "srcOrderno",
       "overHidden": true,
       "width": 200,
-      "index": 1
+      "index": 2
     },
     {
       "label": "提单号",
       "prop": "billNo",
       "overHidden": true,
       "width": 200,
-      "index": 2
+      "index": 3
     },
     {
-      "label": "费用名称",
-      "prop": "itemName",
+      "label": "车号",
+      "prop": "plateNo",
       "overHidden": true,
       "width": 150,
-      "index": 3
+      "index": 4
     },
     {
       "label": "金额",
       "prop": "amount",
       "overHidden": true,
       "width": 150,
-      "index": 4
+      "index": 5
     },
     {
-      "label": "已付",
+      "label": "已对账",
       "prop": "settlementAmount",
       "overHidden": true,
       "width": 150,
-      "index": 5
+      "index": 6
     },
     {
-      "label": "本次金额",
+      "label": "未对账",
       "prop": "thisAmount",
       "overHidden": true,
       "width": 150,
-      "index": 6
+      "index": 7
     },
     {
-      "label": "币别",
-      "prop": "currency",
-      "index": 7,
-      "width": 120,
+      "label": "车队",
+      "prop": "fleetName",
       "overHidden": true,
-      "type": "select",
-      "dicData": [
-        {
-          "label": "CNY",
-          "value":"1"
-        },
-        {
-          "label": "USD",
-          "value": "2"
-        }
-      ]
+      "width": 150,
+      "index": 8
     },
-    {
-      "label": "备注",
-      "prop": "remarks",
+   {
+      "label": "业务日期",
+      "prop": "srcDate",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
       "overHidden": true,
-      "index": 8,
-      "cell": true,
-      "width": 140
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "searchDefaultTime": ["00:00:00", "23:59:59"],
+      "width": 100,
+      "index": 9
     }
   ]
 }

src/views/financialManagement/reconciliationC/configuration/mainList.json

@@ -35,7 +35,6 @@
       "prop": "corpId",
       "search": true,
       "overHidden": true,
-      "width": 200,
       "index": 1
     },
     {
@@ -46,7 +45,8 @@
       "search": true,
       "unlinkPanels": true,
       "searchRange": true,
-      "width": 150,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
       "index": 2
     },
     {
@@ -54,29 +54,19 @@
       "prop": "billNo",
       "search": true,
       "overHidden": true,
-      "width": 150,
       "index": 3
     },
     {
       "label": "对账编号",
-      "prop": "billNo",
+      "prop": "sysNo",
       "search": true,
       "overHidden": true,
-      "width": 150,
       "index": 4
     },
     {
-      "label": "金额",
-      "prop": "amount",
-      "overHidden": true,
-      "width": 150,
-      "index": 5
-    },
-    {
       "label": "对账金额",
-      "prop": "billNo",
+      "prop": "amount",
       "overHidden": true,
-      "width": 150,
       "index": 6
     },
     {
@@ -86,15 +76,18 @@
       "search": true,
       "overHidden": true,
       "index": 7,
-      "width": 120,
       "dicData": [
         {
-          "label": "待结算",
-          "value":"待结算"
+          "label": "暂存",
+          "value":"暂存"
+        },
+        {
+          "label": "审核中",
+          "value": "审核中"
         },
         {
-          "label": "结算完成",
-          "value": "结算完成"
+          "label": "审核完成",
+          "value": "审核完成"
         }
       ]
     },
@@ -103,8 +96,7 @@
       "prop": "remark",
       "search": true,
       "overHidden": true,
-      "index": 8,
-      "width": 120
+      "index": 8
     }
   ]
 }

src/views/financialManagement/reconciliationC/detailsPage.vue

@@ -58,7 +58,7 @@
           @refresh-change="refreshChange">
           <template slot="menuLeft">
             <el-button type="primary" size="small" icon="el-icon-shopping-cart-2"
-              :disabled="!financeDisabled || editDisable" :buttonLoading="buttonLoading" @click="selectRecipt">应付费用
+              :disabled="!financeDisabled || editDisable" :buttonLoading="buttonLoading" @click="selectRecipt">付款对账
             </el-button>
             <el-button :disabled="!form.id" type="info" size="small" icon="el-icon-printer"
               @click.stop="openReport">报表打印</el-button>
@@ -102,7 +102,11 @@
           </template>
         </avue-crud>
       </basic-container>
-      <el-dialog title="应付费用" append-to-body class="el-dialogDeep" :visible.sync="billDetailDialog" width="90%"
+      <containerTitle title="上传附件"></containerTitle>
+      <c-upload typeUpload="CD" :data="form.filesList" display deleteUrl="/api/blade-client/common-file/remove"
+        :enumerationValue="86.2">
+      </c-upload>
+      <el-dialog title="付款对账" append-to-body class="el-dialogDeep" :visible.sync="billDetailDialog" width="90%"
         :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" top="10vh" v-dialog-drag>
         <bill-detail :dataList="dataList" :params="params" @closeFun="closeBillDetail" @importProMent="importProMent">
         </bill-detail>
@@ -173,12 +177,6 @@ export default {
             disabled: true,
           },
           {
-            label: '系统号',
-            prop: 'sysNo',
-            span: 8,
-            disabled: true
-          },
-          {
             label: '对账单号',
             prop: 'sysNo',
             span: 8,
@@ -200,21 +198,6 @@ export default {
             ]
           },
           {
-            label: '业务日期日期',
-            prop: 'settlementDate',
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
-            span: 8,
-            type: "date",
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          },
-          {
             label: '制单人',
             prop: 'createUserName',
             span: 8,
@@ -432,7 +415,7 @@ export default {
       }
       this.params = {
         fleetId: this.form.corpId,
-        dc: '2'
+        srcType: '3'
       }
       this.billDetailDialog = true;
     },
@@ -579,7 +562,7 @@ export default {
 
           const params = {
             ...this.form,
-            billType: "付费",
+            billType: "对账付",
             itemsList: this.dataList,
             settlementType: 1,
             whetherIntegral: 0
@@ -624,14 +607,6 @@ export default {
         })
       }
       this.oldForm = Object.assign({}, this.form);
-      // 达沃特企业人民币可以编辑不需要计算
-      if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
-        // this.findObject(this.option.column, "amount").disabled = false
-      } else {
-        this.findObject(this.option.column, "amount").disabled = true
-        this.findObject(this.option.column, "foreignAmount").disabled = true
-      }
-
       if (data.itemsList) {
         this.dataList = data.itemsList
         this.oldDataList = this.deepClone(data.itemsList)

src/views/financialManagement/reconciliationC/index.vue

@@ -195,7 +195,7 @@ export default {
     onLoad(page, params) {
       this.loading = true
       params = this.paramsAdjustment(params)
-      params.billType = "付费"
+      params.billType = "对账付"
       params.settlementType = 1
 
       getList(page.currentPage, page.pageSize, params).then(res => {
@@ -252,7 +252,7 @@ export default {
         params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
         this.$delete(params, 'completionTime')
       }
-      params.billType = "收费"
+      params.billType = "对账付"
       params.settlementType = 1
       const routeData = this.$router.resolve({
         path: '/api/trade-finance/settlement/expenseExport',      //跳转目标窗口的地址

src/views/financialManagement/reconciliationD/configuration/detailsPage.json

@@ -19,6 +19,7 @@
   "stripe": true,
   "selection": false,
   "menuWidth": 150,
+  "columnBtn":false,
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",
@@ -30,76 +31,81 @@
     {
       "name": "thisAmount",
       "type": "sum"
+    },
+    {
+      "name": "settlementAmount",
+      "type": "sum"
     }
   ],
   "column": [
     {
+      "label": "费用名称",
+      "prop": "itemName",
+      "overHidden": true,
+      "width": 150,
+      "index": 1
+    },
+    {
       "label": "来源订单号",
       "prop": "srcOrderno",
       "overHidden": true,
       "width": 200,
-      "index": 1
+      "index": 2
     },
     {
       "label": "提单号",
       "prop": "billNo",
       "overHidden": true,
       "width": 200,
-      "index": 2
+      "index": 3
     },
     {
-      "label": "费用名称",
-      "prop": "itemName",
+      "label": "车号",
+      "prop": "plateNo",
       "overHidden": true,
       "width": 150,
-      "index": 3
+      "index": 4
     },
     {
       "label": "金额",
       "prop": "amount",
       "overHidden": true,
       "width": 150,
-      "index": 4
+      "index": 5
     },
     {
-      "label": "已收",
+      "label": "已对账",
       "prop": "settlementAmount",
       "overHidden": true,
       "width": 150,
-      "index": 5
+      "index": 6
     },
     {
-      "label": "本次金额",
+      "label": "未对账",
       "prop": "thisAmount",
       "overHidden": true,
       "width": 150,
-      "index": 6
+      "index": 7
     },
     {
-      "label": "币别",
-      "prop": "currency",
-      "index": 7,
-      "width": 120,
+      "label": "车队",
+      "prop": "fleetName",
       "overHidden": true,
-      "type": "select",
-      "dicData": [
-        {
-          "label": "CNY",
-          "value":"1"
-        },
-        {
-          "label": "USD",
-          "value": "2"
-        }
-      ]
+      "width": 150,
+      "index": 8
     },
-    {
-      "label": "备注",
-      "prop": "remarks",
+   {
+      "label": "业务日期",
+      "prop": "srcDate",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
       "overHidden": true,
-      "index": 8,
-      "cell": true,
-      "width": 140
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "searchDefaultTime": ["00:00:00", "23:59:59"],
+      "width": 100,
+      "index": 9
     }
   ]
 }

src/views/financialManagement/reconciliationD/configuration/mainList.json

@@ -35,7 +35,6 @@
       "prop": "corpId",
       "search": true,
       "overHidden": true,
-      "width": 200,
       "index": 1
     },
     {
@@ -46,7 +45,8 @@
       "search": true,
       "unlinkPanels": true,
       "searchRange": true,
-      "width": 150,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
       "index": 2
     },
     {
@@ -54,29 +54,19 @@
       "prop": "billNo",
       "search": true,
       "overHidden": true,
-      "width": 150,
       "index": 3
     },
     {
       "label": "对账编号",
-      "prop": "billNo",
+      "prop": "sysNo",
       "search": true,
       "overHidden": true,
-      "width": 150,
       "index": 4
     },
     {
-      "label": "金额",
-      "prop": "amount",
-      "overHidden": true,
-      "width": 150,
-      "index": 5
-    },
-    {
       "label": "对账金额",
-      "prop": "billNo",
+      "prop": "amount",
       "overHidden": true,
-      "width": 150,
       "index": 6
     },
     {
@@ -86,15 +76,18 @@
       "search": true,
       "overHidden": true,
       "index": 7,
-      "width": 120,
       "dicData": [
         {
-          "label": "待结算",
-          "value":"待结算"
+          "label": "暂存",
+          "value":"暂存"
+        },
+        {
+          "label": "审核中",
+          "value": "审核中"
         },
         {
-          "label": "结算完成",
-          "value": "结算完成"
+          "label": "审核完成",
+          "value": "审核完成"
         }
       ]
     },
@@ -103,8 +96,7 @@
       "prop": "remark",
       "search": true,
       "overHidden": true,
-      "index": 8,
-      "width": 120
+      "index": 8
     }
   ]
 }

src/views/financialManagement/reconciliationD/detailsPage.vue

@@ -25,8 +25,9 @@
       <basic-container>
         <avue-form class="trading-form" ref="form" v-model="form" :option="option">
           <template slot="corpId">
-            <crop-select v-model="form.corpId" corpType="KG" :disabled="!financeDisabled || editDisable||dataList.length>0"
-              @getCorpData="returnBack" style="width: 100%"></crop-select>
+            <crop-select v-model="form.corpId" corpType="KG"
+              :disabled="!financeDisabled || editDisable || dataList.length > 0" @getCorpData="returnBack"
+              style="width: 100%"></crop-select>
           </template>
           <template slot="salesCompany">
             <crop-select v-model="form.salesCompany" corpType="GS" :disabled="!financeDisabled || editDisable"
@@ -58,7 +59,7 @@
           @refresh-change="refreshChange">
           <template slot="menuLeft">
             <el-button type="primary" size="small" icon="el-icon-shopping-cart-2"
-              :disabled="!financeDisabled || editDisable" :buttonLoading="buttonLoading" @click="selectRecipt">应收费用
+              :disabled="!financeDisabled || editDisable" :buttonLoading="buttonLoading" @click="selectRecipt">收款对账
             </el-button>
             <el-button :disabled="!form.id" type="info" size="small" icon="el-icon-printer"
               @click.stop="openReport">报表打印</el-button>
@@ -102,7 +103,11 @@
           </template>
         </avue-crud>
       </basic-container>
-      <el-dialog title="应收费用" append-to-body class="el-dialogDeep" :visible.sync="billDetailDialog" width="90%"
+      <containerTitle title="上传附件"></containerTitle>
+      <c-upload typeUpload="CD" :data="form.filesList" display deleteUrl="/api/blade-client/common-file/remove"
+        :enumerationValue="86.2">
+      </c-upload>
+      <el-dialog title="收款对账" append-to-body class="el-dialogDeep" :visible.sync="billDetailDialog" width="90%"
         :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" top="10vh" v-dialog-drag>
         <bill-detail :dataList="dataList" :params="params" @closeFun="closeBillDetail" @importProMent="importProMent">
         </bill-detail>
@@ -143,7 +148,9 @@ export default {
     return {
       sysitemType: null,
       category: '',
-      form: {},
+      form: {
+        filesList:[]
+      },
       itemsForm: {},
       params: {},
       buttonLoading: false,
@@ -173,12 +180,6 @@ export default {
             disabled: true,
           },
           {
-            label: '系统号',
-            prop: 'sysNo',
-            span: 8,
-            disabled: true
-          },
-          {
             label: '对账单号',
             prop: 'sysNo',
             span: 8,
@@ -200,21 +201,6 @@ export default {
             ]
           },
           {
-            label: '业务日期日期',
-            prop: 'settlementDate',
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
-            span: 8,
-            type: "date",
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          },
-          {
             label: '制单人',
             prop: 'createUserName',
             span: 8,
@@ -432,7 +418,7 @@ export default {
       }
       this.params = {
         corpId: this.form.corpId,
-        dc: '1'
+        srcType: '3'
       }
       this.billDetailDialog = true;
     },
@@ -579,7 +565,7 @@ export default {
 
           const params = {
             ...this.form,
-            billType: "收费",
+            billType: "对账收",
             itemsList: this.dataList,
             settlementType: 1,
             whetherIntegral: 0
@@ -604,7 +590,7 @@ export default {
       getDetails(id).then(res => {
         if (res.data.data.financeStatus == "结算完成") {
           this.option.disabled = true
-        }else{
+        } else {
           this.option.disabled = false
         }
         this.afterEcho(res.data.data)
@@ -624,14 +610,6 @@ export default {
         })
       }
       this.oldForm = Object.assign({}, this.form);
-      // 达沃特企业人民币可以编辑不需要计算
-      if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
-        // this.findObject(this.option.column, "amount").disabled = false
-      } else {
-        this.findObject(this.option.column, "amount").disabled = true
-        this.findObject(this.option.column, "foreignAmount").disabled = true
-      }
-
       if (data.itemsList) {
         this.dataList = data.itemsList
         this.oldDataList = this.deepClone(data.itemsList)

src/views/financialManagement/reconciliationD/index.vue

@@ -194,7 +194,7 @@ export default {
     onLoad(page, params) {
       this.loading = true
       params = this.paramsAdjustment(params)
-      params.billType = "收费"
+      params.billType = "对账收"
       params.settlementType = 1
 
       getList(page.currentPage, page.pageSize, params).then(res => {
@@ -251,7 +251,7 @@ export default {
         params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
         this.$delete(params, 'completionTime')
       }
-      params.billType = "收费"
+      params.billType = "对账收"
       params.settlementType = 1
       const routeData = this.$router.resolve({
         path: '/api/trade-finance/settlement/expenseExport',      //跳转目标窗口的地址

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -144,6 +144,11 @@
                             label="dictValue" url="/blade-system/dict-biz/dictionary?code=Emergency_Unit"
                             :filterable="true"></dic-select>
                     </tempalte>
+                    <tempalte slot-scope="{type,disabled}" slot="dgImdgCodeForm">
+                        <dic-select v-model="Detailform.dgImdgCode" placeholder="危险品类别" key="dictKey" label="dictKey"
+                            keyValue="dictKey" url="/blade-system/dict-biz/dictionary?code=dg_imdg_code"
+                            :filterable="true" :diySlot="true"></dic-select>
+                    </tempalte>
                     <tempalte slot-scope="{type,disabled}" slot="dgCtrlTemperatureUnitForm">
                         <dic-select v-model="Detailform.dgCtrlTemperatureUnit" placeholder="Control温度单位" key="dictKey"
                             label="dictValue" url="/blade-system/dict-biz/dictionary?code=dgCtrlTemperatureUnit_Unit"
@@ -1241,9 +1246,9 @@ export default {
     methods: {
         // 货物详情弹窗开启
         DetailAdd() {
-            this.Detailform.packingUnit=this.assemblyForm.packingUnit
-            this.Detailform.commodityDescr=this.assemblyForm.commodityDescr
-            this.Detailform.marks=this.assemblyForm.marks
+            this.Detailform.packingUnit = this.assemblyForm.packingUnit
+            this.Detailform.commodityDescr = this.assemblyForm.commodityDescr
+            this.Detailform.marks = this.assemblyForm.marks
             this.$refs.crudDetail.rowAdd()
         },
         // 货物明细单个保存接口

src/views/iosBasicData/inventoryAccount/index.vue

@@ -0,0 +1,492 @@
+<template>
+    <basic-container>
+        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
+            v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName" @row-del="rowDel"
+            @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+            @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 452)"
+            @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 452)" @on-load="onLoad">
+            <template slot="menuLeft">
+                <el-button type="success" size="small" plain @click="Export">导出</el-button>
+            </template>
+            <template slot="header">
+                <avue-crud :data="commodityData" :table-loading="itemLoading" :option="itemOption"></avue-crud>
+            </template>
+            <template slot="billNo" slot-scope="{row}">
+                <span
+                    style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
+                    @click.stop="rowCell(row)">
+                    {{ row.billNo }}
+                </span>
+            </template>
+            <template slot="mblno" slot-scope="{row}">
+                <span
+                    style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
+                    @click.stop="rowCell(row)">
+                    {{ row.mblno }}
+                </span>
+            </template>
+            <template slot="srcNo" slot-scope="{row}">
+                <span
+                    style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
+                    @click.stop="rowCell(row)">
+                    {{ row.srcNo }}
+                </span>
+            </template>
+        </avue-crud>
+    </basic-container>
+</template>
+
+<script>
+import { getList, boxNumberProfitStatisticsSum } from "@/api/iosBasicData/costStatistics";
+import { getToken } from "@/util/auth";
+export default {
+    data() {
+        return {
+            form: {},
+            query: {},
+            loading: false,
+            itemLoading: false,
+            page: {
+                pageSize: 20,
+                currentPage: 1,
+                total: 0
+            },
+            selectionList: [],
+            option: {},
+            optionBack: {
+                height: '600px',
+                calcHeight: 30,
+                searchShow: true,
+                searchMenuSpan: 18,
+                border: true,
+                index: true,
+                addBtn: false,
+                menu: false,
+                searchIcon: true,
+                searchIndex: 3,
+                dialogClickModal: false,
+                emptyBtnText: '清空所有条件',
+                column: [
+                    {
+                        label: "提单号",
+                        prop: "mblno",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
+                        label: "合同号",
+                        prop: "billNo",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
+                        label: "委托编号",
+                        prop: "srcNo",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
+                        label: "箱号",
+                        prop: "srcNo",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
+                        label: "客户名称",
+                        prop: "corpName",
+                        type: 'select',
+                        search: true,
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'id',
+                            res: 'data.records'
+                        },
+                        overHidden: true,
+                    },
+                    {
+                        label: "入库日期",
+                        prop: "billDate",
+                        overHidden: true,
+                        searchProp: "etdList",
+                        type: "date",
+                        unlinkPanels: true,
+                        searchRange: true,
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        searchDefaultTime: ["00:00:00", "23:59:59"],
+                    },
+                    {
+                        label: "货物名称",
+                        prop: "feeName",
+                        search: true,
+                        type: 'select',
+                        filterable: true,
+                        multiple: true,
+                        tags: true,
+                        dataType: 'string',
+                        dicUrl: '/api/blade-los/bfees/listAll',
+                        overHidden: true,
+                        props: {
+                            label: "cnName",
+                            value: "cnName"
+                        },
+                    },
+                    {
+                        label: "仓库",
+                        prop: "amount",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
+                        label: "入库件数",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "入库净重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "入库毛重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "出库件数",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "出库净重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "出库毛重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "结余件数",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "结余净重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "结余毛重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "结余金额",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        overHidden: true,
+                    },
+                    {
+                        label: "显示0库存",
+                        prop: "remarks",
+                        search: true,
+                        overHidden: true,
+                        hide:true,
+                        showColumn:false,
+                    }
+                ]
+            },
+            data: [],
+            commodityData: [],
+            itemOption: {
+                border: true,
+                align: 'center',
+                header: false,
+                menu: false,
+                height: '90',
+                column: [
+                    {
+                        label: "入库件数",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "入库净重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "入库毛重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "出库件数",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "出库净重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "出库毛重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "结余件数",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "结余净重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "结余毛重",
+                        prop: "amount",
+                        overHidden: true,
+                    },
+                    {
+                        label: "结余金额",
+                        prop: "amount",
+                        overHidden: true,
+                    }
+                ]
+            },
+        };
+    },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(452), this.optionBack)
+    },
+    methods: {
+        rowCell(row) {
+            if (row.type == 'MYDL') {
+                if (this.$store.getters.mydlTStatus) {
+                    this.$alert("贸易代理(T)页面已存在,请关闭贸易代理(T)再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/tradeAgency/tradeAgency/index`,
+                        query: {
+                            params: row.srcId
+                        }
+                    })
+                }
+
+            }
+            if (row.type == 'SE') {
+                if (this.$store.getters.seaFEStatus) {
+                    this.$alert("海运出口页面已存在,请关闭海运出口再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/SeafreightExportF/bills/index`,
+                        query: {
+                            id: row.srcId
+                        }
+                    })
+                }
+            }
+            if (row.type == 'ASE') {
+                if (this.$store.getters.SFEStatus) {
+                    this.$alert("SEAMEND页面已存在,请关闭SEAMEND再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/seamends/index`,
+                        query: {
+                            id: row.srcId
+                        }
+                    })
+                }
+            }
+            if (row.type == 'SI') {
+                if (this.$store.getters.OceanFIStatus) {
+                    this.$alert("海运进口页面已存在,请关闭海运进口再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/OceanFreightImport/bills/index`,
+                        query: {
+                            id: row.srcId
+                        }
+                    })
+                }
+            }
+            if (row.type == 'ASI') {
+                if (this.$store.getters.OFIStatus) {
+                    this.$alert("SIAMEND页面已存在,请关闭SIAMEND再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/siamends/index`,
+                        query: {
+                            id: row.srcId
+                        }
+                    })
+                }
+            }
+        },
+        searchReset() {
+            this.query = {};
+            this.onLoad(this.page);
+        },
+        // 搜索点击回调
+        searchChange(params, done) {
+            this.page.currentPage = 1;
+            if (params.etdList) {
+                params = {
+                    ...params,
+                    startDate: params.etdList[0],
+                    endDate: params.etdList[1],
+                }
+            }
+            this.query = params
+            this.onLoad(this.page, params);
+            done();
+        },
+        selectionChange(list) {
+            this.selectionList = list;
+        },
+        currentChange(currentPage) {
+            this.page.currentPage = currentPage;
+        },
+        sizeChange(pageSize) {
+            this.page.pageSize = pageSize;
+        },
+        refreshChange() {
+            this.onLoad(this.page, this.query);
+        },
+        onLoad(page, params = {}) {
+            if (params.etdList) {
+                params = {
+                    ...params,
+                    startDate: params.etdList[0],
+                    endDate: params.etdList[1],
+                }
+            }
+            this.loading = true;
+            getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+                this.page.total = res.data.data.total;
+                this.data = res.data.data.records
+                this.getStatisticsSum(Object.assign(params, this.query))
+                this.$nextTick(() => {
+                    this.$refs.crud.refreshTable()
+                    this.$refs.crud.dicInit()
+                })
+            }).finally(() => {
+                this.loading = false;
+            })
+        },
+        getStatisticsSum(params) {
+            this.itemLoading = true
+            boxNumberProfitStatisticsSum(params).then(res => {
+                this.commodityData = [res.data.data]
+            }).finally(() => {
+                this.itemLoading = false;
+            })
+        },
+        Export() {
+            const routeData = this.$router.resolve({
+                path: '/api/blade-los/financeStatistics/feeSettlementExport',//跳转目标窗口的地址
+                query: {
+                    'Blade-Auth': getToken(),
+                    ...this.query
+                }
+            })
+            window.open(routeData.href.slice(1, routeData.href.length));
+        },
+        //自定义列保存
+        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;
+            }
+        },
+
+        // 更改表格颜色
+        headerClassName(tab) {
+            //颜色间隔
+            let back = ""
+            if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                if (tab.columnIndex % 2 === 0) {
+                    back = "back-one"
+                } else if (tab.columnIndex % 2 === 1) {
+                    back = "back-two"
+                }
+            }
+            return back;
+        },
+    }
+};
+</script>
+
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+
+::v-deep .el-col-md-8 {
+    width: 24.33333%;
+}
+
+::v-deep.el-form-item {
+    margin-bottom: 0;
+}
+</style>

src/views/landTransportation/bulkCargo/index.vue

@@ -1,105 +1,106 @@
 <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 || 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 || roleName.indexOf('散货经理') !== -1 || 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>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('0')">
               <div class="card">
                 <div class="card-title card-title7">
-                <span>
-                  提
-                </span>
+                  <span>
+                    提
+                  </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '0'?'selected':''">{{ totalData.last }}</span>
-                  <span class="card-content-text" :class="activeName === '0'?'selected':''">未提交</span>
+                  <span class="card-content-num" :class="activeName === '0' ? 'selected' : ''">{{ totalData.last }}</span>
+                  <span class="card-content-text" :class="activeName === '0' ? 'selected' : ''">未提交</span>
                 </div>
               </div>
             </div>
-            <div class="divider"/>
+            <div class="divider" />
             <div class="content-item" @click="handleClick('1')">
               <div class="card">
                 <div class="card-title card-title2">
-                <span>
-                  调
-                </span>
+                  <span>
+                    调
+                  </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '1'?'selected':''">{{ totalData.zero }}</span>
-                  <span class="card-content-text" :class="activeName === '1'?'selected':''">未调度</span>
+                  <span class="card-content-num" :class="activeName === '1' ? 'selected' : ''">{{ totalData.zero }}</span>
+                  <span class="card-content-text" :class="activeName === '1' ? 'selected' : ''">未调度</span>
                 </div>
               </div>
             </div>
-            <div class="divider"/>
+            <div class="divider" />
             <div class="content-item" @click="handleClick('2')">
               <div class="card">
                 <div class="card-title card-title3">
-                <span>
-                  派
-                </span>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('3')">
               <div class="card">
                 <div class="card-title card-title4">
-                <span>
-                  受
-                </span>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('4,6')">
               <div class="card">
                 <div class="card-title card-title5">
-                <span>
-                  完
-                </span>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('5')">
               <div class="card">
                 <div class="card-title card-title6">
-                    <span>
-                      工
-                    </span>
+                  <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>
+                  <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>
@@ -112,71 +113,71 @@
             <div class="content-item" @click="handleClick('')">
               <div class="card">
                 <div class="card-title card-title1">
-                <span>
-                  全
-                </span>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('2')">
               <div class="card">
                 <div class="card-title card-title3">
-                <span>
-                  派
-                </span>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('3')">
               <div class="card">
                 <div class="card-title card-title4">
-                <span>
-                  受
-                </span>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('4,6')">
               <div class="card">
                 <div class="card-title card-title5">
-                <span>
-                  完
-                </span>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('5')">
               <div class="card">
                 <div class="card-title card-title6">
-                    <span>
-                      工
-                    </span>
+                  <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>
+                  <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>
@@ -189,57 +190,57 @@
             <div class="content-item" @click="handleClick('')">
               <div class="card">
                 <div class="card-title card-title1">
-                <span>
-                  全
-                </span>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('3')">
               <div class="card">
                 <div class="card-title card-title4">
-                <span>
-                  受
-                </span>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('4,6')">
               <div class="card">
                 <div class="card-title card-title5">
-                <span>
-                  完
-                </span>
+                  <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>
+                  <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="divider" />
             <div class="content-item" @click="handleClick('5')">
               <div class="card">
                 <div class="card-title card-title6">
-                    <span>
-                      工
-                    </span>
+                  <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>
+                  <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>
@@ -248,24 +249,12 @@
       </div>
     </basic-container>
     <basic-container v-show="show">
-      <avue-crud
-          :key="key"
-          :table-loading="loading"
-          :page.sync="page"
-          :data="dataList"
-          ref="crud"
-          :option="option"
-          :search.sync="query"
-          @on-load="onLoad"
-          @row-del="rowDel"
-          @search-reset="query={};activeName = ''"
-          @selection-change="selectionChange"
-          @resetColumn="resetColumn"
-          @saveColumn="saveColumn"
-          @search-criteria-switch="searchCriteriaSwitch"
-          @search-change="searchChange">
+      <avue-crud :key="key" :table-loading="loading" :page.sync="page" :data="dataList" ref="crud" :option="option"
+        :search.sync="query" @on-load="onLoad" @row-del="rowDel" @search-reset="query = {}; activeName = ''"
+        @selection-change="selectionChange" @resetColumn="resetColumn" @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 || roleName.indexOf('演示账号') !== -1">
+          v-if="roleName.indexOf('客户') !== -1 || roleName.indexOf('分管调度') !== -1 || roleName.indexOf('administrator') !== -1 || roleName.indexOf('admin') !== -1 || roleName.indexOf('演示账号') !== -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>
@@ -275,11 +264,7 @@
           <span class="el-button--text" style="cursor: pointer" @click="openTrack(row)">{{ row.plateNo }}</span>
         </template>
         <template slot="corpShortNameSearch" slot-scope="{ row,index}">
-          <crop-select
-              v-model="row.corpId"
-              :corpType="'KH'"
-              :label="'shortName'"
-          ></crop-select>
+          <crop-select v-model="row.corpId" :corpType="'KH'" :label="'shortName'"></crop-select>
         </template>
         <!--        <template slot="corpNameSearch" slot-scope="{ row,index}">-->
         <!--          <crop-select-->
@@ -299,51 +284,40 @@
           </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 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 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>
         </template>
         <template slot="corpShortName" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer"
-                @click.stop="rowCell(row,index)">{{ row.corpShortName }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.corpShortName
+            }}</span>
         </template>
         <template slot="dispatchNumber" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer"
-                @click.stop="rowCell(row,index)">{{ row.dispatchNumber }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.dispatchNumber
+            }}</span>
         </template>
         <template slot="orderNo" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer"
-                @click.stop="rowCell(row,index)">{{ row.orderNo }}</span>
+          <span class="el-button--text" style="cursor: pointer" @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>
     <detail-page v-if="!show" @backToList="backToList" :id="id" :home="home"></detail-page>
-    <el-dialog
-        title="实时位置"
-        append-to-body
-        custom-class="dialog_two"
-        :visible.sync="dialogVisible"
-        lock-scroll
-        width="80%">
+    <el-dialog title="实时位置" append-to-body custom-class="dialog_two" :visible.sync="dialogVisible" lock-scroll
+      width="80%">
       <div id="container"></div>
     </el-dialog>
   </div>
@@ -351,20 +325,20 @@
 
 <script>
 import detailPage from './detailPage'
-import {getSalesman, removeDelegationList, selectInvoiceList, totalList} from "@/api/landTransportation/bulkCargo";
-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";
+import { getSalesman, removeDelegationList, selectInvoiceList, totalList } from "@/api/landTransportation/bulkCargo";
+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",
   components: {
     detailPage
   },
-  watch:{
-    option:{
+  watch: {
+    option: {
       handler(newValue, oldValue) {
         if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
           this.findObject(this.option.column, "freightCollect").hide = true
@@ -575,8 +549,69 @@ export default {
             searchProp: 'orderNo',
             filterable: true,
             search: true,
-            hide:true,
-          }]
+            hide: true,
+          }, 
+          {
+            label: '结算金额(收)',
+            width: 100,
+            index: 18,
+            prop: 'settlementAmountD'
+          }, 
+          {
+            label: '结算时间(收)',
+            width: 100,
+            index: 19,
+            prop: 'settlementDateD',
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+          }, 
+          {
+            label: '结算金额(付)',
+            width: 100,
+            index: 20,
+            prop: 'settlementAmountC'
+          }, 
+          {
+            label: '结算时间(付)',
+            width: 100,
+            index: 21,
+            prop: 'settlementDateC',
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+          }, 
+          {
+            label: '对账金额(收)',
+            width: 100,
+            index: 22,
+            prop: 'reconciliationAmountD'
+          }, 
+          {
+            label: '对账时间(收)',
+            width: 100,
+            index: 23,
+            prop: 'reconciliationDateD',
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+          }, 
+          {
+            label: '对账金额(付)',
+            width: 100,
+            index: 24,
+            prop: 'reconciliationAmountC'
+          }, 
+          {
+            label: '对账时间(付)',
+            width: 100,
+            index: 25,
+            prop: 'reconciliationDateC',
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+          },
+        ]
       },
       //调度
       optionListTwo: {
@@ -740,7 +775,8 @@ export default {
             index: 17,
             width: 135,
             search: true,
-          }]
+          }
+        ]
       },
       optionListThree: {
         align: 'center',
@@ -1065,10 +1101,10 @@ export default {
       roleName: localStorage.getItem("roleName").split(','),
     }
   },
-  
+
   activated() {
     if (this.$route.query.id) {
-      this.rowCell({id: this.$route.query.id}, 0)
+      this.rowCell({ id: this.$route.query.id }, 0)
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
       this.home = true
     }
@@ -1078,7 +1114,7 @@ export default {
     // this.option = this.optionListTwo
     // this.option = this.optionListThree
     this.query = {
-      arrivalTime: [defaultDate(4)[0] + ' 00:00:00',defaultDate(4)[1] + ' 23:59:59']
+      arrivalTime: [defaultDate(4)[0] + ' 00:00:00', defaultDate(4)[1] + ' 23:59:59']
     }
     if (this.roleName.indexOf('客户') !== -1 || this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('散货经理') !== -1) {
       this.activeName = '0'
@@ -1133,7 +1169,7 @@ export default {
   },
   methods: {
     openTrack(row) {
-      location({itemId: row.itemId, plateNo: row.plateNo, tenantId: '234557', color: '2'}).then(res => {
+      location({ itemId: row.itemId, plateNo: row.plateNo, tenantId: '234557', color: '2' }).then(res => {
         this.dialogVisible = true
         let this_ = this
         setTimeout(function () {
@@ -1147,7 +1183,7 @@ export default {
     },
     initMap(data, plateNo) {
       this.map = null
-      this.map = new AMap.Map("container", {resizeEnable: true});
+      this.map = new AMap.Map("container", { resizeEnable: true });
       this.infoWindow = new AMap.InfoWindow({
         ffset: new AMap.Pixel(0, -30),
         offset: new AMap.Pixel(0, -30)
@@ -1167,20 +1203,20 @@ export default {
         angle: -15
       });
       this.marker.content = '<div style="width: 300px;">'
-          + '<p style="font-size: 22px;font-weight: bold;background-color: #2d8cf0;color: #fff;">' + plateNo + '</p>'
-          + '<p style="padding: 5px 0"><span style="color: #a0a0a0">最后上报时间:</span>' + new Date(Number(data.time) + 8 * 60 * 60 * 1000).toJSON().split('T').join(' ').substr(0, 19) + '</p>'
-          + '<div style="width: 150px;float: left;">'
-          + '<p style="padding: 5px 0"><span style="color: #a0a0a0">车辆状态:</span>' + (data.speed > 0 ? '行驶中' : '停车') + '</p>'
-          + '</div>'
-          + '<div style="width: 150px;float: right;">'
-          + '<p style="padding: 5px 0"><span style="color: #a0a0a0">速度:</span>' + data.speed + 'km/h</p>'
-          + '</div>'
-          + '<p><span style="color: #a0a0a0">当前位置:</span>' + data.address + '</p>'
-          + '<p style="padding: 5px 0"><span style="color: #a0a0a0">经纬度:</span>' + data.location.join(',') + '</p>'
-          + '</div>'
+        + '<p style="font-size: 22px;font-weight: bold;background-color: #2d8cf0;color: #fff;">' + plateNo + '</p>'
+        + '<p style="padding: 5px 0"><span style="color: #a0a0a0">最后上报时间:</span>' + new Date(Number(data.time) + 8 * 60 * 60 * 1000).toJSON().split('T').join(' ').substr(0, 19) + '</p>'
+        + '<div style="width: 150px;float: left;">'
+        + '<p style="padding: 5px 0"><span style="color: #a0a0a0">车辆状态:</span>' + (data.speed > 0 ? '行驶中' : '停车') + '</p>'
+        + '</div>'
+        + '<div style="width: 150px;float: right;">'
+        + '<p style="padding: 5px 0"><span style="color: #a0a0a0">速度:</span>' + data.speed + 'km/h</p>'
+        + '</div>'
+        + '<p><span style="color: #a0a0a0">当前位置:</span>' + data.address + '</p>'
+        + '<p style="padding: 5px 0"><span style="color: #a0a0a0">经纬度:</span>' + data.location.join(',') + '</p>'
+        + '</div>'
       this.infoWindow.open(this.map, this.map.getCenter());
       this.marker.on('click', this.markerClick);
-      this.marker.emit('click', {target: this.marker});
+      this.marker.emit('click', { target: this.marker });
       this.map.setFitView();
     },
     selectionChange(list) {
@@ -1277,7 +1313,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        removeDelegationList({ids: row.id}).then(res => {
+        removeDelegationList({ ids: row.id }).then(res => {
           this.$message.success('删除成功');
           this.onLoad(this.page)
         })

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -786,7 +786,10 @@ export default {
           label: '结算时间(收)',
           width: 100,
           index: 19,
-          prop: 'settlementDateD'
+          prop: 'settlementDateD',
+          type: "date",
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
         }, {
           label: '结算金额(付)',
           width: 100,
@@ -796,21 +799,52 @@ export default {
           label: '结算时间(付)',
           width: 100,
           index: 21,
-          prop: 'settlementDateC'
+          prop: 'settlementDateC',
+          type: "date",
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
+        },  {
+          label: '对账金额(收)',
+          width: 100,
+          index: 22,
+          prop: 'reconciliationAmountD'
+        }, {
+          label: '对账时间(收)',
+          width: 100,
+          index: 23,
+          prop: 'reconciliationDateD',
+          type: "date",
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
         }, {
+          label: '对账金额(付)',
+          width: 100,
+          index: 24,
+          prop: 'reconciliationAmountC'
+        }, {
+          label: '对账时间(付)',
+          width: 100,
+          index: 25,
+          prop: 'reconciliationDateC',
+          type: "date",
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
+        }, 
+        {
           label: '委托备注',
           width: 245,
-          index: 22,
+          index: 26,
           prop: 'remarks'
-        }, {
+        }, 
+        {
           label: '车队备注',
           width: 245,
-          index: 23,
+          index: 27,
           prop: 'fleetRemarks'
         }, {
           label: '司机备注',
           width: 245,
-          index: 24,
+          index: 28,
           prop: 'driverRemarks'
         },
           // {
@@ -1247,11 +1281,27 @@ export default {
         },
         {
           label: '结算金额',
-          type: 'settlementAmount',
+          prop: 'settlementAmount',
         },
         {
           label: '结算时间',
-          type: 'settlementDate',
+          prop: 'settlementDate',
+          type: "date",
+          width:100,
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
+        },
+        {
+          label: '对账金额',
+          prop: 'reconciliationAmount',
+        },
+        {
+          label: '对账时间',
+          prop: 'reconciliationDate',
+          type: "date",
+          width:100,
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
         }
         ]
       },
@@ -1364,11 +1414,27 @@ export default {
         },
         {
           label: '结算金额',
-          type: 'settlementAmount',
+          prop: 'settlementAmount',
         },
         {
           label: '结算时间',
-          type: 'settlementDate',
+          prop: 'settlementDate',
+          type: "date",
+          width:100,
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
+        },
+        {
+          label: '对账金额',
+          prop: 'reconciliationAmount',
+        },
+        {
+          label: '对账时间',
+          prop: 'reconciliationDate',
+          type: "date",
+          width:100,
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
         }
         ]
       },