-
年份
+
名称
+
+
年份
-
+
+
资金隶属情况
+
+
+
+
+
+
+
+
预算类型
-
- 科室
-
+
科室
-
-
+
+
@@ -118,6 +162,29 @@
},
data() {
return {
+ isTree: true,
+ dimensions: [
+ {
+ value: "年初部门预算",
+ id: "1"
+ },
+ {
+ value: "年中追加部门预算",
+ id: "2"
+ },
+ {
+ value: "上年结转资金",
+ id: "3"
+ },
+ {
+ value: "基本户资金",
+ id: "4"
+ },
+ {
+ value: "其他",
+ id: "5"
+ }
+ ],
isShowAdd: false,
types: [],
form: {
@@ -230,11 +297,14 @@
},
],
select: {
+ name: "",
page: 1,
year: "",
type: "",
- type_pid: "",
department: "",
+ is_auth: 0,
+ type_pid: "",
+ dimension: []
},
departments: [], //部门类型
@@ -244,6 +314,23 @@
}
},
methods: {
+ changeTree() {
+ if (!this.isTree) {
+ this.table = [
+ {
+ label: "隶属项目",
+ prop: "pid_info_name",
+ width: 200,
+ align: "left",
+ sortable: false,
+ fixed: "left",
+ },
+ ].concat(this.tableItem);
+ } else {
+ this.table = this.tableItem;
+ }
+ this.getBudgets();
+ },
handleTypePick(e) {
if (e.length === 1) {
this.select.type_pid = e[0] || ''
@@ -342,15 +429,17 @@
//查询计划列表
getBudgets() {
getBudget({
+ name: this.select.name,
page_size: this.pageSize,
page: this.pageIndex,
year: this.select.year,
type: this.select.type,
plan_department_id: this.select.department,
+ is_tree: this.isTree ? 1 : "",
+ top_pid: !this.isTree ? 1 : "",
+ is_auth:this.select.is_auth,
type_pid: this.select.type_pid,
- //top_pid: 1,
- is_auth: 1,
- is_tree: 1
+ dimension: this.select.dimension.toString()
}).then(res => {
for (var m of res.list) {
m.pid_info_name = m.pid_info?.name
diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue
index 219de87..0168283 100644
--- a/src/views/contract/contractEdit.vue
+++ b/src/views/contract/contractEdit.vue
@@ -1124,12 +1124,11 @@ export default {
},
{
label: "计划金额",
- prop: "money",
+ prop: "update_money",
align: "right",
width: 120,
formatter: (v1, v2, value) => {
- return `${(value && parseFloat(value) !== 0) ? value : v1.update_money }`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
- }
+ return `${(value && parseFloat(value) !== 0) ? value : v1.money }`.replace(/\B(?=(\d{3})+(?!\d))/g, ",") }
},
{
label: "实付金额",
@@ -1303,7 +1302,7 @@ export default {
});
return;
}
- if ((i._inputMoney > ((Number(i.money) || Number(i.update_money)) - Number(i.has_money_total))) || (i._inputMoney > ((Number(i.money) || Number(i.update_money)) - Number(i.use_money_total)))) {
+ if ((i._inputMoney > (Number(i.update_money) || (Number(i.money)) - Number(i.has_money_total))) || (i._inputMoney > (Number(i.update_money) || (Number(i.money)) - Number(i.use_money_total)))) {
this.$message({
type: "warning",
message: `【${i.year}】${i.name} 使用金额大于剩余预算！`,
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 62f0af4..dd3fd24 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -1038,6 +1038,7 @@
ref="planTable"
:height="300"
:list="plans"
+ highlight-current-row
:show-index="false"
:table-item="planTable"
style="margin-top: 10px"
@@ -2754,7 +2755,7 @@ export default {
}
}
}
- if (item.purchase_way?.value !== '网上商城' && item.is_contract && item.purchase_way?.remark === 'true' && !item.is_substitute) {
+ if (item.is_contract && item.purchase_way?.remark === 'true' && !item.is_substitute) {
//不为网上商场 是合同\
flowStatus["zhaobiao"].setStatus(item.invite_status)
if (item.invite_status === 1 && item.purchase_status === 3) {
@@ -2762,7 +2763,7 @@ export default {
flowStatus["zhaobiao"].setExecutable(true)
}
}
- if (item.is_contract && item.purchase_way?.value !== "网上商城") {
+ if (item.is_contract) {
//为合同 不为网上商城
flowStatus["shenpi"].setStatus(item.join_status)
if (item.join_status === 1 && (item.invite_status === 3 ||
@@ -2771,7 +2772,7 @@ export default {
flowStatus["shenpi"].setExecutable(true)
}
}
- if (item.is_contract && item.purchase_way?.value !== "网上商城" && !item.is_substitute) {
+ if (item.is_contract && !item.is_substitute) {
flowStatus["qianding"].setStatus(item.status)
if (item.join_status === 3 && item.status === 1) {
flowStatus["qianding"].setExecutable(true)
@@ -2780,7 +2781,7 @@ export default {
if (item.is_end === 0) {
flowStatus["zhifu"].setStatus(1)
//最后一笔没付完
- if ((!item.is_contract && !item.is_substitute && item.purchase_status === 3) || (item.purchase_way?.value === "网上商城" && item.purchase_status === 3) ||
+ if ((!item.is_contract && !item.is_substitute && item.purchase_status === 3) ||
item.status === 2 ||
(!item.is_contract && item.is_simple) || (item.is_contract && item.is_substitute && item.join_status === 3)) {
//网上商场的话采购完成 合同签订完成 不为合同并且为简易
@@ -2852,7 +2853,7 @@ export default {
if (/contractLedger/g.test(this.$route.path)) {
this.select.is_contract = 1;
this.select.purchase_status = 3;
- this.select.invite_status = 3;
+ //this.select.invite_status = 3;
this.select.is_simple = "";
}
if (/contractAll/g.test(this.$route.path)) {
diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue
index 31544b0..715436e 100644
--- a/src/views/finance/paymentRegistrationList.vue
+++ b/src/views/finance/paymentRegistrationList.vue
@@ -383,13 +383,17 @@ export default {
{
if (row.act_plan_link.length > 0) {
return row.act_plan_link.map((item) => {
- return (
-
- {" "}
- [{item.plan.year}] {(item.plan && item.plan.pid_info) ? item.plan.pid_info.name: ''} - {item.plan.name}
[使用金额]{" "}
- {item.use_money}元{" "}
-
- );
+ if (item.plan) {
+ return (
+
+ {" "}
+ [{item.plan.year}] {(item.plan && item.plan.pid_info) ? item.plan.pid_info.name: ''} - {item.plan.name}
[使用金额]{" "}
+ {item.use_money}元{" "}
+
+ );
+ } else {
+ return ""
+ }
});
}
}
diff --git a/src/views/inOut/expenseAccount.vue b/src/views/inOut/expenseAccount.vue
index 731d8a6..04fd8b1 100644
--- a/src/views/inOut/expenseAccount.vue
+++ b/src/views/inOut/expenseAccount.vue
@@ -161,6 +161,21 @@