diff --git a/src/api/rescue/info.js b/src/api/rescue/info.js
index a3b4c0e..fbc190c 100644
--- a/src/api/rescue/info.js
+++ b/src/api/rescue/info.js
@@ -100,3 +100,13 @@ export function downloadOrder(params) {
responseType: 'blob'
})
}
+
+export function exportManagement(params) {
+ return request({
+ url: '/system/rescueInfo/exportManagement',
+ method: 'get',
+ params,
+ responseType: 'blob'
+ })
+}
+
diff --git a/src/views/company/staff/index.vue b/src/views/company/staff/index.vue
index c88fda8..bd35f61 100644
--- a/src/views/company/staff/index.vue
+++ b/src/views/company/staff/index.vue
@@ -2,6 +2,11 @@
+
+
+ {{ scope.$index + 1 }}
+
+
@@ -86,6 +91,9 @@
>新增
+
+
+
{
+ // console.log(res)
+ // })
+ // }
}
}
diff --git a/src/views/rescue/customerDriverIndex.vue b/src/views/rescue/customerDriverIndex.vue
index c20bec6..18286af 100644
--- a/src/views/rescue/customerDriverIndex.vue
+++ b/src/views/rescue/customerDriverIndex.vue
@@ -336,9 +336,9 @@ import {
handleUpdate(row) {
const data = {
...row,
- firstDriverIds: row.firstDriverIds.split(",").map(id => parseInt(id)),
- secondDriverIds: row.secondDriverIds.split(",").map(id => parseInt(id)),
- thirdDriverIds: row.thirdDriverIds.split(",").map(id => parseInt(id))
+ firstDriverIds: row.firstDriverIds ? row.firstDriverIds.split(",").map(id => parseInt(id)) : "",
+ secondDriverIds: row.secondDriverIds ? row.secondDriverIds.split(",").map(id => parseInt(id)) : "",
+ thirdDriverIds: row.thirdDriverIds ? row.thirdDriverIds.split(",").map(id => parseInt(id)) : ""
}
this.form = data
// console.log(this.form)
@@ -351,9 +351,9 @@ import {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
- this.form.firstDriverIds = this.form.firstDriverIds.join(",")
- this.form.secondDriverIds = this.form.secondDriverIds.join(",")
- this.form.thirdDriverIds = this.form.thirdDriverIds.join(",")
+ this.form.firstDriverIds = this.form.firstDriverIds ? this.form.firstDriverIds.join(",") : null
+ this.form.secondDriverIds = this.form.secondDriverIds ? this.form.secondDriverIds.join(",") : null
+ this.form.thirdDriverIds = this.form.thirdDriverIds ? this.form.thirdDriverIds.join(",") : null
edept_driver(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
diff --git a/src/views/rescue/driverIndex.vue b/src/views/rescue/driverIndex.vue
index 6ca3563..06d608c 100644
--- a/src/views/rescue/driverIndex.vue
+++ b/src/views/rescue/driverIndex.vue
@@ -683,14 +683,12 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
- console.log(row)
this.reset()
this.form = row
this.form.realName = row.nickName
- this.carfrom.carInfoList = !!row.carInfoList ? row.carInfoList : this.carfrom.carInfoList
+ this.carfrom.carInfoList = !row.carInfoList ? row.carInfoList : this.carfrom.carInfoList
this.open = true
this.title = '修改司机信息'
-
},
handleAuth(row) {
this.reset()
@@ -706,7 +704,7 @@ export default {
this.$refs['carfrom'].validate(carValid => {
if (carValid) {
if (this.form.id != null) {
- this.form.carInfoList = this.carfrom.carInfoList
+ this.form.carInfoList = this.carfrom.carInfoList.carType
updateDriver(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
diff --git a/src/views/rescue/index.vue b/src/views/rescue/index.vue
index 5b950a8..56249cc 100644
--- a/src/views/rescue/index.vue
+++ b/src/views/rescue/index.vue
@@ -100,7 +100,11 @@
-
+
+
+ {{ scope.$index + 1 }}
+
+
@@ -167,7 +171,7 @@
{{ scope.row.setMoney/100 }}
-
+
{{ scope.row.payMoney/100 }}
@@ -500,7 +504,6 @@ export default {
editInfoFront(type,index){
this.editType =type
this.editIdx =index
-
},
cancelRepayment(){
this.repaymentForm = {}
diff --git a/src/views/rescue/refuelRecord.vue b/src/views/rescue/refuelRecord.vue
index 0063a2b..5f95b88 100644
--- a/src/views/rescue/refuelRecord.vue
+++ b/src/views/rescue/refuelRecord.vue
@@ -29,6 +29,11 @@
+
+
+ {{ scope.$index + 1 }}
+
+
@@ -154,8 +159,8 @@ export default {
getList() {
this.loading = true;
listRefuelRecord(this.queryParams).then(response => {
- this.refuelRecordList = response.rows;
- this.total = response.total;
+ this.refuelRecordList = response.data.records;
+ this.total = response.data.total;
this.loading = false;
});
},
diff --git a/src/views/rescue/rescueCarSpend.vue b/src/views/rescue/rescueCarSpend.vue
index fc21935..44617a7 100644
--- a/src/views/rescue/rescueCarSpend.vue
+++ b/src/views/rescue/rescueCarSpend.vue
@@ -91,7 +91,11 @@
-
+
+
+ {{ scope.$index + 1 }}
+
+
@@ -119,7 +123,7 @@
{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
+
-
+
-
+
+ placeholder="选择月份"
+ >
-
+
+ :picker-options="pickerOptions"
+ >
搜索
重置
- 导出
-
+
+
+ 导出
+
+
+
+
+
+
+
- 施救总金额:{{moneyManagementData.allMoney}} 元
+ 施救总金额:{{ moneyManagementData.allMoney }} 元
- 出车次数:{{moneyManagementData.allNum}} 次
+ 出车次数:{{ moneyManagementData.allNum }} 次
- 提成总金额:{{moneyManagementData.tcAll}} 元
+ 提成总金额:{{ moneyManagementData.tcAll }} 元
- 燃油费小计:{{moneyManagementData.refuelMoney}} 元
+ 燃油费小计:{{ moneyManagementData.refuelMoney }} 元
-
-
-
-
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
{{ parseTime(scope.row.rescueTime, '{y}-{m}-{d} {h}:{m}') }}
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -124,22 +137,24 @@