From cdd399de614778acee8880ec133242c5500c3e03 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 12 八月 2026 09:56:22 +0800
Subject: [PATCH] 合并冲突
---
src/views/project/tallage/index.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/project/tallage/index.vue b/src/views/project/tallage/index.vue
index 69287b5..f15f1b6 100644
--- a/src/views/project/tallage/index.vue
+++ b/src/views/project/tallage/index.vue
@@ -88,7 +88,7 @@
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="缁忓姙浜�" align="center" prop="username" />
+ <!-- <el-table-column label="缁忓姙浜�" align="center" prop="username" /> -->
<el-table-column
label="鐢宠鍗曞彿"
width="180"
@@ -103,15 +103,19 @@
<el-table-column label="鏄惁绠楃◣" width="180" align="center" prop="istax">
<template slot-scope="scope">
<dict-tag
- :options="dict.type.sys_calculate"
+ :options="dict.type.sys_0_1"
:value="scope.row.istax"
/>
</template>
</el-table-column>
- <el-table-column label="鎬婚噾棰�" align="center" prop="taxamount" />
+ <!-- <el-table-column label="鎬婚噾棰�" align="center" prop="taxamount" /> -->
<el-table-column label="绠楃◣鏃堕棿" align="center" prop="taxedtime" />
- <el-table-column label="浠樻鐘舵��" align="center" prop="isdistribute" />
+ <el-table-column label="浠樻鐘舵��" align="center" prop="isdistribute">
+ <template slot-scope="scope">
+ <span>{{ scope.row.isdistribute == "0" ? "鏈粯娆�" : "宸蹭粯娆�" }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="浠樻鏃ユ湡" align="center" prop="riqi" />
<el-table-column label="鎿嶄綔" width="280" align="center">
<template slot-scope="scope">
@@ -216,7 +220,7 @@
export default {
name: "Donorcharge",
- dicts: ["sys_gathering", "sys_calculate"],
+ dicts: ["Collection_status", "sys_0_1"],
components: {
OrgSelecter
},
@@ -385,7 +389,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.$router.push({
- path: "/cost/computingBill",
+ path: "/finance/computingBill",
query: { id: row.id, operation: "update", data: row }
});
},
@@ -393,7 +397,7 @@
/** 璇︽儏鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail(row) {
this.$router.push({
- path: "/cost/computingBill",
+ path: "/finance/computingBill",
query: { id: row.id, operation: "detail", data: row }
});
},
--
Gitblit v1.9.3