diff --git a/src/components.d.ts b/src/components.d.ts index f7ffd79..815d62f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -22,6 +22,7 @@ Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default'] diff --git a/src/components.d.ts b/src/components.d.ts index f7ffd79..815d62f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -22,6 +22,7 @@ Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue new file mode 100644 index 0000000..4d92074 --- /dev/null +++ b/src/components/DetailPage/DetailBlockSwitch.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/components.d.ts b/src/components.d.ts index f7ffd79..815d62f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -22,6 +22,7 @@ Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue new file mode 100644 index 0000000..4d92074 --- /dev/null +++ b/src/components/DetailPage/DetailBlockSwitch.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/components.d.ts b/src/components.d.ts index f7ffd79..815d62f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -22,6 +22,7 @@ Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue new file mode 100644 index 0000000..4d92074 --- /dev/null +++ b/src/components/DetailPage/DetailBlockSwitch.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/components.d.ts b/src/components.d.ts index f7ffd79..815d62f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -22,6 +22,7 @@ Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue new file mode 100644 index 0000000..4d92074 --- /dev/null +++ b/src/components/DetailPage/DetailBlockSwitch.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue new file mode 100644 index 0000000..03d414b --- /dev/null +++ b/src/views/device/borrow/borrwoApply.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/components.d.ts b/src/components.d.ts index f7ffd79..815d62f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -22,6 +22,7 @@ Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue new file mode 100644 index 0000000..4d92074 --- /dev/null +++ b/src/components/DetailPage/DetailBlockSwitch.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue new file mode 100644 index 0000000..03d414b --- /dev/null +++ b/src/views/device/borrow/borrwoApply.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index c2682fc..5f7b347 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -339,381 +339,374 @@ diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue new file mode 100644 index 0000000..03d414b --- /dev/null +++ b/src/views/device/borrow/borrwoApply.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index c2682fc..5f7b347 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -339,381 +339,374 @@ diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue new file mode 100644 index 0000000..03d414b --- /dev/null +++ b/src/views/device/borrow/borrwoApply.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index c2682fc..5f7b347 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -339,381 +339,374 @@ diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue new file mode 100644 index 0000000..03d414b --- /dev/null +++ b/src/views/device/borrow/borrwoApply.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index c2682fc..5f7b347 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -339,381 +339,374 @@ diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue new file mode 100644 index 0000000..03d414b --- /dev/null +++ b/src/views/device/borrow/borrwoApply.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index c2682fc..5f7b347 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -339,381 +339,374 @@ diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue new file mode 100644 index 0000000..03d414b --- /dev/null +++ b/src/views/device/borrow/borrwoApply.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index c2682fc..5f7b347 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -339,381 +339,374 @@ diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue new file mode 100644 index 0000000..03d414b --- /dev/null +++ b/src/views/device/borrow/borrwoApply.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index c2682fc..5f7b347 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -339,381 +339,374 @@ diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue new file mode 100644 index 0000000..03d414b --- /dev/null +++ b/src/views/device/borrow/borrwoApply.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index c2682fc..5f7b347 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -339,381 +339,374 @@ - diff --git a/src/components.d.ts b/src/components.d.ts index f7ffd79..815d62f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -22,6 +22,7 @@ Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] + DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default'] diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue new file mode 100644 index 0000000..4d92074 --- /dev/null +++ b/src/components/DetailPage/DetailBlockSwitch.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index d6c1c91..1644a80 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -314,6 +314,39 @@ }, ], }, + { + path: '/borrow', + component: Layout, + redirect: '/device/borrow/borrowapply', + name: 'Borrow', + meta: { + title: '设备领用', + icon: 'ep:key', + auth: '/device/borrow', + }, + children: [ + { + path: 'borrowapply', + name: 'borroWapply', + component: () => import('@/views/device/borrow/borrwoApply.vue'), + meta: { + title: '设备借用申请', + icon: 'ep:key', + auth: '/device/borrow/borrowapply', + }, + }, + { + path: 'borrowhandle', + name: 'borrowHandle', + component: () => import('@/views/device/borrow/borrowHandle.vue'), + meta: { + title: '设备借用处理', + icon: 'ep:key', + auth: '/device/borrow/borrowhandle', + }, + }, + ], + }, ] diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue new file mode 100644 index 0000000..1c2405e --- /dev/null +++ b/src/views/device/borrow/borrowHandle.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue new file mode 100644 index 0000000..03d414b --- /dev/null +++ b/src/views/device/borrow/borrwoApply.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index c2682fc..5f7b347 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -339,381 +339,374 @@ - diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue index 0763c5a..9ef0b93 100644 --- a/src/views/measure/file/components/addDialog.vue +++ b/src/views/measure/file/components/addDialog.vue @@ -19,7 +19,6 @@ const effectiveStatusName = ref('') const title = ref('') const fileList = ref([]) -console.log(sessionStorage.getItem(fileTypeName.value)) const ruleForm = reactive({ fileType: '', // 类型 fileTypeName: '', // 类型名称 不传 @@ -80,10 +79,9 @@ if (row.title === '新建') { // 默认发布人和发布单位 ruleForm.createUserId = userInfo.$state.id - ruleForm.publisher = '' + ruleForm.publisher = userInfo.$state.deptName ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 判断有无存储 - console.log(sessionStorage.getItem(fileTypeName.value), 'sess') if (sessionStorage.getItem(fileTypeName.value)) { const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string) ruleForm.fileType = session.fileType @@ -117,6 +115,8 @@ ruleForm.remark = row.remark ruleForm.publishTime = row.publishTime ruleForm.minioFileName = row.minioFileName + // ruleForm.publisher = '0' + // ruleForm.createUserId = '1' } } defineExpose({ initDialog }) @@ -148,6 +148,9 @@ type: 'warning', }, ).then((res) => { + if (ruleForm.publisher === userInfo.$state.deptName) { + ruleForm.publisher === userInfo.$state.deptId + } if (flag == '提交') { addApi(ruleForm).then((res) => { if (res.code == 200) { @@ -193,7 +196,6 @@ fd.append('multipartFile', event.target.files[0]) UploadFile(fd).then((res) => { if (res.code === 200) { - console.log(res.data[0]) ruleForm.minioFileName = res.data[0] // 重置当前验证 ruleFormRef.value?.clearValidate('minioFileName') @@ -216,7 +218,6 @@ // ]) watch(() => ruleForm.effectiveTime, (newVal) => { const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour') - console.log(diffDat) if (diffDat < 0) { // ruleForm.effectiveStatusName = '已废止' effectiveStatusName.value = '在使用' @@ -237,7 +238,7 @@