Explorar o código

登录页租户名、logo隐藏、数字员工新增分类名称

kyoyue hai 6 meses
pai
achega
11a371277e

+ 3 - 3
internal/eslint-config/dist/index.cjs

@@ -1,7 +1,7 @@
-module.exports = require("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js")(null, {
+module.exports = require("/Users/wanganyue/Desktop/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js")(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/eslint-config": "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config"
+    "@vben/eslint-config": "/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config"
   }
-})("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config/src/index.ts")
+})("/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config/src/index.ts")

+ 2 - 2
internal/eslint-config/dist/index.d.ts

@@ -1,2 +1,2 @@
-export * from "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config/src/index";
-export { default } from "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config/src/index";
+export * from "/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config/src/index";
+export { default } from "/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config/src/index";

+ 4 - 4
internal/eslint-config/dist/index.mjs

@@ -1,12 +1,12 @@
-import jiti from "file:///Users/songbowen/development/Project/gooki/scrm/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js";
+import jiti from "file:///Users/wanganyue/Desktop/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js";
 
-/** @type {import("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config/src/index")} */
+/** @type {import("/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config/src/index")} */
 const _module = jiti(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/eslint-config": "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config"
+    "@vben/eslint-config": "/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config"
   }
-})("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config/src/index.ts");
+})("/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config/src/index.ts");
 
 export default _module;

+ 3 - 3
internal/eslint-config/dist/strict.cjs

@@ -1,7 +1,7 @@
-module.exports = require("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js")(null, {
+module.exports = require("/Users/wanganyue/Desktop/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js")(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/eslint-config": "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config"
+    "@vben/eslint-config": "/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config"
   }
-})("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config/src/strict.ts")
+})("/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config/src/strict.ts")

+ 2 - 2
internal/eslint-config/dist/strict.d.ts

@@ -1,2 +1,2 @@
-export * from "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config/src/strict";
-export { default } from "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config/src/strict";
+export * from "/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config/src/strict";
+export { default } from "/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config/src/strict";

+ 4 - 4
internal/eslint-config/dist/strict.mjs

@@ -1,12 +1,12 @@
-import jiti from "file:///Users/songbowen/development/Project/gooki/scrm/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js";
+import jiti from "file:///Users/wanganyue/Desktop/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js";
 
-/** @type {import("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config/src/strict")} */
+/** @type {import("/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config/src/strict")} */
 const _module = jiti(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/eslint-config": "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config"
+    "@vben/eslint-config": "/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config"
   }
-})("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/eslint-config/src/strict.ts");
+})("/Users/wanganyue/Desktop/wechat-ui/internal/eslint-config/src/strict.ts");
 
 export default _module;

+ 3 - 3
internal/stylelint-config/dist/index.cjs

@@ -1,7 +1,7 @@
-module.exports = require("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js")(null, {
+module.exports = require("/Users/wanganyue/Desktop/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js")(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/stylelint-config": "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/stylelint-config"
+    "@vben/stylelint-config": "/Users/wanganyue/Desktop/wechat-ui/internal/stylelint-config"
   }
-})("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/stylelint-config/src/index.ts")
+})("/Users/wanganyue/Desktop/wechat-ui/internal/stylelint-config/src/index.ts")

+ 2 - 2
internal/stylelint-config/dist/index.d.ts

@@ -1,2 +1,2 @@
-export * from "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/stylelint-config/src/index";
-export { default } from "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/stylelint-config/src/index";
+export * from "/Users/wanganyue/Desktop/wechat-ui/internal/stylelint-config/src/index";
+export { default } from "/Users/wanganyue/Desktop/wechat-ui/internal/stylelint-config/src/index";

+ 4 - 4
internal/stylelint-config/dist/index.mjs

@@ -1,12 +1,12 @@
-import jiti from "file:///Users/songbowen/development/Project/gooki/scrm/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js";
+import jiti from "file:///Users/wanganyue/Desktop/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js";
 
-/** @type {import("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/stylelint-config/src/index")} */
+/** @type {import("/Users/wanganyue/Desktop/wechat-ui/internal/stylelint-config/src/index")} */
 const _module = jiti(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/stylelint-config": "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/stylelint-config"
+    "@vben/stylelint-config": "/Users/wanganyue/Desktop/wechat-ui/internal/stylelint-config"
   }
-})("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/stylelint-config/src/index.ts");
+})("/Users/wanganyue/Desktop/wechat-ui/internal/stylelint-config/src/index.ts");
 
 export default _module;

+ 3 - 3
internal/vite-config/dist/index.cjs

@@ -1,7 +1,7 @@
-module.exports = require("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js")(null, {
+module.exports = require("/Users/wanganyue/Desktop/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js")(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/vite-config": "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/vite-config"
+    "@vben/vite-config": "/Users/wanganyue/Desktop/wechat-ui/internal/vite-config"
   }
-})("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/vite-config/src/index.ts")
+})("/Users/wanganyue/Desktop/wechat-ui/internal/vite-config/src/index.ts")

+ 1 - 1
internal/vite-config/dist/index.d.ts

@@ -1 +1 @@
-export * from "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/vite-config/src/index";
+export * from "/Users/wanganyue/Desktop/wechat-ui/internal/vite-config/src/index";

+ 4 - 4
internal/vite-config/dist/index.mjs

@@ -1,13 +1,13 @@
-import jiti from "file:///Users/songbowen/development/Project/gooki/scrm/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js";
+import jiti from "file:///Users/wanganyue/Desktop/wechat-ui/node_modules/.pnpm/jiti@1.21.6/node_modules/jiti/lib/index.js";
 
-/** @type {import("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/vite-config/src/index")} */
+/** @type {import("/Users/wanganyue/Desktop/wechat-ui/internal/vite-config/src/index")} */
 const _module = jiti(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/vite-config": "/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/vite-config"
+    "@vben/vite-config": "/Users/wanganyue/Desktop/wechat-ui/internal/vite-config"
   }
-})("/Users/songbowen/development/Project/gooki/scrm/wechat-ui/internal/vite-config/src/index.ts");
+})("/Users/wanganyue/Desktop/wechat-ui/internal/vite-config/src/index.ts");
 
 export const defineApplicationConfig = _module.defineApplicationConfig;
 export const definePackageConfig = _module.definePackageConfig;

+ 13 - 0
src/api/wechat/employee.ts

@@ -10,6 +10,7 @@ enum Api {
   DeleteEmployee = '/wechat-api/employee/delete',
   GetEmployeeById = '/wechat-api/employee',
   GetEmployeeTypes = '/wechat-api/employee_config/list',
+  GetEmployeeCategory = '/wechat-api/category/list',
 }
 
 /**
@@ -80,3 +81,15 @@ export const getEmployeeById = (params: BaseIDReq, mode: ErrorMessageMode = 'not
 export const getEmployeeTypes = () => {
   return defHttp.get<BaseDataResp<EmployeeInfo>>({ url: Api.GetEmployeeTypes });
 };
+
+/**
+ *  @description: 获取数字员工分类
+ */
+export const getEmployeeCategory = (params: BaseIDReq, mode: ErrorMessageMode = 'notice') => {
+  return defHttp.post<BaseDataResp<EmployeeInfo>>(
+    { url: Api.GetEmployeeCategory, params: params },
+    {
+      errorMessageMode: mode,
+    },
+  );
+};

+ 2 - 2
src/views/sys/login/Login.vue

@@ -10,13 +10,13 @@
     </div>
 
     <span class="-enter-x xl:hidden">
-      <AppLogo :alwaysShowTitle="true" />
+      <!-- <AppLogo :alwaysShowTitle="true" /> -->
     </span>
 
     <div class="container relative h-full py-2 mx-auto sm:px-10">
       <div class="flex h-full">
         <div class="hidden min-h-full pl-4 mr-4 xl:flex xl:flex-col xl:w-6/12">
-          <AppLogo class="-enter-x" />
+          <!-- <AppLogo class="-enter-x" /> -->
           <div class="my-auto">
             <img
               :alt="title"

+ 22 - 11
src/views/wechat/employee/EmployeeDrawer.vue

@@ -7,12 +7,18 @@
     width="60%"
     @ok="handleSubmit"
   >
-    <!-- <BasicForm @register="registerForm" /> -->
     <Form ref="formRef" :model="formModel" :rules="formRules">
       <FormItem label="标题" name="title" :rules="[{ required: true, message: '请输入' }]">
         <Input v-model:value="formModel.title" placeholder="请输入标题" />
       </FormItem>
-
+      <FormItem label="分类" name="categoryId" :rules="[{ required: true, message: '请选择分类' }]">
+        <Select
+          v-model:value="formModel.categoryId"
+          placeholder="请选择"
+          allowClear
+          :options="categoryList"
+        ></Select>
+      </FormItem>
       <FormItem label="头像" name="avatar" :rules="{ required: true, message: '请上传头像' }">
         <BasicUpload
           :maxSize="100"
@@ -24,11 +30,9 @@
           :showPreviewNumber="false"
           emptyHidePreview
         />
-        <!-- <Input v-model="formModel.avatar" type="hidden" /> -->
       </FormItem>
 
-      <FormItem label="标签" name="tags" :rules="[{ required: true, message: '请输入标签' }]">
-        <!-- <Input v-model:value="formModel.tags" placeholder="请输入标签" /> -->
+      <FormItem label="标签" name="tags" :rules="[{ required: true, message: '请选择标签' }]">
         <Select
           v-model:value="formModel.tags"
           placeholder="请选择"
@@ -105,9 +109,8 @@
       <FormItem
         label="适用场景"
         name="scene"
-        :rules="[{ required: true, message: '请输入适用场景' }]"
+        :rules="[{ required: true, message: '请选择适用场景' }]"
       >
-        <!-- <Input v-model:value="formModel.scene" placeholder="请输入适用场景" /> -->
         <Select
           v-model:value="formModel.scene"
           placeholder="请选择"
@@ -120,9 +123,8 @@
       <FormItem
         label="支持接入"
         name="switchIn"
-        :rules="[{ required: true, message: '请输入支持接入' }]"
+        :rules="[{ required: true, message: '请选择支持接入' }]"
       >
-        <!-- <Input v-model:value="formModel.switchIn" placeholder="请输入支持接入" /> -->
         <Select
           v-model:value="formModel.switchIn"
           placeholder="请选择"
@@ -180,7 +182,6 @@
           :showPreviewNumber="false"
           emptyHidePreview
         />
-        <!-- <Input v-model="formModel.videoUrl" type="hidden" /> -->
       </FormItem>
 
       <FormItem
@@ -244,7 +245,7 @@
   import { useI18n } from 'vue-i18n';
   import dayjs from 'dayjs';
   import { getLabelSelectList } from '@/api/wechat/label';
-  import { createEmployee, updateEmployee, getEmployeeTypes } from '@/api/wechat/employee';
+  import { createEmployee, updateEmployee, getEmployeeTypes,getEmployeeCategory } from '@/api/wechat/employee';
   const emit = defineEmits<{
     (event: 'update:getList', value: { value: boolean }): void;
   }>();
@@ -254,11 +255,13 @@
   const actionLabel = ref([]);
   const configs_scene = ref([]);
   const configs_switch = ref([]);
+  const categoryList = ref([]);
   const formModel = reactive({
     id: '',
     title: '',
     avatar: [],
     tags: [],
+    categoryId:undefined,
     hireCount: undefined,
     serviceCount: undefined,
     achievementCount: undefined,
@@ -284,6 +287,7 @@
   const initialForm = reactive({
     id: '',
     title: '',
+    categoryId:undefined,
     avatar: [],
     tags: [],
     hireCount: undefined,
@@ -379,6 +383,13 @@
       label: item.title,
       value: item.id,
     }));
+
+    let res2 = await getEmployeeCategory({page: 1, pageSize: 50,});
+    categoryList.value = res2.data.data.map((item) => ({
+      label: item.name,
+      value: item.id,
+    }))
+    console.log(res2.data.data)
   });
   const getTitle = computed(() =>
     !unref(isUpdate) ? t('wechat.employee.addEmployee') : t('wechat.employee.editEmployee'),