Browse Source

Merge branch 'master' of http://gitlab.frkj.cc/php/zhjwxt

master
李双庆 10 months ago
parent
commit
17632268db
  1. 10
      admin/src/app/api/school_approval/process.ts
  2. 13
      admin/src/app/api/service_logs.js
  3. 13
      admin/src/app/api/sys.ts
  4. 141
      admin/src/app/views/customer_resources/components/UserProfile.vue
  5. 19
      admin/src/app/views/customer_resources/customer_resources.vue
  6. 1241
      admin/src/app/views/school_approval/config/index.vue
  7. 182
      admin/src/app/views/school_approval/process/index.vue
  8. 165
      admin/src/app/views/service_logs/service_logs.vue
  9. 94
      admin/src/app/views/student_course_usage/student_course_usage.vue
  10. 37
      admin/src/utils/request.ts
  11. 16
      niucloud/app/adminapi/controller/person_course_schedule/PersonCourseSchedule.php
  12. 56
      niucloud/app/adminapi/controller/school_approval/Process.php
  13. 39
      niucloud/app/adminapi/controller/service_logs/ServiceLogs.php
  14. 8
      niucloud/app/adminapi/controller/student_course_usage/StudentCourseUsage.php
  15. 15
      niucloud/app/adminapi/controller/sys/System.php
  16. 31
      niucloud/app/adminapi/route/service_logs.php
  17. 5
      niucloud/app/adminapi/route/sys.php
  18. 78
      niucloud/app/model/person_course_schedule/PersonCourseSchedule.php
  19. 44
      niucloud/app/model/service_logs/ServiceLogs.php
  20. 12
      niucloud/app/service/admin/auth/AuthService.php
  21. 4
      niucloud/app/service/admin/customer_resources/CustomerResourcesService.php
  22. 60
      niucloud/app/service/admin/service_logs/ServiceLogsService.php
  23. 30
      niucloud/app/service/admin/student_course_usage/StudentCourseUsageService.php
  24. 18
      niucloud/app/service/admin/sys/SystemService.php
  25. 43
      niucloud/app/service/school_approval/SchoolApprovalConfigService.php
  26. 92
      niucloud/app/service/school_approval/SchoolApprovalProcessService.php

10
admin/src/app/api/school_approval/process.ts

@ -5,7 +5,7 @@ import request from '@/utils/request'
* @param params
*/
export function getProcessList(params?: Record<string, any>) {
return request.get({ url: '/school_approval/process/lists', params })
return request.get('/school_approval/process/lists', { params })
}
/**
@ -13,7 +13,7 @@ export function getProcessList(params?: Record<string, any>) {
* @param params
*/
export function getProcessInfo(params: { id: number }) {
return request.get({ url: '/school_approval/process/info', params })
return request.get('/school_approval/process/info', { params })
}
/**
@ -21,7 +21,7 @@ export function getProcessInfo(params: { id: number }) {
* @param params
*/
export function createProcess(params: any) {
return request.post({ url: '/school_approval/process/create', data: params })
return request.post('/school_approval/process/create', params)
}
/**
@ -29,7 +29,7 @@ export function createProcess(params: any) {
* @param params
*/
export function approveProcess(params: { process_id: number; status: string; remarks?: string }) {
return request.post({ url: '/school_approval/process/approve', data: params })
return request.post('/school_approval/process/approve', params)
}
/**
@ -37,5 +37,5 @@ export function approveProcess(params: { process_id: number; status: string; rem
* @param params
*/
export function cancelProcess(params: { process_id: number }) {
return request.post({ url: '/school_approval/process/cancel', data: params })
return request.post('/school_approval/process/cancel', params)
}

13
admin/src/app/api/service_logs.js

@ -0,0 +1,13 @@
import request from '@/utils/request'
// USER_CODE_BEGIN -- service_logs
/**
*
* @param params
* @returns
*/
export function getServiceLogsList(params) {
return request.get(`service_logs/service_logs`, {params})
}

13
admin/src/app/api/sys.ts

@ -796,3 +796,16 @@ export function setDocument(params: Record<string, any>) {
export function getScsjtj(params: Record<string, any>) {
return request.post('sys/scsjtj', params)
}
export function person_all() {
return request.get('sys/person_all')
}
export function role_all() {
return request.get('sys/role_all')
}
export function departments_all() {
return request.get('sys/departments_all')
}

141
admin/src/app/views/customer_resources/components/UserProfile.vue

@ -0,0 +1,141 @@
<template>
<el-dialog
v-model="showDialog"
title="客户详情"
width="80%"
class="user-profile p-6"
:destroy-on-close="true"
>
<!-- 顶部用户信息 -->
<el-card class="mb-4">
<div class="flex items-center">
<el-avatar :size="60" class="mr-4" />
<div>
<h2 class="text-xl font-bold">{{ user.name }}</h2>
<p>ID: {{ user.id }}</p>
<p>电话: {{ user.phone }}</p>
</div>
</div>
</el-card>
<!-- 标签导航 -->
<el-tabs v-model="activeTab" class="mb-4">
<el-tab-pane label="六要素" name="six-elements" />
<el-tab-pane label="修改日志" name="log" />
<el-tab-pane label="学生情况" name="student" />
<el-tab-pane label="订单列表" name="orders" />
<el-tab-pane label="课程列表" name="courses" />
</el-tabs>
<!-- 六要素信息卡片 -->
<el-card v-if="activeTab === 'six-elements'">
<h3 class="text-lg font-bold mb-4">六要素信息</h3>
<el-row :gutter="20" class="mb-2">
<el-col :span="8">需求购买力<el-tag>{{ info.purchasePower }}</el-tag></el-col>
<el-col :span="8">认知理念<el-tag>{{ info.knowledge }}</el-tag></el-col>
<el-col :span="8">距离<span>{{ info.distance }}</span></el-col>
</el-row>
<el-row :gutter="20" class="mb-2">
<el-col :span="8">可谈上课时间<span>{{ info.canTalkDate }}</span></el-col>
<el-col :span="8">承诺到访时间<span>{{ info.promisedVisitDate }}</span></el-col>
<el-col :span="8">实际到访时间<span>{{ info.actualVisitDate }}</span></el-col>
</el-row>
<el-row :gutter="20" class="mb-2">
<el-col :span="8">电话后的意向程度<el-tag>{{ info.phoneIntention }}</el-tag></el-col>
<el-col :span="8">是否关单
<el-tag :type="info.isClosed ? 'success' : 'danger'">{{ info.isClosed ? '是' : '否' }}</el-tag>
</el-col>
</el-row>
<!-- 备注与访问情况 -->
<el-form label-position="top" class="mt-4">
<el-form-item label="沟通备注">
<el-input v-model="info.notes" placeholder="填写备注" disabled/>
</el-form-item>
<el-form-item label="一访情况">
<el-input v-model="info.visit1" placeholder="填写一访情况" disabled/>
</el-form-item>
<el-form-item label="二访情况">
<el-input v-model="info.visit2" placeholder="填写二访情况" disabled/>
</el-form-item>
</el-form>
</el-card>
</el-dialog>
</template>
<script setup>
import { useDictionary } from '@/app/api/dict'
import { ref, reactive, computed, watch } from 'vue'
let showDialog = ref(false)
const activeTab = ref('six-elements')
const user = reactive({
name: '王五1',
id: 'U001',
phone: '13914556707'
})
const info = reactive({
purchasePower: '',
knowledge: '',
distance: '',
canTalkDate: '',
promisedVisitDate: '',
actualVisitDate: '',
phoneIntention: '',
isClosed: '',
notes: '',
visit1: '',
visit2: ''
})
let call_intentList = ref([])
let purchase_powerList = ref([])
let concept_awarenessList = ref([])
const setFormData = async (row) => {
call_intentList.value = await (
await useDictionary('preliminarycustomerintention')
).data.dictionary
purchase_powerList.value = await (
await useDictionary('customer_purchasing_power')
).data.dictionary
concept_awarenessList.value = await (
await useDictionary('cognitive_concept')
).data.dictionary
user.name = row.name;
user.id = row.id;
user.phone = row.phone_number;
info.purchasePower = purchase_powerList.value.flat().find(item => item.value == row.six.purchase_power)?.name || '';
info.knowledge = concept_awarenessList.value.flat().find(item => item.value == row.six.concept_awareness)?.name || '';
info.distance = row.six.distance;
info.canTalkDate = row.six.preferred_class_time;
info.promisedVisitDate = row.six.promised_visit_time;
info.actualVisitDate = row.six.actual_visit_time;
info.phoneIntention = call_intentList.value.flat().find(item => item.value == row.six.call_intent)?.name || '';
info.isClosed = row.six.is_closed == 1 ? true : false;
info.notes = row.six.communication;
info.visit1 = row.six.first_visit_status;
info.visit2 = row.six.second_visit_status;
console.log(call_intentList.value);
}
defineExpose({
showDialog,
setFormData
})
</script>
<style scoped>
.user-profile {
margin: 0 auto;
}
</style>

19
admin/src/app/views/customer_resources/customer_resources.vue

@ -127,6 +127,9 @@
<el-dropdown-item command="resourceChanges">
客户信息修改记录
</el-dropdown-item>
<el-dropdown-item command="UserProfile">
客户详情
</el-dropdown-item>
<el-dropdown-item command="editEvent">
{{ t('edit') }}
</el-dropdown-item>
@ -180,6 +183,7 @@
<tc ref="TcCustomerResourcesDialog" @complete="loadCustomerResourcesList" />
<user ref="UserProfileDialog" @complete="loadCustomerResourcesList" />
</el-card>
</div>
</template>
@ -195,6 +199,8 @@
import Fp from '@/app/views/customer_resources/components/fp.vue'
import Order from '@/app/views/order_table/components/order-table-edit.vue'
import Tc from '@/app/views/tc_dialog/tc_dialog.vue'
import User from '@/app/views/customer_resources/components/UserProfile.vue'
import { ArrowDown } from '@element-plus/icons-vue'
import { getMemberLabelAll } from '@/app/api/member'
@ -244,6 +250,9 @@
case 'deleteEvent':
deleteEvent(row.id)
break
case 'UserProfile':
UserProfile(row)
break
}
}
@ -276,7 +285,8 @@
editOrderTableDialog.value.setFormData(row)
editOrderTableDialog.value.showDialog = true
}
const TcCustomerResourcesDialog : Record<string, any> | null = ref(null)
const tcEvent = (row : any) => {
@ -290,8 +300,13 @@
}
const UserProfileDialog : Record<string, any> | null = ref(null)
const UserProfile = (row : any) => {
UserProfileDialog.value.setFormData(row)
UserProfileDialog.value.showDialog = true
}
const searchFormRef = ref<FormInstance>()
//

1241
admin/src/app/views/school_approval/config/index.vue

File diff suppressed because it is too large

182
admin/src/app/views/school_approval/process/index.vue

@ -5,14 +5,14 @@
<div>
<el-button type="primary" @click="handleCreate">
<icon name="add" class="mr-5px" />
{{ $t('approval.process.create') }}
{{ '创建(测试暂留)' }}
</el-button>
</div>
<div class="flex items-center">
<el-input
v-model="state.searchParams.process_name"
class="w-200px mr-15px"
:placeholder="$t('approval.process.searchPlaceholder')"
class="w-200 mr-15"
:placeholder="'搜索'"
clearable
@keyup.enter="handleSearch"
@clear="handleSearch"
@ -20,29 +20,29 @@
<el-select
v-model="state.searchParams.approval_status"
class="w-150px mr-15px"
:placeholder="$t('approval.process.statusPlaceholder')"
:placeholder="'状态'"
clearable
@change="handleSearch"
>
<el-option :label="$t('approval.process.pending')" value="pending" />
<el-option :label="$t('approval.process.approved')" value="approved" />
<el-option :label="$t('approval.process.rejected')" value="rejected" />
<el-option :label="'待审批'" value="pending" />
<el-option :label="'已审批'" value="approved" />
<el-option :label="'已拒绝'" value="rejected" />
</el-select>
<el-button type="primary" @click="handleSearch">
<icon name="search" class="mr-5px" />
{{ $t('common.search') }}
{{ '搜索' }}
</el-button>
<el-button @click="handleReset">
<icon name="refresh-right" class="mr-5px" />
{{ $t('common.reset') }}
{{ '重置' }}
</el-button>
</div>
</div>
<el-tabs v-model="state.activeTab" class="mt-15px" @tab-click="handleTabChange">
<el-tab-pane :label="$t('approval.process.all')" name="all" />
<el-tab-pane :label="$t('approval.process.myCreate')" name="myCreate" />
<el-tab-pane :label="$t('approval.process.myApproval')" name="myApproval" />
<el-tab-pane :label="'全部'" name="all" />
<el-tab-pane :label="'我创建的'" name="myCreate" />
<el-tab-pane :label="'我审批的'" name="myApproval" />
</el-tabs>
<el-table
@ -50,22 +50,22 @@
:data="state.processList"
:header-cell-style="{ background: '#fafafa', color: '#606266' }"
>
<el-table-column :label="$t('approval.process.id')" prop="id" width="80" />
<el-table-column :label="$t('approval.process.processName')" prop="process_name" min-width="180" />
<el-table-column :label="$t('approval.process.applicantId')" prop="applicant_id" width="100" />
<el-table-column :label="$t('approval.process.applicationTime')" prop="application_time" width="180" />
<el-table-column :label="$t('approval.process.currentApproverId')" prop="current_approver_id" width="100" />
<el-table-column :label="$t('approval.process.approvalStatus')" prop="approval_status" width="100">
<el-table-column :label="'ID'" prop="id" width="80" />
<el-table-column :label="'流程名称'" prop="process_name" min-width="180" />
<el-table-column :label="'申请人'" prop="applicant_name" width="100" />
<el-table-column :label="'申请时间'" prop="application_time" width="180" />
<el-table-column :label="'当前审批人'" prop="current_approver_name" width="100" />
<el-table-column :label="'审批状态'" prop="approval_status" width="100">
<template #default="{ row }">
<el-tag :type="getStatusType(row.approval_status)">
{{ getStatusText(row.approval_status) }}
</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('common.action')" width="180" fixed="right">
<el-table-column :label="'操作'" width="180" fixed="right">
<template #default="{ row }">
<el-button type="primary" link @click="handleDetail(row)">
{{ $t('common.detail') }}
{{ '详情' }}
</el-button>
<el-button
v-if="row.approval_status === 'pending' && row.applicant_id === state.userInfo.uid"
@ -73,7 +73,7 @@
link
@click="handleCancel(row)"
>
{{ $t('approval.process.cancel') }}
{{ '取消' }}
</el-button>
<el-button
v-if="row.approval_status === 'pending' && row.current_approver_id === state.userInfo.uid"
@ -81,7 +81,7 @@
link
@click="handleApprove(row)"
>
{{ $t('approval.process.approve') }}
{{ '审批' }}
</el-button>
</template>
</el-table-column>
@ -103,7 +103,7 @@
<!-- 创建审批弹窗 -->
<el-dialog
v-model="state.createDialog.visible"
:title="$t('approval.process.create')"
:title="'创建审批'"
width="600px"
:close-on-click-modal="false"
:destroy-on-close="true"
@ -114,17 +114,17 @@
:rules="state.createDialog.rules"
label-width="120px"
>
<el-form-item :label="$t('approval.process.processName')" prop="process_name">
<el-form-item :label="'流程名称'" prop="process_name">
<el-input
v-model="state.createDialog.form.process_name"
:placeholder="$t('approval.process.processNamePlaceholder')"
:placeholder="'请输入流程名称'"
/>
</el-form-item>
<el-form-item :label="$t('approval.process.configId')" prop="config_id">
<el-form-item :label="'审批流配置'" prop="config_id">
<el-select
v-model="state.createDialog.form.config_id"
class="w-full"
:placeholder="$t('approval.process.configIdPlaceholder')"
:placeholder="'请选择审批流配置'"
>
<el-option
v-for="item in state.configOptions"
@ -134,19 +134,19 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('approval.process.remarks')" prop="remarks">
<el-form-item :label="'备注'" prop="remarks">
<el-input
v-model="state.createDialog.form.remarks"
type="textarea"
:rows="3"
:placeholder="$t('approval.process.remarksPlaceholder')"
:placeholder="'请输入备注'"
/>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="state.createDialog.visible = false">{{ $t('common.cancel') }}</el-button>
<el-button @click="state.createDialog.visible = false">{{ '取消' }}</el-button>
<el-button type="primary" :loading="state.createDialog.loading" @click="handleCreateSubmit">
{{ $t('common.confirm') }}
{{ '确认' }}
</el-button>
</template>
</el-dialog>
@ -154,7 +154,7 @@
<!-- 审批弹窗 -->
<el-dialog
v-model="state.approveDialog.visible"
:title="$t('approval.process.approve')"
:title="'审批'"
width="500px"
:close-on-click-modal="false"
:destroy-on-close="true"
@ -165,25 +165,25 @@
:rules="state.approveDialog.rules"
label-width="80px"
>
<el-form-item :label="$t('approval.process.status')" prop="status">
<el-form-item :label="'审批状态'" prop="status">
<el-radio-group v-model="state.approveDialog.form.status">
<el-radio label="approved">{{ $t('approval.process.approved') }}</el-radio>
<el-radio label="rejected">{{ $t('approval.process.rejected') }}</el-radio>
<el-radio label="approved">{{ '已审批' }}</el-radio>
<el-radio label="rejected">{{ '已拒绝' }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('approval.process.remarks')" prop="remarks">
<el-form-item :label="'备注'" prop="remarks">
<el-input
v-model="state.approveDialog.form.remarks"
type="textarea"
:rows="3"
:placeholder="$t('approval.process.remarksPlaceholder')"
:placeholder="'请输入备注'"
/>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="state.approveDialog.visible = false">{{ $t('common.cancel') }}</el-button>
<el-button @click="state.approveDialog.visible = false">{{ '取消' }}</el-button>
<el-button type="primary" :loading="state.approveDialog.loading" @click="handleApproveSubmit">
{{ $t('common.confirm') }}
{{ '确认' }}
</el-button>
</template>
</el-dialog>
@ -191,41 +191,41 @@
<!-- 详情弹窗 -->
<el-dialog
v-model="state.detailDialog.visible"
:title="$t('approval.process.detail')"
:title="'审批详情'"
width="800px"
:destroy-on-close="true"
>
<el-descriptions :column="1" border>
<el-descriptions-item :label="$t('approval.process.id')">
<el-descriptions-item :label="'ID'">
{{ state.detailDialog.info.id }}
</el-descriptions-item>
<el-descriptions-item :label="$t('approval.process.processName')">
<el-descriptions-item :label="'流程名称'">
{{ state.detailDialog.info.process_name }}
</el-descriptions-item>
<el-descriptions-item :label="$t('approval.process.applicantId')">
{{ state.detailDialog.info.applicant_id }}
<el-descriptions-item :label="'申请人'">
{{ state.detailDialog.info.applicant_name }}
</el-descriptions-item>
<el-descriptions-item :label="$t('approval.process.applicationTime')">
<el-descriptions-item :label="'申请时间'">
{{ state.detailDialog.info.application_time }}
</el-descriptions-item>
<el-descriptions-item :label="$t('approval.process.currentApproverId')">
{{ state.detailDialog.info.current_approver_id }}
<el-descriptions-item :label="'当前审批人'">
{{ state.detailDialog.info.current_approver_name }}
</el-descriptions-item>
<el-descriptions-item :label="$t('approval.process.approvalStatus')">
<el-descriptions-item :label="'审批状态'">
<el-tag :type="getStatusType(state.detailDialog.info.approval_status)">
{{ getStatusText(state.detailDialog.info.approval_status) }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item :label="$t('approval.process.approvalTime')">
<el-descriptions-item :label="'审批时间'">
{{ state.detailDialog.info.approval_time || '-' }}
</el-descriptions-item>
<el-descriptions-item :label="$t('approval.process.remarks')">
<el-descriptions-item :label="'备注'">
{{ state.detailDialog.info.remarks || '-' }}
</el-descriptions-item>
</el-descriptions>
<div class="mt-20px">
<div class="font-bold text-16px mb-10px">{{ $t('approval.process.participants') }}</div>
<div class="font-bold text-16px mb-10px">{{ '参与者' }}</div>
<el-timeline>
<el-timeline-item
v-for="(node, index) in state.detailDialog.info.participants"
@ -234,22 +234,22 @@
:color="getNodeColor(node.status)"
>
<div class="font-bold mb-5px">
{{ $t('approval.process.participantLabel', { index: index + 1 }) }}
{{ '参与者' + (index + 1) }}
</div>
<div class="text-gray-500">
{{ $t('approval.process.participantId') }}{{ node.participant_id }}
{{ '参与者' }}{{ node.name }}
</div>
<div class="text-gray-500">
{{ $t('approval.process.sequence') }}{{ node.sequence }}
{{ '顺序' }}{{ node.sequence }}
</div>
<div class="text-gray-500">
{{ $t('approval.process.status') }}{{ getStatusText(node.status) }}
{{ '状态' }}{{ getStatusText(node.status) }}
</div>
<div class="text-gray-500">
{{ $t('approval.process.signType') }}{{ node.sign_type === 'or_sign' ? $t('approval.process.orSign') : $t('approval.process.andSign') }}
{{ '签名类型' }}{{ node.sign_type === 'or_sign' ? '或签名' : '和签名' }}
</div>
<div class="text-gray-500">
{{ $t('approval.process.remarks') }}{{ node.remarks || '-' }}
{{ '备注' }}{{ node.remarks || '-' }}
</div>
</el-timeline-item>
</el-timeline>
@ -263,23 +263,39 @@ import { reactive, ref, onMounted } from 'vue'
import { ElMessage, ElMessageBox, FormInstance } from 'element-plus'
import { getProcessList, getProcessInfo, createProcess, approveProcess, cancelProcess } from '@/app/api/school_approval/process'
import { getConfigList } from '@/app/api/school_approval/config'
import { useI18n } from 'vue-i18n'
// import { useI18n } from 'vue-i18n'
// import { useUserInfo } from '@/stores/userInfo'
const { t } = useI18n()
// const { t } = useI18n()
// const userInfo = useUserInfo()
//
const createFormRef = ref<FormInstance>()
const approveFormRef = ref<FormInstance>()
// script
interface ConfigOption {
label: string;
value: number;
}
interface Participant {
participant_id: number;
sequence: number;
status: string;
sign_type: string;
remarks?: string;
}
//
const state = reactive({
loading: false,
processList: [],
total: 0,
activeTab: 'all',
userInfo: null,
userInfo: {
uid: 1 // IDstore
},
searchParams: {
page: 1,
limit: 10,
@ -288,7 +304,7 @@ const state = reactive({
applicant_id: 0,
approver_id: 0
},
configOptions: [], //
configOptions: [] as ConfigOption[], //
createDialog: {
visible: false,
loading: false,
@ -299,10 +315,10 @@ const state = reactive({
},
rules: {
process_name: [
{ required: true, message: t('approval.process.processNameRequired'), trigger: 'blur' }
{ required: true, message: '请输入流程名称', trigger: 'blur' }
],
config_id: [
{ required: true, message: t('approval.process.configIdRequired'), trigger: 'change' }
{ required: true, message: '请选择审批流配置', trigger: 'change' }
]
}
},
@ -316,13 +332,23 @@ const state = reactive({
},
rules: {
status: [
{ required: true, message: t('approval.process.statusRequired'), trigger: 'change' }
{ required: true, message: '请选择审批状态', trigger: 'change' }
]
}
},
detailDialog: {
visible: false,
info: {}
info: {
id: 0,
process_name: '',
applicant_id: 0,
application_time: '',
current_approver_id: 0,
approval_status: '',
approval_time: '',
remarks: '',
participants: [] as Participant[] //
}
}
})
@ -394,11 +420,11 @@ function handleTabChange() {
async function getConfigOptions() {
try {
const res = await getConfigList({ status: 1 })
state.configOptions = res.data.list.map((item: any) => {
state.configOptions = (res.data.list || []).map((item: any) => {
return {
label: item.config_name,
value: item.id
}
label: item.config_name || '',
value: item.id || 0
} as ConfigOption
})
} catch (error) {
console.error(error)
@ -425,7 +451,7 @@ async function handleCreateSubmit() {
state.createDialog.loading = true
try {
await createProcess(state.createDialog.form)
ElMessage.success(t('approval.process.createSuccess'))
ElMessage.success('创建成功')
state.createDialog.visible = false
getList()
} catch (error) {
@ -460,7 +486,7 @@ async function handleApproveSubmit() {
status: state.approveDialog.form.status,
remarks: state.approveDialog.form.remarks
})
ElMessage.success(t('approval.process.approveSuccess'))
ElMessage.success('审批成功')
state.approveDialog.visible = false
getList()
} catch (error) {
@ -473,15 +499,15 @@ async function handleApproveSubmit() {
//
function handleCancel(row: any) {
ElMessageBox.confirm(t('approval.process.confirmCancel'), t('common.warning'), {
confirmButtonText: t('common.confirm'),
cancelButtonText: t('common.cancel'),
ElMessageBox.confirm('确认取消审批?', '警告', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
})
.then(async () => {
try {
await cancelProcess({ process_id: row.id })
ElMessage.success(t('approval.process.cancelSuccess'))
ElMessage.success('取消成功')
getList()
} catch (error) {
console.error(error)
@ -514,9 +540,9 @@ function getStatusType(status: string) {
//
function getStatusText(status: string) {
const map: Record<string, string> = {
pending: t('approval.process.pending'),
approved: t('approval.process.approved'),
rejected: t('approval.process.rejected')
pending: '待审批',
approved: '已审批',
rejected: '已拒绝'
}
return map[status] || status
}

165
admin/src/app/views/service_logs/service_logs.vue

@ -0,0 +1,165 @@
<template>
<div class="main-container">
<el-card class="box-card !border-none" shadow="never">
<div class="flex justify-between items-center">
<span class="text-lg">{{ pageName }}</span>
</div>
<el-card
class="box-card !border-none my-[10px] table-search-wrap"
shadow="never"
>
<el-form
:inline="true"
:model="studentCourseUsageTable.searchParam"
ref="searchFormRef"
>
<el-form-item label="家长姓名" prop="name">
<el-input
v-model="studentCourseUsageTable.searchParam.name"
placeholder="请输入家长姓名"
/>
</el-form-item>
<el-form-item label="评分" prop="score">
<el-input
v-model="studentCourseUsageTable.searchParam.score"
placeholder="请输入评分"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loadServiceLogsList()">{{
t('search')
}}</el-button>
<el-button @click="resetForm(searchFormRef)">{{
t('reset')
}}</el-button>
</el-form-item>
</el-form>
</el-card>
<div class="mt-[10px]">
<el-table
:data="studentCourseUsageTable.data"
size="large"
v-loading="studentCourseUsageTable.loading"
>
<template #empty>
<span>{{
!studentCourseUsageTable.loading ? t('emptyData') : ''
}}</span>
</template>
<el-table-column prop="name" label="家长姓名" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="staff_name" label="教练姓名" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="service_name" label="服务内容" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="customer_confirmation" label="是否需要反馈" min-width="120" :show-overflow-tooltip="true">
<template #default="{ row }">
<div v-if="row.customer_confirmation == 1"></div>
<div v-if="row.customer_confirmation == 0"></div>
</template>
</el-table-column>
<el-table-column prop="score" label="反馈分数" min-width="120" :show-overflow-tooltip="true"/>
</el-table>
<div class="mt-[16px] flex justify-end">
<el-pagination
v-model:current-page="studentCourseUsageTable.page"
v-model:page-size="studentCourseUsageTable.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="studentCourseUsageTable.total"
@size-change="loadServiceLogsList()"
@current-change="loadServiceLogsList"
/>
</div>
</div>
</el-card>
</div>
</template>
<script lang="ts" setup>
import { reactive, ref, watch } from 'vue'
import { t } from '@/lang'
import { useDictionary } from '@/app/api/dict'
import {
getServiceLogsList,
} from '@/app/api/service_logs'
import { img } from '@/utils/common'
import { ElMessageBox, FormInstance } from 'element-plus'
import { useRoute } from 'vue-router'
const route = useRoute()
const pageName = route.meta.title
let studentCourseUsageTable = reactive({
page: 1,
limit: 10,
total: 0,
loading: true,
data: [],
searchParam: {
name: '',
score: '',
},
})
const searchFormRef = ref<FormInstance>()
//
const selectData = ref<any[]>([])
//
/**
* 获取学员课时消费记录列表
*/
const loadServiceLogsList = (page: number = 1) => {
studentCourseUsageTable.loading = true
studentCourseUsageTable.page = page
getServiceLogsList({
page: studentCourseUsageTable.page,
limit: studentCourseUsageTable.limit,
...studentCourseUsageTable.searchParam,
})
.then((res) => {
studentCourseUsageTable.loading = false
studentCourseUsageTable.data = res.data.data
studentCourseUsageTable.total = res.data.total
})
.catch(() => {
studentCourseUsageTable.loading = false
})
}
loadServiceLogsList()
const resetForm = (formEl: FormInstance | undefined) => {
if (!formEl) return
formEl.resetFields()
}
</script>
<style lang="scss" scoped>
/* 多行超出隐藏 */
.multi-hidden {
word-break: break-all;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
</style>

94
admin/src/app/views/student_course_usage/student_course_usage.vue

@ -3,9 +3,6 @@
<el-card class="box-card !border-none" shadow="never">
<div class="flex justify-between items-center">
<span class="text-lg">{{ pageName }}</span>
<el-button type="primary" @click="addEvent">
{{ t('addStudentCourseUsage') }}
</el-button>
</div>
<el-card
@ -17,24 +14,27 @@
:model="studentCourseUsageTable.searchParam"
ref="searchFormRef"
>
<el-form-item :label="t('studentCourseId')" prop="student_course_id">
<el-form-item label="家长名称" prop="emergency_contact">
<el-input
v-model="studentCourseUsageTable.searchParam.student_course_id"
:placeholder="t('studentCourseIdPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('usedHours')" prop="used_hours">
<el-input
v-model="studentCourseUsageTable.searchParam.used_hours"
:placeholder="t('usedHoursPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('usageDate')" prop="usage_date">
<el-input
v-model="studentCourseUsageTable.searchParam.usage_date"
:placeholder="t('usageDatePlaceholder')"
v-model="studentCourseUsageTable.searchParam.emergency_contact"
placeholder="请输入家长名称"
/>
</el-form-item>
<el-form-item label="学生名称" prop="student_name">
<el-input
v-model="studentCourseUsageTable.searchParam.student_name"
placeholder="请输入学生名称"
/>
</el-form-item>
<el-form-item label="手机号" prop="contact_phone">
<el-input
v-model="studentCourseUsageTable.searchParam.contact_phone"
placeholder="请输入手机号"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loadStudentCourseUsageList()">{{
@ -58,41 +58,23 @@
!studentCourseUsageTable.loading ? t('emptyData') : ''
}}</span>
</template>
<el-table-column
prop="student_course_id"
:label="t('studentCourseId')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="used_hours"
:label="t('usedHours')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="usage_date"
:label="t('usageDate')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
:label="t('operation')"
fixed="right"
min-width="120"
>
<template #default="{ row }">
<el-button type="primary" link @click="editEvent(row)">{{
t('edit')
}}</el-button>
<el-button type="primary" link @click="deleteEvent(row.id)">{{
t('delete')
}}</el-button>
</template>
</el-table-column>
<el-table-column prop="course_name" label="课程名称" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="student_name" label="学员姓名" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="emergency_contact" label="家长称呼" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="total_hours" label="课时数量" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="used_hours" label="消课数量" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="sy_time" label="剩余课时" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column prop="gift_hours" label="赠送课时" min-width="120" :show-overflow-tooltip="true"/>
</el-table>
<div class="mt-[16px] flex justify-end">
<el-pagination
@ -136,9 +118,9 @@ let studentCourseUsageTable = reactive({
loading: true,
data: [],
searchParam: {
student_course_id: '',
used_hours: '',
usage_date: '',
emergency_contact: '',
student_name: '',
contact_phone: '',
},
})

37
admin/src/utils/request.ts

@ -8,7 +8,6 @@ import type {
import { getToken, isUrl } from './common'
import { ElMessage } from 'element-plus'
import type { MessageParams } from 'element-plus'
import { t } from '@/lang'
import useUserStore from '@/stores/modules/user'
import storage from '@/utils/storage'
@ -172,13 +171,13 @@ class Request {
const errStatus = err.response.status
switch (errStatus) {
case 400:
errMessage = t('axios.400')
errMessage = '请求错误'
break
case 401:
errMessage = t('axios.401')
errMessage = '未授权,请登录'
break
case 403:
errMessage = t('axios.403')
errMessage = '拒绝访问'
break
case 404:
let baseURL = '';
@ -191,38 +190,38 @@ class Request {
} catch (e) {
baseURL = location.origin;
}
errMessage = baseURL + t('axios.baseUrlError')
errMessage = baseURL + '请求地址出错'
break
case 405:
errMessage = t('axios.405')
errMessage = '请求方法未允许'
break
case 408:
errMessage = t('axios.408')
errMessage = '请求超时'
break
case 409:
errMessage = t('axios.409')
errMessage = '资源冲突'
break
case 500:
errMessage = t('axios.500')
errMessage = '服务器内部错误'
break
case 501:
errMessage = t('axios.501')
errMessage = '服务未实现'
break
case 502:
errMessage = t('axios.502')
errMessage = '网关错误'
break
case 503:
errMessage = t('axios.503')
errMessage = '服务不可用'
break
case 504:
errMessage = t('axios.504')
errMessage = '网关超时'
break
case 505:
errMessage = t('axios.505')
errMessage = 'HTTP版本不受支持'
break
}
}
err.message.includes('timeout') && (errMessage = t('axios.timeout'))
err.message.includes('timeout') && (errMessage = '请求超时')
if (err.code == 'ERR_NETWORK') {
let baseURL = '';
try {
@ -234,7 +233,7 @@ class Request {
} catch (e) {
baseURL = location.origin;
}
errMessage = baseURL + t('axios.baseUrlError')
errMessage = baseURL + '请求地址出错'
}
errMessage &&
this.showElMessage({
@ -256,7 +255,11 @@ class Request {
private messageCache = new Map()
private showElMessage(options: MessageParams) {
const cacheKey = options.message
// 处理类型问题,安全地获取消息
const message = typeof options === 'string' ? options : (options as any).message;
if (!message) return;
const cacheKey = message;
const cachedMessage = this.messageCache.get(cacheKey)
if (!cachedMessage || Date.now() - cachedMessage.timestamp > 5000) {

16
niucloud/app/adminapi/controller/person_course_schedule/PersonCourseSchedule.php

@ -50,14 +50,11 @@ class PersonCourseSchedule extends BaseAdminController
*/
public function add(){
$data = $this->request->params([
["person_id",0],
["person_type",""],
["resources_id",[]],
["schedule_id",0],
["course_date","2025-05-29 17:03:27"],
["time_slot",""],
["student_ids",[]],
]);
$this->validate($data, 'app\validate\person_course_schedule\PersonCourseSchedule.add');
$id = (new PersonCourseScheduleService())->add($data);
return success('ADD_SUCCESS', ['id' => $id]);
}
@ -69,14 +66,11 @@ class PersonCourseSchedule extends BaseAdminController
*/
public function edit(int $id){
$data = $this->request->params([
["person_id",0],
["person_type",""],
["schedule_id",0],
["course_date","2025-05-29 17:03:27"],
["time_slot",""],
["resources_id",[]],
["schedule_id",0],
["student_ids",[]],
]);
$this->validate($data, 'app\validate\person_course_schedule\PersonCourseSchedule.edit');
(new PersonCourseScheduleService())->edit($id, $data);
return success('EDIT_SUCCESS');
}

56
niucloud/app/adminapi/controller/school_approval/Process.php

@ -34,32 +34,32 @@ class Process extends BaseAdminController
$page = input('page', 1);
$limit = input('limit', 10);
$status = input('approval_status', '');
$where = [];
if ($status !== '') {
$where[] = ['approval_status', '=', $status];
$where[] = ['a.approval_status', '=', $status];
}
$process_name = input('process_name', '');
if (!empty($process_name)) {
$where[] = ['process_name', 'like', "%{$process_name}%"];
$where[] = ['a.process_name', 'like', "%{$process_name}%"];
}
// 我发起的审批
$applicant_id = input('applicant_id', 0);
if (!empty($applicant_id)) {
$where[] = ['applicant_id', '=', $applicant_id];
$where[] = ['a.applicant_id', '=', $applicant_id];
}
// 待我审批的
$approver_id = input('approver_id', 0);
if (!empty($approver_id)) {
$where[] = ['current_approver_id', '=', $approver_id];
$where[] = ['approval_status', '=', 'pending'];
$where[] = ['a.current_approver_id', '=', $approver_id];
$where[] = ['a.approval_status', '=', 'pending'];
}
$data = $this->service->getList($where, $page, $limit);
$data = $this->service->getList($where, (int)$page, (int)$limit);
return success($data);
}
@ -72,12 +72,12 @@ class Process extends BaseAdminController
if (empty($id)) {
return fail('参数错误');
}
$info = $this->service->getInfo($id);
$info = $this->service->getInfo((int)$id);
if (empty($info)) {
return fail('审批流程不存在');
}
return success($info);
}
@ -88,19 +88,19 @@ class Process extends BaseAdminController
{
$data = Request::only(['process_name', 'remarks']);
$config_id = input('config_id', 0);
// 验证参数
if (empty($data['process_name'])) {
return fail('流程名称不能为空');
}
if (empty($config_id)) {
return fail('请选择审批流配置');
}
// 设置申请人ID
$data['applicant_id'] = $this->user_info['uid'];
$data['applicant_id'] = $this->request->uid();
try {
$process_id = $this->service->create($data, $config_id);
return success(['id' => $process_id]);
@ -117,17 +117,17 @@ class Process extends BaseAdminController
$process_id = input('process_id', 0);
$status = input('status', '');
$remarks = input('remarks', '');
if (empty($process_id)) {
return fail('参数错误');
}
if (empty($status) || !in_array($status, ['approved', 'rejected'])) {
return fail('请选择审批结果');
}
try {
$result = $this->service->approve($process_id, $this->user_info['uid'], $status, $remarks);
$result = $this->service->approve((int)$process_id, $this->request->uid(), $status, $remarks);
return success($result);
} catch (\Exception $e) {
return fail($e->getMessage());
@ -140,16 +140,16 @@ class Process extends BaseAdminController
public function cancel()
{
$process_id = input('process_id', 0);
if (empty($process_id)) {
return fail('参数错误');
}
try {
$result = $this->service->cancel($process_id, $this->user_info['uid']);
$result = $this->service->cancel($process_id, $this->request->uid());
return success($result);
} catch (\Exception $e) {
return fail($e->getMessage());
}
}
}
}

39
niucloud/app/adminapi/controller/service_logs/ServiceLogs.php

@ -0,0 +1,39 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址:https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace app\adminapi\controller\service_logs;
use app\service\admin\service_logs\ServiceLogsService;
use core\base\BaseAdminController;
use app\service\admin\service\ServiceService;
/**
* 服务控制器
* Class Service
* @package app\adminapi\controller\service
*/
class ServiceLogs extends BaseAdminController
{
/**
* 获取服务列表
* @return \think\Response
*/
public function lists(){
$data = $this->request->params([
["name",""],
["score",""]
]);
return success((new ServiceLogsService())->getPage($data));
}
}

8
niucloud/app/adminapi/controller/student_course_usage/StudentCourseUsage.php

@ -28,9 +28,9 @@ class StudentCourseUsage extends BaseAdminController
*/
public function lists(){
$data = $this->request->params([
["student_course_id",""],
["used_hours",""],
["usage_date",""]
["emergency_contact",""],
["student_name",""],
["contact_phone",""]
]);
return success((new StudentCourseUsageService())->getPage($data));
}
@ -87,5 +87,5 @@ class StudentCourseUsage extends BaseAdminController
return success('DELETE_SUCCESS');
}
}

15
niucloud/app/adminapi/controller/sys/System.php

@ -169,4 +169,19 @@ class System extends BaseAdminController
}
//全部人员
public function person_all(){
return success(data: (new SystemService())->person_all());
}
public function role_all(){
return success(data: (new SystemService())->role_all());
}
public function departments_all(){
return success(data: (new SystemService())->departments_all());
}
}

31
niucloud/app/adminapi/route/service_logs.php

@ -0,0 +1,31 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址:https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
use think\facade\Route;
use app\adminapi\middleware\AdminCheckRole;
use app\adminapi\middleware\AdminCheckToken;
use app\adminapi\middleware\AdminLog;
// USER_CODE_BEGIN -- service
Route::group('service_logs', function () {
Route::get('service_logs', 'service_logs.ServiceLogs/lists');
})->middleware([
AdminCheckToken::class,
AdminCheckRole::class,
AdminLog::class
]);
// USER_CODE_END -- service

5
niucloud/app/adminapi/route/sys.php

@ -351,6 +351,11 @@ Route::group('sys', function() {
//系统环境(不效验登录状态)
Route::group('sys', function() {
Route::get('person_all', 'sys.System/person_all');
Route::get('role_all', 'sys.System/role_all');
Route::get('departments_all', 'sys.System/departments_all');
Route::get('web/website', 'sys.Config/getWebsite');
// 获取版权信息
Route::get('web/copyright', 'sys.Config/getCopyright');

78
niucloud/app/model/person_course_schedule/PersonCourseSchedule.php

@ -11,6 +11,8 @@
namespace app\model\person_course_schedule;
use app\model\personnel\Personnel;
use app\model\student\Student;
use core\base\BaseModel;
use think\model\relation\HasMany;
use think\model\relation\HasOne;
@ -40,7 +42,19 @@ class PersonCourseSchedule extends BaseModel
/**
* 搜索器:人员与课程安排关系资源
* 搜索器:人员与课程安排关系关系编号
* @param $value
* @param $data
*/
public function searchIdAttr($query, $value, $data)
{
if ($value) {
$query->where("id", $value);
}
}
/**
* 搜索器:人员与课程安排关系人员或资源ID
* @param $value
* @param $data
*/
@ -51,13 +65,71 @@ class PersonCourseSchedule extends BaseModel
}
}
/**
* 搜索器:人员与课程安排关系人员类型: student-正式学员, customer_resource-客户资源
* @param $value
* @param $data
*/
public function searchPersonTypeAttr($query, $value, $data)
{
if ($value) {
$query->where("person_type", $value);
}
}
/**
* 搜索器:人员与课程安排关系课程安排ID
* @param $value
* @param $data
*/
public function searchScheduleIdAttr($query, $value, $data)
{
if ($value) {
$query->where("schedule_id", $value);
}
}
/**
* 搜索器:人员与课程安排关系上课日期
* @param $value
* @param $data
*/
public function searchCourseDateAttr($query, $value, $data)
{
if ($value) {
$query->where("course_date", $value);
}
}
/**
* 搜索器:人员与课程安排关系上课时段
* @param $value
* @param $data
*/
public function searchTimeSlotAttr($query, $value, $data)
{
if ($value) {
$query->where("time_slot", $value);
}
}
public function person()
{
return $this->hasOne(Personnel::class, 'id', 'person_id');
}
public function student()
{
return $this->hasOne(Student::class, 'id', 'student_id');
}
public function customerResources(){
return $this->hasOne(CustomerResources::class, 'id', 'person_id')->joinType('left')->withField('name,id')->bind(['person_id_name'=>'name']);
public function resources()
{
return $this->hasOne(CustomerResources::class, 'id', 'resources_id');
}
public function customerResources(){
return $this->hasOne(CustomerResources::class, 'id', 'person_id')->joinType('left')->withField('name,id')->bind(['person_id_name'=>'name']);
}
}

44
niucloud/app/model/service_logs/ServiceLogs.php

@ -0,0 +1,44 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址:https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace app\model\service_logs;
use core\base\BaseModel;
use think\model\concern\SoftDelete;
use think\model\relation\HasMany;
use think\model\relation\HasOne;
/**
* 服务模型
* Class Service
* @package app\model\service
*/
class ServiceLogs extends BaseModel
{
/**
* 数据表主键
* @var string
*/
protected $pk = 'id';
/**
* 模型名称
* @var string
*/
protected $name = 'service_logs';
}

12
niucloud/app/service/admin/auth/AuthService.php

@ -48,7 +48,10 @@ class AuthService extends BaseAdminService
if (!in_array($rule, $method_menu_list))
return true;
$auth_role_list = $this->getAuthApiList();
if (!empty($auth_role_list[ $method ]) && in_array($rule, $auth_role_list[ $method ]))
return true;
@ -72,7 +75,14 @@ class AuthService extends BaseAdminService
//获取站点信息
return ( new MenuService() )->getAllApiList(1);
} else {
$user_role_ids = $user_info[ 'role_ids' ];
$per = new Personnel();
$CampusPersonRole = new CampusPersonRole();
$per_id = $per->where(['sys_user_id' => $this->uid])->column('id');
$user_role_ids = $CampusPersonRole->where(['person_id' => $per_id])->column('role_id');
// $user_role_ids = $user_info[ 'role_ids' ];
$role_service = new RoleService();
$menu_keys = $role_service->getMenuKeysByRoleIds($user_role_ids ?? []);
return $menu_service->getApiListByMenuKeys($menu_keys);

4
niucloud/app/service/admin/customer_resources/CustomerResourcesService.php

@ -95,6 +95,10 @@ class CustomerResourcesService extends BaseAdminService
return $this->pageQuery($search_model, function ($item, $key) {
$item = $this->makeUp($item);
$sixSpeed = new SixSpeed();
$data = $sixSpeed->where(['resource_id' => $item['id']])->findOrEmpty()->toArray();
$item['six'] = $data;
});
}

60
niucloud/app/service/admin/service_logs/ServiceLogsService.php

@ -0,0 +1,60 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址:https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace app\service\admin\service_logs;
use app\model\service_logs\ServiceLogs;
use core\base\BaseAdminService;
/**
* 学员课时消费记录服务层
* Class StudentCourseUsageService
* @package app\service\admin\student_course_usage
*/
class ServiceLogsService extends BaseAdminService
{
public function __construct()
{
parent::__construct();
$this->model = new ServiceLogs();
}
/**
* 获取学员课时消费记录列表
* @return array
*/
public function getPage(array $data = [])
{
$where = [];
if($data['name']){
$where[] = ['b.name','like','%'.$data['name'].'%'];
}
if($data['score']){
$where[] = ['a.score','=',$data['score']];
}
$search_model = $this->model
->alias("a")
->join(['school_customer_resources' => 'b'],'a.resource_id = b.id','left')
->join(['school_personnel' => 'c'],'a.staff_id = c.id','left')
->join(['school_service' => 'd'],'a.service_id = d.id','left')
->where($where)
->field("a.*,b.name,c.name as staff_name,d.service_name,d.customer_confirmation")
->order("a.id desc");
$list = $this->pageQuery($search_model);
return $list;
}
}

30
niucloud/app/service/admin/student_course_usage/StudentCourseUsageService.php

@ -31,15 +31,31 @@ class StudentCourseUsageService extends BaseAdminService
/**
* 获取学员课时消费记录列表
* @param array $where
* @return array
*/
public function getPage(array $where = [])
public function getPage(array $data = [])
{
$field = 'id,student_course_id,used_hours,usage_date,created_at,updated_at';
$order = 'id desc';
$search_model = $this->model->withSearch(["id","student_course_id","used_hours","usage_date"], $where)->field($field)->order($order);
$where = [];
if($data['emergency_contact']){
$where[] = ['c.emergency_contact','like','%'.$data['emergency_contact'].'%'];
}
if($data['student_name']){
$where[] = ['c.name','like','%'.$data['student_name'].'%'];
}
if($data['contact_phone']){
$where[] = ['c.contact_phone','=',$data['contact_phone']];
}
$search_model = $this->model
->alias("a")
->join(['school_student_courses' => 'b'],'a.student_course_id = b.id','left')
->join(['school_student' => 'c'],'b.student_id = c.id','left')
->join(['school_course' => 'd'],'b.course_id = d.id','left')
->where($where)
->field("a.*,c.name as student_name,c.emergency_contact,d.course_name,b.total_hours,ROUND(b.total_hours - b.use_total_hours) as sy_time,ROUND(b.gift_hours - b.use_gift_hours) as gift_hours")
->order("a.id desc");
$list = $this->pageQuery($search_model);
return $list;
}
@ -94,6 +110,6 @@ class StudentCourseUsageService extends BaseAdminService
return $res;
}
}

18
niucloud/app/service/admin/sys/SystemService.php

@ -17,10 +17,12 @@ use app\model\campus\Campus;
use app\model\campus_person_role\CampusPersonRole;
use app\model\communication_records\CommunicationRecords;
use app\model\customer_resources\CustomerResources;
use app\model\departments\Departments;
use app\model\market_performance\MarketPerformance;
use app\model\personnel\Personnel;
use app\model\student\Student;
use app\model\sys\SysConfig;
use app\model\sys\SysRole;
use app\service\core\sys\CoreSysConfigService;
use core\base\BaseAdminService;
use think\facade\Db;
@ -342,4 +344,20 @@ class SystemService extends BaseAdminService
}
return $data;
}
public function person_all(){
$Personnel = new Personnel();
return $Personnel->select()->toArray();
}
public function role_all(){
$sysRole = new SysRole();
return $sysRole->select()->toArray();
}
public function departments_all(){
$departments = new Departments();
return $departments->select()->toArray();
}
}

43
niucloud/app/service/school_approval/SchoolApprovalConfigService.php

@ -26,7 +26,7 @@ class SchoolApprovalConfigService
{
$field = 'id, config_name, description, status, creator_id, created_at, updated_at';
$order = 'id desc';
$list = (new SchoolApprovalConfig())
->where($where)
->field($field)
@ -34,15 +34,15 @@ class SchoolApprovalConfigService
->page($page, $limit)
->select()
->toArray();
$count = (new SchoolApprovalConfig())->where($where)->count();
return [
'list' => $list,
'count' => $count
];
}
/**
* 获取审批流配置详情
* @param int $id
@ -51,13 +51,14 @@ class SchoolApprovalConfigService
public function getInfo(int $id): array
{
$info = (new SchoolApprovalConfig())->with(['nodes'])->where(['id' => $id])->find();
if (empty($info)) {
return [];
}
return $info->toArray();
}
/**
* 添加审批流配置
* @param array $data
@ -74,9 +75,9 @@ class SchoolApprovalConfigService
'status' => $data['status'] ?? 1,
'creator_id' => $data['creator_id']
];
$config_id = (new SchoolApprovalConfig())->insertGetId($config);
// 添加节点
if (!empty($data['nodes'])) {
$nodes = [];
@ -90,10 +91,10 @@ class SchoolApprovalConfigService
'sequence' => $sequence + 1
];
}
(new SchoolApprovalConfigNode())->insertAll($nodes);
}
Db::commit();
return $config_id;
} catch (\Exception $e) {
@ -101,7 +102,7 @@ class SchoolApprovalConfigService
throw new Exception($e->getMessage());
}
}
/**
* 编辑审批流配置
* @param array $data
@ -117,12 +118,12 @@ class SchoolApprovalConfigService
'description' => $data['description'] ?? '',
'status' => $data['status'] ?? 1
];
(new SchoolApprovalConfig())->where(['id' => $data['id']])->update($config);
// 先删除原有节点
(new SchoolApprovalConfigNode())->where(['config_id' => $data['id']])->delete();
// 添加新节点
if (!empty($data['nodes'])) {
$nodes = [];
@ -136,10 +137,10 @@ class SchoolApprovalConfigService
'sequence' => $sequence + 1
];
}
(new SchoolApprovalConfigNode())->insertAll($nodes);
}
Db::commit();
return true;
} catch (\Exception $e) {
@ -147,7 +148,7 @@ class SchoolApprovalConfigService
throw new Exception($e->getMessage());
}
}
/**
* 删除审批流配置
* @param int $id
@ -160,10 +161,10 @@ class SchoolApprovalConfigService
try {
// 删除配置
(new SchoolApprovalConfig())->where(['id' => $id])->delete();
// 删除节点
(new SchoolApprovalConfigNode())->where(['config_id' => $id])->delete();
Db::commit();
return true;
} catch (\Exception $e) {
@ -171,7 +172,7 @@ class SchoolApprovalConfigService
throw new Exception($e->getMessage());
}
}
/**
* 修改状态
* @param int $id
@ -182,4 +183,4 @@ class SchoolApprovalConfigService
{
return (new SchoolApprovalConfig())->where(['id' => $id])->update(['status' => $status]) !== false;
}
}
}

92
niucloud/app/service/school_approval/SchoolApprovalProcessService.php

@ -3,6 +3,7 @@ declare(strict_types=1);
namespace app\service\school_approval;
use app\model\personnel\Personnel;
use app\model\school_approval\SchoolApprovalConfig;
use app\model\school_approval\SchoolApprovalConfigNode;
use app\model\school_approval\SchoolApprovalParticipants;
@ -26,25 +27,28 @@ class SchoolApprovalProcessService
*/
public function getList(array $where = [], int $page = 1, int $limit = 10): array
{
$field = 'id, process_name, applicant_id, application_time, current_approver_id, approval_status, approval_time, remarks, created_at, updated_at';
$order = 'id desc';
$field = 'a.*,b.name as applicant_name,c.name as current_approver_name';
$order = 'a.id desc';
$list = (new SchoolApprovalProcess())
->alias("a")
->join(['school_personnel' => 'b'],'a.applicant_id = b.id','left')
->join(['school_personnel' => 'c'],'a.current_approver_id = c.id','left')
->where($where)
->field($field)
->order($order)
->page($page, $limit)
->select()
->toArray();
$count = (new SchoolApprovalProcess())->where($where)->count();
return [
'list' => $list,
'count' => $count
];
}
/**
* 获取审批流程详情
* @param int $id
@ -52,14 +56,26 @@ class SchoolApprovalProcessService
*/
public function getInfo(int $id): array
{
$info = (new SchoolApprovalProcess())->with(['participants'])->where(['id' => $id])->find();
$info = (new SchoolApprovalProcess())
->alias("a")
->join(['school_personnel' => 'b'],'a.applicant_id = b.id','left')
->join(['school_personnel' => 'c'],'a.current_approver_id = c.id','left')
->with(['participants'])
->where(['a.id' => $id])
->field('a.*,b.name as applicant_name,c.name as current_approver_name')
->find();
if (empty($info)) {
return [];
}
return $info->toArray();
$info = $info->toArray();
$Personnel = new Personnel();
foreach ($info['participants'] as $key => $value) {
$info['participants'][$key]['name'] = $Personnel->where(['id' => $value['participant_id']])->value('name');
}
return $info;
}
/**
* 创建审批流程
* @param array $data
@ -76,19 +92,19 @@ class SchoolApprovalProcessService
if (empty($config_info)) {
throw new Exception('审批配置不存在');
}
// 创建审批流程
$process = [
'process_name' => $data['process_name'],
'applicant_id' => $data['applicant_id'],
'application_time' => time(),
'application_time' => date("Y-m-d H:i:s"),
'current_approver_id' => 0, // 初始时为0,后面会更新
'approval_status' => SchoolApprovalProcess::STATUS_PENDING,
'remarks' => $data['remarks'] ?? ''
];
$process_id = (new SchoolApprovalProcess())->insertGetId($process);
// 创建审批参与人
$participants = [];
foreach ($config_info['nodes'] as $sequence => $node) {
@ -103,22 +119,22 @@ class SchoolApprovalProcessService
];
}
}
if (!empty($participants)) {
(new SchoolApprovalParticipants())->insertAll($participants);
// 更新当前审批人为第一个审批人
$first_participant = (new SchoolApprovalParticipants())
->where(['process_id' => $process_id])
->order('sequence', 'asc')
->find();
if (!empty($first_participant)) {
(new SchoolApprovalProcess())->where(['id' => $process_id])
->update(['current_approver_id' => $first_participant['participant_id']]);
}
}
Db::commit();
return $process_id;
} catch (\Exception $e) {
@ -126,7 +142,7 @@ class SchoolApprovalProcessService
throw new Exception($e->getMessage());
}
}
/**
* 审批
* @param int $process_id 流程ID
@ -145,17 +161,17 @@ class SchoolApprovalProcessService
if (empty($process_info)) {
throw new Exception('审批流程不存在');
}
// 检查是否当前审批人
if ($process_info['current_approver_id'] != $approver_id) {
throw new Exception('您不是当前审批人');
}
// 检查流程状态
if ($process_info['approval_status'] != SchoolApprovalProcess::STATUS_PENDING) {
throw new Exception('该审批流程已完成');
}
// 获取当前审批节点
$current_participant = (new SchoolApprovalParticipants())
->where([
@ -164,18 +180,18 @@ class SchoolApprovalProcessService
'status' => SchoolApprovalParticipants::STATUS_PENDING
])
->find();
if (empty($current_participant)) {
throw new Exception('审批节点信息错误');
}
// 更新当前审批人状态
(new SchoolApprovalParticipants())->where(['id' => $current_participant['id']])
->update([
'status' => $status,
'remarks' => $remarks
]);
// 如果拒绝,直接更新整个流程状态为拒绝
if ($status == SchoolApprovalParticipants::STATUS_REJECTED) {
(new SchoolApprovalProcess())->where(['id' => $process_id])
@ -184,11 +200,11 @@ class SchoolApprovalProcessService
'approval_time' => time(),
'remarks' => $remarks
]);
Db::commit();
return true;
}
// 检查当前节点是否需要会签
$same_sequence_participants = (new SchoolApprovalParticipants())
->where([
@ -197,14 +213,14 @@ class SchoolApprovalProcessService
'status' => SchoolApprovalParticipants::STATUS_PENDING
])
->select();
// 如果是会签且还有其他人未审批,则等待
if ($current_participant['sign_type'] == SchoolApprovalParticipants::SIGN_TYPE_AND && !$same_sequence_participants->isEmpty()) {
// 不做任何处理,等待其他人审批
Db::commit();
return true;
}
// 获取下一个审批节点
$next_participant = (new SchoolApprovalParticipants())
->where([
@ -213,7 +229,7 @@ class SchoolApprovalProcessService
])
->order('sequence', 'asc')
->find();
if (empty($next_participant)) {
// 没有下一个审批人,流程结束,标记为已通过
(new SchoolApprovalProcess())->where(['id' => $process_id])
@ -226,7 +242,7 @@ class SchoolApprovalProcessService
(new SchoolApprovalProcess())->where(['id' => $process_id])
->update(['current_approver_id' => $next_participant['participant_id']]);
}
Db::commit();
return true;
} catch (\Exception $e) {
@ -234,7 +250,7 @@ class SchoolApprovalProcessService
throw new Exception($e->getMessage());
}
}
/**
* 撤销审批流程
* @param int $process_id 流程ID
@ -251,17 +267,17 @@ class SchoolApprovalProcessService
if (empty($process_info)) {
throw new Exception('审批流程不存在');
}
// 检查是否申请人
if ($process_info['applicant_id'] != $applicant_id) {
throw new Exception('您不是该流程的申请人');
}
// 检查流程状态
if ($process_info['approval_status'] != SchoolApprovalProcess::STATUS_PENDING) {
throw new Exception('该审批流程已完成,无法撤销');
}
// 更新流程状态为已拒绝(撤销)
(new SchoolApprovalProcess())->where(['id' => $process_id])
->update([
@ -269,7 +285,7 @@ class SchoolApprovalProcessService
'approval_time' => time(),
'remarks' => '申请人撤销'
]);
// 更新所有待审批节点为已拒绝
(new SchoolApprovalParticipants())->where([
'process_id' => $process_id,
@ -278,7 +294,7 @@ class SchoolApprovalProcessService
'status' => SchoolApprovalParticipants::STATUS_REJECTED,
'remarks' => '申请人撤销'
]);
Db::commit();
return true;
} catch (\Exception $e) {
@ -286,4 +302,4 @@ class SchoolApprovalProcessService
throw new Exception($e->getMessage());
}
}
}
}

Loading…
Cancel
Save