diff --git a/src/views/allocation/allocationList.vue b/src/views/allocation/allocationList.vue
index 1a6d831..6330fe5 100644
--- a/src/views/allocation/allocationList.vue
+++ b/src/views/allocation/allocationList.vue
@@ -559,7 +559,10 @@
-
+
+
+
+
diff --git a/src/views/travelConf/add-or-update.vue b/src/views/travelConf/add-or-update.vue
index 343d66e..edfbf0b 100644
--- a/src/views/travelConf/add-or-update.vue
+++ b/src/views/travelConf/add-or-update.vue
@@ -35,28 +35,28 @@
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
往返
@@ -64,7 +64,7 @@
-
+
@@ -161,19 +161,8 @@
let cleanField = [];
if(saveData.pricingType == 1){
cleanField = [ 'seasonsType', 'timeIntervalType', 'startingPrice', 'freeKilometers', 'nightTravelExpenses', 'pricePerKilometer' ];
- if(saveData.travelType == 1) {
- //免费的，重置价格
- saveData.fixedPrice = 0;
- }
}else if(saveData.pricingType == 2) {
cleanField = [ 'fixedType', 'fixedPrice' ];
- if(saveData.travelType == 1) {
- //免费的，重置价格
- saveData.startingPrice = 0;
- saveData.freeKilometers = 0;
- saveData.nightTravelExpenses = 0;
- saveData.pricePerKilometer = 0;
- }
}
if(cleanField.length){
cleanField.forEach(key => {
diff --git a/src/views/travelConf/index.vue b/src/views/travelConf/index.vue
index 2aed6a9..39130c6 100644
--- a/src/views/travelConf/index.vue
+++ b/src/views/travelConf/index.vue
@@ -33,7 +33,7 @@
查询
-
+
@@ -66,14 +66,19 @@
夜间
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 往返
+ 单程
+
+
+
+
修改
@@ -164,31 +169,43 @@
},
// 删除
deleteHandle(id) {
- let ids = (id ? [id] : this.dataListSelections.map(item => item.id)).join(',');
- this.$confirm(`确定[${id ? '删除' : '批量删除'}]操作?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
- this.$http({
- url: this.$http.adornUrl('travelConf/deleteById' + (id?'':'s')),
- method: 'delete',
- params: this.$http.adornParams({ id: ids}, false)
- }).then(({ data }) => {
- if (data && data.code === 0) {
- this.$message({
- message: '操作成功',
- type: 'success',
- duration: 1500,
- onClose: () => {
- this.getDataList()
- }
- })
- } else {
- this.$message.error(data.msg)
- }
- })
- }).catch(() => {})
+ // let ids = (id ? [id] : this.dataListSelections.map(item => item.id)).join(',');
+ // this.$confirm(`确定[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+ // confirmButtonText: '确定',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // }).then(() => {
+ // this.$http({
+ // url: this.$http.adornUrl('travelConf/deleteById' + (id?'':'s')),
+ // method: 'delete',
+ // params: this.$http.adornParams({ id: ids}, false)
+ // }).then(({ data }) => {
+ // if (data && data.code === 0) {
+ // this.$message({
+ // message: '操作成功',
+ // type: 'success',
+ // duration: 1500,
+ // onClose: () => {
+ // this.getDataList()
+ // }
+ // })
+ // } else {
+ // this.$message.error(data.msg)
+ // }
+ // })
+ // }).catch(() => {})
+
+ this.$http({
+ url: this.$http.adornUrl('travelConf/getTaxiMoney'),
+ method: 'get',
+ params: this.$http.adornParams({ artificerId: 116,toLongitude:"125.423736",toLatitude:"43.878001"}, false)
+ }).then(({ data }) => {
+ if (data && data.code === 0) {
+ console.log(data.data);
+ } else {
+ this.$message.error(data.msg)
+ }
+ })
}
}
}