寄存代发

src/views/inventiry/consignmentIn/StoreConsignmentIn.api.ts

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

src/views/inventiry/consignmentIn/StoreConsignmentIn.data.ts

@@ -0,0 +1,300 @@
+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: '提交(submit)1是0否',
+    align:"center",
+    dataIndex: 'submit_dictText'
+   },
+   {
+    title: '单据日期',
+    align:"center",
+    dataIndex: 'billDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+   {
+    title: '单据编码',
+    align:"center",
+    dataIndex: 'billCode'
+   },
+   {
+    title: '项目(project)',
+    align:"center",
+    dataIndex: 'project'
+   },
+   {
+    title: '项目名称',
+    align:"center",
+    dataIndex: 'projectName'
+   },
+   {
+    title: '客户',
+    align:"center",
+    dataIndex: 'customer'
+   },
+   {
+    title: '客户名称',
+    align:"center",
+    dataIndex: 'customerName'
+   },
+   {
+    title: '仓库(warehouse)',
+    align:"center",
+    dataIndex: 'warehouse'
+   },
+   {
+    title: '货位(goods allocation)',
+    align:"center",
+    dataIndex: 'goodsAllocation'
+   },
+   {
+    title: '备注(notes)',
+    align:"center",
+    dataIndex: 'notes'
+   },
+   {
+    title: '附件(attachs)',
+    align:"center",
+    dataIndex: 'attachs'
+   },
+];
+
+//子表表格配置
+export const storeConsignmentInDetailsColumns: JVxeColumn[] = [
+    {
+      title: '产品id',
+      key: 'productId',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '产品分类',
+      key: 'productClass',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '产品编码',
+      key: 'productCode',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '产品中文名',
+      key: 'chineseName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '产品英文名',
+      key: 'englishName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '型号',
+      key: 'model',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '备件号',
+      key: 'partno',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '图号',
+      key: 'drawingno',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '质量等级',
+      key: 'qualityGrade',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '件数',
+      key: 'quantity',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '重量',
+      key: 'weight',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '备注(notes)',
+      key: 'notes',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '供应商(supplier)',
+      key: 'supplier',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '供应商名称',
+      key: 'supplierName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '附件',
+      key: 'attachs',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+export const storeConsignmentInShipColumns: JVxeColumn[] = [
+    {
+      title: '表头主键（寄存代发入库）',
+      key: 'headId',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '船id',
+      key: 'shipId',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '船名',
+      key: 'shipName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '主机号',
+      key: 'hostNumber',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '工程编号',
+      key: 'projectNo',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '船厂',
+      key: 'shipFactory',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '船东',
+      key: 'shipowner',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+
+// 高级查询数据
+export const superQuerySchema = {
+  submit: {title: '提交(submit)1是0否',order: 0,view: 'list', type: 'string',dictCode: 'yes_or_no',},
+  billDate: {title: '单据日期',order: 1,view: 'date', type: 'string',},
+  billCode: {title: '单据编码',order: 2,view: 'text', type: 'string',},
+  project: {title: '项目(project)',order: 3,view: 'text', type: 'string',},
+  projectName: {title: '项目名称',order: 4,view: 'text', type: 'string',},
+  customer: {title: '客户',order: 5,view: 'text', type: 'string',},
+  customerName: {title: '客户名称',order: 6,view: 'text', type: 'string',},
+  warehouse: {title: '仓库(warehouse)',order: 7,view: 'text', type: 'string',},
+  goodsAllocation: {title: '货位(goods allocation)',order: 8,view: 'text', type: 'string',},
+  notes: {title: '备注(notes)',order: 9,view: 'textarea', type: 'string',},
+  attachs: {title: '附件(attachs)',order: 10,view: 'text', type: 'string',},
+  //子表高级查询
+  storeConsignmentInDetails: {
+    title: '寄存代发入库-子表产品明细',
+    view: 'table',
+    fields: {
+        productId: {title: '产品id',order: 0,view: 'text', type: 'string',},
+        productClass: {title: '产品分类',order: 1,view: 'text', type: 'string',},
+        productCode: {title: '产品编码',order: 2,view: 'text', type: 'string',},
+        chineseName: {title: '产品中文名',order: 3,view: 'text', type: 'string',},
+        englishName: {title: '产品英文名',order: 4,view: 'text', type: 'string',},
+        model: {title: '型号',order: 5,view: 'text', type: 'string',},
+        partno: {title: '备件号',order: 6,view: 'text', type: 'string',},
+        drawingno: {title: '图号',order: 7,view: 'text', type: 'string',},
+        qualityGrade: {title: '质量等级',order: 8,view: 'text', type: 'string',},
+        quantity: {title: '件数',order: 9,view: 'number', type: 'number',},
+        weight: {title: '重量',order: 10,view: 'text', type: 'string',},
+        notes: {title: '备注(notes)',order: 11,view: 'text', type: 'string',},
+        supplier: {title: '供应商(supplier)',order: 12,view: 'text', type: 'string',},
+        supplierName: {title: '供应商名称',order: 13,view: 'text', type: 'string',},
+        attachs: {title: '附件',order: 14,view: 'text', type: 'string',},
+    }
+  },
+  storeConsignmentInShip: {
+    title: '寄存代发入库-子表船明细',
+    view: 'table',
+    fields: {
+        headId: {title: '表头主键（寄存代发入库）',order: 0,view: 'text', type: 'string',},
+        shipId: {title: '船id',order: 1,view: 'text', type: 'string',},
+        shipName: {title: '船名',order: 2,view: 'text', type: 'string',},
+        hostNumber: {title: '主机号',order: 3,view: 'text', type: 'string',},
+        projectNo: {title: '工程编号',order: 4,view: 'text', type: 'string',},
+        shipFactory: {title: '船厂',order: 5,view: 'text', type: 'string',},
+        shipowner: {title: '船东',order: 6,view: 'text', type: 'string',},
+    }
+  },
+};

src/views/inventiry/consignmentIn/StoreConsignmentInList.vue

@@ -0,0 +1,232 @@
+<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-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" v-auth="'storeCode:store_consignment_in:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'storeCode:store_consignment_in:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'storeCode:store_consignment_in:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button v-auth="'storeCode:store_consignment_in:deleteBatch'">批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <StoreConsignmentInModal @register="registerModal" @success="handleSuccess"></StoreConsignmentInModal>
+  </div>
+</template>
+
+<script lang="ts" name="storeCode-storeConsignmentIn" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import {useModal} from '/@/components/Modal';
+  import StoreConsignmentInModal from './components/StoreConsignmentInModal.vue'
+  import {columns, superQuerySchema} from './StoreConsignmentIn.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './StoreConsignmentIn.api';
+  import {downloadFile} from '/@/utils/common/renderUtils';
+  import { useUserStore } from '/@/store/modules/user';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  const userStore = useUserStore();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '寄存代发入库主表',
+           api: list,
+           columns,
+           canResize:false,
+           useSearchForm: false,
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+           },
+           beforeFetch: async (params) => {
+             return Object.assign(params, queryParam);
+           },
+        },
+        exportConfig: {
+            name:"寄存代发入库主表",
+            url: getExportUrl,
+            params: queryParam,
+        },
+        importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+        },
+    })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+           auth: 'storeCode:store_consignment_in:edit'
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft'
+           },
+           auth: 'storeCode:store_consignment_in:delete'
+         }
+       ]
+   }
+
+  
+
+  /* ----------------------以下为原生查询需要添加的-------------------------- */
+  const toggleSearchStatus = ref<boolean>(false);
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+</script>
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>

src/views/inventiry/consignmentIn/components/StoreConsignmentInForm.vue

@@ -0,0 +1,282 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="StoreConsignmentInForm" ref="formRef">
+          <a-row>
+						
+						<a-col :span="12">
+							<a-form-item label="单据日期" v-bind="validateInfos.billDate" id="StoreConsignmentInForm-billDate" name="billDate">
+								<a-date-picker placeholder="请选择单据日期"  v-model:value="formData.billDate" value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="单据编码" v-bind="validateInfos.billCode" id="StoreConsignmentInForm-billCode" name="billCode">
+								<a-input v-model:value="formData.billCode" placeholder="请输入单据编码" disabled allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="项目(project)" v-bind="validateInfos.project" id="StoreConsignmentInForm-project" name="project">
+								<a-input v-model:value="formData.project" placeholder="请输入项目(project)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="项目名称" v-bind="validateInfos.projectName" id="StoreConsignmentInForm-projectName" name="projectName">
+								<a-input v-model:value="formData.projectName" placeholder="请输入项目名称"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="客户" v-bind="validateInfos.customer" id="StoreConsignmentInForm-customer" name="customer">
+								<a-input v-model:value="formData.customer" placeholder="请输入客户"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="客户名称" v-bind="validateInfos.customerName" id="StoreConsignmentInForm-customerName" name="customerName">
+								<a-input v-model:value="formData.customerName" placeholder="请输入客户名称"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="仓库(warehouse)" v-bind="validateInfos.warehouse" id="StoreConsignmentInForm-warehouse" name="warehouse">
+								<a-input v-model:value="formData.warehouse" placeholder="请输入仓库(warehouse)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="货位(goods allocation)" v-bind="validateInfos.goodsAllocation" id="StoreConsignmentInForm-goodsAllocation" name="goodsAllocation">
+								<a-input v-model:value="formData.goodsAllocation" placeholder="请输入货位(goods allocation)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="StoreConsignmentInForm-notes" name="notes">
+								<a-textarea v-model:value="formData.notes" :rows="4" placeholder="请输入备注(notes)" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="StoreConsignmentInForm-attachs" name="attachs">
+								<a-input v-model:value="formData.attachs" placeholder="请输入附件(attachs)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+
+		<!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated>
+      <a-tab-pane tab="寄存代发入库-子表产品明细" key="storeConsignmentInDetails" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="storeConsignmentInDetailsTableRef"
+          :loading="storeConsignmentInDetailsTable.loading"
+          :columns="storeConsignmentInDetailsTable.columns"
+          :dataSource="storeConsignmentInDetailsTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"/>
+      </a-tab-pane>
+      <a-tab-pane tab="寄存代发入库-子表船明细" key="storeConsignmentInShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="storeConsignmentInShipTableRef"
+          :loading="storeConsignmentInShipTable.loading"
+          :columns="storeConsignmentInShipTable.columns"
+          :dataSource="storeConsignmentInShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"/>
+      </a-tab-pane>
+    </a-tabs>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+  import { queryStoreConsignmentInDetailsListByMainId, queryStoreConsignmentInShipListByMainId, queryDataById, saveOrUpdate } from '../StoreConsignmentIn.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import {storeConsignmentInDetailsColumns, storeConsignmentInShipColumns} from '../StoreConsignmentIn.data';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import { Form } from 'ant-design-vue';
+  const useForm = Form.useForm;
+
+  export default defineComponent({
+    name: "StoreConsignmentInForm",
+    components:{
+      JDictSelectTag,
+      JVxeTable,
+			JFormContainer,
+    },
+    props:{
+      formDisabled:{
+        type: Boolean,
+        default: false
+      },
+      formData: { type: Object, default: ()=>{} },
+      formBpm: { type: Boolean, default: true }
+    },
+    emits:['success'],
+    setup(props, {emit}) {
+      const loading = ref(false);
+      const formRef = ref();
+      const storeConsignmentInDetailsTableRef = ref();
+      const storeConsignmentInDetailsTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: storeConsignmentInDetailsColumns,
+        dataSource: []
+      });
+      const storeConsignmentInShipTableRef = ref();
+      const storeConsignmentInShipTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: storeConsignmentInShipColumns,
+        dataSource: []
+      });
+      const activeKey = ref('storeConsignmentInDetails');
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        submit: '',   
+        billDate: '',   
+        billCode: '',   
+        project: '',   
+        projectName: '',   
+        customer: '',   
+        customerName: '',   
+        warehouse: '',   
+        goodsAllocation: '',   
+        notes: '',   
+        attachs: '',   
+      });
+
+      //表单验证
+      const validatorRules = reactive({
+      });
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
+      const dbData = {};
+      const formItemLayout = {
+        labelCol: {xs: {span: 24}, sm: {span: 5}},
+        wrapperCol: {xs: {span: 24}, sm: {span: 16}},
+      };
+
+      // 表单禁用
+      const disabled = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return false;
+          }else{
+            return true;
+          }
+        }
+        return props.formDisabled;
+      });
+
+      
+
+      function add() {
+        resetFields();
+        storeConsignmentInDetailsTable.dataSource = [];
+        storeConsignmentInShipTable.dataSource = [];
+      }
+
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        //子表数据
+        const storeConsignmentInDetailsDataList = await queryStoreConsignmentInDetailsListByMainId(row['id']);
+        storeConsignmentInDetailsTable.dataSource = [...storeConsignmentInDetailsDataList];
+        const storeConsignmentInShipDataList = await queryStoreConsignmentInShipListByMainId(row['id']);
+        storeConsignmentInShipTable.dataSource = [...storeConsignmentInShipDataList];
+      }
+
+      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, {
+        'storeConsignmentInDetails': storeConsignmentInDetailsTableRef,
+        'storeConsignmentInShip': storeConsignmentInShipTableRef,
+      });
+
+      async function getFormData() {
+        try {
+          // 触发表单验证
+          await validate();
+        } catch ({ errorFields }) {
+          if (errorFields) {
+            const firstField = errorFields[0];
+            if (firstField) {
+              formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+            }
+          }
+          return Promise.reject(errorFields);
+        }
+        return transformData(toRaw(formData))
+      }
+
+      async function submitForm() {
+        const mainData = await getFormData();
+        const subData = await getSubFormAndTableData();
+        const values = Object.assign({}, dbData, mainData, subData);
+        console.log('表单提交数据', values)
+        const isUpdate = values.id ? true : false
+        await saveOrUpdate(values, isUpdate);
+        //关闭弹窗
+        emit('success');
+      }
+      
+      function setFieldsValue(values) {
+        if(values){
+          Object.keys(values).map(k=>{
+            formData[k] = values[k];
+          });
+        }
+      }
+
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+
+
+      return {
+        storeConsignmentInDetailsTableRef,
+        storeConsignmentInDetailsTable,
+        storeConsignmentInShipTableRef,
+        storeConsignmentInShipTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+      }
+    }
+  });
+</script>
+<style lang="less" scoped></style>

src/views/inventiry/consignmentIn/components/StoreConsignmentInModal.vue

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

src/views/inventiry/consignmentOut/StoreConsignmentOut.api.ts

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

src/views/inventiry/consignmentOut/StoreConsignmentOut.data.ts

@@ -0,0 +1,214 @@
+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: '提交(submit)1是0否',
+    align:"center",
+    dataIndex: 'submit_dictText'
+   },
+   {
+    title: '单据日期',
+    align:"center",
+    dataIndex: 'billDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+   {
+    title: '单据编码',
+    align:"center",
+    dataIndex: 'billCode'
+   },
+   {
+    title: '项目(project)',
+    align:"center",
+    dataIndex: 'project'
+   },
+   {
+    title: '项目名称',
+    align:"center",
+    dataIndex: 'projectName'
+   },
+   {
+    title: '客户(customer)',
+    align:"center",
+    dataIndex: 'customer'
+   },
+   {
+    title: '客户名称',
+    align:"center",
+    dataIndex: 'customerName'
+   },
+   {
+    title: '仓库(warehouse)',
+    align:"center",
+    dataIndex: 'warehouse'
+   },
+   {
+    title: '货位(goods allocation)',
+    align:"center",
+    dataIndex: 'goodsAllocation'
+   },
+   {
+    title: '备注(notes)',
+    align:"center",
+    dataIndex: 'notes'
+   },
+];
+
+//子表表格配置
+export const storeConsignmentOutDetailsColumns: JVxeColumn[] = [
+    {
+      title: '产品id',
+      key: 'productId',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '产品分类',
+      key: 'productClass',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '产品编码',
+      key: 'productCode',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '产品中文名',
+      key: 'chineseName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '产品英文名',
+      key: 'englishName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '型号',
+      key: 'model',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '备件号',
+      key: 'partno',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '图号',
+      key: 'drawingno',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '质量等级',
+      key: 'qualityGrade',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '出库数量(stock out quantity)',
+      key: 'stockOutQuantity',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '库存选择(Inventory selection)记录库存单号',
+      key: 'inventorySelection',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '备注(notes)',
+      key: 'notes',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '来源',
+      key: 'sourceId',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '来源批次id',
+      key: 'batchId',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+
+// 高级查询数据
+export const superQuerySchema = {
+  submit: {title: '提交(submit)1是0否',order: 0,view: 'list', type: 'string',dictCode: 'yes_or_no',},
+  billDate: {title: '单据日期',order: 1,view: 'date', type: 'string',},
+  billCode: {title: '单据编码',order: 2,view: 'text', type: 'string',},
+  project: {title: '项目(project)',order: 3,view: 'text', type: 'string',},
+  projectName: {title: '项目名称',order: 4,view: 'text', type: 'string',},
+  customer: {title: '客户(customer)',order: 5,view: 'text', type: 'string',},
+  customerName: {title: '客户名称',order: 6,view: 'text', type: 'string',},
+  warehouse: {title: '仓库(warehouse)',order: 7,view: 'text', type: 'string',},
+  goodsAllocation: {title: '货位(goods allocation)',order: 8,view: 'text', type: 'string',},
+  notes: {title: '备注(notes)',order: 9,view: 'textarea', type: 'string',},
+  //子表高级查询
+  storeConsignmentOutDetails: {
+    title: '寄存代发出库-子表明细',
+    view: 'table',
+    fields: {
+        productId: {title: '产品id',order: 0,view: 'text', type: 'string',},
+        productClass: {title: '产品分类',order: 1,view: 'text', type: 'string',},
+        productCode: {title: '产品编码',order: 2,view: 'text', type: 'string',},
+        chineseName: {title: '产品中文名',order: 3,view: 'text', type: 'string',},
+        englishName: {title: '产品英文名',order: 4,view: 'text', type: 'string',},
+        model: {title: '型号',order: 5,view: 'text', type: 'string',},
+        partno: {title: '备件号',order: 6,view: 'text', type: 'string',},
+        drawingno: {title: '图号',order: 7,view: 'text', type: 'string',},
+        qualityGrade: {title: '质量等级',order: 8,view: 'text', type: 'string',},
+        stockOutQuantity: {title: '出库数量(stock out quantity)',order: 9,view: 'number', type: 'number',},
+        inventorySelection: {title: '库存选择(Inventory selection)记录库存单号',order: 10,view: 'text', type: 'string',},
+        notes: {title: '备注(notes)',order: 11,view: 'text', type: 'string',},
+        sourceId: {title: '来源',order: 12,view: 'text', type: 'string',},
+        batchId: {title: '来源批次id',order: 13,view: 'text', type: 'string',},
+    }
+  },
+};

src/views/inventiry/consignmentOut/StoreConsignmentOutList.vue

@@ -0,0 +1,316 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="submit">
+              <template #label><span title="提交(submit)1是0否">提交(s</span></template>
+              <j-select-multiple placeholder="请选择提交(submit)1是0否" v-model:value="queryParam.submit" dictCode="yes_or_no" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="billDate">
+              <template #label><span title="单据日期">单据日期</span></template>
+              <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParam.billDate" class="query-group-cust"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="6">
+              <a-form-item name="billCode">
+                <template #label><span title="单据编码">单据编码</span></template>
+                <JRangeNumber v-model:value="queryParam.billCode" class="query-group-cust"></JRangeNumber>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="projectName">
+                <template #label><span title="项目名称">项目名称</span></template>
+                <JRangeNumber v-model:value="queryParam.projectName" class="query-group-cust"></JRangeNumber>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="customerName">
+                <template #label><span title="客户名称">客户名称</span></template>
+                <JRangeNumber v-model:value="queryParam.customerName" class="query-group-cust"></JRangeNumber>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="warehouse">
+                <template #label><span title="仓库(warehouse)">仓库(w</span></template>
+                <a-input placeholder="请输入仓库(warehouse)" v-model:value="queryParam.warehouse" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="goodsAllocation">
+                <template #label><span title="货位(goods allocation)">货位(g</span></template>
+                <a-input placeholder="请输入货位(goods allocation)" v-model:value="queryParam.goodsAllocation" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
+                <a-button preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" v-auth="'storeCode:store_consignment_out:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'storeCode:store_consignment_out:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'storeCode:store_consignment_out:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button v-auth="'storeCode:store_consignment_out:deleteBatch'">批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <StoreConsignmentOutModal @register="registerModal" @success="handleSuccess"></StoreConsignmentOutModal>
+  </div>
+</template>
+
+<script lang="ts" name="storeCode-storeConsignmentOut" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import {useModal} from '/@/components/Modal';
+  import StoreConsignmentOutModal from './components/StoreConsignmentOutModal.vue'
+  import {columns, superQuerySchema} from './StoreConsignmentOut.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './StoreConsignmentOut.api';
+  import {downloadFile} from '/@/utils/common/renderUtils';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+  import { cloneDeep } from "lodash-es";
+  import { useUserStore } from '/@/store/modules/user';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  const userStore = useUserStore();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '寄存代发出库-主表',
+           api: list,
+           columns,
+           canResize:false,
+           useSearchForm: false,
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+           },
+           beforeFetch: async (params) => {
+             let rangerQuery = await setRangeQuery();
+             return Object.assign(params, rangerQuery);
+           },
+        },
+        exportConfig: {
+            name:"寄存代发出库-主表",
+            url: getExportUrl,
+            params: queryParam,
+        },
+        importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+        },
+    })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+           auth: 'storeCode:store_consignment_out:edit'
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft'
+           },
+           auth: 'storeCode:store_consignment_out:delete'
+         }
+       ]
+   }
+
+  
+
+  /* ----------------------以下为原生查询需要添加的-------------------------- */
+  const toggleSearchStatus = ref<boolean>(false);
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+  
+  let rangeField = 'billDate,'
+  
+  /**
+   * 设置范围查询条件
+   */
+  async function setRangeQuery(){
+    let queryParamClone = cloneDeep(queryParam);
+    if (rangeField) {
+      let fieldsValue = rangeField.split(',');
+      fieldsValue.forEach(item => {
+        if (queryParamClone[item]) {
+          let range = queryParamClone[item];
+          queryParamClone[item+'_begin'] = range[0];
+          queryParamClone[item+'_end'] = range[1];
+          delete queryParamClone[item];
+        } else {
+          queryParamClone[item+'_begin'] = '';
+          queryParamClone[item+'_end'] = '';
+        }
+      })
+    }
+    return queryParamClone;
+  }
+</script>
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>

src/views/inventiry/consignmentOut/components/StoreConsignmentOutForm.vue

@@ -0,0 +1,246 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="StoreConsignmentOutForm" ref="formRef">
+          <a-row>
+						<a-col :span="12">
+							<a-form-item label="单据日期" v-bind="validateInfos.billDate" id="StoreConsignmentOutForm-billDate" name="billDate">
+								<a-date-picker placeholder="请选择单据日期"  v-model:value="formData.billDate" value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="单据编码" v-bind="validateInfos.billCode" id="StoreConsignmentOutForm-billCode" name="billCode">
+								<a-input v-model:value="formData.billCode" placeholder="请输入单据编码" disabled allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="项目(project)" v-bind="validateInfos.project" id="StoreConsignmentOutForm-project" name="project">
+								<a-input v-model:value="formData.project" placeholder="请输入项目(project)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="项目名称" v-bind="validateInfos.projectName" id="StoreConsignmentOutForm-projectName" name="projectName">
+								<a-input v-model:value="formData.projectName" placeholder="请输入项目名称"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="客户(customer)" v-bind="validateInfos.customer" id="StoreConsignmentOutForm-customer" name="customer">
+								<a-input v-model:value="formData.customer" placeholder="请输入客户(customer)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="客户名称" v-bind="validateInfos.customerName" id="StoreConsignmentOutForm-customerName" name="customerName">
+								<a-input v-model:value="formData.customerName" placeholder="请输入客户名称"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="仓库(warehouse)" v-bind="validateInfos.warehouse" id="StoreConsignmentOutForm-warehouse" name="warehouse">
+								<a-input v-model:value="formData.warehouse" placeholder="请输入仓库(warehouse)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="货位(goods allocation)" v-bind="validateInfos.goodsAllocation" id="StoreConsignmentOutForm-goodsAllocation" name="goodsAllocation">
+								<a-input v-model:value="formData.goodsAllocation" placeholder="请输入货位(goods allocation)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="StoreConsignmentOutForm-notes" name="notes">
+								<a-textarea v-model:value="formData.notes" :rows="4" placeholder="请输入备注(notes)" />
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+
+		<!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated>
+      <a-tab-pane tab="寄存代发出库-子表明细" key="storeConsignmentOutDetails" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="storeConsignmentOutDetailsTableRef"
+          :loading="storeConsignmentOutDetailsTable.loading"
+          :columns="storeConsignmentOutDetailsTable.columns"
+          :dataSource="storeConsignmentOutDetailsTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"/>
+      </a-tab-pane>
+    </a-tabs>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+  import { queryStoreConsignmentOutDetailsListByMainId, queryDataById, saveOrUpdate } from '../StoreConsignmentOut.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import {storeConsignmentOutDetailsColumns} from '../StoreConsignmentOut.data';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import { Form } from 'ant-design-vue';
+  const useForm = Form.useForm;
+
+  export default defineComponent({
+    name: "StoreConsignmentOutForm",
+    components:{
+      JVxeTable,
+			JFormContainer,
+    },
+    props:{
+      formDisabled:{
+        type: Boolean,
+        default: false
+      },
+      formData: { type: Object, default: ()=>{} },
+      formBpm: { type: Boolean, default: true }
+    },
+    emits:['success'],
+    setup(props, {emit}) {
+      const loading = ref(false);
+      const formRef = ref();
+      const storeConsignmentOutDetailsTableRef = ref();
+      const storeConsignmentOutDetailsTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: storeConsignmentOutDetailsColumns,
+        dataSource: []
+      });
+      const activeKey = ref('storeConsignmentOutDetails');
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        billDate: '',   
+        billCode: '',   
+        project: '',   
+        projectName: '',   
+        customer: '',   
+        customerName: '',   
+        warehouse: '',   
+        goodsAllocation: '',   
+        notes: '',   
+      });
+
+      //表单验证
+      const validatorRules = reactive({
+      });
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
+      const dbData = {};
+      const formItemLayout = {
+        labelCol: {xs: {span: 24}, sm: {span: 5}},
+        wrapperCol: {xs: {span: 24}, sm: {span: 16}},
+      };
+
+      // 表单禁用
+      const disabled = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return false;
+          }else{
+            return true;
+          }
+        }
+        return props.formDisabled;
+      });
+
+      
+
+      function add() {
+        resetFields();
+        storeConsignmentOutDetailsTable.dataSource = [];
+      }
+
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        //子表数据
+        const storeConsignmentOutDetailsDataList = await queryStoreConsignmentOutDetailsListByMainId(row['id']);
+        storeConsignmentOutDetailsTable.dataSource = [...storeConsignmentOutDetailsDataList];
+      }
+
+      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, {
+        'storeConsignmentOutDetails': storeConsignmentOutDetailsTableRef,
+      });
+
+      async function getFormData() {
+        try {
+          // 触发表单验证
+          await validate();
+        } catch ({ errorFields }) {
+          if (errorFields) {
+            const firstField = errorFields[0];
+            if (firstField) {
+              formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+            }
+          }
+          return Promise.reject(errorFields);
+        }
+        return transformData(toRaw(formData))
+      }
+
+      async function submitForm() {
+        const mainData = await getFormData();
+        const subData = await getSubFormAndTableData();
+        const values = Object.assign({}, dbData, mainData, subData);
+        console.log('表单提交数据', values)
+        const isUpdate = values.id ? true : false
+        await saveOrUpdate(values, isUpdate);
+        //关闭弹窗
+        emit('success');
+      }
+      
+      function setFieldsValue(values) {
+        if(values){
+          Object.keys(values).map(k=>{
+            formData[k] = values[k];
+          });
+        }
+      }
+
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+
+
+      return {
+        storeConsignmentOutDetailsTableRef,
+        storeConsignmentOutDetailsTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+      }
+    }
+  });
+</script>
+<style lang="less" scoped></style>

src/views/inventiry/consignmentOut/components/StoreConsignmentOutModal.vue

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

src/views/publicComponents/components/AddProjectModal.vue

@@ -18,6 +18,11 @@
                                 <JSelect   v-model:value="model.customerId" :get-option-url="CustomerOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
+                        <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                            <a-form-item  prop="customerId" label="客户简称(customer)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                                <JSelect   v-model:value="model.customerId" :get-option-url="CustomerOption" :showField="showField2"></JSelect>
+                            </a-form-item>
+                        </a-col>
                         <a-col >
                             <a-form-item  prop="code" label="编码(code)" :labelCol="labelCol" :wrapperCol="wrapperCol">
                                 <a-input v-model:value="model.code" placeholder="自动生成" disabled></a-input>
@@ -47,10 +52,12 @@
     import {JSelect} from '/@/components/Form/index'
     import{CustomerOption} from '../../saleCode/saleInquiryForm/SaleInquiryForm.api';
     var customerOption = ref([])
+    var customerOption2 = ref([])
     var visible = ref(false);
     var form = ref();
     var addProjectModalRef = ref()
     var showField = ref('currency_dictText+name');
+    var showField2 = ref('currency_dictText+abbreviation');
     const emit = defineEmits([ 'success']);
     var model = ref({
         customerId:'',
@@ -97,7 +104,7 @@
         record.records.map(item=>{
             item.label = item.name+'-'+item.currency
         })
-        customerOption.value=  record.records
+        customerOption.value=  record.records;
     }
     function handleCancel(){
       emit('success')
@@ -139,4 +146,4 @@
 /deep/.ant-modal-body{
     padding: 24px;
 }
-</style>
+</style>

src/views/saleCode/saleInquiryForm/SaleInquiryForm.api.ts

@@ -16,7 +16,7 @@ enum Api {
   saleInquiryFormProductList = '/saleCode/saleInquiryForm/querySaleInquiryFormProductByMainId',
   submitBatch='/saleCode/saleInquiryForm/submitBatch',
   cancelSubmitBatch='/saleCode/saleInquiryForm/returnSubmitBatch',
-  customerList='/cuspCode/cuspCustomerProfile/list?pageSize=-1',
+  customerList='/cuspCode/cuspCustomerProfile/list?pageSize=-1&status=1',
   projectList='/baseCode/baseProjectArchive/list',
   classOption='baseCode/baseProductClass/list',
   salemanOption = 'sys/user/list',
@@ -132,4 +132,4 @@ export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, par
 export const ClassOption = (params) => defHttp.get({ url: Api.classOption, params });
 //获取业务员下拉框
 export const SaleManOption = (params) => defHttp.get({ url: Api.salemanOption, params });
-export const LinkOption = (params) => defHttp.get({ url: Api.linkOption, params });
+export const LinkOption = (params) => defHttp.get({ url: Api.linkOption, params });