diff --git a/src/views/contract/components/examineRegistration.vue b/src/views/contract/components/examineRegistration.vue
index 21250bb..4693829 100644
--- a/src/views/contract/components/examineRegistration.vue
+++ b/src/views/contract/components/examineRegistration.vue
@@ -75,7 +75,6 @@
@@ -164,7 +163,7 @@ export default {
}
}
],
- paymentType:["进度款","结算款","质保金"],
+ paymentType:["首付款","进度款","结算款","质保金"],
isShow:false,
registrationId:"",
paymentRegistrationForm:{
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index 3419698..02407da 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -313,7 +313,7 @@ export default {
},
},
],
- paymentType: ["进度款", "结算款", "质保金"],
+ paymentType: ["首付款","进度款", "结算款", "质保金"],
isShowPaymentRegistration: false,
paymentRegistrationForm: {
applyMoney: "",
diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue
index e53f0e9..fe98fa1 100644
--- a/src/views/contract/contractEdit.vue
+++ b/src/views/contract/contractEdit.vue
@@ -73,6 +73,7 @@
row-key="id"
border
default-expand-all
+ @select="planPick"
:tree-props="{ children: 'notChildren', hasChildren: 'hasChildren' }"
>
@@ -1164,7 +1165,7 @@ export default {
align: "left",
},
{
- label: "预存金额",
+ label: "框架合同总额",
prop: "plan_price",
width: 120,
align: "right"
@@ -1194,6 +1195,14 @@ export default {
};
},
methods: {
+ planPick (selection, row) {
+ if (row.year != new Date().getFullYear()) {
+ this.$confirm("您选择了非本年预算，是否继续？").catch(_ => {
+ this.$refs['editorPlanTable'].toggleRowSelection(row)
+ })
+ }
+ },
+
setType(type) {
if (["add", "edit"].find((i) => i === type)) {
this.type = type;
@@ -1372,7 +1381,7 @@ export default {
})?.label,
yusuan: row?.plan_price?.toString(),
zijinlaiyuan: row.money_way_detail?.value,
- zijinlaiyuanjuti: row?.plans.reduce((pre,cur,index)=>(index === 0 ? cur?.name : pre+cur?.name+"；"),"")
+ zijinlaiyuanjuti: row?.plans.reduce((pre,cur,index)=>(index === 0 ? (`【${cur?.year}】${cur?.name}`) : (pre+`，【${cur?.year}】${cur?.name}`)),"")
};
let url = `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/8&auth_token=${this.$store.getters.oa_token}&out_caigou_id=${
row.id
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index f4144b9..0ff8278 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -2268,7 +2268,7 @@ export default {
}
}, ""),
- zijinlaiyuanjuti: row?.plans.reduce((pre,cur,index)=>(index === 0 ? cur?.name : pre+cur?.name+"；"),"")
+ zijinlaiyuanjuti: row?.plans.reduce((pre,cur,index)=>(index === 0 ? (`【${cur?.year}】${cur?.name}`) : (pre+`，【${cur?.year}】${cur?.name}`)),"")
};
console.log(baseInfo.zijinlaiyuanjuti)
// let res = await getOatoken()
@@ -2745,7 +2745,7 @@ export default {
flowStatus["shenpi"].setExecutable(true)
}
}
- if (item.is_contract && item.purchase_way?.value !== "网上商城" && !/contractLedger/g.test(this.$route.path)) {
+ if (item.is_contract && item.purchase_way?.value !== "网上商城" && !item.is_substitute) {
flowStatus["qianding"].setStatus(item.status)
if (item.join_status === 3 && item.status === 1) {
flowStatus["qianding"].setExecutable(true)
@@ -2754,9 +2754,9 @@ export default {
if (item.is_end === 0) {
flowStatus["zhifu"].setStatus(1)
//最后一笔没付完
- if ((item.purchase_way?.value === "网上商城" && item.purchase_status === 3) ||
+ if ((!item.is_contract && !item.is_substitute && item.purchase_status === 3) || (item.purchase_way?.value === "网上商城" && item.purchase_status === 3) ||
item.status === 2 ||
- (!item.is_contract && item.is_simple)) {
+ (!item.is_contract && item.is_simple) || (item.is_contract && item.is_substitute && item.join_status === 3)) {
//网上商场的话采购完成 合同签订完成 不为合同并且为简易
flowStatus["zhifu"].setExecutable(true)
}
@@ -2810,7 +2810,6 @@ export default {
})
.catch((error) => {});
this.getPurchaseType();
- this.select.is_myself = this.$route.path.split('_')[1] ? Number(this.$route.path.split('_')[1]) : 0
this.getDepartment();
this.getPurchaseWay();
this.getMoneyWay();
@@ -2823,13 +2822,11 @@ export default {
created() {
this.getBudgets();
this.select.keyword = this.$route.query.keyword || "";
- //this.select.is_contract = /All|all/g.test(this.$route.path) ? "" : 0;
+ this.select.is_myself = this.$route.path.split('_')[1] ? Number(this.$route.path.split('_')[1]) : 0;
if (/contractLedger/g.test(this.$route.path)) {
this.select.is_contract = 1;
this.select.purchase_status = 3;
- }
- if (/mycontract/g.test(this.$route.path)) {
- this.select.is_contract = 1;
+ this.select.invite_status = 3;
}
if (/contractAll/g.test(this.$route.path)) {
this.select.is_simple = "";
@@ -2845,6 +2842,7 @@ export default {
.selects {
display: flex;
flex-wrap: wrap;
+ align-items: center;
& > div {
margin-bottom: 6px;
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 02179f3..69a52f0 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -572,7 +572,7 @@ export default {
});
let curAct = res?.map(i => {
const { use_money_total,money_total_2 } = i
- return money_total_2 ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
+ return Number(money_total_2) ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
});
let nextPlan = res?.map(i => {
const { use_money_total_next,paid_plan_total_next,money_total_2 } = i
@@ -944,6 +944,13 @@ export default {
};