|
|
@@ -751,7 +751,7 @@
|
|
|
<basic-container>
|
|
|
<el-tabs v-model="activeIndex" @tab-click="handleSelect">
|
|
|
<el-tab-pane label="应收" name="1"></el-tab-pane>
|
|
|
- <!--<el-tab-pane label="应付" name="2"></el-tab-pane>-->
|
|
|
+ <el-tab-pane label="应付" name="2"></el-tab-pane>
|
|
|
</el-tabs>
|
|
|
<avue-crud
|
|
|
v-if="activeIndex === '1'"
|
|
|
@@ -778,27 +778,26 @@
|
|
|
v-model="row.feeId"
|
|
|
:disabled="goodsForm.status !== 0"
|
|
|
@selectValue="(value) => selectValue(value,row)"
|
|
|
- :configuration="breakConfiguration"
|
|
|
- >
|
|
|
+ :configuration="breakConfiguration">
|
|
|
</breakdown-select>
|
|
|
<span v-else>{{ row.feeName }}</span>
|
|
|
</template>
|
|
|
<template slot-scope="{row,index}" slot="menu">
|
|
|
- <!-- <el-button-->
|
|
|
- <!-- type="text"-->
|
|
|
- <!-- size="small"-->
|
|
|
- <!-- :disabled="goodsForm.status === 1"-->
|
|
|
- <!-- :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"-->
|
|
|
- <!-- @click="rowCell(row,index)"-->
|
|
|
- <!-- >{{ row.$cellEdit ? '保存' : '编辑' }}-->
|
|
|
- <!-- </el-button>-->
|
|
|
- <!-- <el-button type="text"-->
|
|
|
- <!-- icon="el-icon-delete"-->
|
|
|
- <!-- size="small"-->
|
|
|
- <!-- :disabled="goodsForm.status === 1"-->
|
|
|
- <!-- @click="$refs.collection.rowDel(row,index)"-->
|
|
|
- <!-- >删除-->
|
|
|
- <!-- </el-button>-->
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ size="small"
|
|
|
+ :disabled="goodsForm.status === 1"
|
|
|
+ :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
|
|
|
+ @click="rowCell(row,index)"
|
|
|
+ >{{ row.$cellEdit ? '保存' : '编辑' }}
|
|
|
+ </el-button>
|
|
|
+ <el-button type="text"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ size="small"
|
|
|
+ :disabled="goodsForm.status === 1"
|
|
|
+ @click="$refs.collection.rowDel(row,index)"
|
|
|
+ >删除
|
|
|
+ </el-button>
|
|
|
<el-button
|
|
|
size="small"
|
|
|
type="text"
|
|
|
@@ -808,12 +807,13 @@
|
|
|
</el-button>
|
|
|
</template>
|
|
|
<template slot="menuLeft">
|
|
|
- <!-- <el-button-->
|
|
|
- <!-- type="primary"-->
|
|
|
- <!-- icon="el-icon-plus"-->
|
|
|
- <!-- :disabled="goodsForm.status !== 0"-->
|
|
|
- <!-- @click="addRowCollection"-->
|
|
|
- <!-- size="small">录入明细</el-button>-->
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-plus"
|
|
|
+ :disabled="goodsForm.status !== 0"
|
|
|
+ @click="addRowCollection"
|
|
|
+ size="small">录入明细
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
<avue-crud
|
|
|
@@ -913,12 +913,13 @@ import {
|
|
|
removeCollection,
|
|
|
saveSaveList,
|
|
|
addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange, tRemove
|
|
|
-} from "@/api/landTransportation";
|
|
|
+} from "@/api/landTransportation/bulkCargo";
|
|
|
import {getDeptTree} from "@/api/system/dept";
|
|
|
import website from "@/config/website";
|
|
|
import {gaude, location} from "@/api/gaude";
|
|
|
//地图回放
|
|
|
import trackPlayback from "@/components/trackPlayback"
|
|
|
+import {fleetList, telephone} from "@/api/landTransportation";
|
|
|
|
|
|
export default {
|
|
|
comments: {
|
|
|
@@ -1426,18 +1427,25 @@ export default {
|
|
|
valueFormat: 'yyyy-MM-dd HH:mm:ss',
|
|
|
}, {
|
|
|
label: '合同号',
|
|
|
+ span: 6,
|
|
|
prop: 'receiptNo'
|
|
|
}, {
|
|
|
label: '联系电话',
|
|
|
+ span: 6,
|
|
|
prop: 'tel'
|
|
|
}, {
|
|
|
label: '派车单号',
|
|
|
prop: 'billNo',
|
|
|
+ span: 6,
|
|
|
rules: [{
|
|
|
required: true,
|
|
|
message: " ",
|
|
|
trigger: "blur"
|
|
|
}],
|
|
|
+ }, {
|
|
|
+ label: '单车运费',
|
|
|
+ span: 6,
|
|
|
+ prop: 'freightCollect'
|
|
|
}
|
|
|
// , {
|
|
|
// label: '场站',
|
|
|
@@ -1532,25 +1540,46 @@ export default {
|
|
|
span: 8,
|
|
|
column: [{
|
|
|
label: '车队',
|
|
|
- prop: 'etd'
|
|
|
+ prop: 'fleet',
|
|
|
+ type: 'select',
|
|
|
+ cascader: ['licenseNumber'],
|
|
|
+ dicUrl: "/api/blade-client/corpsdesc/list?size=1000¤t=1&&corpType=CD",
|
|
|
+ props: {
|
|
|
+ label: "cname",
|
|
|
+ value: "id",
|
|
|
+ res: "data.records"
|
|
|
+ }
|
|
|
}, {
|
|
|
label: '车号',
|
|
|
- prop: 'etd'
|
|
|
+ prop: 'licenseNumber',
|
|
|
+ allowCreate: true,
|
|
|
+ overHidden: true,
|
|
|
+ filterable: true,
|
|
|
+ cascader: ['driver'],
|
|
|
+ type: "select",
|
|
|
+ dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
|
|
|
+ props: {
|
|
|
+ label: "plateNo",
|
|
|
+ value: "plateNo"
|
|
|
+ },
|
|
|
}, {
|
|
|
label: '司机',
|
|
|
- prop: 'etd'
|
|
|
+ prop: 'driver',
|
|
|
+ type: "select",
|
|
|
+ dicUrl: "/api/blade-client/land-driver/driver-list?plateNo={{key}}",
|
|
|
+ props: {
|
|
|
+ label: "name",
|
|
|
+ value: "id"
|
|
|
+ }
|
|
|
}, {
|
|
|
label: '电话',
|
|
|
- prop: 'etd'
|
|
|
+ prop: 'driverTel'
|
|
|
}, {
|
|
|
label: '车体积',
|
|
|
- prop: 'etd'
|
|
|
- }, {
|
|
|
- label: '单车运费(收)',
|
|
|
- prop: 'etd'
|
|
|
+ prop: 'fleetVolum'
|
|
|
}, {
|
|
|
- label: '单车运费(付)',
|
|
|
- prop: 'etd'
|
|
|
+ label: '应付运费',
|
|
|
+ prop: 'freightPay'
|
|
|
}]
|
|
|
},
|
|
|
entrustOptionTwoBackup: {
|
|
|
@@ -1730,19 +1759,21 @@ export default {
|
|
|
column: [{
|
|
|
label: '公司名称',
|
|
|
slot: true,
|
|
|
- width: 300,
|
|
|
+ width: 200,
|
|
|
overHidden: true,
|
|
|
prop: 'corpId'
|
|
|
- }, {
|
|
|
- label: '车号',
|
|
|
- cell: true,
|
|
|
- prop: 'plateNo',
|
|
|
- type: "select",
|
|
|
- props: {
|
|
|
- label: "label",
|
|
|
- value: "label"
|
|
|
- },
|
|
|
- }, {
|
|
|
+ }
|
|
|
+ /*, {
|
|
|
+ label: '车号',
|
|
|
+ cell: true,
|
|
|
+ prop: 'plateNo',
|
|
|
+ type: "select",
|
|
|
+ props: {
|
|
|
+ label: "label",
|
|
|
+ value: "label"
|
|
|
+ },
|
|
|
+ }*/
|
|
|
+ , {
|
|
|
label: '费用名称',
|
|
|
slot: true,
|
|
|
width: 200,
|
|
|
@@ -1784,8 +1815,7 @@ export default {
|
|
|
label: "dictValue",
|
|
|
value: "dictKey"
|
|
|
},
|
|
|
- }
|
|
|
- ]
|
|
|
+ }]
|
|
|
},
|
|
|
paymentList: [],
|
|
|
collectionOption: {},
|
|
|
@@ -1826,9 +1856,11 @@ export default {
|
|
|
}, {
|
|
|
label: '费用名称',
|
|
|
slot: true,
|
|
|
+ width: 200,
|
|
|
prop: 'feeId'
|
|
|
}, {
|
|
|
label: '计价单位',
|
|
|
+ width: 100,
|
|
|
cell: true,
|
|
|
prop: 'unit',
|
|
|
type: "select",
|
|
|
@@ -1840,23 +1872,28 @@ export default {
|
|
|
}, {
|
|
|
label: '数量',
|
|
|
cell: true,
|
|
|
+ width: 100,
|
|
|
prop: 'quantity'
|
|
|
}, {
|
|
|
label: '单价',
|
|
|
cell: true,
|
|
|
+ width: 100,
|
|
|
prop: 'price'
|
|
|
}, {
|
|
|
label: '金额',
|
|
|
cell: true,
|
|
|
+ width: 100,
|
|
|
prop: 'amount'
|
|
|
}, {
|
|
|
// label: '税率(默认6)',
|
|
|
label: '税率',
|
|
|
cell: true,
|
|
|
+ width: 100,
|
|
|
prop: 'taxRate'
|
|
|
}, {
|
|
|
label: '币别',
|
|
|
cell: true,
|
|
|
+ width: 100,
|
|
|
prop: 'currency',
|
|
|
type: "select",
|
|
|
dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
|
|
|
@@ -1869,6 +1906,26 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
async created() {
|
|
|
+ this.findObject(this.goodsOptionFormTwo.column, "licenseNumber").change = (data) => {
|
|
|
+ fleetList({fleetId: data.row.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
|
|
|
+ this.goodsForm.driverName = res.data.data[item].driverName
|
|
|
+ this.goodsForm.driverTel = res.data.data[item].tel
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.findObject(this.goodsOptionFormTwo.column, "driver").change = (data) => {
|
|
|
+ telephone().then(res => {
|
|
|
+ for (let item in res.data.data) {
|
|
|
+ if (data.value === res.data.data[item].id) {
|
|
|
+ this.goodsForm.driverTel = res.data.data[item].tel
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
this.entrustOptionTwo = await this.getColumnData(this.getColumnName(85.1), this.entrustOptionTwoBackup);
|
|
|
this.KeyBox++
|
|
|
this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(85.2), this.entrustOptionTwoTBackup);
|
|
|
@@ -1985,6 +2042,7 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
} else {
|
|
|
+ this.goodsForm.status = 0
|
|
|
this.tableData = [{}, {}]
|
|
|
getCorp().then(res => {
|
|
|
this.goodsForm = {
|
caojunjie