|
|
@@ -40,9 +40,9 @@
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in billTypeList"
|
|
|
- :key="index.dictSort"
|
|
|
+ :key="index.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
- :value="dict.dictSort"
|
|
|
+ :value="dict.dictValue"
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -491,7 +491,7 @@
|
|
|
filterable
|
|
|
size="mini"
|
|
|
style="width: 160px"
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fMblnoOptions"
|
|
|
@@ -502,12 +502,17 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="fFeeid" label="费用名称" align="center" width="120">
|
|
|
+ <el-table-column
|
|
|
+ prop="fFeeid"
|
|
|
+ label="费用名称"
|
|
|
+ align="center"
|
|
|
+ width="120"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
v-model="scope.row.fFeeid"
|
|
|
filterable
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
remote
|
|
|
placeholder="费用名称"
|
|
|
>
|
|
|
@@ -520,24 +525,29 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="fDc" label="收付" align="center" width="100">
|
|
|
+ <el-table-column prop="fDc" label="收付" align="center" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
v-model="scope.row.fDc"
|
|
|
placeholder="请选择"
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
>
|
|
|
<el-option label="收" value="D"></el-option>
|
|
|
<el-option label="付" value="C"></el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="fFeeunitid" label="计费单位" align="center" width="100">
|
|
|
+ <el-table-column
|
|
|
+ prop="fFeeunitid"
|
|
|
+ label="计费单位"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
v-model="scope.row.fFeeunitid"
|
|
|
placeholder="请选择计费单位"
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -549,33 +559,48 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="fBillingQty" label="计费数量" align="center" width="100">
|
|
|
+ <el-table-column
|
|
|
+ prop="fBillingQty"
|
|
|
+ label="计费数量"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fBillingQty"
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
placeholder="请输入内容"
|
|
|
@input="total(scope.row)"
|
|
|
v-input-limit="2"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="fUnitprice" label="单价" align="center" width="100">
|
|
|
+ <el-table-column
|
|
|
+ prop="fUnitprice"
|
|
|
+ label="单价"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fUnitprice"
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
placeholder="请输入内容"
|
|
|
@input="total(scope.row)"
|
|
|
v-input-limit="2"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="fCurrency" label="币种" align="center" width="100">
|
|
|
+ <el-table-column
|
|
|
+ prop="fCurrency"
|
|
|
+ label="币种"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fCurrency"
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
placeholder="请输入内容"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
@@ -584,7 +609,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fExrate"
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
placeholder="请输入内容"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
@@ -593,16 +618,21 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fAmount"
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
placeholder="请输入内容"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="fTaxrate" label="税率" align="center" width="100">
|
|
|
+ <el-table-column
|
|
|
+ prop="fTaxrate"
|
|
|
+ label="税率"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fTaxrate"
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
placeholder="请输入内容"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
@@ -611,18 +641,14 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.remarks"
|
|
|
- :disabled="scope.row.actId != 1090 || disabled"
|
|
|
+ :disabled="scope.row.actId == 1080 || disabled"
|
|
|
placeholder="请输入内容"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="remarks" label="费用来源" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="scope.row.actId == 1030">接单</span>
|
|
|
- <span v-if="scope.row.actId == 1040">提箱</span>
|
|
|
- <span v-if="scope.row.actId == 1050">装卸柜</span>
|
|
|
- <span v-if="scope.row.actId == 1060">还卸柜</span>
|
|
|
- <span v-if="scope.row.actId == 1070">回单</span>
|
|
|
+ <span v-if="scope.row.actId == 1080">费用确认</span>
|
|
|
<span v-if="scope.row.actId == 1090">追加费用</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -745,6 +771,7 @@ export default {
|
|
|
goodsOptions: [],
|
|
|
fWbuOptions: [],
|
|
|
disabled: false,
|
|
|
+ fCNameOptions: [],
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -847,12 +874,17 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
addRelevt2() {
|
|
|
- // if(this.feesList.length){
|
|
|
-
|
|
|
- // }
|
|
|
+ let arr = this.feesList;
|
|
|
+ let arr2 = [];
|
|
|
+ arr.forEach((e) => {
|
|
|
+ arr2.push(e.fFeeid);
|
|
|
+ });
|
|
|
+ if (arr2.length > 0) {
|
|
|
+ return this.msgSuccess("费用已导入，请勿重复导入");
|
|
|
+ }
|
|
|
if (this.form.oilAmt > 0) {
|
|
|
this.feesList.push({
|
|
|
- actId: "1090",
|
|
|
+ actId: "1080",
|
|
|
fCorpid: this.form.fCorpId,
|
|
|
fFeeid: 52,
|
|
|
fDc: "C",
|
|
|
@@ -868,7 +900,7 @@ export default {
|
|
|
}
|
|
|
if (this.form.costomAmt03 > 0) {
|
|
|
this.feesList.push({
|
|
|
- actId: "1090",
|
|
|
+ actId: "1080",
|
|
|
fCorpid: this.form.fCorpId,
|
|
|
fFeeid: 55,
|
|
|
fDc: "C",
|
|
|
@@ -884,7 +916,7 @@ export default {
|
|
|
}
|
|
|
if (this.form.costomAmt05 > 0) {
|
|
|
this.feesList.push({
|
|
|
- actId: "1090",
|
|
|
+ actId: "1080",
|
|
|
fCorpid: this.form.fCorpId,
|
|
|
fFeeid: 58,
|
|
|
fDc: "C",
|
qukaidi