佣金预付款

src/views/purchase/advanceCommission/PurAdvanceCommission.api.ts

@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/purCode/purAdvanceCommission/list',
+  save='/purCode/purAdvanceCommission/add',
+  edit='/purCode/purAdvanceCommission/edit',
+  deleteOne = '/purCode/purAdvanceCommission/delete',
+  deleteBatch = '/purCode/purAdvanceCommission/deleteBatch',
+  importExcel = '/purCode/purAdvanceCommission/importExcel',
+  exportXls = '/purCode/purAdvanceCommission/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}

src/views/purchase/advanceCommission/PurAdvanceCommission.data.ts

@@ -0,0 +1,104 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '审批(approve)(1-是,0-否)',
+    align: "center",
+    dataIndex: 'approve'
+  },
+  {
+    title: '提交(submit)1是0否',
+    align: "center",
+    dataIndex: 'submit'
+  },
+  {
+    title: '付款(payment)1是0否',
+    align: "center",
+    dataIndex: 'payment'
+  },
+  {
+    title: '单据日期',
+    align: "center",
+    dataIndex: 'billDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+  },
+  {
+    title: '预付款编号',
+    align: "center",
+    dataIndex: 'billCode'
+  },
+  {
+    title: '返佣类型(commission type)',
+    align: "center",
+    dataIndex: 'commissionType_dictText'
+  },
+  {
+    title: '预计付款日期(Expected payment date)',
+    align: "center",
+    dataIndex: 'expectedPaymentDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+  },
+  {
+    title: '收款人(payee)',
+    align: "center",
+    dataIndex: 'payee'
+  },
+  {
+    title: '开户行(opening bank)',
+    align: "center",
+    dataIndex: 'openingBank'
+  },
+  {
+    title: '银行帐号(bank account)',
+    align: "center",
+    dataIndex: 'bankAccount'
+  },
+  {
+    title: '银行代码(swift code)',
+    align: "center",
+    dataIndex: 'swiftCode'
+  },
+  {
+    title: '币种(currency)',
+    align: "center",
+    dataIndex: 'currency'
+  },
+  {
+    title: '备注(notes)',
+    align: "center",
+    dataIndex: 'notes'
+  },
+  {
+    title: '申请金额(approve money)',
+    align: "center",
+    dataIndex: 'approveMoney'
+  },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  approve: {title: '审批(approve)(1-是,0-否)',order: 0,view: 'text', type: 'string',},
+  submit: {title: '提交(submit)1是0否',order: 1,view: 'text', type: 'string',},
+  payment: {title: '付款(payment)1是0否',order: 2,view: 'text', type: 'string',},
+  billDate: {title: '单据日期',order: 3,view: 'date', type: 'string',},
+  billCode: {title: '预付款编号',order: 4,view: 'text', type: 'string',},
+  commissionType: {title: '返佣类型(commission type)',order: 5,view: 'list', type: 'string',dictCode: '',},
+  expectedPaymentDate: {title: '预计付款日期(Expected payment date)',order: 6,view: 'date', type: 'string',},
+  payee: {title: '收款人(payee)',order: 7,view: 'text', type: 'string',},
+  openingBank: {title: '开户行(opening bank)',order: 8,view: 'text', type: 'string',},
+  bankAccount: {title: '银行帐号(bank account)',order: 9,view: 'text', type: 'string',},
+  swiftCode: {title: '银行代码(swift code)',order: 10,view: 'text', type: 'string',},
+  currency: {title: '币种(currency)',order: 11,view: 'text', type: 'string',},
+  notes: {title: '备注(notes)',order: 12,view: 'text', type: 'string',},
+  approveMoney: {title: '申请金额(approve money)',order: 13,view: 'number', type: 'number',},
+};

src/views/purchase/advanceCommission/PurAdvanceCommissionList.vue

@@ -0,0 +1,299 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="billDate">
+              <template #label><span title="单据日期">单据日期</span></template>
+              <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParam.billDate" class="query-group-cust"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="billCode">
+              <template #label><span title="预付款编号">预付款编</span></template>
+              <a-input placeholder="请输入预付款编号" v-model:value="queryParam.billCode" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="6">
+              <a-form-item name="commissionType">
+                <template #label><span title="返佣类型(commission type)">返佣类型</span></template>
+                <a-input placeholder="请输入返佣类型(commission type)" v-model:value="queryParam.commissionType" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="payee">
+                <template #label><span title="收款人(payee)">收款人(</span></template>
+                <a-input placeholder="请输入收款人(payee)" v-model:value="queryParam.payee" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'purCode:pur_advance_commission:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button  type="primary" v-auth="'purCode:pur_advance_commission:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" v-auth="'purCode:pur_advance_commission: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="'purCode:pur_advance_commission: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)"/>
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <PurAdvanceCommissionModal ref="registerModal" @success="handleSuccess"></PurAdvanceCommissionModal>
+  </div>
+</template>
+
+<script lang="ts" name="purCode-purAdvanceCommission" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns, superQuerySchema } from './PurAdvanceCommission.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './PurAdvanceCommission.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import PurAdvanceCommissionModal from './components/PurAdvanceCommissionModal.vue'
+  import { useUserStore } from '/@/store/modules/user';
+  import { cloneDeep } from "lodash-es";
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '佣金预付款',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: async (params) => {
+        let rangerQuery = await setRangeQuery();
+        return Object.assign(params, rangerQuery);
+      },
+    },
+    exportConfig: {
+      name: "佣金预付款",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+  
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+   
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+   
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+   
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+        auth: 'purCode:pur_advance_commission:edit'
+      },
+    ];
+  }
+   
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+        auth: 'purCode:pur_advance_commission:delete'
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+  
+
+
+
+  
+  let rangeField = 'billDate,'
+  
+  /**
+   * 设置范围查询条件
+   */
+  async function setRangeQuery(){
+    let queryParamClone = cloneDeep(queryParam);
+    if (rangeField) {
+      let fieldsValue = rangeField.split(',');
+      fieldsValue.forEach(item => {
+        if (queryParamClone[item]) {
+          let range = queryParamClone[item];
+          queryParamClone[item+'_begin'] = range[0];
+          queryParamClone[item+'_end'] = range[1];
+          delete queryParamClone[item];
+        } else {
+          queryParamClone[item+'_begin'] = '';
+          queryParamClone[item+'_end'] = '';
+        }
+      })
+    }
+    return queryParamClone;
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>

src/views/purchase/advanceCommission/components/PurAdvanceCommissionForm.vue

@@ -0,0 +1,206 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="PurAdvanceCommissionForm">
+          <a-row>
+						<a-col :span="12">
+							<a-form-item label="单据日期" v-bind="validateInfos.billDate" id="PurAdvanceCommissionForm-billDate" name="billDate">
+								<a-date-picker placeholder="请选择单据日期"  v-model:value="formData.billDate" value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="预付款编号" v-bind="validateInfos.billCode" id="PurAdvanceCommissionForm-billCode" name="billCode">
+								<a-input v-model:value="formData.billCode" placeholder="请输入预付款编号"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="返佣类型(commission type)" v-bind="validateInfos.commissionType" id="PurAdvanceCommissionForm-commissionType" name="commissionType">
+								<j-dict-select-tag v-model:value="formData.commissionType" dictCode="" placeholder="请选择返佣类型(commission type)"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="预计付款日期(Expected payment date)" v-bind="validateInfos.expectedPaymentDate" id="PurAdvanceCommissionForm-expectedPaymentDate" name="expectedPaymentDate">
+								<a-date-picker placeholder="请选择预计付款日期(Expected payment date)"  v-model:value="formData.expectedPaymentDate" value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="收款人(payee)" v-bind="validateInfos.payee" id="PurAdvanceCommissionForm-payee" name="payee">
+								<a-input v-model:value="formData.payee" placeholder="请输入收款人(payee)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="开户行(opening bank)" v-bind="validateInfos.openingBank" id="PurAdvanceCommissionForm-openingBank" name="openingBank">
+								<a-input v-model:value="formData.openingBank" placeholder="请输入开户行(opening bank)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="银行帐号(bank account)" v-bind="validateInfos.bankAccount" id="PurAdvanceCommissionForm-bankAccount" name="bankAccount">
+								<a-input v-model:value="formData.bankAccount" placeholder="请输入银行帐号(bank account)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="银行代码(swift code)" v-bind="validateInfos.swiftCode" id="PurAdvanceCommissionForm-swiftCode" name="swiftCode">
+								<a-input v-model:value="formData.swiftCode" placeholder="请输入银行代码(swift code)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="币种(currency)" v-bind="validateInfos.currency" id="PurAdvanceCommissionForm-currency" name="currency">
+								<a-input v-model:value="formData.currency" placeholder="请输入币种(currency)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="PurAdvanceCommissionForm-notes" name="notes">
+								<a-input v-model:value="formData.notes" placeholder="请输入备注(notes)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="申请金额(approve money)" v-bind="validateInfos.approveMoney" id="PurAdvanceCommissionForm-approveMoney" name="approveMoney">
+								<a-input-number v-model:value="formData.approveMoney" placeholder="请输入申请金额(approve money)" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../PurAdvanceCommission.api';
+  import { Form } from 'ant-design-vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => ({})},
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    billDate: '',   
+    billCode: '',   
+    commissionType: '',   
+    expectedPaymentDate: '',   
+    payee: '',   
+    openingBank: '',   
+    bankAccount: '',   
+    swiftCode: '',   
+    currency: '',   
+    notes: '',   
+    approveMoney: undefined,
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = reactive({
+  });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>

src/views/purchase/advanceCommission/components/PurAdvanceCommissionModal.vue

@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <PurAdvanceCommissionForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></PurAdvanceCommissionForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import PurAdvanceCommissionForm from './PurAdvanceCommissionForm.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>

src/views/purchase/advancePayment/PurAdvancePayment.api.ts

@@ -0,0 +1,81 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/purCode/purAdvancePayment/list',
+  save='/purCode/purAdvancePayment/add',
+  edit='/purCode/purAdvancePayment/edit',
+  deleteOne = '/purCode/purAdvancePayment/delete',
+  deleteBatch = '/purCode/purAdvancePayment/deleteBatch',
+  importExcel = '/purCode/purAdvancePayment/importExcel',
+  exportXls = '/purCode/purAdvancePayment/exportXls',
+  queryDataById = '/purCode/purAdvancePayment/queryById',
+  purAdvancePaymentDetailsList = '/purCode/purAdvancePayment/queryPurAdvancePaymentDetailsByMainId',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const queryPurAdvancePaymentDetailsListByMainId = (id) => defHttp.get({url: Api.purAdvancePaymentDetailsList, params:{ id }});
+
+/**
+ * 列表接口
+ * @param 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(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
+
+/**
+* 根据id查询数据
+* @param params
+*/
+export const queryDataById = (id) => defHttp.get({url: Api.queryDataById, params:{ id }});
+

src/views/purchase/advancePayment/PurAdvancePayment.data.ts

@@ -0,0 +1,206 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '审批(approve)(1-是,0-否)',
+    align:"center",
+    dataIndex: 'approve_dictText'
+   },
+   {
+    title: '提交(submit)1是0否',
+    align:"center",
+    dataIndex: 'submit_dictText'
+   },
+   {
+    title: '付款(payment)1是0否',
+    align:"center",
+    dataIndex: 'payment_dictText'
+   },
+   {
+    title: '单据日期',
+    align:"center",
+    dataIndex: 'billDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+   {
+    title: '单据编码',
+    align:"center",
+    dataIndex: 'billCode'
+   },
+   {
+    title: '供应商(supplier)',
+    align:"center",
+    dataIndex: 'supplierName'
+   },
+   {
+    title: '预计付款日期(Expected payment date)',
+    align:"center",
+    dataIndex: 'expectedPaymentDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+   {
+    title: '收款人(payee)',
+    align:"center",
+    dataIndex: 'payee'
+   },
+   {
+    title: '开户行(opening bank)',
+    align:"center",
+    dataIndex: 'openingBank'
+   },
+   {
+    title: '银行帐号(bank account)',
+    align:"center",
+    dataIndex: 'bankAccount'
+   },
+   {
+    title: '银行代码(swift code)',
+    align:"center",
+    dataIndex: 'swiftCode'
+   },
+   {
+    title: '币种(currency)',
+    align:"center",
+    dataIndex: 'currency_dictText'
+   },
+   {
+    title: '委托收款证明(Entrusted Collection Certificate)',
+    align:"center",
+    dataIndex: 'collectionCertificate'
+   },
+   {
+    title: '备注(notes)',
+    align:"center",
+    dataIndex: 'notes'
+   },
+   {
+    title: '申请金额(approve money)',
+    align:"center",
+    dataIndex: 'approveMoney'
+   },
+   {
+    title: '来源',
+    align:"center",
+    dataIndex: 'sourceCode'
+   },
+   {
+    title: '预付款比例',
+    align:"center",
+    dataIndex: 'prepaymentRatio'
+   },
+];
+
+//子表表格配置
+export const purAdvancePaymentDetailsColumns: JVxeColumn[] = [
+    {
+      title: '项目名称',
+      key: 'projectName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '采购订单号(purchase code)',
+      key: 'purchaseCode',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '订单金额(order money)',
+      key: 'orderMoney',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '回款金额(collection amount)',
+      key: 'collectionAmount',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '已申请金额(applyed money',
+      key: 'applyedMoney',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '本次申请金额(apply money)',
+      key: 'applyMoney',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '发票(invoice)',
+      key: 'invoice',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '备注(notes)',
+      key: 'notes',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+
+// 高级查询数据
+export const superQuerySchema = {
+  approve: {title: '审批(approve)(1-是,0-否)',order: 0,view: 'list', type: 'string',dictCode: '',},
+  submit: {title: '提交(submit)1是0否',order: 1,view: 'list', type: 'string',dictCode: '',},
+  payment: {title: '付款(payment)1是0否',order: 2,view: 'list', type: 'string',dictCode: '',},
+  billDate: {title: '单据日期',order: 3,view: 'date', type: 'string',},
+  billCode: {title: '单据编码',order: 4,view: 'text', type: 'string',},
+  supplierName: {title: '供应商(supplier)',order: 5,view: 'text', type: 'string',},
+  expectedPaymentDate: {title: '预计付款日期(Expected payment date)',order: 6,view: 'date', type: 'string',},
+  payee: {title: '收款人(payee)',order: 7,view: 'text', type: 'string',},
+  openingBank: {title: '开户行(opening bank)',order: 8,view: 'text', type: 'string',},
+  bankAccount: {title: '银行帐号(bank account)',order: 9,view: 'text', type: 'string',},
+  swiftCode: {title: '银行代码(swift code)',order: 10,view: 'text', type: 'string',},
+  currency: {title: '币种(currency)',order: 11,view: 'list', type: 'string',dictCode: '',},
+  collectionCertificate: {title: '委托收款证明(Entrusted Collection Certificate)',order: 12,view: 'text', type: 'string',},
+  notes: {title: '备注(notes)',order: 13,view: 'text', type: 'string',},
+  approveMoney: {title: '申请金额(approve money)',order: 14,view: 'number', type: 'number',},
+  sourceCode: {title: '来源',order: 15,view: 'text', type: 'string',},
+  prepaymentRatio: {title: '预付款比例',order: 16,view: 'number', type: 'number',},
+  //子表高级查询
+  purAdvancePaymentDetails: {
+    title: '采购预付款-子表',
+    view: 'table',
+    fields: {
+        projectName: {title: '项目名称',order: 0,view: 'text', type: 'string',},
+        purchaseCode: {title: '采购订单号(purchase code)',order: 1,view: 'text', type: 'string',},
+        orderMoney: {title: '订单金额(order money)',order: 2,view: 'number', type: 'number',},
+        collectionAmount: {title: '回款金额(collection amount)',order: 3,view: 'number', type: 'number',},
+        applyedMoney: {title: '已申请金额(applyed money',order: 4,view: 'number', type: 'number',},
+        applyMoney: {title: '本次申请金额(apply money)',order: 5,view: 'number', type: 'number',},
+        invoice: {title: '发票(invoice)',order: 6,view: 'text', type: 'string',},
+        notes: {title: '备注(notes)',order: 7,view: 'text', type: 'string',},
+    }
+  },
+};

src/views/purchase/advancePayment/PurAdvancePaymentList.vue

@@ -0,0 +1,320 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="approve">
+              <template #label><span title="审批(approve)(1-是,0-否)">审批(a</span></template>
+              <a-input placeholder="请输入审批(approve)(1-是,0-否)" v-model:value="queryParam.approve" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="submit">
+              <template #label><span title="提交(submit)1是0否">提交(s</span></template>
+              <a-input placeholder="请输入提交(submit)1是0否" v-model:value="queryParam.submit" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="6">
+              <a-form-item name="payment">
+                <template #label><span title="付款(payment)1是0否">付款(p</span></template>
+                <a-input placeholder="请输入付款(payment)1是0否" v-model:value="queryParam.payment" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="billDate">
+                <template #label><span title="单据日期">单据日期</span></template>
+                <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParam.billDate" class="query-group-cust"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="billCode">
+                <template #label><span title="单据编码">单据编码</span></template>
+                <JRangeNumber v-model:value="queryParam.billCode" class="query-group-cust"></JRangeNumber>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="supplierName">
+                <template #label><span title="供应商(supplier)">供应商(</span></template>
+                <JRangeNumber v-model:value="queryParam.supplierName" class="query-group-cust"></JRangeNumber>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="expectedPaymentDate">
+                <template #label><span title="预计付款日期(Expected payment date)">预计付款</span></template>
+                <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParam.expectedPaymentDate" class="query-group-cust"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="sourceCode">
+                <template #label><span title="来源">来源</span></template>
+                <a-input placeholder="请输入来源" v-model:value="queryParam.sourceCode" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
+                <a-button preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" v-auth="'purCode:pur_advance_payment:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'purCode:pur_advance_payment:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'purCode:pur_advance_payment: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="'purCode:pur_advance_payment: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)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <PurAdvancePaymentModal @register="registerModal" @success="handleSuccess"></PurAdvancePaymentModal>
+  </div>
+</template>
+
+<script lang="ts" name="purCode-purAdvancePayment" 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 PurAdvancePaymentModal from './components/PurAdvancePaymentModal.vue'
+  import {columns, superQuerySchema} from './PurAdvancePayment.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './PurAdvancePayment.api';
+  import {downloadFile} from '/@/utils/common/renderUtils';
+  import { cloneDeep } from "lodash-es";
+  import { useUserStore } from '/@/store/modules/user';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  const userStore = useUserStore();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '采购预付款',
+           api: list,
+           columns,
+           canResize:false,
+           useSearchForm: false,
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+           },
+           beforeFetch: async (params) => {
+             let rangerQuery = await setRangeQuery();
+             return Object.assign(params, rangerQuery);
+           },
+        },
+        exportConfig: {
+            name:"采购预付款",
+            url: getExportUrl,
+            params: queryParam,
+        },
+        importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+        },
+    })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+           auth: 'purCode:pur_advance_payment:edit'
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft'
+           },
+           auth: 'purCode:pur_advance_payment:delete'
+         }
+       ]
+   }
+
+  
+
+  /* ----------------------以下为原生查询需要添加的-------------------------- */
+  const toggleSearchStatus = ref<boolean>(false);
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+  
+  let rangeField = 'billDate,expectedPaymentDate,'
+  
+  /**
+   * 设置范围查询条件
+   */
+  async function setRangeQuery(){
+    let queryParamClone = cloneDeep(queryParam);
+    if (rangeField) {
+      let fieldsValue = rangeField.split(',');
+      fieldsValue.forEach(item => {
+        if (queryParamClone[item]) {
+          let range = queryParamClone[item];
+          queryParamClone[item+'_begin'] = range[0];
+          queryParamClone[item+'_end'] = range[1];
+          delete queryParamClone[item];
+        } else {
+          queryParamClone[item+'_begin'] = '';
+          queryParamClone[item+'_end'] = '';
+        }
+      })
+    }
+    return queryParamClone;
+  }
+</script>
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>

src/views/purchase/advancePayment/components/PurAdvancePaymentForm.vue

@@ -0,0 +1,272 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="PurAdvancePaymentForm" ref="formRef">
+          <a-row>
+						<a-col :span="12">
+							<a-form-item label="单据日期" v-bind="validateInfos.billDate" id="PurAdvancePaymentForm-billDate" name="billDate">
+								<a-date-picker placeholder="请选择单据日期"  v-model:value="formData.billDate" value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="单据编码" v-bind="validateInfos.billCode" id="PurAdvancePaymentForm-billCode" name="billCode">
+								<a-input v-model:value="formData.billCode" placeholder="请输入单据编码"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplierName" id="PurAdvancePaymentForm-supplierName" name="supplierName">
+								<a-input v-model:value="formData.supplierName" placeholder="请输入供应商(supplier)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="预计付款日期(Expected payment date)" v-bind="validateInfos.expectedPaymentDate" id="PurAdvancePaymentForm-expectedPaymentDate" name="expectedPaymentDate">
+								<a-date-picker placeholder="请选择预计付款日期(Expected payment date)"  v-model:value="formData.expectedPaymentDate" value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="收款人(payee)" v-bind="validateInfos.payee" id="PurAdvancePaymentForm-payee" name="payee">
+								<a-input v-model:value="formData.payee" placeholder="请输入收款人(payee)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="开户行(opening bank)" v-bind="validateInfos.openingBank" id="PurAdvancePaymentForm-openingBank" name="openingBank">
+								<a-input v-model:value="formData.openingBank" placeholder="请输入开户行(opening bank)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="银行帐号(bank account)" v-bind="validateInfos.bankAccount" id="PurAdvancePaymentForm-bankAccount" name="bankAccount">
+								<a-input v-model:value="formData.bankAccount" placeholder="请输入银行帐号(bank account)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="银行代码(swift code)" v-bind="validateInfos.swiftCode" id="PurAdvancePaymentForm-swiftCode" name="swiftCode">
+								<a-input v-model:value="formData.swiftCode" placeholder="请输入银行代码(swift code)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="币种(currency)" v-bind="validateInfos.currency" id="PurAdvancePaymentForm-currency" name="currency">
+								<j-dict-select-tag v-model:value="formData.currency" dictCode="" placeholder="请选择币种(currency)"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="委托收款证明(Entrusted Collection Certificate)" v-bind="validateInfos.collectionCertificate" id="PurAdvancePaymentForm-collectionCertificate" name="collectionCertificate">
+								<a-input v-model:value="formData.collectionCertificate" placeholder="请输入委托收款证明(Entrusted Collection Certificate)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="PurAdvancePaymentForm-notes" name="notes">
+								<a-input v-model:value="formData.notes" placeholder="请输入备注(notes)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="申请金额(approve money)" v-bind="validateInfos.approveMoney" id="PurAdvancePaymentForm-approveMoney" name="approveMoney">
+								<a-input-number v-model:value="formData.approveMoney" placeholder="请输入申请金额(approve money)" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="预付款比例" v-bind="validateInfos.prepaymentRatio" id="PurAdvancePaymentForm-prepaymentRatio" name="prepaymentRatio">
+								<a-input-number v-model:value="formData.prepaymentRatio" placeholder="请输入预付款比例" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+
+		<!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated>
+      <a-tab-pane tab="采购预付款-子表" key="purAdvancePaymentDetails" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="purAdvancePaymentDetailsTableRef"
+          :loading="purAdvancePaymentDetailsTable.loading"
+          :columns="purAdvancePaymentDetailsTable.columns"
+          :dataSource="purAdvancePaymentDetailsTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"/>
+      </a-tab-pane>
+    </a-tabs>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+  import { queryPurAdvancePaymentDetailsListByMainId, queryDataById, saveOrUpdate } from '../PurAdvancePayment.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import {purAdvancePaymentDetailsColumns} from '../PurAdvancePayment.data';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import { Form } from 'ant-design-vue';
+  const useForm = Form.useForm;
+
+  export default defineComponent({
+    name: "PurAdvancePaymentForm",
+    components:{
+      JDictSelectTag,
+      JVxeTable,
+			JFormContainer,
+    },
+    props:{
+      formDisabled:{
+        type: Boolean,
+        default: false
+      },
+      formData: { type: Object, default: ()=>{} },
+      formBpm: { type: Boolean, default: true }
+    },
+    emits:['success'],
+    setup(props, {emit}) {
+      const loading = ref(false);
+      const formRef = ref();
+      const purAdvancePaymentDetailsTableRef = ref();
+      const purAdvancePaymentDetailsTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: purAdvancePaymentDetailsColumns,
+        dataSource: []
+      });
+      const activeKey = ref('purAdvancePaymentDetails');
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        billDate: '',   
+        billCode: '',   
+        supplierName: '',   
+        expectedPaymentDate: '',   
+        payee: '',   
+        openingBank: '',   
+        bankAccount: '',   
+        swiftCode: '',   
+        currency: '',   
+        collectionCertificate: '',   
+        notes: '',   
+        approveMoney: undefined,
+        prepaymentRatio: undefined,
+      });
+
+      //表单验证
+      const validatorRules = reactive({
+      });
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
+      const dbData = {};
+      const formItemLayout = {
+        labelCol: {xs: {span: 24}, sm: {span: 5}},
+        wrapperCol: {xs: {span: 24}, sm: {span: 16}},
+      };
+
+      // 表单禁用
+      const disabled = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return false;
+          }else{
+            return true;
+          }
+        }
+        return props.formDisabled;
+      });
+
+      
+
+      function add() {
+        resetFields();
+        purAdvancePaymentDetailsTable.dataSource = [];
+      }
+
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        //子表数据
+        const purAdvancePaymentDetailsDataList = await queryPurAdvancePaymentDetailsListByMainId(row['id']);
+        purAdvancePaymentDetailsTable.dataSource = [...purAdvancePaymentDetailsDataList];
+      }
+
+      async function queryMainData(id) {
+        const row = await queryDataById(id);
+        resetFields();
+        const tmpData = {};
+        Object.keys(formData).forEach((key) => {
+          if(row.hasOwnProperty(key)){
+            tmpData[key] = row[key]
+          }
+        })
+        //赋值
+        Object.assign(formData,tmpData);
+      }
+
+      const {getSubFormAndTableData, transformData} = useValidateAntFormAndTable(activeKey, {
+        'purAdvancePaymentDetails': purAdvancePaymentDetailsTableRef,
+      });
+
+      async function getFormData() {
+        try {
+          // 触发表单验证
+          await validate();
+        } catch ({ errorFields }) {
+          if (errorFields) {
+            const firstField = errorFields[0];
+            if (firstField) {
+              formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+            }
+          }
+          return Promise.reject(errorFields);
+        }
+        return transformData(toRaw(formData))
+      }
+
+      async function submitForm() {
+        const mainData = await getFormData();
+        const subData = await getSubFormAndTableData();
+        const values = Object.assign({}, dbData, mainData, subData);
+        console.log('表单提交数据', values)
+        const isUpdate = values.id ? true : false
+        await saveOrUpdate(values, isUpdate);
+        //关闭弹窗
+        emit('success');
+      }
+      
+      function setFieldsValue(values) {
+        if(values){
+          Object.keys(values).map(k=>{
+            formData[k] = values[k];
+          });
+        }
+      }
+
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+
+
+      return {
+        purAdvancePaymentDetailsTableRef,
+        purAdvancePaymentDetailsTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+      }
+    }
+  });
+</script>
+<style lang="less" scoped></style>

src/views/purchase/advancePayment/components/PurAdvancePaymentModal.vue

@@ -0,0 +1,67 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" :width="896" @ok="handleSubmit">
+    <pur-advance-payment-form ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></pur-advance-payment-form>
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import PurAdvancePaymentForm from './PurAdvancePaymentForm.vue';
+
+  export default {
+    name: "TestCgMainVxeModal",
+    components:{
+      BasicModal,
+      PurAdvancePaymentForm
+    },
+    emits:['register','success'],
+    setup(_p, {emit}){
+      const formComponent = ref()
+      const isUpdate = ref(true);
+      const formDisabled = ref(false);
+      const title = ref('')
+
+      //表单赋值
+      const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        formDisabled.value = !data?.showFooter;
+        title.value = data?.isUpdate ? (unref(formDisabled) ? '详情' : '编辑') : '新增';
+        if (unref(isUpdate)) {
+          formComponent.value.edit(data.record)
+        }else{
+          formComponent.value.add()
+        }
+      });
+
+      function handleSubmit() {
+        formComponent.value.submitForm();
+      }
+
+      function submitSuccess(){
+        emit('success');
+        closeModal();
+      }
+
+      return {
+        registerModal,
+        title,
+        formComponent,
+        formDisabled,
+        handleSubmit,
+        submitSuccess
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>

src/views/saleCode/salesInvoice/components/saleInvoiceForm.vue

@@ -669,6 +669,7 @@
         formData.invoiceHeader = data[0].invoiceHeader;
         formData.invoiceAddress = data[0].invoiceAddress;
         formData.currency = data[0].currency;
+        formData.fnumber = data[0].fnumber;
         formData.busynessType = '普通业务';
         getCustomerOptions({ pageSize: -1, id: data[0].customer }).then((res) => {
           formData.buyerTaxNumber = res.records[0].dutyParagraph;