feat:调整订单相关接口

src/views/miniapp/order/AppOrder.api.ts

@@ -1,12 +1,12 @@
-import { defHttp } from '/@/utils/http/axios';
-import { useMessage } from '/@/hooks/web/useMessage';
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
 
 const { createConfirm } = useMessage();
 
 enum Api {
   list = '/order/appOrder/list',
-  save = '/order/appOrder/add',
-  edit = '/order/appOrder/edit',
+  save='/order/appOrder/add',
+  edit='/order/appOrder/edit',
   deleteOne = '/order/appOrder/delete',
   deleteBatch = '/order/appOrder/deleteBatch',
   importExcel = '/order/appOrder/importExcel',
@@ -44,16 +44,17 @@ export const appOrderFinanceList = Api.appOrderFinanceList;
  * 列表接口
  * @param params
  */
-export const list = (params) => defHttp.get({ url: Api.list, params });
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
 
 /**
  * 删除单个
  */
-export const deleteOne = (params, handleSuccess) => {
-  return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
     handleSuccess();
   });
-};
+}
 /**
  * 批量删除
  * @param params
@@ -66,17 +67,17 @@ export const batchDelete = (params, handleSuccess) => {
     okText: '确认',
     cancelText: '取消',
     onOk: () => {
-      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
         handleSuccess();
       });
-    },
+    }
   });
-};
+}
 /**
  * 保存或者更新
  * @param params
  */
 export const saveOrUpdate = (params, isUpdate) => {
-  const url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({ url: url, params });
-};
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

src/views/miniapp/order/AppOrder.data.ts

@@ -6,21 +6,31 @@ import { JVxeTypes, JVxeColumn } from '/@/components/jeecg/JVxeTable/types';
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
+  {
+    title: '订单编号',
+    align: 'center',
+    dataIndex: 'orderNum',
+  },
   {
     title: '产品服务名称',
     align: 'center',
     dataIndex: 'productName',
   },
   {
-    title: '服务年限',
+    title: '产品服务年限',
     align: 'center',
     dataIndex: 'productServiceYear',
   },
   {
-    title: '销售金额',
+    title: '产品销售金额',
     align: 'center',
     dataIndex: 'productMoney',
   },
+  {
+    title: '产品合同模板',
+    align: 'center',
+    dataIndex: 'productContractTemp',
+  },
   {
     title: '经销商',
     align: 'center',
@@ -121,14 +131,15 @@ export const columns: BasicColumn[] = [
     dataIndex: 'payVoucherUrl',
     customRender: render.renderImage,
   },
-  {
-    title: '订单编号',
-    align: 'center',
-    dataIndex: 'orderNum',
-  },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+  {
+    label: '订单编号',
+    field: 'orderNum',
+    component: 'Input',
+    //colProps: {span: 6},
+  },
   {
     label: '产品服务名称',
     field: 'productName',
@@ -199,12 +210,6 @@ export const searchFormSchema: FormSchema[] = [
     },
     //colProps: {span: 6},
   },
-  {
-    label: '订单编号',
-    field: 'orderNum',
-    component: 'Input',
-    //colProps: {span: 6},
-  },
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -217,19 +222,28 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '服务年限',
+    label: '产品服务年限',
     field: 'productServiceYear',
     component: 'Input',
     dynamicRules: ({ model, schema }) => {
-      return [{ required: true, message: '请输入服务年限!' }];
+      return [{ required: true, message: '请输入产品服务年限!' }];
     },
   },
   {
-    label: '销售金额',
+    label: '产品销售金额',
     field: 'productMoney',
     component: 'InputNumber',
     dynamicRules: ({ model, schema }) => {
-      return [{ required: true, message: '请输入销售金额!' }];
+      return [{ required: true, message: '请输入产品销售金额!' }];
+    },
+  },
+  {
+    label: '产品合同模板',
+    field: 'productContractTemp',
+    component: 'JUpload',
+    componentProps: {},
+    dynamicRules: ({ model, schema }) => {
+      return [{ required: true, message: '请输入产品合同模板!' }];
     },
   },
   {
@@ -345,9 +359,12 @@ export const formSchema: FormSchema[] = [
   {
     label: '订单状态',
     field: 'status',
+    defaultValue: 0,
     component: 'JDictSelectTag',
     componentProps: {
       dictCode: 'order_status',
+      type: 'radio',
+      stringToNumer: true,
     },
     dynamicRules: ({ model, schema }) => {
       return [{ required: true, message: '请输入订单状态!' }];
@@ -523,13 +540,20 @@ export const appOrderVoucherFormSchema: FormSchema[] = [
     field: 'effectiveTime',
     component: 'DatePicker',
     componentProps: {
-      showTime: true,
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD',
     },
     dynamicRules: ({ model, schema }) => {
       return [{ required: true, message: '请输入生效时间!' }];
     },
   },
+  {
+    label: '失效时间',
+    field: 'endTime',
+    component: 'DatePicker',
+    componentProps: {
+      valueFormat: 'YYYY-MM-DD',
+    },
+  },
   {
     label: '服务年限',
     field: 'serviceYear',
@@ -631,29 +655,30 @@ export const appOrderFinanceFormSchema: FormSchema[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
-  productName: { title: '产品服务名称', order: 0, view: 'text', type: 'string' },
-  productServiceYear: { title: '服务年限', order: 1, view: 'text', type: 'string' },
-  productMoney: { title: '销售金额', order: 2, view: 'number', type: 'number' },
-  storeName: { title: '经销商', order: 3, view: 'text', type: 'string' },
-  custName: { title: '客户姓名', order: 4, view: 'text', type: 'string' },
-  custAddress: { title: '客户地址', order: 5, view: 'text', type: 'string' },
-  custCardNo: { title: '客户证件号', order: 6, view: 'text', type: 'string' },
-  custPhone: { title: '客户联系电话', order: 7, view: 'text', type: 'string' },
-  salePort: { title: '销售端口', order: 8, view: 'list', type: 'string', dictCode: 'order_sale_port' },
-  saleName: { title: '销售顾问', order: 9, view: 'text', type: 'string' },
-  payType: { title: '付款方式', order: 10, view: 'text', type: 'string' },
-  custType: { title: '客户类型', order: 11, view: 'number', type: 'number', dictCode: 'customer_type' },
-  certFront: { title: '身份证正面照', order: 12, view: 'image', type: 'string' },
-  certBack: { title: '身份证反面照', order: 13, view: 'image', type: 'string' },
-  carPic: { title: '车辆合格证', order: 14, view: 'image', type: 'string' },
-  busLicense: { title: '营业执照', order: 15, view: 'image', type: 'string' },
-  createTime: { title: '创建日期', order: 16, view: 'datetime', type: 'string' },
-  status: { title: '订单状态', order: 17, view: 'number', type: 'number', dictCode: 'order_status' },
-  contractUrl: { title: '订单合同', order: 18, view: 'file', type: 'string' },
-  payee: { title: '收款方', order: 19, view: 'text', type: 'string' },
-  payeeTime: { title: '收款时间', order: 20, view: 'datetime', type: 'string' },
-  payVoucherUrl: { title: '支付凭证', order: 21, view: 'image', type: 'string' },
-  orderNum: { title: '订单编号', order: 22, view: 'text', type: 'string' },
+  orderNum: { title: '订单编号', order: 0, view: 'text', type: 'string' },
+  productName: { title: '产品服务名称', order: 1, view: 'text', type: 'string' },
+  productServiceYear: { title: '产品服务年限', order: 2, view: 'text', type: 'string' },
+  productMoney: { title: '产品销售金额', order: 3, view: 'number', type: 'number' },
+  productContractTemp: { title: '产品合同模板', order: 4, view: 'file', type: 'string' },
+  storeName: { title: '经销商', order: 5, view: 'text', type: 'string' },
+  custName: { title: '客户姓名', order: 6, view: 'text', type: 'string' },
+  custAddress: { title: '客户地址', order: 7, view: 'text', type: 'string' },
+  custCardNo: { title: '客户证件号', order: 8, view: 'text', type: 'string' },
+  custPhone: { title: '客户联系电话', order: 9, view: 'text', type: 'string' },
+  salePort: { title: '销售端口', order: 10, view: 'list', type: 'string', dictCode: 'order_sale_port' },
+  saleName: { title: '销售顾问', order: 11, view: 'text', type: 'string' },
+  payType: { title: '付款方式', order: 12, view: 'text', type: 'string' },
+  custType: { title: '客户类型', order: 13, view: 'number', type: 'number', dictCode: 'customer_type' },
+  certFront: { title: '身份证正面照', order: 14, view: 'image', type: 'string' },
+  certBack: { title: '身份证反面照', order: 15, view: 'image', type: 'string' },
+  carPic: { title: '车辆合格证', order: 16, view: 'image', type: 'string' },
+  busLicense: { title: '营业执照', order: 17, view: 'image', type: 'string' },
+  createTime: { title: '创建日期', order: 18, view: 'datetime', type: 'string' },
+  status: { title: '订单状态', order: 19, view: 'number', type: 'number', dictCode: 'order_status' },
+  contractUrl: { title: '订单合同', order: 20, view: 'file', type: 'string' },
+  payee: { title: '收款方', order: 21, view: 'text', type: 'string' },
+  payeeTime: { title: '收款时间', order: 22, view: 'datetime', type: 'string' },
+  payVoucherUrl: { title: '支付凭证', order: 23, view: 'image', type: 'string' },
   //子表高级查询
   appOrderCar: {
     title: '订单车辆信息',
@@ -680,18 +705,19 @@ export const superQuerySchema = {
     fields: {
       firstBeneficiary: { title: '第一受益人', order: 0, view: 'text', type: 'string' },
       serviceMoney: { title: '服务费', order: 1, view: 'number', type: 'number' },
-      effectiveTime: { title: '生效时间', order: 2, view: 'datetime', type: 'string' },
-      serviceYear: { title: '服务年限', order: 3, view: 'text', type: 'string' },
-      equityPackage: { title: '权益套餐', order: 4, view: 'text', type: 'string' },
-      packageMoney: { title: '套餐价', order: 5, view: 'number', type: 'number' },
-      carInsuranceNo: { title: '商业险编号', order: 6, view: 'text', type: 'string' },
-      registeredCity: { title: '上牌城市', order: 7, view: 'text', type: 'string' },
-      insuranceName: { title: '保险公司', order: 8, view: 'text', type: 'string' },
-      assigneeName: { title: '受让人名称', order: 9, view: 'text', type: 'string' },
-      assigneePhone: { title: '受让人电话', order: 10, view: 'text', type: 'string' },
-      assigneeCardNo: { title: '受让人身份证', order: 11, view: 'text', type: 'string' },
-      payTime: { title: '支付时间', order: 12, view: 'date', type: 'string' },
-      dealerAddress: { title: '经销商地址', order: 13, view: 'text', type: 'string' },
+      effectiveTime: { title: '生效时间', order: 2, view: 'date', type: 'string' },
+      endTime: { title: '失效时间', order: 3, view: 'date', type: 'string' },
+      serviceYear: { title: '服务年限', order: 4, view: 'text', type: 'string' },
+      equityPackage: { title: '权益套餐', order: 5, view: 'text', type: 'string' },
+      packageMoney: { title: '套餐价', order: 6, view: 'number', type: 'number' },
+      carInsuranceNo: { title: '商业险编号', order: 7, view: 'text', type: 'string' },
+      registeredCity: { title: '上牌城市', order: 8, view: 'text', type: 'string' },
+      insuranceName: { title: '保险公司', order: 9, view: 'text', type: 'string' },
+      assigneeName: { title: '受让人名称', order: 10, view: 'text', type: 'string' },
+      assigneePhone: { title: '受让人电话', order: 11, view: 'text', type: 'string' },
+      assigneeCardNo: { title: '受让人身份证', order: 12, view: 'text', type: 'string' },
+      payTime: { title: '支付时间', order: 13, view: 'date', type: 'string' },
+      dealerAddress: { title: '经销商地址', order: 14, view: 'text', type: 'string' },
     },
   },
   appOrderFinance: {

src/views/miniapp/order/AppOrderList.vue

@@ -1,101 +1,104 @@
 <template>
   <div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
-      <!--插槽:table标题-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'order:app_order:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button type="primary" v-auth="'order:app_order:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" v-auth="'order:app_order:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
-          >导入</j-upload-button
-        >
-        <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined" />
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button v-auth="'order:app_order:deleteBatch'"
-            >批量操作
-            <Icon icon="mdi:chevron-down" />
-          </a-button>
+          <a-button type="primary" v-auth="'order:app_order:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'order:app_order:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'order:app_order:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button v-auth="'order:app_order:deleteBatch'">批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
         </a-dropdown>
         <!-- 高级查询 -->
         <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
-      <!--操作栏-->
+       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
       </template>
       <!--字段回显插槽-->
-      <template #bodyCell="{ column, record, index, text }">
-        <template v-if="column.dataIndex === 'contractUrl'">
+      <template v-slot:bodyCell="{ column, record, index, text }">
+        <template v-if="column.dataIndex==='productContractTemp'">
           <!--文件字段回显插槽-->
-          <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
-          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)"
-            >下载</a-button
-          >
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+        </template>
+        <template v-if="column.dataIndex==='contractUrl'">
+          <!--文件字段回显插槽-->
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
         </template>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <AppOrderModal @register="registerModal" @success="handleSuccess" />
+    <AppOrderModal @register="registerModal" @success="handleSuccess"></AppOrderModal>
   </div>
 </template>
 
 <script lang="ts" name="order-appOrder" setup>
-  import { ref, reactive, computed, unref } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { useModal } from '/@/components/Modal';
-  import AppOrderModal from './components/AppOrderModal.vue';
-  import { columns, searchFormSchema, superQuerySchema } from './AppOrder.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './AppOrder.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import {useModal} from '/@/components/Modal';
+  import AppOrderModal from './components/AppOrderModal.vue'
+  import {columns, searchFormSchema, superQuerySchema} from './AppOrder.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './AppOrder.api';
+  import {downloadFile} from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
   const queryParam = reactive<any>({});
   const checkedKeys = ref<Array<string | number>>([]);
   const userStore = useUserStore();
   //注册model
-  const [registerModal, { openModal }] = useModal();
-  //注册table数据
-  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-    tableProps: {
-      title: '合同订单表',
-      api: list,
-      columns,
-      canResize: false,
-      formConfig: {
-        //labelWidth: 120,
-        schemas: searchFormSchema,
-        autoSubmitOnEnter: true,
-        showAdvancedButton: true,
-        fieldMapToNumber: [],
-        fieldMapToTime: [['createTime', ['createTime_begin', 'createTime_end'], 'YYYY-MM-DD HH:mm:ss']],
-      },
-      actionColumn: {
-        width: 120,
-        fixed: 'right',
-      },
-      beforeFetch: (params) => {
-        return Object.assign(params, queryParam);
-      },
-    },
-    exportConfig: {
-      name: '合同订单表',
-      url: getExportUrl,
-      params: queryParam,
-    },
-    importConfig: {
-      url: getImportUrl,
-      success: handleSuccess,
-    },
-  });
+  const [registerModal, {openModal}] = useModal();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '合同订单表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+                //labelWidth: 120,
+                schemas: searchFormSchema,
+                autoSubmitOnEnter:true,
+                showAdvancedButton:true,
+                fieldMapToNumber: [
+                ],
+                fieldMapToTime: [
+                   ['createTime', ['createTime_begin', 'createTime_end'], 'YYYY-MM-DD HH:mm:ss'],
+                ],
+            },
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+           },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam);
+           },
+        },
+        exportConfig: {
+            name:"合同订单表",
+            url: getExportUrl,
+            params: queryParam,
+        },
+        importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+        },
+    })
 
-  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 
   // 高级查询配置
   const superQueryConfig = reactive(superQuerySchema);
@@ -110,91 +113,91 @@
     reload();
   }
 
-  /**
-   * 新增事件
-   */
+   /**
+    * 新增事件
+    */
   function handleAdd() {
-    openModal(true, {
-      isUpdate: false,
-      showFooter: true,
-    });
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
   }
-  /**
-   * 编辑事件
-   */
+   /**
+    * 编辑事件
+    */
   function handleEdit(record: Recordable) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-      showFooter: true,
-    });
-  }
-  /**
-   * 详情
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
    */
   function handleDetail(record: Recordable) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-      showFooter: false,
-    });
-  }
-  /**
-   * 删除事件
-   */
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
-  }
-  /**
-   * 批量删除事件
-   */
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
   async function batchHandleDelete() {
-    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-  }
-  /**
-   * 成功回调
-   */
+     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
   function handleSuccess() {
-    (selectedRowKeys.value = []) && reload();
-  }
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-        auth: 'order:app_order:edit',
-      },
-    ];
-  }
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+           auth: 'order:app_order:edit'
+         }
+       ]
+   }
+
 
   /**
    * 下拉操作栏
    */
-  function getDropDownAction(record) {
+  function getDropDownAction(record){
     return [
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      },
-      {
+      }, {
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
+          placement: 'topLeft'
         },
-        auth: 'order:app_order:delete',
-      },
-    ];
+        auth: 'order:app_order:delete'
+      }
+    ]
   }
+
 </script>
 
 <style lang="less" scoped>
-  :deep(.ant-picker),
-  :deep(.ant-input-number) {
+  :deep(.ant-picker),:deep(.ant-input-number){
     width: 100%;
   }
-</style>
+</style>

src/views/miniapp/order/components/AppOrderCarForm.vue

@@ -1,76 +1,74 @@
 <template>
-  <BasicForm @register="registerForm" name="AppOrderCarForm" class="basic-modal-form" />
+    <BasicForm @register="registerForm" name="AppOrderCarForm" class="basic-modal-form"/>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { appOrderCarFormSchema } from '../AppOrder.data';
-  import { defHttp } from '/@/utils/http/axios';
-  import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils';
+    import {defineComponent} from 'vue';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {appOrderCarFormSchema} from '../AppOrder.data';
+    import {defHttp} from '/@/utils/http/axios';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
 
-  export default defineComponent({
-    name: 'AppOrderCarForm',
-    components: { BasicForm },
-    props: {
-      disabled: {
-        type: Boolean,
-        default: false,
-      },
-    },
-    emits: ['register'],
-    setup(props, { emit }) {
-      const [registerForm, { setProps, resetFields, setFieldsValue, getFieldsValue, validate, scrollToField }] = useForm({
-        schemas: appOrderCarFormSchema,
-        showActionButtonGroup: false,
-        baseColProps: { span: 12 },
-      });
-      /**
-       *初始化加载数据
-       */
-      function initFormData(url, id) {
-        if (id) {
-          defHttp.get({ url, params: { id } }, { isTransformResponse: false }).then((res) => {
-            res.success && setFieldsValue({ ...res.result[0] });
-          });
-        }
-        setProps({ disabled: props.disabled });
-      }
-      /**
-       *获取表单数据
-       */
-      function getFormData() {
-        let formData = getFieldsValue();
-        Object.keys(formData).map((k) => {
-          if (formData[k] instanceof Array) {
-            formData[k] = formData[k].join(',');
-          }
-        });
-        return [formData];
-      }
-      /**
-       *表单校验
-       */
-      function validateForm(index) {
-        return new Promise((resolve, reject) => {
-          // 验证子表表单
-          validate()
-            .then(() => {
-              return resolve();
-            })
-            .catch(({ errorFields }) => {
-              return reject({ error: VALIDATE_FAILED, index, errorFields: errorFields, scrollToField: scrollToField });
+    export default defineComponent({
+        name:"AppOrderCarForm",
+        components: {BasicForm},
+        emits:['register'],
+        props:{
+            disabled: {
+                type: Boolean,
+                default: false
+            }
+        },
+        setup(props,{emit}) {
+            const [registerForm, { setProps, resetFields, setFieldsValue, getFieldsValue, validate, scrollToField }] = useForm({
+                schemas: appOrderCarFormSchema,
+                showActionButtonGroup: false,
+                baseColProps: {span: 12}
             });
-        });
-      }
-      return {
-        registerForm,
-        resetFields,
-        initFormData,
-        getFormData,
-        validateForm,
-      };
-    },
-  });
+            /**
+            *初始化加载数据
+            */
+            function initFormData(url,id){
+                if(id){
+                     defHttp.get({url,params:{id}},{isTransformResponse:false}).then(res=>{
+                       res.success && setFieldsValue({...res.result[0]});
+                    })
+                }
+                setProps({disabled: props.disabled})
+            }
+           /**
+            *获取表单数据
+            */
+            function getFormData(){
+               let formData = getFieldsValue();
+               Object.keys(formData).map(k=>{
+                    if(formData[k] instanceof Array){
+                        formData[k] = formData[k].join(',')
+                    }
+               });
+               return [formData];
+            }
+            /**
+            *表单校验
+            */
+            function validateForm(index){
+                return new Promise((resolve, reject) => {
+                    // 验证子表表单
+                    validate().then(()=>{
+                        return resolve()
+                    }).catch(({ errorFields }) => {
+                      return reject({ error: VALIDATE_FAILED, index, errorFields: errorFields, scrollToField: scrollToField });
+                    });
+                })
+            }
+            return {
+                registerForm,
+                resetFields,
+                initFormData,
+                getFormData,
+                validateForm
+            }
+        }
+    })
 </script>
 <style lang="less" scoped>
   .basic-modal-form {

src/views/miniapp/order/components/AppOrderFinanceForm.vue

@@ -1,76 +1,74 @@
 <template>
-  <BasicForm @register="registerForm" name="AppOrderFinanceForm" class="basic-modal-form" />
+    <BasicForm @register="registerForm" name="AppOrderFinanceForm" class="basic-modal-form"/>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { appOrderFinanceFormSchema } from '../AppOrder.data';
-  import { defHttp } from '/@/utils/http/axios';
-  import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils';
+    import {defineComponent} from 'vue';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {appOrderFinanceFormSchema} from '../AppOrder.data';
+    import {defHttp} from '/@/utils/http/axios';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
 
-  export default defineComponent({
-    name: 'AppOrderFinanceForm',
-    components: { BasicForm },
-    props: {
-      disabled: {
-        type: Boolean,
-        default: false,
-      },
-    },
-    emits: ['register'],
-    setup(props, { emit }) {
-      const [registerForm, { setProps, resetFields, setFieldsValue, getFieldsValue, validate, scrollToField }] = useForm({
-        schemas: appOrderFinanceFormSchema,
-        showActionButtonGroup: false,
-        baseColProps: { span: 12 },
-      });
-      /**
-       *初始化加载数据
-       */
-      function initFormData(url, id) {
-        if (id) {
-          defHttp.get({ url, params: { id } }, { isTransformResponse: false }).then((res) => {
-            res.success && setFieldsValue({ ...res.result[0] });
-          });
-        }
-        setProps({ disabled: props.disabled });
-      }
-      /**
-       *获取表单数据
-       */
-      function getFormData() {
-        let formData = getFieldsValue();
-        Object.keys(formData).map((k) => {
-          if (formData[k] instanceof Array) {
-            formData[k] = formData[k].join(',');
-          }
-        });
-        return [formData];
-      }
-      /**
-       *表单校验
-       */
-      function validateForm(index) {
-        return new Promise((resolve, reject) => {
-          // 验证子表表单
-          validate()
-            .then(() => {
-              return resolve();
-            })
-            .catch(({ errorFields }) => {
-              return reject({ error: VALIDATE_FAILED, index, errorFields: errorFields, scrollToField: scrollToField });
+    export default defineComponent({
+        name:"AppOrderFinanceForm",
+        components: {BasicForm},
+        emits:['register'],
+        props:{
+            disabled: {
+                type: Boolean,
+                default: false
+            }
+        },
+        setup(props,{emit}) {
+            const [registerForm, { setProps, resetFields, setFieldsValue, getFieldsValue, validate, scrollToField }] = useForm({
+                schemas: appOrderFinanceFormSchema,
+                showActionButtonGroup: false,
+                baseColProps: {span: 12}
             });
-        });
-      }
-      return {
-        registerForm,
-        resetFields,
-        initFormData,
-        getFormData,
-        validateForm,
-      };
-    },
-  });
+            /**
+            *初始化加载数据
+            */
+            function initFormData(url,id){
+                if(id){
+                     defHttp.get({url,params:{id}},{isTransformResponse:false}).then(res=>{
+                       res.success && setFieldsValue({...res.result[0]});
+                    })
+                }
+                setProps({disabled: props.disabled})
+            }
+           /**
+            *获取表单数据
+            */
+            function getFormData(){
+               let formData = getFieldsValue();
+               Object.keys(formData).map(k=>{
+                    if(formData[k] instanceof Array){
+                        formData[k] = formData[k].join(',')
+                    }
+               });
+               return [formData];
+            }
+            /**
+            *表单校验
+            */
+            function validateForm(index){
+                return new Promise((resolve, reject) => {
+                    // 验证子表表单
+                    validate().then(()=>{
+                        return resolve()
+                    }).catch(({ errorFields }) => {
+                      return reject({ error: VALIDATE_FAILED, index, errorFields: errorFields, scrollToField: scrollToField });
+                    });
+                })
+            }
+            return {
+                registerForm,
+                resetFields,
+                initFormData,
+                getFormData,
+                validateForm
+            }
+        }
+    })
 </script>
 <style lang="less" scoped>
   .basic-modal-form {

src/views/miniapp/order/components/AppOrderForm.vue

@@ -1,106 +1,102 @@
 <template>
   <div>
-    <BasicForm @register="registerForm" ref="formRef" />
+    <BasicForm @register="registerForm" ref="formRef"/>
     <!-- 子表单区域 -->
-    <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
+    <a-tabs v-model:activeKey="activeKey" animated  @change="handleChangeTabs">
       <a-tab-pane tab="订单车辆信息" key="appOrderCar" :forceRender="true">
-        <AppOrderCarForm ref="appOrderCarForm" :disabled="formDisabled" />
+        <AppOrderCarForm ref="appOrderCarForm" :disabled="formDisabled"></AppOrderCarForm>
       </a-tab-pane>
       <a-tab-pane tab="订单凭证信息" key="appOrderVoucher" :forceRender="true">
-        <AppOrderVoucherForm ref="appOrderVoucherForm" :disabled="formDisabled" />
+        <AppOrderVoucherForm ref="appOrderVoucherForm" :disabled="formDisabled"></AppOrderVoucherForm>
       </a-tab-pane>
       <a-tab-pane tab="订单金融信息" key="appOrderFinance" :forceRender="true">
-        <AppOrderFinanceForm ref="appOrderFinanceForm" :disabled="formDisabled" />
+        <AppOrderFinanceForm ref="appOrderFinanceForm" :disabled="formDisabled"></AppOrderFinanceForm>
       </a-tab-pane>
     </a-tabs>
 
-    <div style="width: 100%; text-align: center" v-if="!formDisabled">
+    <div style="width: 100%;text-align: center" v-if="!formDisabled">
       <a-button @click="handleSubmit" pre-icon="ant-design:check" type="primary">提 交</a-button>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-  import { BasicForm, useForm } from '/@/components/Form/index';
+
+  import {BasicForm, useForm} from '/@/components/Form/index';
   import { computed, defineComponent, reactive, ref, unref } from 'vue';
-  import { defHttp } from '/@/utils/http/axios';
+  import {defHttp} from '/@/utils/http/axios';
   import { propTypes } from '/@/utils/propTypes';
   import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods';
   import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils';
-  import AppOrderCarForm from './AppOrderCarForm.vue';
-  import AppOrderVoucherForm from './AppOrderVoucherForm.vue';
-  import AppOrderFinanceForm from './AppOrderFinanceForm.vue';
-  import { getBpmFormSchema } from '../AppOrder.data';
-  import { saveOrUpdate, appOrderCarList, appOrderVoucherList, appOrderFinanceList } from '../AppOrder.api';
+  import AppOrderCarForm from './AppOrderCarForm.vue'
+  import AppOrderVoucherForm from './AppOrderVoucherForm.vue'
+  import AppOrderFinanceForm from './AppOrderFinanceForm.vue'
+  import {getBpmFormSchema} from '../AppOrder.data';
+  import {saveOrUpdate,appOrderCarList,appOrderVoucherList,appOrderFinanceList} from '../AppOrder.api';
 
   export default defineComponent({
-    name: 'AppOrderForm',
-    components: {
+    name: "AppOrderForm",
+    components:{
       BasicForm,
       AppOrderCarForm,
       AppOrderVoucherForm,
       AppOrderFinanceForm,
     },
-    props: {
+    props:{
       formData: propTypes.object.def({}),
       formBpm: propTypes.bool.def(true),
     },
-    setup(props) {
+    setup(props){
       const [registerForm, { setFieldsValue, setProps }] = useForm({
         labelWidth: 150,
         schemas: getBpmFormSchema(props.formData),
         showActionButtonGroup: false,
-        baseColProps: { span: 12 },
+        baseColProps: {span: 12}
       });
 
-      const formDisabled = computed(() => {
-        if (props.formData.disabled === false) {
+      const formDisabled = computed(()=>{
+        if(props.formData.disabled === false){
           return false;
         }
         return true;
       });
 
-      const refKeys = ref(['appOrderCar', 'appOrderVoucher', 'appOrderFinance']);
+      const refKeys = ref(['appOrderCar', 'appOrderVoucher', 'appOrderFinance', ]);
       const activeKey = ref('appOrderCar');
       const appOrderCarForm = ref();
       const appOrderVoucherForm = ref();
       const appOrderFinanceForm = ref();
       const tableRefs = {};
 
-      const [handleChangeTabs, handleSubmit, requestSubTableData, formRef] = useJvxeMethod(
-        requestAddOrEdit,
-        classifyIntoFormData,
-        tableRefs,
-        activeKey,
-        refKeys,
-        validateSubForm
-      );
+      const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys,validateSubForm);
 
       function classifyIntoFormData(allValues) {
-        let main = Object.assign({}, allValues.formValue);
+        let main = Object.assign({}, allValues.formValue)
         return {
           ...main, // 展开
           appOrderCarList: appOrderCarForm.value.getFormData(),
           appOrderVoucherList: appOrderVoucherForm.value.getFormData(),
           appOrderFinanceList: appOrderFinanceForm.value.getFormData(),
-        };
+        }
       }
       //校验所有一对一子表表单
-      function validateSubForm(allValues) {
-        return new Promise((resolve, _reject) => {
-          Promise.all([appOrderCarForm.value.validateForm(0), appOrderVoucherForm.value.validateForm(1), appOrderFinanceForm.value.validateForm(2)])
-            .then(() => {
-              resolve(allValues);
-            })
-            .catch((e) => {
-              if (e.error === VALIDATE_FAILED) {
-                // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
-                activeKey.value = e.index == null ? unref(activeKey) : refKeys.value[e.index];
-              } else {
-                console.error(e);
-              }
-            });
-        });
+      function validateSubForm(allValues){
+        return new Promise((resolve, _reject)=>{
+          Promise.all([
+            appOrderCarForm.value.validateForm(0),
+            appOrderVoucherForm.value.validateForm(1),
+            appOrderFinanceForm.value.validateForm(2),
+          ]).then(() => {
+            resolve(allValues)
+          }).catch(e => {
+            if (e.error === VALIDATE_FAILED) {
+              // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+              activeKey.value = e.index == null ? unref(activeKey) : refKeys.value[e.index]
+            } else {
+              console.error(e)
+            }
+          })
+        })
       }
 
       //表单提交事件
@@ -109,16 +105,16 @@
       }
 
       const queryByIdUrl = '/order/appOrder/queryById';
-      async function initFormData() {
-        let params = { id: props.formData.dataId };
-        const data = await defHttp.get({ url: queryByIdUrl, params });
+      async function initFormData(){
+        let params = {id: props.formData.dataId};
+        const data = await defHttp.get({url: queryByIdUrl, params});
         //设置表单的值
-        await setFieldsValue({ ...data });
+        await setFieldsValue({...data});
         appOrderCarForm.value.initFormData(appOrderCarList, data.id);
         appOrderVoucherForm.value.initFormData(appOrderVoucherList, data.id);
         appOrderFinanceForm.value.initFormData(appOrderFinanceList, data.id);
         //默认是禁用
-        await setProps({ disabled: formDisabled.value });
+        await setProps({disabled: formDisabled.value})
       }
 
       initFormData();
@@ -133,7 +129,7 @@
         appOrderCarForm,
         appOrderVoucherForm,
         appOrderFinanceForm,
-      };
-    },
+      }
+    }
   });
-</script>
+</script>

src/views/miniapp/order/components/AppOrderModal.vue

@@ -1,140 +1,136 @@
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="896" @ok="handleSubmit">
-    <BasicForm @register="registerForm" ref="formRef" name="AppOrderForm" />
+    <BasicForm @register="registerForm" ref="formRef" name="AppOrderForm"/>
     <!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
       <a-tab-pane tab="订单车辆信息" key="appOrderCar" :forceRender="true">
-        <AppOrderCarForm ref="appOrderCarForm" :disabled="formDisabled" />
+        <AppOrderCarForm ref="appOrderCarForm" :disabled="formDisabled"></AppOrderCarForm>
       </a-tab-pane>
 
       <a-tab-pane tab="订单凭证信息" key="appOrderVoucher" :forceRender="true">
-        <AppOrderVoucherForm ref="appOrderVoucherForm" :disabled="formDisabled" />
+        <AppOrderVoucherForm ref="appOrderVoucherForm" :disabled="formDisabled"></AppOrderVoucherForm>
       </a-tab-pane>
 
       <a-tab-pane tab="订单金融信息" key="appOrderFinance" :forceRender="true">
-        <AppOrderFinanceForm ref="appOrderFinanceForm" :disabled="formDisabled" />
+        <AppOrderFinanceForm ref="appOrderFinanceForm" :disabled="formDisabled"></AppOrderFinanceForm>
       </a-tab-pane>
+
     </a-tabs>
   </BasicModal>
 </template>
 
 <script lang="ts" setup>
-  import { ref, computed, unref, reactive } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
-  import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts';
-  import AppOrderCarForm from './AppOrderCarForm.vue';
-  import AppOrderVoucherForm from './AppOrderVoucherForm.vue';
-  import AppOrderFinanceForm from './AppOrderFinanceForm.vue';
-  import { formSchema } from '../AppOrder.data';
-  import { saveOrUpdate, appOrderCarList, appOrderVoucherList, appOrderFinanceList } from '../AppOrder.api';
-  import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils';
-  // Emits声明
-  const emit = defineEmits(['register', 'success']);
-  const isUpdate = ref(true);
-  const formDisabled = ref(false);
-  const refKeys = ref(['appOrderCar', 'appOrderVoucher', 'appOrderFinance']);
-  const activeKey = ref('appOrderCar');
-  const appOrderCarForm = ref();
-  const appOrderVoucherForm = ref();
-  const appOrderFinanceForm = ref();
-  const tableRefs = {};
-  //表单配置
-  const [registerForm, { setProps, resetFields, setFieldsValue, validate }] = useForm({
-    schemas: formSchema,
-    showActionButtonGroup: false,
-    baseColProps: { span: 12 },
-  });
-  //表单赋值
-  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    //重置表单
-    await reset();
-    setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
-    isUpdate.value = !!data?.isUpdate;
-    formDisabled.value = !data?.showFooter;
-    if (unref(isUpdate)) {
-      //表单赋值
-      await setFieldsValue({
-        ...data.record,
-      });
-      appOrderCarForm.value.initFormData(appOrderCarList, data?.record?.id);
-      appOrderVoucherForm.value.initFormData(appOrderVoucherList, data?.record?.id);
-      appOrderFinanceForm.value.initFormData(appOrderFinanceList, data?.record?.id);
-    }
-    // 隐藏底部时禁用整个表单
-    setProps({ disabled: !data?.showFooter });
-  });
-  //方法配置
-  const [handleChangeTabs, handleSubmit, requestSubTableData, formRef] = useJvxeMethod(
-    requestAddOrEdit,
-    classifyIntoFormData,
-    tableRefs,
-    activeKey,
-    refKeys,
-    validateSubForm
-  );
+    import {ref, computed, unref,reactive} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import { JVxeTable } from '/@/components/jeecg/JVxeTable'
+    import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
+    import AppOrderCarForm from './AppOrderCarForm.vue'
+    import AppOrderVoucherForm from './AppOrderVoucherForm.vue'
+    import AppOrderFinanceForm from './AppOrderFinanceForm.vue'
+    import {formSchema} from '../AppOrder.data';
+    import {saveOrUpdate,appOrderCarList,appOrderVoucherList,appOrderFinanceList} from '../AppOrder.api';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    const formDisabled = ref(false);
+    const refKeys = ref(['appOrderCar', 'appOrderVoucher', 'appOrderFinance', ]);
+    const activeKey = ref('appOrderCar');
+    const appOrderCarForm = ref();
+    const appOrderVoucherForm = ref();
+    const appOrderFinanceForm = ref();
+    const tableRefs = {};
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 12}
+    });
+     //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await reset();
+        setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        formDisabled.value = !data?.showFooter;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+             appOrderCarForm.value.initFormData(appOrderCarList,data?.record?.id)
+             appOrderVoucherForm.value.initFormData(appOrderVoucherList,data?.record?.id)
+             appOrderFinanceForm.value.initFormData(appOrderFinanceList,data?.record?.id)
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //方法配置
+    const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys,validateSubForm);
 
-  //设置标题
-  const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(formDisabled) ? '编辑' : '详情'));
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(formDisabled) ? '编辑' : '详情'));
 
-  async function reset() {
-    await resetFields();
-    activeKey.value = 'appOrderCar';
-    appOrderCarForm.value.resetFields();
-    appOrderVoucherForm.value.resetFields();
-    appOrderFinanceForm.value.resetFields();
-  }
-  function classifyIntoFormData(allValues) {
-    let main = Object.assign({}, allValues.formValue);
-    return {
-      ...main, // 展开
-      appOrderCarList: appOrderCarForm.value.getFormData(),
-      appOrderVoucherList: appOrderVoucherForm.value.getFormData(),
-      appOrderFinanceList: appOrderFinanceForm.value.getFormData(),
-    };
-  }
-  //校验所有一对一子表表单
-  function validateSubForm(allValues) {
-    return new Promise((resolve, reject) => {
-      Promise.all([appOrderCarForm.value.validateForm(0), appOrderVoucherForm.value.validateForm(1), appOrderFinanceForm.value.validateForm(2)])
-        .then(() => {
-          resolve(allValues);
-        })
-        .catch((e) => {
-          if (e.error === VALIDATE_FAILED) {
-            // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
-            activeKey.value = e.index == null ? unref(activeKey) : refKeys.value[e.index];
-            if (e.errorFields) {
-              const firstField = e.errorFields[0];
-              if (firstField) {
-                e.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
-              }
-            }
-          } else {
-            console.error(e);
-          }
-        });
-    });
-  }
-  //表单提交事件
-  async function requestAddOrEdit(values) {
-    try {
-      setModalProps({ confirmLoading: true });
-      //提交表单
-      await saveOrUpdate(values, isUpdate.value);
-      //关闭弹窗
-      closeModal();
-      //刷新列表
-      emit('success');
-    } finally {
-      setModalProps({ confirmLoading: false });
+    async function reset(){
+      await resetFields();
+      activeKey.value = 'appOrderCar';
+      appOrderCarForm.value.resetFields();
+      appOrderVoucherForm.value.resetFields();
+      appOrderFinanceForm.value.resetFields();
+    }
+    function classifyIntoFormData(allValues) {
+         let main = Object.assign({}, allValues.formValue)
+         return {
+           ...main, // 展开
+           appOrderCarList: appOrderCarForm.value.getFormData(),
+           appOrderVoucherList: appOrderVoucherForm.value.getFormData(),
+           appOrderFinanceList: appOrderFinanceForm.value.getFormData(),
+         }
+       }
+     //校验所有一对一子表表单
+     function validateSubForm(allValues){
+         return new Promise((resolve,reject)=>{
+             Promise.all([
+                  appOrderCarForm.value.validateForm(0),
+                  appOrderVoucherForm.value.validateForm(1),
+                  appOrderFinanceForm.value.validateForm(2),
+             ]).then(() => {
+                 resolve(allValues)
+             }).catch(e => {
+                 if (e.error === VALIDATE_FAILED) {
+                     // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+                     activeKey.value = e.index == null ? unref(activeKey) : refKeys.value[e.index]
+                     if (e.errorFields) {
+                       const firstField = e.errorFields[0];
+                       if (firstField) {
+                         e.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+                       }
+                     }
+                 } else {
+                     console.error(e)
+                 }
+             })
+         })
+     }
+    //表单提交事件
+    async function requestAddOrEdit(values) {
+        try {
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
     }
-  }
 </script>
 
 <style lang="less" scoped>
-  /** 时间和数字输入框样式 */
+	/** 时间和数字输入框样式 */
   :deep(.ant-input-number) {
     width: 100%;
   }
@@ -142,4 +138,4 @@
   :deep(.ant-calendar-picker) {
     width: 100%;
   }
-</style>
+</style>

src/views/miniapp/order/components/AppOrderVoucherForm.vue

@@ -1,76 +1,74 @@
 <template>
-  <BasicForm @register="registerForm" name="AppOrderVoucherForm" class="basic-modal-form" />
+    <BasicForm @register="registerForm" name="AppOrderVoucherForm" class="basic-modal-form"/>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { appOrderVoucherFormSchema } from '../AppOrder.data';
-  import { defHttp } from '/@/utils/http/axios';
-  import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils';
+    import {defineComponent} from 'vue';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {appOrderVoucherFormSchema} from '../AppOrder.data';
+    import {defHttp} from '/@/utils/http/axios';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
 
-  export default defineComponent({
-    name: 'AppOrderVoucherForm',
-    components: { BasicForm },
-    props: {
-      disabled: {
-        type: Boolean,
-        default: false,
-      },
-    },
-    emits: ['register'],
-    setup(props, { emit }) {
-      const [registerForm, { setProps, resetFields, setFieldsValue, getFieldsValue, validate, scrollToField }] = useForm({
-        schemas: appOrderVoucherFormSchema,
-        showActionButtonGroup: false,
-        baseColProps: { span: 12 },
-      });
-      /**
-       *初始化加载数据
-       */
-      function initFormData(url, id) {
-        if (id) {
-          defHttp.get({ url, params: { id } }, { isTransformResponse: false }).then((res) => {
-            res.success && setFieldsValue({ ...res.result[0] });
-          });
-        }
-        setProps({ disabled: props.disabled });
-      }
-      /**
-       *获取表单数据
-       */
-      function getFormData() {
-        let formData = getFieldsValue();
-        Object.keys(formData).map((k) => {
-          if (formData[k] instanceof Array) {
-            formData[k] = formData[k].join(',');
-          }
-        });
-        return [formData];
-      }
-      /**
-       *表单校验
-       */
-      function validateForm(index) {
-        return new Promise((resolve, reject) => {
-          // 验证子表表单
-          validate()
-            .then(() => {
-              return resolve();
-            })
-            .catch(({ errorFields }) => {
-              return reject({ error: VALIDATE_FAILED, index, errorFields: errorFields, scrollToField: scrollToField });
+    export default defineComponent({
+        name:"AppOrderVoucherForm",
+        components: {BasicForm},
+        emits:['register'],
+        props:{
+            disabled: {
+                type: Boolean,
+                default: false
+            }
+        },
+        setup(props,{emit}) {
+            const [registerForm, { setProps, resetFields, setFieldsValue, getFieldsValue, validate, scrollToField }] = useForm({
+                schemas: appOrderVoucherFormSchema,
+                showActionButtonGroup: false,
+                baseColProps: {span: 12}
             });
-        });
-      }
-      return {
-        registerForm,
-        resetFields,
-        initFormData,
-        getFormData,
-        validateForm,
-      };
-    },
-  });
+            /**
+            *初始化加载数据
+            */
+            function initFormData(url,id){
+                if(id){
+                     defHttp.get({url,params:{id}},{isTransformResponse:false}).then(res=>{
+                       res.success && setFieldsValue({...res.result[0]});
+                    })
+                }
+                setProps({disabled: props.disabled})
+            }
+           /**
+            *获取表单数据
+            */
+            function getFormData(){
+               let formData = getFieldsValue();
+               Object.keys(formData).map(k=>{
+                    if(formData[k] instanceof Array){
+                        formData[k] = formData[k].join(',')
+                    }
+               });
+               return [formData];
+            }
+            /**
+            *表单校验
+            */
+            function validateForm(index){
+                return new Promise((resolve, reject) => {
+                    // 验证子表表单
+                    validate().then(()=>{
+                        return resolve()
+                    }).catch(({ errorFields }) => {
+                      return reject({ error: VALIDATE_FAILED, index, errorFields: errorFields, scrollToField: scrollToField });
+                    });
+                })
+            }
+            return {
+                registerForm,
+                resetFields,
+                initFormData,
+                getFormData,
+                validateForm
+            }
+        }
+    })
 </script>
 <style lang="less" scoped>
   .basic-modal-form {