|
@@ -200,6 +200,10 @@
|
|
|
:disabled="selectionList.length === 0">批量调度
|
|
|
</el-button>
|
|
|
</template>
|
|
|
+ <template slot="plateNo" slot-scope="{row}">
|
|
|
+ <span class="el-button--text" style="cursor: pointer"
|
|
|
+ @click="openTrack(row)">{{ row.plateNo }}</span>
|
|
|
+ </template>
|
|
|
<template slot-scope="{row}" slot="fleetId">
|
|
|
<crop-select
|
|
|
v-if="row.$cellEdit"
|
|
@@ -551,6 +555,7 @@
|
|
|
<el-button type="primary" @click="saveAnnex" size="small">保 存</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
+ <track-playback :dialogVisible="dialogVisibleTwo" :lineArr="lineArr" ref="playback"></track-playback>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -572,6 +577,7 @@ import {
|
|
|
import website from "@/config/website";
|
|
|
import {getDeptTree} from "@/api/system/dept";
|
|
|
import {customerList} from "@/api/basicData/basicFeesDesc";
|
|
|
+import {gaude, location} from "@/api/gaude";
|
|
|
|
|
|
export default {
|
|
|
props: {
|
|
@@ -586,6 +592,8 @@ export default {
|
|
|
return {
|
|
|
formData: {},
|
|
|
enclosure: false,
|
|
|
+ dialogVisibleTwo:false,
|
|
|
+ lineArr: [],
|
|
|
formAnnex: {},
|
|
|
key: 0,
|
|
|
formDataList: {},
|
|
@@ -822,7 +830,7 @@ export default {
|
|
|
type: "date",
|
|
|
searchRange: true,
|
|
|
defaultTime: ['00:00:00', '23:59:59'],
|
|
|
- format: "yyyy-MM-dd HH:mm:ss",
|
|
|
+ format: "yyyy-MM-dd HH:mm",
|
|
|
valueFormat: "yyyy-MM-dd HH:mm:ss",
|
|
|
index: 2,
|
|
|
width: 140,
|
|
@@ -864,7 +872,7 @@ export default {
|
|
|
type: "date",
|
|
|
searchRange: true,
|
|
|
defaultTime: ['00:00:00', '23:59:59'],
|
|
|
- format: "yyyy-MM-dd HH:mm:ss",
|
|
|
+ format: "yyyy-MM-dd HH:mm",
|
|
|
valueFormat: "yyyy-MM-dd HH:mm:ss",
|
|
|
index: 9,
|
|
|
width: 140,
|
|
@@ -1395,7 +1403,6 @@ export default {
|
|
|
prop: 'fleetId',
|
|
|
type: "select",
|
|
|
cascader: ['plateNo'],
|
|
|
- dicUrl: "/api/blade-land/order-fee/fleet?orderId=" + this.id,
|
|
|
props: {
|
|
|
label: "fleetName",
|
|
|
value: "fleetId"
|
|
@@ -1414,18 +1421,10 @@ export default {
|
|
|
label: '车号',
|
|
|
cell: true,
|
|
|
prop: 'plateNo',
|
|
|
- dicUrl: "api/blade-land/order-fee/plate-no?orderId=" + this.id + '&fleetId={{key}}',
|
|
|
type: "select",
|
|
|
props: {
|
|
|
label: "label",
|
|
|
value: "label"
|
|
|
- },
|
|
|
- dicFormatter:(data)=>{
|
|
|
- let list = []
|
|
|
- data.data.forEach(ele=>{
|
|
|
- list.push({label:ele})
|
|
|
- })
|
|
|
- return list
|
|
|
}
|
|
|
}, {
|
|
|
label: '费用名称',
|
|
@@ -1483,6 +1482,15 @@ export default {
|
|
|
this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(86.1), this.entrustOptionTwoTBackup);
|
|
|
this.collectionOption = await this.getColumnData(this.getColumnName(86.4), this.collectionOptionBackup);
|
|
|
this.paymentOption = await this.getColumnData(this.getColumnName(86.5), this.paymentOptionBackup);
|
|
|
+ this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.id
|
|
|
+ this.findObject(this.paymentOption.column, "plateNo").dicUrl = "api/blade-land/order-fee/plate-no?orderId=" + this.id + '&fleetId={{key}}'
|
|
|
+ this.findObject(this.paymentOption.column, "plateNo").dicFormatter = (data)=>{
|
|
|
+ let list = []
|
|
|
+ data.data.forEach(ele=>{
|
|
|
+ list.push({label:ele})
|
|
|
+ })
|
|
|
+ return list
|
|
|
+ }
|
|
|
// price
|
|
|
// quantity
|
|
|
this.findObject(this.collectionOption.column, "price").change = (data) => {
|
|
@@ -1557,6 +1565,20 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ openTrack(row){
|
|
|
+ gaude({itemId: row.id,plateNo:row.plateNo,tenantId:'234557'}).then(res => {
|
|
|
+ this.lineArr = res.data.data
|
|
|
+ this.dialogVisibleTwo = true
|
|
|
+ let this_=this
|
|
|
+ setTimeout(function(){
|
|
|
+ this_.$refs.playback.initMap();
|
|
|
+ },100)
|
|
|
+ })
|
|
|
+ // location({itemId: row.id,plateNo:'陕YH0008'}).then(res => {
|
|
|
+ // // console.log(res.data.data)
|
|
|
+ // // console.log(this.lineArr[this.lineArr.length - 1])
|
|
|
+ // })
|
|
|
+ },
|
|
|
//自定义列保存
|
|
|
async saveColumnBoxTwo() {
|
|
|
/**
|
|
@@ -1612,6 +1634,8 @@ export default {
|
|
|
*/
|
|
|
const inSave = await this.saveColumnData(this.getColumnName(86.5), this.paymentOption);
|
|
|
if (inSave) {
|
|
|
+ this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.id
|
|
|
+ this.findObject(this.paymentOption.column, "plateNo").dicUrl = "api/blade-land/order-fee/plate-no?orderId=" + this.id + '&fleetId={{key}}'
|
|
|
this.$message.success("保存成功");
|
|
|
//关闭窗口
|
|
|
this.$refs.payment.$refs.dialogColumn.columnBox = false;
|
|
@@ -1623,6 +1647,8 @@ export default {
|
|
|
const inSave = await this.delColumnData(this.getColumnName(86.5), this.paymentOptionBackup);
|
|
|
if (inSave) {
|
|
|
this.$message.success("重置成功");
|
|
|
+ this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.id
|
|
|
+ this.findObject(this.paymentOption.column, "plateNo").dicUrl = "api/blade-land/order-fee/plate-no?orderId=" + this.id + '&fleetId={{key}}'
|
|
|
this.$refs.payment.$refs.dialogColumn.columnBox = false;
|
|
|
}
|
|
|
},
|