From 9df1378f8e7dbd166393f0385401b8d6aa96c720 Mon Sep 17 00:00:00 2001 From: xiayuping666 <1269237624@qq.com> Date: Mon, 3 Jun 2024 17:17:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E8=80=83=E5=8B=A4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=B9=E6=8E=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/admin.js | 15 + src/i18n/lang/en.js | 1 + src/i18n/lang/zh-cn.js | 1 + src/i18n/lang/zh-tw.js | 1 + src/layout/navBars/tagsView/tagsView.vue | 2 + src/views/SmartVisitors/VisitorsRecord/api.js | 2 +- .../SmartVisitors/VisitorsRecord/index.vue | 33 +- .../AttendanceForm/index.vue | 1 - .../SetAttendanceRules/index.vue | 1 - .../leavedRecord/api.js | 53 +++ .../leavedRecord/components/CommonHead.vue | 44 +++ .../components/CommonTablesImg.vue | 113 +++++++ .../leavedRecord/index.vue | 317 ++++++++++++++++++ .../index.vue | 1 - .../devicelog/index.vue | 1 - src/views/classList/classList/index.vue | 2 +- src/views/department/index.vue | 2 +- src/views/evaluate/index.vue | 2 +- src/views/recipe/index.vue | 1 - src/views/regulation/index.vue | 2 +- 20 files changed, 573 insertions(+), 22 deletions(-) create mode 100644 src/views/StudentSafetyAttendance/leavedRecord/api.js create mode 100644 src/views/StudentSafetyAttendance/leavedRecord/components/CommonHead.vue create mode 100644 src/views/StudentSafetyAttendance/leavedRecord/components/CommonTablesImg.vue create mode 100644 src/views/StudentSafetyAttendance/leavedRecord/index.vue diff --git a/public/admin.js b/public/admin.js index c76a125..ec5f81b 100644 --- a/public/admin.js +++ b/public/admin.js @@ -176,6 +176,21 @@ export default { icon: 'el-icon-tickets', }, }, + { + path: '/StudentSafetyAttendance/leavedRecord', + name: 'leavedRecord', + component: 'StudentSafetyAttendance/leavedRecord', + meta: { + title: 'message.router.leavedRecord', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin', 'common'], + icon: 'el-icon-tickets', + }, + }, { path: '/StudentSafetyAttendance/SetAttendanceRules', name: 'SetAttendanceRules', diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index c12f84c..33025d1 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -32,6 +32,7 @@ export default { ResponsiblePersonManagement:'ResponsiblePersonManagement', AttendanceForm:'AttendanceForm', StudentSafetyAttendance:'StudentSafetyAttendance', + leavedRecord: 'leavedRecord', SetAttendanceRules:'SetAttendanceRules', Inspect:'Inspect', MoralEducationEvaluation:'MoralEducationEvaluation', diff --git a/src/i18n/lang/zh-cn.js b/src/i18n/lang/zh-cn.js index 925ad1d..5a0af4f 100644 --- a/src/i18n/lang/zh-cn.js +++ b/src/i18n/lang/zh-cn.js @@ -30,6 +30,7 @@ export default { ccInformation:'配置', AttendanceForm:'考勤表单', StudentSafetyAttendance:'学生安全考勤', + leavedRecord: '请假记录', SetAttendanceRules:'设置考勤规则', Inspect:'晨午检查', roleManagement:'角色分配', diff --git a/src/i18n/lang/zh-tw.js b/src/i18n/lang/zh-tw.js index 5fbe2c7..3709811 100644 --- a/src/i18n/lang/zh-tw.js +++ b/src/i18n/lang/zh-tw.js @@ -30,6 +30,7 @@ export default { morningAndAfternoonInspectionManagement:"晨午检管理", AttendanceForm:'考勤表單', StudentSafetyAttendance:'學生安全考勤', + leavedRecord: '請假記錄', SetAttendanceRules:'設置考勤規則', Inspect:'晨午檢查', MoralEducationEvaluation:'德育評價', diff --git a/src/layout/navBars/tagsView/tagsView.vue b/src/layout/navBars/tagsView/tagsView.vue index 60095ce..5779c12 100644 --- a/src/layout/navBars/tagsView/tagsView.vue +++ b/src/layout/navBars/tagsView/tagsView.vue @@ -221,6 +221,7 @@ export default { case 0: this.refreshCurrentTagsView(path); this.$router.push({ path, query: currentTag.query }); + console.log('======================') break; case 1: this.closeCurrentTagsView(path); @@ -236,6 +237,7 @@ export default { }, // 1、刷新当前 tagsView： refreshCurrentTagsView(path) { + console.log('刷新当前 tagsView：', path); this.bus.$emit('onTagsViewRefreshRouterView', path); }, // 2、关闭当前 tagsView：当前项 `tags-view` icon 关闭时点击，如果是设置了固定的（isAffix），不可以关闭 diff --git a/src/views/SmartVisitors/VisitorsRecord/api.js b/src/views/SmartVisitors/VisitorsRecord/api.js index b79778c..3baf5af 100644 --- a/src/views/SmartVisitors/VisitorsRecord/api.js +++ b/src/views/SmartVisitors/VisitorsRecord/api.js @@ -2,7 +2,7 @@ import request from '@/utils/request' // get获取列表 export function getOrders (params) { return request({ - url: '/user-dept/user/visitor/list', + url: '/manager/visitor', method: 'get', params: params }); diff --git a/src/views/SmartVisitors/VisitorsRecord/index.vue b/src/views/SmartVisitors/VisitorsRecord/index.vue index 9c7cb6a..4815be4 100644 --- a/src/views/SmartVisitors/VisitorsRecord/index.vue +++ b/src/views/SmartVisitors/VisitorsRecord/index.vue @@ -8,7 +8,7 @@ - + @@ -75,7 +75,7 @@ import { postAddOrders, getOrders, putOrders } from './api' import CommonHead from './components/CommonHead.vue' import CommonTablesImg from './components/CommonTablesImg.vue' export default { - name: "CreatePayment", + data() { return { form: { @@ -132,6 +132,12 @@ export default { prop: "description", type: 'text', minWidth: '150' + }, + { + label: "审批意见", + prop: "opinions", + type: 'text', + minWidth: '150' } ], @@ -163,10 +169,15 @@ export default { ], }, statusEnum:{ - start: '开始', - terminate: '结束', - agree:'同意', - refuse: '拒绝', + 0: { + name: '待审核', + }, + 1: { + name: '已通过', + }, + 2: { + name: '已拒绝', + } }, datePicker: null, // 搜索日期 } @@ -241,18 +252,16 @@ export default { getList(){ getOrders(this.query).then( res =>{ console.log(res) - this.data = res.data.records.map(item =>{ - item.status = this.statusEnum[item.status] - item.faceImg ? item.faceImg = JSON.parse(item.faceImg)[0] : item.faceImg + this.data = res.records.map(item =>{ + item.status = this.statusEnum[item.status].name + item.faceImg = item.faceImg return item }) - this.total = res.data.total + this.total = res.total }) }, // 删除 deleteData(item) { - console.log('------------------------------------------') - console.log(item) deleteOrders().then(res =>{ if(res.code == 200){ diff --git a/src/views/StudentSafetyAttendance/AttendanceForm/index.vue b/src/views/StudentSafetyAttendance/AttendanceForm/index.vue index 03cc260..6fd447e 100644 --- a/src/views/StudentSafetyAttendance/AttendanceForm/index.vue +++ b/src/views/StudentSafetyAttendance/AttendanceForm/index.vue @@ -51,7 +51,6 @@ import columns from "./columns"; import { rqObtainingSafetyAttendanceTeachers } from "../api"; export default { - name: "AttendanceForm", data() { return { form: { diff --git a/src/views/StudentSafetyAttendance/SetAttendanceRules/index.vue b/src/views/StudentSafetyAttendance/SetAttendanceRules/index.vue index d5d89dd..f54ed46 100644 --- a/src/views/StudentSafetyAttendance/SetAttendanceRules/index.vue +++ b/src/views/StudentSafetyAttendance/SetAttendanceRules/index.vue @@ -173,7 +173,6 @@ import { } from "../api"; import InterestClassTabes from "./components/InterestClassTabes"; export default { - name: "roleManagement", data() { return { checkList: [ diff --git a/src/views/StudentSafetyAttendance/leavedRecord/api.js b/src/views/StudentSafetyAttendance/leavedRecord/api.js new file mode 100644 index 0000000..c725ff8 --- /dev/null +++ b/src/views/StudentSafetyAttendance/leavedRecord/api.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' +// get获取列表 +export function getOrders (params) { + return request({ + url: '/manager/leave', + method: 'get', + params: params + }); +} +// 新增 +export function postAddOrders (data) { + return request({ + url: '/meetingAct/info/add', + method: 'post', + data, + }); +} +// 修改 +export function putOrders (data) { + return request({ + url: '/meetingAct/info/update', + method: 'put', + data, + }); +} + +// 删除 +export function deleteOrders (id) { + return request({ + url: '/meetingAct/info/delete', + method: 'delete', + params:{ + id + } + }); +} + +// 获取审批人 +export function getApprover () { + return request({ + url: '/meetingAct/info/getTeacher', + method: 'get', + }); +} + +// 查询班级列表 +export function getClass() { + return request({ + url: '/meetingAct/moral/moral/evaluableGradeAndClassList', + method: 'get', + }); +} + diff --git a/src/views/StudentSafetyAttendance/leavedRecord/components/CommonHead.vue b/src/views/StudentSafetyAttendance/leavedRecord/components/CommonHead.vue new file mode 100644 index 0000000..400c138 --- /dev/null +++ b/src/views/StudentSafetyAttendance/leavedRecord/components/CommonHead.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/views/StudentSafetyAttendance/leavedRecord/components/CommonTablesImg.vue b/src/views/StudentSafetyAttendance/leavedRecord/components/CommonTablesImg.vue new file mode 100644 index 0000000..1566196 --- /dev/null +++ b/src/views/StudentSafetyAttendance/leavedRecord/components/CommonTablesImg.vue @@ -0,0 +1,113 @@ + + + diff --git a/src/views/StudentSafetyAttendance/leavedRecord/index.vue b/src/views/StudentSafetyAttendance/leavedRecord/index.vue new file mode 100644 index 0000000..b44a49f --- /dev/null +++ b/src/views/StudentSafetyAttendance/leavedRecord/index.vue @@ -0,0 +1,317 @@ + + + + + diff --git a/src/views/attendanceMachineEquipmentManagement/attendanceMachineEquipmentManagement/index.vue b/src/views/attendanceMachineEquipmentManagement/attendanceMachineEquipmentManagement/index.vue index 876d9ca..8ef1034 100644 --- a/src/views/attendanceMachineEquipmentManagement/attendanceMachineEquipmentManagement/index.vue +++ b/src/views/attendanceMachineEquipmentManagement/attendanceMachineEquipmentManagement/index.vue @@ -95,7 +95,6 @@ import { formatDate } from "@/com/index"; import CommonHead from "./components/CommonHead"; export default { - name: "attendanceMachineEquipmentManagement", data() { return { columns, diff --git a/src/views/attendanceMachineEquipmentManagement/devicelog/index.vue b/src/views/attendanceMachineEquipmentManagement/devicelog/index.vue index ea98f7d..4882e7a 100644 --- a/src/views/attendanceMachineEquipmentManagement/devicelog/index.vue +++ b/src/views/attendanceMachineEquipmentManagement/devicelog/index.vue @@ -101,7 +101,6 @@ import CommonHead from "./components/CommonHead"; import CommonTables from "./components/CommonTables.vue"; export default { - name: "attendanceMachineEquipmentManagement", data() { return { columns, diff --git a/src/views/classList/classList/index.vue b/src/views/classList/classList/index.vue index 9b09c34..1b809e8 100644 --- a/src/views/classList/classList/index.vue +++ b/src/views/classList/classList/index.vue @@ -210,7 +210,7 @@ const FlagEnum = { let loading export default { - name: "deviceManagement", + name: "classList/classList", data() { return { columns, diff --git a/src/views/department/index.vue b/src/views/department/index.vue index f7a4dbf..1febab6 100644 --- a/src/views/department/index.vue +++ b/src/views/department/index.vue @@ -260,7 +260,7 @@ const errorMessages = { }; export default { - name: "deviceManagement", + name: "department", data() { return { columns, diff --git a/src/views/evaluate/index.vue b/src/views/evaluate/index.vue index cc4083d..1d6387d 100644 --- a/src/views/evaluate/index.vue +++ b/src/views/evaluate/index.vue @@ -115,7 +115,7 @@ import { formatDate } from "@/com/index"; import CommonHead from './components/CommonHead.vue' export default { - name: "deviceManagement", + name: "evaluate", data() { return { columns, diff --git a/src/views/recipe/index.vue b/src/views/recipe/index.vue index 9b7e7bb..c22bf76 100644 --- a/src/views/recipe/index.vue +++ b/src/views/recipe/index.vue @@ -218,7 +218,6 @@ import { formatDate } from "@/com/index"; import CommonHead from './components/CommonHead.vue' export default { - name: "deviceManagement", data() { return { columns, diff --git a/src/views/regulation/index.vue b/src/views/regulation/index.vue index 7649240..f7afc06 100644 --- a/src/views/regulation/index.vue +++ b/src/views/regulation/index.vue @@ -203,7 +203,7 @@ const FlagEnum = { const FlagArr = ['INTO', 'OUT'] export default { - name: "deviceManagement", + name: "regulation", data() { return { columns,