常用单位完成，商品分类查询’新增‘详情

.vscode/settings.json

@@ -77,5 +77,8 @@
   "i18n-ally.localesPaths": [
     "src/lang"
   ],
-  "scss.lint.unknownAtRules": "ignore"
+  "scss.lint.unknownAtRules": "ignore",
+  "[typescript]": {
+    "editor.defaultFormatter": "vscode.typescript-language-features"
+  }
 }

src/api/product/commonUnits.ts

@@ -0,0 +1,58 @@
+import request from "@/utils/request";
+import { number } from "echarts";
+const baseURL = "/product/admin/prod/unit";
+
+
+const AuthAPI = {
+  /** 分页*/
+  getPage(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/page`,
+      method: "get",
+      params,
+    });
+  },
+  // 单位新增
+  addunit(data: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}`,
+      method: "post",
+      data,
+    });
+  },
+  // 获取详情
+  getunitinfo(id: number) {
+    return request<any, Responseres>({
+      url: `${baseURL}/${id}`,
+      method: "get",
+    });
+  },
+  // 编辑确定
+  update(data: Object) {
+    return request<any, Responseres>({
+      url: `${baseURL}`,
+      method: "put",
+      data,
+    });
+  },
+  // 删除
+  deleteByIds(id: number | String) {
+
+    return request<any, Responseres>({
+      url: `${baseURL}/${id}`,
+      method: "delete",
+    });
+  },
+};
+
+
+
+
+export interface Responseres {
+  code?: number | null;
+  data?: any;
+  msg?: null | string;
+  [property: string]: any;
+}
+
+export default AuthAPI;

src/api/product/productclassification.ts

@@ -0,0 +1,57 @@
+import request from "@/utils/request";
+import { number } from "echarts";
+const baseURL = "/product/admin/prod/category";
+
+const AuthAPI = {
+  /** 分页*/
+  getPage(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/page`,
+      method: "get",
+      params,
+    });
+  },
+  // 新增
+  addunit(data: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}`,
+      method: "post",
+      data,
+    });
+  },
+  // 获取详情
+  getunitinfo(id: number) {
+    return request<any, Responseres>({
+      url: `${baseURL}/${id}`,
+      method: "get",
+    });
+  },
+  // 编辑确定
+  update(data: Object) {
+    return request<any, Responseres>({
+      url: `${baseURL}`,
+      method: "put",
+      data,
+    });
+  },
+  // 删除
+  deleteByIds(id: number | String) {
+    return request<any, Responseres>({
+      url: `${baseURL}/${id}`,
+      method: "delete",
+    });
+  },
+
+};
+
+
+
+
+export interface Responseres {
+  code?: number | null;
+  data?: any;
+  msg?: null | string;
+  [property: string]: any;
+}
+
+export default AuthAPI;

src/components/CURD/PageContent.vue

@@ -401,8 +401,8 @@ const pagination = reactive(
 );
 // 分页相关的请求参数
 const request = props.contentConfig.request ?? {
-  pageName: "pageNum",
+  pageName: "page",
-  limitName: "pageSize",
+  limitName: "size",
 };
 
 const tableRef = ref<TableInstance>();
@@ -791,10 +791,10 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
         if (props.contentConfig.parseData) {
           data = props.contentConfig.parseData(data);
         }
-        pagination.total = !props.contentConfig.resultListKey ? data.length : data.totalRow * 1;
+        pagination.total = props.contentConfig.resultListKey ? data.records.length : data.totalRow * 1;
         pageData.value = props.contentConfig.resultListKey
           ? data[props.contentConfig.resultListKey]
-          : data;
+          : data.records;
       } else {
         pageData.value = data;
       }
@@ -803,7 +803,7 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
       loading.value = false;
     });
 }
-fetchPageData();
+fetchPageData(props.contentConfig.indexActionData);
 
 // 导出Excel
 function exportPageData(formData: IObject = {}) {

src/components/CURD/PageModal.vue

@@ -67,6 +67,7 @@
                 <template v-else-if="item.type === 'date-picker'">
                   <el-date-picker v-model="formData[item.prop]" v-bind="item.attrs" />
                 </template>
+
                 <!-- Text 文本 -->
                 <template v-else-if="item.type === 'text'">
                   <el-text v-bind="item.attrs">
@@ -168,6 +169,10 @@
                       {{ formData[item.prop] }}
                     </el-text>
                   </template>
+                  <!-- 图片上传 -->
+                  <template v-else-if="item.type === 'UpImage'">
+                    <SingleImageUpload v-model="formData[item.prop]" />
+                  </template>
                   <!-- 自定义 -->
                   <template v-else-if="item.type === 'custom'">
                     <slot :name="item.slotName ?? item.prop" :prop="item.prop" :formData="formData"
@@ -195,7 +200,7 @@ import { useThrottleFn } from "@vueuse/core";
 import type { FormInstance, FormRules } from "element-plus";
 import { nextTick, reactive, ref, watch, watchEffect } from "vue";
 import type { IModalConfig, IObject } from "./types";
-
+// import SingleImageUpload from "@/components/Upload/SingleImageUpload.vue";
 // 定义接收的属性
 const props = defineProps<{
   modalConfig: IModalConfig;
@@ -204,7 +209,7 @@ const props = defineProps<{
 const emit = defineEmits<{
   submitClick: [];
 }>();
-
+console.log(props.modalConfig, '全部')
 const pk = props.modalConfig.pk ?? "id";
 const modalVisible = ref(false);
 const formRef = ref<FormInstance>();

src/components/CURD/types.ts

@@ -62,13 +62,13 @@ export interface IContentConfig<T = any> {
   table?: Omit<TableProps<any>, "data">;
   // pagination组件属性
   pagination?:
-    | boolean
+  | boolean
-    | Partial<
+  | Partial<
-        Omit<
+    Omit<
-          PaginationProps,
+      PaginationProps,
-          "v-model:page-size" | "v-model:current-page" | "total" | "currentPage"
+      "v-model:page-size" | "v-model:current-page" | "total" | "currentPage"
-        >
+    >
-      >;
+  >;
   // 列表的网络请求函数(需返回promise)
   indexAction: (queryParams: T) => Promise<any>;
   // 默认的分页相关的请求参数
@@ -82,6 +82,8 @@ export interface IContentConfig<T = any> {
     list: IObject[];
     [key: string]: any;
   };
+  // 请求数据的参数
+  indexActionData: object | any,
   // 修改属性的网络请求函数(需返回promise)
   modifyAction?: (data: {
     [key: string]: any;
@@ -109,12 +111,12 @@ export interface IContentConfig<T = any> {
     | "import"
     | "export"
     | {
-        auth: string;
+      auth: string;
-        icon?: string;
+      icon?: string;
-        name: string;
+      name: string;
-        text: string;
+      text: string;
-        type?: "primary" | "success" | "warning" | "danger" | "info";
+      type?: "primary" | "success" | "warning" | "danger" | "info";
-      }
+    }
   >;
   // 表格工具栏右侧图标
   defaultToolbar?: Array<
@@ -124,11 +126,11 @@ export interface IContentConfig<T = any> {
     | "exports"
     | "search"
     | {
-        name: string;
+      name: string;
-        icon: string;
+      icon: string;
-        title?: string;
+      title?: string;
-        auth?: string;
+      auth?: string;
-      }
+    }
   >;
   // table组件列属性(额外的属性templet,operat,slotName)
   cols: Array<{
@@ -143,17 +145,17 @@ export interface IContentConfig<T = any> {
     show?: boolean;
     // 模板
     templet?:
-      | "image"
+    | "image"
-      | "list"
+    | "list"
-      | "url"
+    | "url"
-      | "switch"
+    | "switch"
-      | "input"
+    | "input"
-      | "price"
+    | "price"
-      | "percent"
+    | "percent"
-      | "icon"
+    | "icon"
-      | "date"
+    | "date"
-      | "tool"
+    | "tool"
-      | "custom";
+    | "custom";
     // image模板相关参数
     imageWidth?: number;
     imageHeight?: number;
@@ -175,13 +177,13 @@ export interface IContentConfig<T = any> {
       | "edit"
       | "delete"
       | {
-          auth?: string;
+        auth?: string;
-          icon?: string;
+        icon?: string;
-          name: string;
+        name: string;
-          text: string;
+        text: string;
-          type?: "primary" | "success" | "warning" | "danger" | "info";
+        type?: "primary" | "success" | "warning" | "danger" | "info";
-          render?: (row: IObject) => boolean;
+        render?: (row: IObject) => boolean;
-        }
+      }
     >;
     // filter值拼接符
     filterJoin?: string;
@@ -218,17 +220,18 @@ export type IForm = Partial<Omit<FormProps, "model" | "rules">>;
 export type IFormItems<T = any> = Array<{
   // 组件类型(如input,select,radio,custom等，默认input)
   type?:
-    | "input"
+  | "input"
-    | "textarea"
+  | "textarea"
-    | "select"
+  | "select"
-    | "radio"
+  | "radio"
-    | "switch"
+  | "switch"
-    | "checkbox"
+  | "checkbox"
-    | "tree-select"
+  | "tree-select"
-    | "date-picker"
+  | "date-picker"
-    | "input-number"
+  | "input-number"
-    | "text"
+  | "text"
-    | "custom";
+  | "UpImage"
+  | "custom";
   // 组件属性
   attrs?: IObject;
   // 组件可选项(适用于select,radio,checkbox组件)

src/components/Upload/SingleImageUpload.vue

@@ -1,17 +1,8 @@
 <!-- 单图上传组件 -->
 <template>
-  <el-upload
+  <el-upload v-model="modelValue" class="single-upload" list-type="picture-card" :show-file-list="false"
-    v-model="modelValue"
+    :accept="props.accept" :before-upload="handleBeforeUpload" :http-request="handleUpload" :on-success="onSuccess"
-    class="single-upload"
+    :on-error="onError" multiple>
-    list-type="picture-card"
-    :show-file-list="false"
-    :accept="props.accept"
-    :before-upload="handleBeforeUpload"
-    :http-request="handleUpload"
-    :on-success="onSuccess"
-    :on-error="onError"
-    multiple
-  >
     <template #default>
       <el-image v-if="modelValue" :src="modelValue" />
       <el-icon v-if="modelValue" class="single-upload__delete-btn" @click.stop="handleDelete">

src/views/login/index.vue

@@ -1,13 +1,7 @@
 <template>
   <div class="login" :style="'background-image:url(' + Background + ');'">
-    <el-form
+    <el-form ref="loginForm" :model="state.loginForm" :rules="state.loginRules" label-position="left" label-width="0px"
-      ref="loginForm"
+      class="login-form">
-      :model="state.loginForm"
-      :rules="state.loginRules"
-      label-position="left"
-      label-width="0px"
-      class="login-form"
-    >
       <h3 class="title">银收客后台管理</h3>
       <el-form-item>
         <el-radio-group v-model="state.loginForm.loginType">
@@ -16,39 +10,19 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item prop="merchantName" v-if="state.loginForm.loginType == 'staff'">
-        <el-input
+        <el-input v-model="state.loginForm.merchantName" type="text" auto-complete="off" placeholder="商户号"></el-input>
-          v-model="state.loginForm.merchantName"
-          type="text"
-          auto-complete="off"
-          placeholder="商户号"
-        ></el-input>
       </el-form-item>
       <el-form-item prop="username">
-        <el-input
+        <el-input v-model="state.loginForm.username" type="text" auto-complete="off" placeholder="账号"></el-input>
-          v-model="state.loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        ></el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input
+        <el-input v-model="state.loginForm.password" type="password" auto-complete="off" placeholder="密码"
-          v-model="state.loginForm.password"
+          @keyup.enter="handleLogin"></el-input>
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter="handleLogin"
-        ></el-input>
       </el-form-item>
       <el-form-item prop="code">
         <div class="code_wrap">
-          <el-input
+          <el-input v-model="state.loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
-            v-model="state.loginForm.code"
+            @keyup.enter="handleLogin"></el-input>
-            auto-complete="off"
-            placeholder="验证码"
-            style="width: 63%"
-            @keyup.enter="handleLogin"
-          ></el-input>
           <div class="login-code">
             <img :src="state.codeUrl" @click="getCode" />
           </div>
@@ -56,13 +30,8 @@
       </el-form-item>
 
       <el-form-item style="width: 100%">
-        <el-button
+        <el-button :loading="state.loading" size="default" type="primary" style="width: 100%"
-          :loading="state.loading"
+          @click.prevent="handleLogin">
-          size="default"
-          type="primary"
-          style="width: 100%"
-          @click.prevent="handleLogin"
-        >
           <span v-if="!state.loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
@@ -183,6 +152,7 @@ function handleLogin() {
         .then(async (res) => {
           // await userStore.getUserInfo();
           const { path, queryParams } = parseRedirect();
+          console.log(res, 'Denglv返回');
           router.push({ path: path, query: queryParams });
         })
         .catch(() => {

src/views/product/category.vue

@@ -1 +1,145 @@
-<template></template>
+<template>
+  <div class="app-container">
+    <!-- 列表 -->
+    <template v-if="isA">
+      <!-- 搜索 -->
+      <!-- <page-search ref="searchRef" :search-config="searchConfig" @query-click="handleQueryClick"
+        @reset-click="handleResetClick" /> -->
+
+      <!-- 列表 -->
+      <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
+        @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
+        @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
+        <template #status="scope">
+          <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
+            {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+          </el-tag>
+        </template>
+        <template #gender="scope">
+          <DictLabel v-model="scope.row[scope.prop]" code="gender" />
+        </template>
+        <template #mobile="scope">
+          <el-text>{{ scope.row[scope.prop] }}</el-text>
+          <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
+        </template>
+      </page-content>
+
+      <!-- 新增 -->
+      <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
+        <template #gender="scope">
+          <Dict v-model="scope.formData[scope.prop]" code="gender" />
+        </template>
+      </page-modal>
+
+      <!-- 编辑 -->
+      <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
+        <template #gender="scope">
+          <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
+        </template>
+      </page-modal>
+    </template>
+    <template v-else>
+      <page-content ref="contentRef" :content-config="contentConfig2" @operat-click="handleOperatClick">
+        <template #status="scope">
+          <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
+            {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+          </el-tag>
+        </template>
+      </page-content>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import UserAPI from "@/api/product/productclassification";
+import DeptAPI from "@/api/system/dept";
+import RoleAPI from "@/api/system/role";
+import type { IObject, IOperatData } from "@/components/CURD/types";
+import usePage from "@/components/CURD/usePage";
+import addModalConfig from "./categoryconfig/add";
+import contentConfig from "./categoryconfig/content";
+import contentConfig2 from "./categoryconfig/content2";
+import editModalConfig from "./categoryconfig/edit";
+import searchConfig from "./categoryconfig/search";
+
+const {
+  searchRef,
+  contentRef,
+  addModalRef,
+  editModalRef,
+  handleQueryClick,
+  handleResetClick,
+  // handleAddClick,
+  // handleEditClick,
+  handleSubmitClick,
+  handleExportClick,
+  handleSearchClick,
+  handleFilterChange,
+} = usePage();
+
+// 新增
+async function handleAddClick() {
+  addModalRef.value?.setModalVisible();
+  // 加载部门下拉数据源
+  addModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
+  // 加载角色下拉数据源
+  addModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
+}
+// 编辑
+async function handleEditClick(row: IObject) {
+  editModalRef.value?.handleDisabled(false);
+  // 加载部门下拉数据源
+  // editModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
+  // 加载角色下拉数据源
+  // editModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
+  // 根据id获取数据进行填充
+  const data = await UserAPI.getunitinfo(row.id);
+  editModalRef.value?.setFormData(data);
+  editModalRef.value?.setModalVisible();
+
+}
+// 其他工具栏
+function handleToolbarClick(name: string) {
+  console.log(name);
+  if (name === "custom1") {
+    ElMessage.success("点击了自定义1按钮");
+  }
+}
+// 其他操作列
+async function handleOperatClick(data: IOperatData) {
+  console.log(data);
+  // 重置密码
+  if (data.name === "reset_pwd") {
+    ElMessageBox.prompt("请输入用户「" + data.row.username + "」的新密码", "重置密码", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    }).then(({ value }) => {
+      if (!value || value.length < 6) {
+        ElMessage.warning("密码至少需要6位字符，请重新输入");
+        return false;
+      }
+      // UserAPI.resetPassword(data.row.id, value).then(() => {
+      //   ElMessage.success("密码重置成功，新密码是：" + value);
+      // });
+    });
+  } else if (data.name === "detail") {
+    // 禁用表单编辑
+    editModalRef.value?.handleDisabled(true);
+    // 打开抽屉
+    editModalRef.value?.setModalVisible();
+    // 修改抽屉标题
+    editModalConfig.drawer = { ...editModalConfig.drawer, title: "用户详情" };
+    // 加载部门下拉数据源
+    editModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
+    // 加载角色下拉数据源
+    editModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
+    // 根据id获取数据进行填充
+    // const formData = await UserAPI.getFormData(data.row.id);
+    // 设置表单数据
+    // editModalRef.value?.setFormData(formData);
+  }
+}
+
+// 切换示例
+const isA = ref(true);
+</script>

src/views/product/categoryconfig/add.ts

@@ -0,0 +1,54 @@
+import UserAPI from "@/api/product/commonUnits";
+
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig<UserForm> = {
+  pageName: "sys:user",
+  dialog: {
+    title: "新增分类",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 100,
+  },
+  formAction: UserAPI.addunit,
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "分类名称",
+      prop: "name",
+      rules: [{ required: true, message: "分类名称不能为空", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "请输入分类名称",
+      },
+    },
+    {
+      label: "分类图片",
+      prop: "pic",
+      type: "UpImage",
+    },
+    {
+      label: "开关",
+      prop: "status",
+      type: "switch",
+      options: [
+        { label: "启用", value: 1 },
+        { label: "禁用", value: 0 },
+      ],
+      attrs: {
+        activeValue: 1,
+        inactiveValue: 0,
+      },
+      initialValue: 1,
+    },
+  ],
+};
+export interface UserForm {
+
+}
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);

src/views/product/categoryconfig/content.ts

@@ -0,0 +1,68 @@
+import UserAPI from "@/api/product/productclassification";
+
+import RoleAPI from "@/api/system/role";
+import type { UserPageQuery } from "@/api/system/user";
+import type { IContentConfig } from "@/components/CURD/types";
+
+const contentConfig: IContentConfig<UserPageQuery> = {
+  pageName: "sys:user",
+  table: {
+    border: true,
+    highlightCurrentRow: true,
+  },
+  pagination: {
+    background: true,
+    layout: "prev,pager,next,jumper,total,sizes",
+    pageSize: 20,
+    pageSizes: [10, 20, 30, 50],
+  },
+  indexActionData: { name: "", orderBy: "name asc" },
+  indexAction: function (params) {
+    return UserAPI.getPage(params);
+  },
+  deleteAction: UserAPI.deleteByIds,
+  // importAction(file) {
+  //   return UserAPI.import(1, file);
+  // },
+  // exportAction: UserAPI.export,
+  modifyAction: UserAPI.update,
+
+  // importTemplate: UserAPI.downloadTemplate,
+  importsAction(data) {
+    // 模拟导入数据
+    console.log("importsAction", data);
+    return Promise.resolve();
+  },
+  exportsAction: async function (params) {
+    // 模拟获取到的是全量数据
+    const res = await UserAPI.getPage(params);
+    console.log("exportsAction", res.list);
+    return res.list;
+  },
+  pk: "id",
+  toolbar: [
+    "add",
+  ],
+  cols: [
+    // { type: "selection", width: 50, align: "center" },
+    { label: "分类名称", align: "center", prop: "name" },
+    { label: "分类图片", align: "center", prop: "pic", templet: "image" },
+    {
+      label: "状态",
+      align: "center",
+      prop: "status",
+      templet: "switch",
+      slotName: "status",
+    },
+    {
+      label: "操作",
+      align: "center",
+      fixed: "right",
+      width: 280,
+      templet: "tool",
+      operat: ["edit", "delete"],
+    },
+  ],
+};
+
+export default contentConfig;

src/views/product/categoryconfig/content2.ts

@@ -0,0 +1,133 @@
+import type { IContentConfig } from "@/components/CURD/types";
+
+const contentConfig: IContentConfig = {
+  pageName: "sys:user",
+  table: {
+    showOverflowTooltip: true,
+  },
+  toolbar: [],
+  indexAction: function (params) {
+    // 模拟发起网络请求获取列表数据
+    console.log("indexAction:", params);
+    return Promise.resolve({
+      total: 2,
+      list: [
+        {
+          id: 1,
+          username: "tom",
+          avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+          percent: 99,
+          price: 10,
+          url: "https://www.baidu.com",
+          icon: "el-icon-setting",
+          gender: 1,
+          status: 1,
+          status2: 1,
+          sort: 99,
+          createTime: 1715647982437,
+        },
+        {
+          id: 2,
+          username: "jerry",
+          avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+          percent: 88,
+          price: 999,
+          url: "https://www.google.com",
+          icon: "el-icon-user",
+          gender: 0,
+          status: 0,
+          status2: 0,
+          sort: 0,
+          createTime: 1715648977426,
+        },
+      ],
+    });
+  },
+  modifyAction(data) {
+    // 模拟发起网络请求修改字段
+    // console.log("modifyAction:", data);
+    ElMessage.success(JSON.stringify(data));
+    return Promise.resolve(null);
+  },
+  cols: [
+    { type: "index", width: 50, align: "center" },
+    { label: "ID", align: "center", prop: "id", show: false },
+    { label: "文本", align: "center", prop: "username" },
+    { label: "图片", align: "center", prop: "avatar", templet: "image" },
+    {
+      label: "百分比",
+      align: "center",
+      prop: "percent",
+      templet: "percent",
+    },
+    {
+      label: "货币符",
+      align: "center",
+      prop: "price",
+      templet: "price",
+      priceFormat: "$",
+    },
+    { label: "链接", align: "center", prop: "url", width: 180, templet: "url" },
+    { label: "图标", align: "center", prop: "icon", templet: "icon" },
+    {
+      label: "列表值",
+      align: "center",
+      prop: "gender",
+      templet: "list",
+      selectList: { "0": "女", "1": "男" },
+    },
+    {
+      label: "自定义",
+      align: "center",
+      prop: "status",
+      templet: "custom",
+      slotName: "status",
+    },
+    {
+      label: "Switch",
+      align: "center",
+      prop: "status2",
+      templet: "switch",
+      activeValue: 1,
+      inactiveValue: 0,
+      activeText: "启用",
+      inactiveText: "禁用",
+    },
+    {
+      label: "输入框",
+      align: "center",
+      prop: "sort",
+      templet: "input",
+      inputType: "number",
+    },
+    {
+      label: "日期格式化",
+      align: "center",
+      prop: "createTime",
+      minWidth: 120,
+      templet: "date",
+      dateFormat: "YYYY/MM/DD HH:mm:ss",
+    },
+    {
+      label: "操作栏",
+      align: "center",
+      fixed: "right",
+      width: 220,
+      templet: "tool",
+      operat: [
+        {
+          name: "reset_pwd",
+          auth: "password:reset",
+          icon: "refresh-left",
+          text: "重置密码",
+          type: "primary",
+          render(row) {
+            return row.id === 1;
+          },
+        },
+      ],
+    },
+  ],
+};
+
+export default contentConfig;

src/views/product/categoryconfig/edit.ts

@@ -0,0 +1,78 @@
+import UserAPI from "@/api/product/productclassification";
+
+import type { IModalConfig } from "@/components/CURD/types";
+import { DeviceEnum } from "@/enums/DeviceEnum";
+import { useAppStore } from "@/store";
+
+const modalConfig: IModalConfig<UserForm> = {
+  pageName: "sys:user",
+  // component: "drawer",
+  dialog: {
+    title: "编辑单位",
+    width: 800,
+    draggable: true,
+  },
+
+  pk: "id",
+  formAction: function (data) {
+    return UserAPI.update(data);
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "分类名称",
+      prop: "name",
+      rules: [{ required: true, message: "分类名称不能为空", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "请输入分类名称",
+      },
+    },
+    {
+      label: "分类图片",
+      prop: "pic",
+      type: "UpImage",
+    },
+    {
+      label: "开关",
+      prop: "status",
+      type: "switch",
+      options: [
+        { label: "启用", value: 1 },
+        { label: "禁用", value: 0 },
+      ],
+      attrs: {
+        activeValue: 1,
+        inactiveValue: 0,
+      },
+      initialValue: 1,
+    },
+  ],
+};
+/** 用户表单类型 */
+interface UserForm {
+  /** 用户头像 */
+  avatar?: string;
+  /** 部门ID */
+  deptId?: number;
+  /** 邮箱 */
+  email?: string;
+  /** 性别 */
+  gender?: number;
+  /** 用户ID */
+  id?: number;
+  /** 手机号 */
+  mobile?: string;
+  /** 昵称 */
+  nickname?: string;
+  /** 角色ID集合 */
+  roleIds?: number[];
+  /** 用户状态(1:正常;0:禁用) */
+  status?: number;
+  /** 用户名 */
+  username?: string;
+}
+
+export default reactive(modalConfig);

src/views/product/categoryconfig/search.ts

@@ -0,0 +1,44 @@
+import DeptAPI from "@/api/system/dept";
+import type { ISearchConfig } from "@/components/CURD/types";
+
+const searchConfig: ISearchConfig = {
+  pageName: "sys:user",
+  formItems: [
+    {
+      type: "input",
+      label: "单位名称",
+      prop: "name",
+      attrs: {
+        placeholder: "请输入单位名称",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+    },
+    // {
+    //   type: "tree-select",
+    //   label: "设备类型",
+    //   prop: "deptId",
+    //   attrs: {
+    //     placeholder: "请选择设备类型",
+    //     data: [],
+    //     filterable: true,
+    //     "check-strictly": true,
+    //     "render-after-expand": false,
+    //     clearable: true,
+    //     style: {
+    //       width: "150px",
+    //     },
+    //   },
+    //   async initFn(formItem) {
+    //     formItem.attrs.data = await DeptAPI.getOptions();
+    //     // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
+    //     // this.attrs!.data = await DeptAPI.getOptions();
+    //   },
+    // },
+
+  ],
+};
+
+export default searchConfig;

src/views/product/unit.vue

@@ -1 +1,145 @@
-<template></template>
+<template>
+  <div class="app-container">
+    <!-- 列表 -->
+    <template v-if="isA">
+      <!-- 搜索 -->
+      <page-search ref="searchRef" :search-config="searchConfig" @query-click="handleQueryClick"
+        @reset-click="handleResetClick" />
+
+      <!-- 列表 -->
+      <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
+        @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
+        @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
+        <template #status="scope">
+          <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
+            {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+          </el-tag>
+        </template>
+        <template #gender="scope">
+          <DictLabel v-model="scope.row[scope.prop]" code="gender" />
+        </template>
+        <template #mobile="scope">
+          <el-text>{{ scope.row[scope.prop] }}</el-text>
+          <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
+        </template>
+      </page-content>
+
+      <!-- 新增 -->
+      <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
+        <template #gender="scope">
+          <Dict v-model="scope.formData[scope.prop]" code="gender" />
+        </template>
+      </page-modal>
+
+      <!-- 编辑 -->
+      <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
+        <template #gender="scope">
+          <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
+        </template>
+      </page-modal>
+    </template>
+    <template v-else>
+      <page-content ref="contentRef" :content-config="contentConfig2" @operat-click="handleOperatClick">
+        <template #status="scope">
+          <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
+            {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+          </el-tag>
+        </template>
+      </page-content>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import UserAPI from "@/api/product/commonUnits";
+import DeptAPI from "@/api/system/dept";
+import RoleAPI from "@/api/system/role";
+import type { IObject, IOperatData } from "@/components/CURD/types";
+import usePage from "@/components/CURD/usePage";
+import addModalConfig from "./unitconfig/add";
+import contentConfig from "./unitconfig/content";
+import contentConfig2 from "./unitconfig/content2";
+import editModalConfig from "./unitconfig/edit";
+import searchConfig from "./unitconfig/search";
+
+const {
+  searchRef,
+  contentRef,
+  addModalRef,
+  editModalRef,
+  handleQueryClick,
+  handleResetClick,
+  // handleAddClick,
+  // handleEditClick,
+  handleSubmitClick,
+  handleExportClick,
+  handleSearchClick,
+  handleFilterChange,
+} = usePage();
+
+// 新增
+async function handleAddClick() {
+  addModalRef.value?.setModalVisible();
+  // 加载部门下拉数据源
+  addModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
+  // 加载角色下拉数据源
+  addModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
+}
+// 编辑
+async function handleEditClick(row: IObject) {
+  editModalRef.value?.handleDisabled(false);
+  // 加载部门下拉数据源
+  // editModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
+  // 加载角色下拉数据源
+  // editModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
+  // 根据id获取数据进行填充
+  const data = await UserAPI.getunitinfo(row.id);
+  editModalRef.value?.setFormData(data);
+  editModalRef.value?.setModalVisible();
+
+}
+// 其他工具栏
+function handleToolbarClick(name: string) {
+  console.log(name);
+  if (name === "custom1") {
+    ElMessage.success("点击了自定义1按钮");
+  }
+}
+// 其他操作列
+async function handleOperatClick(data: IOperatData) {
+  console.log(data);
+  // 重置密码
+  if (data.name === "reset_pwd") {
+    ElMessageBox.prompt("请输入用户「" + data.row.username + "」的新密码", "重置密码", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    }).then(({ value }) => {
+      if (!value || value.length < 6) {
+        ElMessage.warning("密码至少需要6位字符，请重新输入");
+        return false;
+      }
+      // UserAPI.resetPassword(data.row.id, value).then(() => {
+      //   ElMessage.success("密码重置成功，新密码是：" + value);
+      // });
+    });
+  } else if (data.name === "detail") {
+    // 禁用表单编辑
+    editModalRef.value?.handleDisabled(true);
+    // 打开抽屉
+    editModalRef.value?.setModalVisible();
+    // 修改抽屉标题
+    editModalConfig.drawer = { ...editModalConfig.drawer, title: "用户详情" };
+    // 加载部门下拉数据源
+    editModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
+    // 加载角色下拉数据源
+    editModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
+    // 根据id获取数据进行填充
+    // const formData = await UserAPI.getFormData(data.row.id);
+    // 设置表单数据
+    // editModalRef.value?.setFormData(formData);
+  }
+}
+
+// 切换示例
+const isA = ref(true);
+</script>

src/views/product/unitconfig/add.ts

@@ -0,0 +1,37 @@
+import UserAPI from "@/api/product/commonUnits";
+
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig<UserForm> = {
+  pageName: "sys:user",
+  dialog: {
+    title: "新增单位",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 100,
+  },
+  formAction: UserAPI.addunit,
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "单位名称",
+      prop: "name",
+      rules: [{ required: true, message: "单位名称不能为空", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "请输入单位名称",
+      },
+    },
+
+
+  ],
+};
+export interface UserForm {
+
+}
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);

src/views/product/unitconfig/content.ts

@@ -0,0 +1,58 @@
+import UserAPI from "@/api/product/commonUnits";
+import RoleAPI from "@/api/system/role";
+import type { UserPageQuery } from "@/api/system/user";
+import type { IContentConfig } from "@/components/CURD/types";
+
+const contentConfig: IContentConfig<UserPageQuery> = {
+  pageName: "sys:user",
+  table: {
+    border: true,
+    highlightCurrentRow: true,
+  },
+  pagination: {
+    background: true,
+    layout: "prev,pager,next,jumper,total,sizes",
+    pageSize: 20,
+    pageSizes: [10, 20, 30, 50],
+  },
+  indexActionData: { name: "", orderBy: "name asc" },
+  indexAction: function (params) {
+    return UserAPI.getPage(params);
+  },
+  deleteAction: UserAPI.deleteByIds,
+  // importAction(file) {
+  //   return UserAPI.import(1, file);
+  // },
+  // exportAction: UserAPI.export,
+  // importTemplate: UserAPI.downloadTemplate,
+  importsAction(data) {
+    // 模拟导入数据
+    console.log("importsAction", data);
+    return Promise.resolve();
+  },
+  exportsAction: async function (params) {
+    // 模拟获取到的是全量数据
+    const res = await UserAPI.getPage(params);
+    console.log("exportsAction", res.list);
+    return res.list;
+  },
+  pk: "id",
+  toolbar: [
+    "add",
+  ],
+  cols: [
+    // { type: "selection", width: 50, align: "center" },
+    { label: "单位名称", align: "center", prop: "name" },
+    { label: "排序", align: "center", prop: "id" },
+    {
+      label: "操作",
+      align: "center",
+      fixed: "right",
+      width: 280,
+      templet: "tool",
+      operat: ["edit", "delete"],
+    },
+  ],
+};
+
+export default contentConfig;

src/views/product/unitconfig/content2.ts

@@ -0,0 +1,133 @@
+import type { IContentConfig } from "@/components/CURD/types";
+
+const contentConfig: IContentConfig = {
+  pageName: "sys:user",
+  table: {
+    showOverflowTooltip: true,
+  },
+  toolbar: [],
+  indexAction: function (params) {
+    // 模拟发起网络请求获取列表数据
+    console.log("indexAction:", params);
+    return Promise.resolve({
+      total: 2,
+      list: [
+        {
+          id: 1,
+          username: "tom",
+          avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+          percent: 99,
+          price: 10,
+          url: "https://www.baidu.com",
+          icon: "el-icon-setting",
+          gender: 1,
+          status: 1,
+          status2: 1,
+          sort: 99,
+          createTime: 1715647982437,
+        },
+        {
+          id: 2,
+          username: "jerry",
+          avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+          percent: 88,
+          price: 999,
+          url: "https://www.google.com",
+          icon: "el-icon-user",
+          gender: 0,
+          status: 0,
+          status2: 0,
+          sort: 0,
+          createTime: 1715648977426,
+        },
+      ],
+    });
+  },
+  modifyAction(data) {
+    // 模拟发起网络请求修改字段
+    // console.log("modifyAction:", data);
+    ElMessage.success(JSON.stringify(data));
+    return Promise.resolve(null);
+  },
+  cols: [
+    { type: "index", width: 50, align: "center" },
+    { label: "ID", align: "center", prop: "id", show: false },
+    { label: "文本", align: "center", prop: "username" },
+    { label: "图片", align: "center", prop: "avatar", templet: "image" },
+    {
+      label: "百分比",
+      align: "center",
+      prop: "percent",
+      templet: "percent",
+    },
+    {
+      label: "货币符",
+      align: "center",
+      prop: "price",
+      templet: "price",
+      priceFormat: "$",
+    },
+    { label: "链接", align: "center", prop: "url", width: 180, templet: "url" },
+    { label: "图标", align: "center", prop: "icon", templet: "icon" },
+    {
+      label: "列表值",
+      align: "center",
+      prop: "gender",
+      templet: "list",
+      selectList: { "0": "女", "1": "男" },
+    },
+    {
+      label: "自定义",
+      align: "center",
+      prop: "status",
+      templet: "custom",
+      slotName: "status",
+    },
+    {
+      label: "Switch",
+      align: "center",
+      prop: "status2",
+      templet: "switch",
+      activeValue: 1,
+      inactiveValue: 0,
+      activeText: "启用",
+      inactiveText: "禁用",
+    },
+    {
+      label: "输入框",
+      align: "center",
+      prop: "sort",
+      templet: "input",
+      inputType: "number",
+    },
+    {
+      label: "日期格式化",
+      align: "center",
+      prop: "createTime",
+      minWidth: 120,
+      templet: "date",
+      dateFormat: "YYYY/MM/DD HH:mm:ss",
+    },
+    {
+      label: "操作栏",
+      align: "center",
+      fixed: "right",
+      width: 220,
+      templet: "tool",
+      operat: [
+        {
+          name: "reset_pwd",
+          auth: "password:reset",
+          icon: "refresh-left",
+          text: "重置密码",
+          type: "primary",
+          render(row) {
+            return row.id === 1;
+          },
+        },
+      ],
+    },
+  ],
+};
+
+export default contentConfig;

src/views/product/unitconfig/edit.ts

@@ -0,0 +1,61 @@
+import UserAPI from "@/api/product/commonUnits";
+
+import type { IModalConfig } from "@/components/CURD/types";
+import { DeviceEnum } from "@/enums/DeviceEnum";
+import { useAppStore } from "@/store";
+
+const modalConfig: IModalConfig<UserForm> = {
+  pageName: "sys:user",
+  // component: "drawer",
+  dialog: {
+    title: "编辑单位",
+    width: 800,
+    draggable: true,
+  },
+
+  pk: "id",
+  formAction: function (data) {
+    return UserAPI.update(data);
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "单位名称",
+      prop: "name",
+      rules: [{ required: true, message: "单位名称不能为空", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "请输入单位名称",
+      },
+    },
+
+
+  ],
+};
+/** 用户表单类型 */
+interface UserForm {
+  /** 用户头像 */
+  avatar?: string;
+  /** 部门ID */
+  deptId?: number;
+  /** 邮箱 */
+  email?: string;
+  /** 性别 */
+  gender?: number;
+  /** 用户ID */
+  id?: number;
+  /** 手机号 */
+  mobile?: string;
+  /** 昵称 */
+  nickname?: string;
+  /** 角色ID集合 */
+  roleIds?: number[];
+  /** 用户状态(1:正常;0:禁用) */
+  status?: number;
+  /** 用户名 */
+  username?: string;
+}
+
+export default reactive(modalConfig);

src/views/product/unitconfig/search.ts

@@ -0,0 +1,44 @@
+import DeptAPI from "@/api/system/dept";
+import type { ISearchConfig } from "@/components/CURD/types";
+
+const searchConfig: ISearchConfig = {
+  pageName: "sys:user",
+  formItems: [
+    {
+      type: "input",
+      label: "单位名称",
+      prop: "name",
+      attrs: {
+        placeholder: "请输入单位名称",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+    },
+    // {
+    //   type: "tree-select",
+    //   label: "设备类型",
+    //   prop: "deptId",
+    //   attrs: {
+    //     placeholder: "请选择设备类型",
+    //     data: [],
+    //     filterable: true,
+    //     "check-strictly": true,
+    //     "render-after-expand": false,
+    //     clearable: true,
+    //     style: {
+    //       width: "150px",
+    //     },
+    //   },
+    //   async initFn(formItem) {
+    //     formItem.attrs.data = await DeptAPI.getOptions();
+    //     // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
+    //     // this.attrs!.data = await DeptAPI.getOptions();
+    //   },
+    // },
+
+  ],
+};
+
+export default searchConfig;