|
|
@@ -251,7 +251,7 @@
|
|
|
<!--单价-->
|
|
|
<el-table-column prop="unitPrice" :label="$t('lift.unitPrice')" width="150px" align="right">
|
|
|
<template slot-scope="scope">
|
|
|
- {{ toDecimal2(numFormat(scope.row.unitPrice)) }}
|
|
|
+ {{ getUnit(scope.row.currencyId) + toDecimal2(numFormat(scope.row.unitPrice)) }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<!--项目名称-->
|
|
|
@@ -271,12 +271,12 @@
|
|
|
<!--附加费用-->
|
|
|
<el-table-column prop="additionalCost" :label="$t('lift.additionalCost')" width="180px" align="right">
|
|
|
<template slot-scope="scope">
|
|
|
- {{ toDecimal2(numFormat(scope.row.additionalCost)) }}
|
|
|
+ {{ getUnit(scope.row.currencyId) + toDecimal2(numFormat(scope.row.additionalCost)) }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="总价" prop="liftAmount" width="180px" align="right">
|
|
|
<template slot-scope="{row}">
|
|
|
- {{ toDecimal2(numFormat(row.liftAmount)) }}
|
|
|
+ {{ getUnit(row.currencyId) + toDecimal2(numFormat(row.liftAmount)) }}
|
|
|
</template>
|
|
|
</el-table-column >
|
|
|
|
|
|
@@ -629,6 +629,7 @@ import {getAccountByAgent} from "@/api/business/crm/account";
|
|
|
import Vue from "vue";
|
|
|
import {getI18nDictName} from "@/utils/dict/DictFind";
|
|
|
import {audit} from "@/api/system/flow";
|
|
|
+import {getDicts} from "@/api/system/dict/data";
|
|
|
|
|
|
export default {
|
|
|
name: "Contract-Edit",
|
|
|
@@ -655,6 +656,7 @@ export default {
|
|
|
{required: true, message: this.$t('user.area') + this.$t('common.notEmpty'), trigger: "change"}
|
|
|
],
|
|
|
},
|
|
|
+ currencyUnitList:[],
|
|
|
nationList: [],
|
|
|
areaList: [],
|
|
|
equipmentList: [],
|
|
|
@@ -780,6 +782,8 @@ export default {
|
|
|
this.initType();
|
|
|
this.contractId = this.$route.params.contractId ;
|
|
|
this.loading = true;
|
|
|
+ //从数据库取出货币单位
|
|
|
+ this.getDictsFun()
|
|
|
|
|
|
try {
|
|
|
//获取地区
|
|
|
@@ -815,6 +819,22 @@ export default {
|
|
|
this.$tab.updatePage(obj);
|
|
|
},
|
|
|
methods: {
|
|
|
+ getUnit(currencyId){
|
|
|
+ const label = this.currencyUnitList.find(item => item.value == currencyId);
|
|
|
+ return label ? label.label : '';
|
|
|
+ },
|
|
|
+ getDictsFun(){
|
|
|
+ getDicts("currency_type").then(res=>{
|
|
|
+ if(res && res.code === 200){
|
|
|
+ res.data.forEach(item => {
|
|
|
+ this.currencyUnitList.push({
|
|
|
+ label: item.remark.charAt(item.remark.length - 1),
|
|
|
+ value: item.dictValue
|
|
|
+ })
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
formatDiscount(row, column, cellValue) {
|
|
|
return cellValue ? parseFloat(cellValue).toFixed(4) : '0.0000';
|
|
|
},
|
|
|
@@ -1029,6 +1049,7 @@ export default {
|
|
|
if(this.type == 'approve'){
|
|
|
getContractById(this.contractId).then(response => {
|
|
|
this.approveForm = response.data;
|
|
|
+ console.log("this.approveForm=====================>",this.approveForm)
|
|
|
//确定走审批流程3 还是 4（少） 1.首先如果是不是第一版本 || 付款方式是信用证 || 付款比例不是是30/70 走财务流程3 3.否则还是走4
|
|
|
this.approveForm.businessDesc = this.form.version > 1 || this.approveForm.paymentMethod === '1' || this.approveForm.paymentRatio !=='1' ? 3 : 4
|
|
|
})
|
|
|
@@ -1492,7 +1513,13 @@ export default {
|
|
|
},
|
|
|
//审核通过
|
|
|
async approveYes(){
|
|
|
- this.$set(this.approveForm,"approveStatus","2")
|
|
|
+ if("toVoid" === this.equipmentList[0].type){
|
|
|
+ //作废
|
|
|
+ this.$set(this.approveForm,"approveStatus","4")
|
|
|
+ }else{
|
|
|
+ //通过
|
|
|
+ this.$set(this.approveForm,"approveStatus","2")
|
|
|
+ }
|
|
|
let bargainObj = {
|
|
|
paymentMethod:this.approveForm.paymentMethod,
|
|
|
paymentRatio:this.approveForm.paymentRatio
|
|
|
@@ -1510,6 +1537,7 @@ export default {
|
|
|
// 业务参数
|
|
|
businessObj: bargainObj
|
|
|
}
|
|
|
+ console.log("this.equipmentList",this.equipmentList[0])
|
|
|
const response = await audit(auditForm)
|
|
|
if(response && response.code == 200){
|
|
|
const res = await editFlow({...this.approveForm})
|
chenj