diff --git a/api/hrm/appropriation.js b/api/hrm/appropriation.js
new file mode 100644
index 0000000..4247da4
--- /dev/null
+++ b/api/hrm/appropriation.js
@@ -0,0 +1,59 @@
+import request from "@/util/oaRequest"
+
+// 请假单
+export function listAppropriationReq (query) {
+ return request({
+ url: '/hrm/appropriation/list',
+ method: 'get',
+ params: query
+ })
+}
+
+export function getAppropriationReq (bizId) {
+ return request({
+ url: `/hrm/appropriation/${bizId}`,
+ method: 'get'
+ })
+}
+
+export function addAppropriationReq (data) {
+ return request({
+ url: '/hrm/appropriation',
+ method: 'post',
+ data
+ })
+}
+
+export function editAppropriationReq (data) {
+ return request({
+ url: '/hrm/appropriation',
+ method: 'put',
+ data
+ })
+}
+
+export function delAppropriationReq (bizIds) {
+ return request({
+ url: `/hrm/appropriation/${bizIds}`,
+ method: 'delete'
+ })
+}
+
+export function allAppropriationReq (query) {
+ return request({
+ url: '/hrm/appropriation/all',
+ method: 'get',
+ params: query
+ })
+}
+
+/**
+ * 请假统计信息
+ */
+export function getAppropriationStats (query) {
+ return request({
+ url: '/hrm/appropriation/req/stats',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/components/hrm/detailPanels/appropriation.vue b/components/hrm/detailPanels/appropriation.vue
new file mode 100644
index 0000000..a44ed83
--- /dev/null
+++ b/components/hrm/detailPanels/appropriation.vue
@@ -0,0 +1,381 @@
+
+
+
+
+
+
+ 拨款类型
+ {{ detail.appropriationType || '无' }}
+
+
+
+
+ 拨款总金额
+ {{ detail.amount || 0 }} 元
+
+
+
+
+ 收款人姓名
+ {{ detail.payeeName || '无' }}
+
+
+
+
+ 开户银行
+ {{ detail.bankName || '无' }}
+
+
+
+
+ 银行账号
+ {{ detail.bankAccount || '无' }}
+
+
+
+
+ 拨款事由
+ {{ detail.reason || '无' }}
+
+
+
+
+ 备注
+ {{ detail.remark || '无' }}
+
+
+
+
+ 申请人
+ {{ detail.createBy || '无' }}
+
+
+
+ 申请时间
+ {{ detail.createTime || '无' }}
+
+
+
+
+ 附件：
+
+
+
+
+
+
+
+ 项目名称
+ {{ detail.projectName || '无' }}
+
+
+
+ 项目编号
+ {{ detail.projectNum || '无' }}
+
+
+
+ 项目代号
+ {{ detail.projectCode || '无' }}
+
+
+
+
+
+ 项目名称：
+ {{ detail.projectName || '-' }}
+
+
+ 项目编号：
+ {{ detail.projectNum || '-' }}
+
+
+ 项目代号：
+ {{ detail.projectCode || '-' }}
+
+
+ 项目类型：
+
+
+
+ 项目地址：
+ {{ detail.address || '-' }}
+
+
+ 项目总金额：
+ {{ detail.funds || '-' }}元
+
+
+ 负责人：
+ {{ detail.functionary || '-' }}
+
+
+ 备注：
+ {{ detail.remark || '-' }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/oa/oa-file-list/index.vue b/components/oa/oa-file-list/index.vue
index 0f34e66..2d332cd 100644
--- a/components/oa/oa-file-list/index.vue
+++ b/components/oa/oa-file-list/index.vue
@@ -1,6 +1,6 @@
-
+
@@ -15,7 +15,7 @@
-
+
暂无附件
diff --git a/pages/hrm/approve/approve.vue b/pages/hrm/approve/approve.vue
index 018a1ee..fa78d09 100644
--- a/pages/hrm/approve/approve.vue
+++ b/pages/hrm/approve/approve.vue
@@ -115,6 +115,10 @@
{
label: '报销',
value: 'reimburse'
+ },
+ {
+ label: '拨款',
+ value: 'appropriation'
}
],
bizTypeIndex: 0,
@@ -187,6 +191,9 @@
} else if (task.bizType === 'reimburse') {
const amt = biz.totalAmount != null ? biz.totalAmount : 0;
return `${biz.reimburseType || '报销'} · 金额: ${amt}元`;
+ } else if (task.bizType === 'appropriation') {
+ const amt = biz.amount != null ? biz.amount : 0;
+ return `${biz.appropriationType || '拨款'} · 金额: ${amt}元`;
}
return '-';
},
@@ -200,7 +207,8 @@
leave: '请假',
travel: '出差',
seal: '用印',
- reimburse: '报销'
+ reimburse: '报销',
+ appropriation: '拨款'
};
return map[type] || type || '-';
},
@@ -210,7 +218,8 @@
leave: 'primary',
travel: 'success',
seal: 'warning',
- reimburse: 'danger'
+ reimburse: 'danger',
+ appropriation: 'danger'
};
return map[type] || 'info';
},
diff --git a/pages/workbench/hrm/approve/approve.vue b/pages/workbench/hrm/approve/approve.vue
index 3ecd07b..6d45aeb 100644
--- a/pages/workbench/hrm/approve/approve.vue
+++ b/pages/workbench/hrm/approve/approve.vue
@@ -114,6 +114,10 @@
{
label: '报销',
value: 'reimburse'
+ },
+ {
+ label: '拨款',
+ value: 'appropriation'
}
],
bizTypeIndex: 0,
@@ -168,6 +172,9 @@
} else if (task.bizType === 'reimburse') {
const amt = biz.totalAmount != null ? biz.totalAmount : 0;
return `${biz.reimburseType || '报销'} · 金额: ${amt}元`;
+ } else if (task.bizType === 'appropriation') {
+ const amt = biz.amount != null ? biz.amount : 0;
+ return `${biz.appropriationType || '拨款'} · 金额: ${amt}元`;
}
return '-';
},
@@ -181,7 +188,8 @@
leave: '请假',
travel: '出差',
seal: '用印',
- reimburse: '报销'
+ reimburse: '报销',
+ appropriation: '拨款'
};
return map[type] || type || '-';
},
@@ -191,7 +199,8 @@
leave: 'primary',
travel: 'success',
seal: 'warning',
- reimburse: 'danger'
+ reimburse: 'danger',
+ appropriation: 'danger'
};
return map[type] || 'info';
},
diff --git a/pages/workbench/hrm/detail/detail.vue b/pages/workbench/hrm/detail/detail.vue
index 3c43b17..83f1ce5 100644
--- a/pages/workbench/hrm/detail/detail.vue
+++ b/pages/workbench/hrm/detail/detail.vue
@@ -20,6 +20,7 @@
import HRMReimburseDetail from '@/components/hrm/detailPanels/reimburse.vue'
import HRMSealDetail from '@/components/hrm/detailPanels/seal.vue'
import HRMTravelDetail from '@/components/hrm/detailPanels/travel.vue'
+ import HRMAppropriationDetail from '@/components/hrm/detailPanels/appropriation.vue'
import {
approveFlowTask,
@@ -34,7 +35,8 @@
HRMLeaveDetail,
HRMReimburseDetail,
HRMSealDetail,
- HRMTravelDetail
+ HRMTravelDetail,
+ HRMAppropriationDetail
},
data() {
return {
@@ -46,7 +48,8 @@
leave: 'HRMLeaveDetail', // 请假
reimburse: 'HRMReimburseDetail', // 报销
seal: 'HRMSealDetail', // 用章
- travel: 'HRMTravelDetail' // 差旅
+ travel: 'HRMTravelDetail' ,// 差旅
+ appropriation: 'HRMAppropriationDetail'
}
}
},
diff --git a/pages/workbench/wms/in.vue b/pages/workbench/wms/in.vue
index 73b6833..ead1ec7 100644
--- a/pages/workbench/wms/in.vue
+++ b/pages/workbench/wms/in.vue
@@ -96,17 +96,6 @@
height="700rpx"
>