|
|
@@ -81,14 +81,14 @@
|
|
|
/>
|
|
|
</template>
|
|
|
<template slot-scope="scope" slot="pickUpGoodsUserId">
|
|
|
- <el-select v-model="goodsForm.pickUpGoodsUserId" placeholder="请选择揽货员" :disabled="goodsForm.status !== 0">
|
|
|
- <el-option
|
|
|
- v-for="item in adminProfilesList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
+ <el-select v-model="goodsForm.pickUpGoodsUserId" placeholder="请选择揽货员" :disabled="goodsForm.status !== 0">
|
|
|
+ <el-option
|
|
|
+ v-for="item in adminProfilesList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</template>
|
|
|
</avue-form>
|
|
|
</basic-container>
|
|
|
@@ -134,7 +134,7 @@
|
|
|
title="预估费用"></containerTitle>
|
|
|
<basic-container>
|
|
|
<avue-crud :data="yugudata" :option="yuguoptionpz" ref="yugoref"
|
|
|
- @row-update="yuguupdate" @row-del="yugurowDel"
|
|
|
+ @row-update="yuguupdate" @row-del="yugurowDel"
|
|
|
>
|
|
|
<!--<template slot-scope="{row,index}" slot="menu">-->
|
|
|
<!-- <el-button-->
|
|
|
@@ -248,15 +248,15 @@
|
|
|
<containerTitle title="车辆信息"></containerTitle>
|
|
|
<basic-container>
|
|
|
<el-button type="success" icon="el-icon-check" size="small" @click="batchScheduling"
|
|
|
- :disabled="batchDuling" v-if="roleNameTwo.indexOf('总调度') === -1">批量调度
|
|
|
+ :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%">
|
|
|
+ :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">
|
|
|
@@ -322,153 +322,153 @@
|
|
|
<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>
|
|
|
- </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>
|
|
|
+ </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>-->
|
|
|
+<!-- <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>-->
|
|
|
@@ -591,9 +591,9 @@
|
|
|
></crop-select>
|
|
|
<span v-else>{{ row.corpName }}</span>
|
|
|
</template>
|
|
|
- <!-- <template slot="plateNoHeader" slot-scope="{column}">-->
|
|
|
- <!-- {{ column.label }}<span style="color:#F56C6C">*</span>-->
|
|
|
- <!-- </template>-->
|
|
|
+<!-- <template slot="plateNoHeader" slot-scope="{column}">-->
|
|
|
+<!-- {{ column.label }}<span style="color:#F56C6C">*</span>-->
|
|
|
+<!-- </template>-->
|
|
|
<template slot="feeIdHeader" slot-scope="{column}">
|
|
|
{{ column.label }}<span style="color:#F56C6C">*</span>
|
|
|
</template>
|
|
|
@@ -669,9 +669,9 @@
|
|
|
</el-select>
|
|
|
<span v-else>{{row.fleetName}}</span>
|
|
|
</template> -->
|
|
|
- <!-- <template slot="plateNoHeader" slot-scope="{column}">-->
|
|
|
- <!-- {{ column.label }}<span style="color:#F56C6C">*</span>-->
|
|
|
- <!-- </template>-->
|
|
|
+<!-- <template slot="plateNoHeader" slot-scope="{column}">-->
|
|
|
+<!-- {{ column.label }}<span style="color:#F56C6C">*</span>-->
|
|
|
+<!-- </template>-->
|
|
|
<template slot="feeIdHeader" slot-scope="{column}">
|
|
|
{{ column.label }}<span style="color:#F56C6C">*</span>
|
|
|
</template>
|
|
|
@@ -1121,99 +1121,99 @@ export default {
|
|
|
width: 140,
|
|
|
},
|
|
|
{
|
|
|
- label: '车型',
|
|
|
- width: 100,
|
|
|
- slot: true,
|
|
|
- index: 3,
|
|
|
- prop: 'ctnType'
|
|
|
- }, {
|
|
|
- label: '车辆数',
|
|
|
- width: 50,
|
|
|
- index: 4,
|
|
|
- prop: 'ctnQuantity'
|
|
|
- },
|
|
|
+ label: '车型',
|
|
|
+ width: 100,
|
|
|
+ slot: true,
|
|
|
+ index: 3,
|
|
|
+ prop: 'ctnType'
|
|
|
+ }, {
|
|
|
+ label: '车辆数',
|
|
|
+ width: 50,
|
|
|
+ index: 4,
|
|
|
+ prop: 'ctnQuantity'
|
|
|
+ },
|
|
|
{
|
|
|
- label: '车队',
|
|
|
- width: 200,
|
|
|
- index: 5,
|
|
|
- type: 'select',
|
|
|
- cascader: ['plateNo'],
|
|
|
- overHidden: true,
|
|
|
- cell: true,
|
|
|
- prop: 'fleetId',
|
|
|
- dicUrl: "/api/blade-client/corpsdesc/list?size=1000¤t=1&&corpType=CD",
|
|
|
- props: {
|
|
|
- label: "cname",
|
|
|
- value: "id",
|
|
|
- res: "data.records"
|
|
|
- },
|
|
|
- change: (data) => {
|
|
|
- // if (JSON.parse(localStorage.getItem('saber-tenantId')).content == 119111) {
|
|
|
- console.log("a")
|
|
|
- fleetListS(data.row.fleetId).then(res => {
|
|
|
- this.driverIddata = res.data.data
|
|
|
- })
|
|
|
- // } else {
|
|
|
- // fleetListT().then(res => {
|
|
|
- // this.driverIddata = res.data.data
|
|
|
- // })
|
|
|
- // }
|
|
|
+ label: '车队',
|
|
|
+ width: 200,
|
|
|
+ index: 5,
|
|
|
+ type: 'select',
|
|
|
+ cascader: ['plateNo'],
|
|
|
+ overHidden: true,
|
|
|
+ cell: true,
|
|
|
+ prop: 'fleetId',
|
|
|
+ dicUrl: "/api/blade-client/corpsdesc/list?size=1000¤t=1&&corpType=CD",
|
|
|
+ props: {
|
|
|
+ label: "cname",
|
|
|
+ value: "id",
|
|
|
+ res: "data.records"
|
|
|
+ },
|
|
|
+ change: (data) => {
|
|
|
+ // if (JSON.parse(localStorage.getItem('saber-tenantId')).content == 119111) {
|
|
|
+ console.log("a")
|
|
|
+ fleetListS(data.row.fleetId).then(res => {
|
|
|
+ this.driverIddata = res.data.data
|
|
|
+ })
|
|
|
+ // } else {
|
|
|
+ // fleetListT().then(res => {
|
|
|
+ // this.driverIddata = res.data.data
|
|
|
+ // })
|
|
|
+ // }
|
|
|
|
|
|
- this.entrustList[data.index].tel = null
|
|
|
- this.entrustList[data.index].driverName = null
|
|
|
- }
|
|
|
- }, {
|
|
|
- label: '车号',
|
|
|
- width: 150,
|
|
|
- index: 6,
|
|
|
- cell: false,
|
|
|
- prop: 'plateNo',
|
|
|
- type: "select",
|
|
|
- dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
|
|
|
- props: {
|
|
|
- label: "plateNo",
|
|
|
- value: "plateNo"
|
|
|
- },
|
|
|
- change: (data) => {
|
|
|
- }
|
|
|
- }, {
|
|
|
- label: '司机',
|
|
|
- width: 115,
|
|
|
- index: 7,
|
|
|
- prop: 'driverName'
|
|
|
- }, {
|
|
|
- label: '电话',
|
|
|
- width: 160,
|
|
|
- index: 8,
|
|
|
- prop: 'tel'
|
|
|
- }, {
|
|
|
- label: '完工日期',
|
|
|
- prop: 'finishedTime',
|
|
|
- overHidden: true,
|
|
|
- type: "date",
|
|
|
- searchRange: true,
|
|
|
- defaultTime: ['00:00:00', '23:59:59'],
|
|
|
- format: "yyyy-MM-dd HH:mm",
|
|
|
- valueFormat: "yyyy-MM-dd HH:mm:ss",
|
|
|
- index: 9,
|
|
|
- width: 140,
|
|
|
- }, {
|
|
|
- label: '货物名称',
|
|
|
- overHidden: true,
|
|
|
- width: 160,
|
|
|
- index: 10,
|
|
|
- prop: 'goods'
|
|
|
- }, {
|
|
|
- label: '件数',
|
|
|
- width: 100,
|
|
|
- overHidden: true,
|
|
|
- controls: false,
|
|
|
- cell: true,
|
|
|
- index: 11,
|
|
|
- prop: 'quantity',
|
|
|
- type: 'number',
|
|
|
- precision: 0
|
|
|
+ this.entrustList[data.index].tel = null
|
|
|
+ this.entrustList[data.index].driverName = null
|
|
|
+ }
|
|
|
+ }, {
|
|
|
+ label: '车号',
|
|
|
+ width: 150,
|
|
|
+ index: 6,
|
|
|
+ cell: false,
|
|
|
+ prop: 'plateNo',
|
|
|
+ type: "select",
|
|
|
+ dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
|
|
|
+ props: {
|
|
|
+ label: "plateNo",
|
|
|
+ value: "plateNo"
|
|
|
+ },
|
|
|
+ change: (data) => {
|
|
|
}
|
|
|
+ }, {
|
|
|
+ label: '司机',
|
|
|
+ width: 115,
|
|
|
+ index: 7,
|
|
|
+ prop: 'driverName'
|
|
|
+ }, {
|
|
|
+ label: '电话',
|
|
|
+ width: 160,
|
|
|
+ index: 8,
|
|
|
+ prop: 'tel'
|
|
|
+ }, {
|
|
|
+ label: '完工日期',
|
|
|
+ prop: 'finishedTime',
|
|
|
+ overHidden: true,
|
|
|
+ type: "date",
|
|
|
+ searchRange: true,
|
|
|
+ defaultTime: ['00:00:00', '23:59:59'],
|
|
|
+ format: "yyyy-MM-dd HH:mm",
|
|
|
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
|
|
|
+ index: 9,
|
|
|
+ width: 140,
|
|
|
+ }, {
|
|
|
+ label: '货物名称',
|
|
|
+ overHidden: true,
|
|
|
+ width: 160,
|
|
|
+ index: 10,
|
|
|
+ prop: 'goods'
|
|
|
+ }, {
|
|
|
+ label: '件数',
|
|
|
+ width: 100,
|
|
|
+ overHidden: true,
|
|
|
+ controls: false,
|
|
|
+ cell: true,
|
|
|
+ index: 11,
|
|
|
+ prop: 'quantity',
|
|
|
+ type: 'number',
|
|
|
+ precision: 0
|
|
|
+ }
|
|
|
// , {
|
|
|
// label: '包装',
|
|
|
// width: 100,
|
|
|
@@ -1518,9 +1518,9 @@ export default {
|
|
|
prop: 'pickUpGoodsUserId',
|
|
|
disabled: true,
|
|
|
rules: [{
|
|
|
- required: true,
|
|
|
- message: " ",
|
|
|
- trigger: "blur"
|
|
|
+ required: true,
|
|
|
+ message: " ",
|
|
|
+ trigger: "blur"
|
|
|
}]
|
|
|
}, {
|
|
|
label: '备注',
|
|
|
@@ -1746,9 +1746,9 @@ export default {
|
|
|
value: "dictKey"
|
|
|
},
|
|
|
}, {
|
|
|
- label: '备注',
|
|
|
- cell: true,
|
|
|
- prop: 'remarks'
|
|
|
+ label: '备注',
|
|
|
+ cell: true,
|
|
|
+ prop: 'remarks'
|
|
|
}
|
|
|
]
|
|
|
},
|
|
|
@@ -1858,9 +1858,9 @@ export default {
|
|
|
value: "dictKey"
|
|
|
},
|
|
|
}, {
|
|
|
- label: '备注',
|
|
|
- cell: true,
|
|
|
- prop: 'remarks'
|
|
|
+ label: '备注',
|
|
|
+ cell: true,
|
|
|
+ prop: 'remarks'
|
|
|
}
|
|
|
]
|
|
|
}
|
|
|
@@ -1933,7 +1933,7 @@ export default {
|
|
|
this.KeyBoxTwo++
|
|
|
if (this.id) {
|
|
|
detailDelegationList({id: this.id, kind: '2'}).then(res => {
|
|
|
- console.log(res.data.data)
|
|
|
+ console.log(res.data.data)
|
|
|
this.goodsForm = res.data.data
|
|
|
this.tableData = res.data.data.orderAddressList
|
|
|
|
|
|
@@ -1964,20 +1964,20 @@ export default {
|
|
|
this.goodsList = res.data.data.orderItemList
|
|
|
this.orderFilesList = res.data.data.fileList
|
|
|
if (res.data.data.orderFeeList.length > 0) {
|
|
|
- let orderFeeList = res.data.data.orderFeeList;
|
|
|
- let collectionList = [];
|
|
|
- let paymentList = [];
|
|
|
+ let orderFeeList = res.data.data.orderFeeList;
|
|
|
+ let collectionList = [];
|
|
|
+ let paymentList = [];
|
|
|
|
|
|
- for (const orderFee of orderFeeList) {
|
|
|
+ for (const orderFee of orderFeeList) {
|
|
|
if (orderFee.type == 1) {
|
|
|
collectionList.push(orderFee)
|
|
|
} else {
|
|
|
paymentList.push(orderFee)
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
- this.collectionList = collectionList;
|
|
|
- this.paymentList = paymentList;
|
|
|
+ this.collectionList = collectionList;
|
|
|
+ this.paymentList = paymentList;
|
|
|
|
|
|
// res.data.data.orderFeeList.forEach(item => {
|
|
|
// if (item.type == 1) {
|
|
|
@@ -2001,7 +2001,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
getAdminProfilesById(this.goodsForm.corpId).then(res => {
|
|
|
- this.adminProfilesList = res.data.data;
|
|
|
+ this.adminProfilesList = res.data.data;
|
|
|
})
|
|
|
})
|
|
|
}
|
|
|
@@ -2317,15 +2317,15 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- driverChange(row) {
|
|
|
- // if (JSON.parse(localStorage.getItem('saber-tenantId')).content == 119111) {
|
|
|
- this.driverIddata.forEach((driver) => {
|
|
|
- if (driver.name === row.driverName) {
|
|
|
- row.tel = driver.tel
|
|
|
- }
|
|
|
- })
|
|
|
- // }
|
|
|
- },
|
|
|
+ driverChange(row) {
|
|
|
+ // if (JSON.parse(localStorage.getItem('saber-tenantId')).content == 119111) {
|
|
|
+ this.driverIddata.forEach((driver) => {
|
|
|
+ if (driver.name === row.driverName) {
|
|
|
+ row.tel = driver.tel
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // }
|
|
|
+ },
|
|
|
//刷新数据
|
|
|
refreshData() {
|
|
|
detailDelegationList({id: this.id, kind: '2'}).then(res => {
|
|
|
@@ -2341,20 +2341,20 @@ export default {
|
|
|
this.yugudata = res.data.data.orderEstimateList?res.data.data.orderEstimateList:[]
|
|
|
if (res.data.data.orderFeeList.length > 0) {
|
|
|
|
|
|
- let orderFeeList = res.data.data.orderFeeList;
|
|
|
- let collectionList = [];
|
|
|
- let paymentList = [];
|
|
|
+ let orderFeeList = res.data.data.orderFeeList;
|
|
|
+ let collectionList = [];
|
|
|
+ let paymentList = [];
|
|
|
|
|
|
- for (const orderFee of orderFeeList) {
|
|
|
- if (orderFee.type == 1) {
|
|
|
- collectionList.push(orderFee)
|
|
|
- } else {
|
|
|
- paymentList.push(orderFee)
|
|
|
- }
|
|
|
+ for (const orderFee of orderFeeList) {
|
|
|
+ if (orderFee.type == 1) {
|
|
|
+ collectionList.push(orderFee)
|
|
|
+ } else {
|
|
|
+ paymentList.push(orderFee)
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
- this.collectionList = collectionList;
|
|
|
- this.paymentList = paymentList;
|
|
|
+ this.collectionList = collectionList;
|
|
|
+ this.paymentList = paymentList;
|
|
|
|
|
|
// res.data.data.orderFeeList.forEach(item => {
|
|
|
// if (item.type == 1) {
|
|
|
@@ -2372,7 +2372,7 @@ export default {
|
|
|
// })
|
|
|
|
|
|
getAdminProfilesById(this.goodsForm.corpId).then(res => {
|
|
|
- this.adminProfilesList = res.data.data;
|
|
|
+ this.adminProfilesList = res.data.data;
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
@@ -2419,7 +2419,7 @@ export default {
|
|
|
row.$cellEdit = true;
|
|
|
if (row.fleetId != null) {
|
|
|
fleetListS(row.fleetId).then(res => {
|
|
|
- this.driverIddata = res.data.data
|
|
|
+ this.driverIddata = res.data.data
|
|
|
})
|
|
|
}
|
|
|
|
|
|
@@ -2442,15 +2442,15 @@ export default {
|
|
|
}
|
|
|
|
|
|
|
|
|
- // this.entrustOptionTwoT.column.forEach(item => {
|
|
|
- // if (item.prop === 'plateNo') {
|
|
|
- // item.cell = true
|
|
|
- // item.value = row.plateNo
|
|
|
- // }
|
|
|
- // if (item.prop === 'tel') {
|
|
|
- // item.cell = true
|
|
|
- // }
|
|
|
- // })
|
|
|
+ // 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)
|
|
|
},
|
|
|
@@ -2613,15 +2613,15 @@ export default {
|
|
|
rowCell(row, index) {
|
|
|
if (row.$cellEdit) {
|
|
|
// if (row.plateNo) {
|
|
|
- if (row.feeId) {
|
|
|
- incidentalSubmit(row).then(res => {
|
|
|
- this.$refs.collection.rowCell(row, index)
|
|
|
- row = res.data.data
|
|
|
- this.$message.success("保存成功");
|
|
|
- })
|
|
|
- } else {
|
|
|
- this.$message.error("请选择费用名称");
|
|
|
- }
|
|
|
+ if (row.feeId) {
|
|
|
+ incidentalSubmit(row).then(res => {
|
|
|
+ this.$refs.collection.rowCell(row, index)
|
|
|
+ row = res.data.data
|
|
|
+ this.$message.success("保存成功");
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.$message.error("请选择费用名称");
|
|
|
+ }
|
|
|
// } else {
|
|
|
// this.$message.error("请选择车号");
|
|
|
// }
|
|
|
@@ -2630,21 +2630,21 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
paymentRowCell(row, index) {
|
|
|
- console.log(row)
|
|
|
+ console.log(row)
|
|
|
if (row.$cellEdit) {
|
|
|
// if (row.plateNo) {
|
|
|
- if (row.feeId) {
|
|
|
- incidentalSubmit(row).then(res => {
|
|
|
- row = {
|
|
|
- ...res.data.data,
|
|
|
- $cellEdit: true
|
|
|
- }
|
|
|
- this.$message.success("保存成功");
|
|
|
- this.$refs.payment.rowCell(row, index)
|
|
|
- })
|
|
|
- } else {
|
|
|
- this.$message.error("请选择费用名称");
|
|
|
- }
|
|
|
+ if (row.feeId) {
|
|
|
+ incidentalSubmit(row).then(res => {
|
|
|
+ row = {
|
|
|
+ ...res.data.data,
|
|
|
+ $cellEdit: true
|
|
|
+ }
|
|
|
+ this.$message.success("保存成功");
|
|
|
+ this.$refs.payment.rowCell(row, index)
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.$message.error("请选择费用名称");
|
|
|
+ }
|
|
|
// } else {
|
|
|
// this.$message.error("请选择车号");
|
|
|
// }
|
|
|
@@ -2770,7 +2770,7 @@ export default {
|
|
|
},
|
|
|
//选择客户信息触发
|
|
|
getfleetId(data, row) {
|
|
|
- console.log(data)
|
|
|
+ console.log(data)
|
|
|
this.$set(row, 'corpShortName', data.corpId)
|
|
|
this.$set(row, 'corpName', data.cname)
|
|
|
this.$set(row, 'corpShortName', data.shortName)
|
caojunjie