From 6b8e493084cc8d2a2412056292d22e5b22cacbf6 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 20 Feb 2025 19:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E7=94=B3=E8=AF=B7=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/receive-apply/index.js | 34 ++
src/router/index.js | 60 ++-
.../direct-rotation-apply/index.vue | 13 +-
.../receive-apply/business-details.vue | 175 +++++++-
.../receive-apply/components/title-tip.vue | 37 ++
.../business-examine/receive-apply/index.vue | 391 ++++++++----------
.../reduction-apply/index.vue | 13 +-
.../material/countersign/config/index.vue | 4 +-
8 files changed, 470 insertions(+), 257 deletions(-)
create mode 100644 src/api/receive-apply/index.js
create mode 100644 src/views/business-examine/receive-apply/components/title-tip.vue
diff --git a/src/api/receive-apply/index.js b/src/api/receive-apply/index.js
new file mode 100644
index 00000000..77108ccb
--- /dev/null
+++ b/src/api/receive-apply/index.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+// 获取领用申请列表
+export function getReceiveApplyApi(query) {
+ return request({
+ url: '/material/ma_type/getMaTypeTreeSelect',
+ method: 'get',
+ params: query
+ })
+}
+// 获取领用申请详情
+export function getReceiveApplyDetailsApi(query) {
+ return request({
+ url: '/material/ma_type/getMaTypeTreeSelect',
+ method: 'get',
+ params: query
+ })
+}
+// 获取审核记录详情
+export function getAuditingDetailsApi(query) {
+ return request({
+ url: '/material/ma_type/getMaTypeTreeSelect',
+ method: 'get',
+ params: query
+ })
+}
+// 审核提交接口
+export function submitAuditingApi(query) {
+ return request({
+ url: '/material/ma_type/getMaTypeTreeSelect',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index b1cd5beb..343073ed 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -182,22 +182,52 @@ export const dynamicRoutes = [
meta: { title: '流程配置', activeMenu: '/countersign/config' }
}
]
+ },
+ // 领料审核 业务详情
+ {
+ path: '/business-details/receive-apply',
+ component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
+ hidden: true,
+ permissions: ['system:dict:list'], // 权限字符
+ children: [
+ {
+ path: 'index',
+ name: 'receive-apply-details',
+ meta: { title: '领料详情', activeMenu: '/business-examine/receive-apply' },
+ component: () => import('@/views/business-examine/receive-apply/business-details.vue')
+ }
+ ]
+ },
+ // 直转审核 业务详情
+ {
+ path: '/business-details/direct-rotation-apply',
+ component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
+ hidden: true,
+ permissions: ['system:dict:list'], // 权限字符
+ children: [
+ {
+ path: 'index',
+ name: 'direct-rotation-apply',
+ meta: { title: '直转详情', activeMenu: '/business-examine/direct-rotation-apply' },
+ component: () => import('@/views/business-examine/direct-rotation-apply/business-details.vue')
+ }
+ ]
+ },
+ // 减免审核 业务详情
+ {
+ path: '/business-details/reduction-apply',
+ component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
+ hidden: true,
+ permissions: ['system:dict:list'], // 权限字符
+ children: [
+ {
+ path: 'index',
+ name: 'reduction-apply',
+ meta: { title: '减免详情', activeMenu: '/business-examine/reduction-apply' },
+ component: () => import('@/views/business-examine/reduction-apply/business-details.vue')
+ }
+ ]
}
- // 业务详情
- // {
- // path: '/business-details',
- // component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
- // hidden: true,
- // permissions: ['system:dict:list'], // 权限字符
- // children: [
- // {
- // path: 'index',
- // name: 'business-details',
- // meta: { title: '业务详情', activeMenu: '/business-examine' },
- // component: () => import('@/views/business-examine/business-details.vue')
- // }
- // ]
- // }
]
// 防止连续点击多次路由报错
diff --git a/src/views/business-examine/direct-rotation-apply/index.vue b/src/views/business-examine/direct-rotation-apply/index.vue
index ea3ae845..1a18d891 100644
--- a/src/views/business-examine/direct-rotation-apply/index.vue
+++ b/src/views/business-examine/direct-rotation-apply/index.vue
@@ -41,16 +41,7 @@
/>
-
-
-
- {{ row.typeName }}
-
-
-
+
@@ -276,7 +267,7 @@ export default {
},
// 查询
handlePreview() {
- this.$router.push({ name: 'business-details' }) // 跳转业务详情页面
+ this.$router.push({ name: 'receive-apply-details' }) // 跳转业务详情页面
},
// 审核
handleAuditing() {}
diff --git a/src/views/business-examine/receive-apply/business-details.vue b/src/views/business-examine/receive-apply/business-details.vue
index beab4cf6..b4aed05b 100644
--- a/src/views/business-examine/receive-apply/business-details.vue
+++ b/src/views/business-examine/receive-apply/business-details.vue
@@ -2,21 +2,188 @@
- 左侧
+
+
领用申请详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 右侧
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 通过
+ 驳回
+
+
+
-
diff --git a/src/views/business-examine/receive-apply/components/title-tip.vue b/src/views/business-examine/receive-apply/components/title-tip.vue
new file mode 100644
index 00000000..7ee4e4d5
--- /dev/null
+++ b/src/views/business-examine/receive-apply/components/title-tip.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
diff --git a/src/views/business-examine/receive-apply/index.vue b/src/views/business-examine/receive-apply/index.vue
index ea3ae845..aad8cb08 100644
--- a/src/views/business-examine/receive-apply/index.vue
+++ b/src/views/business-examine/receive-apply/index.vue
@@ -1,285 +1,248 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
- 搜索
- 重置
+ 查询
+ 重置
+
-
+ 领料申请
+
+
+
+ 导出数据
+
+
+ -->
-
+
+
+
-
-
-
-
-
+
+
+
+ 待审核
+
+
+ 审核中
+
+
- {{ row.typeName }}
-
+ 已完成
+
-
+
-
- 查看
-
-
+
审核
+
+
+ 删除
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/views/business-examine/reduction-apply/index.vue b/src/views/business-examine/reduction-apply/index.vue
index ea3ae845..1a18d891 100644
--- a/src/views/business-examine/reduction-apply/index.vue
+++ b/src/views/business-examine/reduction-apply/index.vue
@@ -41,16 +41,7 @@
/>
-
-
-
- {{ row.typeName }}
-
-
-
+
@@ -276,7 +267,7 @@ export default {
},
// 查询
handlePreview() {
- this.$router.push({ name: 'business-details' }) // 跳转业务详情页面
+ this.$router.push({ name: 'receive-apply-details' }) // 跳转业务详情页面
},
// 审核
handleAuditing() {}
diff --git a/src/views/material/countersign/config/index.vue b/src/views/material/countersign/config/index.vue
index 5cfa10c4..f9eac8dd 100644
--- a/src/views/material/countersign/config/index.vue
+++ b/src/views/material/countersign/config/index.vue
@@ -109,7 +109,7 @@
:key="dict.value"
:label="dict.label"
:value="dict.value"
- v-for="dict in dict.type.countersign_type_name"
+ v-for="dict in dict.type.tm_task_type"
/>
@@ -128,7 +128,7 @@
import { getConfigListApi, addConfigApi, editConfigApi, deleteConfigApi } from '@/api/countersign/countersign'
export default {
name: 'signConfig',
- dicts: ['countersign_process_name', 'countersign_type_name'],
+ dicts: ['countersign_process_name', 'countersign_type_name', 'tm_task_type'],
data() {
return {
// 遮罩层