feat: 联调订单

sanmu
1 parent bf93cc5f
Showing 16 changed files with 575 additions and 285 deletions
src/api/project/account.ts
src/api/project/approve.ts
src/api/project/order.ts
src/components/FieldUpload/src/FieldUpload.vue
src/views/dashboard/analysis/components/GrowCard.vue
src/views/project/account/AccountModal.vue
src/views/project/account/account.data.ts
src/views/project/account/index.vue
src/views/project/approve/FieldPanel.vue
src/views/project/approve/ProfitPanel.vue
src/views/project/approve/ReportPanel.vue
src/views/project/approve/Text.vue
src/views/project/approve/index.vue
src/views/project/order/FormDetail.vue
src/views/project/order/component/BaseFormPanel.vue
src/views/project/order/tableData.tsx
@@ -3,9 +3,9 @@ import { defHttp } from &#39;/@/utils/http/axios&#39;;
 enum Api {
   ROLE_LIST = '/order/erp/roles/all',
   USER_LIST = '/order/erp/users/list_by_page',
-  USER_ADD = '/order/erp/roles/add',
-  USER_EDIT = '/order/erp/roles/edit',
-  USER_DELETE = '/order/erp/roles/delete',
+  USER_ADD = '/order/erp/users/add',
+  USER_EDIT = '/order/erp/users/edit',
+  USER_DELETE = '/order/erp/users/delete',
 }
 export const getRoleList = async (params: any) => {
@@ -21,7 +21,10 @@ export const getUserList = async (params: any) =&gt; {
     params,
   });
   return new Promise((resolve) => {
-    resolve(res.records);
+    resolve({
+      items: res.records,
+      total: res.total,
+    });
   });
 };
@@ -33,17 +36,23 @@ export const getUserList = async (params: any) =&gt; {
 // };
 export const userAdd = async (params: any) => {
-  return defHttp.post<any>({
-    url: Api.USER_ADD,
-    params,
-  });
+  return defHttp.post<any>(
+    {
+      url: Api.USER_ADD,
+      params,
+    },
+    { message: '保存成功' },
+  );
 };
 export const userEdit = async (params: any) => {
-  return defHttp.post<any>({
-    url: Api.USER_EDIT,
-    params,
-  });
+  return defHttp.post<any>(
+    {
+      url: Api.USER_EDIT,
+      params,
+    },
+    { message: '保存成功' },
+  );
 };
 export const userDelete = async (params: any) => {
@@ -28,35 +28,11 @@ export const getWaitListApi = async (params: DemoParams) =&gt; {
   });
   res.records = res.records.map((item) => {
-    item.fields = [];
-    !isEmpty(item.fieldInfos.baseFields) &&
-      Object.entries(item.fieldInfos.baseFields).map(([key, value]) => {
-        if (value === 'UN_LOCKED') {
-          const obj = find(FIELDS_BASE_INFO, { field: key });
-          item.fields.push(obj?.label);
-        }
-      });
-    !isEmpty(item.fieldInfos.reportFields) &&
-      Object.entries(item.fieldInfos.reportFields).map(([key, value]) => {
-        if (value === 'UN_LOCKED') {
-          const obj = find(FIELDS_REPORT_INFO, { field: key });
-          item.fields.push(obj?.label);
-        }
-      });
-    !isEmpty(item.fieldInfos.reportFields) &&
-      Object.entries(item.fieldInfos.reportFields).map(([key, value]) => {
-        if (value === 'UN_LOCKED') {
-          const obj = find(FIELDS_PROFIT_INFO, { field: key });
-          item.fields.push(obj?.label);
-        }
-      });
-
-    item.fields = item.fields.join(',');
     return item;
   });
   return new Promise((resolve) => {
-    resolve(res.records);
+    resolve({ items: res.records, total: res.total });
   });
 };
@@ -67,33 +43,10 @@ export const getApprovedListApi = async (params: any) =&gt; {
   });
   res.records = res.records.map((item) => {
-    item.fields = [];
-    !isEmpty(item.fieldInfos.baseFields) &&
-      Object.entries(item.fieldInfos.baseFields).map(([key, value]) => {
-        if (value === 'UN_LOCKED') {
-          const obj = find(FIELDS_BASE_INFO, { field: key });
-          item.fields.push(obj?.label);
-        }
-      });
-    !isEmpty(item.fieldInfos.reportFields) &&
-      Object.entries(item.fieldInfos.reportFields).map(([key, value]) => {
-        if (value === 'UN_LOCKED') {
-          const obj = find(FIELDS_REPORT_INFO, { field: key });
-          item.fields.push(obj?.label);
-        }
-      });
-    !isEmpty(item.fieldInfos.reportFields) &&
-      Object.entries(item.fieldInfos.reportFields).map(([key, value]) => {
-        if (value === 'UN_LOCKED') {
-          const obj = find(FIELDS_PROFIT_INFO, { field: key });
-          item.fields.push(obj?.label);
-        }
-      });
-    item.fields = item.fields.join(',');
     return item;
   });
   return new Promise((resolve) => {
-    resolve(res.records);
+    resolve({ items: res.records, total: res.total });
   });
 };
@@ -9,7 +9,7 @@ enum Api {
   ORDER = '/order/erp/order/list_by_page',
   FIELD_AUTH = '/order/erp/order/field_unlock_apply',
   EXPORT = '/order/erp/order/export',
-  UPLOAD = '/api/localStorage/upload',
+  UPLOAD = '/api/localStorage/uploadOss',
   DICT_INIT = '/order/erp/dictionary/get_all',
   DICT_ADD = '/order/erp/dictionary/add',
@@ -26,7 +26,7 @@ export const orderCreate = async (data: any) =&gt; {
 };
 export const orderUpdate = async (data: any) => {
-  const res = await defHttp.post<any>({ url: Api.UPDATE, data });
+  const res = await defHttp.post<any>({ url: Api.UPDATE, data }, { message: '操作成功' });
   return res;
 };
@@ -5,7 +5,7 @@
     list-type="picture-card"
     class="avatar-uploader"
     :show-upload-list="false"
-    action="/api/localStorage/upload"
+    action="/api/localStorage/upload_oss"
     accept=".jpg,.jpeg,.gif,.png,.webp"
     :data="handleData"
   >
@@ -73,7 +73,7 @@
       {
         title: '订单初始化',
         icon: 'transaction|svg',
-        value: 5000,
+        value: data?.orderCount || 0,
         total: 50000,
         color: 'purple',
         action: '年',
@@ -49,7 +49,10 @@
           setModalProps({ confirmLoading: true });
           closeModal();
-          emit('success', { isUpdate: unref(isUpdate), values: { ...values, id: rowId.value } });
+          emit('success', {
+            isUpdate: unref(isUpdate),
+            values: { ...values, id: rowId.value || undefined },
+          });
         } finally {
           setModalProps({ confirmLoading: false });
         }
@@ -80,7 +80,7 @@ export const accountFormSchema: FormSchema[] = [
   // },
   {
     label: '角色',
-    field: 'roleName',
+    field: 'roleId',
     component: 'ApiSelect',
     componentProps: {
       api: getRoleList,
@@ -19,16 +19,16 @@
                 tooltip: '编辑用户资料',
                 onClick: handleEdit.bind(null, record),
               },
-              {
-                icon: 'ant-design:delete-outlined',
-                color: 'error',
-                tooltip: '删除此账号',
-                popConfirm: {
-                  title: '是否确认删除',
-                  placement: 'left',
-                  confirm: handleDelete.bind(null, record),
-                },
-              },
+              // {
+              //   icon: 'ant-design:delete-outlined',
+              //   color: 'error',
+              //   tooltip: '删除此账号',
+              //   popConfirm: {
+              //     title: '是否确认删除',
+              //     placement: 'left',
+              //     confirm: handleDelete.bind(null, record),
+              //   },
+              // },
             ]"
           />
         </template>
+<template>
+  <PageWrapper contentBackground>
+    <BasicTable @register="registerTable">
+      <template #form-custom> custom-slot </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'action'">
+          <TableAction
+            :actions="[
+              {
+                label: '详情',
+                // icon: 'ic:outline-delete-outline',
+                onClick: handleDetail.bind(null, record),
+              },
+            ]"
+          />
+        </template>
+      </template>
+    </BasicTable>
+    <BasicDrawer
+      :showFooter="!isApproved"
+      @register="registerDrawer"
+      title="申请信息"
+      okText="通过"
+      @ok="handleTrue"
+    >
+      <h2>基本信息</h2>
+      <div v-for="field in baseInfos" :key="field">
+        <span className="w-[140px] inline-block text-right mr-3">{{ field.label }}:</span
+        ><span>{{ field.value }}</span>
+      </div>
+      <h2 className="mt-8">基本信息申请字段</h2>
+      <div>{{ fieldInfos.baseFields.join(' , ') }}</div>
+      <h2 className="mt-8">利润分析表申请字段</h2>
+      <div>
+        {{ fieldInfos.profitFields.join(' , ') }}
+      </div>
+      <h2 className="mt-8">项目报告书申请字段</h2>
+      <div>
+        <span>{{ fieldInfos.reportFields.join(' , ') }}</span>
+      </div>
+      <template #appendFooter>
+        <a-button @click="handleFalse"> 不通过</a-button>
+      </template>
+    </BasicDrawer>
+  </PageWrapper>
+</template>
+<script lang="ts">
+  import { 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, FIELDS_PROFIT_INFO, FIELDS_REPORT_INFO } from '../order/tableData';
+  import { find, isEmpty } from 'lodash-es';
+
+  export default defineComponent({
+    components: {
+      PageWrapper,
+      BasicTable,
+      BasicDrawer,
+      TableAction,
+    },
+    props: {
+      isApproved: { type: Boolean },
+    },
+    setup(props) {
+      const checkedKeys = ref<Array<string | number>>([]);
+      const currentKey = ref('1');
+      const [registerDrawer, { openDrawer, closeDrawer }] = useDrawer();
+      const fieldInfos = ref({
+        baseFields: [],
+        reportFields: [],
+        profitFields: [],
+      });
+      const baseInfos = ref({});
+      const id = ref('');
+
+      const [registerTable, { reload }] = useTable({
+        api: props.isApproved ? getApprovedListApi : getWaitListApi,
+        searchInfo: { type: 0 },
+
+        columns: [
+          {
+            title: '申请人',
+            dataIndex: 'createBy',
+            width: 150,
+          },
+        ],
+        // useSearchForm: true,
+        // formConfig: getFormConfig(),
+        rowKey: 'id',
+        actionColumn: {
+          width: 160,
+          title: 'Action',
+          dataIndex: 'action',
+          // slots: { customRender: 'action' },
+        },
+      });
+
+      function onSelect(record, selected) {
+        if (selected) {
+          checkedKeys.value = [...checkedKeys.value, record.id];
+        } else {
+          checkedKeys.value = checkedKeys.value.filter((id) => id !== record.id);
+        }
+      }
+      function onSelectAll(selected, selectedRows, changeRows) {
+        const changeIds = changeRows.map((item) => item.id);
+        if (selected) {
+          checkedKeys.value = [...checkedKeys.value, ...changeIds];
+        } else {
+          checkedKeys.value = checkedKeys.value.filter((id) => {
+            return !changeIds.includes(id);
+          });
+        }
+      }
+      function handleEdit(record, e) {
+        e?.stopPropagation();
+        return false;
+      }
+
+      function handleProfitModal() {}
+
+      async function handleDetail(data) {
+        fieldInfos.value = {
+          baseFields: [],
+          reportFields: [],
+          profitFields: [],
+        };
+        openDrawer(true, { data });
+
+        !isEmpty(data.fieldInfos.baseFields) &&
+          Object.entries(data.fieldInfos.baseFields)?.map(([key, value]) => {
+            if (value === 'UN_LOCKED') {
+              const obj = find(FIELDS_BASE_INFO, { field: key });
+              fieldInfos.value.baseFields.push(obj?.label);
+            }
+          });
+        !isEmpty(data.fieldInfos.reportFields) &&
+          Object.entries(data.fieldInfos.reportFields).map(([key, value]) => {
+            if (value === 'UN_LOCKED') {
+              const obj = find(FIELDS_REPORT_INFO, { field: key });
+              fieldInfos.value.reportFields.push(obj?.label);
+            }
+          });
+        !isEmpty(data.fieldInfos.profitAnalysisFields) &&
+          Object.entries(data.fieldInfos.profitAnalysisFields).map(([key, value]) => {
+            if (value === 'UN_LOCKED') {
+              const obj = find(FIELDS_PROFIT_INFO, { field: key });
+              fieldInfos.value.profitFields.push(obj?.label);
+            }
+          });
+
+        id.value = data.id;
+        baseInfos.value = FIELDS_BASE_INFO.map((field) => {
+          return {
+            label: field.label,
+            value: data.orderBaseInfo[field.field],
+          };
+        }).filter((item) => !!item.value);
+      }
+
+      async function handleTrue() {
+        await approveAuditApi({ status: 10, id: id.value });
+        reload();
+        closeDrawer();
+      }
+
+      async function handleFalse() {
+        await approveAuditApi({ status: 20, id: id.value });
+        reload();
+        closeDrawer();
+      }
+      return {
+        handleProfitModal,
+        registerTable,
+        checkedKeys,
+        currentKey,
+        onSelect,
+        handleEdit,
+        onSelectAll,
+        handleDetail,
+        registerDrawer,
+        fieldInfos,
+        baseInfos,
+        handleTrue,
+        handleFalse,
+      };
+    },
+  });
+</script>
@@ -7,44 +7,67 @@
           <TableAction
             :actions="[
               {
-                label: '通过',
+                label: '详情',
                 // icon: 'ic:outline-delete-outline',
-                onClick: handleTrue.bind(null, record),
-              },
-              {
-                label: '拒绝',
-                // icon: 'ic:outline-delete-outline',
-                onClick: handleFalse.bind(null, record),
+                onClick: handleDetail.bind(null, record),
               },
             ]"
           />
         </template>
       </template>
     </BasicTable>
+    <BasicDrawer
+      :showFooter="!isApproved"
+      @register="registerDrawer"
+      title="申请信息"
+      okText="通过"
+      @ok="handleTrue"
+    >
+      <h2>基本信息</h2>
+      <div v-for="field in baseInfos" :key="field" className="mb-8">
+        <span className="w-[140px] inline-block text-right mr-3">{{ field.label }}:</span
+        ><span>{{ field.value }}</span>
+      </div>
+      <h2>项目报告书信息</h2>
+      <div v-for="field in fieldInfos" :key="field">
+        <span className="w-[140px] inline-block text-right mr-3">{{ field.label }}:</span
+        ><span>{{ field.value }}</span>
+      </div>
+      <template #appendFooter>
+        <a-button @click="handleFalse"> 不通过</a-button>
+      </template>
+    </BasicDrawer>
   </PageWrapper>
 </template>
 <script lang="ts">
   import { defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { Tabs } from 'ant-design-vue';
   import { PageWrapper } from '/@/components/Page';
+  import { BasicDrawer, useDrawer } from '/@/components/Drawer';
-  import { approveAuditApi, getWaitListApi } from '/@/api/project/approve';
+  import { approveAuditApi, getApprovedListApi, getWaitListApi } from '/@/api/project/approve';
+  import { FIELDS_BASE_INFO, FIELDS_PROFIT_INFO, FIELDS_REPORT_INFO } from '../order/tableData';
   export default defineComponent({
     components: {
       PageWrapper,
       BasicTable,
+      BasicDrawer,
       TableAction,
-      [Tabs.name]: Tabs,
-      [Tabs.TabPane.name]: Tabs.TabPane,
     },
-    setup() {
+    props: {
+      isApproved: { type: Boolean },
+    },
+    setup(props) {
       const checkedKeys = ref<Array<string | number>>([]);
       const currentKey = ref('1');
+      const [registerDrawer, { openDrawer, closeDrawer }] = useDrawer();
+      const fieldInfos = ref({});
+      const baseInfos = ref({});
+      const id = ref('');
       const [registerTable, { reload }] = useTable({
-        api: getWaitListApi,
+        api: props.isApproved ? getApprovedListApi : getWaitListApi,
         searchInfo: { type: 10 },
         columns: [
@@ -53,32 +76,6 @@
             dataIndex: 'createBy',
             width: 150,
           },
-          {
-            title: '申请字段',
-            dataIndex: 'fields',
-            width: 600,
-          },
-          {
-            title: '订单号',
-            dataIndex: 'no6',
-          },
-          {
-            title: '订单字段1',
-            dataIndex: 'no5',
-          },
-          {
-            title: '订单字段2',
-            dataIndex: 'no4',
-          },
-          {
-            title: '订单字段3',
-            dataIndex: 'no3',
-          },
-
-          {
-            title: '订单字段5',
-            dataIndex: 'no1',
-          },
         ],
         // useSearchForm: true,
         // formConfig: getFormConfig(),
@@ -115,16 +112,34 @@
       function handleProfitModal() {}
-      async function handleTrue(record) {
-        await approveAuditApi({ status: 10, id: record.id });
-        reload();
+      async function handleDetail(data) {
+        openDrawer(true, { data });
+        id.value = data.id;
+        fieldInfos.value = FIELDS_PROFIT_INFO.map((field) => {
+          return {
+            label: field.label,
+            value: data.fieldInfos.profitAnalysisFields[field.field],
+          };
+        }).filter((item) => !!item.value);
+        baseInfos.value = FIELDS_BASE_INFO.map((field) => {
+          return {
+            label: field.label,
+            value: data.orderBaseInfo[field.field],
+          };
+        }).filter((item) => !!item.value);
       }
-      async function handleFalse(record) {
-        await approveAuditApi({ status: 20, id: record.id });
+      async function handleTrue() {
+        await approveAuditApi({ status: 10, id: id.value });
         reload();
+        closeDrawer();
       }
+      async function handleFalse() {
+        await approveAuditApi({ status: 20, id: id.value });
+        reload();
+        closeDrawer();
+      }
       return {
         handleProfitModal,
         registerTable,
@@ -133,6 +148,10 @@
         onSelect,
         handleEdit,
         onSelectAll,
+        handleDetail,
+        registerDrawer,
+        fieldInfos,
+        baseInfos,
         handleTrue,
         handleFalse,
       };
@@ -7,44 +7,67 @@
           <TableAction
             :actions="[
               {
-                label: '通过',
+                label: '详情',
                 // icon: 'ic:outline-delete-outline',
-                onClick: handleTrue.bind(null, record),
-              },
-              {
-                label: '拒绝',
-                // icon: 'ic:outline-delete-outline',
-                onClick: handleFalse.bind(null, record),
+                onClick: handleDetail.bind(null, record),
               },
             ]"
           />
         </template>
       </template>
     </BasicTable>
+    <BasicDrawer
+      :showFooter="!isApproved"
+      @register="registerDrawer"
+      title="申请信息"
+      okText="通过"
+      @ok="handleTrue"
+    >
+      <h2>基本信息</h2>
+      <div v-for="field in baseInfos" :key="field" className="mb-8">
+        <span className="w-[140px] inline-block text-right mr-3">{{ field.label }}:</span
+        ><span>{{ field.value }}</span>
+      </div>
+      <h2>项目报告书信息</h2>
+      <div v-for="field in fieldInfos" :key="field">
+        <span className="w-[140px] inline-block text-right mr-3">{{ field.label }}:</span
+        ><span>{{ field.value }}</span>
+      </div>
+      <template #appendFooter>
+        <a-button @click="handleFalse"> 不通过</a-button>
+      </template>
+    </BasicDrawer>
   </PageWrapper>
 </template>
 <script lang="ts">
   import { defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { Tabs } from 'ant-design-vue';
   import { PageWrapper } from '/@/components/Page';
+  import { BasicDrawer, useDrawer } from '/@/components/Drawer';
-  import { approveAuditApi, getWaitListApi, getApprovedListApi } from '/@/api/project/approve';
+  import { approveAuditApi, getApprovedListApi, getWaitListApi } from '/@/api/project/approve';
+  import { FIELDS_BASE_INFO, FIELDS_REPORT_INFO } from '../order/tableData';
   export default defineComponent({
     components: {
       PageWrapper,
       BasicTable,
+      BasicDrawer,
       TableAction,
-      [Tabs.name]: Tabs,
-      [Tabs.TabPane.name]: Tabs.TabPane,
     },
-    setup() {
+    props: {
+      isApproved: { type: Boolean },
+    },
+    setup(props) {
       const checkedKeys = ref<Array<string | number>>([]);
       const currentKey = ref('1');
+      const [registerDrawer, { openDrawer, closeDrawer }] = useDrawer();
+      const fieldInfos = ref({});
+      const baseInfos = ref({});
+      const id = ref('');
       const [registerTable, { reload }] = useTable({
-        api: getWaitListApi,
+        api: props.isApproved ? getApprovedListApi : getWaitListApi,
         searchInfo: { type: 20 },
         columns: [
@@ -53,32 +76,6 @@
             dataIndex: 'createBy',
             width: 150,
           },
-          {
-            title: '申请字段',
-            dataIndex: 'fields',
-            width: 600,
-          },
-          {
-            title: '订单号',
-            dataIndex: 'no6',
-          },
-          {
-            title: '订单字段1',
-            dataIndex: 'no5',
-          },
-          {
-            title: '订单字段2',
-            dataIndex: 'no4',
-          },
-          {
-            title: '订单字段3',
-            dataIndex: 'no3',
-          },
-
-          {
-            title: '订单字段5',
-            dataIndex: 'no1',
-          },
         ],
         // useSearchForm: true,
         // formConfig: getFormConfig(),
@@ -115,16 +112,34 @@
       function handleProfitModal() {}
-      async function handleTrue(record) {
-        await approveAuditApi({ status: 10, id: record.id });
-        reload();
+      async function handleDetail(data) {
+        openDrawer(true, { data });
+        id.value = data.id;
+        fieldInfos.value = FIELDS_REPORT_INFO.map((field) => {
+          return {
+            label: field.label,
+            value: data.fieldInfos.reportFields[field.field],
+          };
+        }).filter((item) => !!item.value);
+        baseInfos.value = FIELDS_BASE_INFO.map((field) => {
+          return {
+            label: field.label,
+            value: data.orderBaseInfo[field.field],
+          };
+        }).filter((item) => !!item.value);
       }
-      async function handleFalse(record) {
-        await approveAuditApi({ status: 20, id: record.id });
+      async function handleTrue() {
+        await approveAuditApi({ status: 10, id: id.value });
         reload();
+        closeDrawer();
       }
+      async function handleFalse() {
+        await approveAuditApi({ status: 20, id: id.value });
+        reload();
+        closeDrawer();
+      }
       return {
         handleProfitModal,
         registerTable,
@@ -133,6 +148,10 @@
         onSelect,
         handleEdit,
         onSelectAll,
+        handleDetail,
+        registerDrawer,
+        fieldInfos,
+        baseInfos,
         handleTrue,
         handleFalse,
       };
 <template>
   <PageWrapper contentBackground>
-    <template #footer>
-      <a-tabs default-active-key="1" v-model:activeKey="currentKey">
-        <a-tab-pane key="1" tab="申请/待审核列表"
-          ><BasicTable @register="registerTable1">
-            <template #form-custom> custom-slot </template>
-            <template #bodyCell="{ column, record }">
-              <template v-if="column.key === 'action'">
-                <TableAction
-                  :actions="[
-                    {
-                      label: '通过',
-                      // icon: 'ic:outline-delete-outline',
-                      onClick: handleTrue.bind(null, record),
-                    },
-                    {
-                      label: '拒绝',
-                      // icon: 'ic:outline-delete-outline',
-                      onClick: handleFalse.bind(null, record),
-                    },
-                  ]"
-                />
-              </template>
-            </template> </BasicTable
-        ></a-tab-pane>
-        <a-tab-pane key="2" tab="已审核列表">
-          <BasicTable @register="registerTable2" />
-        </a-tab-pane>
-        <a-tab-pane key="3" tab="利润分析申请">
-          <ProfitPanel />
-        </a-tab-pane>
-        <a-tab-pane key="4" tab="项目报告书申请">
-          <ReportPanel />
-        </a-tab-pane>
-      </a-tabs>
-    </template>
+    <a-tabs default-active-key="1" v-model:activeKey="currentKey">
+      <a-tab-pane key="1" tab="字段待审核">
+        <FieldPanel />
+      </a-tab-pane>
+      <a-tab-pane key="2" tab="字段已审核">
+        <FieldPanel isApproved />
+      </a-tab-pane>
+      <a-tab-pane key="3" tab="利润分析待审核">
+        <ProfitPanel />
+      </a-tab-pane>
+      <a-tab-pane key="4" tab="利润分析已审核">
+        <ProfitPanel isApproved />
+      </a-tab-pane>
+      <a-tab-pane key="5" tab="项目报告书待审核">
+        <ReportPanel />
+      </a-tab-pane>
+      <a-tab-pane key="6" tab="项目报告书已审核">
+        <ReportPanel isApproved />
+      </a-tab-pane>
+    </a-tabs>
   </PageWrapper>
 </template>
 <script lang="ts">
@@ -44,6 +29,7 @@
   import { PageWrapper } from '/@/components/Page';
   import ReportPanel from './ReportPanel.vue';
   import ProfitPanel from './ProfitPanel.vue';
+  import FieldPanel from './FieldPanel.vue';
   import { approveAuditApi, getWaitListApi, getApprovedListApi } from '/@/api/project/approve';
   export default defineComponent({
@@ -54,6 +40,7 @@
       [Tabs.name]: Tabs,
       [Tabs.TabPane.name]: Tabs.TabPane,
       ReportPanel,
+      FieldPanel,
       ProfitPanel,
     },
     setup() {
@@ -114,32 +101,11 @@
             dataIndex: 'createBy',
             width: 150,
           },
-          {
-            title: '申请字段',
-            dataIndex: 'fields',
-            width: 600,
-          },
-          {
-            title: '订单号',
-            dataIndex: 'no6',
-          },
-          {
-            title: '订单字段1',
-            dataIndex: 'no5',
-          },
-          {
-            title: '订单字段2',
-            dataIndex: 'no4',
-          },
-          {
-            title: '订单字段3',
-            dataIndex: 'no3',
-          },
-
-          {
-            title: '订单字段5',
-            dataIndex: 'no1',
-          },
+          // {
+          //   title: '申请字段',
+          //   dataIndex: 'fields',
+          //   width: 600,
+          // },
         ],
         rowKey: 'id',
       });
@@ -13,23 +13,25 @@
     :mask="false"
     class="z-20"
   >
-    <Tabs v-model:activeKey="activeKey">
-      <TabPanel key="1" tab="基本信息" :forceRender="true">
-        <BasicForm @register="registerForm" />
-      </TabPanel>
-      <TabPanel key="2" tab="利润分析" :forceRender="true">
-        <ProfitFormPanel ref="profitFormPanelRef" :id="id" />
-      </TabPanel>
-      <TabPanel key="3" tab="项目报告书" :forceRender="true">
-        <ReportFormPanel ref="reportFormPanelRef" :id="id" />
-      </TabPanel>
-      <TabPanel key="4" tab="跟单信息" :forceRender="true">
-        <TrackFormPanel ref="trackFormPanelRef" :id="id" />
-      </TabPanel>
-      <TabPanel key="5" tab="质检信息" :forceRender="true">
-        <InspectionFormPanel ref="inspectionFormRef" :id="id" />
-      </TabPanel>
-    </Tabs>
+    <div className="mt-[-16px]">
+      <Tabs v-model:activeKey="activeKey">
+        <TabPanel key="1" tab="基本信息" :forceRender="true">
+          <BaseFormPanel ref="baseFormPanelRef" :id="id" />
+        </TabPanel>
+        <TabPanel key="2" tab="利润分析" :forceRender="true" v-if="!!id">
+          <ProfitFormPanel ref="profitFormPanelRef" :id="id" />
+        </TabPanel>
+        <TabPanel key="3" tab="项目报告书" :forceRender="true" v-if="!!id">
+          <ReportFormPanel ref="reportFormPanelRef" :id="id" />
+        </TabPanel>
+        <TabPanel key="4" tab="跟单信息" :forceRender="true" v-if="!!id">
+          <TrackFormPanel ref="trackFormPanelRef" :id="id" />
+        </TabPanel>
+        <TabPanel key="5" tab="质检信息" :forceRender="true" v-if="!!id">
+          <InspectionFormPanel ref="inspectionFormRef" :id="id" />
+        </TabPanel>
+      </Tabs>
+    </div>
     <!-- <BasicForm @register="registerForm" />
       <BasicForm @register="registerForm" />
       <BasicForm @register="registerForm" /> -->
@@ -53,6 +55,7 @@
   import ReportFormPanel from './component/ReportFormPanel.vue';
   import TrackFormPanel from './component/TrackFormPanel.vue';
   import InspectionFormPanel from './component/InspectionFormPanel.vue';
+  import BaseFormPanel from './component/BaseFormPanel.vue';
   import { Tabs } from 'ant-design-vue';
@@ -62,6 +65,7 @@
     components: {
       BasicDrawer,
       BasicForm,
+      BaseFormPanel,
       Tabs,
       TabPanel,
       ProfitFormPanel,
@@ -84,8 +88,9 @@
       const activeKey = ref('1');
       const profitFormPanelRef = ref();
       const reportFormPanelRef = ref();
-      const trackFormPanelRef = ref(null);
-      const inspectionFormPanelRef = ref(null);
+      const trackFormPanelRef = ref();
+      const inspectionFormPanelRef = ref();
+      const baseFormPanelRef = ref();
       const {
         customerCode,
@@ -119,12 +124,6 @@
       };
       const schemas = computed(() => {
-        console.log(
-          '%c [ fields?.baseFields ]-134',
-          'font-size:13px; background:pink; color:#bf2c9f;',
-          fields?.baseFields,
-        );
-
         return [
           {
             field: 'baseInfo.customerCode',
@@ -376,7 +375,7 @@
           id.value = '';
           picUrl.value = '';
           // 新建
-          resetFields();
+          baseFormPanelRef?.value?.resetFields();
           profitFormPanelRef?.value?.resetFields();
           reportFormPanelRef?.value?.resetFields();
           trackFormPanelRef?.value?.resetFields();
@@ -402,62 +401,69 @@
           setFieldsValue({
             baseInfo: { ...toRaw(data) },
           });
+          setTimeout(() => {
+            baseFormPanelRef.value.fields = { ...data.lockFields?.baseFields } || {};
+            baseFormPanelRef.value.setFieldsValue({
+              ...toRaw(data),
+            });
-          profitFormPanelRef.value.fields = { ...data.lockFields?.profitAnalysisFields } || {};
-
-          profitFormPanelRef?.value?.setFieldsValue({
-            ...toRaw(data.profitAnalysisInfo),
-          });
+            profitFormPanelRef.value.fields = { ...data.lockFields?.profitAnalysisFields } || {};
+            profitFormPanelRef?.value?.setFieldsValue({
+              ...toRaw(data.profitAnalysisInfo),
+            });
-          reportFormPanelRef.value.fields = { ...data.lockFields?.reportFields } || {};
-          reportFormPanelRef?.value?.setFieldsValue({
-            ...toRaw(data.reportInfo),
-          });
+            reportFormPanelRef.value.fields = { ...data.lockFields?.reportFields } || {};
+            reportFormPanelRef?.value?.setFieldsValue({
+              ...toRaw(data.reportInfo),
+            });
+          }, 100);
         } else {
           setFieldsValue({});
         }
       });
       const handleSubmit = async () => {
-        const values = getFieldsValue() || {};
-
-        values.baseInfo = {
-          ...values.baseInfo,
-          picUrl: picUrl?.value || '',
-        };
         if (id.value) {
           const forms = { orderId: id.value } as any;
           if (activeKey.value === '1') {
-            forms.baseInfo = { ...values.baseInfo };
+            forms.baseInfo = baseFormPanelRef?.value?.getFieldsValue() || {};
           } else if (activeKey.value === '2') {
-            const v = profitFormPanelRef?.value?.getFieldsValue() || {};
-            forms.profitAnalysisInfo = { ...v };
+            forms.profitAnalysisInfo = profitFormPanelRef?.value?.getFieldsValue() || {};
           } else if (activeKey.value === '3') {
-            const v = reportFormPanelRef?.value?.getFieldsValue() || {};
-            forms.reportInfo = { ...v };
+            forms.reportInfo = reportFormPanelRef?.value?.getFieldsValue() || {};
           }
           await orderUpdate(forms);
         } else {
-          const v2 = profitFormPanelRef?.value?.getFieldsValue() || {};
-          const v3 = reportFormPanelRef?.value?.getFieldsValue() || {};
-          const v4 = trackFormPanelRef?.value?.getFieldsValue() || {};
-          const v5 = inspectionFormPanelRef?.value?.getFieldsValue() || {};
+          // const v2 = profitFormPanelRef?.value?.getFieldsValue() || {};
+          // const v3 = reportFormPanelRef?.value?.getFieldsValue() || {};
+          // const v4 = trackFormPanelRef?.value?.getFieldsValue() || {};
+          // const v5 = inspectionFormPanelRef?.value?.getFieldsValue() || {};
+
+          // values.profitAnalysisInfo = { ...v2 };
+          // values.reportInfo = { ...v3 };
+          // values.trackStageInfo = { ...v4 };
+          // values.inspectionStageInfo = { ...v5 };
+          const values = baseFormPanelRef?.value?.getFieldsValue() || {};
-          values.profitAnalysisInfo = { ...v2 };
-          values.reportInfo = { ...v3 };
-          values.trackStageInfo = { ...v4 };
-          values.inspectionStageInfo = { ...v5 };
-          await orderCreate(values);
+          const forms = {
+            baseInfo: {
+              ...values,
+              picUrl: baseFormPanelRef?.value?.picUrl || '',
+              smallPicUrl: baseFormPanelRef?.value?.smallPicUrl || '',
+            },
+          };
+          await orderCreate(forms);
         }
         closeDrawer();
-        // emit('success', {});
+        emit('success', {});
       };
       return {
         id,
         profitFormPanelRef,
         reportFormPanelRef,
         trackFormPanelRef,
+        baseFormPanelRef,
         inspectionFormPanelRef,
         activeKey,
         formRef,
@@ -470,7 +476,7 @@
   });
 </script>
-<style>
+<style scoped>
   .ant-drawer {
     position: fixed;
     z-index: 9999;
+<template>
+  <BasicForm @register="registerForm" />
+</template>
+<script lang="ts">
+  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 { useOrderStoreWithOut } from '/@/store/modules/order';
+
+  import { useOrderInfo } from '/@/hooks/component/order';
+
+  export default defineComponent({
+    components: { BasicForm },
+
+    props: {
+      detailData: {
+        type: Object,
+      },
+      onGoCheckDetail: {
+        type: Function,
+      },
+      id: {
+        type: String,
+      },
+    },
+    emits: ['success'],
+    setup(props) {
+      let fields = ref({});
+      const picUrl = ref('');
+      const smallPicUrl = ref('');
+
+      const orderStore = useOrderStoreWithOut();
+      const {
+        customerCode,
+        projectNo,
+        productionDepartment,
+        innerNo,
+        poColor,
+        cnColor,
+        productStyle,
+        outboundType,
+        packetType,
+      } = useOrderInfo(orderStore);
+
+      const schemas = computed(() => {
+        const options = {
+          customerCode,
+          projectNo,
+          productionDepartment,
+          innerNo,
+          poColor,
+          cnColor,
+          productStyle,
+          outboundType,
+          packetType,
+        };
+
+        const res = FIELDS_BASE_INFO.map((item) => {
+          if (item.field === 'picUrl') {
+            return {
+              field: 'picUrl',
+              component: 'FieldUpload',
+              label: '图片',
+              rules: [{ required: true }],
+              colProps: {
+                span: 24,
+              },
+              componentProps: {
+                imgUrl: picUrl,
+                disabled: getDisable(fields.value?.baseFields?.picUrl),
+                onChange: (res) => {
+                  if (res.file?.response?.data) {
+                    picUrl.value = res.file?.response?.data?.picUrl;
+                    smallPicUrl.value = res.file?.response?.data?.smallPicUrl;
+                  }
+                },
+              },
+            };
+          }
+          return {
+            ...item,
+            field: `${item.field}`,
+            componentProps: {
+              ...(item.component === 'Select' && { options: options[item.field] }),
+              disabled: getDisable(fields.value[item.field], props.id),
+            },
+            colProps: {
+              span: 24,
+            },
+          };
+        });
+        return res;
+      });
+
+      const [registerForm, { setFieldsValue, getFieldsValue, resetFields }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+
+      return {
+        fields,
+        schemas,
+        registerForm,
+        getFieldsValue,
+        setFieldsValue,
+        resetFields,
+        picUrl,
+        smallPicUrl,
+      };
+    },
+  });
+</script>
@@ -383,6 +383,12 @@ export const FIELDS_BASE_INFO = [
     rules: [{ required: true }],
   },
   {
+    field: 'modeleLo',
+    component: 'Input',
+    label: 'Modelo(REFERENCE)',
+    rules: [{ required: true }],
+  },
+  {
     field: 'innerNo',
     component: 'Select',
     label: '内部编号',
@@ -666,7 +672,7 @@ export const FIELDS_PROFIT_INFO = [
   {
     field: 'productionDepartmentPrice',
     component: 'InputNumber',
-    label: '生成科单价￥',
+    label: '生成科单价',
     rules: [{ required: true }],
   },
   // {
@@ -682,7 +688,7 @@ export const FIELDS_PROFIT_INFO = [
   //   rules: [{ required: true }],
   // },
   {
-    label: '包装费用合计$',
+    label: '包装费用合计',
     component: 'InputNumber',
     field: 'packetTotalPrice',
     rules: [{ required: true }],