|
|
@@ -201,19 +201,18 @@
|
|
|
:disabled="selectionList.length === 0" v-if="roleNameTwo.indexOf('总调度') === -1">批量调度
|
|
|
</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"
|
|
|
- v-model="row.fleetId"
|
|
|
- @getCorpData="(data)=>{getfleetIdT(data,row)}"
|
|
|
- corpType="CD"
|
|
|
- ></crop-select>
|
|
|
- <span v-else>{{ row.fleetName }}</span>
|
|
|
+ <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"
|
|
|
@@ -223,6 +222,13 @@
|
|
|
>{{ row.$cellEdit ? '保 存' : '修 改' }}
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
+ type="text"
|
|
|
+ size="small"
|
|
|
+ v-if="row.status===0"
|
|
|
+ @click="rowSaveThree(row,index)"
|
|
|
+ >{{ row.$cellEdit ? '确认调度派车' : '调度派车' }}
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
size="small"
|
|
|
type="text"
|
|
|
@click="designate(row, index)"
|
|
|
@@ -250,6 +256,12 @@
|
|
|
v-if="row.status > 1"
|
|
|
>变更记录
|
|
|
</el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="text"
|
|
|
+ @click="annexOpen(row, index)"
|
|
|
+ >附 件
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</basic-container>
|
|
|
@@ -491,11 +503,20 @@
|
|
|
<c-upload
|
|
|
typeUpload="CD"
|
|
|
:data="orderFilesList"
|
|
|
- disabled
|
|
|
- :display="false"
|
|
|
+ display
|
|
|
deleteUrl="/api/blade-client/common-file/remove"
|
|
|
:enumerationValue="86.2"
|
|
|
- ></c-upload>
|
|
|
+ >
|
|
|
+ <template slot="c_button">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ :loading="c_button"
|
|
|
+ @click="schedulingFileSaving"
|
|
|
+ >保存附件
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+ </c-upload>
|
|
|
<el-dialog
|
|
|
title="批量调度"
|
|
|
:visible.sync="dialogVisible"
|
|
|
@@ -524,6 +545,7 @@
|
|
|
<crop-select
|
|
|
v-model="formData.fleetId"
|
|
|
corpType="CD"
|
|
|
+ :disabled="formData === 4"
|
|
|
@getCorpData="getCorpData"
|
|
|
></crop-select>
|
|
|
</template>
|
|
|
@@ -577,7 +599,8 @@ import {
|
|
|
fleetDriverSave,
|
|
|
recordingDetails,
|
|
|
changeFleet,
|
|
|
- incidentalSubmit, saveFile, getFee, fleetList
|
|
|
+ incidentalSubmit, saveFile, getFee, fleetList, conserveDispatch,
|
|
|
+ checkAttachment, sendACarCollection
|
|
|
} from "@/api/landTransportation";
|
|
|
import website from "@/config/website";
|
|
|
import {getDeptTree} from "@/api/system/dept";
|
|
|
@@ -616,45 +639,6 @@ export default {
|
|
|
precision: 2,
|
|
|
controls: false,
|
|
|
type: 'number',
|
|
|
- }, {
|
|
|
- label: '应收场站费',
|
|
|
- width: 100,
|
|
|
- precision: 2,
|
|
|
- controls: false,
|
|
|
- type: 'number',
|
|
|
- prop: 'oneFeeD'
|
|
|
- }, {
|
|
|
- label: '应收港杂费',
|
|
|
- width: 100,
|
|
|
- precision: 2,
|
|
|
- controls: false,
|
|
|
- type: 'number',
|
|
|
- prop: 'twoFeeD'
|
|
|
- }, {
|
|
|
- label: '应收扣款',
|
|
|
- width: 100,
|
|
|
- precision: 2,
|
|
|
- controls: false,
|
|
|
- type: 'number',
|
|
|
- prop: 'threeFeeD'
|
|
|
- }, {
|
|
|
- label: '应收待时费',
|
|
|
- width: 100,
|
|
|
- precision: 2,
|
|
|
- controls: false,
|
|
|
- type: 'number',
|
|
|
- prop: 'fourFeeD'
|
|
|
- }, {
|
|
|
- label: '应收其他',
|
|
|
- width: 100,
|
|
|
- precision: 2,
|
|
|
- type: 'number',
|
|
|
- controls: false,
|
|
|
- prop: 'fiveFeeD'
|
|
|
- }, {
|
|
|
- label: '应收费用备注',
|
|
|
- width: 245,
|
|
|
- prop: 'feeRemarksD'
|
|
|
}]
|
|
|
},
|
|
|
form: {},
|
|
|
@@ -701,6 +685,7 @@ export default {
|
|
|
},
|
|
|
activeIndex: '1',
|
|
|
dialogVisible: false,
|
|
|
+ c_button: false,
|
|
|
goodsForm: {},
|
|
|
orderFilesList: [],
|
|
|
selectionList: [],
|
|
|
@@ -856,12 +841,29 @@ export default {
|
|
|
label: '车队',
|
|
|
width: 200,
|
|
|
index: 5,
|
|
|
- prop: 'fleetId'
|
|
|
+ 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"
|
|
|
+ }
|
|
|
}, {
|
|
|
label: '车号',
|
|
|
width: 150,
|
|
|
index: 6,
|
|
|
- prop: 'plateNo'
|
|
|
+ cell: false,
|
|
|
+ prop: 'plateNo',
|
|
|
+ type: "select",
|
|
|
+ dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
|
|
|
+ props: {
|
|
|
+ label: "plateNo",
|
|
|
+ value: "plateNo"
|
|
|
+ },
|
|
|
}, {
|
|
|
label: '司机',
|
|
|
width: 115,
|
|
|
@@ -1600,6 +1602,18 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ schedulingFileSaving(){
|
|
|
+ this.c_button = true
|
|
|
+ conserveDispatch({
|
|
|
+ fileList:this.orderFilesList,
|
|
|
+ id:this.goodsForm.id
|
|
|
+ }).then(res=>{
|
|
|
+ checkAttachment({id:this.goodsForm.id}).then(res=>{
|
|
|
+ this.orderFilesList = res.data.data
|
|
|
+ this.c_button = false
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
openTrack(row){
|
|
|
gaude({itemId: row.id,plateNo:row.plateNo,tenantId:'234557',color:'2'}).then(res => {
|
|
|
this.lineArr = res.data.data.trackArray
|
|
|
@@ -1811,6 +1825,40 @@ export default {
|
|
|
}
|
|
|
this.$refs.crudBoxTwo.rowCell(row, index)
|
|
|
},
|
|
|
+ //调度并且派车
|
|
|
+ rowSaveThree(row, index, done, loading) {
|
|
|
+ if (row.$cellEdit) {
|
|
|
+ if (!row.plateNo) {
|
|
|
+ return this.$message.warning('未选择车号，请选择');
|
|
|
+ }
|
|
|
+ if (!row.fleetId){
|
|
|
+ return this.$message.warning('请选择车队');
|
|
|
+ }
|
|
|
+ this.$confirm('是否确定调度派车', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ sendACarCollection(row).then(res => {
|
|
|
+ this.$message.success('操作成功');
|
|
|
+ this.refreshData()
|
|
|
+ })
|
|
|
+ }).catch(() => {
|
|
|
+ this.$message({
|
|
|
+ type: 'info',
|
|
|
+ message: '已取消'
|
|
|
+ });
|
|
|
+ });
|
|
|
+ this.$refs.crudBoxTwo.rowCell(row, index)
|
|
|
+ }else {
|
|
|
+ this.entrustOptionTwoT.column.forEach(item=>{
|
|
|
+ if (item.prop === 'plateNo'){
|
|
|
+ item.cell = true
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.$refs.crudBoxTwo.rowCell(row, index)
|
|
|
+ }
|
|
|
+ },
|
|
|
rowSaveWell(row, index, done, loading) {
|
|
|
done()
|
|
|
},
|
|
|
@@ -1840,7 +1888,7 @@ export default {
|
|
|
changeFleetT(row, index) {
|
|
|
this.formDataList = row
|
|
|
this.dialogChange = true
|
|
|
- this.formData = {}
|
|
|
+ this.formData = row
|
|
|
},
|
|
|
//打开变更记录
|
|
|
recordsOfChanges(row, index) {
|
|
|
@@ -1870,6 +1918,14 @@ export default {
|
|
|
//箱信息选择车队
|
|
|
getfleetIdT(data, row) {
|
|
|
this.$set(row, 'fleetName', data.cname)
|
|
|
+ console.log(this.$refs.crudBoxTwo)
|
|
|
+ // this.$refs.crudBoxTwo.handleChange({
|
|
|
+ // label: '车队',
|
|
|
+ // width: 200,
|
|
|
+ // index: 5,
|
|
|
+ // prop: 'fleetId',
|
|
|
+ // cascader: ['plateNo'],
|
|
|
+ // },row)
|
|
|
},
|
|
|
//地址新增
|
|
|
addAddress() {
|
caojunjie