|
|
@@ -247,96 +247,228 @@
|
|
|
</basic-container>
|
|
|
<containerTitle title="车辆信息"></containerTitle>
|
|
|
<basic-container>
|
|
|
- <avue-crud
|
|
|
- :data="entrustList"
|
|
|
- @selection-change="selectionChange"
|
|
|
- :option="entrustOptionTwoT"
|
|
|
- ref="crudBoxTwo"
|
|
|
- :key="KeyBoxTwo"
|
|
|
- @resetColumn="resetColumnBoxTwo"
|
|
|
- @saveColumn="saveColumnBoxTwo"
|
|
|
- @row-save="(row,done,loading)=>{rowSaveT(row,0,done,loading)}"
|
|
|
- @row-update="rowSaveWell">
|
|
|
- <template slot-scope="{ row }" slot="driverName">
|
|
|
- <el-select v-if="row.$cellEdit" v-model="row.driverName" placeholder="请选择" @change="driverChange(row)">
|
|
|
- <el-option
|
|
|
- v-for="item in driverIddata"
|
|
|
- :key="item.name"
|
|
|
- :label="item.name"
|
|
|
- :value="item.name">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- <span v-else>{{row.driverName}}</span>
|
|
|
- </template>
|
|
|
- <template slot="menuLeft" slot-scope="{size}">
|
|
|
- <el-button type="success" icon="el-icon-check" :size="size" @click="batchScheduling"
|
|
|
- :disabled="batchDuling" v-if="roleNameTwo.indexOf('总调度') === -1">批量调度
|
|
|
- </el-button>
|
|
|
- </template>
|
|
|
- <template slot="plateNo" slot-scope="{row}" v-if="!row.$cellEdit">
|
|
|
- <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"-->
|
|
|
- <!-- v-model="row.fleetId"-->
|
|
|
- <!-- @getCorpData="(data)=>{getfleetIdT(data,row)}"-->
|
|
|
- <!-- corpType="CD"-->
|
|
|
- <!-- ></crop-select>-->
|
|
|
- <!-- <span v-else>{{ row.fleetName }}</span>-->
|
|
|
- <!-- </template>-->
|
|
|
- <template slot-scope="{row,index}" slot="menu">
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- size="small"
|
|
|
- v-if="row.status===0"
|
|
|
- @click="rowSaveT(row,index)"
|
|
|
- >{{ row.$cellEdit ? '保 存' : '修 改' }}
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="text"
|
|
|
- @click="designate(row, index)"
|
|
|
- v-if="row.status === 0"
|
|
|
- >调 度
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="text"
|
|
|
- @click="cancelDesignate(row, index)"
|
|
|
- v-if="row.status===1"
|
|
|
- >取消调度
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="text"
|
|
|
- @click="changeFleetT(row, index)"
|
|
|
- disabled=""
|
|
|
- v-if="row.status !== 0 || row.status !==1 || row.status !==4"
|
|
|
- >变 更
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="text"
|
|
|
- @click="recordsOfChanges(row, index)"
|
|
|
- v-if="row.status > 1"
|
|
|
- >变更记录
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="text"
|
|
|
- @click="annexOpen(row, index)"
|
|
|
- >附 件
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- size="small"
|
|
|
- v-if="row.status===0"
|
|
|
- @click="rowSaveThree(row,index)"
|
|
|
- >{{ row.$cellEdit ? '确认调度派车' : '调度派车' }}
|
|
|
- </el-button>
|
|
|
+ <el-button type="success" icon="el-icon-check" size="small" @click="batchScheduling"
|
|
|
+ :disabled="batchDuling" v-if="roleNameTwo.indexOf('总调度') === -1">批量调度
|
|
|
+ </el-button>
|
|
|
+ <el-table
|
|
|
+ :header-cell-style="{background:'#fafafa',color:'#000',fontSize: '12px'}"
|
|
|
+ :data="entrustList"
|
|
|
+ stripe
|
|
|
+ header-align="center"
|
|
|
+ @selection-change="selectionChange"
|
|
|
+ style="width: 100%">
|
|
|
+ <el-table-column
|
|
|
+ type="selection"
|
|
|
+ width="55">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="arrivalTime" label="货运日期" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="realArrivalTime" label="实际到厂时间" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="ctnType" label="车型" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="ctnQuantity" label="车辆数" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="fleetId" label="车队" width="180">
|
|
|
+ <template slot-scope="{ row }">
|
|
|
+ <el-select v-model="row.fleetId" @change="fleetIdChange(row)" :disabled="!row.$cellEdit" placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in motorcadeList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.cname"
|
|
|
+ :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ <!-- <span v-else>{{row.fleetId}}</span> -->
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="plateNo" label="车号" width="180">
|
|
|
+ <template slot-scope="{ row }">
|
|
|
+ <el-select v-if="row.$cellEdit" v-model="row.plateNo" :disabled="!row.$cellEdit" placeholder="请选择车号">
|
|
|
+ <el-option
|
|
|
+ v-for="item in wagonNumber"
|
|
|
+ :key="item.plateNo"
|
|
|
+ :label="item.plateNo"
|
|
|
+ :value="item.plateNo">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ <span v-else class="el-button--text" style="cursor: pointer" @click="openTrack(row)">{{ row.plateNo }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="driverName" label="司机" width="180">
|
|
|
+ <template slot-scope="{ row }">
|
|
|
+ <el-select v-if="row.$cellEdit" v-model="row.driverId" @change="driverNameChange(row)" :disabled="!row.$cellEdit" placeholder="请选择司机">
|
|
|
+ <el-option
|
|
|
+ v-for="item in driverIddata"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ <span v-else>{{row.driverName}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="tel" label="电话" width="180">
|
|
|
+ <template slot-scope="{ row }">
|
|
|
+ <el-input v-if="row.$cellEdit" placeholder="请输入电话" :disabled="!row.$cellEdit" v-model="row.tel" clearable></el-input>
|
|
|
+ <span v-else>{{row.tel}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="finishedTime" label="完工日期" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="goods" label="货物名称" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="quantity" label="件数" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="landWeight" label="重量" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="size" label="尺码" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="landAmountD" label="运费" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="status" label="状态" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="landAmountC" label="应付陆运费" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="remarks" label="委托备注" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="fleetRemarks" label="车队备注" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="driverRemarks" label="司机备注" width="180"></el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ fixed="right"
|
|
|
+ label="操作"
|
|
|
+ width="200">
|
|
|
+ <template slot-scope="{row,index}">
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ size="small"
|
|
|
+ v-if="row.status===0"
|
|
|
+ @click="rowSaveT(row,index)">
|
|
|
+ {{ row.$cellEdit ? '保 存' : '修 改' }}
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="text"
|
|
|
+ @click="designate(row, index)"
|
|
|
+ v-if="row.status === 0"
|
|
|
+ >调 度
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="text"
|
|
|
+ @click="cancelDesignate(row, index)"
|
|
|
+ v-if="row.status===1"
|
|
|
+ >取消调度
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="text"
|
|
|
+ @click="changeFleetT(row, index)"
|
|
|
+ disabled=""
|
|
|
+ v-if="row.status !== 0 || row.status !==1 || row.status !==4"
|
|
|
+ >变 更
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="text"
|
|
|
+ @click="recordsOfChanges(row, index)"
|
|
|
+ v-if="row.status > 1"
|
|
|
+ >变更记录
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="text"
|
|
|
+ @click="annexOpen(row, index)"
|
|
|
+ >附 件
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ size="small"
|
|
|
+ v-if="row.status===0"
|
|
|
+ @click="rowSaveThree(row,index)"
|
|
|
+ >{{ row.$cellEdit ? '确认调度派车' : '调度派车' }}
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
- </avue-crud>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+<!-- <avue-crud-->
|
|
|
+<!-- :data="entrustList"-->
|
|
|
+<!-- @selection-change="selectionChange"-->
|
|
|
+<!-- :option="entrustOptionTwoT"-->
|
|
|
+<!-- ref="crudBoxTwo"-->
|
|
|
+<!-- :key="KeyBoxTwo"-->
|
|
|
+<!-- @resetColumn="resetColumnBoxTwo"-->
|
|
|
+<!-- @saveColumn="saveColumnBoxTwo"-->
|
|
|
+<!-- @row-save="(row,done,loading)=>{rowSaveT(row,0,done,loading)}"-->
|
|
|
+<!-- @row-update="rowSaveWell">-->
|
|
|
+<!-- <template slot-scope="{ row }" slot="driverName">-->
|
|
|
+<!-- <el-select v-if="row.$cellEdit" v-model="row.driverName" placeholder="请选择" @change="driverChange(row)">-->
|
|
|
+<!-- <el-option-->
|
|
|
+<!-- v-for="item in driverIddata"-->
|
|
|
+<!-- :key="item.name"-->
|
|
|
+<!-- :label="item.name"-->
|
|
|
+<!-- :value="item.name">-->
|
|
|
+<!-- </el-option>-->
|
|
|
+<!-- </el-select>-->
|
|
|
+<!-- <span v-else>{{row.driverName}}</span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot="menuLeft" slot-scope="{size}">-->
|
|
|
+<!-- <el-button type="success" icon="el-icon-check" :size="size" @click="batchScheduling"-->
|
|
|
+<!-- :disabled="batchDuling" v-if="roleNameTwo.indexOf('总调度') === -1">批量调度-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot="plateNo" slot-scope="{row}" v-if="!row.$cellEdit">-->
|
|
|
+<!-- <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"–>-->
|
|
|
+<!-- <!– v-model="row.fleetId"–>-->
|
|
|
+<!-- <!– @getCorpData="(data)=>{getfleetIdT(data,row)}"–>-->
|
|
|
+<!-- <!– corpType="CD"–>-->
|
|
|
+<!-- <!– ></crop-select>–>-->
|
|
|
+<!-- <!– <span v-else>{{ row.fleetName }}</span>–>-->
|
|
|
+<!-- <!– </template>–>-->
|
|
|
+<!-- <template slot-scope="{row,index}" slot="menu">-->
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- v-if="row.status===0"-->
|
|
|
+<!-- @click="rowSaveT(row,index)"-->
|
|
|
+<!-- >{{ row.$cellEdit ? '保 存' : '修 改' }}-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- @click="designate(row, index)"-->
|
|
|
+<!-- v-if="row.status === 0"-->
|
|
|
+<!-- >调 度-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- @click="cancelDesignate(row, index)"-->
|
|
|
+<!-- v-if="row.status===1"-->
|
|
|
+<!-- >取消调度-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- @click="changeFleetT(row, index)"-->
|
|
|
+<!-- disabled=""-->
|
|
|
+<!-- v-if="row.status !== 0 || row.status !==1 || row.status !==4"-->
|
|
|
+<!-- >变 更-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- @click="recordsOfChanges(row, index)"-->
|
|
|
+<!-- v-if="row.status > 1"-->
|
|
|
+<!-- >变更记录-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- @click="annexOpen(row, index)"-->
|
|
|
+<!-- >附 件-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- v-if="row.status===0"-->
|
|
|
+<!-- @click="rowSaveThree(row,index)"-->
|
|
|
+<!-- >{{ row.$cellEdit ? '确认调度派车' : '调度派车' }}-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </avue-crud>-->
|
|
|
</basic-container>
|
|
|
<span>
|
|
|
<!-- <containerTitle title="费用明细"></containerTitle>-->
|
|
|
@@ -703,7 +835,7 @@ import {gaude, location} from "@/api/gaude";
|
|
|
import reportDialog from "@/components/report-dialog/main.vue";
|
|
|
|
|
|
import { getAdminProfilesById } from "@/api/specialTrade/placeAnOrder/detailPage";
|
|
|
-import {fleetListS, fleetListT, fleetListTwo} from "../../../api/landTransportation";
|
|
|
+import {fleetListS, getMotorcadeList, fleetListTwo} from "../../../api/landTransportation";
|
|
|
|
|
|
export default {
|
|
|
components: {reportDialog},
|
|
|
@@ -717,6 +849,11 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ // 车队list
|
|
|
+ motorcadeList: [],
|
|
|
+ // 车号list
|
|
|
+ wagonNumber: [],
|
|
|
+ // 司机list
|
|
|
driverIddata:[],
|
|
|
// 揽货员list
|
|
|
adminProfilesList: [],
|
|
|
@@ -1012,8 +1149,8 @@ export default {
|
|
|
},
|
|
|
change: (data) => {
|
|
|
// if (JSON.parse(localStorage.getItem('saber-tenantId')).content == 119111) {
|
|
|
+ console.log("a")
|
|
|
fleetListS(data.row.fleetId).then(res => {
|
|
|
- console.log(res,1017)
|
|
|
this.driverIddata = res.data.data
|
|
|
})
|
|
|
// } else {
|
|
|
@@ -1037,7 +1174,8 @@ export default {
|
|
|
label: "plateNo",
|
|
|
value: "plateNo"
|
|
|
},
|
|
|
-
|
|
|
+ change: (data) => {
|
|
|
+ }
|
|
|
}, {
|
|
|
label: '司机',
|
|
|
width: 115,
|
|
|
@@ -1760,7 +1898,7 @@ export default {
|
|
|
|
|
|
this.KeyBoxTwo++
|
|
|
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").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 => {
|
|
|
@@ -1798,7 +1936,31 @@ export default {
|
|
|
console.log(res.data.data)
|
|
|
this.goodsForm = res.data.data
|
|
|
this.tableData = res.data.data.orderAddressList
|
|
|
+
|
|
|
+ // 查询车队赋值
|
|
|
+ getMotorcadeList().then(ddd => {
|
|
|
+ this.motorcadeList = ddd.data.data.records
|
|
|
+ })
|
|
|
+
|
|
|
+ fleetListS(row.fleetId).then(fleetList => {
|
|
|
+ res.data.data.orderItemList.forEach(data => {
|
|
|
+ data.$cellEdit = false;
|
|
|
+ fleetList.data.data.forEach(fleet => {
|
|
|
+ if (data.driverId == fleet.id) {
|
|
|
+ data.driverName = fleet.name
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
+ // res.data.data.orderItemList.forEach(data => {
|
|
|
+ // data.$cellEdit = false;
|
|
|
+ // })
|
|
|
+
|
|
|
+
|
|
|
this.entrustList = res.data.data.orderItemList
|
|
|
+
|
|
|
+
|
|
|
this.goodsList = res.data.data.orderItemList
|
|
|
this.orderFilesList = res.data.data.fileList
|
|
|
if (res.data.data.orderFeeList.length > 0) {
|
|
|
@@ -1844,8 +2006,8 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
this.KeyBoxTwo++
|
|
|
-
|
|
|
this.findObject(this.entrustOptionTwoT.column, "plateNo").change = (data) => {
|
|
|
+ console.log("监听");
|
|
|
fleetList({fleetId: data.row.fleetId}).then(res => {
|
|
|
for (let item in res.data.data) {
|
|
|
if (data.value === res.data.data[item].plateNo) {
|
|
|
@@ -1874,7 +2036,7 @@ export default {
|
|
|
// });
|
|
|
// this.key++
|
|
|
// }
|
|
|
- // this.$refs.other.show = false
|
|
|
+ this.$refs.other.show = false
|
|
|
// 非租户模式默认加载管理组数据
|
|
|
if (!website.tenantMode) {
|
|
|
this.initData(website.tenantId);
|
|
|
@@ -2218,32 +2380,79 @@ export default {
|
|
|
handleSelect(tab, event) {
|
|
|
this.activeIndex = tab.name
|
|
|
},
|
|
|
+ // 车队点击事件
|
|
|
+ fleetIdChange(row) {
|
|
|
+ // 查询车号
|
|
|
+ fleetList({fleetId: row.fleetId}).then(res => {
|
|
|
+ this.wagonNumber = res.data.data
|
|
|
+ row.plateNo = null
|
|
|
+ row.driverId = null
|
|
|
+ row.tel = null
|
|
|
+ })
|
|
|
+
|
|
|
+ // 查询司机
|
|
|
+ fleetListS(row.fleetId).then(res => {
|
|
|
+ this.driverIddata = res.data.data
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 司机点击事件
|
|
|
+ driverNameChange(row) {
|
|
|
+ this.driverIddata.forEach(data => {
|
|
|
+ if (data.id == row.driverId) {
|
|
|
+ row.tel = data.tel
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
//箱信息保存
|
|
|
rowSaveT(row, index, done, loading) {
|
|
|
if (row.$cellEdit) {
|
|
|
fleetDriverSave(row).then(res => {
|
|
|
+ this.driverIddata.forEach(data => {
|
|
|
+ if (data.id == row.driverId) {
|
|
|
+ row.driverName = data.name
|
|
|
+ }
|
|
|
+ })
|
|
|
+ row.$cellEdit = false;
|
|
|
this.$message.success("保存成功");
|
|
|
})
|
|
|
}
|
|
|
- console.log(row,2229)
|
|
|
- if (row.fleetId != null) {
|
|
|
- fleetListS(row.fleetId).then(res => {
|
|
|
- this.driverIddata = res.data.data
|
|
|
+ row.$cellEdit = true;
|
|
|
+ if (row.fleetId != null) {
|
|
|
+ fleetListS(row.fleetId).then(res => {
|
|
|
+ this.driverIddata = res.data.data
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ // 查询车队赋值
|
|
|
+ getMotorcadeList().then(res => {
|
|
|
+ this.motorcadeList = res.data.data.records
|
|
|
})
|
|
|
- }
|
|
|
|
|
|
+ if (row.fleetId != null) {
|
|
|
+ // 查询车号
|
|
|
+ fleetList({fleetId: row.fleetId}).then(res => {
|
|
|
+ this.wagonNumber = res.data.data
|
|
|
+ })
|
|
|
+
|
|
|
+ // 查询司机
|
|
|
+ fleetListS(row.fleetId).then(res => {
|
|
|
+ this.driverIddata = res.data.data
|
|
|
+ })
|
|
|
|
|
|
- this.entrustOptionTwoT.column.forEach(item => {
|
|
|
- if (item.prop === 'plateNo') {
|
|
|
- item.cell = true
|
|
|
- item.value = row.plateNo
|
|
|
- }
|
|
|
- if (item.prop === 'tel') {
|
|
|
- item.cell = true
|
|
|
}
|
|
|
- })
|
|
|
- // row.$cellEdit = !row.$cellEdit
|
|
|
- this.$refs.crudBoxTwo.rowCell(row, index)
|
|
|
+
|
|
|
+
|
|
|
+ // this.entrustOptionTwoT.column.forEach(item => {
|
|
|
+ // if (item.prop === 'plateNo') {
|
|
|
+ // item.cell = true
|
|
|
+ // item.value = row.plateNo
|
|
|
+ // }
|
|
|
+ // if (item.prop === 'tel') {
|
|
|
+ // item.cell = true
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+
|
|
|
+ // this.$refs.crudBoxTwo.rowCell(row, index)
|
|
|
},
|
|
|
//调度并且派车
|
|
|
rowSaveThree(row, index, done, loading) {
|
|
|
@@ -2263,6 +2472,7 @@ export default {
|
|
|
this.$message.success('操作成功');
|
|
|
this.$refs.crudBoxTwo.rowCell(row, index)
|
|
|
this.refreshData()
|
|
|
+ row.$cellEdit = false;
|
|
|
})
|
|
|
}).catch(() => {
|
|
|
this.$message({
|
|
|
@@ -2272,6 +2482,27 @@ export default {
|
|
|
this.$refs.crudBoxTwo.rowCell(row, index)
|
|
|
});
|
|
|
} else {
|
|
|
+
|
|
|
+ // 查询车队赋值
|
|
|
+ getMotorcadeList().then(res => {
|
|
|
+ this.motorcadeList = res.data.data.records
|
|
|
+ })
|
|
|
+
|
|
|
+ if(row.fleetId != null) {
|
|
|
+ // 查询车号
|
|
|
+ fleetList({fleetId: row.fleetId}).then(res => {
|
|
|
+ this.wagonNumber = res.data.data
|
|
|
+ })
|
|
|
+
|
|
|
+ // 查询司机
|
|
|
+ fleetListS(row.fleetId).then(res => {
|
|
|
+ this.driverIddata = res.data.data
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ row.$cellEdit = true;
|
|
|
+
|
|
|
this.entrustOptionTwoT.column.forEach(item => {
|
|
|
if (item.prop === 'plateNo') {
|
|
|
item.cell = true
|
|
|
@@ -2382,7 +2613,6 @@ export default {
|
|
|
rowCell(row, index) {
|
|
|
if (row.$cellEdit) {
|
|
|
// if (row.plateNo) {
|
|
|
- console.log(row)
|
|
|
if (row.feeId) {
|
|
|
incidentalSubmit(row).then(res => {
|
|
|
this.$refs.collection.rowCell(row, index)
|
caojunjie