feat: 开发完成

sanmu
1 parent 20bd399f
Showing 45 changed files with 1652 additions and 364 deletions
src/api/demo/table.ts
src/api/project/order.ts
src/api/sys/config.ts
src/api/sys/user.ts
src/enums/pageEnum.ts
src/enums/roleEnum.ts
src/hooks/component/order.ts
src/layouts/default/header/components/user-dropdown/index.vue
src/layouts/default/header/index.less
src/layouts/default/header/index.vue
src/router/routes/modules/project/system.ts
src/store/modules/order.ts
src/store/modules/permission.ts
src/utils/dateUtil.ts
src/utils/project.ts
src/views/demo/system/password/index.vue
src/views/demo/system/password/pwd.data.ts
src/views/project/account/index.vue
src/views/project/approve/FieldPanel.vue
src/views/project/approve/MsgModal.vue
 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/constant';
 enum Api {
   DEMO_LIST = '/table/getDemoList',
@@ -39,8 +37,8 @@ export const demoApproveListApi = async (params: DemoParams) =&gt; {
     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);
+        // const obj = find(FIELDS_BASE_INFO, { field: key });
+        // item.fields.push(obj?.label);
       }
     });
     item.fields = item.fields.join(',');
@@ -3,6 +3,7 @@ import { defHttp } from &#39;/@/utils/http/axios&#39;;
 import { useUserStoreWithOut } from '/@/store/modules/user';
 import { useOrderStoreWithOut } from '/@/store/modules/order';
 import { formatToDate } from '/@/utils/dateUtil';
+import message from '/@/views/form-design/utils/message';
 enum Api {
   ORDER_CREATE = '/order/erp/order/add',
@@ -19,11 +20,37 @@ enum Api {
   DICT_LIST = '/order/erp/dictionary/list_by_page',
   ANALYSIS = '/order/erp/profit/analysis',
+  GRAVITY = '/order/erp/report/analysis',
   OPT_LOG = '/order/erp/opt/log/list_by_page', // 操作日志
   AUDIT_LOG = '/order/erp/audit/log/list_by_page', //审批日志
 }
+export const formatSearchData = (params) => {
+  params.createStartTime = params.createStartTime
+    ? formatToDate(params.createStartTime)
+    : undefined;
+  params.productionDepartmentConsignStartTime = params.productionDepartmentConsignStartTime
+    ? formatToDate(params.productionDepartmentConsignStartTime)
+    : undefined;
+  params.productionDepartmentConsignEndTime = params.productionDepartmentConsignEndTime
+    ? formatToDate(params.productionDepartmentConsignEndTime)
+    : undefined;
+  params.orderHodStartTime = params.orderHodStartTime
+    ? formatToDate(params.orderHodStartTime)
+    : undefined;
+  params.orderHodEndTime = params.orderHodEndTime
+    ? formatToDate(params.orderHodEndTime)
+    : undefined;
+  params.selfTestPassStartTime = params.selfTestPassStartTime
+    ? formatToDate(params.selfTestPassStartTime)
+    : undefined;
+  params.selfTestPassEndTime = params.selfTestPassEndTime
+    ? formatToDate(params.selfTestPassEndTime)
+    : undefined;
+  return params;
+};
+
 export const orderCreate = async (data: any) => {
   const res = await defHttp.post<any>({ url: Api.ORDER_CREATE, data }, { message: '保存成功' });
   return res;
@@ -50,6 +77,13 @@ export const orderAnalysis = async (data: any) =&gt; {
   return res;
 };
+export const orderGravity = async (data: any) => {
+  data = formatSearchData(data);
+
+  const res = await defHttp.post<any>({ url: Api.GRAVITY, data });
+  return res;
+};
+
 export const orderExport = async (data: any = {}) => {
   // const res = await defHttp.post<any>({ url: Api.EXPORT, data });
   const userStore = useUserStoreWithOut();
@@ -60,7 +94,7 @@ export const orderExport = async (data: any = {}) =&gt; {
     url: '/basic-api' + Api.EXPORT,
     method: 'post',
     responseType: 'blob',
-    headers: { Authorization: `Bearer ${token}` },
+    headers: { Authorization: `${token}` },
     data,
   })
     .then((response) => {
@@ -74,6 +108,8 @@ export const orderExport = async (data: any = {}) =&gt; {
       a.click(); // 模拟点击操作来下载文件
       URL.revokeObjectURL(downloadUrl); // 释放掉 blob 对象所占用的内存
       document.body.removeChild(a);
+
+      message.success('导出成功');
     })
     .catch((error) => {
       // 处理错误
@@ -104,28 +140,7 @@ export async function uploadImg(params, onUploadProgress: (progressEvent: Progre
 }
 export const getOrderList = async (params: DemoParams) => {
-  params.createStartTime = params.createStartTime
-    ? formatToDate(params.createStartTime)
-    : undefined;
-  params.productionDepartmentConsignStartTime = params.productionDepartmentConsignStartTime
-    ? formatToDate(params.productionDepartmentConsignStartTime)
-    : undefined;
-  params.productionDepartmentConsignEndTime = params.productionDepartmentConsignEndTime
-    ? formatToDate(params.productionDepartmentConsignEndTime)
-    : undefined;
-  params.orderHodStartTime = params.orderHodStartTime
-    ? formatToDate(params.orderHodStartTime)
-    : undefined;
-  params.orderHodEndTime = params.orderHodEndTime
-    ? formatToDate(params.orderHodEndTime)
-    : undefined;
-  params.selfTestPassStartTime = params.selfTestPassStartTime
-    ? formatToDate(params.selfTestPassStartTime)
-    : undefined;
-  params.selfTestPassEndTime = params.selfTestPassEndTime
-    ? formatToDate(params.selfTestPassEndTime)
-    : undefined;
-
+  params = formatSearchData(params);
   const res = await defHttp.post<DemoListGetResultModel>({
     url: Api.ORDER,
     params,
+import { defHttp } from '/@/utils/http/axios';
+import { LoginParams, LoginResultModel } from './model/userModel';
+
+import { ErrorMessageMode } from '/#/axios';
+
+enum Api {
+  // Login = '/login',
+  LIST = '/order/erp/system_setting/query_list',
+  EDIT = '/order/erp/system_setting/edit',
+  ADD = '/order/erp/system_setting/add',
+  DELETE = '/order/erp/system_setting/delete_by_id',
+}
+
+export function getList(params: LoginParams, mode: ErrorMessageMode = 'modal') {
+  return defHttp.post<LoginResultModel>(
+    {
+      url: Api.LIST,
+      params,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+export function saveConfig(params: LoginParams) {
+  return defHttp.post<LoginResultModel>(
+    {
+      url: Api.EDIT,
+      params,
+    },
+    {
+      message: '保存成功',
+    },
+  );
+}
+
+export function addConfig(params: LoginParams) {
+  return defHttp.post<LoginResultModel>(
+    {
+      url: Api.ADD,
+      params,
+    },
+    {
+      message: '新建成功',
+    },
+  );
+}
+
+export function deleteConfig(params: LoginParams) {
+  return defHttp.post<LoginResultModel>(
+    {
+      url: Api.DELETE,
+      params,
+    },
+    {
+      message: '删除成功',
+    },
+  );
+}
@@ -10,6 +10,11 @@ enum Api {
   GetUserInfo = '/getUserInfo',
   GetPermCode = '/getPermCode',
   TestRetry = '/testRetry',
+  MODIFY_PASSWORD = '/order/erp/users/update_pass',
+  FORGET_PASSWORD = '/order/erp/auth/password_modify',
+  RESET = '/order/erp/users/reset',
+  CAPTCHA = '/order/erp/captcha/get_img_captcha_code',
+  SMS = '/order/erp/captcha/send_captcha_code',
 }
 /**
@@ -27,6 +32,19 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = &#39;modal&#39;) 
   );
 }
+export function MODIFY_PASSWORD(params: LoginParams, mode: ErrorMessageMode = 'modal') {
+  return defHttp.post<LoginResultModel>(
+    {
+      url: Api.MODIFY_PASSWORD,
+      params,
+    },
+    {
+      errorMessageMode: mode,
+      message: '修改成功',
+    },
+  );
+}
+
 /**
  * @description: getUserInfo
  */
@@ -56,5 +74,18 @@ export function testRetry() {
 }
 export function getImageCaptcha() {
-  return defHttp.post({ url: '/order/erp/captcha/get_img_captcha_code' });
+  return defHttp.post({ url: Api.CAPTCHA });
+}
+
+export function forgetPassword(params) {
+  return defHttp.post(
+    { url: Api.FORGET_PASSWORD, params },
+    {
+      message: '修改成功',
+    },
+  );
+}
+
+export function getSms(params) {
+  return defHttp.post({ url: Api.SMS, params });
 }
@@ -2,7 +2,7 @@ export enum PageEnum {
   // basic login path
   BASE_LOGIN = '/login',
   // basic home path
-  BASE_HOME = '/',
+  BASE_HOME = '/home',
   // error page path
   ERROR_PAGE = '/exception',
   // error log page path
 export enum RoleEnum {
   // super admin
   SUPER = 'super',
-
+  ADMIN = 'admin',
   // tester
   TEST = 'test',
 }
@@ -9,6 +9,11 @@ export function useOrderInfo(orderStore) {
     value: item.dictValue,
   });
+  const exchangeRate = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.exchangeRate, transformDictInfo);
+  });
+
   const customerCode = computed(() => {
     const dictInfo = orderStore.getDictInfo;
@@ -75,7 +80,11 @@ export function useOrderInfo(orderStore) {
     return map(dictInfo?.midCheckResult, transformDictInfo);
   });
-  console.log('%c [  ]-78', 'font-size:13px; background:pink; color:#bf2c9f;', endCheckResult);
+  const businessPerson = computed(() => {
+    const dictInfo = orderStore.getDictInfo;
+    return map(dictInfo?.businessPerson, transformDictInfo);
+  });
+
   return {
     customerCode,
     projectNo,
@@ -90,5 +99,7 @@ export function useOrderInfo(orderStore) {
     manualPreform,
     midCheckResult,
     endCheckResult,
+    exchangeRate,
+    businessPerson,
   };
 }
 <template>
   <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`">
     <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex">
-      <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" />
+      <!-- <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" /> -->
       <span :class="`${prefixCls}__info hidden md:block`">
         <span :class="`${prefixCls}__name  `" class="truncate">
-          {{ getUserInfo.realName }}
+          {{ getUserInfo.nickName }}
         </span>
       </span>
     </span>
@@ -76,8 +76,13 @@
       const userStore = useUserStore();
       const getUserInfo = computed(() => {
-        const { realName = '', avatar, desc } = userStore.getUserInfo || {};
-        return { realName, avatar: avatar || headerImg, desc };
+        const { nickName = '', avatar, desc } = userStore.getUserInfo || {};
+        console.log(
+          '%c [  userStore.getUserInfo  ]-80',
+          'font-size:13px; background:pink; color:#bf2c9f;',
+          userStore.getUserInfo,
+        );
+        return { nickName, avatar: avatar || headerImg, desc };
       });
       const [register, { openModal }] = useModal();
@@ -104,7 +104,7 @@
     display: flex;
     // padding-right: 12px;
     align-items: center;
-    min-width: 180px;
+    min-width: 120px;
     &__item {
       display: flex !important;
@@ -49,7 +49,6 @@
       /> -->
       <UserDropDown :theme="getHeaderTheme" />
-      <span className="text-gray-900">{{ nickName }}</span>
       <!-- <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" /> -->
     </div>
   </Header>
@@ -2,6 +2,7 @@ import type { AppRouteModule } from &#39;/@/router/types&#39;;
 import { LAYOUT } from '/@/router/constant';
 import { t } from '/@/hooks/web/useI18n';
+import { RoleEnum } from '/@/enums/roleEnum';
 const system: AppRouteModule = {
   path: '/system',
@@ -19,21 +20,41 @@ const system: AppRouteModule = {
       name: 'AccountManagement',
       meta: {
         title: t('routes.demo.system.account'),
+        roles: [RoleEnum.ADMIN],
         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: 'changePassword',
+      name: 'ChangePassword',
+      meta: {
+        title: t('routes.demo.system.password'),
+        ignoreKeepAlive: true,
+      },
+      component: () => import('/@/views/demo/system/password/index.vue'),
+    },
     {
-      path: 'account_detail/:id',
-      name: 'AccountDetail',
+      path: 'config',
+      name: 'config',
       meta: {
-        hideMenu: true,
-        title: t('routes.demo.system.account_detail'),
+        title: '系统配置',
         ignoreKeepAlive: true,
-        showMenu: false,
-        currentActiveMenu: '/system/account',
+        roles: [RoleEnum.ADMIN],
       },
-      component: () => import('/@/views/project/account/AccountDetail.vue'),
+      component: () => import('/@/views/project/config/index.vue'),
     },
     // {
     //   path: 'role',
@@ -92,7 +92,7 @@ export const useOrderStore = defineStore({
     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);
@@ -112,6 +112,11 @@ export const usePermissionStore = defineStore({
     async buildRoutesAction(): Promise<AppRouteRecordRaw[]> {
       const { t } = useI18n();
       const userStore = useUserStore();
+      console.log(
+        '%c [ userStore ]-115',
+        'font-size:13px; background:pink; color:#bf2c9f;',
+        userStore,
+      );
       const appStore = useAppStoreWithOut();
       let routes: AppRouteRecordRaw[] = [];
@@ -127,7 +132,9 @@ export const usePermissionStore = defineStore({
         const { roles } = meta || {};
         if (!roles) return true;
         // 进行角色权限判断
-        return roleList.some((role) => roles.includes(role));
+        const user = userStore.getUserInfo;
+        return user?.roleSmallVO.code === 'admin';
+        // return roleList.some((role) => roles.includes(role));
       };
       const routeRemoveIgnoreFilter = (route: AppRouteRecordRaw) => {
@@ -195,6 +202,7 @@ export const usePermissionStore = defineStore({
           routes = filter(routes, routeRemoveIgnoreFilter);
           // 移除掉 ignoreRoute: true 的路由 一级路由；
           routes = routes.filter(routeRemoveIgnoreFilter);
+
           // 对菜单进行排序
           menuList.sort((a, b) => {
             return (a.meta?.orderNo || 0) - (b.meta?.orderNo || 0);
@@ -11,7 +11,7 @@ export function formatToDateTime(date?: dayjs.ConfigType, format = DATE_TIME_FOR
 }
 export function formatToDate(date?: dayjs.ConfigType, format = DATE_FORMAT): string {
-  return dayjs(date).format(format);
+  return date ? dayjs(date).format(format) : '';
 }
 export const dateUtil = dayjs;
-export const getDisable = (code, id) => {
-  return code === 'LOCKED' && !!id;
+export const getDisable = (code, id, value) => {
+  return code === 'LOCKED' && !!id && value;
+};
+
+// 利润分析的权限校验
+export const getProfitDisable = (field, code, id, value) => {
+  // 包装费用,汇率不允许修改
+  if (['packetPrice', 'exchangeRate'].includes(field)) {
+    return true;
+  }
+  // code是lock，编辑并且value存在，才需要审核
+  return code === 'LOCKED' && !!id && value;
+};
+
+// 基本信息的权限校验 客户编码、项目号、生产科、内部编号、业务员 才需要审核
+export const getBaseDisable = (field, code, id) => {
+  if (
+    [
+      'customerCode',
+      'projectNo',
+      'productionDepartment',
+      'innerNo',
+      'orderCount',
+      'businessPerson',
+    ].includes(field)
+  ) {
+    return code === 'LOCKED' && !!id;
+  }
+  return false;
 };
@@ -13,13 +13,17 @@
   import { defineComponent } from 'vue';
   import { PageWrapper } from '/@/components/Page';
   import { BasicForm, useForm } from '/@/components/Form';
+  import { useUserStoreWithOut } from '/@/store/modules/user';
   import { formSchema } from './pwd.data';
+  import { forgetPassword } from '/@/api/sys/user';
   export default defineComponent({
     name: 'ChangePassword',
     components: { BasicForm, PageWrapper },
     setup() {
+      const userStore = useUserStoreWithOut();
+
       const [register, { validate, resetFields }] = useForm({
         size: 'large',
         baseColProps: { span: 24 },
@@ -31,12 +35,10 @@
       async function handleSubmit() {
         try {
           const values = await validate();
-          const { passwordOld, passwordNew } = values;
-          // TODO custom api
-          console.log(passwordOld, passwordNew);
-          // const { router } = useRouter();
-          // router.push(pageEnum.BASE_LOGIN);
+          const userInfo = userStore.getUserInfo;
+
+          await forgetPassword({ ...values, userId: userInfo.id });
         } catch (error) {}
       }
 import { FormSchema } from '/@/components/Form';
 export const formSchema: FormSchema[] = [
+  // {
+  //   field: 'passwordOld',
+  //   label: '当前密码',
+  //   component: 'InputPassword',
+  //   required: true,
+  // },
   {
-    field: 'passwordOld',
-    label: '当前密码',
-    component: 'InputPassword',
-    required: true,
-  },
-  {
-    field: 'passwordNew',
+    field: 'password',
     label: '新密码',
     component: 'StrengthMeter',
     componentProps: {
@@ -34,7 +34,7 @@ export const formSchema: FormSchema[] = [
             if (!value) {
               return Promise.reject('密码不能为空');
             }
-            if (value !== values.passwordNew) {
+            if (value !== values.password) {
               return Promise.reject('两次输入的密码不一致!');
             }
             return Promise.resolve();
@@ -70,6 +70,9 @@
         },
         useSearchForm: true,
         showTableSetting: true,
+        tableSetting: {
+          setting: false,
+        },
         bordered: true,
         handleSearchInfoFn(info) {
           console.log('handleSearchInfoFn', info);
@@ -51,14 +51,15 @@
         <a-button @click="handleFalse"> 不通过</a-button>
       </template>
     </BasicDrawer>
+    <MsgModal v-if="msgVisible" @msg-modal-close="handleMsgModalClose" />
   </PageWrapper>
 </template>
 <script lang="ts">
+  import MsgModal from './MsgModal.vue';
   import { computed, defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
   import { BasicDrawer, useDrawer } from '/@/components/Drawer';
-
   import { approveAuditApi, getApprovedListApi, getWaitListApi } from '/@/api/project/approve';
   import {
     FIELDS_BASE_INFO,
@@ -81,11 +82,15 @@
       BasicDrawer,
       TableAction,
       BaseInfo,
+      MsgModal,
     },
     props: {
       isApproved: { type: Boolean },
     },
     setup(props) {
+      // visible 用于msgModal显示隐藏
+      const msgVisible = ref(false);
+
       const checkedKeys = ref<Array<string | number>>([]);
       const currentKey = ref('1');
       const [registerDrawer, { openDrawer, closeDrawer }] = useDrawer();
@@ -99,17 +104,35 @@
       const baseInfos = ref({});
       const id = ref('');
-      const [registerTable, { reload }] = useTable({
-        api: props.isApproved ? getApprovedListApi : getWaitListApi,
-        searchInfo: { type: 0 },
+      let columns = [
+        {
+          title: '申请人',
+          dataIndex: 'createBy',
+          width: 150,
+        },
+      ];
-        columns: [
+      if (props.isApproved) {
+        columns = columns.concat([
           {
-            title: '申请人',
-            dataIndex: 'createBy',
+            title: '状态',
+            dataIndex: 'status',
             width: 150,
+            customRender: (column) => {
+              const { record } = column || {};
+
+              return record.status === 10 ? '通过' : '拒绝';
+            },
           },
-        ],
+          { title: '拒绝原因', dataIndex: 'refuseRemark', width: 250 },
+        ]);
+      }
+
+      const [registerTable, { reload }] = useTable({
+        api: props.isApproved ? getApprovedListApi : getWaitListApi,
+        searchInfo: { type: 0 },
+
+        columns,
         // useSearchForm: true,
         // formConfig: getFormConfig(),
         rowKey: 'id',
@@ -209,14 +232,23 @@
       }
       async function handleFalse() {
-        await approveAuditApi({ status: 20, id: id.value });
-        reload();
-        closeDrawer();
+        msgVisible.value = true;
       }
       const role = computed(() => {
         return userStore.getUserInfo?.roleSmallVO?.code;
       });
+
+      // 定义MsgModalClose的事件，方便子组件调用
+      const handleMsgModalClose = async (data) => {
+        if (data) {
+          await approveAuditApi({ status: 20, id: id.value, refuseRemark: data });
+          reload();
+          closeDrawer();
+        }
+        msgVisible.value = false;
+      };
+
       return {
         handleProfitModal,
         registerTable,
@@ -233,8 +265,9 @@
         handleFalse,
         ROLE,
         role,
+        msgVisible,
+        handleMsgModalClose,
       };
     },
   });
 </script>
-../order/constant
+<!-- 通过vue的modal增加一个拒绝填写message -->
+<template>
+  <!-- 一直显示 -->
+  <Modal title="拒绝原因" width="30%" @cancel="handleClose" @ok="handleOk" visible>
+    <div className="pa-5">
+      <a-textarea :rows="5" placeholder="请输入拒绝原因" v-model:value="message" />
+    </div>
+  </Modal>
+</template>
+
+<script setup lang="ts">
+  import { ref, defineEmits } from 'vue';
+  import { Modal } from 'ant-design-vue';
+
+  const emit = defineEmits(['msg-modal-close']);
+
+  const message = ref('');
+
+  const handleOk = () => {
+    // 修改父组件的状态
+    emit('msg-modal-close', message.value);
+  };
+
+  const handleClose = () => {
+    // 修改父组件的状态
+    emit('msg-modal-close');
+  };
+</script>
@@ -33,9 +33,11 @@
         <a-button @click="handleFalse"> 不通过</a-button>
       </template>
     </BasicDrawer>
+    <MsgModal v-if="msgVisible" @msg-modal-close="handleMsgModalClose" />
   </PageWrapper>
 </template>
 <script lang="ts">
+  import MsgModal from './MsgModal.vue';
   import { computed, defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
@@ -56,11 +58,14 @@
       BasicDrawer,
       TableAction,
       BaseInfo,
+      MsgModal,
     },
     props: {
       isApproved: { type: Boolean },
     },
     setup(props) {
+      // visible 用于msgModal显示隐藏
+      const msgVisible = ref(false);
       const checkedKeys = ref<Array<string | number>>([]);
       const currentKey = ref('1');
       const [registerDrawer, { openDrawer, closeDrawer }] = useDrawer();
@@ -68,17 +73,35 @@
       const baseInfos = ref({});
       const id = ref('');
-      const [registerTable, { reload }] = useTable({
-        api: props.isApproved ? getApprovedListApi : getWaitListApi,
-        searchInfo: { type: 10 },
+      let columns = [
+        {
+          title: '申请人',
+          dataIndex: 'createBy',
+          width: 150,
+        },
+      ];
-        columns: [
+      if (props.isApproved) {
+        columns = columns.concat([
           {
-            title: '申请人',
-            dataIndex: 'createBy',
+            title: '状态',
+            dataIndex: 'status',
             width: 150,
+            customRender: (column) => {
+              const { record } = column || {};
+
+              return record.status === 10 ? '通过' : '拒绝';
+            },
           },
-        ],
+          { title: '拒绝原因', dataIndex: 'refuseRemark', width: 250 },
+        ]);
+      }
+
+      const [registerTable, { reload }] = useTable({
+        api: props.isApproved ? getApprovedListApi : getWaitListApi,
+        searchInfo: { type: 10 },
+
+        columns,
         // useSearchForm: true,
         // formConfig: getFormConfig(),
         rowKey: 'id',
@@ -118,6 +141,12 @@
         openDrawer(true, { data });
         id.value = data.id;
         fieldInfos.value = FIELDS_PROFIT_INFO.map((field) => {
+          if (field.field === 'profitType') {
+            return {
+              label: field.label,
+              value: data.fieldInfos.profitAnalysisFields[field.field] == 0 ? '方式1' : '方式2',
+            };
+          }
           return {
             label: field.label,
             value: data.fieldInfos.profitAnalysisFields[field.field],
@@ -138,14 +167,25 @@
       }
       async function handleFalse() {
-        await approveAuditApi({ status: 20, id: id.value });
-        reload();
-        closeDrawer();
+        msgVisible.value = true;
+        // await approveAuditApi({ status: 20, id: id.value });
+        // reload();
+        // closeDrawer();
       }
       const role = computed(() => {
         return userStore.getUserInfo?.roleSmallVO?.code;
       });
+
+      // 定义MsgModalClose的事件，方便子组件调用
+      const handleMsgModalClose = async (data) => {
+        if (data) {
+          await approveAuditApi({ status: 20, id: id.value, refuseRemark: data });
+          reload();
+          closeDrawer();
+        }
+        msgVisible.value = false;
+      };
       return {
         handleProfitModal,
         registerTable,
@@ -162,8 +202,9 @@
         handleFalse,
         role,
         ROLE,
+        msgVisible,
+        handleMsgModalClose,
       };
     },
   });
 </script>
-../order/constant
@@ -33,9 +33,11 @@
         <a-button @click="handleFalse"> 不通过</a-button>
       </template>
     </BasicDrawer>
+    <MsgModal v-if="msgVisible" @msg-modal-close="handleMsgModalClose" />
   </PageWrapper>
 </template>
 <script lang="ts">
+  import MsgModal from './MsgModal.vue';
   import { computed, defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
@@ -56,29 +58,49 @@
       BasicDrawer,
       BaseInfo,
       TableAction,
+      MsgModal,
     },
     props: {
       isApproved: { type: Boolean },
     },
     setup(props) {
+      // visible 用于msgModal显示隐藏
+      const msgVisible = ref(false);
       const checkedKeys = ref<Array<string | number>>([]);
       const currentKey = ref('1');
       const [registerDrawer, { openDrawer, closeDrawer }] = useDrawer();
       const fieldInfos = ref({});
       const baseInfos = ref({});
       const id = ref('');
+      let columns = [
+        {
+          title: '申请人',
+          dataIndex: 'createBy',
+          width: 150,
+        },
+      ];
+
+      if (props.isApproved) {
+        columns = columns.concat([
+          {
+            title: '状态',
+            dataIndex: 'status',
+            width: 150,
+            customRender: (column) => {
+              const { record } = column || {};
+
+              return record.status === 10 ? '通过' : '拒绝';
+            },
+          },
+          { title: '拒绝原因', dataIndex: 'refuseRemark', width: 250 },
+        ]);
+      }
       const [registerTable, { reload }] = useTable({
         api: props.isApproved ? getApprovedListApi : getWaitListApi,
         searchInfo: { type: 20 },
-        columns: [
-          {
-            title: '申请人',
-            dataIndex: 'createBy',
-            width: 150,
-          },
-        ],
+        columns,
         // useSearchForm: true,
         // formConfig: getFormConfig(),
         rowKey: 'id',
@@ -138,11 +160,19 @@
       }
       async function handleFalse() {
-        await approveAuditApi({ status: 20, id: id.value });
-        reload();
-        closeDrawer();
+        msgVisible.value = true;
       }
+      // 定义MsgModalClose的事件，方便子组件调用
+      const handleMsgModalClose = async (data) => {
+        if (data) {
+          await approveAuditApi({ status: 20, id: id.value, refuseRemark: data });
+          reload();
+          closeDrawer();
+        }
+        msgVisible.value = false;
+      };
+
       const role = computed(() => {
         return userStore.getUserInfo?.roleSmallVO?.code;
       });
@@ -162,8 +192,9 @@
         handleFalse,
         role,
         ROLE,
+        msgVisible,
+        handleMsgModalClose,
       };
     },
   });
 </script>
-../order/constant
@@ -136,8 +136,6 @@
         return false;
       }
-      function handleProfitModal() {}
-
       async function handleTrue(record) {
         await approveAuditApi({ status: 10, id: record.id });
         reload();
@@ -149,7 +147,6 @@
       }
       return {
-        handleProfitModal,
         registerTable1,
         registerTable2,
         checkedKeys,
@@ -163,3 +160,9 @@
     },
   });
 </script>
+
+<style>
+  .ant-modal-wrap {
+    z-index: 99999999;
+  }
+</style>
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    destroyOnClose
+    @register="register"
+    title="创建配置"
+    width="600px"
+    @visible-change="handleShow"
+    @ok="handleOk"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, defineEmits } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { orderGravity } from '/@/api/project/order';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
+  import { useOrderInfo } from '/@/hooks/component/order';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { addConfig } from '/@/api/sys/config';
+
+  export default defineComponent({
+    components: { BasicModal, BasicForm },
+    props: {
+      column: { type: Number },
+    },
+    emits: ['modal-success'],
+    setup(props, { emit }) {
+      const orderStore = useOrderStoreWithOut();
+      const { manualPreform, exchangeRate } = useOrderInfo(orderStore);
+      const loading = ref(true);
+      const activeUser = ref();
+      const info = ref();
+      const searchData = ref({});
+      const [register, { setModalProps, closeModal }] = useModalInner(async (data) => {
+        searchData.value = data.data || {};
+        activeUser.value = undefined;
+        info.value = '';
+      });
+
+      const { customerCode: customerCodeOptions } = useOrderInfo(orderStore);
+      var [registerForm, { getFieldsValue, validate }] = useForm({
+        labelWidth: 80,
+        schemas: [
+          {
+            field: 'settingValue',
+            component: 'Select',
+            label: '客户编码',
+            rules: [{ required: true }],
+            componentProps: {
+              options: customerCodeOptions,
+            },
+            colProps: {
+              span: 24,
+            },
+          },
+          {
+            field: 'relationValue',
+            component: 'InputNumber',
+            label: props.column === 1 ? '利润率' : '包装费用',
+            rules: [{ required: true }],
+            colProps: {
+              span: 24,
+            },
+          },
+        ],
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+
+      function handleShow(visible: boolean) {
+        if (visible) {
+          loading.value = true;
+          // setModalProps({ loading: true, confirmLoading: true });
+          setModalProps({ loading: false, confirmLoading: false });
+        }
+      }
+
+      async function handleCalc() {
+        const res = await orderGravity({
+          ...searchData.value,
+          designer: activeUser.value,
+        });
+        info.value = res?.rate || 0;
+      }
+
+      async function handleOk() {
+        try {
+          const values = getFieldsValue();
+          await validate();
+          const params = {
+            settingCode: 'customerCode',
+            settingName: '客户编码',
+            settingValue: values.settingValue,
+            settingType: 1,
+            relationCode: props.column === 1 ? 'profitRate' : 'packetPrice',
+            relationName: '包装费用',
+            relationValue: values.relationValue,
+          };
+
+          await addConfig(params);
+          emit('modal-success');
+          closeModal();
+        } catch (error) {
+          console.log('%c [ error ]-108', 'font-size:13px; background:pink; color:#bf2c9f;', error);
+        }
+      }
+      return {
+        register,
+        loading,
+        handleShow,
+        info,
+        manualPreform,
+        handleCalc,
+        activeUser,
+        exchangeRate,
+        registerForm,
+        handleOk,
+      };
+    },
+  });
+</script>
+<style scoped>
+  .empty-tips {
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+</style>
+<template>
+  <BasicTable @register="registerTable">
+    <template #toolbar>
+      <a-button v-if="props.column !== 3" type="primary" @click="handleCreateModal">新建</a-button>
+    </template>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.key === 'action'">
+        <TableAction :actions="createActions(record)" />
+      </template>
+    </template>
+  </BasicTable>
+  <CreateModal
+    @register="createModalRegister"
+    @modal-success="handleModalSuccess"
+    :column="props.column"
+  />
+</template>
+<script setup lang="ts">
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import CreateModal from './CreateModal.vue';
+  import { deleteConfig, getList, saveConfig } from '/@/api/sys/config';
+  import { COLUMNS } from './data';
+  import { useModal } from '/@/components/Modal';
+
+  const props = defineProps({
+    searchInfo: {
+      type: Object,
+    },
+    column: {
+      type: Number,
+    },
+  });
+  const [createModalRegister, { openModal }] = useModal();
+
+  const [registerTable, { reload }] = useTable({
+    api: getList,
+    searchInfo: props.searchInfo,
+
+    columns: COLUMNS[props.column!],
+    rowKey: 'id',
+    actionColumn: {
+      width: 160,
+      title: 'Action',
+      dataIndex: 'action',
+    },
+  });
+
+  function handleCreateModal() {
+    openModal(true);
+  }
+
+  function createActions(record: any): any[] {
+    if (!record.editable) {
+      return [
+        {
+          label: '编辑',
+          onClick: handleEdit.bind(null, record),
+        },
+        {
+          ...(props.column !== 3 && {
+            label: '删除',
+            // onClick: handleDelete.bind(null, record),
+            popConfirm: {
+              title: '确认删除？',
+              confirm: handleDelete.bind(null, record),
+            },
+          }),
+        },
+      ];
+    }
+    return [
+      {
+        label: '保存',
+        onClick: handleSave.bind(null, record),
+      },
+      {
+        label: '取消',
+        popConfirm: {
+          title: '是否取消编辑',
+          confirm: handleCancel.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  async function handleSave(record) {
+    await saveConfig({ id: record.id, settingValue: record.settingValue });
+    handleCancel(record);
+    reload();
+  }
+
+  function handleEdit(record: any) {
+    record.onEdit?.(true);
+  }
+
+  function handleCancel(record) {
+    record.onEdit?.(false, false);
+  }
+
+  function handleModalSuccess() {
+    reload();
+  }
+
+  async function handleDelete(record) {
+    await deleteConfig({ ids: [record.id] });
+    reload();
+  }
+</script>
+<style></style>
+export const COLUMNS = {
+  1: [
+    {
+      title: '客户编码',
+      dataIndex: 'settingValue',
+      width: 150,
+    },
+    {
+      title: '利润率',
+      dataIndex: 'relationValue',
+      width: 150,
+      editComponent: 'InputNumber',
+      editRow: true,
+    },
+  ],
+  2: [
+    {
+      title: '客户编码',
+      dataIndex: 'settingValue',
+      width: 150,
+    },
+    {
+      title: '包装费用',
+      dataIndex: 'relationValue',
+      width: 150,
+      editComponent: 'InputNumber',
+      editRow: true,
+    },
+  ],
+  3: [
+    {
+      title: '名称',
+      dataIndex: 'settingName',
+      width: 150,
+    },
+    {
+      title: '值',
+      dataIndex: 'settingValue',
+      width: 150,
+      editComponent: 'InputNumber',
+      editRow: true,
+    },
+  ],
+};
+<template>
+  <PageWrapper contentBackground>
+    <div className="config-page">
+      <Tabs v-model:selectedKey="currentKey" className="ml-2 mb-0">
+        <Tabs.TabPane key="1" tab="利润率配置">
+          <TablePanel :searchInfo="{ relationCode: 'profitRate' }" :column="1" />
+        </Tabs.TabPane>
+        <Tabs.TabPane key="2" tab="包装费用配置">
+          <TablePanel :searchInfo="{ relationCode: 'packetPrice' }" :column="2" />
+        </Tabs.TabPane>
+        <Tabs.TabPane key="3" tab="汇率配置">
+          <TablePanel :searchInfo="{ settingCode: 'exchangeRate' }" :column="3"
+        /></Tabs.TabPane>
+      </Tabs>
+    </div>
+  </PageWrapper>
+</template>
+
+<script setup lang="ts">
+  import { Tabs } from 'ant-design-vue';
+  import { PageWrapper } from '/@/components/Page';
+  import TablePanel from './TablePanel.vue';
+  import { onMounted } from 'vue';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
+
+  let currentKey = '1';
+  const orderStore = useOrderStoreWithOut();
+
+  onMounted(async () => {
+    await orderStore.getDict();
+  });
+</script>
+
+<style>
+  .config-page .ant-tabs-nav-operations ant-tabs-nav-operations-hidden {
+    display: none;
+  }
+
+  .config-page .ant-tabs-nav {
+    margin-bottom: 0;
+  }
+</style>
@@ -12,8 +12,10 @@
     okText="申请"
     ><input />
     <div>
-      <h3>基本信息</h3>
-      <BasicForm @register="registerForm" />
+      <template v-if="role === ROLE.ADMIN || role === ROLE.TRACKER">
+        <h3>基本信息</h3>
+        <BasicForm @register="registerForm" />
+      </template>
       <template v-if="role === ROLE.ADMIN || role === ROLE.BUSINESS">
         <h3>利润分析</h3>
         <BasicForm @register="registerProfitForm" />
@@ -56,19 +58,21 @@
   const userStore = useUserStoreWithOut();
   const getSchema = (fields) =>
-    fields.map((item) => ({
-      field: `${item.field}`,
-      dataIndex: `${item.field}`,
-      label: item.label,
-      component: 'Switch',
-      componentProps: {
-        checkedValue: 'UN_LOCKED',
-        unCheckedValue: 'LOCKED',
-      },
-      colProps: {
-        span: 6,
-      },
-    }));
+    fields
+      .map((item) => ({
+        field: `${item.field}`,
+        dataIndex: `${item.field}`,
+        label: item.label,
+        component: 'Switch',
+        componentProps: {
+          checkedValue: 'UN_LOCKED',
+          unCheckedValue: 'LOCKED',
+        },
+        colProps: {
+          span: 6,
+        },
+      }))
+      .filter((item) => item.field !== 'packetPrice' && item.field !== 'exchangeRate');
   export default defineComponent({
     components: { BasicDrawer, BasicForm },
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    destroyOnClose
+    @register="register"
+    title="利润分析表"
+    width="500px"
+    :height="100"
+    wrapClassName="h-[260px]"
+    @visible-change="handleShow"
+    :footer="null"
+  >
+    <CheckboxGroup v-model:value="checkedList" :options="options" />
+    <div className="mt-6">
+      <a-button type="primary" @click="handleCalc" className="ml-4">导出</a-button>
+    </div>
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { orderExport } from '/@/api/project/order';
+  import { ROLE } from './type.d';
+  import { CheckboxGroup } from 'ant-design-vue';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
+  import { useOrderInfo } from '/@/hooks/component/order';
+  import { merge } from 'lodash-es';
+  import {
+    ORDER_LIST_BASE_FIELDS,
+    ORDER_LIST_REPORT_FIELDS,
+    ORDER_LIST_PROFIT_FIELDS,
+    ORDER_LIST_INSPECT_FIELDS,
+    ORDER_LIST_TRACK_FIELDS,
+  } from './tableData';
+
+  export default defineComponent({
+    components: { BasicModal, CheckboxGroup },
+    props: {
+      role: {
+        type: String,
+      },
+    },
+    setup(props) {
+      const orderStore = useOrderStoreWithOut();
+      const { manualPreform, exchangeRate } = useOrderInfo(orderStore);
+      const checkedList = ref([
+        'baseFields',
+        'reportFields',
+        'profitAnalysisFields',
+        'trackStageFields',
+        'inspectionStageFields',
+      ]);
+      const loading = ref(true);
+      const activeUser = ref();
+      const info = ref();
+      const searchData = ref({});
+      const [register, { setModalProps, closeModal }] = useModalInner(async (data) => {
+        searchData.value = data.data || {};
+        activeUser.value = undefined;
+        info.value = '';
+      });
+
+      const options = computed(() => {
+        if (props.role === ROLE.TRACKER) {
+          return [
+            { label: '基本信息', value: 'baseFields' },
+            { label: '利润分析', value: 'profitAnalysisFields' },
+            { label: '跟单信息', value: 'trackStageFields' },
+            { label: '质检信息', value: 'inspectionStageFields' },
+          ];
+        }
+        if (props.role === ROLE.INSPECT) {
+          return [
+            { label: '基本信息', value: 'baseFields' },
+            { label: '跟单信息', value: 'trackStageFields' },
+            { label: '质检信息', value: 'inspectionStageFields' },
+          ];
+        }
+        return [
+          { label: '基本信息', value: 'baseFields' },
+          { label: '项目报告', value: 'reportFields' },
+          { label: '利润分析', value: 'profitAnalysisFields' },
+          { label: '跟单信息', value: 'trackStageFields' },
+          { label: '质检信息', value: 'inspectionStageFields' },
+        ];
+      });
+
+      function handleShow(visible: boolean) {
+        if (visible) {
+          loading.value = true;
+          setModalProps({ loading: false, confirmLoading: false });
+        }
+      }
+
+      async function handleCalc() {
+        const fieldVO: any = {};
+        checkedList.value.forEach((item) => {
+          if (item === 'baseFields') {
+            fieldVO.baseFields = ORDER_LIST_BASE_FIELDS.map((item) => ({
+              [item.dataIndex]: 'selected',
+            }));
+            fieldVO.baseFields = merge({}, ...fieldVO.baseFields);
+          } else if (item === 'reportFields') {
+            fieldVO.reportFields = ORDER_LIST_REPORT_FIELDS[0].children.map((item) => ({
+              [item.dataIndex]: 'selected',
+            }));
+            fieldVO.reportFields = merge({}, ...fieldVO.reportFields);
+          } else if (item === 'profitAnalysisFields') {
+            if (props.role === ROLE.TRACKER) {
+              fieldVO.profitAnalysisFields = ORDER_LIST_PROFIT_FIELDS[0].children
+                .filter(
+                  (k) => k.dataIndex === 'customerPrice' || k.dataIndex === 'customerTotalPrice',
+                )
+                .map((item) => ({
+                  [item.dataIndex]: 'selected',
+                }));
+            } else {
+              fieldVO.profitAnalysisFields = ORDER_LIST_PROFIT_FIELDS[0].children.map((item) => ({
+                [item.dataIndex]: 'selected',
+              }));
+            }
+            fieldVO.profitAnalysisFields = merge({}, ...fieldVO.profitAnalysisFields);
+          } else if (item === 'trackStageFields') {
+            fieldVO.trackStageFields = ORDER_LIST_TRACK_FIELDS[0].children.map((item) => ({
+              [item.dataIndex]: 'selected',
+            }));
+            fieldVO.trackStageFields = merge({}, ...fieldVO.trackStageFields);
+          } else if (item === 'inspectionStageFields') {
+            fieldVO.inspectionStageFields = ORDER_LIST_INSPECT_FIELDS[0].children.map((item) => ({
+              [item.dataIndex]: 'selected',
+            }));
+            fieldVO.inspectionStageFields = merge({}, ...fieldVO.inspectionStageFields);
+          }
+        });
+
+        await orderExport({ fieldVO });
+
+        closeModal();
+      }
+      return {
+        register,
+        options,
+        loading,
+        handleShow,
+        info,
+        manualPreform,
+        handleCalc,
+        activeUser,
+        exchangeRate,
+        checkedList,
+      };
+    },
+  });
+</script>
@@ -2,7 +2,7 @@
   <BasicDrawer
     @register="register"
     v-bind="$attrs"
-    title="title"
+    title="字段自定义"
     :destroyOnClose="true"
     width="60%"
     :isDetail="true"
@@ -55,7 +55,7 @@
     setup() {
       const dataSource = ref([]);
       const key = ref('');
-      const title = ref('');
+      const title = ref('12');
       const [registerTable, { getDataSource, reload }] = useTable({
         columns: columns,
@@ -72,11 +72,18 @@
       });
       const [register] = useDrawerInner((data) => {
-        const { dataIndex, customTitle } = data;
+        let { dataIndex, customTitle } = data;
+
+        // 如果dataIndex= 手工初型1或者2，则等于手工初型
+        if (dataIndex === 'manualPreform1' || dataIndex == 'manualPreform2') {
+          dataIndex = 'manualPreform';
+        }
         const dicts = orderStore.getDictInfo;
         const dict = dicts[dataIndex];
         dataSource.value = dict;
+
         title.value = customTitle;
+
         key.value = dataIndex;
       });
@@ -95,13 +102,13 @@
       async function handleSave(record: EditRecordRow) {
         if (record.id) {
-          await dictUpdate({ dictCode: key.value, dictValue: record.dictValue });
+          await dictUpdate({ id: record.id, dictCode: key.value, dictValue: record.dictValue });
         } else {
           await dictCreate({
             dictName: title.value,
             dictCode: key.value,
             dictValue: record.dictValue,
-            sort: dataSource.value.length + 1,
+            sort: (dataSource.value?.length || 0) + 1,
           });
         }
@@ -5,7 +5,7 @@
   import { computed, defineComponent, ref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { FIELDS_BASE_INFO } from '../tableData';
-  import { getDisable } from '/@/utils/project';
+  import { getBaseDisable } from '/@/utils/project';
   import { useOrderStoreWithOut } from '/@/store/modules/order';
   import { useOrderInfo } from '/@/hooks/component/order';
@@ -24,6 +24,9 @@
       id: {
         type: String,
       },
+      businessUsers: {
+        type: Array,
+      },
     },
     emits: ['success'],
     setup(props) {
@@ -42,7 +45,14 @@
         productStyle,
         outboundType,
         packetType,
+
+        // businessPerson,
       } = useOrderInfo(orderStore);
+      console.log(
+        '%c [ productionDepartment ]-57',
+        'font-size:13px; background:pink; color:#bf2c9f;',
+        productionDepartment,
+      );
       var schemas = computed(() => {
         const options = {
@@ -55,14 +65,11 @@
           productStyle,
           outboundType,
           packetType,
+
+          businessPerson: props.businessUsers,
         };
         const res = FIELDS_BASE_INFO.map((item) => {
-          console.log(
-            '%c [  ]-62',
-            'font-size:13px; background:pink; color:#bf2c9f;',
-            getDisable(fields.value?.baseFields?.picUrl, props.id),
-          );
           if (item.field === 'picUrl') {
             return {
               field: 'picUrl',
@@ -74,7 +81,7 @@
               },
               componentProps: {
                 imgUrl: picUrl.value,
-                disabled: getDisable(get(fields.value, 'picUrl'), props.id),
+                // disabled: getDisable(get(fields.value, 'picUrl'), props.id),
                 onChange: (res) => {
                   if (res.file?.response?.data) {
                     picUrl.value = res.file?.response?.data?.picUrl;
@@ -87,12 +94,20 @@
               },
             };
           }
+
+          console.log(
+            '%c [  ]-98',
+            'font-size:13px; background:pink; color:#bf2c9f;',
+            item.field,
+            options[item.field],
+          );
+
           return {
             ...item,
             field: `${item.field}`,
             componentProps: {
               ...(item.component === 'Select' && { options: options[item.field] }),
-              disabled: getDisable(get(fields.value, `${item.field}`), props.id),
+              disabled: getBaseDisable(item.field, get(fields.value, `${item.field}`), props.id),
             },
             colProps: {
               span: 24,
@@ -2,10 +2,8 @@
   <BasicForm @register="registerForm" />
 </template>
 <script lang="ts">
-  import { computed, defineComponent, ref, toRaw } from 'vue';
+  import { computed, defineComponent, ref } from 'vue';
   import { BasicForm, 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';
@@ -19,6 +17,9 @@
       id: {
         type: String,
       },
+      inspectFormData: {
+        type: Object,
+      },
     },
     emits: ['success'],
     setup(props, { emit }) {
@@ -37,7 +38,11 @@
             ...item,
             componentProps: {
               ...(item.component === 'Select' && { options: options[item.field] }),
-              disabled: getDisable(get(fields.value, item.field), props.id),
+              disabled: getDisable(
+                get(fields.value, item.field),
+                props.id,
+                get(props.inspectFormData, `${item.field}`),
+              ),
             },
             colProps: {
               span: 24,
@@ -4,37 +4,52 @@
 <script lang="ts">
   import { computed, defineComponent, reactive, ref, toRaw } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { dateUtil } from '/@/utils/dateUtil';
   import { FIELDS_PROFIT_INFO } from '../tableData';
-  import { getDisable } from '/@/utils/project';
+  import { getProfitDisable } from '/@/utils/project';
   import { get } from 'lodash-es';
+  import { useOrderInfo } from '/@/hooks/component/order';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
   export default defineComponent({
     components: { BasicForm },
     props: {
-      detailData: {
-        type: Object,
-      },
       onGoCheckDetail: {
         type: Function,
       },
       id: {
         type: String,
       },
+      profitFormData: {
+        type: Object,
+      },
     },
     emits: ['success'],
     setup(props, { emit }) {
       let fields = ref({});
+      const orderStore = useOrderStoreWithOut();
+
+      const { exchangeRate } = useOrderInfo(orderStore);
       const schemas = computed(() => {
+        const options = {
+          exchangeRate,
+        };
+
         return FIELDS_PROFIT_INFO.map((item) => {
           return {
             ...item,
             field: `${item.field}`,
             componentProps: {
               ...item.componentProps,
-              disabled: getDisable(get(fields.value, `${item.field}`), props.id),
+              ...(item.component === 'Select' &&
+                !item.componentProps?.options?.length && { options: options[item.field] }),
+              disabled: getProfitDisable(
+                item.field,
+                get(fields.value, `${item.field}`),
+                props.id,
+                get(props.profitFormData, `${item.field}`),
+              ),
             },
             colProps: {
               span: 24,
@@ -43,7 +58,7 @@
         });
       });
-      const [registerForm, { setFieldsValue, getFieldsValue, resetFields }] = useForm({
+      const [registerForm, { setFieldsValue, getFieldsValue, resetFields, validate }] = useForm({
         labelWidth: 120,
         schemas,
         layout: 'vertical',
@@ -52,7 +67,16 @@
           span: 24,
         },
       });
-      return { fields, schemas, registerForm, getFieldsValue, setFieldsValue, resetFields };
+
+      return {
+        fields,
+        schemas,
+        validate,
+        registerForm,
+        getFieldsValue,
+        setFieldsValue,
+        resetFields,
+      };
     },
   });
 </script>
@@ -24,6 +24,9 @@
       id: {
         type: String,
       },
+      reportFormData: {
+        type: Object,
+      },
     },
     emits: ['success'],
     setup(props) {
@@ -39,12 +42,20 @@
         };
         const res = FIELDS_REPORT_INFO.map((item) => {
+          let optionsField = item.field;
+          if (optionsField === 'manualPreform1' || optionsField === 'manualPreform2') {
+            optionsField = 'manualPreform';
+          }
           return {
             ...item,
             field: `${item.field}`,
             componentProps: {
-              ...(item.component === 'Select' && { options: options[item.optionField] }),
-              disabled: getDisable(get(fields.value, `${item.field}`), props.id),
+              ...(item.component === 'Select' && { options: options[optionsField] }),
+              disabled: getDisable(
+                get(fields.value, `${item.field}`),
+                props.id,
+                get(props.reportFormData, `${item.field}`),
+              ),
             },
             colProps: {
               span: 24,
@@ -54,7 +65,7 @@
         return res;
       });
-      const [registerForm, { setFieldsValue, getFieldsValue }] = useForm({
+      const [registerForm, { setFieldsValue, getFieldsValue, resetFields, validate }] = useForm({
         labelWidth: 120,
         schemas,
         layout: 'vertical',
@@ -64,7 +75,15 @@
         },
       });
-      return { fields, schemas, registerForm, getFieldsValue, setFieldsValue };
+      return {
+        fields,
+        schemas,
+        validate,
+        registerForm,
+        getFieldsValue,
+        setFieldsValue,
+        resetFields,
+      };
     },
   });
 </script>
@@ -17,6 +17,9 @@
       id: {
         type: String,
       },
+      trackFormData: {
+        type: Object,
+      },
     },
     emits: ['success'],
     setup(props, { emit }) {
@@ -27,7 +30,11 @@
           ...item,
           componentProps: {
             ...item.componentProps,
-            disabled: getDisable(get(fields.value, `${item.field}`), props.id),
+            disabled: getDisable(
+              get(fields.value, `${item.field}`),
+              props.id,
+              get(props.trackFormData, `${item.field}`),
+            ),
           },
           colProps: {
             span: 24,
@@ -14,10 +14,15 @@
     :mask="false"
     class="z-20"
   >
-    <div className="mt-[-16px]">
+    <div className="mt-[-16px] order-drawer-panel">
       <Tabs v-model:activeKey="activeKey">
-        <TabPanel key="1" tab="基本信息" :forceRender="true" v-if="role !== ROLE.INSPECT">
-          <BaseFormPanel ref="baseFormPanelRef" :id="id" />
+        <TabPanel
+          key="1"
+          tab="基本信息"
+          :forceRender="true"
+          v-if="role === ROLE.ADMIN || role === ROLE.TRACKER"
+        >
+          <BaseFormPanel ref="baseFormPanelRef" :id="id" :businessUsers="businessUsers" />
         </TabPanel>
         <TabPanel
           key="2"
@@ -25,7 +30,7 @@
           :forceRender="true"
           v-if="!!id && (role === ROLE.ADMIN || role === ROLE.BUSINESS)"
         >
-          <ProfitFormPanel ref="profitFormPanelRef" :id="id" />
+          <ProfitFormPanel ref="profitFormPanelRef" :id="id" :profitFormData="profitFormData" />
         </TabPanel>
         <TabPanel
           key="3"
@@ -33,7 +38,7 @@
           :forceRender="true"
           v-if="!!id && (role === ROLE.ADMIN || role === ROLE.BUSINESS)"
         >
-          <ReportFormPanel ref="reportFormPanelRef" :id="id" />
+          <ReportFormPanel ref="reportFormPanelRef" :id="id" :reportFormData="reportFormData" />
         </TabPanel>
         <TabPanel
           key="4"
@@ -41,7 +46,7 @@
           :forceRender="true"
           v-if="!!id && (role === ROLE.ADMIN || role === ROLE.TRACKER)"
         >
-          <TrackFormPanel ref="trackFormPanelRef" :id="id" />
+          <TrackFormPanel ref="trackFormPanelRef" :id="id" :trackFormData="trackFormData" />
         </TabPanel>
         <TabPanel
           key="5"
@@ -49,7 +54,11 @@
           :forceRender="true"
           v-if="!!id && (role === ROLE.ADMIN || role === ROLE.INSPECT)"
         >
-          <InspectionFormPanel ref="inspectionFormPanelRef" :id="id" />
+          <InspectionFormPanel
+            ref="inspectionFormPanelRef"
+            :id="id"
+            :inspectFormData="inspectFormData"
+          />
         </TabPanel>
       </Tabs>
     </div>
@@ -61,7 +70,7 @@
   </BasicDrawer>
 </template>
 <script lang="ts">
-  import { computed, defineComponent, reactive, ref, toRaw, watch, toRefs } from 'vue';
+  import { computed, defineComponent, reactive, ref, toRaw, watch, toRefs, onMounted } from 'vue';
   import { FormActionType, FormSchema, useForm } from '/@/components/Form/index';
   import { orderCreate, orderUpdate, uploadImg } from '/@/api/project/order';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -73,8 +82,12 @@
   import BaseFormPanel from './BaseFormPanel.vue';
   import { useUserStoreWithOut } from '/@/store/modules/user';
   import { ROLE } from '../type.d';
+  import { getList as getConfigList } from '/@/api/sys/config';
   import { Tabs } from 'ant-design-vue';
+  import { find } from 'lodash-es';
+  import { getUserList } from '/@/api/project/account';
+  import message from '/@/views/form-design/utils/message';
   const userStore = useUserStoreWithOut();
@@ -109,8 +122,33 @@
       const trackFormPanelRef = ref();
       const inspectionFormPanelRef = ref();
+      // 编辑从接口获取的value
+      const baseFormData = ref();
+      const profitFormData = ref();
+      const reportFormData = ref();
+      const trackFormData = ref();
+      const inspectFormData = ref();
+
       const formRef = ref<FormActionType | null>(null);
       const id = ref('');
+      const configList = ref([]);
+      const businessUsers = ref([]);
+
+      onMounted(async () => {
+        // 获取包装费用和客户编码的关联关系
+        const res = await getConfigList({
+          page: 1,
+          pageSize: 1000,
+          // relationCode: 'packetPrice',
+        });
+        configList.value = res || [];
+
+        // 获取业务员
+        const res1 = await getUserList({ page: 1, pageSize: 1000 });
+        businessUsers.value = res1.items
+          .filter((item) => item.roleCode === ROLE.BUSINESS)
+          .map((item) => ({ value: item.userName, label: item.userName }));
+      });
       const role = computed(() => {
         return userStore.getUserInfo?.roleSmallVO?.code;
@@ -120,6 +158,8 @@
       let fields = reactive({ baseFields: {} });
       const [register, { closeDrawer }] = useDrawerInner((data) => {
+        activeKey.value =
+          role.value === ROLE.INSPECT ? '5' : role.value === ROLE.BUSINESS ? '2' : '1';
         if (!data.id) {
           id.value = '';
           picUrl.value = '';
@@ -133,6 +173,10 @@
           return;
         }
         id.value = data.id;
+        profitFormData.value = data.profitAnalysisInfo;
+        inspectFormData.value = data.inspectionStageInfo;
+        reportFormData.value = data.reportInfo;
+        trackFormData.value = data.trackStageInfo;
         // 方式1
         picUrl.value = data.picUrl;
@@ -159,10 +203,22 @@
             }
             if (profitFormPanelRef.value) {
+              // 包装费用通过客户编码去查
+              const packetPrice = find(configList.value, (item) => {
+                return (
+                  data.customerCode === item.settingValue && item.relationCode === 'packetPrice'
+                );
+              });
+
+              const exchangeRate = find(configList.value, (item) => {
+                return item.settingCode === 'exchangeRate';
+              });
               // 利润分析
               profitFormPanelRef.value.fields = { ...data.lockFields?.profitAnalysisFields } || {};
               profitFormPanelRef?.value?.setFieldsValue({
                 ...toRaw(data.profitAnalysisInfo),
+                packetPrice: packetPrice?.relationValue || 0,
+                exchangeRate: exchangeRate?.settingValue,
               });
             }
@@ -186,7 +242,7 @@
               inspectionFormPanelRef.value.fields =
                 { ...data.lockFields?.inspectionStageFields } || {};
               inspectionFormPanelRef?.value?.setFieldsValue({
-                ...toRaw(data.trackStageInfo),
+                ...toRaw(data.inspectionStageInfo),
               });
             }
           }, 100);
@@ -196,10 +252,10 @@
       });
       const handleSubmit = async () => {
-        if (id.value) {
-          const forms = { orderId: id.value } as any;
-          if (activeKey.value === '1') {
-            try {
+        try {
+          if (id.value) {
+            const forms = { orderId: id.value } as any;
+            if (activeKey.value === '1') {
               await baseFormPanelRef?.value?.validate();
               forms.baseInfo = baseFormPanelRef?.value?.getFieldsValue() || {};
@@ -211,25 +267,36 @@
               await orderUpdate(forms);
               closeDrawer();
               emit('success', {});
-            } catch (error) {
-              console.log(error);
+            } else {
+              if (activeKey.value === '2') {
+                await profitFormPanelRef?.value?.validate();
+                forms.profitAnalysisInfo = profitFormPanelRef?.value?.getFieldsValue() || {};
+                // 方式如果没有变化，默认方式1
+                if (!forms.profitAnalysisInfo.profitType) {
+                  forms.profitAnalysisInfo.profitType = '0';
+                }
+              } else if (activeKey.value === '3') {
+                await reportFormPanelRef?.value?.validate();
+                // 比重相加等于1
+                const values = reportFormPanelRef?.value?.getFieldsValue() || {};
+                if (
+                  values.ideaSourceRate + values.manualPreform1Rate + values.manualPreform2Rate !==
+                  1
+                ) {
+                  return message.error('占比相加不等于1');
+                }
+
+                forms.reportInfo = values;
+              } else if (activeKey.value === '4') {
+                forms.trackStageInfo = trackFormPanelRef?.value?.getFieldsValue() || {};
+              } else if (activeKey.value === '5') {
+                forms.inspectionStageInfo = inspectionFormPanelRef?.value?.getFieldsValue() || {};
+              }
+              await orderUpdate(forms);
+              closeDrawer();
+              emit('success', {});
             }
           } else {
-            if (activeKey.value === '2') {
-              forms.profitAnalysisInfo = profitFormPanelRef?.value?.getFieldsValue() || {};
-            } else if (activeKey.value === '3') {
-              forms.reportInfo = reportFormPanelRef?.value?.getFieldsValue() || {};
-            } else if (activeKey.value === '4') {
-              forms.trackStageInfo = trackFormPanelRef?.value?.getFieldsValue() || {};
-            } else if (activeKey.value === '5') {
-              forms.inspectionStageInfo = inspectionFormPanelRef?.value?.getFieldsValue() || {};
-            }
-            await orderUpdate(forms);
-            closeDrawer();
-            emit('success', {});
-          }
-        } else {
-          try {
             await baseFormPanelRef?.value?.validate();
             // 新建只有基本信息
@@ -245,9 +312,9 @@
             await orderCreate(forms);
             closeDrawer();
             emit('success', {});
-          } catch (error) {
-            console.log(error);
           }
+        } catch (error) {
+          console.log(error);
         }
       };
       return {
@@ -261,16 +328,25 @@
         formRef,
         ROLE,
         role,
+        profitFormData,
+        inspectFormData,
+        reportFormData,
+        trackFormData,
         register,
         handleSubmit,
+        businessUsers,
       };
     },
   });
 </script>
-<style scoped>
+<style>
   .ant-drawer {
     position: fixed;
     z-index: 9999;
   }
+
+  .order-drawer-panel .ant-picker {
+    width: 100% !important;
+  }
 </style>
@@ -4,9 +4,31 @@
     destroyOnClose
     @register="register"
     title="利润分析表"
+    width="600px"
     @visible-change="handleShow"
     :footer="null"
   >
+    <div className="mb-2">
+      公示：
+      <Select
+        className="w-[200px]"
+        :options="[
+          { label: '公示1：1 -（LOCAL总金额 / 汇率 + 包装总金额）/客户总金额', value: '0' },
+          { label: '公示2：1 -（LOCAL总金额/汇率 / (客户总金额-包装费用总金额)', value: '1' },
+        ]"
+        v-model:value="profitType"
+        placeholder="请选择"
+        default-value="0"
+      />
+    </div>
+    <Space>
+      <span>
+        汇率：
+        {{ activeRate }}
+      </span>
+      <a-button type="primary" @click="handleCalc" className="ml-4">计算</a-button>
+    </Space>
+    <!-- <Button @click="handleCalc">计算</Button> -->
     <!-- :helpMessage="['提示1', '提示2']" -->
     <!-- <template #insertFooter>
       <a-button type="primary" danger @click="setLines" :disabled="loading">点我更新内容</a-button>
@@ -25,24 +47,34 @@
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, toRaw, watch } from 'vue';
+  import { computed, defineComponent, onMounted, 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';
+  import { Select, Space } from 'ant-design-vue';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
+  import { getList } from '/@/api/sys/config';
+  import { useOrderInfo } from '/@/hooks/component/order';
   export default defineComponent({
-    components: { BasicModal, Description },
+    components: { BasicModal, Description, Select, Space },
     setup() {
+      const orderStore = useOrderStoreWithOut();
+      const { exchangeRate } = useOrderInfo(orderStore);
+      const orderIds = ref([]);
       const loading = ref(true);
       const lines = ref(10);
+      const activeRate = ref();
+      const profitType = ref('1');
       const info = ref({});
       const [register, { setModalProps, redoModalHeight }] = useModalInner(async (data) => {
-        const orderIds = toRaw(data.data);
-        const res = await orderAnalysis({ orderIds });
+        orderIds.value = toRaw(data.data);
+        info.value = {};
+      });
-        info.value = {
-          ...(res || {}),
-        };
+      onMounted(async () => {
+        const res = await getList({ settingCode: 'exchangeRate', page: 1, pageSize: 10 });
+        activeRate.value = res?.[0]?.settingValue;
       });
       const schema: DescItem[] = [
@@ -75,18 +107,37 @@
         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);
+          setModalProps({ loading: false, confirmLoading: false });
         }
       }
       function setLines() {
         lines.value = Math.round(Math.random() * 20 + 10);
       }
-      return { register, loading, handleShow, lines, setLines, info, schema };
+
+      async function handleCalc() {
+        const res = await orderAnalysis({
+          orderIds: orderIds.value,
+          profitType: profitType.value,
+          exchangeRate: activeRate.value,
+        });
+        info.value = {
+          ...(res || {}),
+        };
+      }
+      return {
+        register,
+        loading,
+        handleShow,
+        lines,
+        setLines,
+        info,
+        schema,
+        exchangeRate,
+        handleCalc,
+        activeRate,
+        profitType,
+      };
     },
   });
 </script>
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    destroyOnClose
+    @register="register"
+    title="利润分析表"
+    width="600px"
+    @visible-change="handleShow"
+    :footer="null"
+  >
+    <Space>
+      <span>
+        设计师：
+        <Select :options="manualPreform" placeholder="请选择" v-model:value="activeUser" />
+      </span>
+      <a-button type="primary" @click="handleCalc" className="ml-4">计算</a-button>
+    </Space>
+    <div className="mt-2">比重结果：{{ info }}</div>
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { orderGravity } from '/@/api/project/order';
+  import { Select, Space } from 'ant-design-vue';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
+  import { useOrderInfo } from '/@/hooks/component/order';
+
+  export default defineComponent({
+    components: { BasicModal, Select, Space },
+    setup() {
+      const orderStore = useOrderStoreWithOut();
+      const { manualPreform, exchangeRate } = useOrderInfo(orderStore);
+
+      const loading = ref(true);
+      const activeUser = ref();
+      const info = ref();
+      const searchData = ref({});
+      const [register, { setModalProps }] = useModalInner(async (data) => {
+        searchData.value = data.data || {};
+        activeUser.value = undefined;
+        info.value = '';
+      });
+
+      function handleShow(visible: boolean) {
+        if (visible) {
+          loading.value = true;
+          // setModalProps({ loading: true, confirmLoading: true });
+          setModalProps({ loading: false, confirmLoading: false });
+        }
+      }
+
+      async function handleCalc() {
+        const res = await orderGravity({
+          ...searchData.value,
+          designer: activeUser.value,
+        });
+        info.value = res?.rate || 0;
+      }
+      return {
+        register,
+        loading,
+        handleShow,
+        info,
+        manualPreform,
+        handleCalc,
+        activeUser,
+        exchangeRate,
+      };
+    },
+  });
+</script>
+<style scoped>
+  .empty-tips {
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+</style>
@@ -33,41 +33,56 @@
           <TableAction
             :actions="[
               {
-                label: '编辑',
-                // icon: 'ic:outline-delete-outline',
-                onClick: handleEdit.bind(null, record),
+                // 数据分析没有编辑权限
+                ...(role !== ROLE.DATA_REPORT_USER && {
+                  label: '编辑',
+                  // icon: 'ic:outline-delete-outline',
+                  onClick: handleEdit.bind(null, record),
+                }),
               },
               {
-                label: '申请权限',
-                // icon: 'ic:outline-delete-outline',
-                onClick: handleCheck.bind(null, record),
-              },
-            ]"
-            :dropDownActions="[
-              {
-                label: '历史记录',
-                onClick: handleHistory.bind(null, record),
+                ...(role !== ROLE.DATA_REPORT_USER && {
+                  label: '申请权限',
+                  // icon: 'ic:outline-delete-outline',
+                  onClick: handleCheck.bind(null, record),
+                }),
               },
             ]"
+            :dropDownActions="
+              role !== ROLE.DATA_REPORT_USER
+                ? [
+                    {
+                      label: '历史记录',
+                      onClick: handleHistory.bind(null, record),
+                    },
+                  ]
+                : []
+            "
           />
         </template>
         <template v-if="column.key === 'picUrl'">
           <img
             :width="100"
             :height="100"
-            :src="record.picUrl"
-            :key="record.picUrl"
+            :src="record.smallPicUrl"
+            :key="record.smallPicUrl"
             @click="handlePreview(record.picUrl)"
           />
         </template>
       </template>
       <template #toolbar>
-        <a-button type="primary" @click="handleExport">导出</a-button>
+        <a-button type="primary" @click="handleRateModal">比重计算</a-button>
+        <a-button type="primary" @click="handleExportModal">导出</a-button>
         <a-button type="primary" @click="handleProfitModal" :disabled="!checkedKeys.length"
           >分析利润</a-button
         >
-        <a-button type="primary" @click="handleAdd">创建订单</a-button>
+        <a-button
+          type="primary"
+          @click="handleAdd"
+          v-if="role !== ROLE.INSPECT && role !== ROLE.DATA_REPORT_USER"
+          >创建订单</a-button
+        >
       </template>
     </BasicTable>
     <FormDetail
@@ -76,13 +91,15 @@
       @success="handleFormSuccess"
     />
     <ProfitAnalysis @register="profitModalRegister" />
+    <RateModal @register="rateModalRegister" />
+    <ExportModal @register="exportModalRegister" :role="role" />
     <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 { defineComponent, onMounted, ref, toRaw, computed } 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';
@@ -90,6 +107,8 @@
   import { useDrawer } from '/@/components/Drawer';
   import ProfitAnalysis from './ProfitAnalysis.vue';
+  import RateModal from './RateModal.vue';
+  import ExportModal from './ExportModal.vue';
   import { useModal } from '/@/components/Modal';
   import { getFormConfig, getOrderColumns, SELECT_FIELD_COLUMNS } from './tableData';
@@ -98,10 +117,10 @@
   import HistoryDetail from './HistoryDetail.vue';
   import FieldDetail from './FieldDetail.vue';
   import { createImgPreview } from '/@/components/Preview/index';
-  import { getOrderList, orderExport } from '/@/api/project/order';
+  import { getOrderList } from '/@/api/project/order';
   import { useOrderStoreWithOut } from '/@/store/modules/order';
-  import { keyBy, reduce } from 'lodash-es';
   import { useUserStoreWithOut } from '/@/store/modules/user';
+  import { ROLE } from './type.d';
   const orderStore = useOrderStoreWithOut();
   const userStore = useUserStoreWithOut();
@@ -118,16 +137,24 @@
       CheckDetail,
       HistoryDetail,
       FieldDetail,
+      RateModal,
+      ExportModal,
     },
     setup() {
       const checkedKeys = ref<Array<string | number>>([]);
       const [profitModalRegister, { openModal: openProfitModal }] = useModal();
+      const [rateModalRegister, { openModal: openRateModal }] = useModal();
+      const [exportModalRegister, { openModal: openExportModal }] = useModal();
+
       const tooltipVisible = ref(false);
       const [formDetailRegister, { openDrawer: openFormDetailDrawer }] = useDrawer();
       const [historyDetailRegister, { openDrawer: openHistoryDetailDrawer }] = useDrawer();
       const [fieldDetailRegister, { openDrawer: openFieldDetailDrawer }] = useDrawer();
       const user = userStore.getUserInfo;
+      const role = computed(() => {
+        return user?.roleSmallVO?.code;
+      });
       const [checkModalRegister, { openDrawer: openCheckDetailDrawer }] = useDrawer();
       onMounted(async () => {
@@ -211,6 +238,15 @@
         });
       }
+      function handleRateModal() {
+        const form = getForm();
+        const values = form.getFieldsValue();
+
+        openRateModal(true, {
+          data: values,
+        });
+      }
+
       function handleFieldVisible(record) {
         openFieldDetailDrawer(true, record);
       }
@@ -225,74 +261,15 @@
         openFormDetailDrawer(true);
       }
-      function handlePreview(url, e) {
+      function handlePreview(url) {
         createImgPreview({ imageList: [url], defaultWidth: 500 });
         // e?.stopPropagation();
         // e?.preventDefault();
         return false;
       }
-      async function handleExport() {
-        const columns = getColumns();
-        const colObj = keyBy(columns, 'dataIndex');
-        const {
-          trackStageInfo,
-          reportInfo,
-          profitAnalysisInfo,
-          inspectionStageInfo,
-          ...baseFields
-        } = colObj;
-
-        for (const key in baseFields) {
-          baseFields[key] = 'selected';
-        }
-        delete baseFields.action;
-
-        const fieldVO = {
-          baseFields,
-          profitAnalysisFields: profitAnalysisInfo?.children?.length
-            ? reduce(
-                profitAnalysisInfo.children,
-                (result, item) => {
-                  result[item.dataIndex] = 'selected';
-                  return result;
-                },
-                {},
-              )
-            : {},
-          reportFields: reportInfo?.children?.length
-            ? reduce(
-                reportInfo.children,
-                (result, item) => {
-                  result[item.dataIndex] = 'selected';
-                  return result;
-                },
-                {},
-              )
-            : {},
-          trackStageFields: trackStageInfo?.children?.length
-            ? reduce(
-                trackStageInfo.children,
-                (result, item) => {
-                  result[item.dataIndex] = 'selected';
-                  return result;
-                },
-                {},
-              )
-            : {},
-          inspectionStageFields: inspectionStageInfo?.children?.length
-            ? reduce(
-                inspectionStageInfo.children,
-                (result, item) => {
-                  result[item.dataIndex] = 'selected';
-                  return result;
-                },
-                {},
-              )
-            : {},
-        };
-
-        await orderExport({ fieldVO });
+      async function handleExportModal() {
+        openExportModal(true);
       }
       const handleFormSuccess = () => {
@@ -300,9 +277,12 @@
       };
       return {
+        user,
         SELECT_FIELD_COLUMNS,
         fieldDetailRegister,
         profitModalRegister,
+        rateModalRegister,
+        exportModalRegister,
         historyDetailRegister,
         formDetailRegister,
         handleProfitModal,
@@ -321,9 +301,13 @@
         handleHistory,
         handleAdd,
         createImgPreview,
-        handleExport,
+        handleExportModal,
         handlePreview,
         handleFormSuccess,
+        handleRateModal,
+        openExportModal,
+        role,
+        ROLE,
       };
     },
   });
@@ -337,12 +321,17 @@
   }
   .ant-table-cell img {
-    width: 100px;
-    height: 100px;
+    width: 40px;
+    height: 40px;
   }
   .order-page .vben-basic-table .ant-form-item .ant-picker {
     width: 100%;
   }
+
+  .order-page .ant-table.ant-table-middle .ant-table-tbody > tr > td {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
 </style>
 ./constant
 import { ROLE } from './type.d';
 import { useOrderInfo } from '/@/hooks/component/order';
 import { useOrderStoreWithOut } from '/@/store/modules/order';
+import { formatToDate } from '/@/utils/dateUtil';
 // 角色
 // 业务员- 查看all，编辑-利润分析，报告书
@@ -11,21 +12,27 @@ import { useOrderStoreWithOut } from &#39;/@/store/modules/order&#39;;
 export const SELECT_FIELD_COLUMNS = [
   'projectNo',
   'customerCode',
+  'productionDepartment',
   'innerNo',
   'poColor',
   'cnColor',
   'productStyle',
   'outboundType',
   'packetType',
+  'ideaSource',
+  'manualPreform1',
+  'manualPreform2',
   'midCheckResult',
   'endCheckResult',
+  // 'exchangeRate',
+  'businessPerson',
 ];
 /**
  *
  * @returns 订单列表数据
  */
-const ORDER_LIST_BASE_FIELDS = [
+export const ORDER_LIST_BASE_FIELDS = [
   {
     title: '客户编码',
     width: 150,
@@ -110,11 +117,19 @@ const ORDER_LIST_BASE_FIELDS = [
     title: '生成科拖货时间',
     width: 150,
     dataIndex: 'productionDepartmentConsignTime',
+    customRender: (column) => {
+      const { record } = column || {};
+      return formatToDate(record?.productionDepartmentConsignTime);
+    },
   },
   {
     title: '订单上HOD时间',
     width: 150,
     dataIndex: 'orderHodTime',
+    customRender: (column) => {
+      const { record } = column || {};
+      return formatToDate(record?.orderHodTime);
+    },
   },
   {
     title: '出库类型',
@@ -126,9 +141,14 @@ const ORDER_LIST_BASE_FIELDS = [
     width: 150,
     dataIndex: 'packetType',
   },
+  {
+    title: '业务员',
+    width: 150,
+    dataIndex: 'businessPerson',
+  },
 ];
-const ORDER_LIST_REPORT_FIELDS = [
+export const ORDER_LIST_REPORT_FIELDS = [
   {
     title: '项目完成报告信息',
     width: 150,
@@ -137,35 +157,62 @@ const ORDER_LIST_REPORT_FIELDS = [
       {
         title: '想法来源',
         width: 150,
-        dataIndex: 'reportInfo.ideaSource',
+        dataIndex: 'ideaSource',
         customRender: (column) => {
           const { record } = column || {};
           return record?.reportInfo?.ideaSource;
         },
       },
       {
-        title: '手工初型',
+        title: '想法来源占比',
+        width: 150,
+        dataIndex: 'ideaSourceRate',
+        customRender: (column) => {
+          const { record } = column || {};
+          return record?.reportInfo?.ideaSourceRate;
+        },
+      },
+      {
+        title: '手工初型1',
+        width: 150,
+        dataIndex: 'manualPreform1',
+        customRender: (column) => {
+          const { record } = column || {};
+          return record?.reportInfo?.manualPreform1;
+        },
+      },
+      {
+        title: '手工初型1占比',
+        width: 150,
+        dataIndex: 'manualPreform1Rate',
+        customRender: (column) => {
+          const { record } = column || {};
+          return record?.reportInfo?.manualPreform1Rate;
+        },
+      },
+      {
+        title: '手工初型2',
         width: 150,
-        dataIndex: 'reportInfo.manualPreform',
+        dataIndex: 'manualPreform2',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.reportInfo?.manualPreform;
+          return record?.reportInfo?.manualPreform2;
         },
       },
       {
-        title: '想法和手工比例分配',
+        title: '手工初型2占比',
         width: 150,
-        dataIndex: 'reportInfo.ideaManualRate',
+        dataIndex: 'manualPreform2Rate',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.reportInfo?.ideaManualRate;
+          return record?.reportInfo?.manualPreform2Rate;
         },
       },
     ],
   },
 ];
-const ORDER_LIST_PROFIT_FIELDS = [
+export const ORDER_LIST_PROFIT_FIELDS = [
   {
     title: '利润分析信息',
     width: 150,
@@ -177,7 +224,9 @@ const ORDER_LIST_PROFIT_FIELDS = [
         dataIndex: 'customerPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.profitAnalysisInfo?.customerPrice;
+          return `${record?.profitAnalysisInfo?.customerCurrency || ''} ${
+            record?.profitAnalysisInfo?.customerPrice || ''
+          }`;
         },
       },
       {
@@ -195,7 +244,18 @@ const ORDER_LIST_PROFIT_FIELDS = [
         dataIndex: 'productionDepartmentPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.profitAnalysisInfo?.productionDepartmentPrice;
+          return `${record?.profitAnalysisInfo?.productionDepartmentCurrency || ''} ${
+            record?.profitAnalysisInfo?.productionDepartmentPrice || ''
+          }`;
+        },
+      },
+      {
+        title: '生成科总价',
+        width: 150,
+        dataIndex: 'productionDepartmentTotalPrice',
+        customRender: (column) => {
+          const { record } = column || {};
+          return record?.profitAnalysisInfo?.productionDepartmentTotalPrice;
         },
       },
       {
@@ -204,7 +264,9 @@ const ORDER_LIST_PROFIT_FIELDS = [
         dataIndex: 'packetPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.profitAnalysisInfo?.packetPrice;
+          return `${record?.profitAnalysisInfo?.packetCurrency || ''} ${
+            record?.profitAnalysisInfo?.packetPrice || ''
+          }`;
         },
       },
       {
@@ -234,11 +296,24 @@ const ORDER_LIST_PROFIT_FIELDS = [
           return record?.profitAnalysisInfo?.profitRate;
         },
       },
+      {
+        title: '利润率计算方式',
+        width: 150,
+        dataIndex: 'profitRate',
+        customRender: (column) => {
+          const { record } = column || {};
+          return record?.profitAnalysisInfo?.profitType === '0'
+            ? '方式1'
+            : record?.profitAnalysisInfo?.profitType === '1'
+            ? '方式2'
+            : '';
+        },
+      },
     ],
   },
 ];
-const ORDER_LIST_TRACK_FIELDS = [
+export const ORDER_LIST_TRACK_FIELDS = [
   {
     title: '跟单信息',
     width: 150,
@@ -250,7 +325,7 @@ const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'ppTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.trackStageInfo?.ppTime;
+          return formatToDate(record?.trackStageInfo?.ppTime);
         },
       },
       {
@@ -268,7 +343,7 @@ const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'esoSampleSendTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.trackStageInfo?.esoSampleSendTime;
+          return formatToDate(record?.trackStageInfo?.esoSampleSendTime);
         },
       },
       {
@@ -277,7 +352,7 @@ const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'shippmentSampleSendTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.trackStageInfo?.shippmentSampleSendTime;
+          return formatToDate(record?.trackStageInfo?.shippmentSampleSendTime);
         },
       },
       {
@@ -295,7 +370,7 @@ const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'selfTestPassTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.trackStageInfo?.selfTestPassTime;
+          return formatToDate(record?.trackStageInfo?.selfTestPassTime);
         },
       },
       {
@@ -304,7 +379,7 @@ const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'aitexTestSendTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.trackStageInfo?.aitexTestSendTime;
+          return formatToDate(record?.trackStageInfo?.aitexTestSendTime);
         },
       },
       {
@@ -322,7 +397,7 @@ const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'sgsTestSendTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.trackStageInfo?.sgsTestSendTime;
+          return formatToDate(record?.trackStageInfo?.sgsTestSendTime);
         },
       },
       {
@@ -349,7 +424,7 @@ const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'latestArrivalTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.trackStageInfo?.latestArrivalTime;
+          return formatToDate(record?.trackStageInfo?.latestArrivalTime);
         },
       },
       {
@@ -358,14 +433,14 @@ const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'latestBkTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.trackStageInfo?.latestBkTime;
+          return formatToDate(record?.trackStageInfo?.latestBkTime);
         },
       },
     ],
   },
 ];
-const ORDER_LIST_INSPECT_FIELDS = [
+export const ORDER_LIST_INSPECT_FIELDS = [
   {
     title: '质检信息',
     width: 150,
@@ -378,7 +453,7 @@ const ORDER_LIST_INSPECT_FIELDS = [
         dataIndex: 'midCheckApplyTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.inspectionStageInfo?.midCheckApplyTime;
+          return formatToDate(record?.inspectionStageInfo?.midCheckApplyTime);
         },
       },
       {
@@ -405,7 +480,7 @@ const ORDER_LIST_INSPECT_FIELDS = [
         dataIndex: 'endCheckApplyTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.inspectionStageInfo?.endCheckApplyTime;
+          return formatToDate(record?.inspectionStageInfo?.endCheckApplyTime);
         },
       },
       {
@@ -493,7 +568,9 @@ const ORDER_LIST_SCHEDULE = [
   },
 ];
+// 订单列表，也就是读权限
 export function getOrderColumns(role: ROLE) {
+  // 管理员/业务员看到所有列
   if (role === ROLE.ADMIN || role === ROLE.BUSINESS) {
     return [
       ...ORDER_LIST_BASE_FIELDS,
@@ -504,15 +581,16 @@ export function getOrderColumns(role: ROLE) {
       ...ORDER_LIST_SCHEDULE,
     ];
   }
-
+  // 跟单 -基本信息-利润分析（单价，总价），跟单，质检
   if (role === ROLE.TRACKER) {
     return [
       ...ORDER_LIST_BASE_FIELDS,
       ...ORDER_LIST_PROFIT_FIELDS.map((item) => {
         const children = item.children.filter(
-          (k) => k.dataIndex !== 'exchangeRate' && k.dataIndex !== 'profitRate',
+          (k) => k.dataIndex === 'customerPrice' || k.dataIndex === 'customerTotalPrice',
         );
         item.children = children;
+
         return item;
       }),
       ...ORDER_LIST_TRACK_FIELDS,
@@ -521,7 +599,8 @@ export function getOrderColumns(role: ROLE) {
     ];
   }
-  if (role === ROLE.INSPECT) {
+  // 质检-基本，跟单，质检
+  if (role === ROLE.INSPECT || role === ROLE.DATA_REPORT_USER) {
     return [
       ...ORDER_LIST_BASE_FIELDS,
       ...ORDER_LIST_TRACK_FIELDS,
@@ -532,7 +611,9 @@ export function getOrderColumns(role: ROLE) {
   return [];
 }
-
+/**
+ * drawer面板的字段
+ */
 // 基本信息
 export const FIELDS_BASE_INFO = [
   {
@@ -670,6 +751,13 @@ export const FIELDS_BASE_INFO = [
     label: '包装类型',
     rules: [{ required: true }],
   },
+  {
+    field: 'businessPerson',
+    component: 'Select',
+    labelWidth: 150,
+    label: '业务员',
+    rules: [{ required: true }],
+  },
 ];
 //项目完成报告信息
@@ -680,22 +768,44 @@ export const FIELDS_REPORT_INFO = [
     optionField: 'ideaSource',
     labelWidth: 150,
     label: '想法来源',
-    // rules: [{ required: true }],
+    rules: [{ required: true }],
+  },
+  {
+    field: 'ideaSourceRate',
+    component: 'InputNumber',
+    optionField: 'ideaSourceRate',
+    labelWidth: 150,
+    label: '想法来源占比',
+    rules: [{ required: true }],
   },
   {
-    field: 'manualPreform',
+    field: 'manualPreform1',
     component: 'Select',
-    optionField: 'manualPreform',
+    optionField: 'manualPreform1',
     labelWidth: 150,
-    label: '手工初型',
-    // rules: [{ required: true }],
+    label: '手工初型1',
+    rules: [{ required: true }],
   },
   {
-    field: 'ideaManualRate',
-    component: 'Input',
+    field: 'manualPreform1Rate',
+    component: 'InputNumber',
     labelWidth: 150,
-    label: '想法和手工比例分配',
-    // rules: [{ required: true }],
+    label: '手工初型1占比',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'manualPreform2',
+    component: 'Select',
+    labelWidth: 150,
+    label: '手工初型2',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'manualPreform2Rate',
+    component: 'InputNumber',
+    labelWidth: 150,
+    label: '手工初型2占比',
+    rules: [{ required: true }],
   },
 ];
@@ -836,7 +946,7 @@ export const FIELDS_PROFIT_INFO = [
     field: 'customerPrice',
     component: 'InputNumber',
     label: '客户单价',
-    // rules: [{ required: true }],
+    rules: [{ required: true }],
   },
   // {
   //   field: 'customerTotalPrice',
@@ -848,7 +958,8 @@ export const FIELDS_PROFIT_INFO = [
     field: 'customerCurrency',
     component: 'Select',
     label: '客户单价货币单位',
-    // rules: [{ required: true }],
+    labelWidth: 400,
+    rules: [{ required: true }],
     componentProps: {
       options: [
         { label: '$', value: '$' },
@@ -860,13 +971,13 @@ export const FIELDS_PROFIT_INFO = [
     field: 'productionDepartmentPrice',
     component: 'InputNumber',
     label: '生成科单价',
-    // rules: [{ required: true }],
+    rules: [{ required: true }],
   },
   {
     field: 'productionDepartmentCurrency',
     component: 'Select',
     label: '生成科货币单位',
-    // rules: [{ required: true }],
+    rules: [{ required: true }],
     componentProps: {
       options: [
         { label: '$', value: '$' },
@@ -884,6 +995,14 @@ export const FIELDS_PROFIT_INFO = [
     label: '包装费用',
     component: 'InputNumber',
     field: 'packetPrice',
+    fieldComponent: { disabled: true },
+    // rules: [{ required: true }],
+  },
+  {
+    label: '汇率',
+    component: 'InputNumber',
+    field: 'exchangeRate',
+    fieldComponent: { disabled: true },
     // rules: [{ required: true }],
   },
   // {
@@ -892,30 +1011,39 @@ export const FIELDS_PROFIT_INFO = [
   //   field: 'packetTotalPrice',
   //   rules: [{ required: true }],
   // },
+  // {
+  //   label: '包装费用货币单位',
+  //   component: 'Input',
+  //   field: 'packetCurrency',
+  //   value: '$',
+  //   // rules: [{ required: true }],
+  //   componentProps: {
+  //     disblaed: true,
+  //     // options: [
+  //     //   { label: '$', value: '$' },
+  //     //   { label: '￥', value: '￥' },
+  //     // ],
+  //   },
+  // },
+  // {
+  //   label: '汇率',
+  //   component: 'Select',
+  //   field: 'exchangeRate',
+  //   // rules: [{ required: true }],
+  // },
   {
-    label: '包装费用货币单位',
+    label: '计算利润方式',
     component: 'Select',
-    field: 'packetCurrency',
-    // rules: [{ required: true }],
+    field: 'profitType',
     componentProps: {
+      defaultValue: '0',
       options: [
-        { label: '$', value: '$' },
-        { label: '￥', value: '￥' },
+        { label: '方式一: 1 -（LOCAL单价 / 汇率 + 包装费用）/ 客户单价', value: '0' },
+        { label: '方式二: 1 -（LOCAL单价/汇率 / (客户单价-包装费用)', value: '1' },
       ],
     },
-  },
-  {
-    label: '汇率',
-    component: 'InputNumber',
-    field: 'exchangeRate',
     // rules: [{ required: true }],
   },
-  // {
-  //   label: '利润率',
-  //   component: 'Input',
-  //   field: 'profitRate',
-  //   rules: [{ required: true }],
-  // },
 ];
 //质量检测信息
@@ -1196,14 +1324,25 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
         },
       },
       {
-        field: `manualPreform`,
-        label: `手工初型`,
+        field: `manualPreform1`,
+        label: `手工初型1`,
+        component: 'Select',
+        colProps: {
+          span: 6,
+        },
+        labelWidth: 150,
+        componentProps: {
+          options: manualPreform,
+        },
+      },
+      {
+        field: `manualPreform2`,
+        label: `手工初型2`,
         component: 'Select',
         colProps: {
           span: 6,
         },
         labelWidth: 150,
-
         componentProps: {
           options: manualPreform,
         },
 export enum ROLE {
   ADMIN = 'admin', // 超管
+  CUSTOM_ADMIN = 'custom_admin', // 客户管理员
+  DATA_REPORT_USER = 'data_report_user', //数据分析员
   BUSINESS = 'business_user', // 业务员
   TRACKER = 'tracker_user', // 跟单员
   INSPECT = 'inspect_user', // 质检员
@@ -2,21 +2,49 @@
   <template 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
           size="large"
           v-model:value="formData.account"
           :placeholder="t('sys.login.userName')"
         />
+      </FormItem> -->
+      <FormItem name="phone" class="enter-x">
+        <Input size="large" v-model:value="formData.phone" :placeholder="t('sys.login.mobile')" />
+      </FormItem>
+      <FormItem name="password" class="enter-x">
+        <Input
+          size="large"
+          visibilityToggle
+          v-model:value="formData.password"
+          placeholder="请输入密码"
+        />
+      </FormItem>
+      <FormItem name="confirmPassword" class="enter-x">
+        <Input
+          size="large"
+          visibilityToggle
+          v-model:value="formData.confirmPassword"
+          placeholder="请输入确认密码"
+        />
       </FormItem>
-      <FormItem name="mobile" class="enter-x">
-        <Input size="large" v-model:value="formData.mobile" :placeholder="t('sys.login.mobile')" />
+      <FormItem name="imgCaptchaCode" class="enter-x">
+        <div className="flex">
+          <img :src="imgCaptcha" class="cursor-pointer" @click="getImgCaptcha" />
+          <Input
+            size="large"
+            visibilityToggle
+            v-model:value="imgCaptchaCode"
+            placeholder="请输入图片验证码"
+          />
+        </div>
       </FormItem>
-      <FormItem name="sms" class="enter-x">
+      <FormItem name="smsCaptchaCode" class="enter-x">
         <CountdownInput
           size="large"
-          v-model:value="formData.sms"
+          v-model:value="formData.smsCaptchaCode"
+          :sendCodeApi="handleSendMsg"
           :placeholder="t('sys.login.smsCode')"
         />
       </FormItem>
@@ -33,12 +61,14 @@
   </template>
 </template>
 <script lang="ts" setup>
-  import { reactive, ref, computed, unref } from 'vue';
+  import { reactive, ref, computed, unref, onMounted } from 'vue';
   import LoginFormTitle from './LoginFormTitle.vue';
-  import { Form, Input, Button } from 'ant-design-vue';
+  import { Form, Input, Button, message } from 'ant-design-vue';
   import { CountdownInput } from '/@/components/CountDown';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useLoginState, useFormRules, LoginStateEnum } from './useLogin';
+  import { forgetPassword, getSms } from '/@/api/sys/user';
+  import { useUserStore } from '/@/store/modules/user';
   const FormItem = Form.Item;
   const { t } = useI18n();
@@ -49,16 +79,56 @@
   const loading = ref(false);
   const formData = reactive({
-    account: '',
-    mobile: '',
-    sms: '',
+    phone: '',
+    smsCaptchaCode: '',
+    password: '',
+    confirmPassword: '',
+  });
+
+  const imgCaptchaCode = ref('');
+  const imgCaptcha = ref('');
+  const imgCaptchaUuid = ref('');
+  const userStore = useUserStore();
+
+  onMounted(async () => {
+    getImgCaptcha();
   });
+  const getImgCaptcha = async () => {
+    const data = await userStore.getImageCaptcha();
+    imgCaptcha.value = data?.img;
+    imgCaptchaUuid.value = data?.uuid;
+  };
+
+  const handleSendMsg = async () => {
+    if (!formData.phone) {
+      message.error('请输入手机号');
+      return false;
+    }
+    if (!imgCaptchaCode.value) {
+      message.error('请输入验证码');
+      return false;
+    }
+    if (formData.password !== formData.confirmPassword) {
+      message.error('密码和确认密码不一样');
+      return false;
+    }
+    return await getSms({
+      phone: formData.phone,
+      imgCaptchaCode: imgCaptchaCode.value,
+      imgCaptchaUuid: imgCaptchaUuid.value,
+    });
+  };
+
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.RESET_PASSWORD);
   async function handleReset() {
-    const form = unref(formRef);
-    if (!form) return;
-    await form.resetFields();
+    try {
+      await formRef.value.validate();
+      const form = unref(formRef);
+      if (!form) return;
+      await forgetPassword({ ...formData });
+      handleBackLogin();
+    } catch (error) {}
   }
 </script>
@@ -34,13 +34,15 @@
       />
     </FormItem>
     <FormItem name="imgCaptchaCode" class="enter-x" label="验证码">
-      <img :src="imgCaptcha" class="cursor-pointer" @click="getImgCaptcha" />
+      <img :src="imgCaptcha" class="cursor-pointer mr-40" @click="getImgCaptcha" />
+      <Button type="link" size="small" @click="setLoginState(LoginStateEnum.RESET_PASSWORD)">
+        {{ t('sys.login.forgetPassword') }}
+      </Button>
     </FormItem>
-    <ARow class="enter-x">
+    <!-- <ARow class="enter-x">
       <ACol :span="12">
         <FormItem>
-          <!-- No logic, you need to deal with it yourself -->
           <Checkbox v-model:checked="rememberMe" size="small">
             {{ t('sys.login.rememberMe') }}
           </Checkbox>
@@ -48,13 +50,12 @@
       </ACol>
       <ACol :span="12">
         <FormItem :style="{ 'text-align': 'right' }">
-          <!-- No logic, you need to deal with it yourself -->
           <Button type="link" size="small" @click="setLoginState(LoginStateEnum.RESET_PASSWORD)">
             {{ t('sys.login.forgetPassword') }}
           </Button>
         </FormItem>
       </ACol>
-    </ARow>
+    </ARow> -->
     <FormItem class="enter-x">
       <Button type="primary" size="large" block @click="handleLogin" :loading="loading">
@@ -64,23 +65,23 @@
         {{ t('sys.login.registerButton') }}
       </Button> -->
     </FormItem>
-    <ARow class="enter-x">
-      <!-- <ACol :md="8" :xs="24">
+    <!-- <ARow class="enter-x"> -->
+    <!-- <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 :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 :md="6" :xs="24">
         <Button block @click="setLoginState(LoginStateEnum.REGISTER)">
           {{ t('sys.login.registerButton') }}
         </Button>
       </ACol> -->
-    </ARow>
+    <!-- </ARow> -->
     <!-- 
     <Divider class="enter-x">{{ t('sys.login.otherSignIn') }}</Divider>
@@ -133,8 +134,8 @@
   const imgCaptchaUuid = ref('');
   const formData = reactive({
-    userName: 'admin',
-    password: '123456',
+    userName: '',
+    password: '',
     imgCaptchaCode: '',
     imgCaptchaUuid: '',
   });
@@ -53,6 +53,7 @@ export function useFormRules(formData?: Recordable) {
   const getPasswordFormRule = computed(() => createRule(t('sys.login.passwordPlaceholder')));
   const getSmsFormRule = computed(() => createRule(t('sys.login.smsPlaceholder')));
   const getMobileFormRule = computed(() => createRule(t('sys.login.mobilePlaceholder')));
+  const getConfirmPasswordFormRule = computed(() => createRule(t('请输入确认密码')));
   const validatePolicy = async (_: RuleObject, value: boolean) => {
     return !value ? Promise.reject(t('sys.login.policyPlaceholder')) : Promise.resolve();
@@ -75,10 +76,11 @@ export function useFormRules(formData?: Recordable) {
     const passwordFormRule = unref(getPasswordFormRule);
     const smsFormRule = unref(getSmsFormRule);
     const mobileFormRule = unref(getMobileFormRule);
+    const confirmPasswordFormRule = unref(getConfirmPasswordFormRule);
     const mobileRule = {
       sms: smsFormRule,
-      mobile: mobileFormRule,
+      phone: mobileFormRule,
     };
     switch (unref(currentState)) {
       // register form rules
@@ -97,6 +99,8 @@ export function useFormRules(formData?: Recordable) {
       case LoginStateEnum.RESET_PASSWORD:
         return {
           userName: accountFormRule,
+          password: passwordFormRule,
+          confirmPassword: confirmPasswordFormRule,
           ...mobileRule,
         };
@@ -20,15 +20,15 @@ export default defineApplicationConfig({
     server: {
       proxy: {
         '/basic-api/order': {
-          target: 'http://39.108.227.113:8010',
+          target: 'http://39.108.227.113:8000',
           // target: 'http://39.108.227.113:3000/mock/35',
-          // http://39.108.227.113:8010/order/erp/captcha/get_img_captcha_code
+          // http://39.108.227.113:8000/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',
+          target: 'http://39.108.227.113:8000',
           changeOrigin: true,
           ws: true,
           // rewrite: (path) => {