feat: update

sanmu
1 parent eea414e0
Showing 83 changed files with 4267 additions and 388 deletions
.env
.pnpm-debug.log
mock/demo/table-demo.ts
mock/sys/user.ts
package.json
src/api/demo/system.ts
src/api/demo/table.ts
src/api/project/account.ts
src/api/project/approve.ts
src/api/project/global.ts
src/api/project/order.ts
src/api/sys/model/userModel.ts
src/api/sys/user.ts
src/components/FieldUpload/index.ts
src/components/FieldUpload/src/FieldUpload.vue
src/components/Form/src/BasicForm.vue
src/components/Form/src/componentMap.ts
src/components/Form/src/types/index.ts
src/components/Table/src/BasicTable.vue
src/components/Table/src/components/settings/ColumnSetting.vue
 # spa-title
-VITE_GLOB_APP_TITLE = Vben Admin
+VITE_GLOB_APP_TITLE = 订单管理系统
+VITE_SANMU = sanmu123
+VITE_IS_DEV = true
+{
+  "0 error pnpm": {
+    "code": "ERR_PNPM_UNSUPPORTED_ENGINE",
+    "packageId": "/Users/sanmu/Documents/teach/vue-vben-admin",
+    "wanted": {
+      "pnpm": ">=8.1.0"
+    },
+    "current": {
+      "node": "v18.14.1",
+      "pnpm": "7.4.1"
+    },
+    "err": {
+      "name": "pnpm",
+      "message": "Unsupported engine for /Users/sanmu/Documents/teach/vue-vben-admin: wanted: {\"pnpm\":\">=8.1.0\"} (current: {\"node\":\"v18.14.1\",\"pnpm\":\"7.4.1\"})",
+      "code": "ERR_PNPM_UNSUPPORTED_ENGINE",
+      "stack": "pnpm: Unsupported engine for /Users/sanmu/Documents/teach/vue-vben-admin: wanted: {\"pnpm\":\">=8.1.0\"} (current: {\"node\":\"v18.14.1\",\"pnpm\":\"7.4.1\"})\n    at checkEngine (/Users/zhusen/.nvm/versions/node/v16.13.0/lib/node_modules/pnpm/dist/pnpm.cjs:43094:16)\n    at checkPackage (/Users/zhusen/.nvm/versions/node/v16.13.0/lib/node_modules/pnpm/dist/pnpm.cjs:43677:74)\n    at packageIsInstallable (/Users/zhusen/.nvm/versions/node/v16.13.0/lib/node_modules/pnpm/dist/pnpm.cjs:43700:61)\n    at exports2.default (/Users/zhusen/.nvm/versions/node/v16.13.0/lib/node_modules/pnpm/dist/pnpm.cjs:49525:46)\n    at async run (/Users/zhusen/.nvm/versions/node/v16.13.0/lib/node_modules/pnpm/dist/pnpm.cjs:192508:29)\n    at async runPnpm (/Users/zhusen/.nvm/versions/node/v16.13.0/lib/node_modules/pnpm/dist/pnpm.cjs:192771:5)\n    at async /Users/zhusen/.nvm/versions/node/v16.13.0/lib/node_modules/pnpm/dist/pnpm.cjs:192763:7"
+    }
+  }
+}
 \ No newline at end of file
@@ -37,6 +37,14 @@ const demoList = (() =&gt; {
       time: `@time('HH:mm')`,
       'no|100000-10000000': 100000,
       'status|1': ['normal', 'enable', 'disable'],
+      no1: '字段内容',
+      no2: '字段内容',
+      no3: '字段内容',
+      no4: '字段内容',
+      no5: '字段内容',
+      no6: '字段内容',
+      no7: '字段内容',
+      no8: '字段内容',
     });
   }
   return result;
@@ -11,7 +11,7 @@ export function createFakeUserList() {
       desc: 'manager',
       password: '123456',
       token: 'fakeToken1',
-      homePath: '/dashboard/analysis',
+      homePath: '/home',
       roles: [
         {
           roleName: 'Super Admin',
@@ -17,7 +17,7 @@
   },
   "scripts": {
     "bootstrap": "pnpm install",
-    "build": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build",
+    "build": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build",
     "build:analyze": "cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build --mode analyze",
     "build:docker": "vite build --mode docker",
     "build:no-cache": "pnpm clean:cache && npm run build",
@@ -151,4 +151,4 @@
     "node": ">=16.15.1",
     "pnpm": ">=8.1.0"
   }
 -}
+}
 \ No newline at end of file
@@ -13,17 +13,21 @@ import {
 import { defHttp } from '/@/utils/http/axios';
  
 enum Api {
-  AccountList = '/system/getAccountList',
+  AccountList = '/order/erp/users/list_by_page',
   IsAccountExist = '/system/accountExist',
   DeptList = '/system/getDeptList',
   setRoleStatus = '/system/setRoleStatus',
   MenuList = '/system/getMenuList',
-  RolePageList = '/system/getRoleListByPage',
+  RolePageList = '/order/erp/roles/list_by_page',
   GetAllRoleList = '/system/getAllRoleList',
 }
  
-export const getAccountList = (params: AccountParams) =>
-  defHttp.get<AccountListGetResultModel>({ url: Api.AccountList, params });
+export const getAccountList = async (params: AccountParams) => {
+  const res = await defHttp.post<AccountListGetResultModel>({ url: Api.AccountList, params });
+  return new Promise((resolve) => {
+    resolve(res.records);
+  });
+};
  
 export const getDeptList = (params?: DeptListItem) =>
   defHttp.get<DeptListGetResultModel>({ url: Api.DeptList, params });
@@ -31,8 +35,12 @@ export const getDeptList = (params?: DeptListItem) =&gt;
 export const getMenuList = (params?: MenuParams) =>
   defHttp.get<MenuListGetResultModel>({ url: Api.MenuList, params });
  
-export const getRoleListByPage = (params?: RolePageParams) =>
-  defHttp.get<RolePageListGetResultModel>({ url: Api.RolePageList, params });
+export const getRoleListByPage = async (params?: RolePageParams) => {
+  const res = await defHttp.post<RolePageListGetResultModel>({ url: Api.RolePageList, params });
+  return new Promise((resolve) => {
+    resolve(res.records);
+  });
+};
  
 export const getAllRoleList = (params?: RoleParams) =>
   defHttp.get<RoleListGetResultModel>({ url: Api.GetAllRoleList, params });
 import { defHttp } from '/@/utils/http/axios';
 import { DemoParams, DemoListGetResultModel } from './model/tableModel';
+import { find } from 'lodash-es';
+import { FIELDS_BASE_INFO } from '/@/views/project/order/tableData';
  
 enum Api {
   DEMO_LIST = '/table/getDemoList',
+  ORDER = '/order/erp/order/list_by_page',
+  DICT_INIT = '/order/erp/dictionary/get_all',
+  APPROVE = '/order/erp/audit/list_by_page',
+  CHECK = '/order/erp/audit/do_audit',
 }
  
 /**
  * @description: Get sample list value
  */
  
-export const demoListApi = (params: DemoParams) =>
-  defHttp.get<DemoListGetResultModel>({
-    url: Api.DEMO_LIST,
+export const demoListApi = async (params: DemoParams) => {
+  const res = await defHttp.post<DemoListGetResultModel>({
+    url: Api.ORDER,
     params,
     headers: {
       // @ts-ignore
       ignoreCancelToken: true,
     },
   });
+  return new Promise((resolve) => {
+    resolve(res.records);
+  });
+};
+
+export const demoApproveListApi = async (params: DemoParams) => {
+  const res = await defHttp.post<DemoListGetResultModel>({
+    url: Api.APPROVE,
+    params,
+  });
+
+  res.records = res.records.map((item) => {
+    item.fields = [];
+    Object.entries(item.fieldInfos.baseFields).map(([key, value]) => {
+      if (value === 'UN_LOCKED') {
+        const obj = find(FIELDS_BASE_INFO, { field: key });
+        item.fields.push(obj?.label);
+      }
+    });
+    item.fields = item.fields.join(',');
+    return item;
+  });
+
+  return new Promise((resolve) => {
+    resolve(res.records);
+  });
+};
+
+export const demoApproveCheckApi = async (params: DemoParams) => {
+  const res = await defHttp.post<DemoListGetResultModel>({
+    url: Api.CHECK,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+  return new Promise((resolve) => {
+    resolve(res);
+  });
+};
+
+export const getInitDictData = async () => {
+  const res = await defHttp.post({
+    url: Api.DICT_INIT,
+    params: {},
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+  return res;
+};
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  ROLE_LIST = '/order/erp/roles/all',
+  USER_LIST = '/order/erp/users/list_by_page',
+  USER_ADD = '/order/erp/roles/add',
+  USER_EDIT = '/order/erp/roles/edit',
+  USER_DELETE = '/order/erp/roles/delete',
+}
+
+export const getRoleList = async (params: any) => {
+  return defHttp.post<any>({
+    url: Api.ROLE_LIST,
+    params,
+  });
+};
+
+export const getUserList = async (params: any) => {
+  const res = await defHttp.post<any>({
+    url: Api.USER_LIST,
+    params,
+  });
+  return new Promise((resolve) => {
+    resolve(res.records);
+  });
+};
+
+// export const getAccountList = async (params: AccountParams) => {
+//   const res = await defHttp.post<AccountListGetResultModel>({ url: Api.AccountList, params });
+//   return new Promise((resolve) => {
+//     resolve(res.records);
+//   });
+// };
+
+export const userAdd = async (params: any) => {
+  return defHttp.post<any>({
+    url: Api.USER_ADD,
+    params,
+  });
+};
+
+export const userEdit = async (params: any) => {
+  return defHttp.post<any>({
+    url: Api.USER_EDIT,
+    params,
+  });
+};
+
+export const userDelete = async (params: any) => {
+  return defHttp.post<any>({
+    url: Api.USER_DELETE,
+    params,
+  });
+};
+import { find, isEmpty } from 'lodash-es';
+import { defHttp } from '/@/utils/http/axios';
+import { FIELDS_BASE_INFO, FIELDS_PROFIT_INFO } from '/@/views/project/order/tableData';
+
+enum Api {
+  APPROVE = '/order/erp/audit/wait_audit_list',
+  APPROVE_ED = '/order/erp/audit/audit_list',
+  AUDIT = '/order/erp/audit/do_audit',
+}
+
+export const approveAuditApi = async (params: any) =>
+  defHttp.post<any>(
+    {
+      url: Api.AUDIT,
+      params,
+    },
+    { message: '操作成功' },
+  );
+
+export const getWaitListApi = async (params: DemoParams) => {
+  const res = await defHttp.post({
+    url: Api.APPROVE,
+    params,
+  });
+
+  console.log('%c [  ]-26', 'font-size:13px; background:pink; color:#bf2c9f;', 123);
+  res.records = res.records.map((item) => {
+    item.fields = [];
+    !isEmpty(item.fieldInfos.baseFields) &&
+      Object.entries(item.fieldInfos.baseFields).map(([key, value]) => {
+        if (value === 'UN_LOCKED') {
+          const obj = find(FIELDS_BASE_INFO, { field: key });
+          item.fields.push(obj?.label);
+        }
+      });
+    !isEmpty(item.fieldInfos.baseFields) &&
+      Object.entries(item.fieldInfos.profitAnalysisFields).map(([key, value]) => {
+        if (value === 'UN_LOCKED') {
+          const obj = find(FIELDS_PROFIT_INFO, { field: `profitAnalysisFields.${key}` });
+          item.fields.push(obj?.label);
+        }
+      });
+    item.fields = item.fields.join(',');
+    return item;
+  });
+  console.log(
+    '%c [  res.records  ]-27',
+    'font-size:13px; background:pink; color:#bf2c9f;',
+    res.records,
+  );
+
+  return new Promise((resolve) => {
+    resolve(res.records);
+  });
+};
+
+export const getApprovedListApi = async (params: any) => {
+  const res = await defHttp.post({
+    url: Api.APPROVE_ED,
+
+    params,
+  });
+
+  res.records = res.records.map((item) => {
+    item.fields = [];
+    Object.entries(item.fieldInfos.baseFields).map(([key, value]) => {
+      if (value === 'UN_LOCKED') {
+        const obj = find(FIELDS_BASE_INFO, { field: key });
+        item.fields.push(obj?.label);
+      }
+    });
+    item.fields = item.fields.join(',');
+    return item;
+  });
+
+  return new Promise((resolve) => {
+    resolve(res.records);
+  });
+};
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  DATA = '/order/erp/index/data',
+  CHART_DATA = '/order/erp/index/chartData',
+}
+
+export const getApiData = async () => {
+  const res = await defHttp.get<any>({ url: Api.DATA });
+  return res;
+};
+
+export const getChartData = async () => {
+  const res = await defHttp.get<any>({ url: Api.CHART_DATA });
+  return res;
+};
+import axios from 'axios';
+import { defHttp } from '/@/utils/http/axios';
+import { useUserStoreWithOut } from '/@/store/modules/user';
+import { useOrderStoreWithOut } from '/@/store/modules/order';
+
+enum Api {
+  ORDER_CREATE = '/order/erp/order/add',
+  UPDATE = '/order/erp/order/edit',
+  ORDER = '/order/erp/order/list_by_page',
+  FIELD_AUTH = '/order/erp/order/field_unlock_apply',
+  EXPORT = '/order/erp/order/export',
+  UPLOAD = '/api/localStorage/upload',
+
+  DICT_INIT = '/order/erp/dictionary/get_all',
+  DICT_ADD = '/order/erp/dictionary/add',
+  DICT_UPDATE = '/order/erp/dictionary/edit',
+  DICT_DELETE = '/order/erp/dictionary/delete',
+  DICT_LIST = '/order/erp/dictionary/list_by_page',
+
+  ANALYSIS = '/order/erp/profit/analysis',
+}
+
+export const orderCreate = async (data: any) => {
+  const res = await defHttp.post<any>({ url: Api.ORDER_CREATE, data }, { message: '保存成功' });
+  return res;
+};
+
+export const orderUpdate = async (data: any) => {
+  const res = await defHttp.post<any>({ url: Api.UPDATE, data });
+  return res;
+};
+
+export const orderAuth = (data: any) =>
+  defHttp.post<any>({ url: Api.FIELD_AUTH, data }, { message: '操作成功' });
+
+export const orderAnalysis = async (data: any) => {
+  const res = await defHttp.post<any>({ url: Api.ANALYSIS, data });
+  return res;
+};
+
+export const orderExport = async (data: any = {}) => {
+  // const res = await defHttp.post<any>({ url: Api.EXPORT, data });
+  const userStore = useUserStoreWithOut();
+
+  const token = userStore.getToken;
+
+  axios({
+    url: '/basic-api' + Api.EXPORT,
+    method: 'post',
+    responseType: 'blob',
+    headers: { Authorization: `Bearer ${token}` },
+    data,
+  })
+    .then((response) => {
+      // 创建一个新的 Blob 对象，它包含了服务器响应的数据（即你的 Excel 文件）
+      const blob = new Blob([response.data]); // Excel 的 MIME 类型
+      const downloadUrl = window.URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = downloadUrl;
+      a.download = '订单.xlsx'; // 你可以为文件命名
+      document.body.appendChild(a);
+      a.click(); // 模拟点击操作来下载文件
+      URL.revokeObjectURL(downloadUrl); // 释放掉 blob 对象所占用的内存
+      document.body.removeChild(a);
+    })
+    .catch((error) => {
+      // 处理错误
+      console.error('导出错误', error);
+    });
+};
+
+export const getInitDictData = async () => {
+  const res = await defHttp.post({
+    url: Api.DICT_INIT,
+  });
+
+  return res;
+};
+
+export async function uploadImg(params, onUploadProgress: (progressEvent: ProgressEvent) => void) {
+  const res = await defHttp.uploadFile(
+    {
+      url: Api.UPLOAD,
+      onUploadProgress,
+    },
+    {
+      file: params.file,
+      data: { name: params.file.name },
+    },
+  );
+  return Promise.resolve({ data: { thumbUrl: res.data } });
+}
+
+export const getOrderList = async (params: DemoParams) => {
+  const res = await defHttp.post<DemoListGetResultModel>({
+    url: Api.ORDER,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+  const orderStore = useOrderStoreWithOut();
+  orderStore.setTotal(res.total);
+  return new Promise((resolve) => {
+    resolve({
+      items: res.records,
+      total: res.total,
+    });
+  });
+};
+
+export const dictCreate = async (data: any) => {
+  const res = await defHttp.post<any>({ url: Api.DICT_ADD, data }, { message: '保存成功' });
+  return res;
+};
+
+export const dictUpdate = async (data: any) => {
+  const res = await defHttp.post<any>({ url: Api.DICT_UPDATE, data }, { message: '保存成功' });
+  return res;
+};
+
+export const dictDelete = async (data: any) => {
+  const res = await defHttp.post<any>({ url: Api.DICT_DELETE, data }, { message: '保存成功' });
+  return res;
+};
+
+export const dictList = async (data: any) => {
+  const res = await defHttp.post<any>({ url: Api.DICT_LIST, data: { ...data, pageSize: 1000 } });
+  return res;
+};
@@ -2,8 +2,10 @@
  * @description: Login interface parameters
  */
 export interface LoginParams {
-  username: string;
+  userName: string;
   password: string;
+  imgCaptchaCode: string;
+  imgCaptchaUuid: string;
 }
  
 export interface RoleInfo {
@@ -4,7 +4,8 @@ import { LoginParams, LoginResultModel, GetUserInfoModel } from &#39;./model/userMod
 import { ErrorMessageMode } from '/#/axios';
  
 enum Api {
-  Login = '/login',
+  // Login = '/login',
+  Login = '/order/erp/auth/login_by_pwd',
   Logout = '/logout',
   GetUserInfo = '/getUserInfo',
   GetPermCode = '/getPermCode',
@@ -53,3 +54,7 @@ export function testRetry() {
     },
   );
 }
+
+export function getImageCaptcha() {
+  return defHttp.post({ url: '/order/erp/captcha/get_img_captcha_code' });
+}
+import { withInstall } from '/@/utils';
+import fieldUpload from './src/FieldUpload.vue';
+
+const FieldUpload = withInstall(fieldUpload);
+export default FieldUpload;
+<template>
+  <Upload
+    v-model:file-list="fileList"
+    name="file"
+    list-type="picture-card"
+    class="avatar-uploader"
+    :show-upload-list="false"
+    action="/api/localStorage/upload"
+    accept=".jpg,.jpeg,.gif,.png,.webp"
+    :data="handleData"
+  >
+    <img v-if="imgUrl" :src="imgUrl" alt="avatar" width="100" height="100" />
+    <div v-else>
+      <loading-outlined v-if="loading" />
+      <plus-outlined v-else />
+      <div class="ant-upload-text">上传</div>
+    </div>
+  </Upload>
+</template>
+<script lang="ts" setup>
+  import { defineProps, ref } from 'vue';
+
+  import { Upload, message } from 'ant-design-vue';
+  import { PlusOutlined, LoadingOutlined } from '@ant-design/icons-vue';
+  import type { UploadChangeParam, UploadProps } from 'ant-design-vue';
+
+  const props = defineProps({
+    imgUrl: String, // 期望 'value' 是一个字符串。根据您的需求调整类型。
+  });
+  console.log('%c [ props ]-29', 'font-size:13px; background:pink; color:#bf2c9f;', props);
+
+  function getBase64(img: Blob, callback: (base64Url: string) => void) {
+    const reader = new FileReader();
+    reader.addEventListener('load', () => callback(reader.result as string));
+    reader.readAsDataURL(img);
+  }
+  const handleData = (data) => {
+    console.log('%c [ data ]-32', 'font-size:13px; background:pink; color:#bf2c9f;', data);
+    return { name: data.name };
+  };
+
+  const fileList = ref([]);
+  const loading = ref<boolean>(false);
+  const imageUrl = ref<string>('');
+
+  const handleChange = (info: UploadChangeParam) => {
+    // if (info.file.status === 'uploading') {
+    //   loading.value = true;
+    //   return;
+    // }
+    // if (info.file.status === 'done') {
+    //   // Get this url from response in real world.
+    //   getBase64(info.file.originFileObj, (base64Url: string) => {
+    //     imageUrl.value = base64Url;
+    //     loading.value = false;
+    //   });
+    // }
+    // if (info.file.status === 'error') {
+    //   loading.value = false;
+    //   message.error('upload error');
+    // }
+  };
+
+  const beforeUpload = (file: UploadProps['fileList'][number]) => {
+    const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+    if (!isJpgOrPng) {
+      message.error('You can only upload JPG file!');
+    }
+    const isLt2M = file.size / 1024 / 1024 < 2;
+    if (!isLt2M) {
+      message.error('图片最大10MB!');
+    }
+    return isJpgOrPng && isLt2M;
+  };
+</script>
+<style scoped>
+  .avatar-uploader > .ant-upload {
+    width: 128px;
+    height: 128px;
+  }
+
+  .ant-upload-select-picture-card i {
+    color: #999;
+    font-size: 32px;
+  }
+
+  .ant-upload-select-picture-card .ant-upload-text {
+    margin-top: 8px;
+    color: #666;
+  }
+</style>
@@ -117,14 +117,19 @@
       const getSchema = computed((): FormSchema[] => {
         const schemas: FormSchema[] = unref(schemaRef) || (unref(getProps).schemas as any);
         for (const schema of schemas) {
-          const { defaultValue, component, componentProps,isHandleDateDefaultValue = true } = schema;
+          const {
+            defaultValue,
+            component,
+            componentProps,
+            isHandleDateDefaultValue = true,
+          } = schema;
           // handle date type
           if (isHandleDateDefaultValue && defaultValue && dateItemType.includes(component)) {
-              const valueFormat =componentProps ? componentProps['valueFormat'] : null;
+            const valueFormat = componentProps ? componentProps['valueFormat'] : null;
             if (!Array.isArray(defaultValue)) {
-              schema.defaultValue =  valueFormat
-                  ? dateUtil(defaultValue).format(valueFormat)
-                  : dateUtil(defaultValue);
+              schema.defaultValue = valueFormat
+                ? dateUtil(defaultValue).format(valueFormat)
+                : dateUtil(defaultValue);
             } else {
               const def: any[] = [];
               defaultValue.forEach((item) => {
@@ -29,6 +29,8 @@ import ApiTreeSelect from &#39;./components/ApiTreeSelect.vue&#39;;
 import ApiCascader from './components/ApiCascader.vue';
 import ApiTransfer from './components/ApiTransfer.vue';
 import { BasicUpload } from '/@/components/Upload';
+import FieldUpload from '/@/components/FieldUpload';
+
 import { StrengthMeter } from '/@/components/StrengthMeter';
 import { IconPicker } from '/@/components/Icon';
 import { CountdownInput } from '/@/components/CountDown';
@@ -71,6 +73,7 @@ componentMap.set(&#39;IconPicker&#39;, IconPicker);
 componentMap.set('InputCountDown', CountdownInput);
  
 componentMap.set('Upload', BasicUpload);
+componentMap.set('FieldUpload', FieldUpload);
 componentMap.set('Divider', Divider);
  
 export function add(compName: ComponentType, component: Component) {
@@ -110,6 +110,7 @@ export type ComponentType =
   | 'Switch'
   | 'StrengthMeter'
   | 'Upload'
+  | 'FieldUpload'
   | 'IconPicker'
   | 'Render'
   | 'Slider'
@@ -457,4 +457,16 @@
       }
     }
   }
+
+  .ant-table {
+    font-size: 15px !important;
+  }
+
+  .ant-table-middle {
+    font-size: 14px !important;
+  }
+
+  .ant-table-small {
+    font-size: 13px !important;
+  }
 </style>
@@ -12,7 +12,7 @@
     >
       <template #title>
         <div :class="`${prefixCls}__popover-title`">
-          <Checkbox
+          <!-- <Checkbox
             :indeterminate="indeterminate"
             v-model:checked="checkAll"
             @change="onCheckAllChange"
@@ -22,7 +22,7 @@
  
           <Checkbox v-model:checked="checkIndex" @change="handleIndexCheckChange">
             {{ t('component.table.settingIndexColumnShow') }}
-          </Checkbox>
+          </Checkbox> -->
  
           <Checkbox
             v-model:checked="checkSelect"
@@ -43,12 +43,12 @@
           <CheckboxGroup v-model:value="checkedList" @change="onChange" ref="columnListRef">
             <template v-for="item in plainOptions" :key="item.value">
               <div :class="`${prefixCls}__check-item`" v-if="!('ifShow' in item && !item.ifShow)">
-                <DragOutlined class="table-column-drag-icon" />
+                <!-- <DragOutlined class="table-column-drag-icon" /> -->
                 <Checkbox :value="item.value">
                   {{ item.label }}
                 </Checkbox>
  
-                <Tooltip
+                <!-- <Tooltip
                   placement="bottomLeft"
                   :mouseLeaveDelay="0.4"
                   :getPopupContainer="getPopupContainer"
@@ -88,7 +88,7 @@
                     ]"
                     @click="handleColumnFixed(item, 'right')"
                   />
-                </Tooltip>
+                </Tooltip> -->
               </div>
             </template>
           </CheckboxGroup>
@@ -156,6 +156,7 @@
     setup(_, { emit, attrs }) {
       const { t } = useI18n();
       const table = useTableContext();
+      const originColumns = getColumns(); // 配置的列
  
       const defaultRowSelection = omit(table.getRowSelection(), 'selectedRowKeys');
       let inited = false;
@@ -236,14 +237,37 @@
         const checkList = table
           .getColumns({ ignoreAction: true, ignoreIndex: true })
           .map((item) => {
-            if (item.defaultHidden) {
-              return '';
+            if (item.children) {
+              return item.children.map((item) => {
+                if (item.defaultHidden) {
+                  return '';
+                }
+                return item.dataIndex || item.title;
+              });
+            } else {
+              if (item.defaultHidden) {
+                return '';
+              }
+              return item.dataIndex || item.title;
             }
-            return item.dataIndex || item.title;
           })
+          .flat()
           .filter(Boolean) as string[];
-        plainOptions.value = columns;
+
+        // plainOptions.value = columns;
         plainSortOptions.value = columns;
+        plainOptions.value = columns
+          .map((item) => {
+            if (item.children) {
+              return item.children.map((item) => ({
+                ...item,
+                label: item.title,
+                value: item.dataIndex || item.title,
+              }));
+            }
+            return item;
+          })
+          .flat();
         // 更新缓存配置
         table.setCacheColumns?.(columns);
         !isReset && (cachePlainOptions.value = cloneDeep(columns));
@@ -282,12 +306,22 @@
         const len = plainSortOptions.value.length;
         state.checkAll = checkedList.length === len;
         const sortList = unref(plainSortOptions).map((item) => item.value);
+
         checkedList.sort((prev, next) => {
           return sortList.indexOf(prev) - sortList.indexOf(next);
         });
         unref(plainSortOptions).forEach((item) => {
-          (item as BasicColumn).defaultHidden = !checkedList.includes(item.value);
+          // 若存在children则，便利children
+          if (item.children) {
+            item.children.forEach((item) => {
+              (item as BasicColumn).defaultHidden = !checkedList.includes(item.value);
+            });
+            return;
+          } else {
+            (item as BasicColumn).defaultHidden = !checkedList.includes(item.value);
+          }
         });
+
         setColumns(checkedList);
       }
  
@@ -388,17 +422,63 @@
       function setColumns(columns: BasicColumn[] | string[]) {
         isSetPropsFromThis = true;
         isSetColumnsFromThis = true;
-        table.setColumns(columns);
-        const data: ColumnChangeParam[] = unref(plainSortOptions).map((col) => {
-          const visible =
-            columns.findIndex(
-              (c: BasicColumn | string) =>
-                c === col.value || (typeof c !== 'string' && c.dataIndex === col.value),
-            ) !== -1;
-          return { dataIndex: col.value, fixed: col.fixed, visible };
-        });
  
-        emit('columns-change', data);
+        const newColumns = plainSortOptions.value
+          .map((col) => {
+            if (col.children) {
+              return {
+                ...col,
+                children: col.children.map((c) => {
+                  if (columns.includes(c.dataIndex as string)) {
+                    return {
+                      ...c,
+                      defaultHidden: false,
+                    };
+                  }
+                  return {
+                    ...c,
+                    defaultHidden: true,
+                  };
+                }),
+              };
+            } else {
+              if (columns.includes(col.dataIndex as string)) {
+                return {
+                  ...col,
+                  defaultHidden: false,
+                };
+              }
+              return {
+                ...col,
+                defaultHidden: true,
+              };
+            }
+          })
+          .filter((col) => {
+            if (col.children) {
+              const newChildren = col.children.filter((c) => !c.defaultHidden);
+              if (!newChildren.length) return false;
+              col.children = newChildren;
+              return true;
+            }
+            return !col.defaultHidden;
+          });
+
+        table.setColumns(newColumns);
+
+        // const columns = unref(plainSortOptions).map(col => {
+        //   if(col.)
+        // })
+        // const data: ColumnChangeParam[] = unref(plainSortOptions).map((col) => {
+        //   const visible =
+        //     columns.findIndex(
+        //       (c: BasicColumn | string) =>
+        //         c === col.value || (typeof c !== 'string' && c.dataIndex === col.value),
+        //     ) !== -1;
+        //   return { dataIndex: col.value, fixed: col.fixed, visible };
+        // });
+
+        // emit('columns-change', data);
       }
  
       function getPopupContainer() {
@@ -457,7 +537,7 @@
       display: flex;
       align-items: center;
       min-width: 100%;
-      padding: 4px 16px 8px 0;
+      padding: 4px 16px 8px;
  
       .ant-checkbox-wrapper {
         width: 100%;
@@ -307,6 +307,7 @@ export function useDataSource(
       const isArrayResult = Array.isArray(res);
  
       let resultItems: Recordable[] = isArrayResult ? res : get(res, listField);
+      console.log('%c [ res ]-311', 'font-size:13px; background:pink; color:#bf2c9f;', res);
       const resultTotal: number = isArrayResult ? res.length : get(res, totalField);
  
       // 假如数据变少，导致总页数变少并小于当前选中页码，通过getPaginationRef获取到的页码是不正确的，需获取正确的页码再次执行
@@ -46,6 +46,12 @@
             </thead>
             <tbody>
               {dataSource.map((record = {}, index) => {
+                console.log(
+                  '%c [ record ]-49',
+                  'font-size:13px; background:pink; color:#bf2c9f;',
+                  record,
+                );
+
                 return (
                   <tr class="file-table-tr" key={`${index + record.name || ''}`}>
                     {columnList.map((item) => {
@@ -50,3 +50,7 @@ html[data-theme=&#39;light&#39;] {
     color: rgb(0 0 0 / 90%);
   }
 }
+
+.ant-message {
+  z-index: 9999 !important;
+}
@@ -3,7 +3,7 @@
  */
 export enum ExceptionEnum {
   // page not access
-  PAGE_NOT_ACCESS = 403,
+  PAGE_NOT_ACCESS = 404,
  
   // page not found
   PAGE_NOT_FOUND = 404,
@@ -2,7 +2,7 @@ export enum PageEnum {
   // basic login path
   BASE_LOGIN = '/login',
   // basic home path
-  BASE_HOME = '/dashboard',
+  BASE_HOME = '/',
   // error page path
   ERROR_PAGE = '/exception',
   // error log page path
+// useOrderInfo.js
+import { computed } from 'vue';
+import { map } from 'lodash-es';
+
+export function useOrderInfo(orderStore) {
+  // 确保 transformDictInfo 函数是可用的，可以将其导入或在此文件中定义
+  const transformDictInfo = (item) => ({
+    label: item.dictValue,
+    value: item.dictValue,
+  });
+
+  const customerCode = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+
+    return map(dictInfo?.customerCode, transformDictInfo);
+  });
+
+  const projectNo = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.projectNo, transformDictInfo);
+  });
+
+  const productionDepartment = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.productionDepartment, transformDictInfo);
+  });
+
+  const innerNo = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.innerNo, transformDictInfo);
+  });
+
+  const poColor = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.poColor, transformDictInfo);
+  });
+
+  const cnColor = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.cnColor, transformDictInfo);
+  });
+
+  const productStyle = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.productStyle, transformDictInfo);
+  });
+
+  const outboundType = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.outboundType, transformDictInfo);
+  });
+
+  const packetType = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.packetType, transformDictInfo);
+  });
+
+  const ideaSource = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.ideaSource, transformDictInfo);
+  });
+
+  const manualPreform = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.manualPreform, transformDictInfo);
+  });
+
+  const endCheckResult = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.endCheckResult, transformDictInfo);
+  });
+
+  const midCheckResult = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.midCheckResult, transformDictInfo);
+  });
+
+  console.log('%c [  ]-78', 'font-size:13px; background:pink; color:#bf2c9f;', endCheckResult);
+  return {
+    customerCode,
+    projectNo,
+    productionDepartment,
+    innerNo,
+    poColor,
+    cnColor,
+    productStyle,
+    outboundType,
+    packetType,
+    ideaSource,
+    manualPreform,
+    midCheckResult,
+    endCheckResult,
+  };
+}
@@ -11,7 +11,7 @@
  
     <template #overlay>
       <Menu @click="handleMenuClick">
-        <MenuItem
+        <!-- <MenuItem
           key="doc"
           :text="t('layout.header.dropdownItemDoc')"
           icon="ion:document-text-outline"
@@ -23,7 +23,7 @@
           key="lock"
           :text="t('layout.header.tooltipLock')"
           icon="ion:lock-closed-outline"
-        />
+        /> -->
         <MenuItem
           key="logout"
           :text="t('layout.header.dropdownItemLoginOut')"
@@ -33,24 +33,24 @@
  
     <!-- action  -->
     <div :class="`${prefixCls}-action`">
-      <AppSearch :class="`${prefixCls}-action__item `" v-if="getShowSearch" />
+      <!-- <AppSearch :class="`${prefixCls}-action__item `" v-if="getShowSearch" /> -->
  
       <ErrorAction v-if="getUseErrorHandle" :class="`${prefixCls}-action__item error-action`" />
  
-      <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" />
+      <!-- <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" /> -->
  
       <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
  
-      <AppLocalePicker
+      <!-- <AppLocalePicker
         v-if="getShowLocalePicker"
         :reload="true"
         :showText="false"
         :class="`${prefixCls}-action__item`"
-      />
+      /> -->
  
       <UserDropDown :theme="getHeaderTheme" />
  
-      <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" />
+      <!-- <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" /> -->
     </div>
   </Header>
 </template>
@@ -3,9 +3,12 @@
     <LayoutFeatures />
     <LayoutHeader fixed v-if="getShowFullHeaderRef" />
     <Layout :class="[layoutClass]">
+      <!-- 左侧菜单 -->
       <LayoutSideBar v-if="getShowSidebar || getIsMobile" />
       <Layout :class="`${prefixCls}-main`">
+        <!-- 顶部header -->
         <LayoutMultipleHeader />
+        <!-- 内容区域 -->
         <LayoutContent />
         <LayoutFooter />
       </Layout>
@@ -140,7 +140,7 @@
  
       function renderMenu() {
         const { menus, ...menuProps } = unref(getCommonProps);
-        // console.log(menus);
+        console.log(menus);
         if (!menus || !menus.length) return null;
         return !props.isHorizontal ? (
           <SimpleMenu {...menuProps} isSplitMenu={unref(getSplit)} items={menus} />
 export default {
   dashboard: 'Dashboard',
+  home: '首页',
   about: '关于',
   workbench: '工作台',
   analysis: '分析页',
+  order: '订单管理',
 };
@@ -67,8 +67,8 @@ export default {
     signUpFormTitle: '注册',
     forgetFormTitle: '重置密码',
  
-    signInTitle: '开箱即用的中后台管理系统',
-    signInDesc: '输入您的个人详细信息开始使用！',
+    signInTitle: '订单管理系统',
+    signInDesc: '',
     policy: '我同意xxx隐私政策',
     scanSign: `扫码后点击"确认"，即可完成登录`,
  
@@ -40,7 +40,7 @@ async function bootstrap() {
   await setupI18n(app);
  
   // Configure routing
-  // 配置路由
+  // 配置路由，把一些常量不需要权限判断的路有页面放在这里
   setupRouter(app);
  
   // router-guard
@@ -25,7 +25,7 @@ export function createPermissionGuard(router: Router) {
       userStore.getUserInfo.homePath &&
       userStore.getUserInfo.homePath !== PageEnum.BASE_HOME
     ) {
-      next(userStore.getUserInfo.homePath);
+      next('/home');
       return;
     }
  
@@ -63,10 +63,12 @@ async function getAsyncMenus() {
       return show;
     });
   };
+
   if (isBackMode()) {
     return menuFilter(permissionStore.getBackMenuList);
   }
-  if (isRouteMappingMode()) {
+  // if (isRouteMappingMode()) {
+  if (true) {
     return menuFilter(permissionStore.getFrontMenuList);
   }
   return staticMenus;
@@ -7,7 +7,7 @@ import { PageEnum } from &#39;/@/enums/pageEnum&#39;;
 import { t } from '/@/hooks/web/useI18n';
  
 // import.meta.glob() 直接引入所有的模块 Vite 独有的功能
-const modules = import.meta.glob('./modules/**/*.ts', { eager: true });
+const modules = import.meta.glob('./modules/project/*.ts', { eager: true });
 const routeModuleList: AppRouteModule[] = [];
  
 // 加入到路由集合中
@@ -40,6 +40,7 @@ export const LoginRoute: AppRouteRecordRaw = {
  
 // Basic routing without permission
 // 未经许可的基本路由
+// 没有权限要求，所有人都看得到
 export const basicRoutes = [
   LoginRoute,
   RootRoute,
@@ -21,7 +21,7 @@ const system: AppRouteModule = {
         title: t('routes.demo.system.account'),
         ignoreKeepAlive: false,
       },
-      component: () => import('/@/views/demo/system/account/index.vue'),
+      component: () => import('/@/views/project/system/account/index.vue'),
     },
     {
       path: 'account_detail/:id',
@@ -33,7 +33,7 @@ const system: AppRouteModule = {
         showMenu: false,
         currentActiveMenu: '/system/account',
       },
-      component: () => import('/@/views/demo/system/account/AccountDetail.vue'),
+      component: () => import('/@/views/project/system/account/AccountDetail.vue'),
     },
     {
       path: 'role',
+import type { AppRouteModule } from '/@/router/types';
+
+import { LAYOUT } from '/@/router/constant';
+
+const order: AppRouteModule = {
+  path: '/approve',
+  name: 'Approve',
+  component: LAYOUT,
+  redirect: '/approve',
+  meta: {
+    hideChildrenInMenu: true,
+    orderNo: 3,
+    icon: 'ion:grid-outline',
+    title: '审批管理',
+  },
+  children: [
+    {
+      path: '',
+      name: 'Approve',
+      component: () => import('/@/views/project/approve/index.vue'),
+      meta: {
+        // affix: true,
+        title: '审批管理',
+      },
+    },
+    // {
+    //   path: 'workbench',
+    //   name: 'Workbench',
+    //   component: () => import('/@/views/dashboard/workbench/index.vue'),
+    //   meta: {
+    //     title: t('routes.dashboard.workbench'),
+    //   },
+    // },
+  ],
+};
+
+export default order;
@@ -4,33 +4,34 @@ import { LAYOUT } from &#39;/@/router/constant&#39;;
 import { t } from '/@/hooks/web/useI18n';
  
 const dashboard: AppRouteModule = {
-  path: '/dashboard',
-  name: 'Dashboard',
+  path: '/home',
+  name: 'Analysis',
   component: LAYOUT,
-  redirect: '/dashboard/analysis',
+  redirect: '/home',
   meta: {
-    orderNo: 10,
+    hideChildrenInMenu: true,
+    orderNo: 1,
     icon: 'ion:grid-outline',
-    title: t('routes.dashboard.dashboard'),
+    title: t('routes.dashboard.home'),
   },
   children: [
     {
-      path: 'analysis',
+      path: '',
       name: 'Analysis',
       component: () => import('/@/views/dashboard/analysis/index.vue'),
       meta: {
         // affix: true,
-        title: t('routes.dashboard.analysis'),
-      },
-    },
-    {
-      path: 'workbench',
-      name: 'Workbench',
-      component: () => import('/@/views/dashboard/workbench/index.vue'),
-      meta: {
-        title: t('routes.dashboard.workbench'),
+        title: '首页',
       },
     },
+    // {
+    //   path: 'workbench',
+    //   name: 'Workbench',
+    //   component: () => import('/@/views/dashboard/workbench/index.vue'),
+    //   meta: {
+    //     title: t('routes.dashboard.workbench'),
+    //   },
+    // },
   ],
 };
  
+import type { AppRouteModule } from '/@/router/types';
+
+import { LAYOUT } from '/@/router/constant';
+import { t } from '/@/hooks/web/useI18n';
+
+const order: AppRouteModule = {
+  path: '/order',
+  name: 'Order',
+  component: LAYOUT,
+  redirect: '/order',
+  meta: {
+    hideChildrenInMenu: true,
+    orderNo: 2,
+    icon: 'ion:grid-outline',
+    title: '订单管理',
+  },
+  children: [
+    {
+      path: '',
+      name: 'Order',
+      component: () => import('/@/views/project/order/index.vue'),
+      meta: {
+        // affix: true,
+        title: '订单管理',
+      },
+    },
+    // {
+    //   path: 'workbench',
+    //   name: 'Workbench',
+    //   component: () => import('/@/views/dashboard/workbench/index.vue'),
+    //   meta: {
+    //     title: t('routes.dashboard.workbench'),
+    //   },
+    // },
+  ],
+};
+
+export default order;
+import type { AppRouteModule } from '/@/router/types';
+
+import { LAYOUT } from '/@/router/constant';
+import { t } from '/@/hooks/web/useI18n';
+
+const system: AppRouteModule = {
+  path: '/system',
+  name: 'System',
+  component: LAYOUT,
+  redirect: '/system/account',
+  meta: {
+    orderNo: 3,
+    icon: 'ion:settings-outline',
+    title: t('routes.demo.system.moduleName'),
+  },
+  children: [
+    {
+      path: 'account',
+      name: 'AccountManagement',
+      meta: {
+        title: t('routes.demo.system.account'),
+        ignoreKeepAlive: false,
+      },
+      component: () => import('/@/views/project/account/index.vue'),
+    },
+    {
+      path: 'account_detail/:id',
+      name: 'AccountDetail',
+      meta: {
+        hideMenu: true,
+        title: t('routes.demo.system.account_detail'),
+        ignoreKeepAlive: true,
+        showMenu: false,
+        currentActiveMenu: '/system/account',
+      },
+      component: () => import('/@/views/project/account/AccountDetail.vue'),
+    },
+    // {
+    //   path: 'role',
+    //   name: 'RoleManagement',
+    //   meta: {
+    //     title: t('routes.demo.system.role'),
+    //     ignoreKeepAlive: true,
+    //   },
+    //   component: () => import('/@/views/demo/system/role/index.vue'),
+    // },
+    // {
+    //   path: 'menu',
+    //   name: 'MenuManagement',
+    //   meta: {
+    //     title: t('routes.demo.system.menu'),
+    //     ignoreKeepAlive: true,
+    //   },
+    //   component: () => import('/@/views/demo/system/menu/index.vue'),
+    // },
+    // {
+    //   path: 'dept',
+    //   name: 'DeptManagement',
+    //   meta: {
+    //     title: t('routes.demo.system.dept'),
+    //     ignoreKeepAlive: true,
+    //   },
+    //   component: () => import('/@/views/demo/system/dept/index.vue'),
+    // },
+    // {
+    //   path: 'changePassword',
+    //   name: 'ChangePassword',
+    //   meta: {
+    //     title: t('routes.demo.system.password'),
+    //     ignoreKeepAlive: true,
+    //   },
+    //   component: () => import('/@/views/demo/system/password/index.vue'),
+    // },
+  ],
+};
+
+export default system;
@@ -25,6 +25,7 @@ const setting: ProjectConfig = {
   settingButtonPosition: SettingButtonPositionEnum.AUTO,
  
   // Permission mode
+  // permissionMode: PermissionModeEnum.ROLE,
   permissionMode: PermissionModeEnum.ROUTE_MAPPING,
  
   // Permission-related cache is stored in sessionStorage or localStorage
@@ -48,6 +48,11 @@ export const useAppStore = defineStore({
     },
  
     getProjectConfig(state): ProjectConfig {
+      console.log(
+        '%c [ state.projectConfig ]-52',
+        'font-size:13px; background:pink; color:#bf2c9f;',
+        state.projectConfig,
+      );
       return state.projectConfig || ({} as ProjectConfig);
     },
  
+import { forEach } from '/@/utils/helper/treeHelper';
+import type { UserInfo } from '/#/store';
+import { defineStore } from 'pinia';
+import { store } from '/@/store';
+import { RoleEnum } from '/@/enums/roleEnum';
+
+import { getApiData, getChartData } from '/@/api/project/global';
+import { formatToDate } from '/@/utils/dateUtil';
+
+interface UserState {
+  userInfo: Nullable<UserInfo>;
+  token?: string;
+  roleList: RoleEnum[];
+  sessionTimeout?: boolean;
+  lastUpdateTime: number;
+}
+
+export const useDataStore = defineStore({
+  id: 'app-data',
+  state: (): UserState => ({
+    // user info
+    data: {},
+    // token
+    chartData: {},
+  }),
+  getters: {
+    getData(state) {
+      return state.data;
+    },
+    getChartData(state) {
+      return state.chartData;
+    },
+  },
+  actions: {
+    setData(info) {
+      this.data = info ? info : '';
+    },
+    setChartData(data) {
+      this.chartData = data;
+    },
+
+    async getFetchData(): Promise<any> {
+      try {
+        const data = await getApiData();
+        this.data = data;
+      } catch (error) {
+        return Promise.reject(error);
+      }
+    },
+    async getFetchChartData(): Promise<any> {
+      try {
+        const data = await getChartData();
+        const x = [],
+          y = [];
+        data.forEach((value) => {
+          x.push(formatToDate(value.dateTime));
+          y.push(value.orderCount);
+        });
+        this.chartData = { x, y };
+      } catch (error) {
+        return Promise.reject(error);
+      }
+    },
+  },
+});
+
+// Need to be used outside the setup
+export function useDataStoreWithOut() {
+  return useDataStore(store);
+}
+import type { UserInfo } from '/#/store';
+import type { ErrorMessageMode } from '/#/axios';
+import { defineStore } from 'pinia';
+import { store } from '/@/store';
+import { RoleEnum } from '/@/enums/roleEnum';
+import { PageEnum } from '/@/enums/pageEnum';
+import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum';
+import { getAuthCache, setAuthCache } from '/@/utils/auth';
+import { GetUserInfoModel, LoginParams } from '/@/api/sys/model/userModel';
+import { doLogout, getUserInfo, loginApi, getImageCaptcha } from '/@/api/sys/user';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { router } from '/@/router';
+import { usePermissionStore } from '/@/store/modules/permission';
+import { RouteRecordRaw } from 'vue-router';
+import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
+import { h } from 'vue';
+import { getInitDictData } from '/@/api/project/order';
+import { groupBy } from 'lodash-es';
+
+interface UserState {
+  userInfo: Nullable<UserInfo>;
+  token?: string;
+  roleList: RoleEnum[];
+  sessionTimeout?: boolean;
+  lastUpdateTime: number;
+}
+
+export const useOrderStore = defineStore({
+  id: 'app-order',
+  state: (): UserState => ({
+    // user info
+    dicts: {},
+    // token
+    total: 0,
+    // roleList
+    roleList: [],
+    // Whether the login expired
+    sessionTimeout: false,
+    // Last fetch time
+    lastUpdateTime: 0,
+  }),
+  getters: {
+    getDictInfo(state): UserInfo {
+      return state.dicts;
+    },
+    getTotal(state) {
+      return state.total;
+    },
+    getToken(state): string {
+      return state.token || getAuthCache<string>(TOKEN_KEY);
+    },
+    getRoleList(state): RoleEnum[] {
+      return state.roleList.length > 0 ? state.roleList : getAuthCache<RoleEnum[]>(ROLES_KEY);
+    },
+    getSessionTimeout(state): boolean {
+      return !!state.sessionTimeout;
+    },
+    getLastUpdateTime(state): number {
+      return state.lastUpdateTime;
+    },
+  },
+  actions: {
+    setToken(info: string | undefined) {
+      this.token = info ? info : ''; // for null or undefined value
+      setAuthCache(TOKEN_KEY, info);
+    },
+    setTotal(total) {
+      this.total = total;
+    },
+    setRoleList(roleList: RoleEnum[]) {
+      this.roleList = roleList;
+      setAuthCache(ROLES_KEY, roleList);
+    },
+    setUserInfo(info: UserInfo | null) {
+      this.userInfo = info;
+      this.lastUpdateTime = new Date().getTime();
+      setAuthCache(USER_INFO_KEY, info);
+    },
+    setSessionTimeout(flag: boolean) {
+      this.sessionTimeout = flag;
+    },
+    resetState() {
+      this.userInfo = null;
+      this.token = '';
+      this.roleList = [];
+      this.sessionTimeout = false;
+    },
+    /**
+     * @description: login
+     */
+    async getDict(): Promise<GetUserInfoModel | null> {
+      try {
+        const data = await getInitDictData();
+        console.log('%c [ data ]-95', 'font-size:13px; background:pink; color:#bf2c9f;', data);
+        this.dicts = groupBy(data, 'dictCode');
+      } catch (error) {
+        return Promise.reject(error);
+      }
+    },
+    async afterLoginAction(userInfo): Promise<GetUserInfoModel | null> {
+      if (!this.getToken) return null;
+      // get user info
+      // const userInfo = await this.getUserInfoAction();
+
+      const sessionTimeout = this.sessionTimeout;
+      if (sessionTimeout) {
+        this.setSessionTimeout(false);
+      } else {
+        const permissionStore = usePermissionStore();
+        if (!permissionStore.isDynamicAddedRoute) {
+          const routes = await permissionStore.buildRoutesAction();
+          routes.forEach((route) => {
+            router.addRoute(route as unknown as RouteRecordRaw);
+          });
+          router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
+          permissionStore.setDynamicAddedRoute(true);
+        }
+        await router.replace('home');
+      }
+      return userInfo;
+    },
+    async getUserInfoAction(): Promise<UserInfo | null> {
+      // if (!this.getToken) return null;
+      // const userInfo = await getUserInfo();
+      // const { roles = [] } = userInfo;
+      // if (isArray(roles)) {
+      //   const roleList = roles.map((item) => item.value) as RoleEnum[];
+      //   this.setRoleList(roleList);
+      // } else {
+      //   userInfo.roles = [];
+      //   this.setRoleList([]);
+      // }
+      // this.setUserInfo(userInfo);
+      // return userInfo;
+      return {};
+    },
+    /**
+     * @description: logout
+     */
+    async logout(goLogin = false) {
+      if (this.getToken) {
+        try {
+          await doLogout();
+        } catch {
+          console.log('注销Token失败');
+        }
+      }
+      this.setToken(undefined);
+      this.setSessionTimeout(false);
+      this.setUserInfo(null);
+      goLogin && router.push(PageEnum.BASE_LOGIN);
+    },
+
+    /**
+     * @description: Confirm before logging out
+     */
+    confirmLoginOut() {
+      const { createConfirm } = useMessage();
+      const { t } = useI18n();
+      createConfirm({
+        iconType: 'warning',
+        title: () => h('span', t('sys.app.logoutTip')),
+        content: () => h('span', t('sys.app.logoutMessage')),
+        onOk: async () => {
+          await this.logout(true);
+        },
+      });
+    },
+
+    /**
+     * 获取图片验证码
+     */
+    async getImageCaptcha() {
+      return await getImageCaptcha();
+    },
+  },
+});
+
+// Need to be used outside the setup
+export function useOrderStoreWithOut() {
+  return useOrderStore(store);
+}
@@ -116,8 +116,10 @@ export const usePermissionStore = defineStore({
  
       let routes: AppRouteRecordRaw[] = [];
       const roleList = toRaw(userStore.getRoleList) || [];
-      const { permissionMode = projectSetting.permissionMode } = appStore.getProjectConfig;
-
+      // dddd
+      // const { permissionMode = projectSetting.permissionMode } = appStore.getProjectConfig;
+      const permissionMode = projectSetting.permissionMode;
+      // const permissionMode = PermissionModeEnum.ROUTE_MAPPING;
       // 路由过滤器 在 函数filter 作为回调传入遍历使用
       const routeFilter = (route: AppRouteRecordRaw) => {
         const { meta } = route;
@@ -167,7 +169,6 @@ export const usePermissionStore = defineStore({
         }
         return;
       };
-
       switch (permissionMode) {
         // 角色权限
         case PermissionModeEnum.ROLE:
@@ -178,6 +179,8 @@ export const usePermissionStore = defineStore({
           // Convert multi-level routing to level 2 routing
           // 将多级路由转换为 2 级路由
           routes = flatMultiLevelRoutes(routes);
+
+          routes = asyncRoutes;
           break;
  
         // 路由映射， 默认进入该case
@@ -7,7 +7,7 @@ import { PageEnum } from &#39;/@/enums/pageEnum&#39;;
 import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum';
 import { getAuthCache, setAuthCache } from '/@/utils/auth';
 import { GetUserInfoModel, LoginParams } from '/@/api/sys/model/userModel';
-import { doLogout, getUserInfo, loginApi } from '/@/api/sys/user';
+import { doLogout, getUserInfo, loginApi, getImageCaptcha } from '/@/api/sys/user';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { router } from '/@/router';
@@ -89,21 +89,24 @@ export const useUserStore = defineStore({
       },
     ): Promise<GetUserInfoModel | null> {
       try {
-        const { goHome = true, mode, ...loginParams } = params;
+        const { mode, ...loginParams } = params;
         const data = await loginApi(loginParams, mode);
-        const { token } = data;
+        const { token, user } = data;
  
-        // save token
         this.setToken(token);
-        return this.afterLoginAction(goHome);
+        // this.setToken(
+        //   'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImF1dGgiOiJkZXB0OmVkaXQsdXNlcjpsaXN0LHJvbGVzOmFkZCx1c2VyOmFkZCxkZXB0OmFkZCxtZW51OmRlbCxyb2xlczpkZWwsbWVudTplZGl0LG1lbnU6bGlzdCxzdG9yYWdlOmxpc3Qsam9iOmVkaXQscm9sZXM6bGlzdCx1c2VyOmRlbCxkaWN0OmFkZCxkZXB0Omxpc3QsbWVudTphZGQsam9iOmRlbCxqb2I6bGlzdCx1c2VyOmVkaXQscm9sZXM6ZWRpdCxkaWN0OmRlbCxqb2I6YWRkLGRpY3Q6ZWRpdCxkZXB0OmRlbCIsImV4cCI6MTY5NjE0NTUzN30.Q9hcwnG9uJP3HHjwpd_3ZrV7LrZlMIL6JJBe0rcfqldE8SPq8JkBKElrGeu7GoCAc5EyN6wUUYcriwV5VhpZqQ',
+        // );
+        // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ4bXMiLCJhdXRoIjoiZGVwdDplZGl0LHVzZXI6bGlzdCxyb2xlczphZGQsdXNlcjphZGQsZGVwdDphZGQsbWVudTpkZWwscm9sZXM6ZGVsLG1lbnU6ZWRpdCxtZW51Omxpc3Qsc3RvcmFnZTpsaXN0LGpvYjplZGl0LHJvbGVzOmxpc3QsdXNlcjpkZWwsZGljdDphZGQsZGVwdDpsaXN0LG1lbnU6YWRkLGpvYjpkZWwsam9iOmxpc3QsdXNlcjplZGl0LHJvbGVzOmVkaXQsZGljdDpkZWwsam9iOmFkZCxkaWN0OmVkaXQsZGVwdDpkZWwiLCJleHAiOjE2OTUxNDIwNDF9.Wj-CyJGbMps_9a84TQkJgBSNnj22OVAEVLsEKvVHdyxkQORIwvxpOzT7gr2l-8VbUJ3wLatG0OUe-6smoaoTbA',
+        return this.afterLoginAction(user);
       } catch (error) {
         return Promise.reject(error);
       }
     },
-    async afterLoginAction(goHome?: boolean): Promise<GetUserInfoModel | null> {
+    async afterLoginAction(userInfo): Promise<GetUserInfoModel | null> {
       if (!this.getToken) return null;
       // get user info
-      const userInfo = await this.getUserInfoAction();
+      // const userInfo = await this.getUserInfoAction();
  
       const sessionTimeout = this.sessionTimeout;
       if (sessionTimeout) {
@@ -118,39 +121,40 @@ export const useUserStore = defineStore({
           router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
           permissionStore.setDynamicAddedRoute(true);
         }
-        goHome && (await router.replace(userInfo?.homePath || PageEnum.BASE_HOME));
+        await router.replace('home');
       }
       return userInfo;
     },
     async getUserInfoAction(): Promise<UserInfo | null> {
-      if (!this.getToken) return null;
-      const userInfo = await getUserInfo();
-      const { roles = [] } = userInfo;
-      if (isArray(roles)) {
-        const roleList = roles.map((item) => item.value) as RoleEnum[];
-        this.setRoleList(roleList);
-      } else {
-        userInfo.roles = [];
-        this.setRoleList([]);
-      }
-      this.setUserInfo(userInfo);
-      return userInfo;
+      // if (!this.getToken) return null;
+      // const userInfo = await getUserInfo();
+      // const { roles = [] } = userInfo;
+      // if (isArray(roles)) {
+      //   const roleList = roles.map((item) => item.value) as RoleEnum[];
+      //   this.setRoleList(roleList);
+      // } else {
+      //   userInfo.roles = [];
+      //   this.setRoleList([]);
+      // }
+      // this.setUserInfo(userInfo);
+      // return userInfo;
+      return {};
     },
     /**
      * @description: logout
      */
     async logout(goLogin = false) {
-      if (this.getToken) {
-        try {
-          await doLogout();
-        } catch {
-          console.log('注销Token失败');
-        }
-      }
+      // if (this.getToken) {
+      //   try {
+      //     await doLogout();
+      //   } catch {
+      //     console.log('注销Token失败');
+      //   }
+      // }
       this.setToken(undefined);
       this.setSessionTimeout(false);
       this.setUserInfo(null);
-      goLogin && router.push(PageEnum.BASE_LOGIN);
+      router.push(PageEnum.BASE_LOGIN);
     },
  
     /**
@@ -168,6 +172,13 @@ export const useUserStore = defineStore({
         },
       });
     },
+
+    /**
+     * 获取图片验证码
+     */
+    async getImageCaptcha() {
+      return await getImageCaptcha();
+    },
   },
 });
  
@@ -13,8 +13,12 @@ import { AxiosCanceler } from &#39;./axiosCancel&#39;;
 import { isFunction } from '/@/utils/is';
 import { cloneDeep } from 'lodash-es';
 import { ContentTypeEnum, RequestEnum } from '/@/enums/httpEnum';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { router } from '/@/router';
+import { useUserStoreWithOut } from '/@/store/modules/user';
  
 export * from './axiosTransform';
+const { createMessage } = useMessage();
  
 /**
  * @description:  axios module
@@ -206,6 +210,7 @@ export class VAxios {
     const transform = this.getTransform();
  
     const { requestOptions } = this.options;
+    const { message } = options || {};
  
     const opt: RequestOptions = Object.assign({}, requestOptions, options);
  
@@ -218,9 +223,23 @@ export class VAxios {
     conf = this.supportFormData(conf);
  
     return new Promise((resolve, reject) => {
+      const userStore = useUserStoreWithOut();
+
       this.axiosInstance
         .request<any, AxiosResponse<Result>>(conf)
         .then((res: AxiosResponse<Result>) => {
+          if (res.data.result === 401) {
+            userStore.setToken('');
+            createMessage.error(res.data.message);
+            return router.push('/login');
+          }
+          if (res.data.result !== 0 && res.data.message) {
+            return createMessage.error(res.data.message);
+          }
+
+          if (message && res.data.result === 0) {
+            createMessage.success(message);
+          }
           if (transformResponseHook && isFunction(transformResponseHook)) {
             try {
               const ret = transformResponseHook(res, opt);
@@ -233,6 +252,7 @@ export class VAxios {
           resolve(res as unknown as Promise<T>);
         })
         .catch((e: Error | AxiosError) => {
+          console.log('%c [ e ]-257', 'font-size:13px; background:pink; color:#bf2c9f;', e);
           if (requestCatchHook && isFunction(requestCatchHook)) {
             reject(requestCatchHook(e, opt));
             return;
@@ -45,16 +45,16 @@ const transform: AxiosTransform = {
     }
     // 错误的时候返回
  
-    const { data } = res;
-    if (!data) {
+    const { data: bodyData } = res;
+    if (!bodyData) {
       // return '[HTTP] Request has no return value';
       throw new Error(t('sys.api.apiRequestFailed'));
     }
     //  这里 code，result，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
-    const { code, result, message } = data;
+    const { result, data, message } = bodyData;
  
     // 这里逻辑可以根据项目进行修改
-    const hasSuccess = data && Reflect.has(data, 'code') && code === ResultEnum.SUCCESS;
+    const hasSuccess = bodyData && Reflect.has(bodyData, 'result') && result === ResultEnum.SUCCESS;
     if (hasSuccess) {
       let successMsg = message;
  
@@ -67,13 +67,13 @@ const transform: AxiosTransform = {
       } else if (options.successMessageMode === 'message') {
         createMessage.success(successMsg);
       }
-      return result;
+      return data;
     }
  
     // 在此处根据自己项目的实际情况对不同的code执行不同的操作
     // 如果不希望中断当前请求，请return数据，否则直接抛出异常即可
     let timeoutMsg = '';
-    switch (code) {
+    switch (result) {
       case ResultEnum.TIMEOUT:
         timeoutMsg = t('sys.api.timeoutMessage');
         const userStore = useUserStoreWithOut();
+export const getDisable = (code, id) => {
+  return code === 'LOCKED' && !!id;
+};
@@ -6,21 +6,21 @@
         :loading="loading"
         :title="item.title"
         class="md:w-1/4 w-full !md:mt-0"
-        :class="{ '!md:mr-4': index + 1 < 4, '!mt-4': index > 0 }"
+        :class="{ '!md:mr-4': index + 1 < 5, '!mt-4': index > 0 }"
       >
-        <template #extra>
+        <!-- <template #extra>
           <Tag :color="item.color">{{ item.action }}</Tag>
-        </template>
+        </template> -->
  
         <div class="py-4 px-4 flex justify-between items-center">
-          <CountTo prefix="$" :startVal="1" :endVal="item.value" class="text-2xl" />
-          <Icon :icon="item.icon" :size="40" />
+          <CountTo :startVal="1" :endVal="item.value" class="text-2xl" />
+          <!-- <Icon :icon="item.icon" :size="40" /> -->
         </div>
  
-        <div class="p-2 px-4 flex justify-between">
+        <!-- <div class="p-2 px-4 flex justify-between">
           <span>总{{ item.title }}</span>
           <CountTo prefix="$" :startVal="1" :endVal="item.total" />
-        </div>
+        </div> -->
       </Card>
     </template>
   </div>
@@ -30,6 +30,56 @@
   import Icon from '@/components/Icon/Icon.vue';
   import { Tag, Card } from 'ant-design-vue';
   import { growCardList } from '../data';
+  import { useDataStoreWithOut } from '/@/store/modules/data';
+  import { computed } from 'vue';
+
+  const dataStore = useDataStoreWithOut();
+
+  const growCardList = computed(() => {
+    const data = dataStore.getData;
+    return [
+      {
+        title: '订单完成',
+        icon: 'visit-count|svg',
+        value: data?.orderFinishedCount || 0,
+        total: 120000,
+        color: 'green',
+        action: '月',
+      },
+      {
+        title: '跟单和质检中',
+        icon: 'total-sales|svg',
+        value: data?.orderInspectingCount || 0,
+        total: 500000,
+        color: 'blue',
+        action: '月',
+      },
+      {
+        title: '利润分析表待审核',
+        icon: 'download-count|svg',
+        value: data?.orderProfitWaitAuditCount || 0,
+        total: 120000,
+        color: 'orange',
+        action: '周',
+      },
+      {
+        title: '项目报告书待审核',
+        icon: 'transaction|svg',
+        value: data?.orderReportWaitAuditCount || 0,
+        total: 50000,
+        color: 'purple',
+        action: '年',
+      },
+      {
+        title: '订单初始化',
+        icon: 'transaction|svg',
+        value: 5000,
+        total: 50000,
+        color: 'purple',
+        action: '年',
+      },
+    ];
+  });
  
   defineProps({
     loading: {
@@ -24,12 +24,12 @@
   const tabListTitle = [
     {
       key: 'tab1',
-      tab: '流量趋势',
-    },
-    {
-      key: 'tab2',
-      tab: '访问量',
+      tab: '订单趋势',
     },
+    // {
+    //   key: 'tab2',
+    //   tab: '访问量',
+    // },
   ];
  
   function onTabChange(key) {
 <template>
   <div ref="chartRef" :style="{ height, width }"></div>
 </template>
-<script lang="ts">
-  import { basicProps } from './props';
-</script>
+
 <script lang="ts" setup>
-  import { onMounted, ref, Ref } from 'vue';
+  import { ref, Ref, watchEffect } from 'vue';
   import { useECharts } from '/@/hooks/web/useECharts';
+  import { basicProps } from './props';
+  import { max } from 'lodash-es';
+  import { useDataStoreWithOut } from '/@/store/modules/data';
  
   defineProps({
     ...basicProps,
   });
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
-
-  onMounted(() => {
+  const dataStore = useDataStoreWithOut();
+  watchEffect(() => {
+    const data = dataStore?.getChartData || {};
+    const maxY = data?.y ? max(data?.y) : 0;
     setOptions({
       tooltip: {
         trigger: 'axis',
@@ -28,7 +31,7 @@
       xAxis: {
         type: 'category',
         boundaryGap: false,
-        data: [...new Array(18)].map((_item, index) => `${index + 6}:00`),
+        data: data?.x,
         splitLine: {
           show: true,
           lineStyle: {
@@ -44,7 +47,7 @@
       yAxis: [
         {
           type: 'value',
-          max: 80000,
+          max: maxY + 20,
           splitNumber: 4,
           axisTick: {
             show: false,
@@ -61,28 +64,25 @@
       series: [
         {
           smooth: true,
-          data: [
-            111, 222, 4000, 18000, 33333, 55555, 66666, 33333, 14000, 36000, 66666, 44444, 22222,
-            11111, 4000, 2000, 500, 333, 222, 111,
-          ],
+          data: data?.y,
           type: 'line',
           areaStyle: {},
           itemStyle: {
             color: '#5ab1ef',
           },
         },
-        {
-          smooth: true,
-          data: [
-            33, 66, 88, 333, 3333, 5000, 18000, 3000, 1200, 13000, 22000, 11000, 2221, 1201, 390,
-            198, 60, 30, 22, 11,
-          ],
-          type: 'line',
-          areaStyle: {},
-          itemStyle: {
-            color: '#019680',
-          },
-        },
+        // {
+        //   smooth: true,
+        //   data: [
+        //     33, 66, 88, 333, 3333, 5000, 18000, 3000, 1200, 13000, 22000, 11000, 2221, 1201, 390,
+        //     198, 60, 30, 22, 11,
+        //   ],
+        //   type: 'line',
+        //   areaStyle: {},
+        //   itemStyle: {
+        //     color: '#019680',
+        //   },
+        // },
       ],
     });
   });
@@ -9,7 +9,7 @@ export interface GrowCardItem {
  
 export const growCardList: GrowCardItem[] = [
   {
-    title: '访问数',
+    title: '订单完成',
     icon: 'visit-count|svg',
     value: 2000,
     total: 120000,
@@ -17,7 +17,7 @@ export const growCardList: GrowCardItem[] = [
     action: '月',
   },
   {
-    title: '成交额',
+    title: '跟单和质检中',
     icon: 'total-sales|svg',
     value: 20000,
     total: 500000,
@@ -25,7 +25,7 @@ export const growCardList: GrowCardItem[] = [
     action: '月',
   },
   {
-    title: '下载数',
+    title: '利润分析表待审核',
     icon: 'download-count|svg',
     value: 8000,
     total: 120000,
@@ -33,7 +33,15 @@ export const growCardList: GrowCardItem[] = [
     action: '周',
   },
   {
-    title: '成交数',
+    title: '项目报告书待审核',
+    icon: 'transaction|svg',
+    value: 5000,
+    total: 50000,
+    color: 'purple',
+    action: '年',
+  },
+  {
+    title: '订单初始化',
     icon: 'transaction|svg',
     value: 5000,
     total: 50000,
@@ -2,22 +2,26 @@
   <div class="p-4">
     <GrowCard :loading="loading" class="enter-y" />
     <SiteAnalysis class="!my-4 enter-y" :loading="loading" />
-    <div class="md:flex enter-y">
+    <!-- <div class="md:flex enter-y">
       <VisitRadar class="md:w-1/3 w-full" :loading="loading" />
       <VisitSource class="md:w-1/3 !md:mx-4 !md:my-0 !my-4 w-full" :loading="loading" />
       <SalesProductPie class="md:w-1/3 w-full" :loading="loading" />
-    </div>
+    </div> -->
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue';
+  import { onMounted, ref } from 'vue';
   import GrowCard from './components/GrowCard.vue';
   import SiteAnalysis from './components/SiteAnalysis.vue';
-  import VisitSource from './components/VisitSource.vue';
-  import VisitRadar from './components/VisitRadar.vue';
-  import SalesProductPie from './components/SalesProductPie.vue';
+  import { useDataStoreWithOut } from '/@/store/modules/data';
  
   const loading = ref(true);
+  const dataStore = useDataStoreWithOut();
+
+  onMounted(() => {
+    dataStore.getFetchData();
+    dataStore.getFetchChartData();
+  });
  
   setTimeout(() => {
     loading.value = false;
@@ -87,6 +87,7 @@
         userStore.setToken(token);
  
         // 重新获取用户信息和菜单
+
         userStore.getUserInfoAction();
         permissionStore.changePermissionCode();
       }
-import { getAllRoleList, isAccountExist } from '/@/api/demo/system';
-import { BasicColumn, FormSchema } from '/@/components/Table';
-
-export const columns: BasicColumn[] = [
-  {
-    title: '用户名',
-    dataIndex: 'account',
-    width: 120,
-  },
-  {
-    title: '昵称',
-    dataIndex: 'nickname',
-    width: 120,
-  },
-  {
-    title: '邮箱',
-    dataIndex: 'email',
-    width: 120,
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 180,
-  },
-  {
-    title: '角色',
-    dataIndex: 'role',
-    width: 200,
-  },
-  {
-    title: '备注',
-    dataIndex: 'remark',
-  },
-];
-
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'account',
-    label: '用户名',
-    component: 'Input',
-    colProps: { span: 8 },
-  },
-  {
-    field: 'nickname',
-    label: '昵称',
-    component: 'Input',
-    colProps: { span: 8 },
-  },
-];
-
-export const accountFormSchema: FormSchema[] = [
-  {
-    field: 'account',
-    label: '用户名',
-    component: 'Input',
-    helpMessage: ['本字段演示异步验证', '不能输入带有admin的用户名'],
-    rules: [
-      {
-        required: true,
-        message: '请输入用户名',
-      },
-      {
-        validator(_, value) {
-          return new Promise((resolve, reject) => {
-            isAccountExist(value)
-              .then(() => resolve())
-              .catch((err) => {
-                reject(err.message || '验证失败');
-              });
-          });
-        },
-      },
-    ],
-  },
-  {
-    field: 'pwd',
-    label: '密码',
-    component: 'InputPassword',
-    required: true,
-    ifShow: false,
-  },
-  {
-    label: '角色',
-    field: 'role',
-    component: 'ApiSelect',
-    componentProps: {
-      api: getAllRoleList,
-      labelField: 'roleName',
-      valueField: 'roleValue',
-    },
-    required: true,
-  },
-  {
-    field: 'dept',
-    label: '所属部门',
-    component: 'TreeSelect',
-    componentProps: {
-      fieldNames: {
-        label: 'deptName',
-        key: 'id',
-        value: 'id',
-      },
-      getPopupContainer: () => document.body,
-    },
-    required: true,
-  },
-  {
-    field: 'nickname',
-    label: '昵称',
-    component: 'Input',
-    required: true,
-  },
-
-  {
-    label: '邮箱',
-    field: 'email',
-    component: 'Input',
-    required: true,
-  },
-
-  {
-    label: '备注',
-    field: 'remark',
-    component: 'InputTextArea',
-  },
-];
@@ -8,7 +8,7 @@
     @ok="handleSubmit"
   >
     <BasicForm @register="registerForm">
-      <template #menu="{ model, field }">
+      <!-- <template #menu="{ model, field }">
         <BasicTree
           v-model:value="model[field]"
           :treeData="treeData"
@@ -17,7 +17,7 @@
           toolbar
           title="菜单分配"
         />
-      </template>
+      </template> -->
     </BasicForm>
   </BasicDrawer>
 </template>
@@ -7,60 +7,60 @@ import { useMessage } from &#39;/@/hooks/web/useMessage&#39;;
 export const columns: BasicColumn[] = [
   {
     title: '角色名称',
-    dataIndex: 'roleName',
+    dataIndex: 'name',
     width: 200,
   },
-  {
-    title: '角色值',
-    dataIndex: 'roleValue',
-    width: 180,
-  },
-  {
-    title: '排序',
-    dataIndex: 'orderNo',
-    width: 50,
-  },
-  {
-    title: '状态',
-    dataIndex: 'status',
-    width: 120,
-    customRender: ({ record }) => {
-      if (!Reflect.has(record, 'pendingStatus')) {
-        record.pendingStatus = false;
-      }
-      return h(Switch, {
-        checked: record.status === '1',
-        checkedChildren: '停用',
-        unCheckedChildren: '启用',
-        loading: record.pendingStatus,
-        onChange(checked: boolean) {
-          record.pendingStatus = true;
-          const newStatus = checked ? '1' : '0';
-          const { createMessage } = useMessage();
-          setRoleStatus(record.id, newStatus)
-            .then(() => {
-              record.status = newStatus;
-              createMessage.success(`已成功修改角色状态`);
-            })
-            .catch(() => {
-              createMessage.error('修改角色状态失败');
-            })
-            .finally(() => {
-              record.pendingStatus = false;
-            });
-        },
-      });
-    },
-  },
+  // {
+  //   title: '角色值',
+  //   dataIndex: 'roleValue',
+  //   width: 180,
+  // },
+  // {
+  //   title: '排序',
+  //   dataIndex: 'orderNo',
+  //   width: 50,
+  // },
+  // {
+  //   title: '状态',
+  //   dataIndex: 'status',
+  //   width: 120,
+  //   customRender: ({ record }) => {
+  //     if (!Reflect.has(record, 'pendingStatus')) {
+  //       record.pendingStatus = false;
+  //     }
+  //     return h(Switch, {
+  //       checked: record.status === '1',
+  //       checkedChildren: '停用',
+  //       unCheckedChildren: '启用',
+  //       loading: record.pendingStatus,
+  //       onChange(checked: boolean) {
+  //         record.pendingStatus = true;
+  //         const newStatus = checked ? '1' : '0';
+  //         const { createMessage } = useMessage();
+  //         setRoleStatus(record.id, newStatus)
+  //           .then(() => {
+  //             record.status = newStatus;
+  //             createMessage.success(`已成功修改角色状态`);
+  //           })
+  //           .catch(() => {
+  //             createMessage.error('修改角色状态失败');
+  //           })
+  //           .finally(() => {
+  //             record.pendingStatus = false;
+  //           });
+  //       },
+  //     });
+  //   },
+  // },
   {
     title: '创建时间',
     dataIndex: 'createTime',
     width: 180,
   },
-  {
-    title: '备注',
-    dataIndex: 'remark',
-  },
+  // {
+  //   title: '备注',
+  //   dataIndex: 'remark',
+  // },
 ];
  
 export const searchFormSchema: FormSchema[] = [
@@ -4,11 +4,10 @@
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
+  import { defineComponent, ref, computed, unref, toRaw } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { accountFormSchema } from './account.data';
-  import { getDeptList } from '/@/api/demo/system';
  
   export default defineComponent({
     name: 'AccountModal',
@@ -18,7 +17,7 @@
       const isUpdate = ref(true);
       const rowId = ref('');
  
-      const [registerForm, { setFieldsValue, updateSchema, resetFields, validate }] = useForm({
+      const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
         labelWidth: 100,
         baseColProps: { span: 24 },
         schemas: accountFormSchema,
@@ -35,22 +34,11 @@
  
         if (unref(isUpdate)) {
           rowId.value = data.record.id;
+
           setFieldsValue({
-            ...data.record,
+            ...toRaw(data.record),
           });
         }
-
-        const treeData = await getDeptList();
-        updateSchema([
-          {
-            field: 'pwd',
-            show: !unref(isUpdate),
-          },
-          {
-            field: 'dept',
-            componentProps: { treeData },
-          },
-        ]);
       });
  
       const getTitle = computed(() => (!unref(isUpdate) ? '新增账号' : '编辑账号'));
@@ -59,8 +47,7 @@
         try {
           const values = await validate();
           setModalProps({ confirmLoading: true });
-          // TODO custom api
-          console.log(values);
+
           closeModal();
           emit('success', { isUpdate: unref(isUpdate), values: { ...values, id: rowId.value } });
         } finally {
+import { getRoleList } from '/@/api/project/account';
+
+export const columns: BasicColumn[] = [
+  {
+    title: '手机号',
+    dataIndex: 'phone',
+    width: 120,
+  },
+  {
+    title: '昵称',
+    dataIndex: 'nickName',
+    width: 120,
+  },
+  // {
+  //   title: '邮箱',
+  //   dataIndex: 'email',
+  //   width: 120,
+  // },
+  // {
+  //   title: '创建时间',
+  //   dataIndex: 'createTime',
+  //   width: 180,
+  // },
+  {
+    title: '角色',
+    dataIndex: 'roleName',
+    width: 200,
+  },
+  {
+    title: '备注',
+    dataIndex: 'remark',
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'phone',
+    label: '手机号',
+    component: 'Input',
+    colProps: { span: 8 },
+  },
+  {
+    field: 'nickName',
+    label: '昵称',
+    component: 'Input',
+    colProps: { span: 8 },
+  },
+];
+
+export const accountFormSchema: FormSchema[] = [
+  {
+    field: 'phone',
+    label: '手机号',
+    component: 'Input',
+    // helpMessage: ['本字段演示异步验证', '不能输入带有admin的用户名'],
+    rules: [
+      {
+        required: true,
+        message: '请输入用户名',
+      },
+      // {
+      //   validator(_, value) {
+      //     return new Promise((resolve, reject) => {
+      //       isAccountExist(value)
+      //         .then(() => resolve())
+      //         .catch((err) => {
+      //           reject(err.message || '验证失败');
+      //         });
+      //     });
+      //   },
+      // },
+    ],
+  },
+  // {
+  //   field: 'pwd',
+  //   label: '密码',
+  //   component: 'InputPassword',
+  //   required: true,
+  //   ifShow: false,
+  // },
+  {
+    label: '角色',
+    field: 'roleName',
+    component: 'ApiSelect',
+    componentProps: {
+      api: getRoleList,
+      labelField: 'name',
+      valueField: 'level',
+    },
+    required: true,
+  },
+  // {
+  //   field: 'dept',
+  //   label: '所属部门',
+  //   component: 'TreeSelect',
+  //   componentProps: {
+  //     fieldNames: {
+  //       label: 'deptName',
+  //       key: 'id',
+  //       value: 'id',
+  //     },
+  //     getPopupContainer: () => document.body,
+  //   },
+  //   required: true,
+  // },
+  {
+    field: 'nickName',
+    label: '昵称',
+    component: 'Input',
+    required: true,
+  },
+
+  // {
+  //   label: '邮箱',
+  //   field: 'email',
+  //   component: 'Input',
+  //   required: true,
+  // },
+
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'InputTextArea',
+  },
+];
 <template>
   <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
-    <DeptTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
-    <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
+    <!-- <DeptTree class="w-1/4 xl:w-1/5" @select="handleSelect" /> -->
+    <BasicTable @register="registerTable" :searchInfo="searchInfo">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate">新增账号</a-button>
       </template>
@@ -9,11 +9,11 @@
         <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
-              {
-                icon: 'clarity:info-standard-line',
-                tooltip: '查看用户详情',
-                onClick: handleView.bind(null, record),
-              },
+              // {
+              //   icon: 'clarity:info-standard-line',
+              //   tooltip: '查看用户详情',
+              //   onClick: handleView.bind(null, record),
+              // },
               {
                 icon: 'clarity:note-edit-line',
                 tooltip: '编辑用户资料',
@@ -41,7 +41,7 @@
   import { defineComponent, reactive } from 'vue';
  
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { getAccountList } from '/@/api/demo/system';
+  import { getUserList, userAdd, userEdit } from '/@/api/project/account';
   import { PageWrapper } from '/@/components/Page';
   import DeptTree from './DeptTree.vue';
  
@@ -57,10 +57,10 @@
     setup() {
       const go = useGo();
       const [registerModal, { openModal }] = useModal();
-      const searchInfo = reactive<Recordable>({});
+      const searchInfo = reactive({});
       const [registerTable, { reload, updateTableDataRecord }] = useTable({
         title: '账号列表',
-        api: getAccountList,
+        api: getUserList,
         rowKey: 'id',
         columns,
         formConfig: {
@@ -101,15 +101,14 @@
         console.log(record);
       }
  
-      function handleSuccess({ isUpdate, values }) {
+      async function handleSuccess({ isUpdate, values }) {
         if (isUpdate) {
-          // 演示不刷新表格直接更新内部数据。
-          // 注意：updateTableDataRecord要求表格的rowKey属性为string并且存在于每一行的record的keys中
-          const result = updateTableDataRecord(values.id, values);
-          console.log(result);
+          await userEdit({ ...values });
         } else {
-          reload();
+          await userAdd({ ...values });
         }
+
+        reload();
       }
  
       function handleSelect(deptId = '') {
+<template>
+  <PageWrapper contentBackground>
+    <template #footer>
+      <a-tabs default-active-key="1" v-model:activeKey="currentKey">
+        <a-tab-pane key="1" tab="申请/待审核列表"
+          ><BasicTable @register="registerTable1">
+            <template #form-custom> custom-slot </template>
+            <template #bodyCell="{ column, record }">
+              <template v-if="column.key === 'action'">
+                <TableAction
+                  :actions="[
+                    {
+                      label: '通过',
+                      // icon: 'ic:outline-delete-outline',
+                      onClick: handleTrue.bind(null, record),
+                    },
+                    {
+                      label: '拒绝',
+                      // icon: 'ic:outline-delete-outline',
+                      onClick: handleFalse.bind(null, record),
+                    },
+                  ]"
+                />
+              </template>
+            </template> </BasicTable
+        ></a-tab-pane>
+        <a-tab-pane key="2" tab="已审核列表">
+          <BasicTable @register="registerTable2" />
+        </a-tab-pane>
+      </a-tabs>
+    </template>
+  </PageWrapper>
+</template>
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { Tabs } from 'ant-design-vue';
+  import { PageWrapper } from '/@/components/Page';
+
+  import { approveAuditApi, getWaitListApi, getApprovedListApi } from '/@/api/project/approve';
+
+  export default defineComponent({
+    components: {
+      PageWrapper,
+      BasicTable,
+      TableAction,
+      [Tabs.name]: Tabs,
+      [Tabs.TabPane.name]: Tabs.TabPane,
+    },
+    setup() {
+      const checkedKeys = ref<Array<string | number>>([]);
+      const currentKey = ref('1');
+
+      const [registerTable1, { reload }] = useTable({
+        api: getWaitListApi,
+        columns: [
+          {
+            title: '申请人',
+            dataIndex: 'createBy',
+            width: 150,
+          },
+          {
+            title: '申请字段',
+            dataIndex: 'fields',
+            width: 600,
+          },
+          {
+            title: '订单号',
+            dataIndex: 'no6',
+          },
+          {
+            title: '订单字段1',
+            dataIndex: 'no5',
+          },
+          {
+            title: '订单字段2',
+            dataIndex: 'no4',
+          },
+          {
+            title: '订单字段3',
+            dataIndex: 'no3',
+          },
+
+          {
+            title: '订单字段5',
+            dataIndex: 'no1',
+          },
+        ],
+        // useSearchForm: true,
+        // formConfig: getFormConfig(),
+        rowKey: 'id',
+        actionColumn: {
+          width: 160,
+          title: 'Action',
+          dataIndex: 'action',
+          // slots: { customRender: 'action' },
+        },
+      });
+
+      const [registerTable2] = useTable({
+        api: getApprovedListApi,
+        columns: [
+          {
+            title: '申请人',
+            dataIndex: 'createBy',
+            width: 150,
+          },
+          {
+            title: '申请字段',
+            dataIndex: 'fields',
+            width: 600,
+          },
+          {
+            title: '订单号',
+            dataIndex: 'no6',
+          },
+          {
+            title: '订单字段1',
+            dataIndex: 'no5',
+          },
+          {
+            title: '订单字段2',
+            dataIndex: 'no4',
+          },
+          {
+            title: '订单字段3',
+            dataIndex: 'no3',
+          },
+
+          {
+            title: '订单字段5',
+            dataIndex: 'no1',
+          },
+        ],
+        rowKey: 'id',
+      });
+
+      // function getFormValues() {
+      //   console.log(getForm1().getFieldsValue());
+      // }
+
+      function onSelect(record, selected) {
+        if (selected) {
+          checkedKeys.value = [...checkedKeys.value, record.id];
+        } else {
+          checkedKeys.value = checkedKeys.value.filter((id) => id !== record.id);
+        }
+      }
+      function onSelectAll(selected, selectedRows, changeRows) {
+        const changeIds = changeRows.map((item) => item.id);
+        if (selected) {
+          checkedKeys.value = [...checkedKeys.value, ...changeIds];
+        } else {
+          checkedKeys.value = checkedKeys.value.filter((id) => {
+            return !changeIds.includes(id);
+          });
+        }
+      }
+      function handleEdit(record, e) {
+        e?.stopPropagation();
+        return false;
+      }
+
+      function handleProfitModal() {}
+
+      async function handleTrue(record) {
+        await approveAuditApi({ status: 10, id: record.id });
+        reload();
+      }
+
+      async function handleFalse(record) {
+        await approveAuditApi({ status: 20, id: record.id });
+        reload();
+      }
+
+      return {
+        handleProfitModal,
+        registerTable1,
+        registerTable2,
+        checkedKeys,
+        currentKey,
+        onSelect,
+        handleEdit,
+        onSelectAll,
+        handleTrue,
+        handleFalse,
+      };
+    },
+  });
+</script>
+<template>
+  <BasicDrawer
+    @register="register"
+    v-bind="$attrs"
+    showFooter
+    title="字段编辑权限申请"
+    width="60%"
+    :isDetail="true"
+    @ok="handleSubmit"
+    :showDetailBack="false"
+    okText="申请"
+    ><input />
+    <div>
+      <h3>基本信息</h3>
+      <BasicForm @register="registerForm" />
+      <h3>利润分析</h3>
+      <BasicForm @register="registerProfitForm" />
+    </div>
+    <!-- <template #titleToolbar> <a-button type="primary"> 申请编辑权限 </a-button></template> -->
+
+    <template #appendFooter>
+      <a-button type="primary" @click="onGoFormDetail"> 返回编辑</a-button>
+    </template>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { defineComponent, reactive, ref } from 'vue';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+  import { orderAuth } from '/@/api/project/order';
+
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { FIELDS_BASE_INFO, FIELDS_PROFIT_INFO } from './tableData';
+  import { cloneDeep, isEmpty, mapValues, mergeWith } from 'lodash-es';
+
+  const getSchema = (fields, base) =>
+    fields.map((item) => ({
+      field: `${base}.${item.field}`,
+      dataIndex: `${base}.${item.field}`,
+      label: item.label,
+      component: 'Switch',
+      colProps: {
+        span: 6,
+      },
+    }));
+
+  export default defineComponent({
+    components: { BasicDrawer, BasicForm },
+    props: {
+      onGoFormDetail: {
+        type: Function,
+      },
+    },
+    setup() {
+      const id = ref('');
+      const schemas = getSchema(FIELDS_BASE_INFO, 'baseFields');
+      const profitSchemas = getSchema(FIELDS_PROFIT_INFO, 'profitAnalysisFields');
+      const [registerForm, { getFieldsValue }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      const [registerProfitForm, { getFieldsValue: getProfitFieldsValue }] = useForm({
+        labelWidth: 120,
+        schemas: profitSchemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      const lockFields = reactive({});
+      const [register, { closeDrawer }] = useDrawerInner((data) => {
+        Object.assign(lockFields, data.lockFields);
+        id.value = data.id;
+      });
+
+      function customizer(objValue, srcValue, key) {
+        // 检查是否在 baseFields 内以及值是否为 true
+        if (srcValue === true) {
+          return 'UN_LOCKED';
+        }
+        return objValue; // 如果不需要改变，返回原值
+      }
+      const handleSubmit = async () => {
+        const baseFieldValues = getFieldsValue();
+        const profitFieldValues = getProfitFieldsValue();
+
+        !isEmpty(baseFieldValues) &&
+          Object.keys(baseFieldValues.baseFields)?.map((key) => {
+            baseFieldValues.baseFields[key] = baseFieldValues.baseFields[key]
+              ? 'UN_LOCKED'
+              : 'LOCKED';
+          });
+
+        !isEmpty(profitFieldValues) &&
+          Object.keys(profitFieldValues.profitAnalysisFields).map((key) => {
+            profitFieldValues.profitAnalysisFields[key] = profitFieldValues.profitAnalysisFields[
+              key
+            ]
+              ? 'UN_LOCKED'
+              : 'LOCKED';
+          });
+
+        const values = Object.assign({ orderId: id.value }, baseFieldValues, profitFieldValues);
+        console.log('%c [ values ]-103', 'font-size:13px; background:pink; color:#bf2c9f;', values);
+        await orderAuth(values);
+        closeDrawer();
+      };
+      return { register, schemas, registerForm, registerProfitForm, handleSubmit };
+    },
+  });
+</script>
+<template>
+  <BasicDrawer
+    @register="register"
+    v-bind="$attrs"
+    title="title"
+    width="60%"
+    :isDetail="true"
+    :showDetailBack="false"
+  >
+    <div>
+      <BasicTable @register="registerTable" @edit-change="handleEditChange">
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'action'">
+            <TableAction :actions="createActions(record, column)" />
+          </template>
+        </template>
+      </BasicTable>
+      <a-button block class="mt-5" type="dashed" @click="handleAdd"> 新增选项 </a-button>
+    </div>
+    <!-- <template #titleToolbar> <a-button type="primary"> 申请编辑权限 </a-button></template> -->
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, toRaw } from 'vue';
+  import {
+    BasicTable,
+    useTable,
+    TableAction,
+    BasicColumn,
+    ActionItem,
+    EditRecordRow,
+  } from '/@/components/Table';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
+  import { dictCreate, dictDelete, dictList, dictUpdate } from '/@/api/project/order';
+
+  const orderStore = useOrderStoreWithOut();
+
+  const columns: BasicColumn[] = [
+    {
+      title: '筛选项',
+      dataIndex: 'dictValue',
+      editRow: true,
+    },
+  ];
+
+  export default defineComponent({
+    components: { BasicDrawer, BasicTable, TableAction },
+    props: {
+      onGoFormDetail: {
+        type: Function,
+      },
+    },
+    setup() {
+      const dataSource = ref([]);
+      const key = ref('');
+      const title = ref('');
+
+      const [registerTable, { getDataSource, reload }] = useTable({
+        columns: columns,
+        showIndexColumn: false,
+        dataSource: toRaw(dataSource),
+        actionColumn: {
+          width: 160,
+          title: '操作',
+          dataIndex: 'action',
+          // slots: { customRender: 'action' },
+        },
+        scroll: { y: '100%' },
+        pagination: false,
+      });
+
+      const [register] = useDrawerInner((data) => {
+        const { dataIndex, customTitle } = data;
+        const dicts = orderStore.getDictInfo;
+        const dict = dicts[dataIndex];
+        dataSource.value = dict;
+        title.value = customTitle;
+        key.value = dataIndex;
+      });
+
+      function handleEdit(record: EditRecordRow) {
+        record.onEdit?.(true);
+      }
+
+      function handleCancel(record: EditRecordRow) {
+        record.onEdit?.(false);
+        if (record.isNew) {
+          const data = getDataSource();
+          const index = data.findIndex((item) => item.key === record.key);
+          data.splice(index, 1);
+        }
+      }
+
+      async function handleSave(record: EditRecordRow) {
+        if (record.id) {
+          await dictUpdate({ dictCode: key.value, dictValue: record.dictValue });
+        } else {
+          await dictCreate({
+            dictName: title.value,
+            dictCode: key.value,
+            dictValue: record.dictValue,
+            sort: dataSource.value.length + 1,
+          });
+        }
+
+        await orderStore.getDict();
+
+        setTimeout(async () => {
+          const res = await dictList({ dictCode: key.value });
+          dataSource.value = res.records;
+          reload();
+        }, 300);
+      }
+
+      async function handleDelete(record) {
+        await dictDelete({ ids: [record.id] });
+        await orderStore.getDict();
+        record.onEdit?.(false, true);
+        setTimeout(async () => {
+          const res = await dictList({ dictCode: key.value });
+          dataSource.value = res.records;
+          reload();
+        }, 300);
+      }
+
+      function handleEditChange(data) {
+        console.log(data);
+      }
+
+      function handleAdd() {
+        const data = getDataSource();
+        const addRow: EditRecordRow = {
+          name: '',
+          no: '',
+          dept: '',
+          editable: true,
+          isNew: true,
+          key: `${Date.now()}`,
+        };
+        data.push(addRow);
+      }
+
+      function createActions(record: EditRecordRow, column: BasicColumn): ActionItem[] {
+        if (!record.editable) {
+          return [
+            {
+              label: '编辑',
+              onClick: handleEdit.bind(null, record),
+            },
+            {
+              label: '删除',
+              onClick: handleDelete.bind(null, record),
+            },
+          ];
+        }
+        return [
+          {
+            label: '保存',
+            onClick: handleSave.bind(null, record, column),
+          },
+          {
+            label: '取消',
+            popConfirm: {
+              title: '是否取消编辑',
+              confirm: handleCancel.bind(null, record, column),
+            },
+          },
+        ];
+      }
+      return {
+        title,
+        register,
+        registerTable,
+        handleEdit,
+        createActions,
+        handleAdd,
+        getDataSource,
+        handleEditChange,
+      };
+    },
+  });
+</script>
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    showFooter
+    @register="register"
+    @ok="handleSubmit"
+    title=""
+    width="28%"
+    ref="formRef"
+    :isDetail="true"
+    :showDetailBack="false"
+    okText="保存"
+    :mask="false"
+    class="z-20"
+  >
+    <Tabs v-model:activeKey="activeKey">
+      <TabPanel key="1" tab="基本信息" :forceRender="true">
+        <BasicForm @register="registerForm" />
+      </TabPanel>
+      <TabPanel key="2" tab="利润分析" :forceRender="true">
+        <ProfitFormPanel ref="profitFormPanelRef" :id="id" />
+      </TabPanel>
+      <TabPanel key="3" tab="项目报告书" :forceRender="true">
+        <ReportFormPanel ref="ReportFormPanelRef" />
+      </TabPanel>
+      <TabPanel key="4" tab="跟单信息" :forceRender="true">
+        <TrackFormPanel ref="TrackFormPanelRef" />
+      </TabPanel>
+      <TabPanel key="5" tab="质检信息" :forceRender="true">
+        <InspectionFormPanel ref="InspectionFormRef" />
+      </TabPanel>
+    </Tabs>
+    <!-- <BasicForm @register="registerForm" />
+      <BasicForm @register="registerForm" />
+      <BasicForm @register="registerForm" /> -->
+    <!-- <template #titleToolbar> <a-button type="primary"> 申请编辑权限 </a-button></template> -->
+
+    <!-- <template #appendFooter>
+      <a-button type="primary" @click="onGoCheckDetail"> 申请权限</a-button>
+    </template> -->
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { computed, defineComponent, reactive, ref, toRaw, watch, watchEffect } from 'vue';
+  import { BasicForm, FormActionType, FormSchema, useForm } from '/@/components/Form/index';
+  import { orderCreate, orderUpdate, uploadImg } from '/@/api/project/order';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
+  import { useOrderInfo } from '/@/hooks/component/order';
+  import { dateUtil } from '/@/utils/dateUtil';
+  import { FIELDS_REPORT_INFO } from './tableData';
+  import ProfitFormPanel from './component/ProfitFormPanel.vue';
+  import ReportFormPanel from './component/ReportFormPanel.vue';
+  import TrackFormPanel from './component/TrackFormPanel.vue';
+  import InspectionFormPanel from './component/InspectionFormPanel.vue';
+
+  import { Tabs } from 'ant-design-vue';
+
+  const TabPanel = Tabs.TabPane;
+
+  export default defineComponent({
+    components: {
+      BasicDrawer,
+      BasicForm,
+      Tabs,
+      TabPanel,
+      ProfitFormPanel,
+      ReportFormPanel,
+      TrackFormPanel,
+      InspectionFormPanel,
+    },
+
+    props: {
+      detailData: {
+        type: Object,
+      },
+      onGoCheckDetail: {
+        type: Function,
+      },
+    },
+    emits: ['success'],
+    setup(_, { emit }) {
+      const orderStore = useOrderStoreWithOut();
+      const activeKey = ref('1');
+      const profitFormPanelRef = ref(null);
+      const ReportFormPanelRef = ref(null);
+      const TrackFormPanelRef = ref(null);
+      const InspectionFormPanelRef = ref(null);
+
+      const {
+        customerCode,
+        projectNo,
+        productionDepartment,
+        innerNo,
+        poColor,
+        cnColor,
+        productStyle,
+        outboundType,
+        packetType,
+      } = useOrderInfo(orderStore);
+
+      const formRef = ref<FormActionType | null>(null);
+      const id = ref('');
+
+      // const customerCode = computed(() => {
+      //   const dictInfo = orderStore.getDictInfo;
+      //   return map(dictInfo?.customerCode, transformDictInfo);
+      // });
+
+      // const projectNo = computed(() => {
+      //   const dictInfo = orderStore.getDictInfo;
+      //   return map(dictInfo?.projectNo, transformDictInfo);
+      // });
+
+      const picUrl = ref('');
+      let fields = reactive({ baseFields: {} });
+      const getDisable = (code) => {
+        return code === 'LOCKED' && !!id.value;
+      };
+
+      const schemas = computed(() => {
+        return [
+          {
+            field: 'baseInfo.customerCode',
+            component: 'Select',
+            label: '客户编码',
+            rules: [{ required: true }],
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              options: customerCode,
+              disabled: getDisable(fields?.baseFields.customerCode),
+            },
+          },
+          {
+            field: 'baseInfo.projectNo',
+            component: 'Select',
+            componentProps: {
+              options: projectNo,
+              disabled: getDisable(fields?.baseFields?.projectNo),
+            },
+            label: '项目号',
+            rules: [{ required: true }],
+            colProps: {
+              span: 24,
+            },
+          },
+          {
+            field: 'baseInfo.productionDepartment',
+            component: 'Select',
+            label: '生产科',
+            rules: [{ required: true }],
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              options: productionDepartment,
+              disabled: getDisable(fields?.baseFields?.productionDepartment),
+            },
+          },
+          {
+            field: 'baseInfo.innerNo',
+            component: 'Select',
+            label: '内部编号',
+            rules: [{ required: true }],
+
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              options: innerNo,
+              disabled: getDisable(fields?.baseFields?.innerNo),
+            },
+          },
+          {
+            field: 'baseInfo.customerPo',
+            component: 'Input',
+            label: '客户po号',
+            rules: [{ required: true }],
+            componentProps: {
+              disabled: getDisable(fields?.baseFields?.customerPo),
+            },
+            colProps: {
+              span: 24,
+            },
+          },
+          {
+            field: 'baseInfo.customerStyle',
+            component: 'Input',
+            label: '客户STYLE',
+            rules: [{ required: true }],
+
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              disabled: getDisable(fields?.baseFields?.customerStyle),
+            },
+          },
+          {
+            field: 'baseInfo.collection',
+            component: 'Input',
+            label: 'COLLECTION (style description)',
+            rules: [{ required: true }],
+
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              disabled: getDisable(fields?.baseFields?.collection),
+            },
+          },
+          {
+            field: 'baseInfo.poColor',
+            component: 'Select',
+            label: 'PO COLOR',
+            rules: [{ required: true }],
+
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              options: poColor,
+              disabled: getDisable(fields?.baseFields?.poColor),
+            },
+          },
+          {
+            field: 'baseInfo.cnColor',
+            component: 'Select',
+            label: '颜色中文',
+            rules: [{ required: true }],
+
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              options: cnColor,
+              disabled: getDisable(fields?.baseFields?.cnColor),
+            },
+          },
+          {
+            field: 'baseInfo.picUrl',
+            component: 'FieldUpload',
+            label: '图片',
+            rules: [{ required: true }],
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              imgUrl: picUrl,
+              disabled: getDisable(fields?.baseFields?.picUrl),
+              onChange: (res) => {
+                if (res.file?.response?.data) picUrl.value = res.file?.response?.data;
+              },
+            },
+          },
+          {
+            field: 'baseInfo.productionComment',
+            component: 'Input',
+            rules: [{ required: true }],
+            label: '生产要求',
+            componentProps: {
+              disabled: getDisable(fields?.baseFields?.productionComment),
+            },
+            colProps: {
+              span: 24,
+            },
+          },
+          {
+            field: 'baseInfo.orderCount',
+            component: 'InputNumber',
+            rules: [{ required: true }],
+            label: '数量',
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              disabled: getDisable(fields?.baseFields?.orderCount),
+            },
+          },
+          {
+            field: 'baseInfo.orderComposition',
+            component: 'Input',
+            rules: [{ required: true }],
+            label: '订单成分',
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              disabled: getDisable(fields?.baseFields?.orderComposition),
+            },
+          },
+          {
+            field: 'baseInfo.productStyle',
+            component: 'Select',
+            rules: [{ required: true }],
+            label: '款式类型',
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              options: productStyle,
+              disabled: getDisable(fields?.baseFields?.productStyle),
+            },
+          },
+          {
+            field: 'baseInfo.productionDepartmentConsignTime',
+            component: 'DatePicker',
+            label: '生成科拖货时间',
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              disabled: getDisable(fields?.baseFields?.productionDepartmentConsignTime),
+            },
+            rules: [{ required: true }],
+          },
+          {
+            field: 'baseInfo.orderHodTime',
+            component: 'DatePicker',
+            label: '订单上HOD时间',
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              disabled: getDisable(fields?.baseFields?.orderHodTime),
+            },
+            rules: [{ required: true }],
+          },
+          {
+            field: 'baseInfo.outboundType',
+            component: 'Select',
+            label: '出库类型',
+            colProps: {
+              span: 24,
+            },
+            rules: [{ required: true }],
+            componentProps: {
+              disabled: getDisable(fields?.baseFields?.outboundType),
+              options: outboundType,
+            },
+          },
+          {
+            field: 'baseInfo.packetType',
+            component: 'Select',
+            label: '包装类型',
+            colProps: {
+              span: 24,
+            },
+            rules: [{ required: true }],
+            componentProps: {
+              options: packetType,
+              disabled: getDisable(fields?.baseFields?.packetType),
+            },
+          },
+        ];
+      });
+      const reportSchemas = computed(() => {
+        return FIELDS_REPORT_INFO.map((item) => {
+          return {
+            field: `reportInfo.${item.field}`,
+            component: item.component,
+            label: item.label,
+            rules: [{ required: true }],
+            colProps: {
+              span: 24,
+            },
+            componentProps: {
+              disabled: getDisable(fields?.baseFields.customerCode),
+            },
+          };
+        });
+      });
+
+      const [registerForm, { setFieldsValue, getFieldsValue, reload }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+
+      const [register, { closeDrawer }] = useDrawerInner((data) => {
+        id.value = data.id;
+
+        // 方式1
+        picUrl.value = data.picUrl;
+        data.orderHodTime = data.orderHodTime ? dateUtil(data.orderHodTime) : null;
+        data.productionDepartmentConsignTime = data.productionDepartmentConsignTime
+          ? dateUtil(data.productionDepartmentConsignTime)
+          : null;
+
+        fields.baseFields = {
+          ...fields.baseFields,
+          ...data.lockFields.baseFields,
+        };
+
+        if (id.value) {
+          setFieldsValue({
+            baseInfo: { ...toRaw(data) },
+          });
+
+          profitFormPanelRef.value.fields.profitAnalysisInfo =
+            { ...data.lockFields?.profitAnalysisFields } || {};
+
+          profitFormPanelRef?.value?.setFieldsValue({
+            ...toRaw(data.profitAnalysisInfo),
+            profitAnalysisInfo: { ...toRaw(data.profitAnalysisInfo) },
+          });
+        } else {
+          setFieldsValue({});
+        }
+      });
+
+      const handleSubmit = async () => {
+        const values = getFieldsValue() || {};
+
+        values.baseInfo = {
+          ...values.baseInfo,
+          picUrl: picUrl?.value || '',
+        };
+        if (id.value) {
+          values.orderId = id.value;
+
+          await orderUpdate(values);
+        } else {
+          const v2 = profitFormPanelRef?.value?.getFieldsValue() || { profitAnalysisInfo: {} };
+          const v3 = ReportFormPanelRef?.value?.getFieldsValue() || { reportInfo: {} };
+          const v4 = TrackFormPanelRef?.value?.getFieldsValue() || { trackStageInfo: {} };
+          const v5 = InspectionFormPanelRef?.value?.getFieldsValue() || { inspectionStageInfo: {} };
+
+          values.profitAnalysisInfo = { ...v2.profitAnalysisInfo };
+          values.reportInfo = { ...v3.reportInfo };
+          values.trackStageInfo = { ...v4.trackStageInfo };
+          values.inspectionStageInfo = { ...v5.inspectionStageInfo };
+          await orderCreate(values);
+        }
+        closeDrawer();
+        emit('success', {});
+      };
+      return {
+        id,
+        profitFormPanelRef,
+        ReportFormPanelRef,
+        TrackFormPanelRef,
+        InspectionFormPanelRef,
+        activeKey,
+        formRef,
+        schemas,
+        register,
+        registerForm,
+        handleSubmit,
+      };
+    },
+  });
+</script>
+
+<style>
+  .ant-drawer {
+    position: fixed;
+    z-index: 9999;
+  }
+</style>
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    title="操作记录"
+    width="60%"
+    :isDetail="true"
+    :showDetailBack="false"
+    okText="保存"
+  >
+    <Tabs animated>
+      <template v-for="i in achieveList" :key="i.key">
+        <TabPane :tab="i.name" />
+      </template>
+    </Tabs>
+    <PageWrapper class="prefixCls">
+      <a-list :pagination="pagination" style="width: 100%">
+        <template v-for="item in list" :key="item.id">
+          <a-list-item class="list">
+            <a-list-item-meta>
+              <template #avatar>
+                <!-- <Icon class="icon" v-if="item.icon" :icon="item.icon" :color="item.color" /> -->
+              </template>
+              <template #title>
+                <!-- <span>{{ item.title }}</span> -->
+                <span>操作人</span>
+                <!-- <div class="extra" v-if="item.extra">
+                  {{ item.extra }}
+                </div> -->
+              </template>
+              <template #description>
+                <div class="description">
+                  <!-- {{ item.description }} -->
+                  干了什么
+                </div>
+                <div class="info">
+                  <div><span>操作时间</span>{{ item.datetime }}</div>
+                </div>
+              </template>
+            </a-list-item-meta>
+          </a-list-item>
+        </template>
+      </a-list>
+    </PageWrapper>
+    <!-- <template #titleToolbar> <a-button type="primary"> 申请编辑权限 </a-button></template> -->
+
+    <template #appendFooter>
+      <!-- <a-button type="primary" @click="onGoCheckDetail"> 申请权限</a-button> -->
+    </template>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { defineComponent } from 'vue';
+  import { Tabs, Progress, Row, Col, List } from 'ant-design-vue';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+  import { cardList } from './data';
+  import { PageWrapper } from '/@/components/Page';
+
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+
+  const schemas: FormSchema[] = [
+    {
+      field: '订单号',
+      component: 'Input',
+      label: '字段1',
+      componentProps: {
+        readonly: true,
+        disabled: true,
+      },
+      colProps: {
+        span: 12,
+      },
+      defaultValue: '111',
+    },
+    {
+      field: 'field2',
+      component: 'Input',
+      label: '字段2',
+      colProps: {
+        span: 12,
+      },
+    },
+  ];
+  const achieveList = [
+    {
+      key: '1',
+      name: '编辑记录',
+    },
+    {
+      key: '2',
+      name: '审批记录',
+    },
+  ];
+  export default defineComponent({
+    components: {
+      BasicDrawer,
+      Tabs,
+      [List.name]: List,
+      [List.Item.name]: List.Item,
+      AListItemMeta: List.Item.Meta,
+      PageWrapper,
+    },
+    props: {
+      onGoCheckDetail: {
+        type: Function,
+      },
+    },
+    setup() {
+      const [registerForm, { setFieldsValue }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      const [register] = useDrawerInner((data) => {
+        // 方式1
+        setFieldsValue({
+          field2: data.data,
+          field1: data.info,
+        });
+      });
+      return {
+        register,
+        schemas,
+        registerForm,
+        achieveList,
+        list: cardList,
+        prefixCls: 'account-center',
+
+        pagination: {
+          show: true,
+          pageSize: 3,
+        },
+      };
+    },
+  });
+</script>
+
+<style lang="less" scoped>
+  .account-center {
+    &-bottom {
+      margin: 0 16px 16px;
+      padding: 10px;
+      border-radius: 3px;
+      background-color: @component-background;
+    }
+  }
+</style>
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    destroyOnClose
+    @register="register"
+    title="利润分析表"
+    :helpMessage="['提示1', '提示2']"
+    @visible-change="handleShow"
+    :footer="null"
+  >
+    <!-- <template #insertFooter>
+      <a-button type="primary" danger @click="setLines" :disabled="loading">点我更新内容</a-button>
+    </template> -->
+    <!-- <template v-if="loading">
+      <div class="empty-tips">加载中，稍等3秒……</div>
+    </template> -->
+    <Description
+      class="mt-4"
+      layout="vertical"
+      :collapseOptions="{ canExpand: true, helpMessage: 'help me' }"
+      :column="2"
+      :data="mockData"
+      :schema="schema"
+    />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, toRaw, watch } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { Description, DescItem, useDescription } from '/@/components/Description/index';
+  import { orderAnalysis } from '/@/api/project/order';
+
+  export default defineComponent({
+    components: { BasicModal, Description },
+    setup() {
+      const loading = ref(true);
+      const lines = ref(10);
+      const [register, { setModalProps, redoModalHeight }] = useModalInner(async (data) => {
+        const orderIds = toRaw(data.data);
+        const res = await orderAnalysis({ orderIds });
+      });
+      const mockData = {
+        username: '100',
+        nickName: '100',
+        age: '123',
+        phone: '1222',
+        addr: '2332',
+      };
+
+      const schema: DescItem[] = [
+        {
+          field: 'username',
+          label: '客户总金额',
+        },
+        {
+          field: 'nickName',
+          label: '供应商总价',
+        },
+        {
+          field: 'phone',
+          label: '包装费用',
+        },
+        {
+          field: 'addr',
+          label: '总利润率',
+        },
+      ];
+
+      watch(
+        () => lines.value,
+        () => {
+          redoModalHeight();
+        },
+      );
+
+      function handleShow(visible: boolean) {
+        if (visible) {
+          loading.value = true;
+          // setModalProps({ loading: true, confirmLoading: true });
+          setTimeout(() => {
+            lines.value = Math.round(Math.random() * 30 + 5);
+            loading.value = false;
+            setModalProps({ loading: false, confirmLoading: false });
+          }, 3000);
+        }
+      }
+
+      function setLines() {
+        lines.value = Math.round(Math.random() * 20 + 10);
+      }
+      return { register, loading, handleShow, lines, setLines, mockData, schema };
+    },
+  });
+</script>
+<style scoped>
+  .empty-tips {
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+</style>
+<template>
+  <BasicForm @register="registerForm" />
+</template>
+<script lang="ts">
+  import { computed, defineComponent, reactive, ref, toRaw } from 'vue';
+  import { BasicForm, FormActionType, useForm } from '/@/components/Form/index';
+  import { useDrawerInner } from '/@/components/Drawer';
+  import { dateUtil } from '/@/utils/dateUtil';
+  import { FIELDS_INSPECTION_INFO } from '../tableData';
+  import { getDisable } from '/@/utils/project';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
+
+  import { useOrderInfo } from '/@/hooks/component/order';
+
+  export default defineComponent({
+    components: { BasicForm },
+
+    props: {
+      detailData: {
+        type: Object,
+      },
+      onGoCheckDetail: {
+        type: Function,
+      },
+    },
+    emits: ['success'],
+    setup(_, { emit }) {
+      let fields = reactive({ baseFields: {}, profitAnalysisInfo: {} });
+      const orderStore = useOrderStoreWithOut();
+
+      const { midCheckResult, endCheckResult } = useOrderInfo(orderStore);
+
+      const schemas = computed(() => {
+        const options = {
+          midCheckResult,
+          endCheckResult,
+        };
+        return FIELDS_INSPECTION_INFO.map((item) => ({
+          ...item,
+          componentProps: {
+            ...(item.component === 'Select' && { options: options[item.optionField] }),
+            disabled: getDisable(`fields.${item.field}`),
+          },
+          colProps: {
+            span: 24,
+          },
+        }));
+      });
+
+      const [registerForm, { setFieldsValue, getFieldsValue, reload }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+
+      const [register, { closeDrawer }] = useDrawerInner((data) => {
+        // 方式1
+        data.orderHodTime = data.orderHodTime ? dateUtil(data.orderHodTime) : null;
+        data.productionDepartmentConsignTime = data.productionDepartmentConsignTime
+          ? dateUtil(data.productionDepartmentConsignTime)
+          : null;
+
+        fields.baseFields = {
+          ...fields.baseFields,
+          ...data.lockFields.baseFields,
+        };
+
+        if (id.value) {
+          setFieldsValue({
+            ...toRaw(data),
+            baseInfo: { ...toRaw(data) },
+          });
+        } else {
+          setFieldsValue({});
+        }
+      });
+
+      return { register, schemas, registerForm, getFieldsValue };
+    },
+  });
+</script>
+<template>
+  <BasicForm @register="registerForm" />
+</template>
+<script lang="ts">
+  import { computed, defineComponent, reactive, ref, toRaw } from 'vue';
+  import { BasicForm, FormActionType, useForm } from '/@/components/Form/index';
+  import { orderCreate, orderUpdate } from '/@/api/project/order';
+  import { dateUtil } from '/@/utils/dateUtil';
+  import { FIELDS_PROFIT_INFO } from '../tableData';
+  import { getDisable } from '/@/utils/project';
+  import { get } from 'lodash-es';
+
+  export default defineComponent({
+    components: { BasicForm },
+
+    props: {
+      detailData: {
+        type: Object,
+      },
+      onGoCheckDetail: {
+        type: Function,
+      },
+      id: {
+        type: String,
+      },
+    },
+    emits: ['success'],
+    setup(props, { emit }) {
+      console.log('%c [ props ]-29', 'font-size:13px; background:pink; color:#bf2c9f;', props);
+      let fields = reactive({ profitAnalysisInfo: {} });
+
+      const schemas = computed(() => {
+        return FIELDS_PROFIT_INFO.map((item) => {
+          console.log(
+            '%c [  ]-31',
+            'font-size:13px; background:pink; color:#bf2c9f;',
+            get(fields, `${item.field}`),
+            getDisable(get(fields, `${item.field}`), props.id),
+          );
+          return {
+            ...item,
+            componentProps: {
+              ...item.componentProps,
+              disabled: getDisable(get(fields, `${item.field}`), props.id),
+            },
+            colProps: {
+              span: 24,
+            },
+          };
+        });
+      });
+
+      const [registerForm, { setFieldsValue, getFieldsValue, reload }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      return { fields, schemas, registerForm, getFieldsValue, setFieldsValue };
+    },
+  });
+</script>
+<template>
+  <BasicForm @register="registerForm" />
+</template>
+<script lang="ts">
+  import { computed, defineComponent, reactive, ref, toRaw } from 'vue';
+  import { BasicForm, FormActionType, useForm } from '/@/components/Form/index';
+  import { dateUtil } from '/@/utils/dateUtil';
+  import { FIELDS_REPORT_INFO } from '../tableData';
+  import { getDisable } from '/@/utils/project';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
+  import { useDrawerInner } from '/@/components/Drawer';
+
+  import { useOrderInfo } from '/@/hooks/component/order';
+
+  export default defineComponent({
+    components: { BasicForm },
+
+    props: {
+      detailData: {
+        type: Object,
+      },
+      onGoCheckDetail: {
+        type: Function,
+      },
+    },
+    emits: ['success'],
+    setup(_, { emit }) {
+      let fields = reactive({ baseFields: {}, profitAnalysisInfo: {} });
+      const orderStore = useOrderStoreWithOut();
+
+      const { ideaSource, manualPreform } = useOrderInfo(orderStore);
+
+      const schemas = computed(() => {
+        const options = {
+          ideaSource,
+          manualPreform,
+        };
+        return FIELDS_REPORT_INFO.map((item) => ({
+          ...item,
+          componentProps: {
+            ...(item.component === 'Select' && { options: options[item.optionField] }),
+            disabled: getDisable(`fields.${item.field}`),
+          },
+          colProps: {
+            span: 24,
+          },
+        }));
+      });
+
+      const [registerForm, { setFieldsValue, getFieldsValue, reload }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+
+      const [register, { closeDrawer }] = useDrawerInner((data) => {
+        // 方式1
+        data.orderHodTime = data.orderHodTime ? dateUtil(data.orderHodTime) : null;
+        data.productionDepartmentConsignTime = data.productionDepartmentConsignTime
+          ? dateUtil(data.productionDepartmentConsignTime)
+          : null;
+
+        fields.baseFields = {
+          ...fields.baseFields,
+          ...data.lockFields.baseFields,
+        };
+
+        if (id.value) {
+          setFieldsValue({
+            ...toRaw(data),
+            baseInfo: { ...toRaw(data) },
+          });
+        } else {
+          setFieldsValue({});
+        }
+      });
+
+      return { register, schemas, registerForm, getFieldsValue };
+    },
+  });
+</script>
+<!-- 跟单信息 -->
+<template>
+  <BasicForm @register="registerForm" />
+</template>
+<script lang="ts">
+  import { computed, defineComponent, reactive, ref, toRaw } from 'vue';
+  import { BasicForm, FormActionType, useForm } from '/@/components/Form/index';
+  import { useDrawerInner } from '/@/components/Drawer';
+  import { dateUtil } from '/@/utils/dateUtil';
+  import { FIELDS_TRACK_STAGE_INFO } from '../tableData';
+  import { getDisable } from '/@/utils/project';
+
+  export default defineComponent({
+    components: { BasicForm },
+
+    props: {
+      detailData: {
+        type: Object,
+      },
+      onGoCheckDetail: {
+        type: Function,
+      },
+    },
+    emits: ['success'],
+    setup(_, { emit }) {
+      let fields = reactive({ baseFields: {}, profitAnalysisInfo: {} });
+
+      const schemas = computed(() => {
+        return FIELDS_TRACK_STAGE_INFO.map((item) => ({
+          ...item,
+          componentProps: {
+            ...item.componentProps,
+            disabled: getDisable(`fields.${item.field}`),
+          },
+          colProps: {
+            span: 24,
+          },
+        }));
+      });
+
+      const [registerForm, { setFieldsValue, getFieldsValue, reload }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+
+      const [register, { closeDrawer }] = useDrawerInner((data) => {
+        // 方式1
+        data.orderHodTime = data.orderHodTime ? dateUtil(data.orderHodTime) : null;
+        data.productionDepartmentConsignTime = data.productionDepartmentConsignTime
+          ? dateUtil(data.productionDepartmentConsignTime)
+          : null;
+
+        fields.baseFields = {
+          ...fields.baseFields,
+          ...data.lockFields.baseFields,
+        };
+
+        if (id.value) {
+          setFieldsValue({
+            ...toRaw(data),
+            baseInfo: { ...toRaw(data) },
+          });
+        } else {
+          setFieldsValue({});
+        }
+      });
+
+      return { register, schemas, registerForm, getFieldsValue };
+    },
+  });
+</script>
+export const cardList = (() => {
+  const result: any[] = [];
+  for (let i = 0; i < 6; i++) {
+    result.push({
+      id: i,
+      title: 'Vben Admin',
+      description: '基于Vue Next, TypeScript, Ant Design Vue实现的一套完整的企业级后台管理系统',
+      datetime: '2020-11-26 17:39',
+      extra: '编辑',
+      icon: 'logos:vue',
+      color: '#1890ff',
+      author: 'Vben',
+      percent: 20 * (i + 1),
+    });
+  }
+  return result;
+})();
+<template>
+  <div>
+    <BasicTable @register="registerTable" bordered>
+      <template #headerCell="{ column }">
+        <!-- <template v-if="column.key === 'address1'">
+          <span class="flex items-center justify-center"> 自定义字段列11 </span>
+        </template> -->
+        <template v-if="SELECT_FIELD_COLUMNS.includes(column.key)">
+          <span class="flex items-center justify-center">
+            {{ column.customTitle }}
+            <FormOutlined class="ml-2 cursor-pointer" @click="handleFieldVisible(column)" />
+          </span>
+        </template>
+        <template v-else>
+          <HeaderCell :column="column" />
+        </template>
+      </template>
+      <template #headerTop>
+        <a-alert type="info" show-icon>
+          <template #message>
+            <template v-if="checkedKeys.length > 0">
+              <span>已选中{{ checkedKeys.length }}条记录(可跨页)</span>
+              <a-button type="link" @click="checkedKeys = []" size="small">清空</a-button>
+            </template>
+            <template v-else>
+              <span>未选中任何订单</span>
+            </template>
+          </template>
+        </a-alert>
+      </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'action'">
+          <TableAction
+            :actions="[
+              {
+                label: '编辑',
+                // icon: 'ic:outline-delete-outline',
+                onClick: handleEdit.bind(null, record),
+              },
+              {
+                label: '申请权限',
+                // icon: 'ic:outline-delete-outline',
+                onClick: handleCheck.bind(null, record),
+              },
+            ]"
+            :dropDownActions="[
+              // {
+              //   label: '启用',
+              //   popConfirm: {
+              //     title: '是否启用？',
+              //     confirm: handleOpen.bind(null, record),
+              //   },
+              // },
+              {
+                label: '历史记录',
+                onClick: handleHistory.bind(null, record),
+              },
+            ]"
+          />
+        </template>
+        <template v-if="column.key === 'picUrl'">
+          <img
+            :width="100"
+            :height="100"
+            :src="record.picUrl"
+            :key="record.picUrl"
+            @click="handlePreview(record.picUrl)"
+          />
+        </template>
+      </template>
+
+      <template #toolbar>
+        <a-button type="primary" @click="handleExport">导出</a-button>
+        <a-button type="primary" @click="handleProfitModal" :disabled="!checkedKeys.length"
+          >分析利润</a-button
+        >
+        <a-button type="primary" @click="handleAdd">创建订单</a-button>
+      </template>
+    </BasicTable>
+    <FormDetail
+      @register="formDetailRegister"
+      :onGoCheckDetail="handleGoCheckDetail"
+      @success="handleFormSuccess"
+    />
+    <ProfitAnalysis @register="profitModalRegister" />
+    <CheckDetail @register="checkModalRegister" :onGoFormDetail="handleGoFormDetail" />
+    <HistoryDetail @register="historyDetailRegister" />
+    <FieldDetail @register="fieldDetailRegister" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, onMounted, ref, toRaw, toRefs, unref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { FormOutlined } from '@ant-design/icons-vue';
+  import HeaderCell from '/@/components/Table/src/components/HeaderCell.vue';
+  import { Alert } from 'ant-design-vue';
+  import { SELECT_FIELD_COLUMNS } from './selectData';
+
+  import { useDrawer } from '/@/components/Drawer';
+  import ProfitAnalysis from './ProfitAnalysis.vue';
+  import { useModal } from '/@/components/Modal';
+
+  import { getFormConfig, getOrderColumns } from './tableData';
+  import FormDetail from './FormDetail.vue';
+  import CheckDetail from './CheckDetail.vue';
+  import HistoryDetail from './HistoryDetail.vue';
+  import FieldDetail from './FieldDetail.vue';
+  import { createImgPreview } from '/@/components/Preview/index';
+  import { getOrderList, orderExport } from '/@/api/project/order';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
+
+  const orderStore = useOrderStoreWithOut();
+
+  export default defineComponent({
+    components: {
+      HeaderCell,
+      BasicTable,
+      AAlert: Alert,
+      TableAction,
+      FormDetail,
+      ProfitAnalysis,
+      FormOutlined,
+      CheckDetail,
+      HistoryDetail,
+      FieldDetail,
+    },
+    setup() {
+      const checkedKeys = ref<Array<string | number>>([]);
+      const [profitModalRegister, { openModal: openProfitModal }] = useModal();
+      const tooltipVisible = ref(false);
+      const [formDetailRegister, { openDrawer: openFormDetailDrawer }] = useDrawer();
+      const [historyDetailRegister, { openDrawer: openHistoryDetailDrawer }] = useDrawer();
+      const [fieldDetailRegister, { openDrawer: openFieldDetailDrawer }] = useDrawer();
+
+      const [checkModalRegister, { openDrawer: openCheckDetailDrawer }] = useDrawer();
+      onMounted(async () => {
+        await orderStore.getDict();
+      });
+
+      const [registerTable, { getForm, reload }] = useTable({
+        api: getOrderList,
+        title: '订单列表',
+        // api: () => {
+        //   const res = demoListApi();
+        //   total.value = res.data.total;
+        //   return res;
+        // // },
+        // pagination: {
+        //   total: 30,
+        // },
+        pagination: {
+          total: 60,
+        },
+        columns: getOrderColumns(),
+        useSearchForm: true,
+        formConfig: getFormConfig(),
+        showTableSetting: true,
+        // tableSetting: { fullScreen: true },
+        showIndexColumn: false,
+        rowKey: 'id',
+        rowSelection: {
+          type: 'checkbox',
+          selectedRowKeys: checkedKeys,
+          onSelect: onSelect,
+          onSelectAll: onSelectAll,
+        },
+        actionColumn: {
+          width: 160,
+          title: 'Action',
+          dataIndex: 'action',
+          // slots: { customRender: 'action' },
+        },
+      });
+
+      function getFormValues() {
+        console.log(getForm().getFieldsValue());
+      }
+
+      function onSelect(record, selected) {
+        if (selected) {
+          checkedKeys.value = [...checkedKeys.value, record.id];
+        } else {
+          checkedKeys.value = checkedKeys.value.filter((id) => id !== record.id);
+        }
+      }
+      function onSelectAll(selected, selectedRows, changeRows) {
+        const changeIds = changeRows.map((item) => item.id);
+        if (selected) {
+          checkedKeys.value = [...checkedKeys.value, ...changeIds];
+        } else {
+          checkedKeys.value = checkedKeys.value.filter((id) => {
+            return !changeIds.includes(id);
+          });
+        }
+      }
+
+      function handleEdit(record, e) {
+        openFormDetailDrawer(true, { ...toRaw(record) });
+        e?.stopPropagation();
+        return false;
+      }
+
+      function handleAdd() {
+        openFormDetailDrawer(true);
+      }
+
+      function handleCheck(record, e) {
+        openCheckDetailDrawer(true, record);
+        e?.stopPropagation();
+        return false;
+      }
+
+      function handleHistory(record, e) {
+        openHistoryDetailDrawer(true, record);
+        e?.stopPropagation();
+        return false;
+      }
+
+      function handleOpen(record: Recordable) {}
+
+      function handleProfitModal() {
+        openProfitModal(true, {
+          data: checkedKeys.value,
+        });
+      }
+
+      function handleFieldVisible(record) {
+        openFieldDetailDrawer(true, record);
+      }
+
+      function handleGoCheckDetail() {
+        openCheckDetailDrawer(true);
+        openFormDetailDrawer(false);
+      }
+
+      function handleGoFormDetail() {
+        openCheckDetailDrawer(false);
+        openFormDetailDrawer(true);
+      }
+
+      function handlePreview(url, e) {
+        createImgPreview({ imageList: [url], defaultWidth: 500 });
+        // e?.stopPropagation();
+        // e?.preventDefault();
+        return false;
+      }
+
+      async function handleExport() {
+        await orderExport();
+      }
+
+      const handleFormSuccess = () => {
+        reload();
+      };
+
+      return {
+        fieldDetailRegister,
+        profitModalRegister,
+        historyDetailRegister,
+        formDetailRegister,
+        handleProfitModal,
+        registerTable,
+        getFormValues,
+        checkedKeys,
+        onSelect,
+        handleEdit,
+        handleCheck,
+        handleOpen,
+        onSelectAll,
+        tooltipVisible,
+        handleFieldVisible,
+        checkModalRegister,
+        handleGoCheckDetail,
+        handleGoFormDetail,
+        handleHistory,
+        handleAdd,
+        SELECT_FIELD_COLUMNS,
+        createImgPreview,
+        handleExport,
+        handlePreview,
+        handleFormSuccess,
+      };
+    },
+  });
+</script>
+
+<style>
+  .ant-table-thead th,
+  .ant-table-tbody td {
+    padding: 0;
+    white-space: pre-wrap;
+  }
+
+  .ant-table-cell img {
+    width: 100px;
+    height: 100px;
+  }
+</style>
+export const SELECT_FIELD_COLUMNS = [
+  'projectNo',
+  'customerCode',
+  'innerNo',
+  'poColor',
+  'cnColor',
+  'productStyle',
+  'outboundType',
+  'packetType',
+  'midCheckResult',
+  'endCheckResult',
+];
+import { useOrderInfo } from '/@/hooks/component/order';
+import { useOrderStoreWithOut } from '/@/store/modules/order';
+
+export function getOrderColumns() {
+  return [
+    {
+      title: '客户编码',
+      width: 150,
+      dataIndex: 'customerCode',
+    },
+    {
+      title: '项目号',
+      width: 150,
+      dataIndex: 'projectNo',
+    },
+    {
+      title: '生产科',
+      width: 150,
+      dataIndex: 'productionDepartment',
+    },
+    {
+      title: '内部编号',
+      width: 150,
+      dataIndex: 'innerNo',
+    },
+    {
+      title: '客户po号',
+      width: 150,
+      dataIndex: 'customerPo',
+    },
+
+    {
+      title: '客户STYLE',
+      width: 150,
+      dataIndex: 'customerStyle',
+    },
+
+    {
+      title: 'Modelo(REFERENCE)',
+      width: 150,
+      dataIndex: 'modeleLo',
+    },
+
+    {
+      title: 'COLLECTION (style description)',
+      width: 150,
+      dataIndex: 'collection',
+    },
+
+    {
+      title: 'PO COLOR',
+      width: 150,
+      dataIndex: 'poColor',
+    },
+    {
+      title: '颜色中文',
+      width: 150,
+      dataIndex: 'cnColor',
+    },
+
+    {
+      title: '图片',
+      width: 150,
+      dataIndex: 'picUrl',
+    },
+    {
+      title: '生产要求',
+      width: 150,
+      dataIndex: 'productionComment',
+    },
+    {
+      title: '数量',
+      width: 150,
+      dataIndex: 'orderCount',
+    },
+    {
+      title: '订单成分',
+      width: 150,
+      dataIndex: 'orderComposition',
+    },
+    {
+      title: '款式类型',
+      width: 150,
+      dataIndex: 'productStyle',
+    },
+    {
+      title: '生成科拖货时间',
+      width: 150,
+      dataIndex: 'productionDepartmentConsignTime',
+    },
+    {
+      title: '订单上HOD时间',
+      width: 150,
+      dataIndex: 'orderHodTime',
+    },
+
+    {
+      title: '出库类型',
+      width: 150,
+      dataIndex: 'outboundType',
+    },
+    {
+      title: '包装类型',
+      width: 150,
+      dataIndex: 'packetType',
+    },
+    // {
+    //   title: 'id',
+    //   width: 150,
+    //   dataIndex: 'id',
+    // },
+    {
+      title: '项目完成报告信息',
+      width: 150,
+      children: [
+        {
+          title: '想法来源',
+          width: 150,
+          dataIndex: 'ideaSource',
+        },
+        {
+          title: '手工初型',
+          width: 150,
+          dataIndex: 'manualPreform',
+        },
+        {
+          title: '想法和手工比例分配',
+          width: 150,
+          dataIndex: 'ideaManualRate',
+        },
+      ],
+    },
+    {
+      title: '利润分析信息',
+      width: 150,
+      dataIndex: 'profitAnalysisInfo',
+      children: [
+        {
+          title: '客户单价',
+          width: 150,
+          dataIndex: 'profitAnalysisInfo.customerPrice',
+          customRender: (column) => {
+            const { record } = column || {};
+            return record?.profitAnalysisInfo?.customerPrice;
+          },
+        },
+        {
+          title: '客户总价',
+          width: 150,
+          dataIndex: 'profitAnalysisInfo.customerTotalPrice',
+          customRender: (column) => {
+            const { record } = column || {};
+            return record?.profitAnalysisInfo?.customerTotalPrice;
+          },
+        },
+        {
+          title: '生成科单价',
+          width: 150,
+          dataIndex: 'profitAnalysisInfo.productionDepartmentPrice',
+          customRender: (column) => {
+            const { record } = column || {};
+            return record?.profitAnalysisInfo?.productionDepartmentPrice;
+          },
+        },
+        {
+          title: '包装费用',
+          width: 150,
+          dataIndex: 'profitAnalysisInfo.packetPrice',
+          customRender: (column) => {
+            const { record } = column || {};
+            return record?.profitAnalysisInfo?.packetPrice;
+          },
+        },
+        {
+          title: '包装费用合计',
+          width: 150,
+          dataIndex: 'profitAnalysisInfo.packetTotalPrice',
+          customRender: (column) => {
+            const { record } = column || {};
+            return record?.profitAnalysisInfo?.packetTotalPrice;
+          },
+        },
+        {
+          title: '汇率',
+          width: 150,
+          dataIndex: 'profitAnalysisInfo.exchangeRate',
+          customRender: (column) => {
+            const { record } = column || {};
+            return record?.profitAnalysisInfo?.exchangeRate;
+          },
+        },
+        {
+          title: '利润率',
+          width: 150,
+          dataIndex: 'profitAnalysisInfo.profitRate',
+          customRender: (column) => {
+            const { record } = column || {};
+            return record?.profitAnalysisInfo?.profitRate;
+          },
+        },
+      ],
+    },
+    {
+      title: '跟单信息',
+      width: 150,
+      dataIndex: 'trackStageInfo',
+      children: [
+        {
+          title: 'pp date',
+          width: 150,
+          dataIndex: 'ppTime',
+        },
+        {
+          title: 'pp样品确认意见',
+          width: 150,
+          dataIndex: 'ppConfirmResult',
+        },
+        {
+          title: 'EXTRA,SHOWROOM,ONLINE sample发送时间',
+          width: 250,
+          dataIndex: 'esoSampleSendTime',
+        },
+        {
+          title: 'shippment sample 发送时间',
+          width: 150,
+          dataIndex: 'shippmentSampleSendTime',
+        },
+        {
+          title: 'shipment sample确认意见',
+          width: 150,
+          dataIndex: 'shippmentSampleConfirmResult',
+        },
+        {
+          title: '自测通过时间',
+          width: 150,
+          dataIndex: 'selfTestPassTime',
+        },
+        {
+          title: 'Aitex测试发送时间',
+          width: 150,
+          dataIndex: 'aitexTestSendTime',
+        },
+        {
+          title: 'Aitex测试结果',
+          width: 150,
+          dataIndex: 'aitexTestFinishResult',
+        },
+        {
+          title: 'SGS测试发送时间',
+          width: 150,
+          dataIndex: 'sgsTestSendTime',
+        },
+        {
+          title: 'SGS测试结果',
+          width: 150,
+          dataIndex: 'sgsTestFinishResult',
+        },
+
+        {
+          title: 'Barcode sticker arrival time',
+          width: 150,
+          dataIndex: 'barcodeStickerArrivalTime',
+        },
+        {
+          title: '最晚包材到货时间',
+          width: 150,
+          dataIndex: 'latestArrivalTime',
+        },
+        {
+          title: '最晚订舱+报关资料时间',
+          width: 150,
+          dataIndex: 'latestBkTime',
+        },
+      ],
+    },
+    {
+      title: '质检信息',
+      width: 150,
+      dataIndex: 'inspectionStageInfo',
+      children: [
+        {
+          title: '中期验货申请时间',
+          width: 150,
+          dataIndex: 'endCheckApplyTime',
+        },
+        {
+          title: '中期验货（功能性-拉力/跌落等、外观性-颜色/规格等、耐久性-烤厅等）',
+          width: 300,
+          dataIndex: 'midCheckComment',
+        },
+        {
+          title: '中期验货结果PASS / FAIL',
+          width: 150,
+          dataIndex: 'midCheckResult',
+        },
+        {
+          title: '尾期验货申请时间',
+          width: 150,
+          dataIndex: 'endCheckApplyTime',
+        },
+
+        {
+          title: 'midCheckApplyTime',
+          width: 150,
+          dataIndex: 'midCheckApplyTime',
+        },
+        {
+          title: '长度/规格',
+          width: 150,
+          dataIndex: 'specification',
+        },
+        {
+          title: '功能性不良',
+          width: 150,
+          dataIndex: 'functionality',
+        },
+        {
+          title: '电镀不良',
+          width: 150,
+          dataIndex: 'electroplate',
+        },
+        {
+          title: '不良1',
+          width: 150,
+          dataIndex: 'value1',
+        },
+
+        {
+          title: '不良2',
+          width: 150,
+          dataIndex: 'value2',
+        },
+        {
+          title: '其他不良3',
+          width: 150,
+          dataIndex: 'value3',
+        },
+        {
+          title: '包装：卡片、条码、箱贴，箱单	',
+          width: 150,
+          dataIndex: 'boxPacket',
+        },
+        {
+          title: '尾期验货结果PASS / FAIL',
+          width: 150,
+          dataIndex: 'endCheckResult',
+        },
+      ],
+    },
+  ];
+}
+// 基本信息
+export const FIELDS_BASE_INFO = [
+  {
+    field: 'customerCode',
+    component: 'Select',
+    label: '客户编码',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'projectNo',
+    component: 'Select',
+    label: '项目号',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'productionDepartment',
+    component: 'Select',
+    label: '生产科',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'innerNo',
+    component: 'Select',
+    label: '内部编号',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'customerPo',
+    component: 'Input',
+    label: '客户po号',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'customerStyle',
+    component: 'Input',
+    label: '客户STYLE',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'collection',
+    component: 'Input',
+    label: 'COLLECTION (style description)',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'poColor',
+    component: 'Select',
+    label: 'PO COLOR',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'cnColor',
+    component: 'Select',
+    label: '颜色中文',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'picUrl',
+    component: 'FieldUpload',
+    label: '图片',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'productionComment',
+    component: 'Input',
+    rules: [{ required: true }],
+    label: '生产要求',
+  },
+  {
+    field: 'orderCount',
+    component: 'InputNumber',
+    rules: [{ required: true }],
+    label: '数量',
+  },
+  {
+    field: 'orderComposition',
+    component: 'Input',
+    rules: [{ required: true }],
+    label: '订单成分',
+  },
+  {
+    field: 'productStyle',
+    component: 'Select',
+    rules: [{ required: true }],
+    label: '款式类型',
+  },
+  {
+    field: 'productionDepartmentConsignTime',
+    component: 'DatePicker',
+    label: '生成科拖货时间',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'orderHodTime',
+    component: 'DatePicker',
+    label: '订单上HOD时间',
+
+    rules: [{ required: true }],
+  },
+  {
+    field: 'outboundType',
+    component: 'Select',
+    label: '出库类型',
+
+    rules: [{ required: true }],
+  },
+  {
+    field: 'packetType',
+    component: 'Select',
+    label: '包装类型',
+    rules: [{ required: true }],
+  },
+];
+
+//项目完成报告信息
+export const FIELDS_REPORT_INFO = [
+  {
+    field: 'reportInfo.ideaSource',
+    component: 'Select',
+    optionField: 'ideaSource',
+    label: '想法来源',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'reportInfo.manualPreform',
+    component: 'Select',
+    optionField: 'manualPreform',
+    label: '手工初型',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'reportInfo.ideaManualRate',
+    component: 'Input',
+    label: '想法和手工比例分配',
+    rules: [{ required: true }],
+  },
+];
+
+// 跟单信息
+export const FIELDS_TRACK_STAGE_INFO = [
+  {
+    field: 'ppTime',
+    component: 'DatePicker',
+    label: 'pp date',
+  },
+  {
+    field: 'ppConfirmResult',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: 'ok',
+          value: 'ok',
+        },
+      ],
+    },
+    label: 'pp样品确认意见	',
+  },
+  {
+    field: 'esoSampleSendTime',
+    component: 'DatePicker',
+    label: 'EXTRA,SHOWROOM,ONLINE sample发送时间',
+  },
+  {
+    field: 'shippmentSampleSendTime',
+    component: 'DatePicker',
+    label: 'shippment sample 发送时间',
+  },
+  {
+    field: 'shippmentSampleConfirmResult',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: 'ok',
+          value: 'ok',
+        },
+      ],
+    },
+    label: 'shipment sample确认意见',
+  },
+  {
+    field: 'selfTestPassTime',
+    component: 'DatePicker',
+    label: '自测通过时间',
+  },
+  {
+    field: 'aitexTestSendTime',
+    component: 'DatePicker',
+    label: 'Aitex测试发送时间',
+  },
+  {
+    field: 'aitexTestFinishResult',
+    component: 'Select',
+    label: 'Aitex测试结果',
+    componentProps: {
+      options: [
+        {
+          label: 'ok',
+          value: 'ok',
+        },
+      ],
+    },
+  },
+  {
+    field: 'sgsTestSendTime',
+    component: 'DatePicker',
+    label: 'SGS测试发送时间',
+  },
+  {
+    field: 'sgsTestFinishResult',
+    component: 'Select',
+    label: 'SGS测试结果',
+    componentProps: {
+      options: [
+        {
+          label: 'ok',
+          value: 'ok',
+        },
+      ],
+    },
+  },
+  {
+    field: 'barcodeStickerArrivalTime',
+    component: 'DatePicker',
+    label: 'Barcode sticker arrival time',
+    componentProps: {
+      options: [
+        {
+          label: 'ok',
+          value: 'ok',
+        },
+      ],
+    },
+  },
+  {
+    field: 'latestArrivalTime',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: 'ok',
+          value: 'ok',
+        },
+      ],
+    },
+    label: '最晚包材到货时间',
+  },
+  {
+    field: 'latestBkTime',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: 'ok',
+          value: 'ok',
+        },
+      ],
+    },
+    label: '最晚订舱+报关资料时间',
+  },
+];
+
+// 利润分析
+export const FIELDS_PROFIT_INFO = [
+  {
+    field: 'profitAnalysisInfo.customerPrice',
+    component: 'InputNumber',
+    label: '客户单价',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'profitAnalysisInfo.customerCurrency',
+    component: 'Select',
+    label: '客户单价单位',
+    rules: [{ required: true }],
+    componentProps: {
+      options: [
+        { label: '$', value: '$' },
+        { label: '￥', value: '￥' },
+      ],
+    },
+  },
+  {
+    field: 'profitAnalysisInfo.customerTotalPrice',
+    component: 'InputNumber',
+    label: '客户总价',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'profitAnalysisInfo.customerTotalCurrency',
+    component: 'Select',
+    label: '客户总价单位',
+    rules: [{ required: true }],
+    componentProps: {
+      options: [
+        { label: '$', value: '$' },
+        { label: '￥', value: '￥' },
+      ],
+    },
+  },
+  {
+    field: 'profitAnalysisInfo.productionDepartmentPrice',
+    component: 'InputNumber',
+    label: '生成科单价￥',
+    rules: [{ required: true }],
+  },
+  // {
+  //   field: 'productionDepartmentPrice',
+  //   component: 'InputNumber',
+  //   label: '生成科总价￥',
+  //   rules: [{ required: true }],
+  // },
+  // {
+  //   label: '包装费用$',
+  //   component: 'InputNumber',
+  //   field: 'packetPrice',
+  //   rules: [{ required: true }],
+  // },
+  {
+    label: '包装费用合计$',
+    component: 'InputNumber',
+    field: 'profitAnalysisInfo.packetTotalPrice',
+    rules: [{ required: true }],
+  },
+  {
+    label: '包装费用合计单位',
+    component: 'Select',
+    field: 'profitAnalysisInfo.packetCurrency',
+    rules: [{ required: true }],
+    componentProps: {
+      options: [
+        { label: '$', value: '$' },
+        { label: '￥', value: '￥' },
+      ],
+    },
+  },
+  {
+    label: '汇率',
+    component: 'InputNumber',
+    field: 'profitAnalysisInfo.exchangeRate',
+    rules: [{ required: true }],
+  },
+  // {
+  //   label: '利润率',
+  //   component: 'Input',
+  //   field: 'profitRate',
+  //   rules: [{ required: true }],
+  // },
+];
+
+//质量检测信息
+export const FIELDS_INSPECTION_INFO = [
+  {
+    field: 'inspectionStageInfo.midCheckApplyTime',
+    component: 'DatePicker',
+    label: '中期验货申请时间',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'inspectionStageInfo.midCheckComment',
+    component: 'Input',
+    label: '中期验货（功能性-拉力/跌落等、外观性-颜色/规格等、耐久性-烤厅等）',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'inspectionStageInfo.midCheckResult',
+    component: 'Select',
+    optionField: 'midCheckResult',
+
+    label: '中期验货结果PASS / FAIL',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'inspectionStageInfo.specification',
+    component: 'Input',
+    label: '长度/规格',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'inspectionStageInfo.functionality',
+    component: 'Input',
+    label: '功能性不良',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'inspectionStageInfo.electroplate',
+    component: 'Input',
+    label: '电镀不良',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'inspectionStageInfo.value1',
+    component: 'Input',
+    label: '不良1',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'inspectionStageInfo.value2',
+    component: 'Input',
+    label: '不良2',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'inspectionStageInfo.value3',
+    component: 'Input',
+    label: '其他不良3',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'inspectionStageInfo.boxPacket',
+    component: 'Input',
+    label: '包装：卡片、条码、箱贴，箱单',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'inspectionStageInfo.endCheckResult',
+    component: 'Select',
+    label: '尾期验货结果PASS / FAIL',
+    optionField: 'endCheckResult',
+    rules: [{ required: true }],
+  },
+];
+
+export function getFormConfig(): Partial<FormProps> {
+  const orderStore = useOrderStoreWithOut();
+
+  const {
+    customerCode,
+    projectNo,
+    productionDepartment,
+    innerNo,
+    poColor,
+    cnColor,
+    productStyle,
+    outboundType,
+    packetType,
+  } = useOrderInfo(orderStore);
+
+  return {
+    labelWidth: 100,
+    schemas: [
+      {
+        field: `customerCode`,
+        label: `客户编码`,
+        component: 'Select',
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+        componentProps: {
+          options: customerCode,
+        },
+      },
+    ],
+  };
+}
@@ -8,11 +8,12 @@
     v-show="getShow"
     @keypress.enter="handleLogin"
   >
-    <FormItem name="account" class="enter-x">
+    <FormItem name="userName" class="enter-x">
       <Input
         size="large"
-        v-model:value="formData.account"
-        :placeholder="t('sys.login.userName')"
+        visibilityToggle
+        v-model:value="formData.userName"
+        placeholder="手机号"
         class="fix-auto-fill"
       />
     </FormItem>
@@ -24,6 +25,17 @@
         :placeholder="t('sys.login.password')"
       />
     </FormItem>
+    <FormItem name="imgCaptchaCode" class="enter-x">
+      <Input
+        size="large"
+        visibilityToggle
+        v-model:value="formData.imgCaptchaCode"
+        placeholder="请输入验证码"
+      />
+    </FormItem>
+    <FormItem name="imgCaptchaCode" class="enter-x" label="验证码">
+      <img :src="imgCaptcha" class="cursor-pointer" @click="getImgCaptcha" />
+    </FormItem>
  
     <ARow class="enter-x">
       <ACol :span="12">
@@ -53,23 +65,23 @@
       </Button> -->
     </FormItem>
     <ARow class="enter-x">
-      <ACol :md="8" :xs="24">
+      <!-- <ACol :md="8" :xs="24">
         <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
           {{ t('sys.login.mobileSignInFormTitle') }}
         </Button>
-      </ACol>
-      <ACol :md="8" :xs="24" class="!my-2 !md:my-0 xs:mx-0 md:mx-2">
+      </ACol> -->
+      <!-- <ACol :md="8" :xs="24" class="!my-2 !md:my-0 xs:mx-0 md:mx-2">
         <Button block @click="setLoginState(LoginStateEnum.QR_CODE)">
           {{ t('sys.login.qrSignInFormTitle') }}
         </Button>
-      </ACol>
-      <ACol :md="6" :xs="24">
+      </ACol> -->
+      <!-- <ACol :md="6" :xs="24">
         <Button block @click="setLoginState(LoginStateEnum.REGISTER)">
           {{ t('sys.login.registerButton') }}
         </Button>
-      </ACol>
+      </ACol> -->
     </ARow>
-
+    <!-- 
     <Divider class="enter-x">{{ t('sys.login.otherSignIn') }}</Divider>
  
     <div class="flex justify-evenly enter-x" :class="`${prefixCls}-sign-in-way`">
@@ -78,11 +90,11 @@
       <AlipayCircleFilled />
       <GoogleCircleFilled />
       <TwitterCircleFilled />
-    </div>
+    </div> -->
   </Form>
 </template>
 <script lang="ts" setup>
-  import { reactive, ref, unref, computed } from 'vue';
+  import { reactive, ref, unref, computed, onMounted } from 'vue';
  
   import { Checkbox, Form, Input, Row, Col, Button, Divider } from 'ant-design-vue';
   import {
@@ -117,14 +129,29 @@
   const formRef = ref();
   const loading = ref(false);
   const rememberMe = ref(false);
+  const imgCaptcha = ref('');
+  const imgCaptchaUuid = ref('');
  
   const formData = reactive({
-    account: 'vben',
+    userName: 'admin',
     password: '123456',
+    imgCaptchaCode: '',
+    imgCaptchaUuid: '',
   });
  
   const { validForm } = useFormValid(formRef);
  
+  onMounted(async () => {
+    getImgCaptcha();
+  });
+
+  const getImgCaptcha = async () => {
+    const data = await userStore.getImageCaptcha();
+    console.log('%c [ data ]-151', 'font-size:13px; background:pink; color:#bf2c9f;', data);
+    imgCaptcha.value = data?.img;
+    imgCaptchaUuid.value = data?.uuid;
+  };
+
   //onKeyStroke('Enter', handleLogin);
  
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN);
@@ -136,7 +163,9 @@
       loading.value = true;
       const userInfo = await userStore.login({
         password: data.password,
-        username: data.account,
+        userName: data.userName,
+        imgCaptchaCode: data.imgCaptchaCode,
+        imgCaptchaUuid: imgCaptchaUuid.value,
         mode: 'none', //不要默认的错误提示
       });
       if (userInfo) {
@@ -2,14 +2,14 @@
   <div v-if="getShow">
     <LoginFormTitle class="enter-x" />
     <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
-      <FormItem name="account" class="enter-x">
+      <!-- <FormItem name="account" class="enter-x">
         <Input
           class="fix-auto-fill"
           size="large"
           v-model:value="formData.account"
           :placeholder="t('sys.login.userName')"
         />
-      </FormItem>
+      </FormItem> -->
       <FormItem name="mobile" class="enter-x">
         <Input
           size="large"
@@ -84,7 +84,7 @@ export function useFormRules(formData?: Recordable) {
       // register form rules
       case LoginStateEnum.REGISTER:
         return {
-          account: accountFormRule,
+          userName: accountFormRule,
           password: passwordFormRule,
           confirmPassword: [
             { validator: validateConfirmPassword(formData?.password), trigger: 'change' },
@@ -96,7 +96,7 @@ export function useFormRules(formData?: Recordable) {
       // reset password form rules
       case LoginStateEnum.RESET_PASSWORD:
         return {
-          account: accountFormRule,
+          userName: accountFormRule,
           ...mobileRule,
         };
  
@@ -107,7 +107,7 @@ export function useFormRules(formData?: Recordable) {
       // login form rules
       default:
         return {
-          account: accountFormRule,
+          userName: accountFormRule,
           password: passwordFormRule,
         };
     }
@@ -36,10 +36,10 @@ export interface RetryRequest {
   waitTime: number;
 }
 export interface Result<T = any> {
-  code: number;
+  result: number;
   type: 'success' | 'error' | 'warning';
   message: string;
-  result: T;
+  data: T;
 }
  
 // multipart/form-data: upload file
@@ -2,6 +2,9 @@ import { defineApplicationConfig } from &#39;@vben/vite-config&#39;;
  
 export default defineApplicationConfig({
   overrides: {
+    // build: {
+    //   sourcemap: 'inline',
+    // },
     optimizeDeps: {
       include: [
         'echarts/core',
@@ -16,11 +19,22 @@ export default defineApplicationConfig({
     },
     server: {
       proxy: {
-        '/basic-api': {
-          target: 'http://localhost:3000',
+        '/basic-api/order': {
+          target: 'http://39.108.227.113:8010',
+          // target: 'http://39.108.227.113:3000/mock/35',
+          // http://39.108.227.113:8010/order/erp/captcha/get_img_captcha_code
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''),
+        },
+        '/api/localStorage/upload': {
+          target: 'http://39.108.227.113:8010',
+          changeOrigin: true,
+          ws: true,
+          // rewrite: (path) => {
+          //   console.log('%c [ path ]-32', 'font-size:13px; background:pink; color:#bf2c9f;', path);
+          //   return path.replace(new RegExp(`^/basic-api`), '');
+          // },
           // only https
           // secure: false
         },