From 649377c926979e7607960e0cf4c6d97d26080403 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期一, 29 十一月 2021 08:37:54 +0800
Subject: [PATCH] 报表
---
src/views/your/area-manage/areaManage.vue | 20 ++++-----
src/views/your/carRepairCost-manage/carRepairCostManage.vue | 8 +++-
src/views/your/customerReceive-manage/customerReceive.vue | 2
src/views/your/accident-manage/accidentManage.vue | 2
src/views/your/carCost-manage/carCostManage.vue | 8 +++-
src/views/your/addOil-manage/addOilManage.vue | 11 ++---
src/views/your/suggest-manage/suggestManage.vue | 10 +++-
src/views/your/carInfo-manage/carInfoManage.vue | 8 +++-
8 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/src/views/your/accident-manage/accidentManage.vue b/src/views/your/accident-manage/accidentManage.vue
index edede87..6e9122c 100644
--- a/src/views/your/accident-manage/accidentManage.vue
+++ b/src/views/your/accident-manage/accidentManage.vue
@@ -62,7 +62,7 @@
<Form
ref="accidentForm"
:model="accidentForm"
- :label-width="80"
+ :label-width="100"
:rules="accidentFormValidate"
>
<FormItem label="杞﹁締" prop="carId">
diff --git a/src/views/your/addOil-manage/addOilManage.vue b/src/views/your/addOil-manage/addOilManage.vue
index 1cd128a..32d6b64 100644
--- a/src/views/your/addOil-manage/addOilManage.vue
+++ b/src/views/your/addOil-manage/addOilManage.vue
@@ -274,19 +274,18 @@
{
title: "杞︾墝鍙�",
key: "carNo",
- width: 100,
+ width: 120,
sortable: true,
},
{
title: "鍔犳补鍗″彿",
key: "addOilCode",
width: 100,
- sortable: true,
},
{
title: "鍔犳补鏃ユ湡",
key: "addDate",
- width: 150,
+ width: 120,
sortable: true,
},
{
@@ -304,13 +303,13 @@
{
title: "鍔犳补閲戦",
key: "money",
- minWidth: 100,
+ minWidth: 120,
sortable: true,
},
{
title: "鍔犳补鏃堕噷绋�",
key: "mileage",
- minWidth: 100,
+ minWidth: 130,
sortable: true,
},
{
@@ -446,7 +445,7 @@
this.loading = false;
if (res.success) {
this.data = res.result.records;
- this.total = res.result.length;
+ this.total = res.result.total;
}
});
},
diff --git a/src/views/your/area-manage/areaManage.vue b/src/views/your/area-manage/areaManage.vue
index 8b49c36..2277c71 100644
--- a/src/views/your/area-manage/areaManage.vue
+++ b/src/views/your/area-manage/areaManage.vue
@@ -84,10 +84,8 @@
<Button @click="addEquipment" type="primary" icon="md-add">娣诲姞鐗囧尯娈�</Button>
<Button @click="init" icon="md-refresh">鍒锋柊</Button>
</Row>
- <Table :loading="loading" border :columns="columns2" :data="data2" ref="table"
- sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-
-
+ <Table :loading="loading" border :columns="columns2" :data="data2" ref="table" style="height: 400px" >
+ sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect" >
</Table>
</Modal>
<Modal :title="modalTitle3" v-model="customerVisible" :mask-closable="false" :width="1050">
@@ -97,7 +95,7 @@
<Input v-model="searchForm.name" suffix="ios-search" @on-change="getCustList" placeholder="杈撳叆鍟嗘埛鍚嶇О鎼滅储" clearable style="width: 250px"
/>
</Row>
- <Table :loading="loading" border :columns="columns3" :data="data3" ref="table"
+ <Table :loading="loading" border :columns="columns3" :data="data3" ref="table" style="height: 350px"
sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
</Table>
<Row type="flex" justify="end" class="page">
@@ -113,10 +111,10 @@
></Page>
</Row>
</Modal>
- <Modal :title="modalTitle" v-model="addEquipmentVisible" :mask-closable="false" :width="500">
+ <Modal :title="modalTitle" v-model="addEquipmentVisible" :mask-closable="false" :width="500" >
<Form ref="areaSectionForm" :model="areaSectionForm" :label-width="80" :rules="areaSectionFormValidate">
<FormItem label="鐗囧尯鍚嶇О" prop="code">
- <Input v-model="areaSectionForm.code" />
+ <Input v-model="areaSectionForm.name" />
</FormItem>
</Form>
@@ -128,7 +126,7 @@
</div>
</Modal>
<Modal :title="modalTitle" v-model="addCustomerVisible" :mask-closable="false" :width="550">
- <Form ref="customerForm" :model="customerForm" :label-width="80" :rules="areaSectionFormValidate">
+ <Form ref="customerForm" :model="customerForm" :label-width="120" :rules="areaSectionFormValidate">
<FormItem label="鍟嗘埛鍚嶇О" prop="name">
<Input v-model="customerForm.name" />
</FormItem>
@@ -171,7 +169,7 @@
<FormItem label="鑱旂郴浜�" prop="linker">
<Input v-model="customerForm.linker" />
</FormItem>
- <FormItem label="闆跺敭璁稿彲璇佷俊鎭�" prop="licence">
+ <FormItem label="闆跺敭璁稿彲璇佷俊鎭�" prop="licence" >
<Input v-model="customerForm.licence" />
</FormItem>
</Form>
@@ -434,8 +432,8 @@
align: "center",
},
{
- title: "鍒嗘缂栧彿鎴栧悕绉�",
- key: "code",
+ title: "鍒嗘鍚嶇О",
+ key: "name",
},
{
title: "鎿嶄綔",
diff --git a/src/views/your/carCost-manage/carCostManage.vue b/src/views/your/carCost-manage/carCostManage.vue
index c483b3f..311f36c 100644
--- a/src/views/your/carCost-manage/carCostManage.vue
+++ b/src/views/your/carCost-manage/carCostManage.vue
@@ -473,8 +473,12 @@
this.searchForm.endTime = this.selectDate(this.value[1]);
this.page=false;
}else{
- this.searchForm.beginTime = "";
- this.searchForm.endTime = "";
+ var date = new Date();
+ this.searchForm.endTime = this.selectDate(date);
+ this.value[1] = this.searchForm.endTime;
+ date.setDate(1);
+ this.value[0] = date;
+ this.searchForm.beginTime = this.selectDate(date);
}
getOilExcel(this.searchForm).then((res) => {
this.loading = false;
diff --git a/src/views/your/carInfo-manage/carInfoManage.vue b/src/views/your/carInfo-manage/carInfoManage.vue
index 217e4b9..bf40a19 100644
--- a/src/views/your/carInfo-manage/carInfoManage.vue
+++ b/src/views/your/carInfo-manage/carInfoManage.vue
@@ -454,8 +454,12 @@
this.searchForm.beginTime = this.selectDate(this.value[0]);
this.searchForm.endTime = this.selectDate(this.value[1]);
}else{
- this.searchForm.beginTime = "";
- this.searchForm.endTime = "";
+ var date = new Date();
+ this.searchForm.endTime = this.selectDate(date);
+ this.value[1] = this.searchForm.endTime;
+ date.setDate(1);
+ this.value[0] = date;
+ this.searchForm.beginTime = this.selectDate(date);
}
getCar(this.searchForm).then((res) => {
this.loading = false;
diff --git a/src/views/your/carRepairCost-manage/carRepairCostManage.vue b/src/views/your/carRepairCost-manage/carRepairCostManage.vue
index fdefd04..30cd7a9 100644
--- a/src/views/your/carRepairCost-manage/carRepairCostManage.vue
+++ b/src/views/your/carRepairCost-manage/carRepairCostManage.vue
@@ -502,8 +502,12 @@
this.searchForm.endTime = this.selectDate(this.value[1]);
this.page=false;
}else{
- this.searchForm.beginTime = "";
- this.searchForm.endTime = "";
+ var date = new Date();
+ this.searchForm.endTime = this.selectDate(date);
+ this.value[1] = this.searchForm.endTime;
+ date.setDate(1);
+ this.value[0] = date;
+ this.searchForm.beginTime = this.selectDate(date);
}
getInfo(this.searchForm).then((res) => {
this.loading = false;
diff --git a/src/views/your/customerReceive-manage/customerReceive.vue b/src/views/your/customerReceive-manage/customerReceive.vue
index 049c674..c304e1f 100644
--- a/src/views/your/customerReceive-manage/customerReceive.vue
+++ b/src/views/your/customerReceive-manage/customerReceive.vue
@@ -243,7 +243,7 @@
{
title: "鍟嗘埛鍚嶇О",
key: "customerName",
- width: 100,
+ width: 240,
},
{
title: "鎺ヨ揣浜�",
diff --git a/src/views/your/suggest-manage/suggestManage.vue b/src/views/your/suggest-manage/suggestManage.vue
index de4a354..ccb4ae3 100644
--- a/src/views/your/suggest-manage/suggestManage.vue
+++ b/src/views/your/suggest-manage/suggestManage.vue
@@ -263,18 +263,22 @@
{
title: "鍐呭",
key: "content",
- width: 200,
+ tooltip:true,
+ width: 230,
},
{
title: "鍙嶉鏃堕棿",
key: "createTime",
- width: 240,
+ width: 200,
sortable: true,
+ render: (h, params) => {
+ return h("div",params.row.createTime.substr(0,10));
+ }
},
{
title: "鍙嶉鍟嗘埛",
key: "name",
- width: 150,
+ width: 260,
},
{
title: "鎿嶄綔",
--
Gitblit v1.9.1