diff --git a/.prettierrc b/.prettierrc index f124b4e6..028eed89 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,17 +1,17 @@ { - "printWidth": 120, - "tabWidth": 2, - "singleQuote": true, - "semi": false, - "bracketSpacing": true, - "jsxBracketSameLine": true, - "arrowParens": "avoid", - "endOfLine": "lf", - "useTabs": false, - "trailingComma": "none", - "bracketSameLine": false, - "htmlWhitespaceSensitivity": "ignore", - "vueIndentScriptAndStyle": false, - "singleAttributePerLine": false, - "importStatement": "none" + "printWidth": 120, + "tabWidth": 2, + "singleQuote": true, + "semi": false, + "bracketSpacing": true, + "jsxBracketSameLine": true, + "arrowParens": "avoid", + "endOfLine": "lf", + "useTabs": false, + "trailingComma": "none", + "bracketSameLine": false, + "htmlWhitespaceSensitivity": "ignore", + "vueIndentScriptAndStyle": false, + "singleAttributePerLine": false, + "importStatement": "none" } diff --git a/src/api/receive-apply/index.js b/src/api/receive-apply/index.js index 77108ccb..b2c63fc4 100644 --- a/src/api/receive-apply/index.js +++ b/src/api/receive-apply/index.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取领用申请列表 export function getReceiveApplyApi(query) { return request({ - url: '/material/ma_type/getMaTypeTreeSelect', + url: '/material/leaseTask/auditList', method: 'get', params: query }) @@ -19,7 +19,7 @@ export function getReceiveApplyDetailsApi(query) { // 获取审核记录详情 export function getAuditingDetailsApi(query) { return request({ - url: '/material/ma_type/getMaTypeTreeSelect', + url: '/material//sysWorkflowNode/listByTaskId', method: 'get', params: query }) diff --git a/src/api/reduction-apply/index.js b/src/api/reduction-apply/index.js new file mode 100644 index 00000000..1bb90408 --- /dev/null +++ b/src/api/reduction-apply/index.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +// 获取减免申请审核列表 +export function getReceiveApplyApi(query) { + return request({ + url: '/material/leaseTask/auditList', + 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//sysWorkflowNode/listByTaskId', + 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 343073ed..e3146457 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -188,7 +188,7 @@ export const dynamicRoutes = [ path: '/business-details/receive-apply', component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 hidden: true, - permissions: ['system:dict:list'], // 权限字符 + permissions: ['receive-apply:list'], // 权限字符 children: [ { path: 'index', @@ -203,7 +203,7 @@ export const dynamicRoutes = [ path: '/business-details/direct-rotation-apply', component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 hidden: true, - permissions: ['system:dict:list'], // 权限字符 + permissions: ['*'], // 权限字符 children: [ { path: 'index', @@ -218,7 +218,7 @@ export const dynamicRoutes = [ path: '/business-details/reduction-apply', component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 hidden: true, - permissions: ['system:dict:list'], // 权限字符 + permissions: ['reduction-apply:list'], // 权限字符 children: [ { path: 'index', diff --git a/src/views/business-examine/receive-apply/business-details.vue b/src/views/business-examine/receive-apply/business-details.vue index b4aed05b..c3d57386 100644 --- a/src/views/business-examine/receive-apply/business-details.vue +++ b/src/views/business-examine/receive-apply/business-details.vue @@ -1,189 +1,258 @@ diff --git a/src/views/business-examine/receive-apply/components/title-tip.vue b/src/views/business-examine/receive-apply/components/title-tip.vue index 7ee4e4d5..2970e850 100644 --- a/src/views/business-examine/receive-apply/components/title-tip.vue +++ b/src/views/business-examine/receive-apply/components/title-tip.vue @@ -1,7 +1,7 @@ @@ -29,7 +29,7 @@ export default { height: 20px; background-color: #19a4a0; } -.title { +.title-child { font-weight: bold; letter-spacing: 1px; font-size: 18px; diff --git a/src/views/business-examine/receive-apply/index.vue b/src/views/business-examine/receive-apply/index.vue index aad8cb08..72bb616e 100644 --- a/src/views/business-examine/receive-apply/index.vue +++ b/src/views/business-examine/receive-apply/index.vue @@ -122,6 +122,7 @@ - diff --git a/src/views/business-examine/reduction-apply/components/title-tip.vue b/src/views/business-examine/reduction-apply/components/title-tip.vue new file mode 100644 index 00000000..2970e850 --- /dev/null +++ b/src/views/business-examine/reduction-apply/components/title-tip.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/views/business-examine/reduction-apply/index.vue b/src/views/business-examine/reduction-apply/index.vue index 1a18d891..4ff50a97 100644 --- a/src/views/business-examine/reduction-apply/index.vue +++ b/src/views/business-examine/reduction-apply/index.vue @@ -1,24 +1,41 @@ +