处理冲突

.gitignore

@@ -7,3 +7,5 @@
 /.idea
 /niucloud/runtime
 /niucloud/vendor
+/niucloud/config
+config

admin/.env.development

@@ -0,0 +1,8 @@
+# api请求地址
+VITE_APP_BASE_URL='http://zhjwxt.test/adminapi/'
+
+# 图片服务器地址
+VITE_IMG_DOMAIN=''
+
+# 请求时header中token的参数名
+VITE_REQUEST_HEADER_TOKEN_KEY='token'

admin/.env.production

@@ -0,0 +1,9 @@
+# api请求地址
+VITE_APP_BASE_URL='http://146.56.228.75:20024/adminapi/'
+# VITE_APP_BASE_URL='https://zh.hnhbty.cn/adminapi/'
+
+# 图片服务器地址
+VITE_IMG_DOMAIN=''
+
+# 请求时header中token的参数名
+VITE_REQUEST_HEADER_TOKEN_KEY='token'

admin/.gitignore

@@ -22,6 +22,7 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
 .env.development
 .env.production
 auto-imports.d.ts

admin/auto-imports.d.ts

@@ -0,0 +1,5 @@
+// Generated by 'unplugin-auto-import'
+export {}
+declare global {
+  const ElNotification: typeof import('element-plus/es')['ElNotification']
+}

admin/components.d.ts

@@ -17,10 +17,7 @@ declare module '@vue/runtime-core' {
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
@@ -57,7 +54,7 @@ declare module '@vue/runtime-core' {
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
+    ElTree: typeof import('element-plus/es')['ElTree']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     ExportSure: typeof import('./src/components/export-sure/index.vue')['default']
     HeatMap: typeof import('./src/components/heat-map/index.vue')['default']

admin/src/app/api/campus_pay.ts

@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+
+
+
+
+
+
+// USER_CODE_BEGIN -- campus_pay
+/**
+ * 获取账户及资金管理列表
+ * @param params
+ * @returns
+ */
+export function getCampusPayList(params: Record<string, any>) {
+    return request.get(`campus_pay/campus_pay`, {params})
+}
+
+/**
+ * 获取账户及资金管理详情
+ * @param id 账户及资金管理id
+ * @returns
+ */
+export function getCampusPayInfo(id: number) {
+    return request.get(`campus_pay/campus_pay/${id}`);
+}
+
+/**
+ * 添加账户及资金管理
+ * @param params
+ * @returns
+ */
+export function addCampusPay(params: Record<string, any>) {
+    return request.post('campus_pay/campus_pay', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑账户及资金管理
+ * @param id
+ * @param params
+ * @returns
+ */
+export function editCampusPay(params: Record<string, any>) {
+    return request.put(`campus_pay/campus_pay/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 删除账户及资金管理
+ * @param id
+ * @returns
+ */
+export function deleteCampusPay(id: number) {
+    return request.delete(`campus_pay/campus_pay/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+export function getWithCampusList(params: Record<string,any>){
+    return request.get('campus_pay/campus_all', {params})
+}
+
+// USER_CODE_END -- campus_pay

admin/src/app/api/reimbursement.ts

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+
+
+
+
+
+
+
+
 // USER_CODE_BEGIN -- reimbursement
 /**
  * 获取报销记录列表
@@ -7,7 +15,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getReimbursementList(params: Record<string, any>) {
-  return request.get(`reimbursement/reimbursement`, { params })
+    return request.get(`reimbursement/reimbursement`, {params})
 }
 
 /**
@@ -16,7 +24,7 @@ export function getReimbursementList(params: Record<string, any>) {
  * @returns
  */
 export function getReimbursementInfo(id: number) {
-  return request.get(`reimbursement/reimbursement/${id}`)
+    return request.get(`reimbursement/reimbursement/${id}`);
 }
 
 /**
@@ -25,10 +33,7 @@ export function getReimbursementInfo(id: number) {
  * @returns
  */
 export function addReimbursement(params: Record<string, any>) {
-  return request.post('reimbursement/reimbursement', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('reimbursement/reimbursement', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -38,10 +43,7 @@ export function addReimbursement(params: Record<string, any>) {
  * @returns
  */
 export function editReimbursement(params: Record<string, any>) {
-  return request.put(`reimbursement/reimbursement/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`reimbursement/reimbursement/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -50,10 +52,11 @@ export function editReimbursement(params: Record<string, any>) {
  * @returns
  */
 export function deleteReimbursement(id: number) {
-  return request.delete(`reimbursement/reimbursement/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`reimbursement/reimbursement/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+export function getWithPersonnelList(params: Record<string,any>){
+    return request.get('reimbursement/personnel_all', {params})
 }
 
 // USER_CODE_END -- reimbursement

admin/src/app/api/salary.ts

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+
+
+
+
+
+
+
+
 // USER_CODE_BEGIN -- salary
 /**
  * 获取工资列表
@@ -7,7 +15,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getSalaryList(params: Record<string, any>) {
-  return request.get(`salary/salary`, { params })
+    return request.get(`salary/salary`, {params})
 }
 
 /**
@@ -16,7 +24,7 @@ export function getSalaryList(params: Record<string, any>) {
  * @returns
  */
 export function getSalaryInfo(id: number) {
-  return request.get(`salary/salary/${id}`)
+    return request.get(`salary/salary/${id}`);
 }
 
 /**
@@ -25,10 +33,7 @@ export function getSalaryInfo(id: number) {
  * @returns
  */
 export function addSalary(params: Record<string, any>) {
-  return request.post('salary/salary', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('salary/salary', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -38,10 +43,7 @@ export function addSalary(params: Record<string, any>) {
  * @returns
  */
 export function editSalary(params: Record<string, any>) {
-  return request.put(`salary/salary/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`salary/salary/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -50,10 +52,13 @@ export function editSalary(params: Record<string, any>) {
  * @returns
  */
 export function deleteSalary(id: number) {
-  return request.delete(`salary/salary/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`salary/salary/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+export function getWithPersonnelList(params: Record<string,any>){
+    return request.get('salary/personnel_all', {params})
+}export function getWithDepartmentsList(params: Record<string,any>){
+    return request.get('salary/departments_all', {params})
 }
 
 // USER_CODE_END -- salary

admin/src/app/api/service.ts

@@ -1,5 +1,7 @@
 import request from '@/utils/request'
 
+
+
 // USER_CODE_BEGIN -- service
 /**
  * 获取服务列表
@@ -7,7 +9,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getServiceList(params: Record<string, any>) {
-  return request.get(`service/service`, { params })
+    return request.get(`service/service`, {params})
 }
 
 /**
@@ -16,7 +18,7 @@ export function getServiceList(params: Record<string, any>) {
  * @returns
  */
 export function getServiceInfo(id: number) {
-  return request.get(`service/service/${id}`)
+    return request.get(`service/service/${id}`);
 }
 
 /**
@@ -25,10 +27,7 @@ export function getServiceInfo(id: number) {
  * @returns
  */
 export function addService(params: Record<string, any>) {
-  return request.post('service/service', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('service/service', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -38,10 +37,7 @@ export function addService(params: Record<string, any>) {
  * @returns
  */
 export function editService(params: Record<string, any>) {
-  return request.put(`service/service/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`service/service/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -50,10 +46,9 @@ export function editService(params: Record<string, any>) {
  * @returns
  */
 export function deleteService(id: number) {
-  return request.delete(`service/service/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`service/service/${id}`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
+
+
 // USER_CODE_END -- service

admin/src/app/api/user_feedback.ts

@@ -1,5 +1,7 @@
 import request from '@/utils/request'
 
+
+
 // USER_CODE_BEGIN -- user_feedback
 /**
  * 获取用户反馈信息列表
@@ -7,7 +9,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getUserFeedbackList(params: Record<string, any>) {
-  return request.get(`user_feedback/user_feedback`, { params })
+    return request.get(`user_feedback/user_feedback`, {params})
 }
 
 /**
@@ -16,7 +18,7 @@ export function getUserFeedbackList(params: Record<string, any>) {
  * @returns
  */
 export function getUserFeedbackInfo(id: number) {
-  return request.get(`user_feedback/user_feedback/${id}`)
+    return request.get(`user_feedback/user_feedback/${id}`);
 }
 
 /**
@@ -25,10 +27,7 @@ export function getUserFeedbackInfo(id: number) {
  * @returns
  */
 export function addUserFeedback(params: Record<string, any>) {
-  return request.post('user_feedback/user_feedback', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('user_feedback/user_feedback', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -38,10 +37,7 @@ export function addUserFeedback(params: Record<string, any>) {
  * @returns
  */
 export function editUserFeedback(params: Record<string, any>) {
-  return request.put(`user_feedback/user_feedback/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`user_feedback/user_feedback/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -50,10 +46,11 @@ export function editUserFeedback(params: Record<string, any>) {
  * @returns
  */
 export function deleteUserFeedback(id: number) {
-  return request.delete(`user_feedback/user_feedback/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`user_feedback/user_feedback/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+export function getWithCustomerResourcesList(params: Record<string,any>){
+    return request.get('user_feedback/customer_resources_all', {params})
 }
 
 // USER_CODE_END -- user_feedback

admin/src/app/lang/zh-cn/campus_pay.campus_pay.json

@@ -0,0 +1,25 @@
+{
+      "id":"",
+      "idPlaceholder":"请输入",
+      "campusId":"校区",
+      "campusIdPlaceholder":"全部",
+      "mchid":"商户号",
+      "mchidPlaceholder":"请输入商户号",
+      "paySignKey":"APIv3密钥",
+      "paySignKeyPlaceholder":"请输入APIv3密钥",
+      "apiclientKey":"商户私钥",
+      "apiclientKeyPlaceholder":"请输入商户私钥",
+      "apiclientCert":"商户公钥",
+      "apiclientCertPlaceholder":"请输入商户公钥",
+      "wxPayKey":"微信支付公钥",
+      "wxPayKeyPlaceholder":"请输入微信支付公钥",
+      "wxPayKeyId":"微信支付公钥ID",
+      "wxPayKeyIdPlaceholder":"请输入微信支付公钥ID",
+      "createdAt":"创建时间",
+      "createdAtPlaceholder":"请输入创建时间",
+      "addCampusPay":"添加账户及资金管理",
+      "updateCampusPay":"编辑账户及资金管理",
+      "campusPayDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间"
+}

admin/src/app/lang/zh-cn/reimbursement.reimbursement.json

@@ -1,21 +1,20 @@
 {
-  "id": "报销编号",
-  "idPlaceholder": "请输入报销编号",
-  "applicantId": "申请人ID",
-  "applicantIdPlaceholder": "请输入申请人ID",
-  "amount": "报销金额",
-  "amountPlaceholder": "请输入报销金额",
-  "description": "报销描述",
-  "descriptionPlaceholder": "请输入报销描述",
-  "receiptUrl": "发票或收据URL",
-  "receiptUrlPlaceholder": "请输入发票或收据URL",
-  "status": "状态",
-  "statusPlaceholder": "请输入状态",
-  "processId": "关联的审批流程ID",
-  "processIdPlaceholder": "请输入关联的审批流程ID",
-  "addReimbursement": "添加报销记录",
-  "updateReimbursement": "编辑报销记录",
-  "reimbursementDeleteTips": "确定要删除该数据吗？",
-  "startDate": "请选择开始时间",
-  "endDate": "请选择结束时间"
-}
+      "applicantId":"申请人",
+      "applicantIdPlaceholder":"请输入申请人",
+      "amount":"报销金额",
+      "amountPlaceholder":"请输入报销金额",
+      "description":"报销描述",
+      "descriptionPlaceholder":"请输入报销描述",
+      "receiptUrl":"发票或收据",
+      "receiptUrlPlaceholder":"请输入发票或收据",
+      "status":"状态",
+      "statusPlaceholder":"请输入状态",
+      "createdAt":"创建时间",
+      "createdAtPlaceholder":"请输入创建时间",
+      "updatedAt":"修改时间",
+      "addReimbursement":"添加报销记录",
+      "updateReimbursement":"编辑报销记录",
+      "reimbursementDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间"
+}

admin/src/app/lang/zh-cn/salary.salary.json

@@ -1,33 +1,31 @@
 {
-  "id": "工资编号",
-  "idPlaceholder": "请输入工资编号",
-  "staffId": "员工ID",
-  "staffIdPlaceholder": "请输入员工ID",
-  "baseSalary": "底薪",
-  "baseSalaryPlaceholder": "请输入底薪",
-  "performanceBonus": "绩效",
-  "performanceBonusPlaceholder": "请输入绩效",
-  "deductions": "扣款",
-  "deductionsPlaceholder": "请输入扣款",
-  "otherSubsidies": "其他补贴",
-  "otherSubsidiesPlaceholder": "请输入其他补贴",
-  "netSalary": "实发工资",
-  "netSalaryPlaceholder": "请输入实发工资",
-  "paymentStatus": "发放状态",
-  "paymentStatusPlaceholder": "请输入发放状态",
-  "paymentMethod": "发放方式",
-  "paymentMethodPlaceholder": "请输入发放方式",
-  "remarks": "备注",
-  "remarksPlaceholder": "请输入备注",
-  "salaryMonth": "工资月份",
-  "salaryMonthPlaceholder": "请输入工资月份",
-  "departmentId": "部门ID",
-  "departmentIdPlaceholder": "请输入部门ID",
-  "processId": "关联的审批流程ID",
-  "processIdPlaceholder": "请输入关联的审批流程ID",
-  "addSalary": "添加工资",
-  "updateSalary": "编辑工资",
-  "salaryDeleteTips": "确定要删除该数据吗？",
-  "startDate": "请选择开始时间",
-  "endDate": "请选择结束时间"
-}
+      "staffId":"员工",
+      "staffIdPlaceholder":"全部",
+      "departmentId":"部门",
+      "departmentIdPlaceholder":"全部",
+      "baseSalary":"底薪",
+      "baseSalaryPlaceholder":"请输入底薪",
+      "performanceBonus":"绩效",
+      "performanceBonusPlaceholder":"请输入绩效",
+      "deductions":"扣款",
+      "deductionsPlaceholder":"请输入扣款",
+      "otherSubsidies":"其他补贴",
+      "otherSubsidiesPlaceholder":"请输入其他补贴",
+      "netSalary":"实发工资",
+      "paymentStatus":"发放状态",
+      "paymentStatusPlaceholder":"请输入发放状态",
+      "paymentMethod":"发放方式",
+      "paymentMethodPlaceholder":"请输入发放方式",
+      "remarks":"备注",
+      "remarksPlaceholder":"请输入备注",
+      "salaryMonth":"工资月份",
+      "salaryMonthPlaceholder":"请输入工资月份",
+      "createdAt":"创建时间",
+      "createdAtPlaceholder":"请输入创建时间",
+      "updatedAt":"修改时间",
+      "addSalary":"添加工资",
+      "updateSalary":"编辑工资",
+      "salaryDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间"
+}

admin/src/app/lang/zh-cn/service.service.json

@@ -1,29 +1,27 @@
 {
-  "id": "服务编号",
-  "idPlaceholder": "请输入服务编号",
-  "serviceName": "服务名称",
-  "serviceNamePlaceholder": "请输入服务名称",
-  "previewImageUrl": "服务预览图URL",
-  "previewImageUrlPlaceholder": "请输入服务预览图URL",
-  "description": "服务描述",
-  "descriptionPlaceholder": "请输入服务描述",
-  "serviceType": "服务类型",
-  "serviceTypePlaceholder": "请输入服务类型",
-  "executionRules": "服务执行规则",
-  "executionRulesPlaceholder": "请输入服务执行规则",
-  "staffReminder": "是否员工提醒: 1-是, 0-否",
-  "staffReminderPlaceholder": "请输入是否员工提醒: 1-是, 0-否",
-  "customerReminder": "是否客户提醒: 1-是, 0-否",
-  "customerReminderPlaceholder": "请输入是否客户提醒: 1-是, 0-否",
-  "customerConfirmation": "是否客户确认: 1-是, 0-否",
-  "customerConfirmationPlaceholder": "请输入是否客户确认: 1-是, 0-否",
-  "customerFeedback": "客户反馈内容",
-  "customerFeedbackPlaceholder": "请输入客户反馈内容",
-  "status": "状态",
-  "statusPlaceholder": "请输入状态",
-  "addService": "添加服务",
-  "updateService": "编辑服务",
-  "serviceDeleteTips": "确定要删除该数据吗？",
-  "startDate": "请选择开始时间",
-  "endDate": "请选择结束时间"
-}
+      "serviceName":"服务名称",
+      "serviceNamePlaceholder":"请输入服务名称",
+      "previewImageUrl":"服务预览图",
+      "previewImageUrlPlaceholder":"请输入服务预览图",
+      "description":"服务描述",
+      "descriptionPlaceholder":"请输入服务描述",
+      "serviceType":"服务类型",
+      "serviceTypePlaceholder":"请输入服务类型",
+      "executionRules":"服务执行规则",
+      "executionRulesPlaceholder":"请输入服务执行规则",
+      "staffReminder":"是否员工提醒",
+      "staffReminderPlaceholder":"请输入是否员工提醒",
+      "customerReminder":"是否客户提醒",
+      "customerReminderPlaceholder":"请输入是否客户提醒",
+      "customerConfirmation":"是否客户确认",
+      "customerConfirmationPlaceholder":"请输入是否客户确认",
+      "customerFeedback":"客户反馈内容",
+      "customerFeedbackPlaceholder":"请输入客户反馈内容",
+      "status":"状态",
+      "statusPlaceholder":"请输入状态",
+      "addService":"添加服务",
+      "updateService":"编辑服务",
+      "serviceDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间"
+}

admin/src/app/lang/zh-cn/user_feedback.user_feedback.json

@@ -1,15 +1,13 @@
 {
-  "id": "反馈编号",
-  "idPlaceholder": "请输入反馈编号",
-  "userId": "用户ID",
-  "userIdPlaceholder": "请输入用户ID",
-  "feedbackText": "反馈内容",
-  "feedbackTextPlaceholder": "请输入反馈内容",
-  "attachmentUrl": "附件URL（OSS对象存储）",
-  "attachmentUrlPlaceholder": "请输入附件URL（OSS对象存储）",
-  "addUserFeedback": "添加用户反馈信息",
-  "updateUserFeedback": "编辑用户反馈信息",
-  "userFeedbackDeleteTips": "确定要删除该数据吗？",
-  "startDate": "请选择开始时间",
-  "endDate": "请选择结束时间"
-}
+      "userId":"客户名称",
+      "userIdPlaceholder":"全部",
+      "feedbackText":"反馈内容",
+      "feedbackTextPlaceholder":"请输入反馈内容",
+      "attachmentUrl":"附件",
+      "attachmentUrlPlaceholder":"请输入附件",
+      "addUserFeedback":"添加用户反馈信息",
+      "updateUserFeedback":"查看用户反馈信息",
+      "userFeedbackDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间"
+}

admin/src/app/views/auth/components/edit-role.vue

@@ -24,6 +24,17 @@
           :show-word-limit="true"
         />
       </el-form-item>
+	  
+	  
+	  
+	  <el-form-item label="类型">
+	    <el-radio-group v-model="formData.role_key">
+	      <el-radio label="market">销售</el-radio>
+		  <el-radio label="teacher">老师</el-radio>
+		  <el-radio label="manager">主管</el-radio>
+	    </el-radio-group>
+	  </el-form-item>
+	  
 
       <el-form-item :label="t('status')">
         <el-radio-group v-model="formData.status">
@@ -142,6 +153,7 @@ const initialFormData = {
   role_id: 0,
   role_name: '',
   status: 1,
+  role_key:'',
   rules: [],
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })

admin/src/app/views/auth/role.vue

@@ -56,6 +56,15 @@
               }}</el-tag>
             </template>
           </el-table-column>
+		  
+		  <el-table-column label="类型">
+		    <template #default="{ row }">
+				<el-tag type="success" v-if="row.role_key == 'market'">销售</el-tag>
+				<el-tag type="success" v-if="row.role_key == 'teacher'">老师</el-tag>
+				<el-tag type="success" v-if="row.role_key == 'manager'">主管</el-tag>
+		    </template>
+		  </el-table-column>
+		  
           <el-table-column
             prop="create_time"
             :label="t('createTime')"

admin/src/app/views/campus_pay/campus_pay.vue

@@ -0,0 +1,183 @@
+<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>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addCampusPay') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="campusPayTable.searchParam" ref="searchFormRef">
+                    
+                    <el-form-item :label="t('campusId')" prop="campus_id">
+                        <el-select class="w-[280px]" v-model="campusPayTable.searchParam.campus_id" clearable :placeholder="t('campusIdPlaceholder')">
+                           <el-option
+                                       v-for="(item, index) in campusIdList"
+                                       :key="index"
+                                       :label="item['campus_name']"
+                                       :value="item['id']"
+                                   />
+                        </el-select>
+                    </el-form-item>
+                    
+                    <el-form-item :label="t('createdAt')" prop="created_at">
+                        <el-date-picker v-model="campusPayTable.searchParam.created_at" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                            :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    
+                    <el-form-item>
+                        <el-button type="primary" @click="loadCampusPayList()">{{ 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="campusPayTable.data" size="large" v-loading="campusPayTable.loading">
+                    <template #empty>
+                        <span>{{ !campusPayTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="campus_id_name" :label="t('campusId')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="mchid" :label="t('mchid')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="created_at" :label="t('createdAt')" 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>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="campusPayTable.page" v-model:page-size="campusPayTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="campusPayTable.total"
+                        @size-change="loadCampusPayList()" @current-change="loadCampusPayList" />
+                </div>
+            </div>
+
+            <edit ref="editCampusPayDialog" @complete="loadCampusPayList" />
+        </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 { getCampusPayList, deleteCampusPay, getWithCampusList } from '@/app/api/campus_pay'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/campus_pay/components/campus-pay-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+
+let campusPayTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      "campus_id":"",
+      "created_at":[]
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+    
+
+/**
+ * 获取账户及资金管理列表
+ */
+const loadCampusPayList = (page: number = 1) => {
+    campusPayTable.loading = true
+    campusPayTable.page = page
+
+    getCampusPayList({
+        page: campusPayTable.page,
+        limit: campusPayTable.limit,
+         ...campusPayTable.searchParam
+    }).then(res => {
+        campusPayTable.loading = false
+        campusPayTable.data = res.data.data
+        campusPayTable.total = res.data.total
+    }).catch(() => {
+        campusPayTable.loading = false
+    })
+}
+loadCampusPayList()
+
+const editCampusPayDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 添加账户及资金管理
+ */
+const addEvent = () => {
+    editCampusPayDialog.value.setFormData()
+    editCampusPayDialog.value.showDialog = true
+}
+
+/**
+ * 编辑账户及资金管理
+ * @param data
+ */
+const editEvent = (data: any) => {
+    editCampusPayDialog.value.setFormData(data)
+    editCampusPayDialog.value.showDialog = true
+}
+
+/**
+ * 删除账户及资金管理
+ */
+const deleteEvent = (id: number) => {
+    ElMessageBox.confirm(t('campusPayDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteCampusPay(id).then(() => {
+            loadCampusPayList()
+        }).catch(() => {
+        })
+    })
+}
+
+    
+    const campusIdList = ref([])
+    const setCampusIdList = async () => {
+    campusIdList.value = await (await getWithCampusList({})).data
+    }
+    setCampusIdList()
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadCampusPayList()
+}
+</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>

admin/src/app/views/campus_pay/components/campus-pay-edit.vue

@@ -0,0 +1,216 @@
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateCampusPay') : t('addCampusPay')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('campusId')" prop="campus_id">
+                    <el-select class="input-width" v-model="formData.campus_id" clearable :placeholder="t('campusIdPlaceholder')">
+                       <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in campusIdList"
+                            :key="index"
+                            :label="item['campus_name']"
+                            :value="item['id']"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('mchid')" prop="mchid">
+                    <el-input v-model="formData.mchid" clearable :placeholder="t('mchidPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('paySignKey')" prop="pay_sign_key">
+                    <el-input v-model="formData.pay_sign_key" clearable :placeholder="t('paySignKeyPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('apiclientKey')">
+                    <upload-file v-model="formData.apiclient_key" />
+                </el-form-item>
+                
+                <el-form-item :label="t('apiclientCert')">
+                    <upload-file v-model="formData.apiclient_cert" />
+                </el-form-item>
+                
+                <el-form-item :label="t('wxPayKey')">
+                    <upload-file v-model="formData.wx_pay_key" />
+                </el-form-item>
+                
+                <el-form-item :label="t('wxPayKeyId')" prop="wx_pay_key_id">
+                    <el-input v-model="formData.wx_pay_key_id" clearable :placeholder="t('wxPayKeyIdPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addCampusPay, editCampusPay, getCampusPayInfo, getWithCampusList } from '@/app/api/campus_pay'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    campus_id: '',
+    mchid: '',
+    pay_sign_key: '',
+    apiclient_key: '',
+    apiclient_cert: '',
+    wx_pay_key: '',
+    wx_pay_key_id: '',
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    campus_id: [
+        { required: true, message: t('campusIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    mchid: [
+        { required: true, message: t('mchidPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    pay_sign_key: [
+        { required: true, message: t('paySignKeyPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    apiclient_key: [
+        { required: true, message: t('apiclientKeyPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    apiclient_cert: [
+        { required: true, message: t('apiclientCertPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    wx_pay_key: [
+        { required: true, message: t('wxPayKeyPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    wx_pay_key_id: [
+        { required: true, message: t('wxPayKeyIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editCampusPay : addCampusPay
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    
+
+    
+    const campusIdList = ref([] as any[])
+    const setCampusIdList = async () => {
+    campusIdList.value = await (await getWithCampusList({})).data
+    }
+    setCampusIdList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getCampusPayInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>

admin/src/app/views/campus_person_role/campus_person_role.vue

@@ -65,7 +65,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item :label="t('deptId')" prop="dept_id">
+<!--          <el-form-item :label="t('deptId')" prop="dept_id">
             <el-select
               class="w-[280px]"
               v-model="campusPersonRoleTable.searchParam.dept_id"
@@ -79,7 +79,7 @@
                 :value="item['id']"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item>
             <el-button type="primary" @click="loadCampusPersonRoleList()">{{
@@ -186,7 +186,6 @@ const route = useRoute()
 const pageName = route.meta.title
 // ?dept_id=1
 
-const dept_id = pageName == '市场人员列表' ? 1 : 2
 let campusPersonRoleTable = reactive({
   page: 1,
   limit: 10,
@@ -197,10 +196,19 @@ let campusPersonRoleTable = reactive({
     campus_id: '',
     person_id: '',
     role_id: '',
-    dept_id: dept_id,
+    dept_id: '',
   },
 })
 
+
+if(pageName == '市场人员列表'){
+	campusPersonRoleTable.searchParam.dept_id = 1;
+}else if(pageName == '销售人员列表'){
+	campusPersonRoleTable.searchParam.dept_id = 2;
+}else if(pageName == '教练管理'){
+	campusPersonRoleTable.searchParam.role_id = 5;
+}
+
 const searchFormRef = ref<FormInstance>()
 
 // 选中数据

admin/src/app/views/course/components/course-edit.vue

@@ -33,7 +33,7 @@
             v-for="(item, index) in courseTypeList"
             :key="index"
             :label="item.name"
-            :value="item.value"
+            :value="item.name"
           />
         </el-select>
       </el-form-item>

admin/src/app/views/course/course.vue

@@ -31,56 +31,12 @@
               <el-option
                 v-for="item in courseTypeList"
                 :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                :label="item.name"
+                :value="item.name"
               />
             </el-select>
           </el-form-item>
-          <el-form-item :label="t('duration')" prop="duration">
-            <el-input
-              v-model="courseTable.searchParam.duration"
-              :placeholder="t('durationPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('sessionCount')" prop="session_count">
-            <el-input
-              v-model="courseTable.searchParam.session_count"
-              :placeholder="t('sessionCountPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item
-            :label="t('singleSessionCount')"
-            prop="single_session_count"
-          >
-            <el-input
-              v-model="courseTable.searchParam.single_session_count"
-              :placeholder="t('singleSessionCountPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('price')" prop="price">
-            <el-input
-              v-model="courseTable.searchParam.price"
-              :placeholder="t('pricePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('internalReminder')" prop="internal_reminder">
-            <el-input
-              v-model="courseTable.searchParam.internal_reminder"
-              :placeholder="t('internalReminderPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('customerReminder')" prop="customer_reminder">
-            <el-input
-              v-model="courseTable.searchParam.customer_reminder"
-              :placeholder="t('customerReminderPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('remarks')" prop="remarks">
-            <el-input
-              v-model="courseTable.searchParam.remarks"
-              :placeholder="t('remarksPlaceholder')"
-            />
-          </el-form-item>
+          
 
           <el-form-item>
             <el-button type="primary" @click="loadCourseList()">{{
@@ -227,7 +183,17 @@ let courseTable = reactive({
     remarks: '',
   },
 })
-const courseTypeList = useDictionary('course_type')
+// const courseTypeList = useDictionary('course_type')
+
+
+const courseTypeList = ref([])
+const getcourseTypeList = async () => {
+  courseTypeList.value = await (
+    await useDictionary('course_type')
+  ).data.dictionary
+}
+getcourseTypeList()
+
 const searchFormRef = ref<FormInstance>()
 
 // 选中数据

admin/src/app/views/customer_resources/components/customer-resources-edit.vue

@@ -230,6 +230,26 @@
                 />
               </el-select>
             </el-form-item>
+			
+			
+			
+			<el-form-item label="会员标签">
+			  <el-select
+			    v-model="formData.member_label"
+			    multiple
+			    collapse-tags
+			    placeholder="请选择会员标签"
+			    class="input-width"
+			  >
+			    <el-option
+			      :label="item['label_name']"
+			      :value="item['label_id']"
+			      v-for="(item, index) in labelSelectData"
+			      :key="index"
+			    />
+			  </el-select>
+			</el-form-item>
+			
           </el-form>
         </el-tab-pane>
 
@@ -410,6 +430,7 @@ import { ref, reactive, computed, watch } from 'vue'
 import { useDictionary } from '@/app/api/dict'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
+import { getMemberLabelAll } from '@/app/api/member'
 import {
   addCustomerResources,
   editCustomerResources,
@@ -448,6 +469,7 @@ const initialFormData = {
   initial_intent: '',
   campus: '',
   status: '',
+  member_label:'',
 
   purchase_power: '',
   concept_awareness: '',
@@ -461,6 +483,15 @@ const initialFormData = {
   second_visit_status: '',
   is_closed: '',
 }
+
+
+const labelSelectData: any = ref(null)
+// 获取全部标签
+const getMemberLabelAllFn = async () => {
+  labelSelectData.value = await (await getMemberLabelAll()).data
+}
+getMemberLabelAllFn()
+
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
 const formRef = ref<FormInstance>()

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

@@ -1,496 +1,396 @@
 <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>
-        <el-button
-          type="primary"
-          @click="addEvent"
-          v-if="customerResourcesTable.searchParam.type == 'khzy'"
-        >
-          {{ t('addCustomerResources') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="customerResourcesTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('name')" prop="name">
-            <el-input
-              v-model="customerResourcesTable.searchParam.name"
-              :placeholder="t('namePlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item label="年龄" prop="age">
-            <el-input
-              v-model="customerResourcesTable.searchParam.age"
-              placeholder="请输入年龄"
-            />
-          </el-form-item>
-
-          <el-form-item label="性别" prop="gender">
-            <el-select
-              v-model="customerResourcesTable.searchParam.gender"
-              placeholder="请选择性别"
-            >
-              <el-option label="男性" value="male" />
-              <el-option label="女性" value="female" />
-              <el-option label="其他" value="other" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item :label="t('phoneNumber')" prop="phone_number">
-            <el-input
-              v-model="customerResourcesTable.searchParam.phone_number"
-              :placeholder="t('phoneNumberPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="customerResourcesTable.searchParam.created_at"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-            />
-          </el-form-item>
-
-          <!-- 更新时间 -->
-          <el-form-item label="更新时间">
-            <el-date-picker
-              v-model="customerResourcesTable.searchParam.updated_at"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadCustomerResourcesList()">{{
-              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="customerResourcesTable.data"
-          size="large"
-          v-loading="customerResourcesTable.loading"
-        >
-          <template #empty>
-            <span>{{
-              !customerResourcesTable.loading ? t('emptyData') : ''
-            }}</span>
-          </template>
-          <el-table-column
-            :label="t('source')"
-            min-width="180"
-            align="center"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <div v-for="(item, index) in sourceList">
-                <div v-if="item.value == row.source">{{ item.name }}</div>
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="consultant_name"
-            :label="t('consultant')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="name"
-            :label="t('name')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="age"
-            :label="t('age')"
-            min-width="50"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            :label="t('gender')"
-            min-width="60"
-            align="center"
-            :show-overflow-tooltip="true"
-          >
-            <template #default="{ row }">
-              <div v-for="(item, index) in genderList">
-                <div v-if="item.value == row.gender">{{ item.name }}</div>
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="phone_number"
-            :label="t('phoneNumber')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="decision_maker"
-            :label="t('decisionMaker')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="created_at"
-            label="添加时间"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="updated_at"
-            label="修改时间"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="200"
-            v-if="customerResourcesTable.searchParam.type == 'khzy'"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="modificationLog(row.id)"
-                >六要素修改记录</el-button
-              >
-              <el-button type="primary" link @click="resourceChanges(row.id)"
-                >客户信息修改记录</el-button
-              >
-              <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
-            :label="t('operation')"
-            fixed="right"
-            min-width="200"
-            v-if="customerResourcesTable.searchParam.type == 'yjfp'"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="fpEvent(row)"
-                >分配</el-button
-              >
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="200"
-            v-if="customerResourcesTable.searchParam.type == 'zylb'"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-
-              <el-button
-                type="primary"
-                link
-                @click="addOrder({ resource_id: row.id })"
-                >添加订单</el-button
-              >
-
-              <el-button
-                type="primary"
-                link
-                @click="tcEvent({ resource_id: row.id })"
-                >体测</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="customerResourcesTable.page"
-            v-model:page-size="customerResourcesTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="customerResourcesTable.total"
-            @size-change="loadCustomerResourcesList()"
-            @current-change="loadCustomerResourcesList"
-          />
-        </div>
-      </div>
-
-      <edit
-        ref="editCustomerResourcesDialog"
-        @complete="loadCustomerResourcesList"
-      />
-
-      <fp
-        ref="fpCustomerResourcesDialog"
-        @complete="loadCustomerResourcesList"
-      />
-
-      <Order ref="editOrderTableDialog" @complete="loadCustomerResourcesList" />
-
-      <tc
-        ref="TcCustomerResourcesDialog"
-        @complete="loadCustomerResourcesList"
-      />
-    </el-card>
-  </div>
+	<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>
+				<el-button type="primary" @click="addEvent" v-if="customerResourcesTable.searchParam.type == 'khzy'">
+					{{ t('addCustomerResources') }}
+				</el-button>
+			</div>
+
+			<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+				<el-form :inline="true" :model="customerResourcesTable.searchParam" ref="searchFormRef">
+					<el-form-item :label="t('name')" prop="name">
+						<el-input v-model="customerResourcesTable.searchParam.name"
+							:placeholder="t('namePlaceholder')" />
+					</el-form-item>
+
+					<el-form-item label="年龄" prop="age">
+						<el-input v-model="customerResourcesTable.searchParam.age" placeholder="请输入年龄" />
+					</el-form-item>
+
+
+					<el-form-item label="性别" prop="gender">
+						<el-select v-model="customerResourcesTable.searchParam.gender" placeholder="请选择性别">
+							<el-option label="男性" value="male" />
+							<el-option label="女性" value="female" />
+							<el-option label="其他" value="other" />
+						</el-select>
+					</el-form-item>
+
+
+
+					<el-form-item :label="t('phoneNumber')" prop="phone_number">
+						<el-input v-model="customerResourcesTable.searchParam.phone_number"
+							:placeholder="t('phoneNumberPlaceholder')" />
+					</el-form-item>
+
+
+					<el-form-item label="创建时间">
+						<el-date-picker v-model="customerResourcesTable.searchParam.created_at" type="daterange" range-separator="至"
+							start-placeholder="开始日期" end-placeholder="结束日期" format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD" />
+					</el-form-item>
+
+					<!-- 更新时间 -->
+					<el-form-item label="更新时间">
+						<el-date-picker v-model="customerResourcesTable.searchParam.updated_at" type="daterange" range-separator="至"
+							start-placeholder="开始日期" end-placeholder="结束日期" format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD" />
+					</el-form-item>
+
+
+					<el-form-item>
+						<el-button type="primary" @click="loadCustomerResourcesList()">{{ 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="customerResourcesTable.data" size="large" v-loading="customerResourcesTable.loading">
+					<template #empty>
+						<span>{{ !customerResourcesTable.loading ? t('emptyData') : '' }}</span>
+					</template>
+					<el-table-column :label="t('source')" min-width="180" align="center" :show-overflow-tooltip="true">
+						<template #default="{ row }">
+							<div v-for="(item, index) in sourceList">
+								<div v-if="item.value == row.source">{{ item.name }}</div>
+							</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="consultant_name" :label="t('consultant')" min-width="120"
+						:show-overflow-tooltip="true" />
+
+					<el-table-column prop="name" :label="t('name')" min-width="120" :show-overflow-tooltip="true" />
+
+					<el-table-column prop="age" :label="t('age')" min-width="50" :show-overflow-tooltip="true" />
+
+					<el-table-column :label="t('gender')" min-width="60" align="center" :show-overflow-tooltip="true">
+						<template #default="{ row }">
+							<div v-for="(item, index) in genderList">
+								<div v-if="item.value == row.gender">{{ item.name }}</div>
+							</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="phone_number" :label="t('phoneNumber')" min-width="120"
+						:show-overflow-tooltip="true" />
+
+					<el-table-column prop="decision_maker" :label="t('decisionMaker')" min-width="120"
+						:show-overflow-tooltip="true" />
+						
+						
+						<el-table-column
+						  prop="member_label"
+						  label="会员标签"
+						  min-width="120"
+						  align="center"
+						>
+						  <template #default="{ row }">
+						    <div class="flex flex-col items-center">
+						      <div
+						        v-for="(item, key) in row.member_label_array"
+						        class="my-[3px]"
+						        :key="key"
+						      >
+						        <el-tag type="info">{{ item.label_name }}</el-tag>
+						      </div>
+						    </div>
+						  </template>
+						</el-table-column>
+
+
+					<el-table-column prop="created_at" label="添加时间" min-width="120" :show-overflow-tooltip="true" />
+						
+					<el-table-column prop="updated_at" label="修改时间" min-width="120" :show-overflow-tooltip="true" />
+
+
+					<el-table-column :label="t('operation')" fixed="right" min-width="200" v-if="customerResourcesTable.searchParam.type == 'khzy'">
+						<template #default="{ row }">
+							<el-button type="primary" link @click="modificationLog(row.id)">六要素修改记录</el-button>
+							<el-button type="primary" link @click="resourceChanges(row.id)">客户信息修改记录</el-button>
+							<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 :label="t('operation')" fixed="right" min-width="200"
+						v-if="customerResourcesTable.searchParam.type == 'yjfp'">
+						<template #default="{ row }">
+							<el-button type="primary" link @click="fpEvent(row)">分配</el-button>
+						</template>
+					</el-table-column>
+
+
+					<el-table-column :label="t('operation')" fixed="right" min-width="200"
+						v-if="customerResourcesTable.searchParam.type == 'zylb'">
+						<template #default="{ row }">
+							<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+
+							<el-button type="primary" link @click="addOrder({'resource_id':row.id})">添加订单</el-button>
+							
+							<el-button type="primary" link @click="tcEvent({'resource_id':row.id})">体测</el-button>
+						</template>
+					</el-table-column>
+
+				</el-table>
+				<div class="mt-[16px] flex justify-end">
+					<el-pagination v-model:current-page="customerResourcesTable.page"
+						v-model:page-size="customerResourcesTable.limit"
+						layout="total, sizes, prev, pager, next, jumper" :total="customerResourcesTable.total"
+						@size-change="loadCustomerResourcesList()" @current-change="loadCustomerResourcesList" />
+				</div>
+			</div>
+
+			<edit ref="editCustomerResourcesDialog" @complete="loadCustomerResourcesList" />
+
+			<fp ref="fpCustomerResourcesDialog" @complete="loadCustomerResourcesList" />
+
+			<Order ref="editOrderTableDialog" @complete="loadCustomerResourcesList" />
+			
+			<tc ref="TcCustomerResourcesDialog" @complete="loadCustomerResourcesList" />
+
+		</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 {
-  getCustomerResourcesList,
-  deleteCustomerResources,
-  getWithPersonnelList,
-  getWithCampusList,
-} from '@/app/api/customer_resources'
-import { img } from '@/utils/common'
-import { ElMessageBox, FormInstance } from 'element-plus'
-import Edit from '@/app/views/customer_resources/components/customer-resources-edit.vue'
-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 { useRouter, useRoute } from 'vue-router'
-const route = useRoute()
-const pageName = route.meta.title
-const router = useRouter()
-
-let customerResourcesTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    name: '',
-    age: '',
-    gender: '',
-    phone_number: '',
-    type: '',
-    created_at: '',
-    updated_at: '',
-  },
-})
-
-if (pageName == '业绩分配') {
-  customerResourcesTable.searchParam.type = 'yjfp'
-} else if (pageName == '客户资源列表') {
-  customerResourcesTable.searchParam.type = 'khzy'
-} else if (pageName == '资源列表') {
-  customerResourcesTable.searchParam.type = 'zylb'
-}
-
-// const type = pageName == '业绩分配' ? 'yjfp' : 'khzy';
-
-const modificationLog = (id: number) => {
-  router.push({
-    path: '/six_speed_modification_log/six_speed_modification_log',
-    query: { id: id },
-  })
-}
-
-const resourceChanges = (id: number) => {
-  router.push({
-    path: '/customer_resource_changes/customer_resource_changes',
-    query: { id: id },
-  })
-}
-
-/**
- * 添加订单
- */
-const editOrderTableDialog: Record<string, any> | null = ref(null)
-const addOrder = (row: any) => {
-  console.log(row)
-  editOrderTableDialog.value.setFormData(row)
-  editOrderTableDialog.value.showDialog = true
-}
-
-const TcCustomerResourcesDialog: Record<string, any> | null = ref(null)
-const tcEvent = (row: any) => {
-  TcCustomerResourcesDialog.value.setFormData(row)
-  TcCustomerResourcesDialog.value.showDialog = true
-}
-
-const searchFormRef = ref<FormInstance>()
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 字典数据
-const sourceList = ref([] as any[])
-const sourceDictList = async () => {
-  sourceList.value = await (await useDictionary('source')).data.dictionary
-}
-sourceDictList()
-const source_channelList = ref([] as any[])
-const source_channelDictList = async () => {
-  source_channelList.value = await (
-    await useDictionary('SourceChannel')
-  ).data.dictionary
-}
-source_channelDictList()
-const genderList = ref([] as any[])
-const genderDictList = async () => {
-  genderList.value = await (await useDictionary('zy_sex')).data.dictionary
-}
-genderDictList()
-const purchasing_powerList = ref([] as any[])
-const purchasing_powerDictList = async () => {
-  purchasing_powerList.value = await (
-    await useDictionary('customer_purchasing_power')
-  ).data.dictionary
-}
-purchasing_powerDictList()
-const cognitive_ideaList = ref([] as any[])
-const cognitive_ideaDictList = async () => {
-  cognitive_ideaList.value = await (
-    await useDictionary('cognitive_concept')
-  ).data.dictionary
-}
-cognitive_ideaDictList()
-const initial_intentList = ref([] as any[])
-const initial_intentDictList = async () => {
-  initial_intentList.value = await (
-    await useDictionary('preliminarycustomerintention')
-  ).data.dictionary
-}
-initial_intentDictList()
-const statusList = ref([] as any[])
-const statusDictList = async () => {
-  statusList.value = await (await useDictionary('kh_status')).data.dictionary
-}
-statusDictList()
-
-/**
- * 获取客户资源列表
- */
-const loadCustomerResourcesList = (page: number = 1) => {
-  customerResourcesTable.loading = true
-  customerResourcesTable.page = page
-
-  getCustomerResourcesList({
-    page: customerResourcesTable.page,
-    limit: customerResourcesTable.limit,
-    ...customerResourcesTable.searchParam,
-  })
-    .then((res) => {
-      customerResourcesTable.loading = false
-      customerResourcesTable.data = res.data.data
-      customerResourcesTable.total = res.data.total
-    })
-    .catch(() => {
-      customerResourcesTable.loading = false
-    })
-}
-loadCustomerResourcesList()
-
-const editCustomerResourcesDialog: Record<string, any> | null = ref(null)
-
-const fpCustomerResourcesDialog: Record<string, any> | null = ref(null)
-
-/**
- * 添加客户资源
- */
-const addEvent = () => {
-  editCustomerResourcesDialog.value.setFormData()
-  editCustomerResourcesDialog.value.showDialog = true
-}
-
-/**
- * 编辑客户资源
- * @param data
- */
-const editEvent = (data: any) => {
-  editCustomerResourcesDialog.value.setFormData(data)
-  editCustomerResourcesDialog.value.showDialog = true
-}
-
-const fpEvent = (data: any) => {
-  fpCustomerResourcesDialog.value.setFormData(data)
-  fpCustomerResourcesDialog.value.showDialog = true
-}
-
-/**
- * 删除客户资源
- */
-const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('customerResourcesDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteCustomerResources(id)
-      .then(() => {
-        loadCustomerResourcesList()
-      })
-      .catch(() => {})
-  })
-}
-
-const consultantList = ref([])
-const setConsultantList = async () => {
-  consultantList.value = await (await getWithPersonnelList({})).data
-}
-setConsultantList()
-const campusList = ref([])
-const setCampusList = async () => {
-  campusList.value = await (await getWithCampusList({})).data
-}
-setCampusList()
-
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadCustomerResourcesList()
-}
+	import { reactive, ref, watch } from 'vue'
+	import { t } from '@/lang'
+	import { useDictionary } from '@/app/api/dict'
+	import { getCustomerResourcesList, deleteCustomerResources, getWithPersonnelList, getWithCampusList } from '@/app/api/customer_resources'
+	import { img } from '@/utils/common'
+	import { ElMessageBox, FormInstance } from 'element-plus'
+	import Edit from '@/app/views/customer_resources/components/customer-resources-edit.vue'
+	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 { getMemberLabelAll } from '@/app/api/member'
+
+	import { useRouter, useRoute } from 'vue-router'
+	const route = useRoute()
+	const pageName = route.meta.title;
+	const router = useRouter()
+
+	let customerResourcesTable = reactive({
+		page: 1,
+		limit: 10,
+		total: 0,
+		loading: true,
+		data: [],
+		searchParam: {
+			"name": "",
+			"age": "",
+			"gender": "",
+			"phone_number": "",
+			"member_label" : "",
+			'type': '',
+			"created_at" : "",
+			"updated_at" : ""
+		}
+	})
+
+	if (pageName == '业绩分配') {
+		customerResourcesTable.searchParam.type = 'yjfp';
+	} else if (pageName == '客户资源列表') {
+		customerResourcesTable.searchParam.type = 'khzy';
+	} else if (pageName == '资源列表') {
+		customerResourcesTable.searchParam.type = 'zylb';
+	}
+
+	// const type = pageName == '业绩分配' ? 'yjfp' : 'khzy';
+
+	// 获取全部标签
+	const labelSelectData = ref([])
+	const getMemberLabelAllFn = async () => {
+	  labelSelectData.value = await (await getMemberLabelAll()).data
+	}
+	getMemberLabelAllFn()
+
+
+	const modificationLog = (id : number) => {
+		router.push({ path: '/six_speed_modification_log/six_speed_modification_log', query: { id: id } })
+	}
+
+	const resourceChanges = (id : number) => {
+		router.push({ path: '/customer_resource_changes/customer_resource_changes', query: { id: id } })
+	}
+
+
+	/**
+	 * 添加订单
+	 */
+	const editOrderTableDialog : Record<string, any> | null = ref(null)
+	const addOrder = (row : any) => {
+
+		console.log(row);
+		editOrderTableDialog.value.setFormData(row)
+		editOrderTableDialog.value.showDialog = true
+	}
+
+
+	const TcCustomerResourcesDialog : Record<string, any> | null = ref(null)
+	const tcEvent = (row : any) => {
+		TcCustomerResourcesDialog.value.setFormData(row)
+		TcCustomerResourcesDialog.value.showDialog = true
+	}
+
+
+
+
+	const searchFormRef = ref<FormInstance>()
+
+	// 选中数据
+	const selectData = ref<any[]>([])
+
+	// 字典数据
+	const sourceList = ref([] as any[])
+	const sourceDictList = async () => {
+		sourceList.value = await (await useDictionary('source')).data.dictionary
+	}
+	sourceDictList();
+	const source_channelList = ref([] as any[])
+	const source_channelDictList = async () => {
+		source_channelList.value = await (await useDictionary('SourceChannel')).data.dictionary
+	}
+	source_channelDictList();
+	const genderList = ref([] as any[])
+	const genderDictList = async () => {
+		genderList.value = await (await useDictionary('zy_sex')).data.dictionary
+	}
+	genderDictList();
+	const purchasing_powerList = ref([] as any[])
+	const purchasing_powerDictList = async () => {
+		purchasing_powerList.value = await (await useDictionary('customer_purchasing_power')).data.dictionary
+	}
+	purchasing_powerDictList();
+	const cognitive_ideaList = ref([] as any[])
+	const cognitive_ideaDictList = async () => {
+		cognitive_ideaList.value = await (await useDictionary('cognitive_concept')).data.dictionary
+	}
+	cognitive_ideaDictList();
+	const initial_intentList = ref([] as any[])
+	const initial_intentDictList = async () => {
+		initial_intentList.value = await (await useDictionary('preliminarycustomerintention')).data.dictionary
+	}
+	initial_intentDictList();
+	const statusList = ref([] as any[])
+	const statusDictList = async () => {
+		statusList.value = await (await useDictionary('kh_status')).data.dictionary
+	}
+	statusDictList();
+
+
+	/**
+	 * 获取客户资源列表
+	 */
+	const loadCustomerResourcesList = (page : number = 1) => {
+		customerResourcesTable.loading = true
+		customerResourcesTable.page = page
+
+		getCustomerResourcesList({
+			page: customerResourcesTable.page,
+			limit: customerResourcesTable.limit,
+			...customerResourcesTable.searchParam
+		}).then(res => {
+			customerResourcesTable.loading = false
+			customerResourcesTable.data = res.data.data
+			customerResourcesTable.total = res.data.total
+		}).catch(() => {
+			customerResourcesTable.loading = false
+		})
+	}
+	loadCustomerResourcesList()
+
+	const editCustomerResourcesDialog : Record<string, any> | null = ref(null)
+
+	const fpCustomerResourcesDialog : Record<string, any> | null = ref(null)
+
+	/**
+	 * 添加客户资源
+	 */
+	const addEvent = () => {
+		editCustomerResourcesDialog.value.setFormData()
+		editCustomerResourcesDialog.value.showDialog = true
+	}
+
+	/**
+	 * 编辑客户资源
+	 * @param data
+	 */
+	const editEvent = (data : any) => {
+		editCustomerResourcesDialog.value.setFormData(data)
+		editCustomerResourcesDialog.value.showDialog = true
+	}
+
+	const fpEvent = (data : any) => {
+		fpCustomerResourcesDialog.value.setFormData(data)
+		fpCustomerResourcesDialog.value.showDialog = true
+	}
+
+
+	/**
+	 * 删除客户资源
+	 */
+	const deleteEvent = (id : number) => {
+		ElMessageBox.confirm(t('customerResourcesDeleteTips'), t('warning'),
+			{
+				confirmButtonText: t('confirm'),
+				cancelButtonText: t('cancel'),
+				type: 'warning',
+			}
+		).then(() => {
+			deleteCustomerResources(id).then(() => {
+				loadCustomerResourcesList()
+			}).catch(() => {
+			})
+		})
+	}
+
+
+	const consultantList = ref([])
+	const setConsultantList = async () => {
+		consultantList.value = await (await getWithPersonnelList({})).data
+	}
+	setConsultantList()
+	const campusList = ref([])
+	const setCampusList = async () => {
+		campusList.value = await (await getWithCampusList({})).data
+	}
+	setCampusList()
+
+	const resetForm = (formEl : FormInstance | undefined) => {
+		if (!formEl) return
+		formEl.resetFields()
+		loadCustomerResourcesList()
+	}
 </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>
+	/* 多行超出隐藏 */
+	.multi-hidden {
+		word-break: break-all;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+</style>

admin/src/app/views/departments/departments.vue

@@ -25,7 +25,7 @@
           </el-form-item>
 
           <el-form-item
-            :label="t('parentDepartmentId')"
+            label="上级部门"
             prop="parent_department_id"
           >
             <el-select
@@ -72,7 +72,7 @@
 
           <el-table-column
             prop="parent_department_id_name"
-            :label="t('parentDepartmentId')"
+            label="上级部门"
             min-width="120"
             :show-overflow-tooltip="true"
           />

admin/src/app/views/member/components/edit-member.vue

@@ -47,6 +47,7 @@
           />
         </el-select>
       </el-form-item>
+	  
       <el-form-item :label="t('memberLabel')" v-if="type == 'member_label'">
         <el-select
           v-model="saveData.member_label"
@@ -63,6 +64,8 @@
           />
         </el-select>
       </el-form-item>
+	  
+	  
       <div v-if="type == 'member_level'">
         <el-form-item :label="t('memberLevelUpdate')" prop="member_level">
           <el-select

admin/src/app/views/order_table/components/order-table-edit.vue

@@ -1,126 +1,85 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.id ? t('updateOrderTable') : t('addOrderTable')"
-    width="50%"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('resourceId')" prop="resource_id">
-        <el-select
-          class="input-width"
-          v-model="formData.resource_id"
-          clearable
-          :placeholder="t('resourceIdPlaceholder')"
-        >
-          <el-option label="请选择" value=""></el-option>
-          <el-option
-            v-for="(item, index) in resourceIdList"
-            :key="index"
-            :label="item['name']"
-            :value="item['id']"
-          />
-        </el-select>
-      </el-form-item>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateOrderTable') : t('addOrderTable')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('resourceId')" prop="resource_id">
+                    <el-select class="input-width" v-model="formData.resource_id" clearable :placeholder="t('resourceIdPlaceholder')">
+                       <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in resourceIdList"
+                            :key="index"
+                            :label="item['name']"
+                            :value="item['id']"
+                        />
+                    </el-select>
+                </el-form-item>
+    <!--
+                <el-form-item :label="t('orderStatus')" prop="order_status">
+                    <el-select class="input-width"  v-model="formData.order_status" clearable :placeholder="t('orderStatusPlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in order_statusList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item> -->
 
-      <el-form-item :label="t('orderStatus')" prop="order_status">
-        <el-select
-          class="input-width"
-          v-model="formData.order_status"
-          clearable
-          :placeholder="t('orderStatusPlaceholder')"
-        >
-          <el-option label="请选择" value=""></el-option>
-          <el-option
-            v-for="(item, index) in order_statusList"
-            :key="index"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
+                <el-form-item :label="t('paymentType')" prop="payment_type">
+                    <el-select class="input-width"  v-model="formData.payment_type" clearable :placeholder="t('paymentTypePlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in payment_typeList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
 
-      <el-form-item :label="t('paymentType')" prop="payment_type">
-        <el-select
-          class="input-width"
-          v-model="formData.payment_type"
-          clearable
-          :placeholder="t('paymentTypePlaceholder')"
-        >
-          <el-option label="请选择" value=""></el-option>
-          <el-option
-            v-for="(item, index) in payment_typeList"
-            :key="index"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
+				<el-form-item :label="t('courseId')" prop="course_id">
+				    <el-select class="input-width" v-model="formData.course_id" clearable :placeholder="t('courseIdPlaceholder')"  @change="handleCourseChange">
+				       <el-option label="请选择" value=""></el-option>
+				        <el-option
+				            v-for="(item, index) in courseIdList"
+				            :key="index"
+				            :label="item['course_name']"
+				            :value="item['id']"
+				        />
+				    </el-select>
+				</el-form-item>
 
-      <el-form-item :label="t('orderAmount')" prop="order_amount">
-        <el-input
-          v-model="formData.order_amount"
-          clearable
-          :placeholder="t('orderAmountPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
 
-      <el-form-item :label="t('courseId')" prop="course_id">
-        <el-select
-          class="input-width"
-          v-model="formData.course_id"
-          clearable
-          :placeholder="t('courseIdPlaceholder')"
-        >
-          <el-option label="请选择" value=""></el-option>
-          <el-option
-            v-for="(item, index) in courseIdList"
-            :key="index"
-            :label="item['course_name']"
-            :value="item['id']"
-          />
-        </el-select>
-      </el-form-item>
+                <el-form-item :label="t('orderAmount')" prop="order_amount">
+                    <el-input v-model="formData.order_amount"  :placeholder="t('orderAmountPlaceholder')" class="input-width" disabled/>
+                </el-form-item>
 
-      <el-form-item :label="t('classId')" prop="class_id">
-        <el-select
-          class="input-width"
-          v-model="formData.class_id"
-          clearable
-          :placeholder="t('classIdPlaceholder')"
-        >
-          <el-option label="请选择" value=""></el-option>
-          <el-option
-            v-for="(item, index) in classIdList"
-            :key="index"
-            :label="item['class_name']"
-            :value="item['id']"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
 
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+                
+                <el-form-item :label="t('classId')" prop="class_id">
+                    <el-select class="input-width" v-model="formData.class_id" clearable :placeholder="t('classIdPlaceholder')">
+                       <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in classIdList"
+                            :key="index"
+                            :label="item['class_name']"
+                            :value="item['id']"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -128,30 +87,27 @@ import { ref, reactive, computed, watch } from 'vue'
 import { useDictionary } from '@/app/api/dict'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import {
-  addOrderTable,
-  editOrderTable,
-  getOrderTableInfo,
-  getWithCustomerResourcesList,
-  getWithCourseList,
-  getWithClassGradeList,
-  getWithPersonnelList,
-} from '@/app/api/order_table'
+import { addOrderTable, editOrderTable, getOrderTableInfo, getWithCustomerResourcesList, getWithCourseList, getWithClassGradeList, getWithPersonnelList } from '@/app/api/order_table'
 
 let showDialog = ref(false)
 const loading = ref(false)
 
+function handleCourseChange(selectedId) {
+  const selectedCourse = courseIdList.value.find(item => item.id === selectedId)
+  formData.order_amount = selectedCourse ? selectedCourse.price : ''
+}
 /**
  * 表单数据
  */
 const initialFormData = {
-  id: '',
-  resource_id: '',
-  order_status: '',
-  payment_type: '',
-  order_amount: '',
-  course_id: '',
-  class_id: '',
+    id: '',
+    resource_id: '',
+    // order_status: '',
+    payment_type: '',
+    order_amount: '',
+    course_id: '',
+    class_id: '',
+
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -159,26 +115,33 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = computed(() => {
-  return {
+    return {
     resource_id: [
-      { required: true, message: t('resourceIdPlaceholder'), trigger: 'blur' },
-    ],
-    order_status: [
-      { required: true, message: t('orderStatusPlaceholder'), trigger: 'blur' },
-    ],
+        { required: true, message: t('resourceIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
     payment_type: [
-      { required: true, message: t('paymentTypePlaceholder'), trigger: 'blur' },
-    ],
+        { required: true, message: t('paymentTypePlaceholder'), trigger: 'blur' },
+        
+    ]
+,
     order_amount: [
-      { required: true, message: t('orderAmountPlaceholder'), trigger: 'blur' },
-    ],
+        { required: true, message: t('orderAmountPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
     course_id: [
-      { required: true, message: t('courseIdPlaceholder'), trigger: 'blur' },
-    ],
+        { required: true, message: t('courseIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
     class_id: [
-      { required: true, message: t('classIdPlaceholder'), trigger: 'blur' },
-    ],
-  }
+        { required: true, message: t('classIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    }
 })
 
 const emit = defineEmits(['complete'])
@@ -188,141 +151,122 @@ const emit = defineEmits(['complete'])
  * @param formEl
  */
 const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  let save = formData.id ? editOrderTable : addOrderTable
+    if (loading.value || !formEl) return
+    let save = formData.id ? editOrderTable : addOrderTable
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
 
-      let data = formData
+            let data = formData
 
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
 }
 
 // 获取字典数据
-let order_statusList = ref([])
-const order_statusDictList = async () => {
-  order_statusList.value = await (
-    await useDictionary('order_status')
-  ).data.dictionary
-}
-order_statusDictList()
-watch(
-  () => order_statusList.value,
-  () => {
-    formData.order_status = order_statusList.value[0].value
-  }
-)
-let payment_typeList = ref([])
-const payment_typeDictList = async () => {
-  payment_typeList.value = await (
-    await useDictionary('payment_type')
-  ).data.dictionary
-}
-payment_typeDictList()
-watch(
-  () => payment_typeList.value,
-  () => {
-    formData.payment_type = payment_typeList.value[0].value
-  }
-)
+    // let order_statusList = ref([])
+    // const order_statusDictList = async () => {
+    // order_statusList.value = await (await useDictionary('order_status')).data.dictionary
+    // }
+    // order_statusDictList();
+    // watch(() => order_statusList.value, () => { formData.order_status = order_statusList.value[0].value })
+    let payment_typeList = ref([])
+    const payment_typeDictList = async () => {
+    payment_typeList.value = await (await useDictionary('payment_type')).data.dictionary
+    }
+    payment_typeDictList();
+    watch(() => payment_typeList.value, () => { formData.payment_type = payment_typeList.value[0].value })
 
-const resourceIdList = ref([] as any[])
-const setResourceIdList = async () => {
-  resourceIdList.value = await (await getWithCustomerResourcesList({})).data
-}
-setResourceIdList()
-const courseIdList = ref([] as any[])
-const setCourseIdList = async () => {
-  courseIdList.value = await (await getWithCourseList({})).data
-}
-setCourseIdList()
-const classIdList = ref([] as any[])
-const setClassIdList = async () => {
-  classIdList.value = await (await getWithClassGradeList({})).data
-}
-setClassIdList()
-const staffIdList = ref([] as any[])
-const setStaffIdList = async () => {
-  staffIdList.value = await (await getWithPersonnelList({})).data
-}
-setStaffIdList()
+
+    
+    const resourceIdList = ref([] as any[])
+    const setResourceIdList = async () => {
+    resourceIdList.value = await (await getWithCustomerResourcesList({})).data
+    }
+    setResourceIdList()
+    const courseIdList = ref([] as any[])
+    const setCourseIdList = async () => {
+    courseIdList.value = await (await getWithCourseList({})).data
+    }
+    setCourseIdList()
+    const classIdList = ref([] as any[])
+    const setClassIdList = async () => {
+    classIdList.value = await (await getWithClassGradeList({})).data
+    }
+    setClassIdList()
+    const staffIdList = ref([] as any[])
+    const setStaffIdList = async () => {
+    staffIdList.value = await (await getWithPersonnelList({})).data
+    }
+    setStaffIdList()
 const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  Object.assign(formData, row)
-  // formData.resource_id = row.resource_id;
-  // console.log(0)
-  // loading.value = true
-  // if(row){
-  //     const data = await (await getOrderTableInfo(row.id)).data
-  //     if (data) Object.keys(formData).forEach((key: string) => {
-  //         if (data[key] != undefined) formData[key] = data[key]
-  //     })
-  // }
-  // loading.value = false
+    Object.assign(formData, initialFormData)
+	Object.assign(formData, row)
+	// formData.resource_id = row.resource_id;
+	// console.log(0)
+    // loading.value = true
+    // if(row){
+    //     const data = await (await getOrderTableInfo(row.id)).data
+    //     if (data) Object.keys(formData).forEach((key: string) => {
+    //         if (data[key] != undefined) formData[key] = data[key]
+    //     })
+    // }
+    // loading.value = false
 }
 
 // 验证手机号格式
 const mobileVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^1[3-9]\d{9}$/.test(value)) {
-    callback(new Error(t('generateMobile')))
-  } else {
-    callback()
-  }
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
 }
 
 // 验证身份证号
 const idCardVerify = (rule: any, value: any, callback: any) => {
-  if (
-    value &&
-    !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
-      value
-    )
-  ) {
-    callback(new Error(t('generateIdCard')))
-  } else {
-    callback()
-  }
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
 }
 
 // 验证邮箱号
 const emailVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
-    callback(new Error(t('generateEmail')))
-  } else {
-    callback()
-  }
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
 }
 
 // 验证请输入整数
 const numberVerify = (rule: any, value: any, callback: any) => {
-  if (!Number.isInteger(value)) {
-    callback(new Error(t('generateNumber')))
-  } else {
-    callback()
-  }
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
 }
 
 defineExpose({
-  showDialog,
-  setFormData,
+    showDialog,
+    setFormData
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
 }
 </style>

admin/src/app/views/reimbursement/components/reimbursement-edit.vue

@@ -1,236 +1,209 @@
-<template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.id ? t('updateReimbursement') : t('addReimbursement')"
-    width="50%"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('applicantId')" prop="applicant_id">
-        <el-input
-          v-model="formData.applicant_id"
-          clearable
-          :placeholder="t('applicantIdPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('amount')" prop="amount">
-        <el-input
-          v-model="formData.amount"
-          clearable
-          :placeholder="t('amountPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('description')" prop="description">
-        <el-input
-          v-model="formData.description"
-          clearable
-          :placeholder="t('descriptionPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('receiptUrl')">
-        <el-input
-          v-model="formData.receipt_url"
-          clearable
-          :placeholder="t('receiptUrlPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('status')" prop="status">
-        <el-input
-          v-model="formData.status"
-          clearable
-          :placeholder="t('statusPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('processId')" prop="process_id">
-        <el-input
-          v-model="formData.process_id"
-          clearable
-          :placeholder="t('processIdPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, computed, watch } from 'vue'
-import { useDictionary } from '@/app/api/dict'
-import { t } from '@/lang'
-import type { FormInstance } from 'element-plus'
-import {
-  addReimbursement,
-  editReimbursement,
-  getReimbursementInfo,
-} from '@/app/api/reimbursement'
-
-let showDialog = ref(false)
-const loading = ref(false)
-
-/**
- * 表单数据
- */
-const initialFormData = {
-  id: '',
-  applicant_id: '',
-  amount: '',
-  description: '',
-  receipt_url: '',
-  status: '',
-  process_id: '',
-}
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-  return {
-    applicant_id: [
-      { required: true, message: t('applicantIdPlaceholder'), trigger: 'blur' },
-    ],
-    amount: [
-      { required: true, message: t('amountPlaceholder'), trigger: 'blur' },
-    ],
-    description: [
-      { required: true, message: t('descriptionPlaceholder'), trigger: 'blur' },
-    ],
-    receipt_url: [
-      { required: true, message: t('receiptUrlPlaceholder'), trigger: 'blur' },
-    ],
-    status: [
-      { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
-    ],
-    process_id: [
-      { required: true, message: t('processIdPlaceholder'), trigger: 'blur' },
-    ],
-  }
-})
-
-const emit = defineEmits(['complete'])
-
-/**
- * 确认
- * @param formEl
- */
-const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  let save = formData.id ? editReimbursement : addReimbursement
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      let data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
-}
-
-// 获取字典数据
-
-const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getReimbursementInfo(row.id)).data
-    if (data)
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
-  }
-  loading.value = false
-}
-
-// 验证手机号格式
-const mobileVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^1[3-9]\d{9}$/.test(value)) {
-    callback(new Error(t('generateMobile')))
-  } else {
-    callback()
-  }
-}
-
-// 验证身份证号
-const idCardVerify = (rule: any, value: any, callback: any) => {
-  if (
-    value &&
-    !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
-      value
-    )
-  ) {
-    callback(new Error(t('generateIdCard')))
-  } else {
-    callback()
-  }
-}
-
-// 验证邮箱号
-const emailVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
-    callback(new Error(t('generateEmail')))
-  } else {
-    callback()
-  }
-}
-
-// 验证请输入整数
-const numberVerify = (rule: any, value: any, callback: any) => {
-  if (!Number.isInteger(value)) {
-    callback(new Error(t('generateNumber')))
-  } else {
-    callback()
-  }
-}
-
-defineExpose({
-  showDialog,
-  setFormData,
-})
-</script>
-
-<style lang="scss" scoped></style>
-<style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
-}
-</style>
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateReimbursement') : t('addReimbursement')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('applicantId')" prop="applicant_id">
+                    <el-select class="input-width" v-model="formData.applicant_id" clearable :placeholder="t('applicantIdPlaceholder')">
+                       <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in applicantIdList"
+                            :key="index"
+                            :label="item['name']"
+                            :value="item['id']"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('amount')" prop="amount">
+                    <el-input v-model="formData.amount" clearable :placeholder="t('amountPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('description')" prop="description">
+                    <el-input v-model="formData.description" clearable :placeholder="t('descriptionPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('receiptUrl')">
+                    <upload-file v-model="formData.receipt_url" />
+                </el-form-item>
+                
+                <el-form-item :label="t('status')" prop="status">
+                    <el-select class="input-width"  v-model="formData.status" clearable :placeholder="t('statusPlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in statusList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addReimbursement, editReimbursement, getReimbursementInfo, getWithPersonnelList } from '@/app/api/reimbursement'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    applicant_id: '',
+    amount: '',
+    description: '',
+    receipt_url: '',
+    status: '',
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    applicant_id: [
+        { required: true, message: t('applicantIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    amount: [
+        { required: true, message: t('amountPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    description: [
+        { required: true, message: t('descriptionPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    receipt_url: [
+        { required: true, message: t('receiptUrlPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editReimbursement : addReimbursement
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('sp_status')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+    
+    const applicantIdList = ref([] as any[])
+    const setApplicantIdList = async () => {
+    applicantIdList.value = await (await getWithPersonnelList({})).data
+    }
+    setApplicantIdList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getReimbursementInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>

admin/src/app/views/reimbursement/reimbursement.vue

@@ -1,265 +1,200 @@
-<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>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addReimbursement') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="reimbursementTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('applicantId')" prop="applicant_id">
-            <el-input
-              v-model="reimbursementTable.searchParam.applicant_id"
-              :placeholder="t('applicantIdPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('amount')" prop="amount">
-            <el-input
-              v-model="reimbursementTable.searchParam.amount"
-              :placeholder="t('amountPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('description')" prop="description">
-            <el-input
-              v-model="reimbursementTable.searchParam.description"
-              :placeholder="t('descriptionPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('receiptUrl')" prop="receipt_url">
-            <el-input
-              v-model="reimbursementTable.searchParam.receipt_url"
-              :placeholder="t('receiptUrlPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('status')" prop="status">
-            <el-input
-              v-model="reimbursementTable.searchParam.status"
-              :placeholder="t('statusPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('processId')" prop="process_id">
-            <el-input
-              v-model="reimbursementTable.searchParam.process_id"
-              :placeholder="t('processIdPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadReimbursementList()">{{
-              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="reimbursementTable.data"
-          size="large"
-          v-loading="reimbursementTable.loading"
-        >
-          <template #empty>
-            <span>{{ !reimbursementTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="applicant_id"
-            :label="t('applicantId')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="amount"
-            :label="t('amount')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="description"
-            :label="t('description')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="receipt_url"
-            :label="t('receiptUrl')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="status"
-            :label="t('status')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="process_id"
-            :label="t('processId')"
-            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>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="reimbursementTable.page"
-            v-model:page-size="reimbursementTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="reimbursementTable.total"
-            @size-change="loadReimbursementList()"
-            @current-change="loadReimbursementList"
-          />
-        </div>
-      </div>
-
-      <edit ref="editReimbursementDialog" @complete="loadReimbursementList" />
-    </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 {
-  getReimbursementList,
-  deleteReimbursement,
-} from '@/app/api/reimbursement'
-import { img } from '@/utils/common'
-import { ElMessageBox, FormInstance } from 'element-plus'
-import Edit from '@/app/views/reimbursement/components/reimbursement-edit.vue'
-import { useRoute } from 'vue-router'
-const route = useRoute()
-const pageName = route.meta.title
-
-let reimbursementTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    applicant_id: '',
-    amount: '',
-    description: '',
-    receipt_url: '',
-    status: '',
-    process_id: '',
-  },
-})
-
-const searchFormRef = ref<FormInstance>()
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 字典数据
-
-/**
- * 获取报销记录列表
- */
-const loadReimbursementList = (page: number = 1) => {
-  reimbursementTable.loading = true
-  reimbursementTable.page = page
-
-  getReimbursementList({
-    page: reimbursementTable.page,
-    limit: reimbursementTable.limit,
-    ...reimbursementTable.searchParam,
-  })
-    .then((res) => {
-      reimbursementTable.loading = false
-      reimbursementTable.data = res.data.data
-      reimbursementTable.total = res.data.total
-    })
-    .catch(() => {
-      reimbursementTable.loading = false
-    })
-}
-loadReimbursementList()
-
-const editReimbursementDialog: Record<string, any> | null = ref(null)
-
-/**
- * 添加报销记录
- */
-const addEvent = () => {
-  editReimbursementDialog.value.setFormData()
-  editReimbursementDialog.value.showDialog = true
-}
-
-/**
- * 编辑报销记录
- * @param data
- */
-const editEvent = (data: any) => {
-  editReimbursementDialog.value.setFormData(data)
-  editReimbursementDialog.value.showDialog = true
-}
-
-/**
- * 删除报销记录
- */
-const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('reimbursementDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteReimbursement(id)
-      .then(() => {
-        loadReimbursementList()
-      })
-      .catch(() => {})
-  })
-}
-
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadReimbursementList()
-}
-</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>
+<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>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addReimbursement') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="reimbursementTable.searchParam" ref="searchFormRef">
+                    
+                    <el-form-item :label="t('status')" prop="status">
+                        <el-select class="w-[280px]" v-model="reimbursementTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option
+                                v-for="(item, index) in statusList"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    
+                    <el-form-item :label="t('createdAt')" prop="created_at">
+                        <el-date-picker v-model="reimbursementTable.searchParam.created_at" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                            :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    
+                    <el-form-item>
+                        <el-button type="primary" @click="loadReimbursementList()">{{ 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="reimbursementTable.data" size="large" v-loading="reimbursementTable.loading">
+                    <template #empty>
+                        <span>{{ !reimbursementTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="applicant_id_name" :label="t('applicantId')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="amount" :label="t('amount')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="description" :label="t('description')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div v-for="(item, index) in statusList">
+                                <div v-if="item.value == row.status">{{ item.name }}</div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column prop="created_at" :label="t('createdAt')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="updated_at" :label="t('updatedAt')" 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>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="reimbursementTable.page" v-model:page-size="reimbursementTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="reimbursementTable.total"
+                        @size-change="loadReimbursementList()" @current-change="loadReimbursementList" />
+                </div>
+            </div>
+
+            <edit ref="editReimbursementDialog" @complete="loadReimbursementList" />
+        </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 { getReimbursementList, deleteReimbursement, getWithPersonnelList } from '@/app/api/reimbursement'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/reimbursement/components/reimbursement-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+
+let reimbursementTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      "status":"",
+      "created_at":[]
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+    const statusList = ref([] as any[])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('sp_status')).data.dictionary
+    }
+    statusDictList();
+
+/**
+ * 获取报销记录列表
+ */
+const loadReimbursementList = (page: number = 1) => {
+    reimbursementTable.loading = true
+    reimbursementTable.page = page
+
+    getReimbursementList({
+        page: reimbursementTable.page,
+        limit: reimbursementTable.limit,
+         ...reimbursementTable.searchParam
+    }).then(res => {
+        reimbursementTable.loading = false
+        reimbursementTable.data = res.data.data
+        reimbursementTable.total = res.data.total
+    }).catch(() => {
+        reimbursementTable.loading = false
+    })
+}
+loadReimbursementList()
+
+const editReimbursementDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 添加报销记录
+ */
+const addEvent = () => {
+    editReimbursementDialog.value.setFormData()
+    editReimbursementDialog.value.showDialog = true
+}
+
+/**
+ * 编辑报销记录
+ * @param data
+ */
+const editEvent = (data: any) => {
+    editReimbursementDialog.value.setFormData(data)
+    editReimbursementDialog.value.showDialog = true
+}
+
+/**
+ * 删除报销记录
+ */
+const deleteEvent = (id: number) => {
+    ElMessageBox.confirm(t('reimbursementDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteReimbursement(id).then(() => {
+            loadReimbursementList()
+        }).catch(() => {
+        })
+    })
+}
+
+    
+    const applicantIdList = ref([])
+    const setApplicantIdList = async () => {
+    applicantIdList.value = await (await getWithPersonnelList({})).data
+    }
+    setApplicantIdList()
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadReimbursementList()
+}
+</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>

admin/src/app/views/salary/components/salary-edit.vue

@@ -1,330 +1,291 @@
-<template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.id ? t('updateSalary') : t('addSalary')"
-    width="50%"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('staffId')" prop="staff_id">
-        <el-input
-          v-model="formData.staff_id"
-          clearable
-          :placeholder="t('staffIdPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('baseSalary')" prop="base_salary">
-        <el-input
-          v-model="formData.base_salary"
-          clearable
-          :placeholder="t('baseSalaryPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('performanceBonus')" prop="performance_bonus">
-        <el-input
-          v-model="formData.performance_bonus"
-          clearable
-          :placeholder="t('performanceBonusPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('deductions')" prop="deductions">
-        <el-input
-          v-model="formData.deductions"
-          clearable
-          :placeholder="t('deductionsPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('otherSubsidies')">
-        <el-input
-          v-model="formData.other_subsidies"
-          clearable
-          :placeholder="t('otherSubsidiesPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('netSalary')">
-        <el-input
-          v-model="formData.net_salary"
-          clearable
-          :placeholder="t('netSalaryPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('paymentStatus')" prop="payment_status">
-        <el-input
-          v-model="formData.payment_status"
-          clearable
-          :placeholder="t('paymentStatusPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('paymentMethod')">
-        <el-input
-          v-model="formData.payment_method"
-          clearable
-          :placeholder="t('paymentMethodPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('remarks')">
-        <el-input
-          v-model="formData.remarks"
-          clearable
-          :placeholder="t('remarksPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('salaryMonth')" prop="salary_month">
-        <el-input
-          v-model="formData.salary_month"
-          clearable
-          :placeholder="t('salaryMonthPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('departmentId')">
-        <el-input
-          v-model="formData.department_id"
-          clearable
-          :placeholder="t('departmentIdPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('processId')">
-        <el-input
-          v-model="formData.process_id"
-          clearable
-          :placeholder="t('processIdPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, computed, watch } from 'vue'
-import { useDictionary } from '@/app/api/dict'
-import { t } from '@/lang'
-import type { FormInstance } from 'element-plus'
-import { addSalary, editSalary, getSalaryInfo } from '@/app/api/salary'
-
-let showDialog = ref(false)
-const loading = ref(false)
-
-/**
- * 表单数据
- */
-const initialFormData = {
-  id: '',
-  staff_id: '',
-  base_salary: '',
-  performance_bonus: '',
-  deductions: '',
-  other_subsidies: '',
-  net_salary: '',
-  payment_status: '',
-  payment_method: '',
-  remarks: '',
-  salary_month: '',
-  department_id: '',
-  process_id: '',
-}
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-  return {
-    staff_id: [
-      { required: true, message: t('staffIdPlaceholder'), trigger: 'blur' },
-    ],
-    base_salary: [
-      { required: true, message: t('baseSalaryPlaceholder'), trigger: 'blur' },
-    ],
-    performance_bonus: [
-      {
-        required: true,
-        message: t('performanceBonusPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    deductions: [
-      { required: true, message: t('deductionsPlaceholder'), trigger: 'blur' },
-    ],
-    other_subsidies: [
-      {
-        required: true,
-        message: t('otherSubsidiesPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    net_salary: [
-      { required: true, message: t('netSalaryPlaceholder'), trigger: 'blur' },
-    ],
-    payment_status: [
-      {
-        required: true,
-        message: t('paymentStatusPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    payment_method: [
-      {
-        required: true,
-        message: t('paymentMethodPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    remarks: [
-      { required: true, message: t('remarksPlaceholder'), trigger: 'blur' },
-    ],
-    salary_month: [
-      { required: true, message: t('salaryMonthPlaceholder'), trigger: 'blur' },
-    ],
-    department_id: [
-      {
-        required: true,
-        message: t('departmentIdPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    process_id: [
-      { required: true, message: t('processIdPlaceholder'), trigger: 'blur' },
-    ],
-  }
-})
-
-const emit = defineEmits(['complete'])
-
-/**
- * 确认
- * @param formEl
- */
-const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  let save = formData.id ? editSalary : addSalary
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      let data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
-}
-
-// 获取字典数据
-
-const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getSalaryInfo(row.id)).data
-    if (data)
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
-  }
-  loading.value = false
-}
-
-// 验证手机号格式
-const mobileVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^1[3-9]\d{9}$/.test(value)) {
-    callback(new Error(t('generateMobile')))
-  } else {
-    callback()
-  }
-}
-
-// 验证身份证号
-const idCardVerify = (rule: any, value: any, callback: any) => {
-  if (
-    value &&
-    !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
-      value
-    )
-  ) {
-    callback(new Error(t('generateIdCard')))
-  } else {
-    callback()
-  }
-}
-
-// 验证邮箱号
-const emailVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
-    callback(new Error(t('generateEmail')))
-  } else {
-    callback()
-  }
-}
-
-// 验证请输入整数
-const numberVerify = (rule: any, value: any, callback: any) => {
-  if (!Number.isInteger(value)) {
-    callback(new Error(t('generateNumber')))
-  } else {
-    callback()
-  }
-}
-
-defineExpose({
-  showDialog,
-  setFormData,
-})
-</script>
-
-<style lang="scss" scoped></style>
-<style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
-}
-</style>
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateSalary') : t('addSalary')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('staffId')" prop="staff_id">
+                    <el-select class="input-width" v-model="formData.staff_id" clearable :placeholder="t('staffIdPlaceholder')">
+                       <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in staffIdList"
+                            :key="index"
+                            :label="item['name']"
+                            :value="item['id']"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('departmentId')" prop="department_id">
+                    <el-select class="input-width" v-model="formData.department_id" clearable :placeholder="t('departmentIdPlaceholder')">
+                       <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in departmentIdList"
+                            :key="index"
+                            :label="item['department_name']"
+                            :value="item['id']"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('baseSalary')" prop="base_salary">
+                    <el-input v-model="formData.base_salary" clearable :placeholder="t('baseSalaryPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('performanceBonus')" prop="performance_bonus">
+                    <el-input v-model="formData.performance_bonus" clearable :placeholder="t('performanceBonusPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('deductions')" prop="deductions">
+                    <el-input v-model="formData.deductions" clearable :placeholder="t('deductionsPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('otherSubsidies')" prop="other_subsidies">
+                    <el-input v-model="formData.other_subsidies" clearable :placeholder="t('otherSubsidiesPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('paymentStatus')" prop="payment_status">
+                    <el-select class="input-width"  v-model="formData.payment_status" clearable :placeholder="t('paymentStatusPlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in payment_statusList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('paymentMethod')" prop="payment_method">
+                    <el-select class="input-width"  v-model="formData.payment_method" clearable :placeholder="t('paymentMethodPlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in payment_methodList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('remarks')" >
+                    <el-input v-model="formData.remarks" type="textarea" rows="4" clearable :placeholder="t('remarksPlaceholder')" class="input-width"/>
+                </el-form-item>
+                <el-form-item :label="t('salaryMonth')" prop="salary_month" class="input-width">
+                    <el-date-picker 
+                        class="flex-1 !flex"
+                        v-model="formData.salary_month"
+                        clearable
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        :placeholder="t('salaryMonthPlaceholder')">
+                    </el-date-picker>
+                </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addSalary, editSalary, getSalaryInfo, getWithPersonnelList, getWithDepartmentsList } from '@/app/api/salary'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    staff_id: '',
+    department_id: '',
+    base_salary: '',
+    performance_bonus: '',
+    deductions: '',
+    other_subsidies: '',
+    payment_status: '',
+    payment_method: '',
+    remarks: '',
+    salary_month: '',
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    staff_id: [
+        { required: true, message: t('staffIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    department_id: [
+        { required: true, message: t('departmentIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    base_salary: [
+        { required: true, message: t('baseSalaryPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    performance_bonus: [
+        { required: true, message: t('performanceBonusPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    deductions: [
+        { required: true, message: t('deductionsPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    other_subsidies: [
+        { required: true, message: t('otherSubsidiesPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    payment_status: [
+        { required: true, message: t('paymentStatusPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    payment_method: [
+        { required: true, message: t('paymentMethodPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    remarks: [
+        { required: true, message: t('remarksPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    salary_month: [
+        { required: true, message: t('salaryMonthPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editSalary : addSalary
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let payment_statusList = ref([])
+    const payment_statusDictList = async () => {
+    payment_statusList.value = await (await useDictionary('payment_status')).data.dictionary
+    }
+    payment_statusDictList();
+    watch(() => payment_statusList.value, () => { formData.payment_status = payment_statusList.value[0].value })
+    let payment_methodList = ref([])
+    const payment_methodDictList = async () => {
+    payment_methodList.value = await (await useDictionary('payment_method')).data.dictionary
+    }
+    payment_methodDictList();
+    watch(() => payment_methodList.value, () => { formData.payment_method = payment_methodList.value[0].value })
+
+    
+    const staffIdList = ref([] as any[])
+    const setStaffIdList = async () => {
+    staffIdList.value = await (await getWithPersonnelList({})).data
+    }
+    setStaffIdList()
+    const departmentIdList = ref([] as any[])
+    const setDepartmentIdList = async () => {
+    departmentIdList.value = await (await getWithDepartmentsList({})).data
+    }
+    setDepartmentIdList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getSalaryInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>

admin/src/app/views/salary/salary.vue

@@ -1,346 +1,246 @@
-<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>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addSalary') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="salaryTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('staffId')" prop="staff_id">
-            <el-input
-              v-model="salaryTable.searchParam.staff_id"
-              :placeholder="t('staffIdPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('baseSalary')" prop="base_salary">
-            <el-input
-              v-model="salaryTable.searchParam.base_salary"
-              :placeholder="t('baseSalaryPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('performanceBonus')" prop="performance_bonus">
-            <el-input
-              v-model="salaryTable.searchParam.performance_bonus"
-              :placeholder="t('performanceBonusPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('deductions')" prop="deductions">
-            <el-input
-              v-model="salaryTable.searchParam.deductions"
-              :placeholder="t('deductionsPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('otherSubsidies')" prop="other_subsidies">
-            <el-input
-              v-model="salaryTable.searchParam.other_subsidies"
-              :placeholder="t('otherSubsidiesPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('netSalary')" prop="net_salary">
-            <el-input
-              v-model="salaryTable.searchParam.net_salary"
-              :placeholder="t('netSalaryPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('paymentStatus')" prop="payment_status">
-            <el-input
-              v-model="salaryTable.searchParam.payment_status"
-              :placeholder="t('paymentStatusPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('paymentMethod')" prop="payment_method">
-            <el-input
-              v-model="salaryTable.searchParam.payment_method"
-              :placeholder="t('paymentMethodPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('remarks')" prop="remarks">
-            <el-input
-              v-model="salaryTable.searchParam.remarks"
-              :placeholder="t('remarksPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('salaryMonth')" prop="salary_month">
-            <el-input
-              v-model="salaryTable.searchParam.salary_month"
-              :placeholder="t('salaryMonthPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('departmentId')" prop="department_id">
-            <el-input
-              v-model="salaryTable.searchParam.department_id"
-              :placeholder="t('departmentIdPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('processId')" prop="process_id">
-            <el-input
-              v-model="salaryTable.searchParam.process_id"
-              :placeholder="t('processIdPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadSalaryList()">{{
-              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="salaryTable.data"
-          size="large"
-          v-loading="salaryTable.loading"
-        >
-          <template #empty>
-            <span>{{ !salaryTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="staff_id"
-            :label="t('staffId')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="base_salary"
-            :label="t('baseSalary')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="performance_bonus"
-            :label="t('performanceBonus')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="deductions"
-            :label="t('deductions')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="other_subsidies"
-            :label="t('otherSubsidies')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="net_salary"
-            :label="t('netSalary')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="payment_status"
-            :label="t('paymentStatus')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="payment_method"
-            :label="t('paymentMethod')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="remarks"
-            :label="t('remarks')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="salary_month"
-            :label="t('salaryMonth')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="department_id"
-            :label="t('departmentId')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="process_id"
-            :label="t('processId')"
-            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>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="salaryTable.page"
-            v-model:page-size="salaryTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="salaryTable.total"
-            @size-change="loadSalaryList()"
-            @current-change="loadSalaryList"
-          />
-        </div>
-      </div>
-
-      <edit ref="editSalaryDialog" @complete="loadSalaryList" />
-    </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 { getSalaryList, deleteSalary } from '@/app/api/salary'
-import { img } from '@/utils/common'
-import { ElMessageBox, FormInstance } from 'element-plus'
-import Edit from '@/app/views/salary/components/salary-edit.vue'
-import { useRoute } from 'vue-router'
-const route = useRoute()
-const pageName = route.meta.title
-
-let salaryTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    staff_id: '',
-    base_salary: '',
-    performance_bonus: '',
-    deductions: '',
-    other_subsidies: '',
-    net_salary: '',
-    payment_status: '',
-    payment_method: '',
-    remarks: '',
-    salary_month: '',
-    department_id: '',
-    process_id: '',
-  },
-})
-
-const searchFormRef = ref<FormInstance>()
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 字典数据
-
-/**
- * 获取工资列表
- */
-const loadSalaryList = (page: number = 1) => {
-  salaryTable.loading = true
-  salaryTable.page = page
-
-  getSalaryList({
-    page: salaryTable.page,
-    limit: salaryTable.limit,
-    ...salaryTable.searchParam,
-  })
-    .then((res) => {
-      salaryTable.loading = false
-      salaryTable.data = res.data.data
-      salaryTable.total = res.data.total
-    })
-    .catch(() => {
-      salaryTable.loading = false
-    })
-}
-loadSalaryList()
-
-const editSalaryDialog: Record<string, any> | null = ref(null)
-
-/**
- * 添加工资
- */
-const addEvent = () => {
-  editSalaryDialog.value.setFormData()
-  editSalaryDialog.value.showDialog = true
-}
-
-/**
- * 编辑工资
- * @param data
- */
-const editEvent = (data: any) => {
-  editSalaryDialog.value.setFormData(data)
-  editSalaryDialog.value.showDialog = true
-}
-
-/**
- * 删除工资
- */
-const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('salaryDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteSalary(id)
-      .then(() => {
-        loadSalaryList()
-      })
-      .catch(() => {})
-  })
-}
-
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadSalaryList()
-}
-</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>
+<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>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addSalary') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="salaryTable.searchParam" ref="searchFormRef">
+                    
+                    <el-form-item :label="t('staffId')" prop="staff_id">
+                        <el-select class="w-[280px]" v-model="salaryTable.searchParam.staff_id" clearable :placeholder="t('staffIdPlaceholder')">
+                           <el-option
+                                       v-for="(item, index) in staffIdList"
+                                       :key="index"
+                                       :label="item['name']"
+                                       :value="item['id']"
+                                   />
+                        </el-select>
+                    </el-form-item>
+                    
+                    
+                    <el-form-item :label="t('departmentId')" prop="department_id">
+                        <el-select class="w-[280px]" v-model="salaryTable.searchParam.department_id" clearable :placeholder="t('departmentIdPlaceholder')">
+                           <el-option
+                                       v-for="(item, index) in departmentIdList"
+                                       :key="index"
+                                       :label="item['department_name']"
+                                       :value="item['id']"
+                                   />
+                        </el-select>
+                    </el-form-item>
+                    
+                    
+                    <el-form-item :label="t('paymentStatus')" prop="payment_status">
+                        <el-select class="w-[280px]" v-model="salaryTable.searchParam.payment_status" clearable :placeholder="t('paymentStatusPlaceholder')">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option
+                                v-for="(item, index) in payment_statusList"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    
+                    <el-form-item :label="t('createdAt')" prop="created_at">
+                        <el-date-picker v-model="salaryTable.searchParam.created_at" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                            :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    
+                    <el-form-item>
+                        <el-button type="primary" @click="loadSalaryList()">{{ 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="salaryTable.data" size="large" v-loading="salaryTable.loading">
+                    <template #empty>
+                        <span>{{ !salaryTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="staff_id_name" :label="t('staffId')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="department_id_name" :label="t('departmentId')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="net_salary" :label="t('netSalary')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column :label="t('paymentStatus')" min-width="180" align="center" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div v-for="(item, index) in payment_statusList">
+                                <div v-if="item.value == row.payment_status">{{ item.name }}</div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column :label="t('paymentMethod')" min-width="180" align="center" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div v-for="(item, index) in payment_methodList">
+                                <div v-if="item.value == row.payment_method">{{ item.name }}</div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column prop="salary_month" :label="t('salaryMonth')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="created_at" :label="t('createdAt')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="updated_at" :label="t('updatedAt')" 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>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="salaryTable.page" v-model:page-size="salaryTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="salaryTable.total"
+                        @size-change="loadSalaryList()" @current-change="loadSalaryList" />
+                </div>
+            </div>
+
+            <edit ref="editSalaryDialog" @complete="loadSalaryList" />
+        </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 { getSalaryList, deleteSalary, getWithPersonnelList, getWithDepartmentsList } from '@/app/api/salary'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/salary/components/salary-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+
+let salaryTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      "staff_id":"",
+      "department_id":"",
+      "payment_status":"",
+      "created_at":[]
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+    const payment_statusList = ref([] as any[])
+    const payment_statusDictList = async () => {
+    payment_statusList.value = await (await useDictionary('payment_status')).data.dictionary
+    }
+    payment_statusDictList();
+    const payment_methodList = ref([] as any[])
+    const payment_methodDictList = async () => {
+    payment_methodList.value = await (await useDictionary('payment_method')).data.dictionary
+    }
+    payment_methodDictList();
+
+/**
+ * 获取工资列表
+ */
+const loadSalaryList = (page: number = 1) => {
+    salaryTable.loading = true
+    salaryTable.page = page
+
+    getSalaryList({
+        page: salaryTable.page,
+        limit: salaryTable.limit,
+         ...salaryTable.searchParam
+    }).then(res => {
+        salaryTable.loading = false
+        salaryTable.data = res.data.data
+        salaryTable.total = res.data.total
+    }).catch(() => {
+        salaryTable.loading = false
+    })
+}
+loadSalaryList()
+
+const editSalaryDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 添加工资
+ */
+const addEvent = () => {
+    editSalaryDialog.value.setFormData()
+    editSalaryDialog.value.showDialog = true
+}
+
+/**
+ * 编辑工资
+ * @param data
+ */
+const editEvent = (data: any) => {
+    editSalaryDialog.value.setFormData(data)
+    editSalaryDialog.value.showDialog = true
+}
+
+/**
+ * 删除工资
+ */
+const deleteEvent = (id: number) => {
+    ElMessageBox.confirm(t('salaryDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteSalary(id).then(() => {
+            loadSalaryList()
+        }).catch(() => {
+        })
+    })
+}
+
+    
+    const staffIdList = ref([])
+    const setStaffIdList = async () => {
+    staffIdList.value = await (await getWithPersonnelList({})).data
+    }
+    setStaffIdList()
+    const departmentIdList = ref([])
+    const setDepartmentIdList = async () => {
+    departmentIdList.value = await (await getWithDepartmentsList({})).data
+    }
+    setDepartmentIdList()
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadSalaryList()
+}
+</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>

admin/src/app/views/service/components/service-edit.vue

@@ -1,311 +1,288 @@
-<template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.id ? t('updateService') : t('addService')"
-    width="50%"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('serviceName')" prop="service_name">
-        <el-input
-          v-model="formData.service_name"
-          clearable
-          :placeholder="t('serviceNamePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('previewImageUrl')">
-        <el-input
-          v-model="formData.preview_image_url"
-          clearable
-          :placeholder="t('previewImageUrlPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('description')" prop="description">
-        <el-input
-          v-model="formData.description"
-          clearable
-          :placeholder="t('descriptionPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('serviceType')" prop="service_type">
-        <el-input
-          v-model="formData.service_type"
-          clearable
-          :placeholder="t('serviceTypePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('executionRules')" prop="execution_rules">
-        <el-input
-          v-model="formData.execution_rules"
-          clearable
-          :placeholder="t('executionRulesPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('staffReminder')" prop="staff_reminder">
-        <el-input
-          v-model="formData.staff_reminder"
-          clearable
-          :placeholder="t('staffReminderPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('customerReminder')" prop="customer_reminder">
-        <el-input
-          v-model="formData.customer_reminder"
-          clearable
-          :placeholder="t('customerReminderPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item
-        :label="t('customerConfirmation')"
-        prop="customer_confirmation"
-      >
-        <el-input
-          v-model="formData.customer_confirmation"
-          clearable
-          :placeholder="t('customerConfirmationPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('customerFeedback')">
-        <el-input
-          v-model="formData.customer_feedback"
-          clearable
-          :placeholder="t('customerFeedbackPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('status')" prop="status">
-        <el-input
-          v-model="formData.status"
-          clearable
-          :placeholder="t('statusPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, computed, watch } from 'vue'
-import { useDictionary } from '@/app/api/dict'
-import { t } from '@/lang'
-import type { FormInstance } from 'element-plus'
-import { addService, editService, getServiceInfo } from '@/app/api/service'
-
-let showDialog = ref(false)
-const loading = ref(false)
-
-/**
- * 表单数据
- */
-const initialFormData = {
-  id: '',
-  service_name: '',
-  preview_image_url: '',
-  description: '',
-  service_type: '',
-  execution_rules: '',
-  staff_reminder: '',
-  customer_reminder: '',
-  customer_confirmation: '',
-  customer_feedback: '',
-  status: '',
-}
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-  return {
-    service_name: [
-      { required: true, message: t('serviceNamePlaceholder'), trigger: 'blur' },
-    ],
-    preview_image_url: [
-      {
-        required: true,
-        message: t('previewImageUrlPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    description: [
-      { required: true, message: t('descriptionPlaceholder'), trigger: 'blur' },
-    ],
-    service_type: [
-      { required: true, message: t('serviceTypePlaceholder'), trigger: 'blur' },
-    ],
-    execution_rules: [
-      {
-        required: true,
-        message: t('executionRulesPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    staff_reminder: [
-      {
-        required: true,
-        message: t('staffReminderPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    customer_reminder: [
-      {
-        required: true,
-        message: t('customerReminderPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    customer_confirmation: [
-      {
-        required: true,
-        message: t('customerConfirmationPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    customer_feedback: [
-      {
-        required: true,
-        message: t('customerFeedbackPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    status: [
-      { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
-    ],
-  }
-})
-
-const emit = defineEmits(['complete'])
-
-/**
- * 确认
- * @param formEl
- */
-const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  let save = formData.id ? editService : addService
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      let data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
-}
-
-// 获取字典数据
-
-const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getServiceInfo(row.id)).data
-    if (data)
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
-  }
-  loading.value = false
-}
-
-// 验证手机号格式
-const mobileVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^1[3-9]\d{9}$/.test(value)) {
-    callback(new Error(t('generateMobile')))
-  } else {
-    callback()
-  }
-}
-
-// 验证身份证号
-const idCardVerify = (rule: any, value: any, callback: any) => {
-  if (
-    value &&
-    !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
-      value
-    )
-  ) {
-    callback(new Error(t('generateIdCard')))
-  } else {
-    callback()
-  }
-}
-
-// 验证邮箱号
-const emailVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
-    callback(new Error(t('generateEmail')))
-  } else {
-    callback()
-  }
-}
-
-// 验证请输入整数
-const numberVerify = (rule: any, value: any, callback: any) => {
-  if (!Number.isInteger(value)) {
-    callback(new Error(t('generateNumber')))
-  } else {
-    callback()
-  }
-}
-
-defineExpose({
-  showDialog,
-  setFormData,
-})
-</script>
-
-<style lang="scss" scoped></style>
-<style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
-}
-</style>
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateService') : t('addService')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('serviceName')" prop="service_name">
+                    <el-input v-model="formData.service_name" clearable :placeholder="t('serviceNamePlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('previewImageUrl')">
+                    <upload-image v-model="formData.preview_image_url" />
+                </el-form-item>
+                
+                <el-form-item :label="t('description')" prop="description">
+                    <el-input v-model="formData.description" clearable :placeholder="t('descriptionPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('serviceType')" prop="service_type">
+                    <el-input v-model="formData.service_type" clearable :placeholder="t('serviceTypePlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('executionRules')" prop="execution_rules">
+                    <el-input v-model="formData.execution_rules" clearable :placeholder="t('executionRulesPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('staffReminder')" prop="staff_reminder">
+                    <el-select class="input-width"  v-model="formData.staff_reminder" clearable :placeholder="t('staffReminderPlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in staff_reminderList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('customerReminder')" prop="customer_reminder">
+                    <el-select class="input-width"  v-model="formData.customer_reminder" clearable :placeholder="t('customerReminderPlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in customer_reminderList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('customerConfirmation')" prop="customer_confirmation">
+                    <el-select class="input-width"  v-model="formData.customer_confirmation" clearable :placeholder="t('customerConfirmationPlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in customer_confirmationList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('customerFeedback')" >
+                    <el-input v-model="formData.customer_feedback" clearable :placeholder="t('customerFeedbackPlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('status')" prop="status">
+                    <el-select class="input-width"  v-model="formData.status" clearable :placeholder="t('statusPlaceholder')">
+                    <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in statusList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addService, editService, getServiceInfo } from '@/app/api/service'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    service_name: '',
+    preview_image_url: '',
+    description: '',
+    service_type: '',
+    execution_rules: '',
+    staff_reminder: '',
+    customer_reminder: '',
+    customer_confirmation: '',
+    customer_feedback: '',
+    status: '',
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    service_name: [
+        { required: true, message: t('serviceNamePlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    preview_image_url: [
+        { required: true, message: t('previewImageUrlPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    description: [
+        { required: true, message: t('descriptionPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    service_type: [
+        { required: true, message: t('serviceTypePlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    execution_rules: [
+        { required: true, message: t('executionRulesPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    staff_reminder: [
+        { required: true, message: t('staffReminderPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    customer_reminder: [
+        { required: true, message: t('customerReminderPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    customer_confirmation: [
+        { required: true, message: t('customerConfirmationPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    customer_feedback: [
+        { required: true, message: t('customerFeedbackPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    status: [
+        { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editService : addService
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let staff_reminderList = ref([])
+    const staff_reminderDictList = async () => {
+    staff_reminderList.value = await (await useDictionary('global_true_or_false')).data.dictionary
+    }
+    staff_reminderDictList();
+    watch(() => staff_reminderList.value, () => { formData.staff_reminder = staff_reminderList.value[0].value })
+    let customer_reminderList = ref([])
+    const customer_reminderDictList = async () => {
+    customer_reminderList.value = await (await useDictionary('global_true_or_false')).data.dictionary
+    }
+    customer_reminderDictList();
+    watch(() => customer_reminderList.value, () => { formData.customer_reminder = customer_reminderList.value[0].value })
+    let customer_confirmationList = ref([])
+    const customer_confirmationDictList = async () => {
+    customer_confirmationList.value = await (await useDictionary('global_true_or_false')).data.dictionary
+    }
+    customer_confirmationDictList();
+    watch(() => customer_confirmationList.value, () => { formData.customer_confirmation = customer_confirmationList.value[0].value })
+    let statusList = ref([])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('SiteStatus')).data.dictionary
+    }
+    statusDictList();
+    watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
+
+    
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getServiceInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>

admin/src/app/views/service/service.vue

@@ -1,321 +1,210 @@
-<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>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addService') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="serviceTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('serviceName')" prop="service_name">
-            <el-input
-              v-model="serviceTable.searchParam.service_name"
-              :placeholder="t('serviceNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('previewImageUrl')" prop="preview_image_url">
-            <el-input
-              v-model="serviceTable.searchParam.preview_image_url"
-              :placeholder="t('previewImageUrlPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('description')" prop="description">
-            <el-input
-              v-model="serviceTable.searchParam.description"
-              :placeholder="t('descriptionPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('serviceType')" prop="service_type">
-            <el-input
-              v-model="serviceTable.searchParam.service_type"
-              :placeholder="t('serviceTypePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('executionRules')" prop="execution_rules">
-            <el-input
-              v-model="serviceTable.searchParam.execution_rules"
-              :placeholder="t('executionRulesPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('staffReminder')" prop="staff_reminder">
-            <el-input
-              v-model="serviceTable.searchParam.staff_reminder"
-              :placeholder="t('staffReminderPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('customerReminder')" prop="customer_reminder">
-            <el-input
-              v-model="serviceTable.searchParam.customer_reminder"
-              :placeholder="t('customerReminderPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item
-            :label="t('customerConfirmation')"
-            prop="customer_confirmation"
-          >
-            <el-input
-              v-model="serviceTable.searchParam.customer_confirmation"
-              :placeholder="t('customerConfirmationPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('customerFeedback')" prop="customer_feedback">
-            <el-input
-              v-model="serviceTable.searchParam.customer_feedback"
-              :placeholder="t('customerFeedbackPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('status')" prop="status">
-            <el-input
-              v-model="serviceTable.searchParam.status"
-              :placeholder="t('statusPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadServiceList()">{{
-              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="serviceTable.data"
-          size="large"
-          v-loading="serviceTable.loading"
-        >
-          <template #empty>
-            <span>{{ !serviceTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="service_name"
-            :label="t('serviceName')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="preview_image_url"
-            :label="t('previewImageUrl')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="description"
-            :label="t('description')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="service_type"
-            :label="t('serviceType')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="execution_rules"
-            :label="t('executionRules')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="staff_reminder"
-            :label="t('staffReminder')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="customer_reminder"
-            :label="t('customerReminder')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="customer_confirmation"
-            :label="t('customerConfirmation')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="customer_feedback"
-            :label="t('customerFeedback')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="status"
-            :label="t('status')"
-            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>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="serviceTable.page"
-            v-model:page-size="serviceTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="serviceTable.total"
-            @size-change="loadServiceList()"
-            @current-change="loadServiceList"
-          />
-        </div>
-      </div>
-
-      <edit ref="editServiceDialog" @complete="loadServiceList" />
-    </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 { getServiceList, deleteService } from '@/app/api/service'
-import { img } from '@/utils/common'
-import { ElMessageBox, FormInstance } from 'element-plus'
-import Edit from '@/app/views/service/components/service-edit.vue'
-import { useRoute } from 'vue-router'
-const route = useRoute()
-const pageName = route.meta.title
-
-let serviceTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    service_name: '',
-    preview_image_url: '',
-    description: '',
-    service_type: '',
-    execution_rules: '',
-    staff_reminder: '',
-    customer_reminder: '',
-    customer_confirmation: '',
-    customer_feedback: '',
-    status: '',
-  },
-})
-
-const searchFormRef = ref<FormInstance>()
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 字典数据
-
-/**
- * 获取服务列表
- */
-const loadServiceList = (page: number = 1) => {
-  serviceTable.loading = true
-  serviceTable.page = page
-
-  getServiceList({
-    page: serviceTable.page,
-    limit: serviceTable.limit,
-    ...serviceTable.searchParam,
-  })
-    .then((res) => {
-      serviceTable.loading = false
-      serviceTable.data = res.data.data
-      serviceTable.total = res.data.total
-    })
-    .catch(() => {
-      serviceTable.loading = false
-    })
-}
-loadServiceList()
-
-const editServiceDialog: Record<string, any> | null = ref(null)
-
-/**
- * 添加服务
- */
-const addEvent = () => {
-  editServiceDialog.value.setFormData()
-  editServiceDialog.value.showDialog = true
-}
-
-/**
- * 编辑服务
- * @param data
- */
-const editEvent = (data: any) => {
-  editServiceDialog.value.setFormData(data)
-  editServiceDialog.value.showDialog = true
-}
-
-/**
- * 删除服务
- */
-const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('serviceDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteService(id)
-      .then(() => {
-        loadServiceList()
-      })
-      .catch(() => {})
-  })
-}
-
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadServiceList()
-}
-</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>
+<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>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addService') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="serviceTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('serviceName')" prop="service_name">
+                        <el-input v-model="serviceTable.searchParam.service_name" :placeholder="t('serviceNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('serviceType')" prop="service_type">
+                        <el-input v-model="serviceTable.searchParam.service_type" :placeholder="t('serviceTypePlaceholder')" />
+                    </el-form-item>
+                    
+                    <el-form-item :label="t('status')" prop="status">
+                        <el-select class="w-[280px]" v-model="serviceTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option
+                                v-for="(item, index) in statusList"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    
+                    <el-form-item>
+                        <el-button type="primary" @click="loadServiceList()">{{ 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="serviceTable.data" size="large" v-loading="serviceTable.loading">
+                    <template #empty>
+                        <span>{{ !serviceTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="service_name" :label="t('serviceName')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="description" :label="t('description')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="service_type" :label="t('serviceType')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="customer_feedback" :label="t('customerFeedback')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div v-for="(item, index) in statusList">
+                                <div v-if="item.value == row.status">{{ item.name }}</div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    
+                    <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>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="serviceTable.page" v-model:page-size="serviceTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="serviceTable.total"
+                        @size-change="loadServiceList()" @current-change="loadServiceList" />
+                </div>
+            </div>
+
+            <edit ref="editServiceDialog" @complete="loadServiceList" />
+        </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 { getServiceList, deleteService } from '@/app/api/service'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/service/components/service-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+
+let serviceTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      "service_name":"",
+      "service_type":"",
+      "status":""
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+    const staff_reminderList = ref([] as any[])
+    const staff_reminderDictList = async () => {
+    staff_reminderList.value = await (await useDictionary('global_true_or_false')).data.dictionary
+    }
+    staff_reminderDictList();
+    const customer_reminderList = ref([] as any[])
+    const customer_reminderDictList = async () => {
+    customer_reminderList.value = await (await useDictionary('global_true_or_false')).data.dictionary
+    }
+    customer_reminderDictList();
+    const customer_confirmationList = ref([] as any[])
+    const customer_confirmationDictList = async () => {
+    customer_confirmationList.value = await (await useDictionary('global_true_or_false')).data.dictionary
+    }
+    customer_confirmationDictList();
+    const statusList = ref([] as any[])
+    const statusDictList = async () => {
+    statusList.value = await (await useDictionary('SiteStatus')).data.dictionary
+    }
+    statusDictList();
+
+/**
+ * 获取服务列表
+ */
+const loadServiceList = (page: number = 1) => {
+    serviceTable.loading = true
+    serviceTable.page = page
+
+    getServiceList({
+        page: serviceTable.page,
+        limit: serviceTable.limit,
+         ...serviceTable.searchParam
+    }).then(res => {
+        serviceTable.loading = false
+        serviceTable.data = res.data.data
+        serviceTable.total = res.data.total
+    }).catch(() => {
+        serviceTable.loading = false
+    })
+}
+loadServiceList()
+
+const editServiceDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 添加服务
+ */
+const addEvent = () => {
+    editServiceDialog.value.setFormData()
+    editServiceDialog.value.showDialog = true
+}
+
+/**
+ * 编辑服务
+ * @param data
+ */
+const editEvent = (data: any) => {
+    editServiceDialog.value.setFormData(data)
+    editServiceDialog.value.showDialog = true
+}
+
+/**
+ * 删除服务
+ */
+const deleteEvent = (id: number) => {
+    ElMessageBox.confirm(t('serviceDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteService(id).then(() => {
+            loadServiceList()
+        }).catch(() => {
+        })
+    })
+}
+
+    
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadServiceList()
+}
+</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>

admin/src/app/views/setting/components/pay-wechatpay.vue

@@ -257,6 +257,8 @@ const confirm = async (formEl: FormInstance | undefined) => {
 
 const cancel = () => {
   Object.assign(formData, initialFormData)
+  
+
   if (initData.value) {
     Object.keys(formData).forEach((key: string) => {
       if (initData.value[key] != undefined) formData[key] = initData.value[key]
@@ -271,13 +273,18 @@ const setFormData = async (data: any = null) => {
   initData.value = cloneDeep(data)
   loading.value = true
   Object.assign(formData, initialFormData)
+  
+
+	
   if (data) {
     Object.keys(formData).forEach((key: string) => {
       if (data[key] != undefined) formData[key] = data[key]
     })
-    formData.channel = data.redio_key.split('_')[0]
+    formData.channel = data.radio_key.split('_')[0]
     formData.status = Number(formData.status)
   }
+  
+  initData.value = formData;
   loading.value = false
 }
 

admin/src/app/views/setting/pay.vue

@@ -1,116 +1,68 @@
 <template>
-  <!--支付设置-->
-  <div class="main-container" v-loading="payLoading">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center" v-if="!payLoading">
-        <span class="text-page-title">{{ pageName }}</span>
-        <el-button type="primary" @click="isEdit = true" ref="setConfigBtn">{{
-          t('setConfig')
-        }}</el-button>
-      </div>
-    </el-card>
-
-    <el-card
-      class="box-card mt-[15px] !border-none"
-      shadow="never"
-      v-for="(payItems, payKey) in payConfigData"
-      :key="payKey"
-    >
-      <h3 class="panel-title !text-sm">{{ payItems.name }}</h3>
-
-      <div>
-        <div
-          class="flex items-center justify-between p-[10px] table-item-border bg"
-        >
-          <span class="text-base w-[230px]">{{ t('payType') }}</span>
-          <span class="text-base w-[110px] text-center">{{
-            t('onState')
-          }}</span>
-          <span class="text-base w-[80px] text-center" v-if="isEdit">{{
-            t('templateName')
-          }}</span>
-        </div>
+    <!--支付设置-->
+    <div class="main-container" v-loading="payLoading">
 
-        <div ref="fieldBoxRefs" :data-key="payKey">
-          <div
-            class="flex items-center justify-between p-[10px] table-item-border"
-            v-for="(childrenItem, childrenIndex) in payItems.pay_type"
-            :key="childrenItem.redio_key"
-            :id="payKey + '_' + childrenIndex"
-          >
-            <div class="flex w-[230px] flex-shrink-0">
-              <span
-                v-if="isEdit"
-                class="iconfont icontuodong mr-2 handle cursor-pointer"
-              ></span>
-              <div class="flex items-center select-none">
-                <div class="mr-[15px] w-[30px] h-[30px] flex-shrink-0">
-                  <img class="w-[30px]" :src="img(childrenItem.icon)" />
-                </div>
-                <span class="text-base text-[#666]">{{
-                  childrenItem.name
-                }}</span>
-              </div>
-            </div>
-            <div class="flex items-center justify-center w-[110px] select-none">
-              <el-switch
-                v-if="isEdit"
-                v-model="childrenItem.status"
-                :active-value="1"
-                :inactive-value="0"
-                :active-text="t('isEnable')"
-                @change="enablePaymentMode(childrenItem)"
-              />
-              <div v-else>
-                <el-tag
-                  v-if="childrenItem.status"
-                  class="ml-2"
-                  type="success"
-                  >{{ t('open') }}</el-tag
-                >
-                <el-tag v-else class="ml-2" type="info">{{
-                  t('notOpen')
-                }}</el-tag>
-              </div>
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center" v-if="!payLoading">
+                <span class="text-page-title">{{ pageName }}</span>
+                <el-button type="primary" @click="isEdit = true" ref="setConfigBtn">{{ t('setConfig') }}</el-button>
             </div>
-            <div
-              class="flex items-center justify-center w-[80px] select-none"
-              v-if="isEdit"
-            >
-              <button
-                class="text-base"
-                @click="configPayFn(childrenItem)"
-                v-if="childrenItem.setting_component"
-              >
-                {{ t('clickConfigure') }}
-              </button>
-              <button v-else>--</button>
+        </el-card>
+	
+        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-for="(item, key) in payConfigData" :key="key">
+			<view v-for="(payItems, payKey) in item" :key="payKey">
+				<h3 class="panel-title !text-sm">{{ payItems.campus_name }}</h3>
+
+				<div>
+				    <div class="flex items-center justify-between p-[10px] table-item-border bg">
+				        <span class="text-base w-[230px]">{{ t('payType') }}</span>
+				        <span class="text-base w-[110px] text-center">{{ t('onState') }}</span>
+				        <span class="text-base w-[80px] text-center" v-if="isEdit">{{ t('templateName') }}</span>
+				    </div>
+
+				    <div ref="fieldBoxRefs" :data-key="payKey">
+				        <div class="flex items-center justify-between p-[10px] table-item-border" v-for="(childrenItem, childrenIndex) in payItems.pay_type" :key="childrenItem.redio_key" :id="payKey + '_' + childrenIndex">
+				            <div class="flex w-[230px] flex-shrink-0">
+				                <span v-if="isEdit" class="iconfont icontuodong mr-2 handle cursor-pointer"></span>
+				                <div class="flex items-center select-none">
+				                    <div class="mr-[15px] w-[30px] h-[30px] flex-shrink-0">
+				                        <img class="w-[30px]" :src="img(childrenItem.icon)" />
+				                    </div>
+				                    <span class="text-base text-[#666]">{{ childrenItem.name }}</span>
+				                </div>
+				            </div>
+				            <div class="flex items-center justify-center w-[110px] select-none">
+				                <el-switch v-if="isEdit" v-model="childrenItem.status" :active-value="1" :inactive-value="0" :active-text="t('isEnable')" @change="enablePaymentMode(childrenItem)" />
+				                <div v-else>
+				                    <el-tag v-if="childrenItem.status" class="ml-2" type="success">{{ t('open') }}</el-tag>
+				                    <el-tag v-else class="ml-2" type="info">{{ t('notOpen') }}</el-tag>
+				                </div>
+				            </div>
+				            <div class="flex items-center justify-center w-[80px] select-none" v-if="isEdit">
+				                <button class="text-base" @click="configPayFn(childrenItem)" v-if="childrenItem.setting_component">{{ t('clickConfigure') }}</button>
+				                <button v-else>--</button>
+				            </div>
+				        </div>
+				    </div>
+				</div>
+
+			</view>
+
+
+		</el-card>
+
+        <div class="fixed-footer-wrap" v-if="isEdit">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="cancelFn">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="saveFn(formRef)">{{ t('save') }}</el-button>
             </div>
-          </div>
         </div>
-      </div>
-    </el-card>
-
-    <div class="fixed-footer-wrap" v-if="isEdit">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="cancelFn">{{
-          t('cancel')
-        }}</el-button>
-        <el-button type="primary" :loading="loading" @click="saveFn(formRef)">{{
-          t('save')
-        }}</el-button>
-      </div>
-    </div>
 
-    <template v-for="(item, index) in payTypeList">
-      <component
-        :is="item.setting_component"
-        :ref="(el) => setPayTypeRefs(el, item.key)"
-        v-if="item.setting_component"
-        @complete="setConfigInfo"
-      />
-    </template>
-  </div>
+        <template v-for="(item, index) in payConfigData">
+            <component :is="is" :ref="(el) => setPayTypeRefs(el, 'wechatpay')"  @complete="setConfigInfo"/>
+        </template>
+
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -127,22 +79,21 @@ import { cloneDeep } from 'lodash-es'
 const route = useRoute()
 const pageName = route.meta.title
 
+
 const payTypeList = ref([])
 const payTypeRefs = ref({})
 const modules: any = import.meta.glob('@/**/*.vue')
+const is = defineAsyncComponent(modules["/src/app/views/setting/components/pay-wechatpay.vue"]);
 
 getAllPayType().then(({ data }) => {
-  Object.keys(data).forEach((key: string) => {
-    data[key].setting_component &&
-      (data[key].setting_component = defineAsyncComponent(
-        modules[data[key].setting_component]
-      ))
-  })
-  payTypeList.value = data
+    Object.keys(data).forEach((key: string) => {
+        data[key].setting_component && (data[key].setting_component = defineAsyncComponent(modules[data[key].setting_component]))
+    })
+    payTypeList.value = data
 })
 
 const setPayTypeRefs = (el: any, index: string) => {
-  payTypeRefs.value[index] = el
+    payTypeRefs.value[index] = (el)
 }
 
 const payLoading = ref(true)
@@ -153,127 +104,134 @@ const setConfigBtn = ref()
 // 获取原始数据
 const payConfigData = ref([])
 const checkPayConfigList = () => {
-  getPayConfigList().then((res) => {
-    const payData = res.data
-    for (const i in payData) {
-      const payType = payData[i].pay_type
-      const pay_type = []
-      let default_key = ''
-
-      payType.forEach((item, index) => {
-        item.redio_key = payData[i].key + '_' + item.key
-        item.defauit_key = ''
-        if (item.is_default == 1) {
-          default_key = item.redio_key
-        }
-        pay_type.push(item)
-      })
-
-      payData[payData[i].key].default_pay_type = default_key
-      payData[payData[i].key].pay_type = pay_type
-    }
-    payConfigData.value = payData
-    payLoading.value = false
-    nextTick(() => {
-      fieldBoxRefs.value.forEach((item, index) => {
-        sortableFn(item, index)
-      })
+    getPayConfigList().then(res => {
+		const list = res.data;
+		const data = [];
+
+		for (const z in list) {
+			const payDataGroup = list[z];
+			for (const i in payDataGroup) {
+				const payItem = payDataGroup[i];
+				const payTypeList = payItem.pay_type || [];
+				const processedPayTypes = [];
+				let defaultKey = '';
+
+				payTypeList.forEach((item) => {
+					item.radio_key = `${payItem.key}_${item.key}`;
+					if (item.is_default === 1) {
+						defaultKey = item.radio_key;
+					}
+					processedPayTypes.push(item);
+				});
+
+
+				list[z][payDataGroup[i].key].default_pay_type = defaultKey
+				list[z][payDataGroup[i].key].pay_type = processedPayTypes
+			}
+
+		}
+
+		console.log(list);
+
+        payConfigData.value = list
+        payLoading.value = false
+        nextTick(() => {
+            fieldBoxRefs.value.forEach((item, index) => {
+                sortableFn(item, index)
+            })
+        })
     })
-  })
 }
 checkPayConfigList()
 
 // 配置支付宝、微信信息
-const setConfigInfo = (data: any) => {
-  payConfigData.value[data.channel].pay_type.forEach((element) => {
-    if (element.key == data.type) {
-      element.config = data.config
-    }
-  })
-  console.log(payConfigData.value)
+const setConfigInfo = (data:any) => {
+    payConfigData.value[data.channel].pay_type.forEach(element => {
+        if (element.key == data.type) {
+            element.config = data.config
+        }
+    })
+    console.log(payConfigData.value)
 }
 
 // 初始化配置信息
-const configPayFn = (data: any) => {
-  payTypeRefs.value[data.key].setFormData(data)
-  payTypeRefs.value[data.key].showDialog = true
+const configPayFn = (data:any) => {
+    payTypeRefs.value[data.key].setFormData(data)
+    payTypeRefs.value[data.key].showDialog = true
 }
 
 // 开启支付方式
 const enablePaymentMode = async (data: any) => {
-  if (
-    payTypeRefs.value[data.key] &&
-    typeof payTypeRefs.value[data.key].enableVerify == 'function'
-  ) {
-    payTypeRefs.value[data.key].setFormData(data)
-
-    const verify = payTypeRefs.value[data.key].enableVerify()
-    if (!verify) {
-      data.status = 0
-      ElMessage(t('configurePaymentMethod'))
-      return false
+    if (payTypeRefs.value[data.key] && typeof payTypeRefs.value[data.key].enableVerify == 'function') {
+        payTypeRefs.value[data.key].setFormData(data)
+
+        const verify = payTypeRefs.value[data.key].enableVerify()
+        if (!verify) {
+            data.status = 0
+            ElMessage(t('configurePaymentMethod'))
+            return false
+        }
     }
-  }
 }
 
 interface SortableEvt extends SortableEvent {
-  originalEvent?: DragEvent
+    originalEvent?: DragEvent
 }
 
 // 拖动
 const fieldBoxRefs = ref<any>([])
 watch(isEdit, (newValue, oldValue) => {
-  if (newValue) {
-    nextTick(() => {
-      fieldBoxRefs.value.forEach((item: any, index: any) => {
-        sortableFn(item, index)
-      })
-    })
-  }
+    if (newValue) {
+        nextTick(() => {
+            fieldBoxRefs.value.forEach((item:any, index:any) => {
+                sortableFn(item, index)
+            })
+        })
+    }
 })
 
 // item=>拖动的每项，index 索引
 const sortableFn = (item, index) => {
-  const sortable = Sortable.create(item, {
-    group: {
-      put: false, // 不允许拖拽进这个列表
-    },
-    handle: '.handle',
-    animation: 200,
-    disabled: false,
-    onEnd: (evt) => {
-      const key = evt.target.getAttribute('data-key')
-      const data = payConfigData.value[key].pay_type
-      data.splice(evt.newIndex, 0, ...data.splice(evt.oldIndex, 1))
-    },
-  })
+    const sortable = Sortable.create(item, {
+        group: {
+            put: false // 不允许拖拽进这个列表
+        },
+        handle: '.handle',
+        animation: 200,
+        disabled: false,
+        onEnd: (evt) => {
+            const key = evt.target.getAttribute('data-key')
+            const data = payConfigData.value[key].pay_type
+            data.splice(evt.newIndex, 0, ...data.splice(evt.oldIndex, 1))
+        }
+    })
 }
 
 // 保存
 const saveFn = () => {
-  payLoading.value = true
-  const data = cloneDeep(payConfigData.value)
-  Object.values(data).forEach((item, index) => {
-    item.pay_type.forEach((subItem: any, subIndex: any) => {
-      subItem.sort = subIndex
+    payLoading.value = true
+    const data = cloneDeep(payConfigData.value)
+    Object.values(data).forEach((item, index) => {
+        item.pay_type.forEach((subItem:any, subIndex:any) => {
+            subItem.sort = subIndex
+        })
     })
-  })
 
-  setPatConfig({ config: data }).then((res) => {
-    checkPayConfigList()
-    isEdit.value = false
-    payLoading.value = false
-  })
+    setPatConfig({ config: data }).then(res => {
+        checkPayConfigList()
+        isEdit.value = false
+        payLoading.value = false
+    })
 }
 
 // 取消按钮
 const cancelFn = () => {
-  location.reload()
+    location.reload()
 }
 </script>
 
 <style lang="scss" scoped>
-.table-item-border {
-  @apply border-b border-[var(--el-border-color)];
-}
+    .table-item-border {
+        @apply border-b border-[var(--el-border-color)];
+    }
 </style>

admin/src/app/views/user_feedback/components/user-feedback-edit.vue

@@ -1,205 +1,175 @@
-<template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.id ? t('updateUserFeedback') : t('addUserFeedback')"
-    width="50%"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('userId')" prop="user_id">
-        <el-input
-          v-model="formData.user_id"
-          clearable
-          :placeholder="t('userIdPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('feedbackText')" prop="feedback_text">
-        <el-input
-          v-model="formData.feedback_text"
-          clearable
-          :placeholder="t('feedbackTextPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('attachmentUrl')">
-        <el-input
-          v-model="formData.attachment_url"
-          clearable
-          :placeholder="t('attachmentUrlPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, computed, watch } from 'vue'
-import { useDictionary } from '@/app/api/dict'
-import { t } from '@/lang'
-import type { FormInstance } from 'element-plus'
-import {
-  addUserFeedback,
-  editUserFeedback,
-  getUserFeedbackInfo,
-} from '@/app/api/user_feedback'
-
-let showDialog = ref(false)
-const loading = ref(false)
-
-/**
- * 表单数据
- */
-const initialFormData = {
-  id: '',
-  user_id: '',
-  feedback_text: '',
-  attachment_url: '',
-}
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-  return {
-    user_id: [
-      { required: true, message: t('userIdPlaceholder'), trigger: 'blur' },
-    ],
-    feedback_text: [
-      {
-        required: true,
-        message: t('feedbackTextPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    attachment_url: [
-      {
-        required: true,
-        message: t('attachmentUrlPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
-})
-
-const emit = defineEmits(['complete'])
-
-/**
- * 确认
- * @param formEl
- */
-const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  let save = formData.id ? editUserFeedback : addUserFeedback
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      let data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
-}
-
-// 获取字典数据
-
-const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getUserFeedbackInfo(row.id)).data
-    if (data)
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
-  }
-  loading.value = false
-}
-
-// 验证手机号格式
-const mobileVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^1[3-9]\d{9}$/.test(value)) {
-    callback(new Error(t('generateMobile')))
-  } else {
-    callback()
-  }
-}
-
-// 验证身份证号
-const idCardVerify = (rule: any, value: any, callback: any) => {
-  if (
-    value &&
-    !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
-      value
-    )
-  ) {
-    callback(new Error(t('generateIdCard')))
-  } else {
-    callback()
-  }
-}
-
-// 验证邮箱号
-const emailVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
-    callback(new Error(t('generateEmail')))
-  } else {
-    callback()
-  }
-}
-
-// 验证请输入整数
-const numberVerify = (rule: any, value: any, callback: any) => {
-  if (!Number.isInteger(value)) {
-    callback(new Error(t('generateNumber')))
-  } else {
-    callback()
-  }
-}
-
-defineExpose({
-  showDialog,
-  setFormData,
-})
-</script>
-
-<style lang="scss" scoped></style>
-<style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
-}
-</style>
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateUserFeedback') : t('addUserFeedback')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('userId')" >
+                    <el-select class="input-width" v-model="formData.user_id" clearable :placeholder="t('userIdPlaceholder')" disabled>
+                       <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in userIdList"
+                            :key="index"
+                            :label="item['name']"
+                            :value="item['id']"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('feedbackText')" >
+                    <el-input disabled v-model="formData.feedback_text" type="textarea" rows="4" clearable :placeholder="t('feedbackTextPlaceholder')" class="input-width"/>
+                </el-form-item>
+                <el-form-item :label="t('attachmentUrl')" >
+                    <upload-file v-model="formData.attachment_url" disabled/>
+                </el-form-item>
+                
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addUserFeedback, editUserFeedback, getUserFeedbackInfo, getWithCustomerResourcesList } from '@/app/api/user_feedback'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    user_id: '',
+    feedback_text: '',
+    attachment_url: '',
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    user_id: [
+        { required: true, message: t('userIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    feedback_text: [
+        { required: true, message: t('feedbackTextPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    attachment_url: [
+        { required: true, message: t('attachmentUrlPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editUserFeedback : addUserFeedback
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    
+
+    
+    const userIdList = ref([] as any[])
+    const setUserIdList = async () => {
+    userIdList.value = await (await getWithCustomerResourcesList({})).data
+    }
+    setUserIdList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getUserFeedbackInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>

admin/src/app/views/user_feedback/user_feedback.vue

@@ -1,223 +1,177 @@
-<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>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addUserFeedback') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="userFeedbackTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('userId')" prop="user_id">
-            <el-input
-              v-model="userFeedbackTable.searchParam.user_id"
-              :placeholder="t('userIdPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('feedbackText')" prop="feedback_text">
-            <el-input
-              v-model="userFeedbackTable.searchParam.feedback_text"
-              :placeholder="t('feedbackTextPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('attachmentUrl')" prop="attachment_url">
-            <el-input
-              v-model="userFeedbackTable.searchParam.attachment_url"
-              :placeholder="t('attachmentUrlPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadUserFeedbackList()">{{
-              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="userFeedbackTable.data"
-          size="large"
-          v-loading="userFeedbackTable.loading"
-        >
-          <template #empty>
-            <span>{{ !userFeedbackTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="user_id"
-            :label="t('userId')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="feedback_text"
-            :label="t('feedbackText')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="attachment_url"
-            :label="t('attachmentUrl')"
-            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>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="userFeedbackTable.page"
-            v-model:page-size="userFeedbackTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="userFeedbackTable.total"
-            @size-change="loadUserFeedbackList()"
-            @current-change="loadUserFeedbackList"
-          />
-        </div>
-      </div>
-
-      <edit ref="editUserFeedbackDialog" @complete="loadUserFeedbackList" />
-    </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 {
-  getUserFeedbackList,
-  deleteUserFeedback,
-} from '@/app/api/user_feedback'
-import { img } from '@/utils/common'
-import { ElMessageBox, FormInstance } from 'element-plus'
-import Edit from '@/app/views/user_feedback/components/user-feedback-edit.vue'
-import { useRoute } from 'vue-router'
-const route = useRoute()
-const pageName = route.meta.title
-
-let userFeedbackTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    user_id: '',
-    feedback_text: '',
-    attachment_url: '',
-  },
-})
-
-const searchFormRef = ref<FormInstance>()
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 字典数据
-
-/**
- * 获取用户反馈信息列表
- */
-const loadUserFeedbackList = (page: number = 1) => {
-  userFeedbackTable.loading = true
-  userFeedbackTable.page = page
-
-  getUserFeedbackList({
-    page: userFeedbackTable.page,
-    limit: userFeedbackTable.limit,
-    ...userFeedbackTable.searchParam,
-  })
-    .then((res) => {
-      userFeedbackTable.loading = false
-      userFeedbackTable.data = res.data.data
-      userFeedbackTable.total = res.data.total
-    })
-    .catch(() => {
-      userFeedbackTable.loading = false
-    })
-}
-loadUserFeedbackList()
-
-const editUserFeedbackDialog: Record<string, any> | null = ref(null)
-
-/**
- * 添加用户反馈信息
- */
-const addEvent = () => {
-  editUserFeedbackDialog.value.setFormData()
-  editUserFeedbackDialog.value.showDialog = true
-}
-
-/**
- * 编辑用户反馈信息
- * @param data
- */
-const editEvent = (data: any) => {
-  editUserFeedbackDialog.value.setFormData(data)
-  editUserFeedbackDialog.value.showDialog = true
-}
-
-/**
- * 删除用户反馈信息
- */
-const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('userFeedbackDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteUserFeedback(id)
-      .then(() => {
-        loadUserFeedbackList()
-      })
-      .catch(() => {})
-  })
-}
-
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadUserFeedbackList()
-}
-</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>
+<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>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addUserFeedback') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="userFeedbackTable.searchParam" ref="searchFormRef">
+                    
+                    <el-form-item :label="t('userId')" prop="user_id">
+                        <el-select class="w-[280px]" v-model="userFeedbackTable.searchParam.user_id" clearable :placeholder="t('userIdPlaceholder')">
+                           <el-option
+                                       v-for="(item, index) in userIdList"
+                                       :key="index"
+                                       :label="item['name']"
+                                       :value="item['id']"
+                                   />
+                        </el-select>
+                    </el-form-item>
+                    
+                    <el-form-item>
+                        <el-button type="primary" @click="loadUserFeedbackList()">{{ 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="userFeedbackTable.data" size="large" v-loading="userFeedbackTable.loading">
+                    <template #empty>
+                        <span>{{ !userFeedbackTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="user_id_name" :label="t('userId')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="feedback_text" :label="t('feedbackText')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="attachment_url" :label="t('attachmentUrl')" 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)">查看</el-button>
+                           <!-- <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button> -->
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="userFeedbackTable.page" v-model:page-size="userFeedbackTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="userFeedbackTable.total"
+                        @size-change="loadUserFeedbackList()" @current-change="loadUserFeedbackList" />
+                </div>
+            </div>
+
+            <edit ref="editUserFeedbackDialog" @complete="loadUserFeedbackList" />
+        </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 { getUserFeedbackList, deleteUserFeedback, getWithCustomerResourcesList } from '@/app/api/user_feedback'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/user_feedback/components/user-feedback-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+
+let userFeedbackTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      "user_id":""
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+    
+
+/**
+ * 获取用户反馈信息列表
+ */
+const loadUserFeedbackList = (page: number = 1) => {
+    userFeedbackTable.loading = true
+    userFeedbackTable.page = page
+
+    getUserFeedbackList({
+        page: userFeedbackTable.page,
+        limit: userFeedbackTable.limit,
+         ...userFeedbackTable.searchParam
+    }).then(res => {
+        userFeedbackTable.loading = false
+        userFeedbackTable.data = res.data.data
+        userFeedbackTable.total = res.data.total
+    }).catch(() => {
+        userFeedbackTable.loading = false
+    })
+}
+loadUserFeedbackList()
+
+const editUserFeedbackDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 添加用户反馈信息
+ */
+const addEvent = () => {
+    editUserFeedbackDialog.value.setFormData()
+    editUserFeedbackDialog.value.showDialog = true
+}
+
+/**
+ * 编辑用户反馈信息
+ * @param data
+ */
+const editEvent = (data: any) => {
+    editUserFeedbackDialog.value.setFormData(data)
+    editUserFeedbackDialog.value.showDialog = true
+}
+
+/**
+ * 删除用户反馈信息
+ */
+const deleteEvent = (id: number) => {
+    ElMessageBox.confirm(t('userFeedbackDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteUserFeedback(id).then(() => {
+            loadUserFeedbackList()
+        }).catch(() => {
+        })
+    })
+}
+
+    
+    const userIdList = ref([])
+    const setUserIdList = async () => {
+    userIdList.value = await (await getWithCustomerResourcesList({})).data
+    }
+    setUserIdList()
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadUserFeedbackList()
+}
+</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>

niucloud/app/adminapi/controller/campus_pay/CampusPay.php

@@ -0,0 +1,102 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\controller\campus_pay;
+
+use core\base\BaseAdminController;
+use app\service\admin\campus_pay\CampusPayService;
+
+
+/**
+ * 账户及资金管理控制器
+ * Class CampusPay
+ * @package app\adminapi\controller\campus_pay
+ */
+class CampusPay extends BaseAdminController
+{
+   /**
+    * 获取账户及资金管理列表
+    * @return \think\Response
+    */
+    public function lists(){
+        $data = $this->request->params([
+             ["campus_id",""],
+             ["created_at",["",""]]
+        ]);
+        return success((new CampusPayService())->getPage($data));
+    }
+
+    /**
+     * 账户及资金管理详情
+     * @param int $id
+     * @return \think\Response
+     */
+    public function info(int $id){
+        return success((new CampusPayService())->getInfo($id));
+    }
+
+    /**
+     * 添加账户及资金管理
+     * @return \think\Response
+     */
+    public function add(){
+        $data = $this->request->params([
+             ["campus_id",0],
+             ["mchid",""],
+             ["pay_sign_key",""],
+             ["apiclient_key",""],
+             ["apiclient_cert",""],
+             ["wx_pay_key",""],
+             ["wx_pay_key_id",""],
+
+        ]);
+        $this->validate($data, 'app\validate\campus_pay\CampusPay.add');
+        $id = (new CampusPayService())->add($data);
+        return success('ADD_SUCCESS', ['id' => $id]);
+    }
+
+    /**
+     * 账户及资金管理编辑
+     * @param $id  账户及资金管理id
+     * @return \think\Response
+     */
+    public function edit(int $id){
+        $data = $this->request->params([
+             ["campus_id",0],
+             ["mchid",""],
+             ["pay_sign_key",""],
+             ["apiclient_key",""],
+             ["apiclient_cert",""],
+             ["wx_pay_key",""],
+             ["wx_pay_key_id",""],
+
+        ]);
+        $this->validate($data, 'app\validate\campus_pay\CampusPay.edit');
+        (new CampusPayService())->edit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+    /**
+     * 账户及资金管理删除
+     * @param $id  账户及资金管理id
+     * @return \think\Response
+     */
+    public function del(int $id){
+        (new CampusPayService())->del($id);
+        return success('DELETE_SUCCESS');
+    }
+
+    
+    public function getCampusAll(){
+         return success(( new CampusPayService())->getCampusAll());
+    }
+
+}

niucloud/app/adminapi/controller/customer_resources/CustomerResources.php

@@ -32,6 +32,7 @@ class CustomerResources extends BaseAdminController
              ["age",""],
              ["gender",""],
              ["phone_number",""],
+             ['member_label', 0],
              ["type","khzy"],
             ["created_at",[]],
             ["updated_at",[]],
@@ -69,6 +70,8 @@ class CustomerResources extends BaseAdminController
              ["initial_intent",""],
              ["campus",""],
              ["status",""],
+             ['member_label', []],
+
             ["create_year_month",date("Y-m")],
             ["create_date",date("Y-m-d")],
             ["purchase_power",""],
@@ -110,6 +113,7 @@ class CustomerResources extends BaseAdminController
              ["initial_intent",""],
              ["campus",""],
              ["status",""],
+             ['member_label', []],
             ["create_year_month",date("Y-m")],
             ["create_date",date("Y-m-d")],
 

niucloud/app/adminapi/controller/departments/Departments.php

@@ -54,8 +54,7 @@ class Departments extends BaseAdminController
 
         ]);
         $this->validate($data, 'app\validate\departments\Departments.add');
-        $id = (new DepartmentsService())->add($data);
-        return success('ADD_SUCCESS', ['id' => $id]);
+        return (new DepartmentsService())->add($data);
     }
 
     /**
@@ -70,8 +69,7 @@ class Departments extends BaseAdminController
 
         ]);
         $this->validate($data, 'app\validate\departments\Departments.edit');
-        (new DepartmentsService())->edit($id, $data);
-        return success('EDIT_SUCCESS');
+        return (new DepartmentsService())->edit($id, $data);
     }
 
     /**
@@ -84,7 +82,7 @@ class Departments extends BaseAdminController
         return success('DELETE_SUCCESS');
     }
 
-    
+
     public function getDepartmentsAll(){
          return success(( new DepartmentsService())->getDepartmentsAll());
     }

niucloud/app/adminapi/controller/order_table/OrderTable.php

@@ -50,7 +50,7 @@ class OrderTable extends BaseAdminController
     public function add(){
         $data = $this->request->params([
              ["resource_id",0],
-             ["order_status",""],
+//             ["order_status",""],
              ["payment_type",""],
              ["order_amount",0.00],
              ["course_id",0],
@@ -58,8 +58,7 @@ class OrderTable extends BaseAdminController
 
         ]);
         $this->validate($data, 'app\validate\order_table\OrderTable.add');
-        $id = (new OrderTableService())->add($data);
-        return success('ADD_SUCCESS', ['id' => $id]);
+        return (new OrderTableService())->add($data);
     }
 
     /**
@@ -70,7 +69,7 @@ class OrderTable extends BaseAdminController
     public function edit(int $id){
         $data = $this->request->params([
              ["resource_id",0],
-             ["order_status",""],
+//             ["order_status",""],
              ["payment_type",""],
              ["order_amount",0.00],
              ["course_id",0],
@@ -92,7 +91,7 @@ class OrderTable extends BaseAdminController
         return success('DELETE_SUCCESS');
     }
 
-    
+
     public function getCustomerResourcesAll(){
          return success(( new OrderTableService())->getCustomerResourcesAll());
     }

niucloud/app/adminapi/controller/reimbursement/Reimbursement.php

@@ -28,12 +28,8 @@ class Reimbursement extends BaseAdminController
     */
     public function lists(){
         $data = $this->request->params([
-             ["applicant_id",""],
-             ["amount",""],
-             ["description",""],
-             ["receipt_url",""],
              ["status",""],
-             ["process_id",""]
+             ["created_at",["",""]]
         ]);
         return success((new ReimbursementService())->getPage($data));
     }
@@ -58,7 +54,6 @@ class Reimbursement extends BaseAdminController
              ["description",""],
              ["receipt_url",""],
              ["status",""],
-             ["process_id",0],
 
         ]);
         $this->validate($data, 'app\validate\reimbursement\Reimbursement.add');
@@ -78,7 +73,6 @@ class Reimbursement extends BaseAdminController
              ["description",""],
              ["receipt_url",""],
              ["status",""],
-             ["process_id",0],
 
         ]);
         $this->validate($data, 'app\validate\reimbursement\Reimbursement.edit');
@@ -97,4 +91,8 @@ class Reimbursement extends BaseAdminController
     }
 
     
+    public function getPersonnelAll(){
+         return success(( new ReimbursementService())->getPersonnelAll());
+    }
+
 }

niucloud/app/adminapi/controller/salary/Salary.php

@@ -29,17 +29,9 @@ class Salary extends BaseAdminController
     public function lists(){
         $data = $this->request->params([
              ["staff_id",""],
-             ["base_salary",""],
-             ["performance_bonus",""],
-             ["deductions",""],
-             ["other_subsidies",""],
-             ["net_salary",""],
-             ["payment_status",""],
-             ["payment_method",""],
-             ["remarks",""],
-             ["salary_month",""],
              ["department_id",""],
-             ["process_id",""]
+             ["payment_status",""],
+             ["created_at",["",""]]
         ]);
         return success((new SalaryService())->getPage($data));
     }
@@ -60,17 +52,15 @@ class Salary extends BaseAdminController
     public function add(){
         $data = $this->request->params([
              ["staff_id",0],
+             ["department_id",0],
              ["base_salary",0.00],
              ["performance_bonus",0.00],
              ["deductions",0.00],
              ["other_subsidies",0.00],
-             ["net_salary",0.00],
              ["payment_status",""],
              ["payment_method",""],
              ["remarks",""],
-             ["salary_month","2025-05-16 17:53:32"],
-             ["department_id",0],
-             ["process_id",0],
+             ["salary_month","2025-05-22 18:20:42"],
 
         ]);
         $this->validate($data, 'app\validate\salary\Salary.add');
@@ -86,17 +76,15 @@ class Salary extends BaseAdminController
     public function edit(int $id){
         $data = $this->request->params([
              ["staff_id",0],
+             ["department_id",0],
              ["base_salary",0.00],
              ["performance_bonus",0.00],
              ["deductions",0.00],
              ["other_subsidies",0.00],
-             ["net_salary",0.00],
              ["payment_status",""],
              ["payment_method",""],
              ["remarks",""],
-             ["salary_month","2025-05-16 17:53:32"],
-             ["department_id",0],
-             ["process_id",0],
+             ["salary_month","2025-05-22 18:20:42"],
 
         ]);
         $this->validate($data, 'app\validate\salary\Salary.edit');
@@ -115,4 +103,12 @@ class Salary extends BaseAdminController
     }
 
     
+    public function getPersonnelAll(){
+         return success(( new SalaryService())->getPersonnelAll());
+    }
+
+    public function getDepartmentsAll(){
+         return success(( new SalaryService())->getDepartmentsAll());
+    }
+
 }

niucloud/app/adminapi/controller/service/Service.php

@@ -29,14 +29,7 @@ class Service extends BaseAdminController
     public function lists(){
         $data = $this->request->params([
              ["service_name",""],
-             ["preview_image_url",""],
-             ["description",""],
              ["service_type",""],
-             ["execution_rules",""],
-             ["staff_reminder",""],
-             ["customer_reminder",""],
-             ["customer_confirmation",""],
-             ["customer_feedback",""],
              ["status",""]
         ]);
         return success((new ServiceService())->getPage($data));

niucloud/app/adminapi/controller/sys/Role.php

@@ -57,6 +57,7 @@ class Role extends BaseAdminController
         $data = $this->request->params([
             ['role_name', ''],
             ['rules', []],
+            ['role_key',''],
             ['status', RoleStatusDict::ON],
         ]);
         $this->validate($data, 'app\validate\sys\Role.add');
@@ -73,6 +74,7 @@ class Role extends BaseAdminController
         $data = $this->request->params([
             ['role_name', ''],
             ['rules', []],
+            ['role_key',''],
             ['status', RoleStatusDict::ON],
         ]);
         $this->validate($data, 'app\validate\sys\Role.edit');

niucloud/app/adminapi/controller/user_feedback/UserFeedback.php

@@ -28,9 +28,7 @@ class UserFeedback extends BaseAdminController
     */
     public function lists(){
         $data = $this->request->params([
-             ["user_id",""],
-             ["feedback_text",""],
-             ["attachment_url",""]
+             ["user_id",""]
         ]);
         return success((new UserFeedbackService())->getPage($data));
     }
@@ -88,4 +86,8 @@ class UserFeedback extends BaseAdminController
     }
 
     
+    public function getCustomerResourcesAll(){
+         return success(( new UserFeedbackService())->getCustomerResourcesAll());
+    }
+
 }

niucloud/app/adminapi/route/campus_pay.php

@@ -0,0 +1,42 @@
+<?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 -- campus_pay
+
+Route::group('campus_pay', function () {
+
+    //账户及资金管理列表
+    Route::get('campus_pay', 'campus_pay.CampusPay/lists');
+    //账户及资金管理详情
+    Route::get('campus_pay/:id', 'campus_pay.CampusPay/info');
+    //添加账户及资金管理
+    Route::post('campus_pay', 'campus_pay.CampusPay/add');
+    //编辑账户及资金管理
+    Route::put('campus_pay/:id', 'campus_pay.CampusPay/edit');
+    //删除账户及资金管理
+    Route::delete('campus_pay/:id', 'campus_pay.CampusPay/del');
+    
+    Route::get('campus_all','campus_pay.CampusPay/getCampusAll');
+
+})->middleware([
+    AdminCheckToken::class,
+    AdminCheckRole::class,
+    AdminLog::class
+]);
+// USER_CODE_END -- campus_pay

niucloud/app/adminapi/route/reimbursement.php

@@ -14,6 +14,10 @@ use think\facade\Route;
 use app\adminapi\middleware\AdminCheckRole;
 use app\adminapi\middleware\AdminCheckToken;
 use app\adminapi\middleware\AdminLog;
+
+
+
+
 // USER_CODE_BEGIN -- reimbursement
 
 Route::group('reimbursement', function () {
@@ -29,6 +33,8 @@ Route::group('reimbursement', function () {
     //删除报销记录
     Route::delete('reimbursement/:id', 'reimbursement.Reimbursement/del');
     
+    Route::get('personnel_all','reimbursement.Reimbursement/getPersonnelAll');
+
 })->middleware([
     AdminCheckToken::class,
     AdminCheckRole::class,

niucloud/app/adminapi/route/salary.php

@@ -14,6 +14,10 @@ use think\facade\Route;
 use app\adminapi\middleware\AdminCheckRole;
 use app\adminapi\middleware\AdminCheckToken;
 use app\adminapi\middleware\AdminLog;
+
+
+
+
 // USER_CODE_BEGIN -- salary
 
 Route::group('salary', function () {
@@ -29,6 +33,10 @@ Route::group('salary', function () {
     //删除工资
     Route::delete('salary/:id', 'salary.Salary/del');
     
+    Route::get('personnel_all','salary.Salary/getPersonnelAll');
+
+    Route::get('departments_all','salary.Salary/getDepartmentsAll');
+
 })->middleware([
     AdminCheckToken::class,
     AdminCheckRole::class,

niucloud/app/adminapi/route/service.php

@@ -15,6 +15,7 @@ use app\adminapi\middleware\AdminCheckRole;
 use app\adminapi\middleware\AdminCheckToken;
 use app\adminapi\middleware\AdminLog;
 
+
 // USER_CODE_BEGIN -- service
 
 Route::group('service', function () {

niucloud/app/adminapi/route/user_feedback.php

@@ -14,6 +14,7 @@ use think\facade\Route;
 use app\adminapi\middleware\AdminCheckRole;
 use app\adminapi\middleware\AdminCheckToken;
 use app\adminapi\middleware\AdminLog;
+
 // USER_CODE_BEGIN -- user_feedback
 
 Route::group('user_feedback', function () {
@@ -29,6 +30,8 @@ Route::group('user_feedback', function () {
     //删除用户反馈信息
     Route::delete('user_feedback/:id', 'user_feedback.UserFeedback/del');
     
+    Route::get('customer_resources_all','user_feedback.UserFeedback/getCustomerResourcesAll');
+
 })->middleware([
     AdminCheckToken::class,
     AdminCheckRole::class,

niucloud/app/api/controller/apiController/CustomerResources.php

@@ -152,5 +152,33 @@ class CustomerResources extends BaseApiService
         return success([]);
     }
 
+    //客户资源-修改记录列表
+    public function getEditLogList(Request $request){
+        //前端要传递分页(page,limit)参数
+        $customer_resource_id = $request->param('customer_resource_id','');
+        $type = $request->param('type','resource');//查询类型|resource=客户资源,six_speed=六要素
+
+        if(empty($customer_resource_id) || empty($type)){
+            return fail('缺少必要参数');
+        }
+
+        if(!in_array($type,['resource','six_speed'])){
+            return fail('类型不正确');
+        }
+
+        $where = [
+            'customer_resource_id' =>$customer_resource_id
+        ];
+
+        if($type == 'resource'){
+            //resource=客户资源
+            $res =(new CustomerResourcesService())->getCustomerResourceChangesEditLog($where);
+        }else{
+            $res =(new CustomerResourcesService())->getSixSpeedModificationEditLog($where);
+        }
+
+        return success($res);
+    }
+
 
 }

niucloud/app/api/route/route.php

@@ -208,6 +208,9 @@ Route::group(function () {
     Route::post('customerResources/add', 'apiController.CustomerResources/add');
     //客户资源-编辑
     Route::post('customerResources/edit', 'apiController.CustomerResources/edit');
+    //客户资源-修改记录列表
+    Route::get('customerResources/getEditLogList', 'apiController.CustomerResources/getEditLogList');
+
 
     //资源共享-列表
     Route::get('resourceSharing/index', 'apiController.ResourceSharing/index');

niucloud/app/dict/common/ChannelDict.php

@@ -33,10 +33,10 @@ class ChannelDict
     public static function getType($type = '')
     {
         $data = [
-            self::PC => get_lang('dict_channel.channel_pc'),//'电脑PC'
-            self::H5 => get_lang('dict_channel.channel_h5'),//'手机H5'
-            self::APP => get_lang('dict_channel.channel_app'),//'手机app'
-            self::WECHAT => get_lang('dict_channel.channel_wechat'),//'微信公众号'
+//            self::PC => get_lang('dict_channel.channel_pc'),//'电脑PC'
+//            self::H5 => get_lang('dict_channel.channel_h5'),//'手机H5'
+//            self::APP => get_lang('dict_channel.channel_app'),//'手机app'
+//            self::WECHAT => get_lang('dict_channel.channel_wechat'),//'微信公众号'
             self::WEAPP => get_lang('dict_channel.channel_weapp'),//微信小程序
         ];
         if (empty($type)) {

niucloud/app/dict/pay/PayDict.php

@@ -64,30 +64,30 @@ class PayDict
                 'setting_component' => '/src/app/views/setting/components/pay-wechatpay.vue',
                 'encrypt_params' => [ 'mch_public_cert_path', 'mch_secret_cert', 'mch_secret_key', 'wechat_public_cert_path' ],
             ],
-            // 支付宝支付
-            self::ALIPAY => [
-                'name' => get_lang('dict_pay.type_alipay'),
-                'key' => self::ALIPAY,
-                'icon' => self::ALIPAY_ICON,
-                'setting_component' => '/src/app/views/setting/components/pay-alipay.vue',
-                'encrypt_params' => [ 'app_secret_cert', 'app_public_cert_path', 'alipay_public_cert_path', 'alipay_root_cert_path' ],
-            ],
-            // 余额支付
-            self::BALANCEPAY => [
-                'name' => get_lang('dict_pay.type_balancepay'),
-                'key' => self::BALANCEPAY,
-                'icon' => self::BALANCEPAY_ICON,
-                'setting_component' => '',
-                'encrypt_params' => [ 'secret_key' ],
-            ],
-            // 找朋友帮忙付
-            self::FRIENDSPAY => [
-                'name' => get_lang('dict_pay.type_friendspay'),
-                'key' => self::FRIENDSPAY,
-                'icon' => self::FRIENDSPAY_ICON,
-                'setting_component' => '/src/app/views/setting/components/pay-friendspay.vue',
-                'encrypt_params' => [],
-            ],
+//            // 支付宝支付
+//            self::ALIPAY => [
+//                'name' => get_lang('dict_pay.type_alipay'),
+//                'key' => self::ALIPAY,
+//                'icon' => self::ALIPAY_ICON,
+//                'setting_component' => '/src/app/views/setting/components/pay-alipay.vue',
+//                'encrypt_params' => [ 'app_secret_cert', 'app_public_cert_path', 'alipay_public_cert_path', 'alipay_root_cert_path' ],
+//            ],
+//            // 余额支付
+//            self::BALANCEPAY => [
+//                'name' => get_lang('dict_pay.type_balancepay'),
+//                'key' => self::BALANCEPAY,
+//                'icon' => self::BALANCEPAY_ICON,
+//                'setting_component' => '',
+//                'encrypt_params' => [ 'secret_key' ],
+//            ],
+//            // 找朋友帮忙付
+//            self::FRIENDSPAY => [
+//                'name' => get_lang('dict_pay.type_friendspay'),
+//                'key' => self::FRIENDSPAY,
+//                'icon' => self::FRIENDSPAY_ICON,
+//                'setting_component' => '/src/app/views/setting/components/pay-friendspay.vue',
+//                'encrypt_params' => [],
+//            ],
         ];
 
         $list = array_merge($list, ...event('PayType'));

niucloud/app/model/campus_pay/CampusPay.php

@@ -0,0 +1,98 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\model\campus_pay;
+
+use core\base\BaseModel;
+use think\model\concern\SoftDelete;
+use think\model\relation\HasMany;
+use think\model\relation\HasOne;
+
+use app\model\campus\Campus;
+
+/**
+ * 账户及资金管理模型
+ * Class CampusPay
+ * @package app\model\campus_pay
+ */
+class CampusPay extends BaseModel
+{
+
+    
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'campus_pay';
+
+    
+
+    
+
+    /**
+     * 搜索器:账户及资金管理
+     * @param $value
+     * @param $data
+     */
+    public function searchIdAttr($query, $value, $data)
+    {
+       if ($value) {
+            $query->where("id", $value);
+        }
+    }
+    
+    /**
+     * 搜索器:账户及资金管理校区
+     * @param $value
+     * @param $data
+     */
+    public function searchCampusIdAttr($query, $value, $data)
+    {
+       if ($value) {
+            $query->where("campus_id", $value);
+        }
+    }
+    
+    /**
+     * 搜索器:账户及资金管理创建时间
+     * @param $value
+     * @param $data
+     */
+    public function searchCreatedAtAttr($query, $value, $data)
+    {
+        $start = empty($value[0]) ? 0 : strtotime($value[0]);
+        $end = empty($value[1]) ? 0 : strtotime($value[1]);
+        if ($start > 0 && $end > 0) {
+             $query->where([["created_at", "between", [$start, $end]]]);
+        } else if ($start > 0 && $end == 0) {
+            $query->where([["created_at", ">=", $start]]);
+        } else if ($start == 0 && $end > 0) {
+            $query->where([["created_at", "<=", $end]]);
+        }
+    }
+    
+    
+
+    
+
+    
+    public function campus(){
+       return $this->hasOne(Campus::class, 'id', 'campus_id')->joinType('left')->withField('campus_name,id')->bind(['campus_id_name'=>'campus_name']);
+    }
+
+}

niucloud/app/model/customer_resources/CustomerResources.php

@@ -15,6 +15,7 @@ use app\model\dict\Dict;
 use app\model\resource_sharing\ResourceSharing;
 use app\model\six_speed\SixSpeed;
 use core\base\BaseModel;
+use think\db\Query;
 use think\model\concern\SoftDelete;
 use think\model\relation\HasMany;
 use think\model\relation\HasOne;
@@ -57,6 +58,37 @@ class CustomerResources extends BaseModel
     */
     protected $defaultSoftDelete = 0;
 
+    protected $json = [ 'member_label' ];
+
+    protected $jsonAssoc = true;
+
+    //定义一个常量数组-字段中文映射
+    const FieldZh = [
+        'id' => '编号',
+        'create_year_month' => '创建年月',
+        'create_date' => '创建日期',
+        'source_channel' => '来源渠道',
+        'source' => '来源',
+        'consultant' => '顾问',
+        'name' => '姓名',
+        'age' => '年龄',
+        'gender' => '性别',
+        'phone_number' => '联系电话',
+        'demand' => '需求',
+        'purchasing_power' => '购买力',
+        'cognitive_idea' => '认知理念',
+        'optional_class_time' => '可选上课时间',
+        'distance' => '距离',
+        'decision_maker' => '决策人',
+        'initial_intent' => '客户初步意向度',
+        'campus' => '所属校区',
+        'trial_class_count' => '体验课次数',
+        'created_at' => '创建时间',
+        'updated_at' => '更新时间',
+        'deleted_at' => '逻辑删除时间',
+        'status' => '客户状态',
+    ];
+
     /**
      * 搜索器:客户资源姓名
      * @param $value
@@ -69,6 +101,14 @@ class CustomerResources extends BaseModel
         }
     }
 
+    public function searchMemberLabelAttr(Query $query, $value, $data)
+    {
+        if ($value) {
+            $query->whereLike('member_label', '%"' . $value . '"%');
+        }
+    }
+
+
     /**
      * 搜索器:客户资源联系电话
      * @param $value

niucloud/app/model/reimbursement/Reimbursement.php

@@ -16,6 +16,8 @@ use think\model\concern\SoftDelete;
 use think\model\relation\HasMany;
 use think\model\relation\HasOne;
 
+use app\model\personnel\Personnel;
+
 /**
  * 报销记录模型
  * Class Reimbursement
@@ -42,66 +44,6 @@ class Reimbursement extends BaseModel
 
     
 
-    /**
-     * 搜索器:报销记录报销编号
-     * @param $value
-     * @param $data
-     */
-    public function searchIdAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("id", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:报销记录申请人ID
-     * @param $value
-     * @param $data
-     */
-    public function searchApplicantIdAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("applicant_id", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:报销记录报销金额
-     * @param $value
-     * @param $data
-     */
-    public function searchAmountAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("amount", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:报销记录报销描述
-     * @param $value
-     * @param $data
-     */
-    public function searchDescriptionAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("description", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:报销记录发票或收据URL
-     * @param $value
-     * @param $data
-     */
-    public function searchReceiptUrlAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("receipt_url", $value);
-        }
-    }
-    
     /**
      * 搜索器:报销记录状态
      * @param $value
@@ -115,14 +57,20 @@ class Reimbursement extends BaseModel
     }
     
     /**
-     * 搜索器:报销记录关联的审批流程ID
+     * 搜索器:报销记录创建时间
      * @param $value
      * @param $data
      */
-    public function searchProcessIdAttr($query, $value, $data)
+    public function searchCreatedAtAttr($query, $value, $data)
     {
-       if ($value) {
-            $query->where("process_id", $value);
+        $start = empty($value[0]) ? 0 : strtotime($value[0]);
+        $end = empty($value[1]) ? 0 : strtotime($value[1]);
+        if ($start > 0 && $end > 0) {
+             $query->where([["created_at", "between", [$start, $end]]]);
+        } else if ($start > 0 && $end == 0) {
+            $query->where([["created_at", ">=", $start]]);
+        } else if ($start == 0 && $end > 0) {
+            $query->where([["created_at", "<=", $end]]);
         }
     }
     
@@ -131,4 +79,8 @@ class Reimbursement extends BaseModel
     
 
     
+    public function personnel(){
+       return $this->hasOne(Personnel::class, 'id', 'applicant_id')->joinType('left')->withField('name,id')->bind(['applicant_id_name'=>'name']);
+    }
+
 }

niucloud/app/model/salary/Salary.php

@@ -16,6 +16,10 @@ use think\model\concern\SoftDelete;
 use think\model\relation\HasMany;
 use think\model\relation\HasOne;
 
+use app\model\personnel\Personnel;
+
+use app\model\departments\Departments;
+
 /**
  * 工资模型
  * Class Salary
@@ -43,19 +47,7 @@ class Salary extends BaseModel
     
 
     /**
-     * 搜索器:工资工资编号
-     * @param $value
-     * @param $data
-     */
-    public function searchIdAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("id", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:工资员工ID
+     * 搜索器:工资员工
      * @param $value
      * @param $data
      */
@@ -67,62 +59,14 @@ class Salary extends BaseModel
     }
     
     /**
-     * 搜索器:工资底薪
-     * @param $value
-     * @param $data
-     */
-    public function searchBaseSalaryAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("base_salary", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:工资绩效
-     * @param $value
-     * @param $data
-     */
-    public function searchPerformanceBonusAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("performance_bonus", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:工资扣款
-     * @param $value
-     * @param $data
-     */
-    public function searchDeductionsAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("deductions", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:工资其他补贴
-     * @param $value
-     * @param $data
-     */
-    public function searchOtherSubsidiesAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("other_subsidies", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:工资实发工资
+     * 搜索器:工资部门
      * @param $value
      * @param $data
      */
-    public function searchNetSalaryAttr($query, $value, $data)
+    public function searchDepartmentIdAttr($query, $value, $data)
     {
        if ($value) {
-            $query->where("net_salary", $value);
+            $query->where("department_id", $value);
         }
     }
     
@@ -139,68 +83,34 @@ class Salary extends BaseModel
     }
     
     /**
-     * 搜索器:工资发放方式
+     * 搜索器:工资创建时间
      * @param $value
      * @param $data
      */
-    public function searchPaymentMethodAttr($query, $value, $data)
+    public function searchCreatedAtAttr($query, $value, $data)
     {
-       if ($value) {
-            $query->where("payment_method", $value);
+        $start = empty($value[0]) ? 0 : strtotime($value[0]);
+        $end = empty($value[1]) ? 0 : strtotime($value[1]);
+        if ($start > 0 && $end > 0) {
+             $query->where([["created_at", "between", [$start, $end]]]);
+        } else if ($start > 0 && $end == 0) {
+            $query->where([["created_at", ">=", $start]]);
+        } else if ($start == 0 && $end > 0) {
+            $query->where([["created_at", "<=", $end]]);
         }
     }
     
-    /**
-     * 搜索器:工资备注
-     * @param $value
-     * @param $data
-     */
-    public function searchRemarksAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("remarks", $value);
-        }
-    }
     
-    /**
-     * 搜索器:工资工资月份
-     * @param $value
-     * @param $data
-     */
-    public function searchSalaryMonthAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("salary_month", $value);
-        }
-    }
+
     
-    /**
-     * 搜索器:工资部门ID
-     * @param $value
-     * @param $data
-     */
-    public function searchDepartmentIdAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("department_id", $value);
-        }
-    }
+
     
-    /**
-     * 搜索器:工资关联的审批流程ID
-     * @param $value
-     * @param $data
-     */
-    public function searchProcessIdAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("process_id", $value);
-        }
+    public function personnel(){
+       return $this->hasOne(Personnel::class, 'id', 'staff_id')->joinType('left')->withField('name,id')->bind(['staff_id_name'=>'name']);
     }
-    
-    
 
-    
+    public function departments(){
+       return $this->hasOne(Departments::class, 'id', 'department_id')->joinType('left')->withField('department_name,id')->bind(['department_id_name'=>'department_name']);
+    }
 
-    
 }

niucloud/app/model/service/Service.php

@@ -50,18 +50,6 @@ class Service extends BaseModel
     */
     protected $defaultSoftDelete = 0;
 
-    /**
-     * 搜索器:服务服务编号
-     * @param $value
-     * @param $data
-     */
-    public function searchIdAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("id", $value);
-        }
-    }
-    
     /**
      * 搜索器:服务服务名称
      * @param $value
@@ -74,30 +62,6 @@ class Service extends BaseModel
         }
     }
     
-    /**
-     * 搜索器:服务服务预览图URL
-     * @param $value
-     * @param $data
-     */
-    public function searchPreviewImageUrlAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("preview_image_url", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:服务服务描述
-     * @param $value
-     * @param $data
-     */
-    public function searchDescriptionAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("description", $value);
-        }
-    }
-    
     /**
      * 搜索器:服务服务类型
      * @param $value
@@ -110,66 +74,6 @@ class Service extends BaseModel
         }
     }
     
-    /**
-     * 搜索器:服务服务执行规则
-     * @param $value
-     * @param $data
-     */
-    public function searchExecutionRulesAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("execution_rules", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:服务是否员工提醒: 1-是, 0-否
-     * @param $value
-     * @param $data
-     */
-    public function searchStaffReminderAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("staff_reminder", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:服务是否客户提醒: 1-是, 0-否
-     * @param $value
-     * @param $data
-     */
-    public function searchCustomerReminderAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("customer_reminder", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:服务是否客户确认: 1-是, 0-否
-     * @param $value
-     * @param $data
-     */
-    public function searchCustomerConfirmationAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("customer_confirmation", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:服务客户反馈内容
-     * @param $value
-     * @param $data
-     */
-    public function searchCustomerFeedbackAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("customer_feedback", $value);
-        }
-    }
-    
     /**
      * 搜索器:服务状态
      * @param $value

niucloud/app/model/six_speed/SixSpeed.php

@@ -57,7 +57,26 @@ class SixSpeed extends BaseModel
 
 
 
-
+    //定义一个常量数组-字段中文映射
+    const FieldZh = [
+        'id' => '编号',
+        'purchase_power' => '需求购买力',
+        'concept_awareness' => '认知理念',
+        'preferred_class_time' => '可选上课时间',
+        'distance' => '距离',
+        'communication' => '沟通备注',
+        'promised_visit_time' => '承诺到访时间',
+        'actual_visit_time' => '实际到访时间',
+        'call_intent' => '电话后的意向程度',
+        'first_visit_status' => '一访情况',
+        'second_visit_status' => '二访情况',
+        'is_closed' => '是否关单',
+        'staff_id' => '人员ID',
+        'resource_id' => '资源ID',
+        'created_at' => '创建时间',
+        'updated_at' => '更新时间',
+        'deleted_at' => '逻辑删除时间'
+    ];
 
 
     public function personnel(){

niucloud/app/model/user_feedback/UserFeedback.php

@@ -16,6 +16,8 @@ use think\model\concern\SoftDelete;
 use think\model\relation\HasMany;
 use think\model\relation\HasOne;
 
+use app\model\customer_resources\CustomerResources;
+
 /**
  * 用户反馈信息模型
  * Class UserFeedback
@@ -43,19 +45,7 @@ class UserFeedback extends BaseModel
     
 
     /**
-     * 搜索器:用户反馈信息反馈编号
-     * @param $value
-     * @param $data
-     */
-    public function searchIdAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("id", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:用户反馈信息用户ID
+     * 搜索器:用户反馈信息客户名称
      * @param $value
      * @param $data
      */
@@ -66,33 +56,13 @@ class UserFeedback extends BaseModel
         }
     }
     
-    /**
-     * 搜索器:用户反馈信息反馈内容
-     * @param $value
-     * @param $data
-     */
-    public function searchFeedbackTextAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("feedback_text", $value);
-        }
-    }
-    
-    /**
-     * 搜索器:用户反馈信息附件URL（OSS对象存储）
-     * @param $value
-     * @param $data
-     */
-    public function searchAttachmentUrlAttr($query, $value, $data)
-    {
-       if ($value) {
-            $query->where("attachment_url", $value);
-        }
-    }
-    
     
 
     
 
     
+    public function customerResources(){
+       return $this->hasOne(CustomerResources::class, 'id', 'user_id')->joinType('left')->withField('name,id')->bind(['user_id_name'=>'name']);
+    }
+
 }

niucloud/app/service/admin/campus_pay/CampusPayService.php

@@ -0,0 +1,105 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\service\admin\campus_pay;
+
+use app\model\campus_pay\CampusPay;
+use app\model\campus\Campus;
+
+use core\base\BaseAdminService;
+
+
+/**
+ * 账户及资金管理服务层
+ * Class CampusPayService
+ * @package app\service\admin\campus_pay
+ */
+class CampusPayService extends BaseAdminService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new CampusPay();
+    }
+
+    /**
+     * 获取账户及资金管理列表
+     * @param array $where
+     * @return array
+     */
+    public function getPage(array $where = [])
+    {
+        $field = 'id,campus_id,mchid,pay_sign_key,apiclient_key,apiclient_cert,wx_pay_key,wx_pay_key_id,created_at,updated_at';
+        $order = 'id desc';
+
+        $search_model = $this->model->withSearch(["id","campus_id","created_at"], $where)->with(['campus'])->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        return $list;
+    }
+
+    /**
+     * 获取账户及资金管理信息
+     * @param int $id
+     * @return array
+     */
+    public function getInfo(int $id)
+    {
+        $field = 'id,campus_id,mchid,pay_sign_key,apiclient_key,apiclient_cert,wx_pay_key,wx_pay_key_id,created_at,updated_at';
+
+        $info = $this->model->field($field)->where([['id', "=", $id]])->with(['campus'])->findOrEmpty()->toArray();
+        return $info;
+    }
+
+    /**
+     * 添加账户及资金管理
+     * @param array $data
+     * @return mixed
+     */
+    public function add(array $data)
+    {
+        $res = $this->model->create($data);
+        return $res->id;
+
+    }
+
+    /**
+     * 账户及资金管理编辑
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function edit(int $id, array $data)
+    {
+
+        $this->model->where([['id', '=', $id]])->update($data);
+        return true;
+    }
+
+    /**
+     * 删除账户及资金管理
+     * @param int $id
+     * @return bool
+     */
+    public function del(int $id)
+    {
+        $model = $this->model->where([['id', '=', $id]])->find();
+        $res = $model->delete();
+        return $res;
+    }
+
+    
+    public function getCampusAll(){
+       $campusModel = new Campus();
+       return $campusModel->select()->toArray();
+    }
+
+
+}

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

@@ -19,6 +19,7 @@ use app\model\campus\Campus;
 use app\model\resource_sharing\ResourceSharing;
 use app\model\six_speed\SixSpeed;
 use app\model\six_speed_modification_log\SixSpeedModificationLog;
+use app\service\admin\member\MemberLabelService;
 use core\base\BaseAdminService;
 
 
@@ -66,9 +67,9 @@ class CustomerResourcesService extends BaseAdminService
             $where[] = ['b.shared_by','=',0];
         }
 
-
-
-
+        if($data['member_label']){
+            $where[] = ['a.member_label','like',"%".$data['member_label']."%"];
+        }
 
 
         $search_model = $this->model
@@ -87,11 +88,9 @@ class CustomerResourcesService extends BaseAdminService
         }
 
 
-        $list = $this->pageQuery($search_model);
-
-
-
-        return $list;
+        return $this->pageQuery($search_model, function ($item, $key) {
+            $item = $this->makeUp($item);
+        });
     }
 
     /**
@@ -101,7 +100,7 @@ class CustomerResourcesService extends BaseAdminService
      */
     public function getInfo(int $id)
     {
-        $field = 'id,create_year_month,create_date,source,source_channel,consultant,name,age,gender,phone_number,demand,purchasing_power,cognitive_idea,optional_class_time,distance,decision_maker,initial_intent,campus,created_at,updated_at,deleted_at,status';
+        $field = 'id,create_year_month,create_date,source,source_channel,member_label,consultant,name,age,gender,phone_number,demand,purchasing_power,cognitive_idea,optional_class_time,distance,decision_maker,initial_intent,campus,created_at,updated_at,deleted_at,status';
 
         $info = $this->model->field($field)->where([['id', "=", $id]])->with(['personnel'])->findOrEmpty()->toArray();
 
@@ -109,7 +108,16 @@ class CustomerResourcesService extends BaseAdminService
         $data = $sixSpeed->where(['resource_id' => $id])->field("*,distance as distance_tow")->findOrEmpty()->toArray();
         $info = $info+$data;
 
-        return $info;
+        return $this->makeUp($info);
+    }
+
+
+    public function makeUp($data){
+        //会员标签
+        if(!empty($data['member_label'])){
+            $data['member_label_array'] = (new MemberLabelService())->getMemberLabelListByLabelIds($data['member_label']);
+        }
+        return $data;
     }
 
     /**
@@ -128,6 +136,8 @@ class CustomerResourcesService extends BaseAdminService
         }
         $sixSpeed = new SixSpeed();
 
+//        $data['member_label'] = json_encode($data['member_label']);
+
         $res = $this->model->create($data);
 
 
@@ -188,7 +198,7 @@ class CustomerResourcesService extends BaseAdminService
         $this->model->where([['id', '=', $id]])->update([
             'source' => $data['source'],
             'source_channel' => $data['source_channel'],
-//            'consultant' => $data['consultant'],
+            'member_label' => $data['member_label'],
             'name' => $data['name'],
             'age' => $data['age'],
             'gender' => $data['gender'],

niucloud/app/service/admin/departments/DepartmentsService.php

@@ -65,8 +65,12 @@ class DepartmentsService extends BaseAdminService
      */
     public function add(array $data)
     {
+
+        if($this->model->where(['department_name' => $data['department_name']])->find()){
+            return fail("部门名称不能重复");
+        }
         $res = $this->model->create($data);
-        return $res->id;
+        return success("操作成功");
 
     }
 
@@ -74,13 +78,14 @@ class DepartmentsService extends BaseAdminService
      * 部门编辑
      * @param int $id
      * @param array $data
-     * @return bool
      */
     public function edit(int $id, array $data)
     {
-
+        if($this->model->where([['id', '<>', $id]])->where(['department_name' => $data['department_name']])->find()){
+            return fail("部门名称不能重复");
+        }
         $this->model->where([['id', '=', $id]])->update($data);
-        return true;
+        return success("操作成功");
     }
 
     /**

niucloud/app/service/admin/order_table/OrderTableService.php

@@ -69,15 +69,15 @@ class OrderTableService extends BaseAdminService
     public function add(array $data)
     {
         $personnel = new Personnel();
-        $data['staff_id'] = $personnel->where(['sys_user_id' => $this->uid])->value("id");
-        if(!$data['staff_id']){
-            return fail("操作失败");
-        }
+//        $data['staff_id'] = $personnel->where(['sys_user_id' => $this->uid])->value("id");
+//        if(!$data['staff_id']){
+//            return fail("操作失败");
+//        }
 
-//        $data['staff_id'] = 1;
+        $data['staff_id'] = 1;
 
         $res = $this->model->create($data);
-        return $res->id;
+        return success("操作成功");
 
     }
 

niucloud/app/service/admin/pay/PayChannelService.php

@@ -15,6 +15,7 @@ use app\dict\common\ChannelDict;
 use app\dict\common\CommonDict;
 use app\dict\pay\PayChannelDict;
 use app\dict\pay\PayDict;
+use app\model\campus\Campus;
 use app\model\pay\PayChannel;
 use app\service\core\pay\CorePayChannelService;
 use core\base\BaseAdminService;
@@ -84,6 +85,7 @@ class PayChannelService extends BaseAdminService
      */
     public function getChannelList()
     {
+
         $channel_list = PayChannelDict::getPayChannel();
         $where = array (
             ['id', '>', 0]
@@ -97,32 +99,41 @@ class PayChannelService extends BaseAdminService
 
         $pay_type_list = PayDict::getPayType();
 
-        foreach ($channel_list as $k => $v) {
-            $temp_item = $pay_channel_list[ $k ] ?? [];
-            foreach ($v[ 'pay_type' ] as $item_k => $item_v) {
-                if (isset($temp_item[ $item_k ])) {
-                    $temp_v_item = $temp_item[ $item_k ];
-                    $encrypt_params = $pay_type_list[$item_k]['encrypt_params'] ?? [];
-                    foreach ($temp_v_item['config'] as $config_k => $config_v) {
-                        if ($config_v !== '' && in_array($config_k, $encrypt_params)) $temp_v_item['config'][$config_k] = CommonDict::ENCRYPT_STR;
+        $campus = new Campus();
+        $campus_list = $campus->select();
+        $list = [];
+        foreach ($campus_list as $key=>$val){
+            foreach ($channel_list as $k => $v) {
+                $temp_item = $pay_channel_list[ $k ] ?? [];
+                foreach ($v[ 'pay_type' ] as $item_k => $item_v) {
+                    if (isset($temp_item[ $item_k ])) {
+                        $temp_v_item = $temp_item[ $item_k ];
+                        $encrypt_params = $pay_type_list[$item_k]['encrypt_params'] ?? [];
+                        foreach ($temp_v_item['config'] as $config_k => $config_v) {
+                            if ($config_v !== '' && in_array($config_k, $encrypt_params)) $temp_v_item['config'][$config_k] = CommonDict::ENCRYPT_STR;
+                        }
+                    } else {
+                        $temp_v_item = [ 'status' => 0, 'config' => $this->getConfigByPayType([], $item_k), 'sort' => 0 ];
                     }
-                } else {
-                    $temp_v_item = [ 'status' => 0, 'config' => $this->getConfigByPayType([], $item_k), 'sort' => 0 ];
-                }
-                $item_v[ 'config' ] = $temp_v_item[ 'config' ];
-                $item_v[ 'status' ] = $temp_v_item[ 'status' ];
-                $item_v[ 'sort' ] = $temp_v_item[ 'sort' ];
-                if ($item_k == PayDict::FRIENDSPAY) {
-                    $item_v[ 'name' ] = $temp_v_item[ 'config' ][ 'pay_type_name' ] ?? get_lang('dict_pay.type_friendspay');
+                    $item_v[ 'config' ] = $temp_v_item[ 'config' ];
+                    $item_v[ 'status' ] = $temp_v_item[ 'status' ];
+                    $item_v[ 'sort' ] = $temp_v_item[ 'sort' ];
+                    if ($item_k == PayDict::FRIENDSPAY) {
+                        $item_v[ 'name' ] = $temp_v_item[ 'config' ][ 'pay_type_name' ] ?? get_lang('dict_pay.type_friendspay');
+                    }
+                    $channel_list[ $k ][ 'pay_type' ][ $item_k ] = $item_v;
                 }
-                $channel_list[ $k ][ 'pay_type' ][ $item_k ] = $item_v;
+                $temp_pay_type = array_values($channel_list[ $k ][ 'pay_type' ]);
+                $sort = array_column($temp_pay_type, 'sort');
+                array_multisort($sort, SORT_ASC, $temp_pay_type);
+                $channel_list[ $k ][ 'pay_type' ] = $temp_pay_type;
+                $channel_list[$k]['campus_name'] = $val['campus_name'];
             }
-            $temp_pay_type = array_values($channel_list[ $k ][ 'pay_type' ]);
-            $sort = array_column($temp_pay_type, 'sort');
-            array_multisort($sort, SORT_ASC, $temp_pay_type);
-            $channel_list[ $k ][ 'pay_type' ] = $temp_pay_type;
+            $list[$key] = $channel_list;
         }
-        return $channel_list;
+
+
+        return $list;
     }
 
     /**

niucloud/app/service/admin/reimbursement/ReimbursementService.php

@@ -12,6 +12,7 @@
 namespace app\service\admin\reimbursement;
 
 use app\model\reimbursement\Reimbursement;
+use app\model\personnel\Personnel;
 
 use core\base\BaseAdminService;
 
@@ -39,7 +40,7 @@ class ReimbursementService extends BaseAdminService
         $field = 'id,applicant_id,amount,description,receipt_url,status,process_id,created_at,updated_at';
         $order = 'id desc';
 
-        $search_model = $this->model->withSearch(["id","applicant_id","amount","description","receipt_url","status","process_id"], $where)->field($field)->order($order);
+        $search_model = $this->model->withSearch(["status","created_at"], $where)->with(['personnel'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
         return $list;
     }
@@ -53,7 +54,7 @@ class ReimbursementService extends BaseAdminService
     {
         $field = 'id,applicant_id,amount,description,receipt_url,status,process_id,created_at,updated_at';
 
-        $info = $this->model->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray();
+        $info = $this->model->field($field)->where([['id', "=", $id]])->with(['personnel'])->findOrEmpty()->toArray();
         return $info;
     }
 
@@ -95,5 +96,10 @@ class ReimbursementService extends BaseAdminService
     }
 
     
+    public function getPersonnelAll(){
+       $personnelModel = new Personnel();
+       return $personnelModel->select()->toArray();
+    }
+
 
 }

niucloud/app/service/admin/salary/SalaryService.php

@@ -12,6 +12,8 @@
 namespace app\service\admin\salary;
 
 use app\model\salary\Salary;
+use app\model\personnel\Personnel;
+use app\model\departments\Departments;
 
 use core\base\BaseAdminService;
 
@@ -36,10 +38,10 @@ class SalaryService extends BaseAdminService
      */
     public function getPage(array $where = [])
     {
-        $field = 'id,staff_id,base_salary,performance_bonus,deductions,other_subsidies,net_salary,payment_status,payment_method,remarks,salary_month,department_id,process_id,created_at,updated_at';
+        $field = 'id,staff_id,department_id,base_salary,performance_bonus,deductions,other_subsidies,net_salary,payment_status,payment_method,remarks,salary_month,process_id,created_at,updated_at';
         $order = 'id desc';
 
-        $search_model = $this->model->withSearch(["id","staff_id","base_salary","performance_bonus","deductions","other_subsidies","net_salary","payment_status","payment_method","remarks","salary_month","department_id","process_id"], $where)->field($field)->order($order);
+        $search_model = $this->model->withSearch(["staff_id","department_id","payment_status","created_at"], $where)->with(['personnel','departments'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
         return $list;
     }
@@ -51,9 +53,9 @@ class SalaryService extends BaseAdminService
      */
     public function getInfo(int $id)
     {
-        $field = 'id,staff_id,base_salary,performance_bonus,deductions,other_subsidies,net_salary,payment_status,payment_method,remarks,salary_month,department_id,process_id,created_at,updated_at';
+        $field = 'id,staff_id,department_id,base_salary,performance_bonus,deductions,other_subsidies,net_salary,payment_status,payment_method,remarks,salary_month,process_id,created_at,updated_at';
 
-        $info = $this->model->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray();
+        $info = $this->model->field($field)->where([['id', "=", $id]])->with(['personnel','departments'])->findOrEmpty()->toArray();
         return $info;
     }
 
@@ -95,5 +97,15 @@ class SalaryService extends BaseAdminService
     }
 
     
+    public function getPersonnelAll(){
+       $personnelModel = new Personnel();
+       return $personnelModel->select()->toArray();
+    }
+
+    public function getDepartmentsAll(){
+       $departmentsModel = new Departments();
+       return $departmentsModel->select()->toArray();
+    }
+
 
 }

niucloud/app/service/admin/service/ServiceService.php

@@ -39,7 +39,7 @@ class ServiceService extends BaseAdminService
         $field = 'id,service_name,preview_image_url,description,service_type,execution_rules,staff_reminder,customer_reminder,customer_confirmation,customer_feedback,status,created_at,updated_at,deleted_at';
         $order = 'id desc';
 
-        $search_model = $this->model->withSearch(["id","service_name","preview_image_url","description","service_type","execution_rules","staff_reminder","customer_reminder","customer_confirmation","customer_feedback","status"], $where)->field($field)->order($order);
+        $search_model = $this->model->withSearch(["service_name","service_type","status"], $where)->field($field)->order($order);
         $list = $this->pageQuery($search_model);
         return $list;
     }

niucloud/app/service/admin/sys/RoleService.php

@@ -46,7 +46,7 @@ class RoleService extends BaseAdminService
         if(isset($data['role_name']) && $data['role_name'] !== '') {
             $where[] = ['role_name', 'like', "%".$this->model->handelSpecialCharacter($data['role_name'])."%"];
         }
-        $field = 'role_id,role_name,status,create_time';
+        $field = 'role_id,role_name,role_key,status,create_time';
         $search_model = $this->model->where($where)->field($field)->order('create_time desc')->append(['status_name']);
         return $this->pageQuery($search_model);
     }
@@ -71,7 +71,7 @@ class RoleService extends BaseAdminService
         $where = array(
             ['status', '=', 1]
         );
-        return $this->model->where($where)->field('role_id,role_name,status,create_time')->select()->toArray();
+        return $this->model->where($where)->field('role_id,role_name,role_key,status,create_time')->select()->toArray();
     }
 
     /**

niucloud/app/service/admin/user_feedback/UserFeedbackService.php

@@ -12,6 +12,7 @@
 namespace app\service\admin\user_feedback;
 
 use app\model\user_feedback\UserFeedback;
+use app\model\customer_resources\CustomerResources;
 
 use core\base\BaseAdminService;
 
@@ -39,7 +40,7 @@ class UserFeedbackService extends BaseAdminService
         $field = 'id,user_id,feedback_text,attachment_url,created_at,updated_at';
         $order = 'id desc';
 
-        $search_model = $this->model->withSearch(["id","user_id","feedback_text","attachment_url"], $where)->field($field)->order($order);
+        $search_model = $this->model->withSearch(["user_id"], $where)->with(['customerResources'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
         return $list;
     }
@@ -53,7 +54,7 @@ class UserFeedbackService extends BaseAdminService
     {
         $field = 'id,user_id,feedback_text,attachment_url,created_at,updated_at';
 
-        $info = $this->model->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray();
+        $info = $this->model->field($field)->where([['id', "=", $id]])->with(['customerResources'])->findOrEmpty()->toArray();
         return $info;
     }
 
@@ -95,5 +96,10 @@ class UserFeedbackService extends BaseAdminService
     }
 
     
+    public function getCustomerResourcesAll(){
+       $customerResourcesModel = new CustomerResources();
+       return $customerResourcesModel->select()->toArray();
+    }
+
 
 }

niucloud/app/service/api/apiService/CustomerResourcesService.php

@@ -14,6 +14,7 @@ namespace app\service\api\apiService;
 use app\model\campus_person_role\CampusPersonRole;
 use app\model\customer_resource_changes\CustomerResourceChanges;
 use app\model\customer_resources\CustomerResources;
+use app\model\dict\Dict;
 use app\model\personnel\Personnel;
 use app\model\resource_sharing\ResourceSharing;
 use app\model\six_speed\SixSpeed;
@@ -205,6 +206,263 @@ class CustomerResourcesService extends BaseApiService
         }
     }
 
+    //客户资源-获取客户资源修改记录列表
+    public function getCustomerResourceChangesEditLog(array $where)
+    {
+        $page_params = $this->getPageParam();//获取请求参数中的页码+分页数
+        $page = $page_params['page'];
+        $limit = $page_params['limit'];
+
+        //客户资源修改记录表
+        $data = CustomerResourceChanges::where('customer_resource_id', $where['customer_resource_id'])
+            ->order('created_at', 'desc')
+            ->with([
+                'personnel' => function ($query) {
+                }
+            ])
+            ->paginate([
+                'list_rows' => $limit,
+                'page' => $page,
+            ])
+            ->toArray();
+
+
+        $fieldZhArr = CustomerResources::FieldZh;//字段中文映射常量
+        //需要获取字段与字典key的映射关系数组
+        $fieldDictArr = [
+            'source_channel'=>'SourceChannel',//field=>dict_key(来源渠道)
+            'source'=>'source',//field=>dict_key(来源)
+            'gender'=>'zy_sex',//field=>dict_key(性别)
+            'purchasing_power'=>'customer_purchasing_power',//field=>dict_key(购买力)
+            'cognitive_idea'=>'cognitive_concept',//field=>dict_key(认知理念)
+            'initial_intent'=>'preliminarycustomerintention',//field=>dict_key(客户初步意向度)
+            'status'=>'kh_status',//field=>dict_key(客户状态)
+        ];
+        $dict_arr = $this->getFieldDictionary($fieldDictArr);//字段与字典值列表的映射关系
+
+        $consultant_id_arr = [];
+        foreach ($data['data'] as $v) {
+            $modified_fields_arr = json_decode($v['modified_fields'], true);
+            $old_values_arr = json_decode($v['old_values'], true);
+            $new_values_arr = json_decode($v['new_values'], true);
+
+            //判断有没有修改过"顾问"字段
+            if(in_array('consultant',$modified_fields_arr)){
+                $consultant_id_arr[] = $old_values_arr['consultant'];
+                $consultant_id_arr[] = $new_values_arr['consultant'];
+            }
+        }
+        $consultant_id_arr = array_unique($consultant_id_arr);//去重
+        $dict_arr['consultant'] = [];//获取员工信息列表
+        if($consultant_id_arr){
+            $personnel = Personnel::whereIn('id',$consultant_id_arr)->field('id,name')->select()->toArray();
+            foreach($personnel as $v){
+                $dict_arr['consultant'][] = [
+                    "name" => $v['name'],
+                    "value" => $v['id'],
+                    "sort" => 0,
+                    "memo" => "",
+                ];
+            }
+        }
+
+
+        $fieldDictKeyArr = array_keys($fieldDictArr);
+        $list = [];
+        foreach ($data['data'] as $v) {
+            $modified_fields_arr = json_decode($v['modified_fields'], true);
+            $old_values_arr = json_decode($v['old_values'], true);
+            $new_values_arr = json_decode($v['new_values'], true);
+
+
+            $update_arr = [];
+            foreach ($modified_fields_arr as $m_v) {
+                $old_value = $old_values_arr[$m_v] ?? '';
+                $new_value = $new_values_arr[$m_v] ?? '';
+
+                if(in_array($m_v,$fieldDictKeyArr)){
+                    $dict = $dict_arr[$m_v];
+                    foreach($dict as $d_v){
+                        if($d_v['value'] == $old_value){
+                            $old_value = $d_v['name'];
+                        }
+                        if($d_v['value'] == $new_value){
+                            $new_value = $d_v['name'];
+                        }
+                    }
+                }
+
+
+                //一些字典和外键相关的字段值处理
+                $update_arr[] = [
+                    'field_name_en' => $m_v,
+                    'field_name_zh' => $fieldZhArr[$m_v] ?? $m_v,
+                    'old_value' => $old_value,
+                    'new_value' => $new_value,
+                ];
+            }
+
+            $list[] = [
+                'id' => $v['id'],//日志id
+                'modification_time' => $v['modification_time'],//修改时间
+                'staff_id_name' => $v['staff_id_name'],//修改人的名字
+                'update_arr' => $update_arr,//数据变更数组
+            ];
+        }
+
+
+        $data['data'] = $list;
+        return $data;
+    }
+
+    //客户资源-获取六要素修改记录列表
+    public function getSixSpeedModificationEditLog(array $where)
+    {
+        $page_params = $this->getPageParam();//获取请求参数中的页码+分页数
+        $page = $page_params['page'];
+        $limit = $page_params['limit'];
+
+        //六要素修改记录表
+        $data = SixSpeedModificationLog::where('operator_id', $where['customer_resource_id'])
+            ->order('created_at', 'desc')
+            ->with([
+                'personnel' => function ($query) {
+                }
+            ])
+            ->paginate([
+                'list_rows' => $limit,
+                'page' => $page,
+            ])
+            ->toArray();
+
+
+        $fieldZhArr = SixSpeed::FieldZh;//字段中文映射常量
+        //需要获取字段与字典key的映射关系数组
+        $fieldDictArr = [
+            'purchase_power'=>'customer_purchasing_power',//field=>dict_key(需求购买力)
+            'concept_awareness'=>'cognitive_concept',//field=>dict_key(认知理念)
+            'call_intent'=>'preliminarycustomerintention',//field=>dict_key(电话后的意向程度)
+            'is_closed'=>'global_true_or_false',//field=>dict_key(是否关单: 1-是, 0-否)
+        ];
+        $dict_arr = $this->getFieldDictionary($fieldDictArr);//字段与字典值列表的映射关系
+
+        $consultant_id_arr = [];//顾问(人员)id数组
+        foreach ($data['data'] as $v) {
+            $modified_fields_arr = json_decode($v['modified_field'], true);
+            $old_values_arr = json_decode($v['old_value'], true);
+            $new_values_arr = json_decode($v['new_value'], true);
+
+            //判断有没有修改过"顾问(人员)"字段
+            if(in_array('staff_id',$modified_fields_arr)){
+                $consultant_id_arr[] = $old_values_arr['staff_id'];
+                $consultant_id_arr[] = $new_values_arr['staff_id'];
+            }
+        }
+        $consultant_id_arr = array_unique($consultant_id_arr);//去重
+        $dict_arr['consultant'] = [];//获取员工信息列表
+        if($consultant_id_arr){
+            $personnel = Personnel::whereIn('id',$consultant_id_arr)->field('id,name')->select()->toArray();
+            foreach($personnel as $v){
+                $dict_arr['consultant'][] = [
+                    "name" => $v['name'],
+                    "value" => $v['id'],
+                    "sort" => 0,
+                    "memo" => "",
+                ];
+            }
+        }
+
+
+        $fieldDictKeyArr = array_keys($fieldDictArr);
+        $list = [];
+        foreach ($data['data'] as $v) {
+            $modified_fields_arr = json_decode($v['modified_field'], true);
+            $old_values_arr = json_decode($v['old_value'], true);
+            $new_values_arr = json_decode($v['new_value'], true);
+
+
+            $update_arr = [];
+            foreach ($modified_fields_arr as $m_v) {
+                $old_value = $old_values_arr[$m_v] ?? '';
+                $new_value = $new_values_arr[$m_v] ?? '';
+
+                if(in_array($m_v,$fieldDictKeyArr)){
+                    $dict = $dict_arr[$m_v];
+                    foreach($dict as $d_v){
+                        if($d_v['value'] == $old_value){
+                            $old_value = $d_v['name'];
+                        }
+                        if($d_v['value'] == $new_value){
+                            $new_value = $d_v['name'];
+                        }
+                    }
+                }
+
+
+                //一些字典和外键相关的字段值处理
+                $update_arr[] = [
+                    'field_name_en' => $m_v,
+                    'field_name_zh' => $fieldZhArr[$m_v] ?? $m_v,
+                    'old_value' => $old_value,
+                    'new_value' => $new_value,
+                ];
+            }
+
+            $list[] = [
+                'id' => $v['id'],//日志id
+                'modification_time' => $v['updated_at'],//修改时间
+                'staff_id_name' => $v['staff_id_name'],//修改人的名字
+                'update_arr' => $update_arr,//数据变更数组
+            ];
+        }
+
+
+        $data['data'] = $list;
+        return $data;
+    }
+
+
+    /**
+     * 根据字段和字典键映射关系，获取字段对应字典项
+     *
+     * @param array $fieldDictMapping 字段 => 字典 key 映射数组
+     * @return array 字段 => 字典列表
+     */
+    public function getFieldDictionary(array $fieldDictMapping): array
+    {
+        // 获取所有需要的字典 key 列表
+        $dictKeys = array_values($fieldDictMapping);
+
+        if (empty($dictKeys)) {
+            return [];
+        }
+
+        // 查询字典数据
+        $dictData = Dict::whereIn('key', $dictKeys)->select()->toArray();
+
+        //使用 array_column 构建 key => dict 的映射
+        $dictMap = array_column($dictData, null, 'key'); // 以 key 字段为索引
+
+
+        // 构建字段 => 字典项的映射
+        $result = [];
+        foreach ($fieldDictMapping as $field => $key) {
+            $result[$field] = $dictMap[$key]['dictionary'] ?? [];
+            //判断是不是获取的"来源渠道"的字典
+            if($field == 'source_channel'){
+                $append_arr = [
+                    "name" => "线下",
+                    "value" => "0",
+                    "sort" => 0,
+                    "memo" => "",
+                ];
+                //插入到数组头部
+                array_unshift($result[$field],$append_arr);
+            }
+        }
+
+        return $result;
+    }
 
 
 }

niucloud/app/validate/campus_pay/CampusPay.php

@@ -0,0 +1,47 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\validate\campus_pay;
+use core\base\BaseValidate;
+/**
+ * 账户及资金管理验证器
+ * Class CampusPay
+ * @package addon\app\validate\campus_pay
+ */
+class CampusPay extends BaseValidate
+{
+
+       protected $rule = [
+            'campus_id' => 'require',
+            'mchid' => 'require',
+            'pay_sign_key' => 'require',
+            'apiclient_key' => 'require',
+            'apiclient_cert' => 'require',
+            'wx_pay_key' => 'require',
+            'wx_pay_key_id' => 'require',
+        ];
+
+       protected $message = [
+            'campus_id.require' => ['common_validate.require', ['campus_id']],
+            'mchid.require' => ['common_validate.require', ['mchid']],
+            'pay_sign_key.require' => ['common_validate.require', ['pay_sign_key']],
+            'apiclient_key.require' => ['common_validate.require', ['apiclient_key']],
+            'apiclient_cert.require' => ['common_validate.require', ['apiclient_cert']],
+            'wx_pay_key.require' => ['common_validate.require', ['wx_pay_key']],
+            'wx_pay_key_id.require' => ['common_validate.require', ['wx_pay_key_id']],
+        ];
+
+       protected $scene = [
+            "add" => ['campus_id', 'mchid', 'pay_sign_key', 'apiclient_key', 'apiclient_cert', 'wx_pay_key', 'wx_pay_key_id'],
+            "edit" => ['campus_id', 'mchid', 'pay_sign_key', 'apiclient_key', 'apiclient_cert', 'wx_pay_key', 'wx_pay_key_id']
+        ];
+
+}

niucloud/app/validate/order_table/OrderTable.php

@@ -38,8 +38,8 @@ class OrderTable extends BaseValidate
         ];
 
        protected $scene = [
-            "add" => ['resource_id', 'order_status', 'payment_type', 'order_amount', 'course_id', 'class_id'],
-            "edit" => ['resource_id', 'order_status', 'payment_type', 'order_amount', 'course_id', 'class_id']
+            "add" => ['resource_id',  'payment_type', 'order_amount', 'course_id', 'class_id'],
+            "edit" => ['resource_id',  'payment_type', 'order_amount', 'course_id', 'class_id']
         ];
 
 }

niucloud/app/validate/reimbursement/Reimbursement.php

@@ -24,7 +24,6 @@ class Reimbursement extends BaseValidate
             'amount' => 'require',
             'description' => 'require',
             'status' => 'require',
-            'process_id' => 'require',
         ];
 
        protected $message = [
@@ -32,12 +31,11 @@ class Reimbursement extends BaseValidate
             'amount.require' => ['common_validate.require', ['amount']],
             'description.require' => ['common_validate.require', ['description']],
             'status.require' => ['common_validate.require', ['status']],
-            'process_id.require' => ['common_validate.require', ['process_id']],
         ];
 
        protected $scene = [
-            "add" => ['applicant_id', 'amount', 'description', 'receipt_url', 'status', 'process_id'],
-            "edit" => ['applicant_id', 'amount', 'description', 'receipt_url', 'status', 'process_id']
+            "add" => ['applicant_id', 'amount', 'description', 'receipt_url', 'status'],
+            "edit" => ['applicant_id', 'amount', 'description', 'receipt_url', 'status']
         ];
 
 }

niucloud/app/validate/salary/Salary.php

@@ -21,25 +21,31 @@ class Salary extends BaseValidate
 
        protected $rule = [
             'staff_id' => 'require',
+            'department_id' => 'require',
             'base_salary' => 'require',
             'performance_bonus' => 'require',
             'deductions' => 'require',
+            'other_subsidies' => 'require',
             'payment_status' => 'require',
+            'payment_method' => 'require',
             'salary_month' => 'require',
         ];
 
        protected $message = [
             'staff_id.require' => ['common_validate.require', ['staff_id']],
+            'department_id.require' => ['common_validate.require', ['department_id']],
             'base_salary.require' => ['common_validate.require', ['base_salary']],
             'performance_bonus.require' => ['common_validate.require', ['performance_bonus']],
             'deductions.require' => ['common_validate.require', ['deductions']],
+            'other_subsidies.require' => ['common_validate.require', ['other_subsidies']],
             'payment_status.require' => ['common_validate.require', ['payment_status']],
+            'payment_method.require' => ['common_validate.require', ['payment_method']],
             'salary_month.require' => ['common_validate.require', ['salary_month']],
         ];
 
        protected $scene = [
-            "add" => ['staff_id', 'base_salary', 'performance_bonus', 'deductions', 'other_subsidies', 'net_salary', 'payment_status', 'payment_method', 'remarks', 'salary_month', 'department_id', 'process_id'],
-            "edit" => ['staff_id', 'base_salary', 'performance_bonus', 'deductions', 'other_subsidies', 'net_salary', 'payment_status', 'payment_method', 'remarks', 'salary_month', 'department_id', 'process_id']
+            "add" => ['staff_id', 'department_id', 'base_salary', 'performance_bonus', 'deductions', 'other_subsidies', 'payment_status', 'payment_method', 'remarks', 'salary_month'],
+            "edit" => ['staff_id', 'department_id', 'base_salary', 'performance_bonus', 'deductions', 'other_subsidies', 'payment_status', 'payment_method', 'remarks', 'salary_month']
         ];
 
 }

niucloud/app/validate/user_feedback/UserFeedback.php

@@ -20,13 +20,11 @@ class UserFeedback extends BaseValidate
 {
 
        protected $rule = [
-            'user_id' => 'require',
-            'feedback_text' => 'require',
+            
         ];
 
        protected $message = [
-            'user_id.require' => ['common_validate.require', ['user_id']],
-            'feedback_text.require' => ['common_validate.require', ['feedback_text']],
+            
         ];
 
        protected $scene = [

niucloud/public/admin/assets/404-145f080f.css

@@ -0,0 +1 @@
+.error[data-v-4f4088b5]{text-align:center;height:100vh;display:flex;justify-content:center;align-items:center}.error .error-code[data-v-4f4088b5]{color:var(--el-color-primary);font-size:150px}.error .error-text[data-v-4f4088b5]{color:#0e77fd}.error .el-button[data-v-4f4088b5]{width:176px;background-color:#0e77fd;color:#fff}

niucloud/public/admin/assets/404-62395b03.js

@@ -1 +0,0 @@
-import{d as l,r as d,o as i,c as p,a as t,b as u,e as m,w as x,u as v,f,E as h,p as g,g as I,h as b,i as w,t as S}from"./index-f5d841af.js";/* empty css                  */import{_ as B}from"./_plugin-vue_export-helper-c27b6911.js";const k=""+new URL("error-ab7e4004.png",import.meta.url).href,o=e=>(g("data-v-c0934944"),e=e(),I(),e),y={class:"error"},C={class:"flex items-center"},E=o(()=>t("div",null,[t("img",{class:"w-[240px]",src:k})],-1)),N={class:"text-left ml-[100px]"},R=o(()=>t("div",{class:"error-text text-[28px] font-bold"},"404错误！",-1)),U=o(()=>t("div",{class:"text-[#222] text-[20px] mt-[15px]"}," 哎呀，出错了！您访问的页面不存在... ",-1)),V=o(()=>t("div",{class:"text-[#c4c2c2] text-[12px] mt-[5px]"}," 尝试检查URL的错误，然后点击浏览器刷新按钮。 ",-1)),L={class:"mt-[40px]"},$=l({__name:"404",setup(e){let s=null;const a=d(5),c=f();return s=setInterval(()=>{a.value===0?(clearInterval(s),c.go(-1)):a.value--},1e3),i(()=>{s&&clearInterval(s)}),(r,n)=>{const _=h;return b(),p("div",y,[t("div",C,[u(r.$slots,"content",{},()=>[E],!0),t("div",N,[R,U,V,t("div",L,[m(_,{class:"bottom",onClick:n[0]||(n[0]=D=>v(c).go(-1))},{default:x(()=>[w(S(a.value)+" 秒后返回上一页",1)]),_:1})])])])])}}});const z=B($,[["__scopeId","data-v-c0934944"]]);export{z as default};

niucloud/public/admin/assets/404-c962cf1f.js

@@ -0,0 +1 @@
+import{d as l,r as d,o as i,c as p,a as t,b as u,e as m,w as x,u as v,f,E as h,p as b,g,h as I,i as w,t as S}from"./index-1dc7b228.js";/* empty css                  */import{_ as B}from"./_plugin-vue_export-helper-c27b6911.js";const k=""+new URL("error-ab7e4004.png",import.meta.url).href,o=e=>(b("data-v-4f4088b5"),e=e(),g(),e),y={class:"error"},C={class:"flex items-center"},E=o(()=>t("div",null,[t("img",{class:"w-[240px]",src:k})],-1)),N={class:"text-left ml-[100px]"},R=o(()=>t("div",{class:"error-text text-[28px] font-bold"},"404错误！",-1)),U=o(()=>t("div",{class:"text-[#222] text-[20px] mt-[15px]"},"哎呀，出错了！您访问的页面不存在...",-1)),V=o(()=>t("div",{class:"text-[#c4c2c2] text-[12px] mt-[5px]"},"尝试检查URL的错误，然后点击浏览器刷新按钮。",-1)),L={class:"mt-[40px]"},$=l({__name:"404",setup(e){let s=null;const a=d(5),n=f();return s=setInterval(()=>{a.value===0?(clearInterval(s),n.go(-1)):a.value--},1e3),i(()=>{s&&clearInterval(s)}),(r,c)=>{const _=h;return I(),p("div",y,[t("div",C,[u(r.$slots,"content",{},()=>[E],!0),t("div",N,[R,U,V,t("div",L,[m(_,{class:"bottom",onClick:c[0]||(c[0]=D=>v(n).go(-1))},{default:x(()=>[w(S(a.value)+" 秒后返回上一页",1)]),_:1})])])])])}}});const z=B($,[["__scopeId","data-v-4f4088b5"]]);export{z as default};

niucloud/public/admin/assets/404-e4083eb7.css

@@ -1 +0,0 @@
-.error[data-v-c0934944]{text-align:center;height:100vh;display:flex;justify-content:center;align-items:center}.error .error-code[data-v-c0934944]{color:var(--el-color-primary);font-size:150px}.error .error-text[data-v-c0934944]{color:#0e77fd}.error .el-button[data-v-c0934944]{width:176px;background-color:#0e77fd;color:#fff}

niucloud/public/admin/assets/App-0882181b.js

@@ -1 +0,0 @@
-import{c5 as f}from"./index-f5d841af.js";export{f as default};

niucloud/public/admin/assets/App-16d4b42a.js

@@ -0,0 +1 @@
+import{c2 as f}from"./index-1dc7b228.js";export{f as default};

niucloud/public/admin/assets/Jump-lesson-library-edit-306ddab0.js

@@ -1 +0,0 @@
-import{_ as o}from"./Jump-lesson-library-edit.vue_vue_type_style_index_0_lang-a658c3b6.js";import"./index-f5d841af.js";/* empty css                   *//* empty css                  *//* empty css                   *//* empty css                  *//* empty css                *//* empty css                       *//* empty css                 */import"./index.vue_vue_type_script_setup_true_lang-bd01ed10.js";import"./index.vue_vue_type_style_index_0_lang-7d665fb9.js";import"./attachment-740d9717.js";import"./index.vue_vue_type_script_setup_true_lang-f45dcca3.js";/* empty css                        */import"./el-form-item-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                  *//* empty css                     *//* empty css                  *//* empty css                      *//* empty css                    */import"./el-tooltip-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                    *//* empty css                         */import"./index.vue_vue_type_script_setup_true_lang-1f394a8b.js";/* empty css                   */import"./index.vue_vue_type_script_setup_true_lang-30796a48.js";import"./sys-4eb1a831.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./index.vue_vue_type_style_index_0_lang-b7271466.js";import"./index.vue_vue_type_style_index_0_lang-3c1b8cd7.js";import"./index-21a2ccda.js";import"./sortable.esm-be94e56d.js";import"./dict-f88a0e26.js";import"./lesson_course_teaching-fdaaef77.js";import"./future_ontent-5dabe1b5.js";export{o as default};

niucloud/public/admin/assets/Jump-lesson-library-edit-aa05ac94.js

@@ -1 +0,0 @@
-import{_ as o}from"./Jump-lesson-library-edit.vue_vue_type_style_index_0_lang-a1f23d9d.js";import"./index-f5d841af.js";/* empty css                   *//* empty css                  *//* empty css                   *//* empty css                  *//* empty css                *//* empty css                       *//* empty css                 */import"./index.vue_vue_type_script_setup_true_lang-bd01ed10.js";import"./index.vue_vue_type_style_index_0_lang-7d665fb9.js";import"./attachment-740d9717.js";import"./index.vue_vue_type_script_setup_true_lang-f45dcca3.js";/* empty css                        */import"./el-form-item-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                  *//* empty css                     *//* empty css                  *//* empty css                      *//* empty css                    */import"./el-tooltip-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                    *//* empty css                         */import"./index.vue_vue_type_script_setup_true_lang-1f394a8b.js";/* empty css                   */import"./index.vue_vue_type_script_setup_true_lang-30796a48.js";import"./sys-4eb1a831.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./index.vue_vue_type_style_index_0_lang-b7271466.js";import"./index.vue_vue_type_style_index_0_lang-3c1b8cd7.js";import"./index-21a2ccda.js";import"./sortable.esm-be94e56d.js";import"./dict-f88a0e26.js";import"./lesson_course_teaching-fdaaef77.js";import"./future_ontent-5dabe1b5.js";export{o as default};

niucloud/public/admin/assets/Jump-lesson-library-edit-b8059124.js

@@ -1 +0,0 @@
-import{_ as o}from"./Jump-lesson-library-edit.vue_vue_type_style_index_0_lang-0fbc701d.js";import"./index-f5d841af.js";/* empty css                   *//* empty css                  *//* empty css                   *//* empty css                  *//* empty css                *//* empty css                       *//* empty css                 */import"./index.vue_vue_type_script_setup_true_lang-bd01ed10.js";import"./index.vue_vue_type_style_index_0_lang-7d665fb9.js";import"./attachment-740d9717.js";import"./index.vue_vue_type_script_setup_true_lang-f45dcca3.js";/* empty css                        */import"./el-form-item-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                  *//* empty css                     *//* empty css                  *//* empty css                      *//* empty css                    */import"./el-tooltip-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                    *//* empty css                         */import"./index.vue_vue_type_script_setup_true_lang-1f394a8b.js";/* empty css                   */import"./index.vue_vue_type_script_setup_true_lang-30796a48.js";import"./sys-4eb1a831.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./index.vue_vue_type_style_index_0_lang-b7271466.js";import"./index.vue_vue_type_style_index_0_lang-3c1b8cd7.js";import"./index-21a2ccda.js";import"./sortable.esm-be94e56d.js";import"./dict-f88a0e26.js";import"./lesson_course_teaching-fdaaef77.js";import"./instructional_material-aec0964c.js";export{o as default};

niucloud/public/admin/assets/Jump-lesson-library-edit-cf13a734.js

@@ -1 +0,0 @@
-import{_ as o}from"./Jump-lesson-library-edit.vue_vue_type_style_index_0_lang-91677b3b.js";import"./index-f5d841af.js";/* empty css                   *//* empty css                  *//* empty css                   *//* empty css                  *//* empty css                *//* empty css                       *//* empty css                 */import"./index.vue_vue_type_script_setup_true_lang-bd01ed10.js";import"./index.vue_vue_type_style_index_0_lang-7d665fb9.js";import"./attachment-740d9717.js";import"./index.vue_vue_type_script_setup_true_lang-f45dcca3.js";/* empty css                        */import"./el-form-item-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                  *//* empty css                     *//* empty css                  *//* empty css                      *//* empty css                    */import"./el-tooltip-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                    *//* empty css                         */import"./index.vue_vue_type_script_setup_true_lang-1f394a8b.js";/* empty css                   */import"./index.vue_vue_type_script_setup_true_lang-30796a48.js";import"./sys-4eb1a831.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./index.vue_vue_type_style_index_0_lang-b7271466.js";import"./index.vue_vue_type_style_index_0_lang-3c1b8cd7.js";import"./index-21a2ccda.js";import"./sortable.esm-be94e56d.js";import"./dict-f88a0e26.js";import"./lesson_course_teaching-fdaaef77.js";import"./future_ontent-5dabe1b5.js";export{o as default};

niucloud/public/admin/assets/Jump-lesson-library-edit-e2131f72.js

@@ -1 +0,0 @@
-import{_ as o}from"./Jump-lesson-library-edit.vue_vue_type_style_index_0_lang-9c5c9cc4.js";import"./index-f5d841af.js";/* empty css                   *//* empty css                  *//* empty css                   *//* empty css                  *//* empty css                *//* empty css                       *//* empty css                 */import"./index.vue_vue_type_script_setup_true_lang-bd01ed10.js";import"./index.vue_vue_type_style_index_0_lang-7d665fb9.js";import"./attachment-740d9717.js";import"./index.vue_vue_type_script_setup_true_lang-f45dcca3.js";/* empty css                        */import"./el-form-item-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                  *//* empty css                     *//* empty css                  *//* empty css                      *//* empty css                    */import"./el-tooltip-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                    *//* empty css                         */import"./index.vue_vue_type_script_setup_true_lang-1f394a8b.js";/* empty css                   */import"./index.vue_vue_type_script_setup_true_lang-30796a48.js";import"./sys-4eb1a831.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./index.vue_vue_type_style_index_0_lang-b7271466.js";import"./index.vue_vue_type_style_index_0_lang-3c1b8cd7.js";import"./index-21a2ccda.js";import"./sortable.esm-be94e56d.js";import"./dict-f88a0e26.js";import"./lesson_course_teaching-fdaaef77.js";export{o as default};

niucloud/public/admin/assets/Jump-lesson-library-edit-ee5b45e9.js

@@ -1 +0,0 @@
-import{_ as o}from"./Jump-lesson-library-edit.vue_vue_type_style_index_0_lang-5df4a241.js";import"./index-f5d841af.js";/* empty css                   *//* empty css                  *//* empty css                   *//* empty css                  *//* empty css                *//* empty css                       *//* empty css                 */import"./index.vue_vue_type_script_setup_true_lang-bd01ed10.js";import"./index.vue_vue_type_style_index_0_lang-7d665fb9.js";import"./attachment-740d9717.js";import"./index.vue_vue_type_script_setup_true_lang-f45dcca3.js";/* empty css                        */import"./el-form-item-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                  *//* empty css                     *//* empty css                  *//* empty css                      *//* empty css                    */import"./el-tooltip-4ed993c7.js";/* empty css                 *//* empty css               *//* empty css                  *//* empty css                    *//* empty css                         */import"./index.vue_vue_type_script_setup_true_lang-1f394a8b.js";/* empty css                   */import"./index.vue_vue_type_script_setup_true_lang-30796a48.js";import"./sys-4eb1a831.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./index.vue_vue_type_style_index_0_lang-b7271466.js";import"./index.vue_vue_type_style_index_0_lang-3c1b8cd7.js";import"./index-21a2ccda.js";import"./sortable.esm-be94e56d.js";import"./dict-f88a0e26.js";import"./lesson_course_teaching-fdaaef77.js";import"./future_ontent-5dabe1b5.js";export{o as default};

niucloud/public/admin/assets/TencentMapPicker-96eea39a.css

@@ -1 +0,0 @@
-.map-picker[data-v-fcaa04a3]{display:flex;flex-direction:column;gap:16px}.map-container[data-v-fcaa04a3]{width:100%;height:400px;border:1px solid #dcdfe6;border-radius:4px;position:relative}.map-placeholder[data-v-fcaa04a3]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);color:#909399;font-size:14px}.address-search[data-v-fcaa04a3]{display:flex;gap:8px;margin-top:20px}