From 9941fc14f6c7bd374586a612002086402e37e2b8 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Tue, 15 Apr 2025 22:33:38 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=B3=A8=E9=87=8A=E5=85=AC=E5=91=8A?=
=?UTF-8?q?=E9=99=84=E4=BB=B6=E5=88=97=E8=A1=A8=E7=9B=B8=E5=85=B3=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/article-management/add.vue | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/article-management/add.vue b/src/views/article-management/add.vue
index fea8059..3276577 100644
--- a/src/views/article-management/add.vue
+++ b/src/views/article-management/add.vue
@@ -40,16 +40,16 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
From 2827c5ace60adad7a25d1ce6ef2febb72b2f6002 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Tue, 15 Apr 2025 23:14:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E8=B4=B9=E7=94=A8=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../expense-management/cost-detail/index.vue | 71 ++++++++++++++-----
.../expend-detail/index.vue | 22 +++---
.../expense-management/share-detail/index.vue | 3 -
3 files changed, 63 insertions(+), 33 deletions(-)
diff --git a/src/views/expense-management/cost-detail/index.vue b/src/views/expense-management/cost-detail/index.vue
index a3d865c..13fc5fb 100644
--- a/src/views/expense-management/cost-detail/index.vue
+++ b/src/views/expense-management/cost-detail/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -30,17 +30,39 @@ const searchConfig = ref([
checkStrictly: true
}
},
- // {
- // label: '子项目',
- // prop: 'subProjectName',
- // component: 'el-input',
- // props: {
- // placeholder: '请输入子项目查询',
- // clearable: true,
- // filterable: true,
- // checkStrictly: true
- // }
- // },
+ {
+ label: '子项目',
+ prop: 'subProjectName',
+ component: 'el-input',
+ props: {
+ placeholder: '请输入子项目查询',
+ clearable: true,
+ filterable: true,
+ checkStrictly: true
+ }
+ },
+ {
+ label: '会计凭证记载金额(元)',
+ prop: 'recordedAmount',
+ component: 'el-input',
+ props: {
+ placeholder: '请输入会计凭证记载金额查询',
+ clearable: true,
+ filterable: true,
+ checkStrictly: true
+ }
+ },
+ {
+ label: '归集研发费用金额(元)',
+ prop: 'rdAmount',
+ component: 'el-input',
+ props: {
+ placeholder: '请输入归集研发费用金额查询',
+ clearable: true,
+ filterable: true,
+ checkStrictly: true
+ }
+ },
// {
// label: '项目类型',
// prop: 'projectType',
@@ -82,14 +104,20 @@ const tableConfig = reactive({
// }
// },
{
- prop: 'paymentYear',
- label: '支付年份',
+ prop: 'rdYear',
+ label: '年',
align: 'center',
width: 80
},
{
- prop: 'paymentMonth',
- label: '支付月份',
+ prop: 'rdMonth',
+ label: '月',
+ align: 'center',
+ width: 80
+ },
+ {
+ prop: 'rdDay',
+ label: '日',
align: 'center',
width: 80
},
@@ -126,9 +154,10 @@ const tableConfig = reactive({
},
{
- prop: 'remarks',
+ prop: 'digest',
label: '摘要',
align: 'center',
+ showOverflowTooltip: false,
},
{
prop: 'accountCode',
@@ -141,11 +170,13 @@ const tableConfig = reactive({
prop: 'accountName',
label: '科目名称',
align: 'center',
+ showOverflowTooltip: false,
},
{
prop: 'auxiliaryItem',
label: '辅助项',
align: 'center',
+ showOverflowTooltip: false,
},
{
prop: 'recordedAmount',
@@ -160,7 +191,7 @@ const tableConfig = reactive({
width: 170
},
],
- api: '/workflow/mosr/payment/list',
+ api: '/workflow/mosr/rd/expense/list',
params: {},
btns: [
{name: '模板下载', key: 'down', color: '#DED0B2'},
@@ -220,7 +251,9 @@ const importTheExpenseLedger = () => {
}