|
|
@@ -351,6 +351,10 @@
|
|
|
<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">
|
|
|
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
|
|
|
+ @click="deleteAddress(scope)"></el-button>
|
|
|
+ </el-tooltip>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -360,14 +364,14 @@
|
|
|
width="60">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="arrivalTime"
|
|
|
+ property="freightTime"
|
|
|
label="货运日期"
|
|
|
align="center"
|
|
|
width="200">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker
|
|
|
format="yyyy-MM-dd HH:mm"
|
|
|
- v-model="scope.row.arrivalTime"
|
|
|
+ v-model="scope.row.freightTime"
|
|
|
type="datetime"
|
|
|
style="width: 100%;"
|
|
|
size="small"
|
|
|
@@ -376,7 +380,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="corpId"
|
|
|
+ property="freightPlaceId"
|
|
|
label="货运地点"
|
|
|
align="center"
|
|
|
:render-header="customTitle"
|
|
|
@@ -385,29 +389,13 @@
|
|
|
<crop-select
|
|
|
:corpType="'GC'"
|
|
|
:disabled="goodsForm.status !== 0"
|
|
|
- v-model="scope.row.corpId"
|
|
|
+ v-model="scope.row.freightPlaceId"
|
|
|
@clear="clear(scope.row)"
|
|
|
@getCorpData="(row)=>{withAddress(row,scope)}"/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- property="province"-->
|
|
|
- <!-- label="省市区"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="280">-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-cascader-->
|
|
|
- <!-- size="small"-->
|
|
|
- <!-- style="width: 100%;"-->
|
|
|
- <!-- :key="scope.row.key"-->
|
|
|
- <!-- :disabled="goodsForm.status === 1"-->
|
|
|
- <!-- :props="treeOption"-->
|
|
|
- <!-- clearable-->
|
|
|
- <!-- v-model="scope.row.region"></el-cascader>-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
<el-table-column
|
|
|
- property="address"
|
|
|
+ property="contacts"
|
|
|
align="center"
|
|
|
width="150"
|
|
|
label="联系人">
|
|
|
@@ -417,7 +405,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="address"
|
|
|
+ property="tel"
|
|
|
align="center"
|
|
|
width="180"
|
|
|
label="电话">
|
|
|
@@ -437,42 +425,42 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="remarks"
|
|
|
+ property="volume"
|
|
|
align="center"
|
|
|
width="180"
|
|
|
label="货物体积">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
|
|
|
+ <el-input v-model="scope.row.volume" :disabled="goodsForm.status !== 0" size="small"
|
|
|
placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="remarks"
|
|
|
+ property="packingType"
|
|
|
align="center"
|
|
|
width="180"
|
|
|
label="包装类型">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
|
|
|
+ <el-input v-model="scope.row.packingType" :disabled="goodsForm.status !== 0" size="small"
|
|
|
placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="remarks"
|
|
|
+ property="weight"
|
|
|
align="center"
|
|
|
width="180"
|
|
|
label="重量">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
|
|
|
+ <el-input v-model="scope.row.weight" :disabled="goodsForm.status !== 0" size="small"
|
|
|
placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="remarks"
|
|
|
+ property="quantity"
|
|
|
align="center"
|
|
|
width="180"
|
|
|
label="件数">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
|
|
|
+ <el-input v-model="scope.row.quantity" :disabled="goodsForm.status !== 0" size="small"
|
|
|
placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -512,7 +500,7 @@
|
|
|
<basic-container>
|
|
|
<el-table
|
|
|
ref="singleTable"
|
|
|
- :data="tableData"
|
|
|
+ :data="tableDataTwo"
|
|
|
size="mini"
|
|
|
:header-cell-style="{color:'#000',background:'#fafafa'}"
|
|
|
style="width: 100%">
|
|
|
@@ -522,11 +510,15 @@
|
|
|
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="增加途径地址"
|
|
|
+ <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="addAddress"
|
|
|
+ <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>
|
|
|
+ </el-tooltip>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -535,15 +527,16 @@
|
|
|
align="center"
|
|
|
width="60">
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
- property="arrivalTime"
|
|
|
+ property="freightTime"
|
|
|
label="货运日期"
|
|
|
align="center"
|
|
|
width="200">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker
|
|
|
format="yyyy-MM-dd HH:mm"
|
|
|
- v-model="scope.row.arrivalTime"
|
|
|
+ v-model="scope.row.freightTime"
|
|
|
type="datetime"
|
|
|
style="width: 100%;"
|
|
|
size="small"
|
|
|
@@ -552,7 +545,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="corpId"
|
|
|
+ property="freightPlaceId"
|
|
|
label="货运地点"
|
|
|
align="center"
|
|
|
:render-header="customTitle"
|
|
|
@@ -561,29 +554,13 @@
|
|
|
<crop-select
|
|
|
:corpType="'GC'"
|
|
|
:disabled="goodsForm.status !== 0"
|
|
|
- v-model="scope.row.corpId"
|
|
|
+ v-model="scope.row.freightPlaceId"
|
|
|
@clear="clear(scope.row)"
|
|
|
@getCorpData="(row)=>{withAddress(row,scope)}"/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- property="province"-->
|
|
|
- <!-- label="省市区"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="280">-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-cascader-->
|
|
|
- <!-- size="small"-->
|
|
|
- <!-- style="width: 100%;"-->
|
|
|
- <!-- :key="scope.row.key"-->
|
|
|
- <!-- :disabled="goodsForm.status === 1"-->
|
|
|
- <!-- :props="treeOption"-->
|
|
|
- <!-- clearable-->
|
|
|
- <!-- v-model="scope.row.region"></el-cascader>-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
<el-table-column
|
|
|
- property="address"
|
|
|
+ property="contacts"
|
|
|
align="center"
|
|
|
width="150"
|
|
|
label="联系人">
|
|
|
@@ -593,7 +570,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="address"
|
|
|
+ property="tel"
|
|
|
align="center"
|
|
|
width="180"
|
|
|
label="电话">
|
|
|
@@ -613,42 +590,42 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="remarks"
|
|
|
+ property="volume"
|
|
|
align="center"
|
|
|
width="180"
|
|
|
label="货物体积">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
|
|
|
+ <el-input v-model="scope.row.volume" :disabled="goodsForm.status !== 0" size="small"
|
|
|
placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="remarks"
|
|
|
+ property="packingType"
|
|
|
align="center"
|
|
|
width="180"
|
|
|
label="包装类型">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
|
|
|
+ <el-input v-model="scope.row.packingType" :disabled="goodsForm.status !== 0" size="small"
|
|
|
placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="remarks"
|
|
|
+ property="weight"
|
|
|
align="center"
|
|
|
width="180"
|
|
|
label="重量">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
|
|
|
+ <el-input v-model="scope.row.weight" :disabled="goodsForm.status !== 0" size="small"
|
|
|
placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- property="remarks"
|
|
|
+ property="quantity"
|
|
|
align="center"
|
|
|
width="180"
|
|
|
label="件数">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
|
|
|
+ <el-input v-model="scope.row.quantity" :disabled="goodsForm.status !== 0" size="small"
|
|
|
placeholder="请输入内容"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -665,18 +642,18 @@
|
|
|
align="center"
|
|
|
width="40">
|
|
|
<template slot-scope="scope">
|
|
|
- <div v-if="scope.$index !== tableData.length-1" style="margin: -5px auto">
|
|
|
+ <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 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>
|
|
|
+ @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 < tableData.length-2">
|
|
|
+ v-if="scope.$index > 0 && scope.$index < tableDataTwo.length-2">
|
|
|
<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>
|
|
|
+ @click="moveDownTwo(scope.row,scope.$index)"></el-button>
|
|
|
</div>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
@@ -1194,6 +1171,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
tableData: [],
|
|
|
+ tableDataTwo: [],
|
|
|
entrustListT: [],
|
|
|
entrustOptionTwoTBackup: {
|
|
|
align: 'center',
|
|
|
@@ -2044,6 +2022,7 @@ export default {
|
|
|
} else {
|
|
|
this.goodsForm.status = 0
|
|
|
this.tableData = [{}, {}]
|
|
|
+ this.tableDataTwo = [{}, {}]
|
|
|
getCorp().then(res => {
|
|
|
this.goodsForm = {
|
|
|
corpId: res.data.data ? res.data.data.id : '',
|
|
|
@@ -2274,14 +2253,24 @@ export default {
|
|
|
},
|
|
|
//地址新增
|
|
|
addAddress() {
|
|
|
- this.tableData.splice(this.tableData.length - 1, 0, {})
|
|
|
+ this.tableData.push({})
|
|
|
+ },
|
|
|
+ //地址新增
|
|
|
+ addAddressTwo() {
|
|
|
+ this.tableDataTwo.push({})
|
|
|
},
|
|
|
moveUp(row, index) {
|
|
|
this.tableData[index] = this.tableData.splice(index - 1, 1, row)[0]
|
|
|
},
|
|
|
+ moveUpTwo(row, index) {
|
|
|
+ this.tableDataTwo[index] = this.tableDataTwo.splice(index - 1, 1, row)[0]
|
|
|
+ },
|
|
|
moveDown(row, index) {
|
|
|
this.tableData[index] = this.tableData.splice(index + 1, 1, row)[0]
|
|
|
},
|
|
|
+ moveDownTwo(row, index) {
|
|
|
+ this.tableDataTwo[index] = this.tableDataTwo.splice(index + 1, 1, row)[0]
|
|
|
+ },
|
|
|
//返回主列表
|
|
|
backToList(value) {
|
|
|
if (value === 0) {
|
|
|
@@ -2338,20 +2327,12 @@ export default {
|
|
|
},
|
|
|
//保存
|
|
|
editCustomer() {
|
|
|
- let data = JSON.parse(JSON.stringify(this.tableData))
|
|
|
- data.forEach((item, index) => {
|
|
|
- item.sort = index + 1
|
|
|
- // if (item.region !== undefined && item.region.length !== 0) {
|
|
|
- // item.region = item.region.join(',')
|
|
|
- // } else {
|
|
|
- // item.region = ''
|
|
|
- // }
|
|
|
- })
|
|
|
this.type = true
|
|
|
saveSaveList({
|
|
|
...this.goodsForm,
|
|
|
kind: '1',
|
|
|
- orderAddressList: data,
|
|
|
+ loadingAddressList:this.tableData,
|
|
|
+ unloadedAddressList:this.tableDataTwo,
|
|
|
fileList: this.orderFilesList,
|
|
|
itemList: this.entrustList,
|
|
|
orderFeeList: this.collectionList.concat(this.paymentList)
|
caojunjie