预收款-第一版页面（配置菜单）

src/views/saleCode/advancePayment/advancePaymentForm.api.ts

@@ -0,0 +1,108 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/saleCode/saleQuotation/list',
+  save='/saleCode/saleQuotation/add',
+  edit='/saleCode/saleQuotation/edit',
+  deleteOne = '/saleCode/saleQuotation/delete',
+  deleteBatch = '/saleCode/saleQuotation/deleteBatch',
+  importExcel = '/saleCode/saleQuotation/importExcel',
+  exportXls = '/saleCode/saleQuotation/exportXls',
+  queryDataById = '/saleCode/saleQuotation/queryById',
+  submitBatch='/saleCode/saleQuotation/submitBatch',
+  cancelSubmitBatch='/saleCode/saleQuotation/returnSubmitBatch',
+}
+/**
+ * 导出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});
+
+/**
+ * 删除单个
+ */
+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 }});
+// 提交
+export const batchSubmit = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认提交',
+    content: '是否提交选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.get({url: Api.submitBatch, params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+// 取消提交
+export const cancelBatchSubmit = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认取消提交',
+    content: '是否取消提交选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.get({url: Api.cancelSubmitBatch, params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}

src/views/saleCode/advancePayment/advancePaymentForm.data.ts

@@ -0,0 +1,250 @@
+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'
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '预收款编号(bill code)',
+    align:"center",
+    dataIndex: 'billCode'
+   },  
+   {
+    title: '预收日期(delivert date)',
+    align:"center",
+    dataIndex: 'deliveryDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+  
+   {
+    title: '项目(project)',
+    align:"center",
+    width:250,
+    dataIndex: 'projectName'
+   },
+   {
+    title: '订单编号(sale order number)',
+    align:"center",
+    width:250,
+    dataIndex: 'saleOrderNumber'
+   },
+   {
+    title: '客户(customer)',
+    align:"center",
+    dataIndex: 'customer'
+   },
+   {
+    title: 'F号(F number)',
+    align:"center",
+    dataIndex: 'fnumber',
+    width:250,
+   },
+   {
+    title: '预收金额(advance payment amount)',
+    align:"center",
+    dataIndex: 'paymentAmount'
+   },
+   {
+    title: '订单金额(order amount)',
+    align:"center",
+    dataIndex: 'orderAmount'
+   },
+   {
+    title: '预售比例(advance payment ratio)',
+    align:"center",
+    dataIndex: 'advancePaymentRatio'
+   },
+   {
+    title: '提交(submit)',
+    align:"center",
+    dataIndex: 'submit_dictText',
+   },
+];
+
+//子表表格配置
+export const saleInvoiceShipColumns: JVxeColumn[] = [
+    {
+      title: '船名(ship name)',
+      key: 'shipName',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '主机号(host number)',
+      key: 'hostNumber',
+      type: JVxeTypes.input,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '工程编号(project No)',
+      key: 'projectNo',
+      type: JVxeTypes.input,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '船厂(ship factory)',
+      key: 'shipFactory',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '船东(shipowner)',
+      key: 'shipowner',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '操作(operation)',
+      key: 'action',
+      width:"400px",
+      // 固定在右侧
+      fixed: 'right',
+      // 对齐方式为居中
+      align: 'center',
+      // 组件类型定义为【插槽】
+      type: JVxeTypes.slot,
+      // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+      slotName: 'action',
+    },
+  ]
+export const saleInvoiceDetailColumns: JVxeColumn[] = [
+    {
+      title: '产品编码(product code)',
+      key: 'productCode',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },    
+    {
+      title: '产品名称(product name)',
+      key: 'ProductName',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '数量(quantity)',
+      key: 'quantity',
+      type: JVxeTypes.inputNumber,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '单价(price)',
+      key: 'taxPrice',
+      type: JVxeTypes.inputNumber,
+      placeholder: '请输入${title}',
+      defaultValue:'',  
+      width:"200px",
+    },
+    {
+      title: '金额(money)',
+      key: 'taxMoney',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '税额(tax amount)',
+      key: 'taxAmount',
+      type: JVxeTypes.inputNumber,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '备注(notes)',
+      key: 'notes',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+
+    {
+      title: '操作(operation)',
+      key: 'action',
+      width:"200px",
+      // 固定在右侧
+      fixed: 'right',
+      // 对齐方式为居中
+      align: 'center',
+      // 组件类型定义为【插槽】
+      type: JVxeTypes.slot,
+      // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+      slotName: 'action',
+    },
+  ]
+
+// 高级查询数据
+export const superQuerySchema = {
+  status: {title: '状态(1-已报价,0-已报价)',order: 0,view: 'number', type: 'number',},
+  otherStatus: {title: '其他状态(other status)',order: 2,view: 'text', type: 'string',},
+  submit: {title: '提交(1是 0否)',order: 3,view: 'text', type: 'string',},
+  billDate: {title: '单据日期(bill date)',order: 4,view: 'date', type: 'string',},
+  billCode: {title: '询价单号(bill code)',order: 5,view: 'text', type: 'string',},
+  inquiryProject: {title: '询价项目(inquiry project)',order: 6,view: 'text', type: 'string',},
+  inquiryCustomer: {title: '询价客户(inquiry customer)',order: 7,view: 'text', type: 'string',},
+  inquiryPlatform: {title: '询价平台(inquiry platform)',order: 8,view: 'text', type: 'string',},
+  customerInquiryNumber: {title: '客户询价单号(customer inquiry number)',order: 9,view: 'text', type: 'string',},
+  inquiryPeriodEnd: {title: '询价有效期(inquiry period)止',order: 10,view: 'date', type: 'string',},
+  inquiryPeriodBegin: {title: '询价有效期(inquiry period)始',order: 11,view: 'date', type: 'string',},
+  busynessType: {title: '业务类型(busyness type)',order: 12,view: 'text', type: 'string',},
+  priority: {title: '优先级(priority)',order: 13,view: 'text', type: 'string',},
+  productionClass: {title: '产品分类(production class)',order: 14,view: 'text', type: 'string',},
+  model: {title: '机型(model)',order: 15,view: 'text', type: 'string',},
+  maker: {title: '厂家(maker)',order: 16,view: 'text', type: 'string',},
+  saleDepartment: {title: '销售部门(sale department)',order: 17,view: 'text', type: 'string',},
+  salesman: {title: '业务员(salesman)',order: 18,view: 'text', type: 'string',},
+  inquiryTeam: {title: '采购询价组(procurement inquiry team)',order: 19,view: 'text', type: 'string',},
+  deliveryTime: {title: '交期(delivery time)',order: 20,view: 'datetime', type: 'string',},
+  attachs: {title: '附件(attachs)',order: 21,view: 'text', type: 'string',},
+  inquiryNotes: {title: '询价备注(inquiry notes)',order: 22,view: 'text', type: 'string',},
+  //子表高级查询
+  saleInquiryFormShip: {
+    title: '销售询价单子表 - 船明细',
+    view: 'table',
+    fields: {
+        shipId: {title: '船id',order: 0,view: 'text', type: 'string',},
+        shipName: {title: '船名',order: 1,view: 'text', type: 'string',},
+        hostNumber: {title: '主机号',order: 2,view: 'text', type: 'string',},
+        projectNo: {title: '工程编号',order: 3,view: 'text', type: 'string',},
+        shipFactory: {title: '船厂',order: 4,view: 'text', type: 'string',},
+        shipowner: {title: '船东',order: 5,view: 'text', type: 'string',},
+    }
+  },
+  saleInquiryFormProduct: {
+    title: '销售询价单子表 - 产品明细',
+    view: 'table',
+    fields: {
+        productId: {title: '产品id',order: 0,view: 'number', type: 'number',},
+        deliveryTime: {title: '交期',order: 1,view: 'date', type: 'string',},
+        productClass: {title: '产品分类',order: 2,view: 'text', type: 'string',},
+        productCode: {title: '产品编码',order: 3,view: 'text', type: 'string',},
+        chineseName: {title: '产品中文名',order: 4,view: 'text', type: 'string',},
+        englishName: {title: '产品英文名',order: 5,view: 'text', type: 'string',},
+        specifications: {title: '规格',order: 6,view: 'text', type: 'string',},
+        model: {title: '型号',order: 7,view: 'text', type: 'string',},
+        factory: {title: '厂家',order: 8,view: 'text', type: 'string',},
+        qualityGrade: {title: '质量等级',order: 9,view: 'text', type: 'string',},
+        quantity: {title: '数量',order: 10,view: 'number', type: 'number',},
+        unit: {title: '单位',order: 11,view: 'text', type: 'string',},
+        needShip: {title: '需要船检证书（1是 0否）',order: 12,view: 'text', type: 'string',},
+        shipInspection: {title: '船检证书',order: 13,view: 'text', type: 'string',},
+        notes: {title: '备注',order: 14,view: 'text', type: 'string',},
+    }
+  },
+};

src/views/saleCode/advancePayment/advancePaymentList.vue

@@ -0,0 +1,362 @@
+<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="8">
+                <a-form-item name="billDate">
+                  <template #label><span title="预收日期(bill date)">预收日期(bill date)</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="8">
+                <a-form-item name="billCode">
+                  <template #label><span title="预收款编码(bill code)">预收款编码(bill code)</span></template>
+                  <a-input placeholder="请输入预收款编码(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off"></a-input>
+                </a-form-item>
+            </a-col>          
+            <template v-if="toggleSearchStatus">
+              <a-col :lg="8">
+                <a-form-item name="project">
+                  <template #label><span title="项目(project)">项目(project)</span></template>
+                  <a-input v-model:value="queryParam.project" placeholder="请输入" AutoComplete="off"/>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="customer">
+                  <template #label><span title="客户(customer)">客户(customer)</span></template>
+                  <a-input placeholder="请输入" v-model:value="queryParam.customerName" allow-clear AutoComplete="off"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="saleOrderCode">
+                  <template #label><span title="订单编号(sale order code)">订单编号(sale order code)</span></template>
+                  <a-input placeholder="请输入" v-model:value="queryParam.saleOrderCode" allow-clear AutoComplete="off"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="fnumber">
+                  <template #label><span title="F号(F Number)">F号(F Number)</span></template>
+                  <a-input placeholder="请输入" v-model:value="queryParam.fnumber" allow-clear AutoComplete="off"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="submit">
+                  <template #label><span title="提交(submit)">提交(submit)</span></template>
+                  <JDictSelectTag v-model:value="queryParam.submit" placeholder="请选择" dictCode="yes_or_no" style="width: 100%;"/>
+                </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" size="small" >
+       <!--插槽:table标题-->
+        <template #tableTitle>
+            <a-button type="primary" v-auth="'saleCode:sale_order:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
+            <a-button  type="primary" v-auth="'saleCode:sale_order:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出(export)</a-button>
+            <a-button  type="primary"  @click="submit" > 提交(submit)</a-button>
+            <a-button  type="primary"  @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <template #overlay>
+                  <a-menu>
+                    <a-menu-item key="1" @click="batchHandleDelete"  v-auth="'saleCode:sale_order_form:deleteBatch'">
+                      <Icon icon="ant-design:delete-outlined"></Icon>
+                      删除(delete)
+                    </a-menu-item>
+                  </a-menu>
+                </template>
+                <a-button v-auth="'saleCode:sale_order:delete'">批量操作
+                  <Icon icon="mdi:chevron-down"></Icon>
+                </a-button>
+          </a-dropdown>
+        </template>
+         <!--操作栏-->
+        <template #action="{ record }">
+          <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        </template>
+        <!--字段回显插槽-->
+        <template v-slot:bodyCell="{ column, record, index, text }">
+        </template>
+      </BasicTable>
+      <!-- 表单区域 -->
+      <advancePaymentFormModal  @register="registerModal" @success="handleSuccess"></advancePaymentFormModal>
+    </div>
+  </template>
+  
+  <script lang="ts" name="saleCode-saleInquiryForm" setup>
+    import {ref, reactive, computed, unref,onMounted} from 'vue';
+    import {BasicTable, useTable, TableAction} from '/@/components/Table';
+    import { useListPage } from '/@/hooks/system/useListPage'
+    import {useModal} from '/@/components/Modal';
+    import {columns,} from './advancePaymentForm.data';
+    import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit} from './advancePaymentForm.api';
+    import { cloneDeep } from "lodash-es";
+    import { defHttp } from '/@/utils/http/axios';
+    import { JDictSelectTag} from '/@/components/Form';
+    import advancePaymentFormModal from './components/advancePaymentFormModal.vue';
+    import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+    import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+    import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+    import { message } from 'ant-design-vue';
+    const formRef = ref();
+    const queryParam = reactive<any>({});
+    //注册model
+    const [registerModal, {openModal}] = useModal();
+    var classOption = ref([]);
+     //注册table数据
+    const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+        tableProps:{
+             title: '预付款',
+             api: list,
+             columns,
+             canResize:false,
+             useSearchForm: false,
+             actionColumn: {
+                 width: 200,
+                 fixed:'right'
+             },
+             scroll:{
+              x:'4000px'
+             },
+             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
+
+     // 自动请求并暴露内部方法
+     onMounted(() => {
+      getOptiom()
+    });
+  
+     /**
+      * 新增事件
+      */
+    function handleAdd() {
+       openModal(true, {
+         isUpdate: false,
+         showFooter: true,
+         isRevise: false
+       });
+    }
+     /**
+      * 编辑事件
+      */
+    function handleEdit(record: Recordable) {
+       openModal(true, {
+         record,
+         isUpdate: true,
+         showFooter: true,
+         isRevise: false
+       });
+     }
+    //  产品分类
+    function getOptiom(){
+          defHttp
+              .get({ url: 'baseCode/baseProductClass/list'}, { isTransformResponse: false })
+              .then((res) => {
+                  if (res.success) {
+                    classOption.value = []
+                    res.result.records.forEach(element => {
+                        var obj = {
+                          label: element.name?element.name:'无名称请维护',
+                          value: element.id?element.id:''
+                        };
+                        classOption.value.push( obj)
+                    });    
+                  }
+              })
+              .finally(() => {
+                  // loading.value = false;
+              });
+    }
+     /**
+      * 详情
+     */
+    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: '编辑(edit)',
+             onClick: handleEdit.bind(null, record),
+             auth: 'saleCode:sale_order:edit',
+             ifShow: record.submit=='0'||!record.submit
+           },
+           {
+             label: '详情(detail)',
+             onClick: handleDetail.bind(null, record),
+             ifShow: record.submit=='1'
+           }, 
+         ]
+     }
+       /**
+          * 下拉操作栏
+          */
+    function getDropDownAction(record){
+         return [
+            {
+             label: '详情(detail)',
+             onClick: handleDetail.bind(null, record),
+             ifShow: record.submit=='0'||!record.submit
+           },
+           {
+             label: '删除(delete)',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+               placement: 'topLeft'
+             },
+             auth: 'saleCode:sale_order:delete',
+             ifShow: record.submit=='0'||!record.submit
+           }
+         ]
+     }
+    function submit(){
+      if(selectedRowKeys.value.length==0){
+        message.warning('请选择数据')
+      }else{
+        var ids=selectedRowKeys.value.join(',')
+        batchSubmit({ids: ids},handleSuccess);
+      }
+    }
+    function cancelSubmit(){
+      if(selectedRowKeys.value.length==0){
+        message.warning('请选择数据')
+      }else{
+        var ids=selectedRowKeys.value.join(',')
+        cancelBatchSubmit({ids: ids},handleSuccess);
+      }
+    }
+  
+    /* ----------------------以下为原生查询需要添加的-------------------------- */
+    const toggleSearchStatus = ref<boolean>(false);
+    const labelCol = reactive({
+      xs:24,
+      sm:8,
+    });
+    const wrapperCol = reactive({
+      xs: 24,
+      sm: 16,
+    });
+    const labelCol1 = reactive({
+      xs:24,
+      sm:12,
+    });
+    const wrapperCol1 = reactive({
+      xs: 24,
+      sm: 12,
+    });
+    /**
+     * 重置
+     */
+    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: 8px;
+        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: 8px;
+        height: 32px;
+      }
+      :deep(.ant-picker),:deep(.ant-input-number){
+        width: 100%;
+      }
+    }
+  </style>

src/views/saleCode/advancePayment/components/advancePaymentForm.vue

@@ -0,0 +1,288 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="saleInvoiceForm" ref="formRef">
+          <a-row>
+            <a-col :span="12">
+							<a-form-item label="预收款单号(bill code)" v-bind="validateInfos.billCode" id="saleInvoiceForm-billCode" name="billCode" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+								<a-input v-model:value="formData.billCode" placeholder="自动生成" disabled></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="预收日期(bill date)" v-bind="validateInfos.billDate" id="saleInvoiceForm-billDate" name="billDate">
+								<a-date-picker placeholder="请选择发票日期(bill date)"  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="项目(project)" v-bind="validateInfos.projectName" id="saleInvoiceForm-projectName" name="projectName">
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="客户(customer)" v-bind="validateInfos.customer" id="saleInvoiceForm-customer" name="customer" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+                <JSelectInput   v-model:value="formData.customer"  placeholder="请选择" :options="customerOption" ></JSelectInput>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="预收金额(advance payment amount)" v-bind="validateInfos.advancePaymentAmount" id="saleInvoiceForm-advancePaymentAmount" name="advancePaymentAmount">
+                <a-input v-model:value="formData.advancePaymentAmount" placeholder="请输入"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="订单金额(order amount)" v-bind="validateInfos.orderAmount" id="saleInvoiceForm-orderAmount" name="orderAmount">
+                <a-input v-model:value="formData.orderAmount" placeholder="请输入"  allow-clear disabled></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="预收比例(advance payment ratio)" v-bind="validateInfos.advancePaymentRatio" id="saleInvoiceForm-advancePaymentRatio" name="advancePaymentRatio">
+                <a-input v-model:value="formData.advancePaymentRatio" placeholder="请输入"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="F号(F number)" v-bind="validateInfos.fnumber" id="saleInvoiceForm-fnumber" name="fnumber">
+                <a-input v-model:value="formData.fnumber" placeholder="请输入"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>						
+            <a-col :span="12">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.quotationNotes" id="saleInvoiceForm-notes" name="notes" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+								<a-input v-model:value="formData.notes" placeholder="请输入报价备注(quotation notes)"  allow-clear AutoComplete="off"></a-input>
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+    <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import {queryDataById, saveOrUpdate } from '../advancePaymentForm.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import SelectProjectModal from '../../../publicComponents/SelectProjectModal.vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import { JDictSelectTag,JSelectMultiple} from '/@/components/Form';
+  import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+  import { Form,message } from 'ant-design-vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import moment from 'moment';
+  const userStore = useUserStore();
+  const useForm = Form.useForm;
+  export default defineComponent({
+    name: "advancePaymentForm",
+    components:{
+      JVxeTable,
+			JFormContainer,
+      JUpload,
+      SelectProjectModal,
+      JDictSelectTag,
+      JSelectInput,
+      JSelectMultiple,
+    },
+    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();
+      var SelectProjectModalRef = ref()
+      var customerOption =ref([]);
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        status: undefined,
+        delFlag: undefined,
+        billDate: moment(new Date()).format('YYYY-MM-DD'),   
+        billCode: '',   
+        project: '',   
+        projectName: '',   
+        customer: '',   
+        customerName: '',   
+        advancePaymentAmount: '',   
+        orderAmount: '',   
+        advancePaymentRatio: '',   
+        fnumber: '',   
+        notes: '',           
+      });
+
+      //表单验证
+      const validatorRules = reactive({
+      });
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
+      const dbData = {};
+      const formItemLayout = {
+        labelCol: {xs: {span: 24}, sm: {span: 8}},
+        wrapperCol: {xs: {span: 24}, sm: {span: 13}},
+        labelCol1: {xs: {span: 24}, sm: {span: 8}},
+        wrapperCol1: {xs: {span: 24}, sm: {span: 13}},
+      };
+
+      // 表单禁用
+      const disabled = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return false;
+          }else{
+            return true;
+          }
+        }
+        return props.formDisabled;
+      });
+
+      
+      //新增方法
+      function add() {
+        resetFields();
+        getCustomerOptions()
+        formData.salesman=userStore.getUserInfo.username;
+        formData.saleDepartment = userStore.getUserInfo.orgCode
+      }
+      //编辑方法
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        getCustomerOptions()
+      }
+      //获取主表
+      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);
+      }
+      //获取表单信息
+      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 values = Object.assign({}, dbData, mainData);
+          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;
+      }
+      //选择项目
+      function addProject(data) {
+        if(data.length==0){
+          formData.project = 
+          formData.projectName = ''
+        }else{
+          formData.project = data[0].id
+          formData.projectName = data[0].name
+          formData.customer =data[0].customerId
+          formData.customerName =data[0].customerId_dictText
+        }
+      }
+      //获取客户列表
+      function getCustomerOptions(){
+          let params = {pageSize:'-1',status:1}
+          defHttp.get({url:'/cuspCode/cuspCustomerProfile/list',params}, { isTransformResponse: false }).then(res=>{
+            if(res){
+              customerOption.value = []
+              res.result.records.forEach(item=>{
+                customerOption.value.push({
+                  label: item.name,
+                  value: item.id,
+                  priority:item.priority,
+                  intermediatorCommission:item.intermediatorCommission,
+                  commission:item.commission
+                })
+              })
+            }
+          })
+      }
+      //选择项目  
+      function onSearchProject(){
+        SelectProjectModalRef.value.getTable()
+      }
+      return {
+        validatorRules,
+        validateInfos,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+        SelectProjectModalRef,
+        onSearchProject,
+        addProject,
+        getCustomerOptions,
+        customerOption,
+      }
+    }
+  });
+</script>
+<style lang="less" scoped>
+  /** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+  /deep/.vxe-table--body-wrapper{
+    height: 100% !important;
+  }
+  /deep/.ant-modal-body{
+    padding: 24px !important;
+  }
+  
+  /deep/.ant-form-item{
+    margin-bottom: 8px !important;
+  }
+      
+</style>

src/views/saleCode/advancePayment/components/advancePaymentFormModal.vue

@@ -0,0 +1,68 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="95%" @ok="handleSubmit">
+    <advancePaymentForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></advancePaymentForm>
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import advancePaymentForm from './advancePaymentForm.vue';
+
+  export default {
+    name: "advancePaymentFormModal",
+    components:{
+      BasicModal,
+      advancePaymentForm
+    },
+    emits:['register','success'],
+    setup(_p, {emit}){
+      const formComponent = ref()
+      const isUpdate = ref(true);
+      const formDisabled = ref(false);
+      const isRevise = 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>