|
|
@@ -336,6 +336,7 @@
|
|
|
<basic-container>
|
|
|
<el-table
|
|
|
ref="singleTable"
|
|
|
+ border="1"
|
|
|
:data="tableData"
|
|
|
size="mini"
|
|
|
:header-cell-style="{color:'#000',background:'#fafafa'}"
|
|
|
@@ -345,13 +346,15 @@
|
|
|
fixed
|
|
|
v-if="goodsForm.status === 0"
|
|
|
width="40">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-tooltip className="item" v-if="scope.$index === tableData.length-1" effect="dark" content="增加途径地址"
|
|
|
+ <template slot-scope="scope" slot="header">
|
|
|
+ <el-tooltip className="item" effect="dark" content="增加途径地址"
|
|
|
placement="top">
|
|
|
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addAddress"
|
|
|
style="margin-right: 1.25rem;"></el-button>
|
|
|
</el-tooltip>
|
|
|
- <el-tooltip v-else class="item" effect="dark" content="删除" placement="right">
|
|
|
+ </template>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-tooltip class="item" effect="dark" content="删除" placement="right">
|
|
|
<el-button type="danger" icon="el-icon-delete" size="mini" circle
|
|
|
@click="deleteAddress(scope)"></el-button>
|
|
|
</el-tooltip>
|
|
|
@@ -381,7 +384,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="freightPlaceId"
|
|
|
+ property="corpId"
|
|
|
label="货运地点"
|
|
|
align="center"
|
|
|
:render-header="customTitle"
|
|
|
@@ -390,7 +393,7 @@
|
|
|
<crop-select
|
|
|
:corpType="'GC'"
|
|
|
:disabled="goodsForm.status !== 0"
|
|
|
- v-model="scope.row.freightPlaceId"
|
|
|
+ v-model="scope.row.corpId"
|
|
|
@clear="clear(scope.row)"
|
|
|
@getCorpData="(row)=>{withAddress(row,scope)}"/>
|
|
|
</template>
|
|
|
@@ -441,8 +444,14 @@
|
|
|
width="180"
|
|
|
label="包装类型">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.packingType" :disabled="goodsForm.status !== 0" size="small"
|
|
|
- placeholder="请输入内容"></el-input>
|
|
|
+ <el-select v-model="scope.row.packingType" :disabled="goodsForm.status !== 0" placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in packageType"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.dictValue"
|
|
|
+ :value="item.dictKey">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -468,6 +477,7 @@
|
|
|
<el-table-column
|
|
|
property="remarks"
|
|
|
align="center"
|
|
|
+ width="200"
|
|
|
label="备注">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
|
|
|
@@ -478,18 +488,25 @@
|
|
|
align="center"
|
|
|
width="40">
|
|
|
<template slot-scope="scope">
|
|
|
- <div v-if="scope.$index !== tableData.length-1" style="margin: -5px auto">
|
|
|
- <el-tooltip class="item" effect="dark" content="向上移动" placement="right" v-if="scope.$index > 1">
|
|
|
+ <div style="margin: -5px auto">
|
|
|
+ <el-tooltip class="item" effect="dark" content="向上移动" placement="right" v-if="scope.$index > 0">
|
|
|
<div class="single" style="margin-bottom: -5px">
|
|
|
- <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-up" size="mini"
|
|
|
- @click="moveUp(scope.row,scope.$index)"></el-button>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ style="margin-right: -0.5rem"
|
|
|
+ icon="el-icon-arrow-up"
|
|
|
+ size="mini"
|
|
|
+ @click="moveUp(scope.row,scope.$index)"></el-button>
|
|
|
</div>
|
|
|
</el-tooltip>
|
|
|
- <el-tooltip class="item" effect="dark" content="向下移动" placement="right"
|
|
|
- v-if="scope.$index > 0 && scope.$index < tableData.length-2">
|
|
|
+ <el-tooltip class="item" effect="dark" content="向下移动" placement="right" v-if="scope.$index < tableDataTwo.length-1">
|
|
|
<div class="single" style="margin-top: -5px">
|
|
|
- <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-down" size="mini"
|
|
|
- @click="moveDown(scope.row,scope.$index)"></el-button>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ style="margin-right: -0.5rem"
|
|
|
+ icon="el-icon-arrow-down"
|
|
|
+ size="mini"
|
|
|
+ @click="moveDown(scope.row,scope.$index)"></el-button>
|
|
|
</div>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
@@ -500,6 +517,7 @@
|
|
|
<containerTitle title="卸货地址"></containerTitle>
|
|
|
<basic-container>
|
|
|
<el-table
|
|
|
+ border="1"
|
|
|
ref="singleTable"
|
|
|
:data="tableDataTwo"
|
|
|
size="mini"
|
|
|
@@ -510,15 +528,30 @@
|
|
|
fixed
|
|
|
v-if="goodsForm.status === 0"
|
|
|
width="40">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-tooltip className="item" v-if="scope.$index === tableDataTwo.length-1" effect="dark" content="增加途径地址"
|
|
|
- placement="top">
|
|
|
- <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addAddressTwo"
|
|
|
- style="margin-right: 1.25rem;"></el-button>
|
|
|
+ <template slot-scope="scope" slot="header">
|
|
|
+ <el-tooltip
|
|
|
+ className="item"
|
|
|
+ effect="dark"
|
|
|
+ content="增加途径地址"
|
|
|
+ placement="top">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-plus"
|
|
|
+ size="mini"
|
|
|
+ circle
|
|
|
+ @click="addAddressTwo"
|
|
|
+ style="margin-right: 1.25rem;">
|
|
|
+ </el-button>
|
|
|
</el-tooltip>
|
|
|
- <el-tooltip v-else class="item" effect="dark" content="删除" placement="right">
|
|
|
- <el-button type="danger" icon="el-icon-delete" size="mini" circle
|
|
|
- @click="deleteAddress(scope)"></el-button>
|
|
|
+ </template>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-tooltip class="item" effect="dark" content="删除" placement="right">
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ size="mini"
|
|
|
+ circle
|
|
|
+ @click="deleteAddressTwo(scope)"></el-button>
|
|
|
</el-tooltip>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -546,7 +579,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="freightPlaceId"
|
|
|
+ property="corpId"
|
|
|
label="货运地点"
|
|
|
align="center"
|
|
|
:render-header="customTitle"
|
|
|
@@ -555,7 +588,7 @@
|
|
|
<crop-select
|
|
|
:corpType="'GC'"
|
|
|
:disabled="goodsForm.status !== 0"
|
|
|
- v-model="scope.row.freightPlaceId"
|
|
|
+ v-model="scope.row.corpId"
|
|
|
@clear="clear(scope.row)"
|
|
|
@getCorpData="(row)=>{withAddressTwo(row,scope)}"/>
|
|
|
</template>
|
|
|
@@ -566,8 +599,11 @@
|
|
|
width="150"
|
|
|
label="联系人">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.contacts" :disabled="goodsForm.status !== 0" size="small"
|
|
|
- placeholder="请输入内容"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.contacts"
|
|
|
+ :disabled="goodsForm.status !== 0"
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -576,8 +612,11 @@
|
|
|
width="180"
|
|
|
label="电话">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.tel" :disabled="goodsForm.status !== 0" size="small"
|
|
|
- placeholder="请输入内容"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.tel"
|
|
|
+ :disabled="goodsForm.status !== 0"
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -586,8 +625,11 @@
|
|
|
width="280"
|
|
|
label="详细地址">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.address" :disabled="goodsForm.status !== 0" size="small"
|
|
|
- placeholder="请输入内容"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.address"
|
|
|
+ :disabled="goodsForm.status !== 0"
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -596,8 +638,11 @@
|
|
|
width="180"
|
|
|
label="货物体积">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.volume" :disabled="goodsForm.status !== 0" size="small"
|
|
|
- placeholder="请输入内容"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.volume"
|
|
|
+ :disabled="goodsForm.status !== 0"
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -606,8 +651,14 @@
|
|
|
width="180"
|
|
|
label="包装类型">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.packingType" :disabled="goodsForm.status !== 0" size="small"
|
|
|
- placeholder="请输入内容"></el-input>
|
|
|
+ <el-select v-model="scope.row.packingType" :disabled="goodsForm.status !== 0" placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in packageType"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.dictValue"
|
|
|
+ :value="item.dictKey">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -616,8 +667,11 @@
|
|
|
width="180"
|
|
|
label="重量">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.weight" :disabled="goodsForm.status !== 0" size="small"
|
|
|
- placeholder="请输入内容"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.weight"
|
|
|
+ :disabled="goodsForm.status !== 0"
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -626,35 +680,50 @@
|
|
|
width="180"
|
|
|
label="件数">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.quantity" :disabled="goodsForm.status !== 0" size="small"
|
|
|
- placeholder="请输入内容"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.quantity"
|
|
|
+ :disabled="goodsForm.status !== 0"
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
property="remarks"
|
|
|
align="center"
|
|
|
+ width="200"
|
|
|
label="备注">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
|
|
|
- placeholder="请输入内容"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.remarks"
|
|
|
+ :disabled="goodsForm.status !== 0"
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
width="40">
|
|
|
<template slot-scope="scope">
|
|
|
- <div v-if="scope.$index !== tableDataTwo.length-1" style="margin: -5px auto">
|
|
|
- <el-tooltip class="item" effect="dark" content="向上移动" placement="right" v-if="scope.$index > 1">
|
|
|
+ <div style="margin: -5px auto">
|
|
|
+ <el-tooltip class="item" effect="dark" content="向上移动" placement="right" v-if="scope.$index > 0">
|
|
|
<div class="single" style="margin-bottom: -5px">
|
|
|
- <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-up" size="mini"
|
|
|
- @click="moveUpTwo(scope.row,scope.$index)"></el-button>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ style="margin-right: -0.5rem"
|
|
|
+ icon="el-icon-arrow-up"
|
|
|
+ size="mini"
|
|
|
+ @click="moveUpTwo(scope.row,scope.$index)"></el-button>
|
|
|
</div>
|
|
|
</el-tooltip>
|
|
|
<el-tooltip class="item" effect="dark" content="向下移动" placement="right"
|
|
|
- v-if="scope.$index > 0 && scope.$index < tableDataTwo.length-2">
|
|
|
+ v-if="scope.$index < tableDataTwo.length-1">
|
|
|
<div class="single" style="margin-top: -5px">
|
|
|
- <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-down" size="mini"
|
|
|
- @click="moveDownTwo(scope.row,scope.$index)"></el-button>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ style="margin-right: -0.5rem"
|
|
|
+ icon="el-icon-arrow-down"
|
|
|
+ size="mini"
|
|
|
+ @click="moveDownTwo(scope.row,scope.$index)"></el-button>
|
|
|
</div>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
@@ -841,6 +910,13 @@
|
|
|
@click="$refs.payment.rowDel(row,index)"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-s-order"
|
|
|
+ @click="annexOpen(row, index)"
|
|
|
+ >附 件
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
<template slot="menuLeft">
|
|
|
<el-button
|
|
|
@@ -872,11 +948,11 @@
|
|
|
:basic="true"
|
|
|
deleteUrl="/api/blade-client/common-file/remove"
|
|
|
:data="orderList"
|
|
|
- disabled
|
|
|
:enumerationValue="76"
|
|
|
></c-upload>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="enclosure = false" size="small">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="saveAnnex" size="small">保 存</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<track-playback :dialogVisible="dialogVisible" :lineArr="lineArr" ref="playback"></track-playback>
|
|
|
@@ -890,7 +966,7 @@ import {
|
|
|
detailDelegationList,
|
|
|
removeCollection,
|
|
|
saveSaveList,
|
|
|
- addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange, tRemove
|
|
|
+ addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange, tRemove,saveFile
|
|
|
} from "@/api/landTransportation/bulkCargo";
|
|
|
import {getDeptTree} from "@/api/system/dept";
|
|
|
import website from "@/config/website";
|
|
|
@@ -898,6 +974,7 @@ import {gaude, location} from "@/api/gaude";
|
|
|
//地图回放
|
|
|
import trackPlayback from "@/components/trackPlayback"
|
|
|
import {fleetList, telephone} from "@/api/landTransportation";
|
|
|
+import {getDictionary} from "@/api/system/dictbiz";
|
|
|
|
|
|
export default {
|
|
|
comments: {
|
|
|
@@ -928,6 +1005,7 @@ export default {
|
|
|
orderFilesList: [],
|
|
|
salesmanList: [],
|
|
|
vehicleList: [],
|
|
|
+ packageType:[],
|
|
|
breakConfiguration: {
|
|
|
multipleChoices: false,
|
|
|
multiple: false,
|
|
|
@@ -1519,9 +1597,9 @@ export default {
|
|
|
span: 8,
|
|
|
column: [{
|
|
|
label: '车队',
|
|
|
- prop: 'fleet',
|
|
|
+ prop: 'fleetId',
|
|
|
type: 'select',
|
|
|
- cascader: ['licenseNumber'],
|
|
|
+ cascader: ['plateNo'],
|
|
|
dicUrl: "/api/blade-client/corpsdesc/list?size=1000¤t=1&&corpType=CD",
|
|
|
props: {
|
|
|
label: "cname",
|
|
|
@@ -1530,11 +1608,8 @@ export default {
|
|
|
}
|
|
|
}, {
|
|
|
label: '车号',
|
|
|
- prop: 'licenseNumber',
|
|
|
- allowCreate: true,
|
|
|
- overHidden: true,
|
|
|
- filterable: true,
|
|
|
- cascader: ['driver'],
|
|
|
+ prop: 'plateNo',
|
|
|
+ cascader: ['driverId'],
|
|
|
type: "select",
|
|
|
dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
|
|
|
props: {
|
|
|
@@ -1543,7 +1618,7 @@ export default {
|
|
|
},
|
|
|
}, {
|
|
|
label: '司机',
|
|
|
- prop: 'driver',
|
|
|
+ prop: 'driverId',
|
|
|
type: "select",
|
|
|
dicUrl: "/api/blade-client/land-driver/driver-list?plateNo={{key}}",
|
|
|
props: {
|
|
|
@@ -1885,8 +1960,11 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
async created() {
|
|
|
- this.findObject(this.goodsOptionFormTwo.column, "licenseNumber").change = (data) => {
|
|
|
- fleetList({fleetId: data.row.fleetId}).then(res => {
|
|
|
+ getDictionary({code:'package_type'}).then(res=>{
|
|
|
+ this.packageType = res.data.data
|
|
|
+ })
|
|
|
+ this.findObject(this.goodsOptionFormTwo.column, "plateNo").change = (data) => {
|
|
|
+ fleetList({fleetId: this.goodsForm.fleetId}).then(res => {
|
|
|
for (let item in res.data.data) {
|
|
|
if (data.value === res.data.data[item].plateNo) {
|
|
|
this.goodsForm.driver = res.data.data[item].driverId
|
|
|
@@ -1896,7 +1974,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- this.findObject(this.goodsOptionFormTwo.column, "driver").change = (data) => {
|
|
|
+ this.findObject(this.goodsOptionFormTwo.column, "driverId").change = (data) => {
|
|
|
telephone().then(res => {
|
|
|
for (let item in res.data.data) {
|
|
|
if (data.value === res.data.data[item].id) {
|
|
|
@@ -1913,11 +1991,13 @@ export default {
|
|
|
this.keyContact++
|
|
|
this.collectionOption = await this.getColumnData(this.getColumnName(85.4), this.collectionOptionBackup);
|
|
|
this.paymentOption = await this.getColumnData(this.getColumnName(85.5), this.paymentOptionBackup);
|
|
|
+ console.log(this.id)
|
|
|
if (this.id) {
|
|
|
if (this.id.slice(0, 4) === 'copy') {
|
|
|
detailDelegationList({id: this.id.slice(4, this.id.length), kind: '1'}).then(res => {
|
|
|
this.goodsForm = res.data.data
|
|
|
- this.tableData = res.data.data.orderAddressList
|
|
|
+ this.tableData = res.data.data.loadingAddressList || []
|
|
|
+ this.tableDataTwo = res.data.data.unloadedAddressList || []
|
|
|
this.entrustList = res.data.data.itemList
|
|
|
this.goodsList = res.data.data.itemList
|
|
|
this.vehicleList = res.data.data.orderItemList
|
|
|
@@ -1958,7 +2038,8 @@ export default {
|
|
|
}
|
|
|
detailDelegationList({id: this.id.slice(2, this.id.length), kind: '1'}).then(res => {
|
|
|
this.goodsForm = res.data.data
|
|
|
- this.tableData = res.data.data.orderAddressList
|
|
|
+ this.tableData = res.data.data.loadingAddressList || []
|
|
|
+ this.tableDataTwo = res.data.data.unloadedAddressList || []
|
|
|
this.entrustList = res.data.data.itemList
|
|
|
this.goodsList = res.data.data.itemList
|
|
|
this.vehicleList = res.data.data.orderItemList
|
|
|
@@ -1990,7 +2071,8 @@ export default {
|
|
|
} else {
|
|
|
detailDelegationList({id: this.id, kind: '1'}).then(res => {
|
|
|
this.goodsForm = res.data.data
|
|
|
- this.tableData = res.data.data.orderAddressList
|
|
|
+ this.tableData = res.data.data.loadingAddressList || []
|
|
|
+ this.tableDataTwo = res.data.data.unloadedAddressList || []
|
|
|
this.entrustList = res.data.data.itemList
|
|
|
this.goodsList = res.data.data.itemList
|
|
|
this.vehicleList = res.data.data.orderItemList
|
|
|
@@ -2070,6 +2152,7 @@ export default {
|
|
|
},
|
|
|
initData(tenantId) {
|
|
|
getDeptTree(tenantId).then(res => {
|
|
|
+ console.log(res)
|
|
|
const column = this.findObject(this.goodsOptionForm.column, "salesmanDept");
|
|
|
column.dicData = res.data.data;
|
|
|
});
|
|
|
@@ -2208,28 +2291,29 @@ export default {
|
|
|
}
|
|
|
detailDelegationList({id: ids, kind: '1'}).then(res => {
|
|
|
this.goodsForm = res.data.data
|
|
|
- this.tableData = res.data.data.orderAddressList
|
|
|
+ this.tableData = res.data.data.loadingAddressList
|
|
|
+ this.tableDataTwo = res.data.data.unloadedAddressList
|
|
|
this.entrustList = res.data.data.itemList
|
|
|
this.goodsList = res.data.data.itemList
|
|
|
this.vehicleList = res.data.data.orderItemList
|
|
|
this.orderFilesList = res.data.data.fileList
|
|
|
- if (res.data.data.orderFeeList.length > 0) {
|
|
|
- this.collectionList = []
|
|
|
- this.paymentList = []
|
|
|
- res.data.data.orderFeeList.forEach(item => {
|
|
|
- if (item.type == 1) {
|
|
|
- this.collectionList.push(item)
|
|
|
- } else {
|
|
|
- this.paymentList.push(item)
|
|
|
- }
|
|
|
- })
|
|
|
+ if (res.data.data.orderFeeList){
|
|
|
+ if (res.data.data.orderFeeList.length > 0) {
|
|
|
+ this.collectionList = []
|
|
|
+ this.paymentList = []
|
|
|
+ res.data.data.orderFeeList.forEach(item => {
|
|
|
+ if (item.type == 1) {
|
|
|
+ this.collectionList.push(item)
|
|
|
+ } else {
|
|
|
+ this.paymentList.push(item)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
this.goodsOptionFormC.disabled = true
|
|
|
this.goodsOptionForm.disabled = true
|
|
|
this.goodsOptionFormTwo.disabled = true
|
|
|
- this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status >= 1
|
|
|
+ this.goodsOptionFormTwo.disabled = this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status >= 1
|
|
|
delete this.goodsForm.orderAddressList
|
|
|
delete this.goodsForm.itemList
|
|
|
delete this.goodsForm.orderFeeList
|
|
|
@@ -2300,6 +2384,16 @@ export default {
|
|
|
this.tableData.splice(scope.$index, 1);
|
|
|
}
|
|
|
},
|
|
|
+ //删除途径地址
|
|
|
+ deleteAddressTwo(scope) {
|
|
|
+ if (scope.row.id) {
|
|
|
+ tRemove({ids: scope.row.id}).then(res => {
|
|
|
+ this.tableDataTwo.splice(scope.$index, 1);
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.tableDataTwo.splice(scope.$index, 1);
|
|
|
+ }
|
|
|
+ },
|
|
|
//箱信息保存
|
|
|
rowSave(row, index, done, loading) {
|
|
|
row.$cellEdit = false
|
|
|
@@ -2377,13 +2471,6 @@ export default {
|
|
|
// if (!this.tableData[item].tel) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行电话');
|
|
|
}
|
|
|
}
|
|
|
- for (let item in this.entrustList) {
|
|
|
- if (!this.entrustList[item].ctnType) return this.$message.error('请选择第' + Number(Number(item) + 1) + '行箱型');
|
|
|
- if (!this.entrustList[item].ctnQuantity) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行箱量');
|
|
|
- if (!this.entrustList[item].arrivalTime) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行货运日期');
|
|
|
- // if (!this.entrustList[item].landAmountD) return this.$message.error('请输入第' + Number(Number(item) + 1) + '运费');
|
|
|
- }
|
|
|
- if (this.entrustList.length === 0) return this.$message.error('箱信息不能为空')
|
|
|
let data = JSON.parse(JSON.stringify(this.tableData))
|
|
|
data.forEach((item, index) => {
|
|
|
item.sort = index + 1
|
|
|
@@ -2416,6 +2503,7 @@ export default {
|
|
|
},
|
|
|
//提交委托
|
|
|
submit(type) {
|
|
|
+ this.goodsForm.salesman = '11111111'
|
|
|
if (type) {
|
|
|
this.$refs['goodsFormE'].validate((valid, done) => {
|
|
|
done()
|
|
|
@@ -2431,13 +2519,6 @@ export default {
|
|
|
// if (!this.tableData[item].tel) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行电话');
|
|
|
}
|
|
|
}
|
|
|
- for (let item in this.entrustList) {
|
|
|
- if (!this.entrustList[item].ctnType) return this.$message.error('请选择第' + Number(Number(item) + 1) + '行箱型');
|
|
|
- if (!this.entrustList[item].ctnQuantity) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行箱量');
|
|
|
- if (!this.entrustList[item].arrivalTime) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行货运日期');
|
|
|
- // if (!this.entrustList[item].landAmountD) return this.$message.error('请输入第' + Number(Number(item) + 1) + '运费');
|
|
|
- }
|
|
|
- if (this.entrustList.length === 0) return this.$message.error('箱信息不能为空')
|
|
|
this.$refs['goodsFormE'].validate((valid, doneE) => {
|
|
|
doneE()
|
|
|
if (valid) {
|
|
|
@@ -2501,6 +2582,16 @@ export default {
|
|
|
this.orderList = res.data.data
|
|
|
})
|
|
|
},
|
|
|
+ //保存
|
|
|
+ saveAnnex() {
|
|
|
+ saveFile({
|
|
|
+ id: this.formAnnex.id,
|
|
|
+ fileList: this.orderList
|
|
|
+ }).then(res => {
|
|
|
+ this.$message.success("保存成功");
|
|
|
+ this.annexOpen(this.formAnnex)
|
|
|
+ })
|
|
|
+ },
|
|
|
//付费新增
|
|
|
addRowPayment() {
|
|
|
this.$refs.payment.rowCellAdd({
|
|
|
@@ -2551,6 +2642,7 @@ export default {
|
|
|
},
|
|
|
//选择公司名称带出所属公司
|
|
|
getCorpData(row) {
|
|
|
+ console.log(row.belongCompany)
|
|
|
this.goodsForm.belongCompany = row.belongCompany
|
|
|
this.goodsForm.salesman = ''
|
|
|
//查询业务员
|
|
|
@@ -2561,6 +2653,7 @@ export default {
|
|
|
},
|
|
|
//选择地址客户带出地址
|
|
|
withAddress(row, scope) {
|
|
|
+ console.log(row)
|
|
|
this.$set(this.tableData[scope.$index], 'contacts', row.attn)
|
|
|
this.$set(this.tableData[scope.$index], 'tel', row.tel)
|
|
|
this.$set(this.tableData[scope.$index], 'address', row.storageAddr)
|
|
|
@@ -2568,7 +2661,7 @@ export default {
|
|
|
// this.tableData[scope.$index].tel = row.tel
|
|
|
// this.tableData[scope.$index].address = row.storageAddr
|
|
|
if (!scope.row.key) scope.row.key = 0
|
|
|
- this.$set(this.tableData[scope.$index], 'freightPlaceName', row.cname)
|
|
|
+ this.$set(this.tableData[scope.$index], 'corpName', row.cname)
|
|
|
// this.tableData[scope.$index].corpName = row.cname
|
|
|
if (row.belongtoarea) {
|
|
|
addressList(row.belongtoarea.split(',')[0]).then(res => {
|
|
|
@@ -2586,7 +2679,7 @@ export default {
|
|
|
// this.tableData[scope.$index].tel = row.tel
|
|
|
// this.tableData[scope.$index].address = row.storageAddr
|
|
|
if (!scope.row.key) scope.row.key = 0
|
|
|
- this.$set(this.tableDataTwo[scope.$index], 'freightPlaceName', row.cname)
|
|
|
+ this.$set(this.tableDataTwo[scope.$index], 'corpName', row.cname)
|
|
|
// this.tableData[scope.$index].corpName = row.cname
|
|
|
if (row.belongtoarea) {
|
|
|
addressList(row.belongtoarea.split(',')[0]).then(res => {
|
caojunjie