佣金订单-页面（第一版）

src/views/platformBusiness/commissionOrder/commissionOrder.vue

@@ -0,0 +1,354 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item name="billCode" :label-col="{ style: 'width: 200px' }">
+              <template #label><span title="订单编号(bill code)">订单编号(bill code)</span></template>
+              <JInput placeholder="请输入订单编号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item name="billDate" :label-col="{ style: 'width: 200px' }">
+              <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>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item label="供应商回款(supplier payment)">
+                <JDictSelectTag v-model:value="queryParam.supplierPayment" placeholder="请选择" dictCode="yes_or_no" style="width: 100%" />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="16">
+              <a-form-item name="customer">
+                <template #label><span title="客户(customer)">客户(customer)</span></template>
+                <JSelect   v-model:value="queryParam.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="16">
+              <a-form-item name="supplier">
+                <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+              </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>
+            <a-col :lg="8">
+                <a-form-item label="业务员(salesman)" >
+                    <j-input placeholder="请输入" v-model:value="queryParam.salesman"></j-input>
+                </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+                 <a-form-item label="销售部门(sale department)">
+                    <j-input placeholder="请输入" v-model:value="queryParam.saleDepartment"></j-input>
+                  </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="close">
+                <template #label><span title="关闭(close)">关闭(close)</span></template>
+                <JDictSelectTag v-model:value="queryParam.close" 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_quotation:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
+        <a-button type="primary" v-auth="'saleCode:sale_quotation: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_quotation:deleteBatch'">
+                <Icon icon="ant-design:delete-outlined" />
+                删除(delete)
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'saleCode:sale_inquiry_form:deleteBatch'"
+            >批量操作
+            <Icon icon="mdi:chevron-down" />
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #bodyCell="{ column, record, index, text }"> </template>
+    </BasicTable>
+    <commissionOrderModal @register="registerModal" @success="handleSuccess" />
+    <!-- 表单区域 -->
+  </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 './commissionOrderForm.data';
+  import {
+    list,
+    deleteOne,
+    batchDelete,
+    getImportUrl,
+    getExportUrl,
+    batchSubmit,
+    cancelBatchSubmit,
+    supplierOption,
+    CustomerOption
+  } from './commissionOrderForm.api';
+  import { cloneDeep } from 'lodash-es';
+  import { JDictSelectTag, JInput ,JSelect} from '/@/components/Form';
+  import commissionOrderModal from './components/commissionOrderModal.vue';
+  import { message } from 'ant-design-vue';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, { openModal }] = useModal();
+  var showField = ref('currency+name');
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '佣金订单',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 240,
+        fixed: 'right',
+      },
+      scroll: {
+        x: '2000px',
+        y:'calc(100vh - 400px)',
+      },
+      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;
+
+
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    openModal(true, {
+      isUpdate: false,
+      showFooter: true,
+      isRevise: false,
+    });
+  }
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: true,
+      isRevise: false,
+    });
+  }
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: false,
+      isRevise: 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_quotation:edit',
+        ifShow: record.status == '0',
+      },
+      {
+        label: '删除(delete)',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+        ifShow: record.status == '0',
+        auth: 'saleCode:sale_quotation:delete',
+      },
+    ];
+  }
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情(detail)',
+        onClick: handleDetail.bind(null, record),
+      },
+    ];
+  }
+  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: 9,
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 17,
+  });
+  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/platformBusiness/commissionOrder/commissionOrderForm.api.ts

@@ -0,0 +1,115 @@
+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',
+  productList = '/saleCode/saleQuotation/queryProductByMainId',
+  submitBatch='/saleCode/saleQuotation/submitBatch',
+  cancelSubmitBatch='/saleCode/saleQuotation/returnSubmitBatch',
+  supplierList='/cuspCode/cuspSupplierProfile/list?pageSize=-1',
+  customerList='/cuspCode/cuspCustomerProfile/list',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+export const queryProductListByMainId = (id) => defHttp.get({url: Api.productList, 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 }});
+// 提交
+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();
+      });
+    }
+  });
+}
+
+//获取供应商列表
+export const supplierOption = (params) => defHttp.get({url: Api.supplierList, params});
+export const CustomerOption = (params) => defHttp.get({ url: Api.customerList, params });

src/views/platformBusiness/commissionOrder/commissionOrderForm.data.ts

@@ -0,0 +1,201 @@
+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: '单据日期(bill date)',
+    align:"center",
+    dataIndex: 'billDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+   {
+    title: '客户(customer)',
+    align:"center",
+    width:250,
+    dataIndex: 'customerName'
+   },
+   {
+    title: '供应商(supplier)',
+    align:"center",
+    width:250,
+    dataIndex: 'supplierName'
+   },
+   {
+    title: '销售部门(saleDepartment)',
+    align:"center",
+    dataIndex: 'saleDepartment'
+   },
+   {
+    title: '业务员(salesman)',
+    align:"center",
+    dataIndex: 'salesman',
+    width:250,
+   },
+   {
+    title: '提交(submit)',
+    align:"center",
+    dataIndex: 'submit'
+   },
+   {
+    title: '关闭(close)',
+    align:"center",
+    dataIndex: 'close'
+   },
+   {
+    title: '供应商回款(supplier payment)',
+    align:"center",
+    dataIndex: 'supplierPayment'
+   },
+];
+
+
+export const ProductColumns: JVxeColumn[] = [
+    {
+      title: '产品分类(product class)',
+      key: 'productClass',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '产品编码(product code)',
+      key: 'productCode',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '产品中文名(chinese name)',
+      key: 'chineseName',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '产品英文名(english name)',
+      key: 'englishName',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '型号(model)',
+      key: 'model',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '订货号(orderno)',
+      key: 'orderno',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '图号(drawingno)',
+      key: 'drawingno',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    // {
+    //   title: '厂家(factory)',
+    //   key: 'factory',
+    //   placeholder: '请输入${title}',
+    //   width:"200px",
+    //   defaultValue:'',
+    //   type: JVxeTypes.normal,
+    //   dictCode: 'factory',
+    // },
+    {
+      title: '质量等级(quality grade)',
+      key: 'qualityGrade',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '数量(quantity)',
+      key: 'quantity',
+      type: JVxeTypes.inputNumber,
+      validateRules: [{ required: true, message: '' }],
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '含税单价(tax price)',
+      key: 'taxPrice',
+      type: JVxeTypes.inputNumber,
+      validateRules: [{ required: true, message: '' }],
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '含税金额(tax money)',
+      key: 'taxMoney',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '佣金率(commission rate)',
+      key: 'commissionRate',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '佣金(commission)',
+      key: 'commission',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '备注(note)',
+      key: 'notes',
+      width:"200px",
+      type: JVxeTypes.input,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+
+    {
+      title: '操作(operation)',
+      key: 'action',
+      width:"200px",
+      // 固定在右侧
+      fixed: 'right',
+      // 对齐方式为居中
+      align: 'center',
+      // 组件类型定义为【插槽】
+      type: JVxeTypes.slot,
+      // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+      slotName: 'action',
+    },
+  ]

src/views/platformBusiness/commissionOrder/components/commissionOrderFormForm.vue

@@ -0,0 +1,371 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="commissionOrderForm" ref="formRef">
+          <a-row>
+            <a-col :span="12">
+              <a-form-item label="订单编号(bill code)" v-bind="validateInfos.billCode" id="commissionOrderForm-billCode" name="billCode">
+                <a-input v-model:value="formData.billCode" placeholder="自动生成" disabled />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="单据日期(bill date)" v-bind="validateInfos.billDate" id="commissionOrderForm-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="供应商(supplier)" v-bind="validateInfos.supplier" id="commissionOrderForm-supplier" name="supplier">
+                <ApiSelect
+                  :api="supplierOption"
+                  showSearch
+                  v-model:value="formData.supplier"
+                  optionFilterProp="label"
+                  resultField="records"
+                  labelField="name"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="客户(customer)" v-bind="validateInfos.customer" id="commissionOrderForm-customer" name="customer">
+                <ApiSelect
+                  :api="CustomerOption"
+                  showSearch
+                  v-model:value="formData.customer"
+                  optionFilterProp="label"
+                  resultField="records"
+                  labelField="name"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="佣金合同(commission contract)" v-bind="validateInfos.commissionContract" id="SaleOrderForm-commissionContract" name="commissionContract">
+                <a-input-search
+                  v-model:value="formData.commissionContract"
+                  placeholder=""
+                  readonly
+                  allow-clear
+                  enter-button="Search"
+                  AutoComplete="off"
+                  @search="onSearchCommissionContract"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="佣金(commission)" v-bind="validateInfos.commission" id="commissionOrderForm-commission" name="commission">
+                <a-input v-model:value="formData.commission" placeholder="请输入采购员(salesman)" allow-clear  />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item
+                label="销售部门(sale department)"
+                v-bind="validateInfos.saleDepartment"
+                id="commissionOrderForm-saleDepartment"
+                name="saleDepartment"
+              >
+                <a-input v-model:value="formData.saleDepartmentName" placeholder="请输入" allow-clear disabled />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="业务员(salesman)" v-bind="validateInfos.salesman" id="commissionOrderForm-salesman" name="salesman">
+                <a-input v-model:value="formData.salesmanName" placeholder="请输入采购员(salesman)" allow-clear disabled />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="commissionOrderForm-notes" name="notes">
+                <a-input v-model:value="formData.notes" AutoComplete="off" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="附件(attachs)"  v-bind="validateInfos.attachs"  id="commissionOrderForm-attachs"   name="attachs">
+                <JUpload v-model:value="formData.attachs"></JUpload>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+
+    <!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated style="padding: 24px; padding-top: 0px">
+      <a-tab-pane tab="佣金合同 - 产品明细(product details)" key="commissionOrderFormProduct" :forceRender="true">
+        <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="selectProductList"> 选择产品(select products)</a-button>
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="commissionOrderFormProductTableRef"
+          :loading="commissionOrderFormProductTable.loading"
+          :columns="commissionOrderFormProductTable.columns"
+          :dataSource="commissionOrderFormProductTable.dataSource"
+          :maxHeight="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          asyncRemove
+        >
+          <template #action="props">
+            <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
+              <a>删除(delete)</a>
+            </a-popconfirm>
+          </template>
+        </j-vxe-table>
+      </a-tab-pane>
+    </a-tabs>
+    <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct ='addProduct'></SelectPrpductModal>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw } from 'vue';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+  import { queryProductListByMainId, queryDataById, supplierOption, saveOrUpdate,CustomerOption} from '../commissionOrderForm.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import { ProductColumns } from '../commissionOrderForm.data';
+  import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import { JDictSelectTag, ApiSelect } from '/@/components/Form';
+  import { Form, message } from 'ant-design-vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import moment from 'moment';
+  const useForm = Form.useForm;
+  export default defineComponent({
+    name: 'commissionOrderForm',
+    components: {
+      JVxeTable,
+      JFormContainer,
+      SelectPrpductModal,
+      JUpload,
+      JDictSelectTag,
+      ApiSelect,
+    },
+    props: {
+      formDisabled: {
+        type: Boolean,
+        default: false,
+      },
+      formData: { type: Object, default: () => {} },
+      formBpm: { type: Boolean, default: true },
+    },
+    emits: ['success'],
+    setup(props, { emit }) {
+      const userStore = useUserStore();
+      const loading = ref(false);
+      const formRef = ref();
+      const SelectPrpductModalRef = ref();
+      const commissionOrderFormProductTableRef = ref();
+      const commissionOrderFormProductTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: ProductColumns,
+        dataSource: [],
+      });
+      const activeKey = ref('commissionOrderFormProduct');
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        status: undefined,
+        delFlag: undefined,
+        submit: undefined,
+        billCode: '',
+        billDate: moment(new Date()).format('YYYY-MM-DD'),
+        supplier: '',
+        supplierName: '',
+        currency: '',
+        salesman:'',
+        salesmanName:'',
+        saleDepartment:'',
+        saleDepartmentName:'',
+        notes: '',
+        attachs: '',
+        commissionContract:'',
+      });
+
+      //表单验证
+      const validatorRules = reactive({
+      });
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
+      const dbData = {};
+      const formItemLayout = {
+        labelCol: { xs: { span: 24 }, sm: { span: 7 } },
+        wrapperCol: { xs: { span: 24 }, sm: { span: 15 } },
+        labelCol1: { xs: { span: 24 }, sm: { span: 7 } },
+        wrapperCol1: { xs: { span: 24 }, sm: { span: 15 } },
+      };
+
+      // 表单禁用
+      const disabled = computed(() => {
+        if (props.formBpm === true) {
+          if (props.formData.disabled === false) {
+            return false;
+          } else {
+            return true;
+          }
+        }
+        return props.formDisabled;
+      });
+
+      function add() {
+        resetFields();
+        commissionOrderFormProductTable.dataSource = [];
+        activeKey.value = 'commissionOrderFormProduct';
+        formData.salesman = userStore.getUserInfo.username;
+        formData.salesmanName = userStore.getUserInfo.realname;
+        formData.saleDepartment = userStore.getUserInfo.orgCode;
+        formData.saleDepartmentName = userStore.getUserInfo.orgName;
+      }
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        const commissionOrderFormProductDataList = await queryProductListByMainId(row['id']);
+        commissionOrderFormProductTable.dataSource = [...commissionOrderFormProductDataList];
+      }
+
+      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, {
+        purOrderProduct: commissionOrderFormProductTableRef,
+      });
+
+      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() {
+        var xTable = commissionOrderFormProductTableRef.value!.getXTable()
+        if(xTable.data.length==0){
+          message.warning('请添加产品明细')
+        }else{
+          commissionOrderFormProductTableRef.value!.validateTable().then(async (errMap) =>  {
+            if (errMap) {
+              console.log('表单验证未通过：', { errMap });
+            } else {
+              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];
+          });
+        }
+      }
+      function selectProductList(){
+        SelectPrpductModalRef.value.getTable()
+      }
+      function addProduct(data) {
+        data.map((item) => {
+          item.productClass = item.classId_dictText;
+          item.productCode = item.code;
+          item.productId = item.id;
+          item.id = undefined
+        });
+        var xTable = commissionOrderFormProductTableRef.value!.getXTable();
+        var arrProduct = xTable.data.concat(data);
+        commissionOrderFormProductTable.dataSource = arrProduct;
+      }      //产品明细-删除行
+      function handleDelete(prop) {
+        var xTable = commissionOrderFormProductTableRef.value!.getXTable()
+        var newArray = [...xTable.data]
+        newArray.splice(prop.rowIndex, 1)
+        commissionOrderFormProductTable.dataSource = newArray  
+      }      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+      function onSearchCommissionContract(){
+
+      }
+      return {
+        commissionOrderFormProductTableRef,
+        commissionOrderFormProductTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+        selectProductList,
+        SelectPrpductModalRef,
+        addProduct,
+        handleDelete,
+        supplierOption,
+        CustomerOption,
+        onSearchCommissionContract
+      };
+    },
+  });
+</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;
+  }
+  /deep/.vxe-cell--valid-error-msg{
+    color: white !important;
+    background-color: white !important;
+  }  
+</style>

src/views/platformBusiness/commissionOrder/components/commissionOrderModal.vue

@@ -0,0 +1,76 @@
+<template>
+  <div ref="commissionContractModalRef">
+    <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="95%"  @ok="handleSubmit" :getContainer ='()=>$refs.SaleOrderDetailsRef' :maskClosable="false">
+      <commissionOrderFormForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></commissionOrderFormForm>
+    </BasicModal>
+  </div>
+</template>
+
+<script lang="ts">
+  import { ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import commissionOrderFormForm from './commissionOrderFormForm.vue';
+
+  export default {
+    name: "commissionOrderModal",
+    components:{
+      BasicModal,
+      commissionOrderFormForm
+    },
+    emits:['register','success'],
+    setup(_p, {emit}){
+      const formComponent = ref()
+      const isUpdate = ref(true);
+      const formDisabled = ref(false);
+      const title = ref('')
+      var SaleOrderDetailsRef = 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,
+        SaleOrderDetailsRef,
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+  /deep/.ant-modal {
+    // width: 520px;
+    padding-bottom: 0;
+    margin-top: -10px;
+    height: 100%;
+}
+</style>