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

src/views/product/categoryconfig/add.ts

@@ -1,4 +1,4 @@
-import UserAPI from "@/api/product/commonUnits";
+import UserAPI from "@/api/product/productclassification";
 
 import type { IModalConfig } from "@/components/CURD/types";
 
@@ -32,7 +32,7 @@ const modalConfig: IModalConfig<UserForm> = {
       type: "UpImage",
     },
     {
-      label: "开关2",
+      label: "开关",
       prop: "status",
       type: "switch",
       options: [
@@ -47,6 +47,6 @@ const modalConfig: IModalConfig<UserForm> = {
     },
   ],
 };
-export interface UserForm {}
+export interface UserForm { }
 // 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
 export default reactive(modalConfig);

src/views/product/categoryconfig/content.ts

@@ -28,17 +28,17 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   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;
-  },
+  // 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",

src/views/product/categoryconfig/edit.ts

@@ -15,7 +15,7 @@ const modalConfig: IModalConfig<UserForm> = {
 
   pk: "id",
   formAction: function (data) {
-    return UserAPI.update(data);
+    return UserAPI.update({ ...data, sort: '1' });
   },
   beforeSubmit(data) {
     console.log("提交之前处理", data);