|
@@ -684,7 +684,7 @@
|
|
|
size="mini"
|
|
|
style="width: 160px"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
>
|
|
|
<el-option
|
|
@@ -709,7 +709,7 @@
|
|
|
remote
|
|
|
placeholder="费用名称"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
>
|
|
|
<el-option
|
|
@@ -727,7 +727,7 @@
|
|
|
v-model="scope.row.fDc"
|
|
|
placeholder="请选择"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
>
|
|
|
<el-option label="收" value="D"></el-option>
|
|
@@ -746,7 +746,7 @@
|
|
|
v-model="scope.row.fFeeunitid"
|
|
|
placeholder="请选择计费单位"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
clearable
|
|
|
>
|
|
@@ -770,7 +770,7 @@
|
|
|
v-model="scope.row.fBillingQty"
|
|
|
placeholder="请输入内容"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
@input="total(scope.row)"
|
|
|
v-input-limit="2"
|
|
@@ -788,7 +788,7 @@
|
|
|
v-model="scope.row.fUnitprice"
|
|
|
placeholder="请输入内容"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
@input="total(scope.row)"
|
|
|
v-input-limit="2"
|
|
@@ -805,7 +805,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.fCurrency"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
placeholder="请输入内容"
|
|
|
></el-input>
|
|
@@ -821,7 +821,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.fExrate"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
placeholder="请输入内容"
|
|
|
></el-input>
|
|
@@ -837,7 +837,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.fAmount"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
placeholder="请输入内容"
|
|
|
></el-input>
|
|
@@ -853,7 +853,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.fTaxrate"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
placeholder="请输入内容"
|
|
|
></el-input>
|
|
@@ -870,7 +870,7 @@
|
|
|
v-model="scope.row.remarks"
|
|
|
placeholder="请输入内容"
|
|
|
:disabled="
|
|
|
- scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
|
|
|
+ scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6||scope.row.fFeeid==61&&scope.row.actId == 1080
|
|
|
"
|
|
|
></el-input>
|
|
|
</template>
|
|
@@ -1686,14 +1686,14 @@ export default {
|
|
|
);
|
|
|
}
|
|
|
}
|
|
|
- if (this.form.priceDr > 0 || this.form.priceCr > 0) {
|
|
|
+ if (this.form.priceCr > 0) {
|
|
|
this.fFeeid61 = true;
|
|
|
this.chiFeesList.map((e) => {
|
|
|
if (e.fFeeid == 61 && e.actId == 1080) {
|
|
|
this.fFeeid61 = false;
|
|
|
}
|
|
|
});
|
|
|
- if (this.fFeeid61 && this.form.priceDr > 0) {
|
|
|
+ if (this.fFeeid61) {
|
|
|
this.chiFeesList.push({
|
|
|
actId: "1080",
|
|
|
fCorpid: this.form.fCorpId,
|
|
@@ -1701,30 +1701,30 @@ export default {
|
|
|
fDc: "D",
|
|
|
fFeeunitid: "6",
|
|
|
fBillingQty: 1,
|
|
|
- fUnitprice: this.form.priceDr,
|
|
|
- fCurrency: "RMB",
|
|
|
- fTaxrate: 3,
|
|
|
- fAmount: this.form.priceDr,
|
|
|
- fExrate: 1,
|
|
|
- remarks: null,
|
|
|
- });
|
|
|
- }
|
|
|
- if (this.fFeeid61 && this.form.priceCr > 0) {
|
|
|
- this.chiFeesList.push({
|
|
|
- actId: "1080",
|
|
|
- fCorpid: this.form.carcorPid,
|
|
|
- fFeeid: 61,
|
|
|
- fDc: "C",
|
|
|
- fFeeunitid: "6",
|
|
|
- fBillingQty: 1,
|
|
|
fUnitprice: this.form.priceCr,
|
|
|
fCurrency: "RMB",
|
|
|
fTaxrate: 3,
|
|
|
- fAmount: this.form.priceCr,
|
|
|
+ fAmount: this.form.priceDr,
|
|
|
fExrate: 1,
|
|
|
remarks: null,
|
|
|
});
|
|
|
}
|
|
|
+ // if (this.fFeeid61 && this.form.priceCr > 0) {
|
|
|
+ // this.chiFeesList.push({
|
|
|
+ // actId: "1080",
|
|
|
+ // fCorpid: this.form.carcorPid,
|
|
|
+ // fFeeid: 61,
|
|
|
+ // fDc: "C",
|
|
|
+ // fFeeunitid: "6",
|
|
|
+ // fBillingQty: 1,
|
|
|
+ // fUnitprice: this.form.priceCr,
|
|
|
+ // fCurrency: "RMB",
|
|
|
+ // fTaxrate: 3,
|
|
|
+ // fAmount: this.form.priceCr,
|
|
|
+ // fExrate: 1,
|
|
|
+ // remarks: null,
|
|
|
+ // });
|
|
|
+ // }
|
|
|
} else {
|
|
|
this.$message.error("未找到运输费用,请确认是否已添加");
|
|
|
}
|