Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web

src/api/system/order.ts

@@ -0,0 +1,216 @@
+import request from "@/utils/request";
+import { System_BaseUrl } from "@/api/config";
+const baseURL = System_BaseUrl + "/admin/order";
+const OrderApi = {
+  getList(params: getListRequest) {
+    return request<any, getListResponse>({
+      url: `${baseURL}`,
+      method: "get",
+      params: params,
+    });
+  },
+  add() {},
+  edit() {},
+  delete() {},
+};
+
+export default OrderApi;
+// 订单状态
+export type statusType =
+  | "unpaid"
+  | "in-production"
+  | "wait-out"
+  | "done"
+  | "refunding"
+  | "refund"
+  | "part-refund"
+  | "cancelled"
+  | "";
+
+// 发货类型
+export type sendType = "post" | "takeaway" | "takeself" | "table" | "";
+//订单类型
+export type orderType = "cash" | "miniapp" | "offline" | "";
+//是否回收站 0-否，1回收站 默认查未删除
+export type isDel = 0 | 1;
+
+export interface getListRequest {
+  endTime?: string;
+  /**
+   * 是否回收站 0-否，1回收站 默认查未删除
+   */
+  isDel?: isDel;
+  /**
+   * 订单编号
+   */
+  orderNo?: string;
+  /**
+   * 订单类型-cash收银-miniapp小程序-offline线下
+   */
+  orderType?: orderType;
+  /**
+   * 支付类型
+   */
+  payType?: string;
+  /**
+   * 平台类型
+   */
+  platformType?: string;
+  /**
+   * 查询包含该商品的 所有订单
+   */
+  productName?: string;
+  /**
+   * 发货类型post快递，takeaway外卖,takeself,自提table---堂食
+   */
+  sendType?: sendType;
+  /**
+   * 店铺Id
+   */
+  shopId?: number;
+  startTime?: string;
+  /**
+   * 状态: unpaid-待支付;in-production 制作中;wait-out
+   * 待取餐;;done-订单完成;refunding-申请退单;refund-退单;part-refund 部分退单;cancelled-取消订单
+   */
+  status?: statusType;
+  /**
+   * 台桌id
+   */
+  tableId?: string;
+  /**
+   * 台桌名称
+   */
+  tableName?: string;
+  [property: string]: any;
+}
+
+/**
+ * CzgResultPageOrderInfoVo
+ */
+export interface getListResponse {
+  code?: number;
+  data?: PageOrderInfoVo;
+  msg?: string;
+  [property: string]: any;
+}
+
+/**
+ * PageOrderInfoVo
+ */
+export interface PageOrderInfoVo {
+  maxPageSize?: number;
+  optimizeCountQuery?: boolean;
+  pageNumber?: number;
+  pageSize?: number;
+  records?: OrderInfoVo[];
+  totalPage?: number;
+  totalRow?: number;
+  [property: string]: any;
+}
+
+/**
+ * 订单表 通用展示类
+ *
+ * OrderInfoVo
+ */
+export interface OrderInfoVo {
+  createTime?: string;
+  /**
+   * 用餐模式 堂食 dine-in  外带 take-out 外卖 take-away
+   */
+  dineMode?: string;
+  /**
+   * 订单商品列表
+   */
+  goods?: OrderDetailSmallVO[];
+  id?: number;
+  /**
+   * 是否使用了霸王餐
+   */
+  isFreeDine?: number;
+  /**
+   * 订单金额 (扣除各类折扣)
+   */
+  orderAmount?: number;
+  /**
+   * 订单编号
+   */
+  orderNo?: string;
+  /**
+   * 订单类型-
+   * cash收银(除小程序以外 都属于收银)
+   * miniapp小程序
+   */
+  orderType?: orderType;
+  /**
+   * 订单原金额 不含折扣价格
+   */
+  originAmount?: number;
+  /**
+   * 支付时间
+   */
+  paidTime?: string;
+  /**
+   * 实际支付金额
+   */
+  payAmount?: number;
+  /**
+   * 支付订单号
+   */
+  payOrderNo?: string;
+  /**
+   * 支付类型
+   * 主扫 main-scan
+   * 被扫 back-scan
+   * 微信小程序 wechat-mini
+   * 支付宝小程序 alipay-mini
+   * 会员支付 vip-pay
+   * 现金支付 cash-pay
+   */
+  payType?: string;
+  /**
+   * 平台类型  pc 收银机客户端 wechat 微信小程序 alipay 支付宝小程序 admin-pc PC管理端 admin-app APP管理端
+   */
+  platformType?: string;
+  /**
+   * 是否支持退款，1支持退单， 0不支持退单
+   */
+  refundAble?: number;
+  /**
+   * 退单金额
+   */
+  refundAmount?: number;
+  /**
+   * 备注
+   */
+  remark?: string;
+  /**
+   * 店铺Id
+   */
+  shopId?: string;
+  /**
+   * 状态: unpaid-待支付;in-production 制作中;wait-out
+   * 待取餐;;done-订单完成;refunding-申请退单;refund-退单;part-refund 部分退单;cancelled-取消订单
+   */
+  status?: statusType;
+  /**
+   * 台桌名称
+   */
+  tableName?: string;
+  [property: string]: any;
+}
+
+/**
+ * 订单详情 实体类。
+ *
+ * OrderDetailSmallVO
+ */
+export interface OrderDetailSmallVO {
+  num?: number;
+  productImg?: string;
+  productName?: string;
+  refundNum?: number;
+  skuName?: string;
+  [property: string]: any;
+}

src/api/system/version.ts

@@ -4,14 +4,28 @@ const baseURL = System_BaseUrl + "/admin/version";
 
 const VersionApi = {
   getList() {
-    return request<any, getListResponse>({
+    return request<any>({
       url: `${baseURL}/list`,
       method: "get",
     });
   },
+  add(data: addRequest) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "post",
+      data,
+    });
+  },
+  edit(data: editRequest) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "put",
+      data,
+    });
+  },
   delete(id: string) {
     return request<any>({
-      url: `${baseURL}/id`,
+      url: `${baseURL}/` + id,
       method: "delete",
     });
   },
@@ -19,7 +33,7 @@ const VersionApi = {
 
 export default VersionApi;
 
-export interface getListResponse {
+export interface versionForm {
   /**
    * 版本 id
    */
@@ -50,3 +64,62 @@ export interface getListResponse {
   version?: string;
   [property: string]: any;
 }
+
+export interface addRequest {
+  /**
+   * 是否强制更新，0：不强制更新；1：强制更新
+   */
+  isForce: number;
+  /**
+   * 更新内容
+   */
+  message: string;
+  /**
+   * 渠道，pc 桌面端， manager_app 管理端， phone_book 电话机点餐
+   */
+  source: string;
+  /**
+   * 类型，0 windows，1 安卓，2 iOS
+   */
+  type: string;
+  /**
+   * 下载地址
+   */
+  url: string;
+  /**
+   * 版本号
+   */
+  version: string;
+  [property: string]: any;
+}
+export interface editRequest {
+  /**
+   * 版本id，ID 编号
+   */
+  id: number;
+  /**
+   * 是否强制升级，0：不强制更新；1：强制更新
+   */
+  isForce: number;
+  /**
+   * 更新内容
+   */
+  message: string;
+  /**
+   * 渠道，pc 桌面端， manager_app 管理端， phone_book 电话机点餐
+   */
+  source: string;
+  /**
+   * 类型，0 windows，1 安卓，2 iOS
+   */
+  type: string;
+  /**
+   * 下载地址
+   */
+  url: string;
+  /**
+   * 版本号
+   */
+  version: string;
+  [property: string]: any;
+}

src/components/CURD/PageForm.vue

@@ -28,7 +28,7 @@
             </template>
             <!-- textarea 输入框 -->
 
-            <template v-else-if="item.type === 'textarea' || item.type === undefined">
+            <template v-else-if="item.type === 'textarea'">
               <el-input v-model="formData[item.prop]" type="textarea" v-bind="item.attrs" />
             </template>
             <!-- Select 选择器 -->

src/components/CURD/PageModal.vue

@@ -24,8 +24,8 @@
                   <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
                 </template>
                 <!-- textarea 输入框 -->
-                <template v-if="item.type === 'textarea' || item.type === undefined">
-                  <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
+                <template v-if="item.type === 'textarea'">
+                  <el-input v-model="formData[item.prop]" v-bind="item.attrs" type="textarea" />
                 </template>
                 <!-- Select 选择器 -->
                 <template v-else-if="item.type === 'select'">
@@ -123,6 +123,10 @@
                   <template v-if="item.type === 'input' || item.type === undefined">
                     <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
                   </template>
+                  <!-- textarea 输入框 -->
+                  <template v-if="item.type === 'textarea'">
+                    <el-input v-model="formData[item.prop]" v-bind="item.attrs" type="textarea" />
+                  </template>
                   <!-- Select 选择器 -->
                   <template v-else-if="item.type === 'select'">
                     <el-select v-model="formData[item.prop]" v-bind="item.attrs">

src/components/CURD/PageSearch.vue

@@ -5,7 +5,7 @@
     shadow="never"
     class="mb-[10px]"
   >
-    <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+    <el-form ref="queryFormRef" :model="queryParams" :inline="inline">
       <template v-for="(item, index) in formItems" :key="item.prop">
         <el-form-item
           v-show="isExpand ? true : index < showNumber"
@@ -36,6 +36,14 @@
               @keyup.enter="handleQuery"
             />
           </template>
+          <!-- radio-button radio按钮组 -->
+          <template v-if="item.type === 'radio-button'">
+            <el-radio-group v-model="queryParams[item.prop]" v-bind="item.attrs">
+              <template v-for="option in item.options" :key="option.value">
+                <el-radio-button :label="option.label" :value="option.value" />
+              </template>
+            </el-radio-group>
+          </template>
           <!-- InputTag 标签输入框 -->
           <template v-if="item.type === 'input-tag'">
             <div class="flex-center">
@@ -131,6 +139,10 @@ const emit = defineEmits<{
 }>();
 
 const queryFormRef = ref<FormInstance>();
+//form表单展示形式
+const inline = ref<boolean>(
+  props.searchConfig.inline === undefined ? true : !!props.searchConfig.inline
+);
 // 是否显示
 const visible = ref(true);
 // 响应式的formItems

src/components/CURD/types.ts

@@ -29,10 +29,11 @@ export interface IOperatData {
 export interface ISearchConfig {
   // 页面名称(参与组成权限标识,如sys:user:xxx)
   pageName: string;
+  inline?: Boolean;
   // 表单项
   formItems: Array<{
     // 组件类型(如input,select等)
-    type?: "input" | "select" | "tree-select" | "date-picker" | "input-tag";
+    type?: "input" | "select" | "tree-select" | "date-picker" | "input-tag" | "radio-button";
     // 标签文本
     label: string;
     // 标签提示

src/components/Upload/FileUpload.vue

@@ -49,7 +49,7 @@ import {
   UploadRequestOptions,
 } from "element-plus";
 
-import FileAPI, { FileInfo } from "@/api/file";
+import CommonApi, { FileInfo, uploadResponse } from "@/api/account/common";
 
 const props = defineProps({
   /**
@@ -165,7 +165,7 @@ function handleUpload(options: UploadRequestOptions) {
       formData.append(key, props.data[key]);
     });
 
-    FileAPI.upload(formData)
+    CommonApi.upload(formData)
       .then((data) => {
         resolve(data);
       })
@@ -187,9 +187,9 @@ const handleProgress = (event: UploadProgressEvent) => {
 /**
  * 上传成功
  */
-const handleSuccess = (fileInfo: FileInfo) => {
+const handleSuccess = (fileInfo: string) => {
   ElMessage.success("上传成功");
-  modelValue.value = [...modelValue.value, fileInfo.url];
+  modelValue.value = [...modelValue.value, fileInfo];
 };
 
 const handleError = (error: any) => {
@@ -200,19 +200,19 @@ const handleError = (error: any) => {
  * 删除文件
  */
 function handleRemove(fileUrl: string) {
-  FileAPI.delete(fileUrl).then(() => {
-    modelValue.value = modelValue.value.filter((url) => url !== fileUrl);
-  });
+  // CommonApi.delete(fileUrl).then(() => {
+  modelValue.value = modelValue.value.filter((url) => url !== fileUrl);
+  // });
 }
 
 /**
  * 下载文件
  */
 function handleDownload(file: UploadUserFile) {
-  const { url, name } = file;
-  if (url) {
-    FileAPI.download(url, name);
-  }
+  // const { url, name } = file;
+  // if (url) {
+  //   CommonApi.download(url, name);
+  // }
 }
 </script>
 <style lang="scss" scoped>

src/layout/components/Sidebar/index.vue

@@ -40,7 +40,7 @@ const isSidebarCollapsed = computed(() => !appStore.sidebar.opened);
 <style lang="scss" scoped>
 .has-logo {
   .el-scrollbar {
-    height: calc(100vh - $navbar-height);
+    height: calc(100vh - $navbar-height - $window-top);
   }
 }
 </style>

src/router/index.ts

@@ -463,7 +463,7 @@ export const constantRoutes: RouteRecordRaw[] = [
     children: [
       {
         path: "index",
-        component: () => import("@/views/order/index.vue"),
+        component: () => import("@/views/order/index/index.vue"),
         name: "orderIndex",
         meta: {
           title: "订单列表",

src/types/global.d.ts

@@ -12,8 +12,8 @@ declare global {
    * 分页查询参数
    */
   interface PageQuery {
-    pageNum: number;
-    pageSize: number;
+    page: number;
+    size: number;
   }
 
   /**

src/views/admim/system/version/config/add.ts

@@ -1,7 +1,8 @@
-import UserAPI, { type UserForm } from "@/api/system/user";
+import VersionApi, { type addRequest } from "@/api/system/version";
+import { sourceOptions, typeOptions, isForceOptions } from "./config";
 import type { IModalConfig } from "@/components/CURD/types";
 
-const modalConfig: IModalConfig<UserForm> = {
+const modalConfig: IModalConfig<addRequest> = {
   pageName: "sys:user",
   dialog: {
     title: "新增版本",
@@ -11,7 +12,9 @@ const modalConfig: IModalConfig<UserForm> = {
   form: {
     labelWidth: 140,
   },
-  formAction: UserAPI.add,
+  formAction: function (data) {
+    return VersionApi.add({ ...data, url: typeof data.url === "string" ? data.url : data.url[0] });
+  },
   beforeSubmit(data) {
     console.log("提交之前处理", data);
   },
@@ -24,11 +27,7 @@ const modalConfig: IModalConfig<UserForm> = {
       attrs: {
         placeholder: "请选择渠道",
       },
-      options: [
-        { label: "桌面端", value: "pc" },
-        { label: "管理端", value: "manager_app" },
-        { label: "电话机点餐", value: "phone_book " },
-      ],
+      options: sourceOptions,
     },
     {
       label: "类型",
@@ -42,11 +41,7 @@ const modalConfig: IModalConfig<UserForm> = {
         xs: 24,
         sm: 12,
       },
-      options: [
-        { label: "windows", value: 0 },
-        { label: "安卓", value: 1 },
-        { label: "iOS", value: 2 },
-      ],
+      options: typeOptions,
     },
     {
       type: "input",
@@ -66,20 +61,27 @@ const modalConfig: IModalConfig<UserForm> = {
         placeholder: "请输入版本号",
       },
       initialValue: 0,
-      options: [
-        { label: "是", value: 1 },
-        { label: "否", value: 0 },
-      ],
+      options: isForceOptions,
     },
     {
       type: "textarea",
       label: "更新提示内容",
-      prop: "version",
-      rules: [{ required: true, message: "请输入版本号", trigger: "blur" }],
+      prop: "message",
+      rules: [{ required: true, message: "请输入更新提示内容", trigger: "blur" }],
       attrs: {
-        placeholder: "请输入版本号",
+        placeholder: "请输入更新提示内容",
       },
     },
+    {
+      type: "custom",
+      label: "版本文件",
+      prop: "url",
+      rules: [{ required: true, message: "请上传版本文件", trigger: "blur" }],
+      attrs: {
+        placeholder: "请上传版本文件",
+      },
+      initialValue: [],
+    },
   ],
 };
 

src/views/admim/system/version/config/config.ts

@@ -0,0 +1,45 @@
+import { property } from "lodash";
+
+export const sourceOptions: options[] = [
+  { label: "桌面端", value: "pc" },
+  { label: "管理端", value: "manager_app" },
+  { label: "电话机点餐", value: "phone_book " },
+];
+export const typeOptions: options[] = [
+  { label: "windows", value: "0" },
+  { label: "安卓", value: "1" },
+  { label: "IOS", value: "2" },
+];
+export const isForceOptions: options[] = [
+  { label: "不强制更新", value: 0 },
+  { label: "强制更新", value: 1 },
+];
+
+export type optionsType = "source" | "type" | "isForce";
+
+export function returnOptions(type: optionsType) {
+  if (type === "source") {
+    return sourceOptions;
+  }
+  if (type === "type") {
+    return typeOptions;
+  }
+  if (type === "isForce") {
+    return isForceOptions;
+  }
+}
+
+export function returnOptionsLabel(optionsType: optionsType, value: string | number) {
+  const options = returnOptions(optionsType);
+  if (!options) {
+    return "";
+  }
+  const option = options.find((item) => item.value === value);
+  return option ? option.label : "";
+}
+
+export interface options {
+  label: string;
+  value: string | number;
+  [property: string]: any;
+}

src/views/admim/system/version/config/content.ts

@@ -1,9 +1,8 @@
 import VersionApi from "@/api/system/version";
-import RoleAPI from "@/api/system/role";
-import type { UserPageQuery } from "@/api/system/user";
+import type { editRequest } from "@/api/system/version";
 import type { IContentConfig } from "@/components/CURD/types";
 
-const contentConfig: IContentConfig<UserPageQuery> = {
+const contentConfig: IContentConfig<editRequest> = {
   pageName: "sys:user",
   table: {
     border: true,
@@ -19,30 +18,37 @@ const contentConfig: IContentConfig<UserPageQuery> = {
     return VersionApi.getList();
   },
   deleteAction: VersionApi.delete,
-  importsAction(data) {
-    // 模拟导入数据
-    console.log("importsAction", data);
-    return Promise.resolve();
-  },
-  exportsAction: async function (params) {
-    // 模拟获取到的是全量数据
-    const res = await VersionApi.getList(params);
-    console.log("exportsAction", res.list);
-    return res.list;
-  },
+  // modifyAction: function (data) {
+  //   // return VersionApi.edit(data);
+  // },
   pk: "id",
   toolbar: ["add"],
   defaultToolbar: ["refresh", "filter", "search"],
   cols: [
     { type: "selection", width: 50, align: "center" },
     { label: "id", align: "center", prop: "id", width: 100, show: true },
-    { label: "渠道", align: "center", prop: "source" },
+    {
+      label: "渠道",
+      align: "center",
+      prop: "source",
+      width: 120,
+      templet: "custom",
+      slotName: "options",
+    },
     {
       label: "类型",
       align: "center",
       prop: "type",
+      width: 120,
+      templet: "custom",
+      slotName: "options",
+    },
+    {
+      label: "版本号",
+      align: "center",
+      width: 120,
+      prop: "version",
     },
-    { label: "版本号", align: "center", prop: "version" },
 
     {
       label: "是否强制升级",
@@ -52,6 +58,12 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       templet: "switch",
       slotName: "isForce",
     },
+    {
+      label: "更新内容",
+      align: "center",
+      prop: "message",
+      width: 240,
+    },
     {
       label: "下载地址",
       align: "center",
@@ -65,20 +77,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: [
-        {
-          icon: "Document",
-          name: "edit",
-          text: "编辑",
-        },
-        {
-          name: "delete",
-          icon: "delete",
-          text: "删除",
-        },
-        "edit",
-        "delete",
-      ],
+      operat: ["edit", "delete"],
     },
   ],
 };

src/views/admim/system/version/config/edit.ts

@@ -1,116 +1,85 @@
-import UserAPI, { type UserForm } from "@/api/system/user";
+import VersionApi, { type editRequest } from "@/api/system/version";
 import type { IModalConfig } from "@/components/CURD/types";
-import { DeviceEnum } from "@/enums/DeviceEnum";
-import { useAppStore } from "@/store";
+import { sourceOptions, typeOptions, isForceOptions } from "./config";
 
-const modalConfig: IModalConfig<UserForm> = {
+const modalConfig: IModalConfig<editRequest> = {
   pageName: "sys:user",
-  component: "drawer",
-  drawer: {
-    title: "修改用户",
-    size: useAppStore().device === DeviceEnum.MOBILE ? "80%" : 500,
+  dialog: {
+    title: "编辑版本",
+    width: 800,
+    draggable: true,
   },
   pk: "id",
   formAction: function (data) {
-    return UserAPI.update(data.id as number, data);
+    return VersionApi.edit({ ...data, url: typeof data.url === "string" ? data.url : data.url[0] });
   },
   beforeSubmit(data) {
     console.log("提交之前处理", data);
   },
   formItems: [
     {
-      label: "用户名",
-      prop: "username",
-      rules: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
-      type: "input",
+      label: "渠道",
+      prop: "source",
+      rules: [{ required: true, message: "请选择渠道", trigger: "blur" }],
+      type: "select",
       attrs: {
-        placeholder: "请输入用户名",
-        readonly: true,
+        placeholder: "请选择渠道",
+      },
+      options: sourceOptions,
+    },
+    {
+      label: "类型",
+      prop: "type",
+      rules: [{ required: true, message: "请选择类型", trigger: "blur" }],
+      type: "select",
+      attrs: {
+        placeholder: "请选择类型",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+      options: typeOptions,
+    },
+    {
+      type: "input",
+      label: "版本号",
+      prop: "version",
+      rules: [{ required: true, message: "请输入版本号", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入版本号",
       },
     },
     {
-      label: "用户昵称",
-      prop: "nickname",
-      rules: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-      type: "input",
+      type: "radio",
+      label: "是否强制更新",
+      prop: "isForce",
+      rules: [{ required: true, message: "请输入版本号", trigger: "blur" }],
       attrs: {
-        placeholder: "请输入用户昵称",
+        placeholder: "请输入版本号",
       },
+      initialValue: 0,
+      options: isForceOptions,
     },
     {
-      label: "所属部门",
-      prop: "deptId",
-      rules: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
-      type: "tree-select",
+      type: "textarea",
+      label: "更新提示内容",
+      prop: "message",
+      rules: [{ required: true, message: "请输入更新提示内容", trigger: "blur" }],
       attrs: {
-        placeholder: "请选择所属部门",
-        data: [],
-        filterable: true,
-        "check-strictly": true,
-        "render-after-expand": false,
+        placeholder: "请输入更新提示内容",
       },
     },
     {
       type: "custom",
-      label: "性别",
-      prop: "gender",
-      initialValue: 1,
-    },
-    {
-      label: "角色",
-      prop: "roleIds",
-      rules: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
-      type: "select",
+      label: "版本文件",
+      prop: "url",
+      rules: [{ required: true, message: "请上传版本文件", trigger: "blur" }],
       attrs: {
-        placeholder: "请选择",
-        multiple: true,
+        placeholder: "请上传版本文件",
       },
-      options: [],
       initialValue: [],
     },
-    {
-      type: "input",
-      label: "手机号码",
-      prop: "mobile",
-      rules: [
-        {
-          pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-          message: "请输入正确的手机号码",
-          trigger: "blur",
-        },
-      ],
-      attrs: {
-        placeholder: "请输入手机号码",
-        maxlength: 11,
-      },
-    },
-    {
-      label: "邮箱",
-      prop: "email",
-      rules: [
-        {
-          pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
-          message: "请输入正确的邮箱地址",
-          trigger: "blur",
-        },
-      ],
-      type: "input",
-      attrs: {
-        placeholder: "请输入邮箱",
-        maxlength: 50,
-      },
-    },
-    {
-      label: "状态",
-      prop: "status",
-      type: "switch",
-      attrs: {
-        activeText: "正常",
-        inactiveText: "禁用",
-        activeValue: 1,
-        inactiveValue: 0,
-      },
-    },
   ],
 };
 

src/views/admim/system/version/index.vue

@@ -26,6 +26,9 @@
             {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
           </el-tag>
         </template>
+        <template #options="scope">
+          {{ returnOptionsLabel(scope.prop, scope.row[scope.prop]) }}
+        </template>
         <template #gender="scope">
           <DictLabel v-model="scope.row[scope.prop]" code="gender" />
         </template>
@@ -45,8 +48,9 @@
         :modal-config="addModalConfig"
         @submit-click="handleSubmitClick"
       >
-        <template #gender="scope">
-          <Dict v-model="scope.formData[scope.prop]" code="gender" />
+        <template #url="scope">
+          <FileUpload v-model="scope.formData[scope.prop]" :limit="1" v-bind="scope.attrs" />
+          <!-- <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" /> -->
         </template>
       </page-modal>
 
@@ -56,8 +60,9 @@
         :modal-config="editModalConfig"
         @submit-click="handleSubmitClick"
       >
-        <template #gender="scope">
-          <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
+        <template #url="scope">
+          <FileUpload v-model="scope.formData[scope.prop]" :limit="1" v-bind="scope.attrs" />
+          <!-- <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" /> -->
         </template>
       </page-modal>
     </template>
@@ -88,6 +93,7 @@ import contentConfig from "./config/content";
 import contentConfig2 from "./config/content2";
 import editModalConfig from "./config/edit";
 import searchConfig from "./config/search";
+import { returnOptionsLabel } from "./config/config";
 
 const {
   searchRef,
@@ -108,18 +114,20 @@ const {
 async function handleAddClick() {
   addModalRef.value?.setModalVisible();
   // 加载部门下拉数据源
-  addModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
+  // addModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
   // 加载角色下拉数据源
-  addModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
+  // addModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
 }
 // 编辑
 async function handleEditClick(row: IObject) {
   editModalRef.value?.handleDisabled(false);
   editModalRef.value?.setModalVisible();
   // 根据id获取数据进行填充
-  const data = await VersionApi.getFormData(row.id);
-  editModalRef.value?.setFormData(data);
+  // const data = await VersionApi.getFormData(row.id);
+  console.log({ ...row, url: [row.url] });
+  editModalRef.value?.setFormData({ ...row, url: [row.url] });
 }
+1;
 // 其他工具栏
 function handleToolbarClick(name: string) {
   console.log(name);

src/views/order/index.vue

@@ -1 +0,0 @@
-<template></template>

src/views/order/index/config/add.ts

@@ -0,0 +1,88 @@
+import VersionApi, { type addRequest } from "@/api/system/version";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig<addRequest> = {
+  pageName: "sys:user",
+  dialog: {
+    title: "新增版本",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 140,
+  },
+  formAction: function (data) {
+    return VersionApi.add({ ...data, url: typeof data.url === "string" ? data.url : data.url[0] });
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "渠道",
+      prop: "source",
+      rules: [{ required: true, message: "请选择渠道", trigger: "blur" }],
+      type: "select",
+      attrs: {
+        placeholder: "请选择渠道",
+      },
+      options: [],
+    },
+    {
+      label: "类型",
+      prop: "type",
+      rules: [{ required: true, message: "请选择类型", trigger: "blur" }],
+      type: "select",
+      attrs: {
+        placeholder: "请选择类型",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+      options: [],
+    },
+    {
+      type: "input",
+      label: "版本号",
+      prop: "version",
+      rules: [{ required: true, message: "请输入版本号", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入版本号",
+      },
+    },
+    {
+      type: "radio",
+      label: "是否强制更新",
+      prop: "isForce",
+      rules: [{ required: true, message: "请输入版本号", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入版本号",
+      },
+      initialValue: 0,
+      options: [],
+    },
+    {
+      type: "textarea",
+      label: "更新提示内容",
+      prop: "message",
+      rules: [{ required: true, message: "请输入更新提示内容", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入更新提示内容",
+      },
+    },
+    {
+      type: "custom",
+      label: "版本文件",
+      prop: "url",
+      rules: [{ required: true, message: "请上传版本文件", trigger: "blur" }],
+      attrs: {
+        placeholder: "请上传版本文件",
+      },
+      initialValue: [],
+    },
+  ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);

src/views/order/index/config/config.ts

@@ -0,0 +1,79 @@
+import type { statusType } from "@/api/system/order";
+export const statusOptions: statusOptions[] = [
+  { label: "全部", value: "" },
+  { label: "待支付", value: "unpaid" },
+  { label: "制作中", value: "in-production" },
+  { label: "待取餐", value: "wait-out" },
+  { label: "订单完成", value: "done" },
+  { label: "申请退单", value: "refunding" },
+  { label: "退单", value: "refund" },
+  { label: "部分退单", value: "part-refund" },
+  { label: "取消订单", value: "cancelled" },
+];
+export const payTypeOptions: payTypeOptions[] = [
+  { label: "全部", value: "" },
+  {
+    label: "现金",
+    value: "cash",
+  },
+  {
+    label: "银行卡",
+    value: "bank",
+  },
+  {
+    label: "扫码支付",
+    value: "scanCode",
+  },
+  {
+    label: "储值卡",
+    value: "deposit",
+  },
+  {
+    label: "会员支付",
+    value: "vipPay",
+  },
+  {
+    label: "挂账",
+    value: "arrears",
+  },
+];
+export type optionsType = "status";
+
+export function returnOptions(type: optionsType) {
+  if (type === "status") {
+    return statusOptions;
+  }
+}
+
+export function returnOptionsLabel(optionsType: optionsType, value: string | number) {
+  const options = returnOptions(optionsType);
+  if (!options) {
+    return "";
+  }
+  const option = options.find((item) => item.value === value);
+  return option ? option.label : "";
+}
+
+export interface options {
+  label: string;
+  value: string | number;
+  [property: string]: any;
+}
+export interface statusOptions extends options {
+  value: statusType;
+}
+
+export type payTypeValue =
+  | ""
+  | "cash"
+  | "bank"
+  | "scanCode"
+  | "deposit"
+  | "vipPay"
+  | "arrears"
+  | "virtual"
+  | "arrears";
+
+export interface payTypeOptions extends options {
+  value: payTypeValue;
+}

src/views/order/index/config/content.ts

@@ -0,0 +1,59 @@
+import OrderApi from "@/api/system/order";
+import type { editRequest } from "@/api/system/version";
+import type { IContentConfig } from "@/components/CURD/types";
+
+const contentConfig: IContentConfig = {
+  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],
+  },
+  indexAction: function (params) {
+    return OrderApi.getList(params);
+  },
+  // deleteAction: OrderApi.delete,
+  // modifyAction: function (data) {
+  //   // return OrderApi.edit(data);
+  // },
+  pk: "id",
+  toolbar: ["add"],
+  defaultToolbar: ["refresh", "filter", "search"],
+  cols: [
+    { type: "selection", width: 50, align: "center" },
+    // { label: "id", align: "center", prop: "id", width: 100, show: true },
+    {
+      label: "订单号信息",
+      align: "center",
+      prop: "orderNo",
+      width: 120,
+    },
+
+    {
+      label: "操作",
+      align: "center",
+      fixed: "right",
+      width: 280,
+      templet: "tool",
+      operat: [
+        {
+          icon: "Document",
+          name: "detail",
+          text: "详情",
+        },
+        {
+          icon: "Printer",
+          name: "printer",
+          text: "开票",
+        },
+      ],
+    },
+  ],
+};
+
+export default contentConfig;

src/views/order/index/config/edit.ts

@@ -0,0 +1,51 @@
+import VersionApi, { type editRequest } from "@/api/system/version";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig<editRequest> = {
+  pageName: "sys:user",
+  dialog: {
+    title: "编辑版本",
+    width: 800,
+    draggable: true,
+  },
+  pk: "id",
+  formAction: function (data) {
+    return VersionApi.edit({ ...data, url: typeof data.url === "string" ? data.url : data.url[0] });
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      type: "input",
+      label: "版本号",
+      prop: "version",
+      rules: [{ required: true, message: "请输入版本号", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入版本号",
+      },
+    },
+
+    {
+      type: "textarea",
+      label: "更新提示内容",
+      prop: "message",
+      rules: [{ required: true, message: "请输入更新提示内容", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入更新提示内容",
+      },
+    },
+    {
+      type: "custom",
+      label: "版本文件",
+      prop: "url",
+      rules: [{ required: true, message: "请上传版本文件", trigger: "blur" }],
+      attrs: {
+        placeholder: "请上传版本文件",
+      },
+      initialValue: [],
+    },
+  ],
+};
+
+export default reactive(modalConfig);

src/views/order/index/config/search.ts

@@ -0,0 +1,57 @@
+import type { ISearchConfig } from "@/components/CURD/types";
+import { statusOptions, payTypeOptions } from "./config";
+const searchConfig: ISearchConfig = {
+  pageName: "sys:user",
+  inline: false,
+  isExpandable: false,
+  formItems: [
+    {
+      type: "radio-button",
+      label: "订单状态",
+      prop: "status",
+      attrs: {
+        placeholder: "请选择订单状态",
+        clearable: true,
+      },
+      options: statusOptions,
+      initialValue: "",
+    },
+    {
+      type: "radio-button",
+      label: "支付方式",
+      prop: "payType",
+      attrs: {
+        placeholder: "请选择支付方式",
+        clearable: true,
+      },
+      options: payTypeOptions,
+      initialValue: "",
+    },
+    {
+      type: "input",
+      label: "订单编号",
+      prop: "orderNo",
+      attrs: {
+        placeholder: "请输入订单编号",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+    },
+    {
+      type: "input",
+      label: "商品名称",
+      prop: "productName",
+      attrs: {
+        placeholder: "请输入商品名称",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+    },
+  ],
+};
+
+export default searchConfig;

src/views/order/index/index.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="app-container">
+    <!-- 列表 -->
+    <!-- 搜索 -->
+    <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 #options="scope">
+        {{ returnOptionsLabel(scope.prop, scope.row[scope.prop]) }}
+      </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 #url="scope">
+        <FileUpload v-model="scope.formData[scope.prop]" :limit="1" v-bind="scope.attrs" />
+        <!-- <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" /> -->
+      </template>
+    </page-modal>
+
+    <!-- 编辑 -->
+    <page-modal
+      ref="editModalRef"
+      :modal-config="editModalConfig"
+      @submit-click="handleSubmitClick"
+    >
+      <template #url="scope">
+        <FileUpload v-model="scope.formData[scope.prop]" :limit="1" v-bind="scope.attrs" />
+        <!-- <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" /> -->
+      </template>
+    </page-modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import VersionApi from "@/api/system/version";
+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 "./config/add";
+import contentConfig from "./config/content";
+import editModalConfig from "./config/edit";
+import searchConfig from "./config/search";
+import { returnOptionsLabel } from "./config/config";
+
+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);
+  editModalRef.value?.setModalVisible();
+  // 根据id获取数据进行填充
+  // const data = await VersionApi.getFormData(row.id);
+  console.log({ ...row, url: [row.url] });
+  editModalRef.value?.setFormData({ ...row, url: [row.url] });
+}
+1;
+// 其他工具栏
+function handleToolbarClick(name: string) {
+  console.log(name);
+  if (name === "custom1") {
+    ElMessage.success("点击了自定义1按钮");
+  }
+}
+// 其他操作列
+async function handleOperatClick(data: IOperatData) {
+  console.log(data);
+  if (data.name === "detail") {
+    return;
+  }
+  if (data.name === "printer") {
+  }
+}
+
+// 切换示例
+const isA = ref(true);
+</script>