运费采购订单-第一版页面

src/views/purchase/freightPurchaseOrder/FreightPurOrder.api.ts

@@ -0,0 +1,192 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/purCode/purShippingFee/list',
+  supplierList='/cuspCode/cuspSupplierProfile/list',
+  save='/purCode/purShippingFee/add',
+  edit='/purCode/purShippingFee/edit',
+  deleteOne = '/purCode/purShippingFee/delete',
+  deleteBatch = '/purCode/purShippingFee/deleteBatch',
+  importExcel = '/purCode/purShippingFee/importExcel',
+  exportXls = '/purCode/purShippingFee/exportXls',
+  queryDataById = '/purCode/purShippingFee/queryById',
+  DeliveryNoticeList = '/purCode/purShippingFee/queryPurShippingFeeNoticeByMainId',
+  FreightProDetails = 'purCode/purDeliveryNote/queryPurDeliveryNoteArrivalByMainId',
+  submitBatch='/purCode/purShippingFee/submitBatch',
+  cancelSubmitBatch='/purCode/purShippingFee/returnSubmitBatch',
+  closeBatch='/purCode/purShippingFee/submitClose',
+  cancelBatchClose = '/purCode/purShippingFee/returnClose',
+  confirmBatch='/purCode/purShippingFee/submitConfirm',
+  cancelBatchConfirm = '/purCode/purShippingFee/returnSubmitConfirm',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const queryDeliveryNoticeTable = (id) => defHttp.get({url: Api.DeliveryNoticeList, params:{ id }});
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const queryFreightProDetailsByMainId = (id) => defHttp.get({url: Api.FreightProDetails, params:{ id }});
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 供应商列表接口
+ * @param params
+ */
+export const Supplierlist = (params) =>
+  defHttp.get({url: Api.supplierList, 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 bacthClose = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认关闭',
+    content: '是否关闭选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.get({url: Api.closeBatch, params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+// 取消关闭
+export const cancelBatchClose = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认取消关闭',
+    content: '是否取消关闭选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.get({url: Api.cancelBatchClose, params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+// 确认
+export const BatchConfirm = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认勾选数据',
+    content: '是否确认选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.get({url: Api.confirmBatch, params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+// 取消关闭
+export const CancelBatchConfirm = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认取消关闭',
+    content: '是否取消关闭选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.get({url: Api.cancelBatchConfirm, params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}

src/views/purchase/freightPurchaseOrder/FreightPurOrderForm.data.ts

@@ -0,0 +1,139 @@
+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: '单据编号(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: '币种(cerrency)',
+    align:"center",
+    dataIndex: 'cerrency'
+   },
+   {
+    title: '供应商(supplier)',
+    align:"center",
+    dataIndex: 'supplierName'
+   },
+    {
+      title: '备注(notes)',
+      align:"center",
+      dataIndex: 'notes',
+    },
+];
+
+//子表表格配置
+export const ShippingNoticeColumns: JVxeColumn[] = [
+    {
+      title: '通知单号(bill code)',
+      key: 'billcode',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '合同编号(contract code)',
+      key: 'contractCode',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '项目(project)',
+      key: 'project',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '客户(customer)',
+      key: 'customer',
+      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 FreightProDetailsColumns: 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: '运费金额(tax amount)',
+      key: 'taxAmount',
+      type: JVxeTypes.input,
+      placeholder: '请输入${title}',
+      defaultValue:'',  
+      width:"200px",
+    },
+    {
+      title: '操作(operation)',
+      key: 'action',
+      width:"200px",
+      // 固定在右侧
+      fixed: 'right',
+      // 对齐方式为居中
+      align: 'center',
+      // 组件类型定义为【插槽】
+      type: JVxeTypes.slot,
+      // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+      slotName: 'action',
+    },
+  ]

src/views/purchase/freightPurchaseOrder/FreightPurchaseOrderList.vue

@@ -0,0 +1,398 @@
+<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="billCode">
+                <template #label><span title="订单编号(bill code)">订单编号(bill code)</span></template>
+                <a-input placeholder="请输入订单编号(bill code)" v-model:value="queryParam.billCode" allow-clear ></a-input>
+              </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+              <a-form-item name="arrivalDate">
+                <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 name="currency">
+                <template #label><span title="币种(currency)">提交(currency)</span></template>
+                <JDictSelectTag v-model:value="queryParam.currency" placeholder="请选择" dictCode="currency"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="supplierName">
+                <template #label><span title="供应商(supplierName)">供应商(supplierName)</span></template>
+                <ApiSelect
+                  :api="Supplierlist"
+                  showSearch
+                  v-model:value="queryParam.supplier"
+                  :filterOption="false"
+                  resultField="records"
+                  labelField="name"
+                  valueField="id"
+                />
+              </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"  @click="handleAdd" preIcon="ant-design:plus-outlined" v-auth="'purCode:pur_delivery_note:add'"> 新增(add)</a-button>
+          <a-button  type="primary"   preIcon="ant-design:export-outlined" @click="onExportXls" v-auth="'purCode:pur_delivery_note:exportXls'"> 导出(export)</a-button>
+          <a-button  type="primary"  @click="submit" > 提交(submit)</a-button>
+          <a-button  type="primary"  @click="cancelSubmit" > 取消提交(cancelSubmit)</a-button>
+          <a-button  type="primary"  @click="close" > 关闭(close)</a-button>
+          <a-button  type="primary"  @click="cancelClose" > 取消关闭(cancel close)</a-button>
+          <a-button  type="primary"  @click="confirm" > 确认(confirm)</a-button>
+          <a-button  type="primary"  @click="cancelConfirm" > 取消确认(cancel confirm)</a-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete" v-auth="'purCode:pur_delivery_note:deleteBatch'" >
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除(delete)
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button >批量操作
+                <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>
+    <!-- 表单区域 -->
+    <FreightPurOrderModal @register="registerModal" @success="handleSuccess"></FreightPurOrderModal>
+  </div>
+</template>
+
+<script lang="ts" name="purchase-purchaseInquiryForm" 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 FreightPurOrderModal from './components/FreightPurOrderModal.vue'
+  import {columns,} from './FreightPurOrderForm.data';
+  import {list, deleteOne, batchDelete, getImportUrl,bacthClose,cancelBatchClose,getExportUrl,batchSubmit,cancelBatchSubmit,Supplierlist,BatchConfirm,CancelBatchConfirm} from './FreightPurOrder.api';
+  import { cloneDeep } from "lodash-es";
+  import { defHttp } from '/@/utils/http/axios';
+  import { JDictSelectTag} from '/@/components/Form';
+  import {ApiSelect} from '/@/components/Form/index';
+  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: 300,
+               fixed:'right'
+           },
+           scroll:{
+            x:'3000px'
+           },
+           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 handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+   // 自动请求并暴露内部方法
+   onMounted(() => {
+    getOptiom()
+  });
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+  //  产品分类
+  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: 'purCode:pur_inquiry_form: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: 'purCode:pur_delivery_note: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);
+    }
+  }
+  function close(){
+    if(selectedRowKeys.value.length==0){
+      message.warning('请选择数据')
+    }else{
+      var ids=selectedRowKeys.value.join(',')
+      bacthClose({ids: ids},handleSuccess);
+    }
+  }
+  function cancelClose(){
+    if(selectedRowKeys.value.length==0){
+      message.warning('请选择数据')
+    }else{
+      var ids=selectedRowKeys.value.join(',')
+      cancelBatchClose({ids: ids},handleSuccess);
+    }
+  }
+  function confirm(){
+    if(selectedRowKeys.value.length==0){
+      message.warning('请选择数据')
+    }else{
+      var ids=selectedRowKeys.value.join(',')
+      BatchConfirm({ids: ids},handleSuccess);
+    }
+  }
+  function cancelConfirm(){
+    if(selectedRowKeys.value.length==0){
+      message.warning('请选择数据')
+    }else{
+      var ids=selectedRowKeys.value.join(',')
+      CancelBatchConfirm({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:10,
+  });
+  const wrapperCol1 = reactive({
+    xs: 24,
+    sm: 14,
+  });
+  /**
+   * 重置
+   */
+  function searchReset() {
+    debugger
+    formRef.value.resetFields();
+    queryParam.supplier = '';
+    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/purchase/freightPurchaseOrder/components/FreightPurOrderForm.vue

@@ -0,0 +1,381 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="SaleOrderForm" ref="formRef">
+          <a-row>
+            <a-col :span="12">
+							<a-form-item label="订单编号(bill code)" v-bind="validateInfos.billCode" id="SaleOrderForm-billCode" name="billCode">
+								<a-input v-model:value="formData.billCode" placeholder="订单编号(bill code)" disabled></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="单据日期(arrival date)" v-bind="validateInfos.billDate" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-billDate" name="billDate">
+								<a-date-picker placeholder="请选择单据日期(arrival 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="币种(currency)" v-bind="validateInfos.currency" id="SaleOrderForm-currency" name="currency">
+                <JDictSelectTag v-model:value="formData.currency" placeholder="请选择" dictCode="currency" />
+							</a-form-item>
+						</a-col>	
+						<a-col :span="12">
+							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplierName" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-supplierName" name="supplierName">
+                <JSelectInput   v-model:value="formData.inquirySuppiler"  placeholder="请选择" allow-clear  :options="supplierOption" @change="changeSupplier"></JSelectInput>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="SaleOrderForm-notes" name="notes">
+								<a-input v-model:value="formData.notes"></a-input>
+							</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="运费采购订单 - 发货通知单(delivery notice)" key="DeliveryDotice" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="DeliveryDoticeTableableRef"
+          :loading="DeliveryDoticeTable.loading"
+          :columns="DeliveryDoticeTable.columns"
+          :dataSource="DeliveryDoticeTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a-popconfirm title="确定删除吗？" @confirm="handleDelete1(props)">
+                <a>删除(delete)</a>
+              </a-popconfirm>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+      <a-tab-pane tab="运费采购订单 - 运费产品明细(freight product details)" key="FreightProductDetails" :forceRender="true">
+        <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="SelectProduct"> 选择产品(select product)</a-button>
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="FreightProductDetailsTableRef"
+          :loading="FreightProductDetailsTable.loading"
+          :columns="FreightProductDetailsTable.columns"
+          :dataSource="FreightProductDetailsTable.dataSource"
+          :height="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 { defHttp } from '/@/utils/http/axios';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+  import { queryDeliveryNoticeTable, queryFreightProDetailsByMainId, queryDataById, saveOrUpdate,Supplierlist} from '../FreightPurOrder.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import {ShippingNoticeColumns, FreightProDetailsColumns} from '../FreightPurOrderForm.data';
+  import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import { JDictSelectTag} from '/@/components/Form';
+  import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+  import { Form, message } from 'ant-design-vue';
+  import moment from 'moment';
+  const useForm = Form.useForm;
+  export default defineComponent({
+    name: "SaleOrderForm",
+    components:{
+      JVxeTable,
+			JFormContainer,
+      JDictSelectTag,
+      JSelectInput,
+      SelectPrpductModal
+    },
+    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 SelectPrpductModalRef = ref()
+      const DeliveryDoticeTableableRef = ref();
+      const DeliveryDoticeTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: ShippingNoticeColumns,
+        dataSource: []
+      });
+      const FreightProductDetailsTableRef = ref();
+      const FreightProductDetailsTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: FreightProDetailsColumns,
+        dataSource: []
+      });
+      const activeKey = ref('DeliveryDotice');
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        status: undefined,
+        delFlag: undefined,
+        sourceCode:'',
+        submit:'',
+        billCode:'',
+        billDate: moment(new Date()).format('YYYY-MM-DD'),   
+        project: '', 
+        projectName:'',  
+        supplier:"",
+        supplierName:'',
+        priority: '',   
+        productionClass: '',   
+        model: '',   
+        maker: '',
+        delivery:'',
+        waybillNumber:'',
+        packagebRequirement:'',
+        recipient:'',
+        recipientTel:'',
+        recipientAddress:'',
+        warrantyTerms:'',
+        purchaseDepartment:'',
+        purchaseman:'',
+        invoiceDate:'',
+        notes:'',
+        arrivalDetails:"",
+      });
+      var supplierOption = ref([]);
+      //表单验证
+      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}},
+        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();
+        DeliveryDoticeTable.dataSource = [];
+        FreightProductDetailsTable.dataSource = [];
+        activeKey.value = 'DeliveryDotice'
+        getSupplierOption()
+      }
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        //子表数据
+        const DeliveryDoticeDataList = await queryDeliveryNoticeTable(row['id']);
+        DeliveryDoticeTable.dataSource = [...DeliveryDoticeDataList];
+        const FreightProductDetailsDataList = await queryFreightProDetailsByMainId(row['id']);
+        FreightProductDetailsTable.dataSource = [...FreightProductDetailsDataList];
+        getSupplierOption()
+      }
+
+      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, {
+        'purShippingFeeNotice': DeliveryDoticeTableableRef,
+        'purShippingFeeProdeuct': FreightProductDetailsTableRef,
+      });
+
+      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];
+          });
+        }
+      }
+      //运费产品明细-删除行
+      function handleDelete(prop) {
+        var newArray = [...FreightProductDetailsTable.dataSource]
+        newArray.splice(prop.rowIndex, 1)
+        FreightProductDetailsTable.dataSource = newArray        
+      }
+      //发货通知单-删除行
+      function handleDelete1(prop) {
+        var newArray = [...DeliveryDoticeTable.dataSource]
+        newArray.splice(prop.rowIndex, 1)
+        DeliveryDoticeTable.dataSource = newArray        
+      }
+      function getSupplierOption(){
+        defHttp
+            .get({ url: '/cuspCode/cuspSupplierProfile/list'}, { isTransformResponse: false })
+            .then((res) => {
+                if (res.success) {
+                  supplierOption.value = []
+                  res.result.records.forEach(element => {
+                      var obj = {
+                        label: element.name?element.name:'无名称请维护',
+                        value: element.id?element.id:''
+                      };
+                      supplierOption.value.push( obj)
+                  });    
+                }
+            })
+            .finally(() => {
+                // loading.value = false;
+            });
+      }
+      function changeSupplier(prop){
+        if(prop){
+          supplierOption.value.map(item=>{
+            if(item.value==prop){
+              formData.supplierName = item.label
+            }
+          })
+        }else{
+          formData.supplier = ''
+          formData.supplierName = ''
+        }
+      }
+      function SelectProduct(){
+        SelectPrpductModalRef.value.getTable()
+      }
+      function addProduct(data){
+        if(data.length!==1){
+          message.warning('请勾选一条数据！')
+        }else{
+          var arrProduct = data.concat(FreightProductDetailsTable.dataSource)
+          arrProduct.map(item=>{
+            item.productClass = item.classId_dictText
+            item.productCode = item.code
+            item.productId = item.id
+          })
+          FreightProductDetailsTable.dataSource=arrProduct  
+        }
+      }
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+      return {
+        DeliveryDoticeTableableRef,
+        DeliveryDoticeTable,
+        FreightProductDetailsTableRef,
+        FreightProductDetailsTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+        handleDelete,
+        handleDelete1,
+        Supplierlist,
+        changeSupplier,
+        supplierOption,
+        SelectPrpductModalRef,
+        SelectProduct,
+        addProduct
+      }
+    }
+  });
+</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/purchase/freightPurchaseOrder/components/FreightPurOrderModal.vue

@@ -0,0 +1,76 @@
+<template>
+  <div ref="SaleOrderDetailsRef">
+    <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="95%"  @ok="handleSubmit" :getContainer ='()=>$refs.SaleOrderDetailsRef'>
+      <FreightPurOrderForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></FreightPurOrderForm>
+    </BasicModal>
+  </div>
+</template>
+
+<script lang="ts">
+  import { ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import FreightPurOrderForm from './FreightPurOrderForm.vue';
+
+  export default {
+    name: "FreightPurOrderModal",
+    components:{
+      BasicModal,
+      FreightPurOrderForm
+    },
+    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>