其他入库-页面（第一版用于配置菜单）

src/views/inventiry/otherIn/components/otherInForm.vue

@@ -0,0 +1,398 @@
+<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="入库日期(bill date)" v-bind="validateInfos.billDate"  id="SaleOrderForm-billDate" name="billDate">
+								<a-date-picker placeholder="请选择入库日期(bill date)"  v-model:value="formData.billDate"  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>		
+						<a-col :span="12">
+							<a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="SaleOrderForm-projectName" name="projectName">
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" :disabled="notAllowEdit"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplierName"  id="SaleOrderForm-supplierName" name="supplierName">
+								<a-input v-model:value="formData.supplierName" placeholder="请输入"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass"  id="SaleOrderForm-productionClass" name="productionClass">
+								<a-input v-model:value="formData.productionClass" placeholder="请输入"  allow-clear  ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="机型(model)" v-bind="validateInfos.model" id="SaleOrderForm-model" name="model">
+                <a-input v-model:value="formData.model" placeholder="请输入"  allow-clear  ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="厂家(maker)" v-bind="validateInfos.maker"  id="SaleOrderForm-maker" name="maker">
+								<a-input v-model:value="formData.maker" placeholder="请输入厂家(maker)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="货位(goods allocation)" v-bind="validateInfos.goodsAllocation" id="SaleOrderForm-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="仓库(warehouse)" v-bind="validateInfos.warehouse" id="SaleOrderForm-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="备注(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-col :span="12">
+							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs"  id="PuechaseInquiryFormForm-attachs" name="attachs" >
+								<JUpload v-model:value="formData.attachs"></JUpload>
+							</a-form-item>
+						</a-col>    
+             
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+
+		<!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
+      <a-tab-pane tab="其他日苦 - 船明细(ship details)" key="purInShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="purInShipTableRef"
+          :loading="purInShipTable.loading"
+          :columns="purInShipTable.columns"
+          :dataSource="purInShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a  @click="viewAccessory(props)">查看配件信息(view accessory information)</a>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+      <a-tab-pane tab="其他入库 - 入库明细(arrive details)" key="stockIn" :forceRender="true">
+        <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="selectProductList"> 选择产品(select product)</a-button>
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="stockInTableRef"
+          :loading="stockInTable.loading"
+          :columns="stockInTable.columns"
+          :dataSource="stockInTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          asyncRemove
+          >
+            <template #action="props">
+              <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
+                <a>删除(delete)</a>
+              </a-popconfirm>
+              <!-- 逻辑不通暂时取消次功能 -->
+              <!-- <a>复制(copy)</a> -->
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+    </a-tabs>
+    <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesModalRef"></BaseShipArchiveAccessoriesModal>
+    <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct ='addProduct'></SelectPrpductModal>
+    <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal> <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal>
+  </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 { queryPurInFormShipFormShippTable, querystockInByMainId, queryDataById, saveOrUpdate} from '../otherInForm.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import {otherInShipColumns, stockInColumns} from '../otherInForm.data';
+  import BaseShipArchiveAccessoriesModal from '../../../publicComponents/BaseShipArchiveAccessoriesModal.vue';
+  import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
+  import SelectProjectModal from '../../../publicComponents/SelectProjectModal.vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import { JDictSelectTag} from '/@/components/Form';
+  import { Form, message } from 'ant-design-vue';
+  import moment from 'moment';
+  const useForm = Form.useForm;
+  export default defineComponent({
+    name: "otherInForm",
+    components:{
+      JVxeTable,
+			JFormContainer,
+      JUpload,
+      JDictSelectTag,
+      BaseShipArchiveAccessoriesModal,
+      SelectProjectModal,
+      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 SelectProjectModalRef = ref()
+      const SelectPrpductModalRef = ref()
+      const purInShipTableRef = ref();
+      const BaseShipArchiveAccessoriesModalRef = ref();
+      const purInShipTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: otherInShipColumns,
+        dataSource: []
+      });
+      const stockInTableRef = ref();
+      const stockInTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: stockInColumns,
+        dataSource: []
+      });
+      const activeKey = ref('purInShip');
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        status: undefined,
+        delFlag: undefined,
+        sourceCode:'',
+        billCode:'',
+        billDate: moment(new Date()).format('YYYY-MM-DD'),   
+        project: '', 
+        projectName:'',  
+        supplier:"",
+        supplierName:'',
+        delivery: '',   
+        productionClass: '',   
+        model:'',   
+        maker: '',
+        goodsAllocation:'',
+        warehouse:'',
+        notes:'',
+        attachs:'',
+        arrivalDetails:'',
+        typr:'1'
+      });
+      //表单验证
+      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();
+        purInShipTable.dataSource = [];
+        stockInTable.dataSource = [];
+        activeKey.value = 'purInShip'
+      }
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        //子表数据
+        const purInShipDataList = await queryPurInFormShipFormShippTable(row['id']);
+        purInShipTable.dataSource = [...purInShipDataList];
+        const stockInDataList = await querystockInByMainId(row['id']);
+        stockInTable.dataSource = [...stockInDataList];
+      }
+
+      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, {
+        'storePurchaseInShip': purInShipTableRef,
+        'storePurchaseInDetails': stockInTableRef,
+      });
+
+      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() {
+        if( formData.sourceCode==''){
+          message.error('请添加入库明细！');
+        }else{
+          const mainData = await getFormData();
+          const subData = await getSubFormAndTableData();
+          const values = Object.assign({}, dbData, mainData, subData);
+          console.log('表单提交数据', values)
+          const isUpdate = values.id ? true : false
+          await saveOrUpdate(values, isUpdate);
+          //关闭弹窗
+          emit('success');
+        }
+      }
+      
+      function setFieldsValue(values) {
+        if(values){
+          Object.keys(values).map(k=>{
+            formData[k] = values[k];
+          });
+        }
+      }
+      function getShipList(id){
+        let params = {id:id}
+        let url = '/purCode/purDeliveryNote/queryPurDeliveryNodeShipByMainId'
+          defHttp.get({url:url,params}, { isTransformResponse: false }).then(res=>{
+            if(res){
+              purInShipTable.dataSource = res.result
+            }
+          })
+      }
+
+       //查看配件信息
+       function viewAccessory(prop){
+        BaseShipArchiveAccessoriesModalRef.value.getTable(prop.row)
+      }
+      //入库明细-删除行
+      function handleDelete(prop) {
+        var newArray = [...stockInTable.dataSource]
+        newArray.splice(prop.rowIndex, 1)
+        stockInTable.dataSource = newArray      
+      }
+      function onSearchProject(){
+        SelectProjectModalRef.value.getTable()
+      }
+      function addProject(data){
+        if(data.lenght==0){
+          formData.projectName = ''
+          formData.projectName = ''
+        }else{
+          formData.project = data[0].id
+          formData.projectName = data[0].name
+        } 
+      }
+      function addProduct(data){
+        data.map(item=>{
+          item.productClass = item.classId_dictText
+          item.productCode = item.code
+          item.productId = item.id
+        })
+        var arrProduct = data.concat(purOrderFormShipFormProductTable.dataSource)
+        purOrderFormShipFormProductTable.dataSource=arrProduct  
+      }
+      function selectProductList(){
+        SelectPrpductModalRef.value.getTable()
+      }
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+      return {
+        purInShipTableRef,
+        purInShipTable,
+        stockInTableRef,
+        stockInTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+        handleDelete,
+        BaseShipArchiveAccessoriesModalRef,
+        viewAccessory,
+        onSearchProject,
+        SelectProjectModalRef,
+        addProject,
+        selectProductList,
+        SelectPrpductModalRef,
+        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/inventiry/otherIn/components/otherInFormModal.vue

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

src/views/inventiry/otherIn/otherInForm.api.ts

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

src/views/inventiry/otherIn/otherInForm.data.ts

@@ -0,0 +1,222 @@
+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: '项目(project)',
+    align:"center",
+    dataIndex: 'projectName'
+   },
+   {
+    title: '供应商(supplier)',
+    align:"center",
+    dataIndex: 'supplierName'
+   },
+   {
+    title: '产品分类(production class)',
+    align:"center",
+    dataIndex: 'productionClass'
+   },
+   {
+    title: '机型(model)',
+    align:"center",
+    dataIndex: 'model'
+   },
+   {
+    title: '厂家(maker)',
+    align:"center",
+    dataIndex: 'maker'
+   },
+   {
+    title: '仓库(warehouse)',
+    align:"center",
+    dataIndex: 'warehouse'
+   },
+   {
+    title: '货位(goods allocation)',
+    align:"center",
+    dataIndex: 'goodsAllocation',
+    width:'250'
+   },
+   {
+    title: '提交(submit)',
+    align:"center",
+    dataIndex: 'submit',
+   },
+];
+
+//子表表格配置
+export const otherInShipColumns: JVxeColumn[] = [
+    {
+      title: '船名(ship name)',
+      key: 'shipName',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '主机号(host number)',
+      key: 'hostNumber',
+      type: JVxeTypes.input,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '工程编号(project No)',
+      key: 'projectNo',
+      type: JVxeTypes.input,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '船厂(ship factory)',
+      key: 'shipFactory',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '船东(shipowner)',
+      key: 'shipowner',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '操作(operation)',
+      key: 'action',
+      width:"400px",
+      // 固定在右侧
+      fixed: 'right',
+      // 对齐方式为居中
+      align: 'center',
+      // 组件类型定义为【插槽】
+      type: JVxeTypes.slot,
+      // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+      slotName: 'action',
+    },
+  ]
+export const stockInColumns: JVxeColumn[] = [
+    {
+      title: '产品中文名(chineseName)',
+      key: 'chineseName',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '产品英文名(englishName)',
+      key: 'englishName',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '型号(model)',
+      key: 'model',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '备件号(partno)',
+      key: 'partno',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '订货号(orderno)',
+      key: 'orderno',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '图号(drawingno)',
+      key: 'drawingno',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '厂家(factory)',
+      key: 'factory',
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+      options: [],
+      dictCode: 'factory',
+    },
+    {
+      title: '质量等级(quality grade)',
+      key: 'qualityGrade',
+      options: [],
+      dictCode: 'quality_grade',
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '入库数量(stock in quantity)',
+      key: 'stockInQuantity',
+      type: JVxeTypes.inputNumber,
+      placeholder: '请输入${title}',
+      defaultValue:'',  
+      width:"200px",
+    },
+    {
+      title: '批号(batch code)',
+      key: 'batchCode',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '备注(notes)',
+      key: 'notes',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '操作(operation)',
+      key: 'action',
+      width:"200px",
+      // 固定在右侧
+      fixed: 'right',
+      // 对齐方式为居中
+      align: 'center',
+      // 组件类型定义为【插槽】
+      type: JVxeTypes.slot,
+      // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+      slotName: 'action',
+    },
+  ]

src/views/inventiry/otherIn/othernList.vue

@@ -0,0 +1,391 @@
+<template>
+    <div class="p-2">
+      <!--查询区域-->
+      <div class="jeecg-basic-table-form-container">
+        <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+          <a-row :gutter="24">
+            <a-col :lg="8">
+                <a-form-item name="billDate">
+                  <template #label><span title="入库日期(bill date)">入库日期(bill date)</span></template>
+                  <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParam.billDate" class="query-group-cust"/>
+                </a-form-item>
+            </a-col> 
+            <a-col :lg="8">
+                <a-form-item name="billCode">
+                  <template #label><span title="入库单号(bill code)">入库单号(bill code)</span></template>
+                  <a-input placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear ></a-input>
+                </a-form-item>
+            </a-col>          
+            <template v-if="toggleSearchStatus">
+              <a-col :lg="8">
+                <a-form-item name="project">
+                  <template #label><span title="项目(project)">项目(project)</span></template>
+                  <a-input v-model:value="queryParam.project" placeholder="请选择"/>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="customerName">
+                  <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
+                  <a-input placeholder="请输入供应商(supplier)" v-model:value="queryParam.supplier" allow-clear ></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="productionClass" >
+                  <template #label><span title="产品分类(production class)">产品分类(production class)</span></template>
+                  <JSelectInput   v-model:value="queryParam.productionClass"  placeholder="请选择" :options="classOption" style="width: 100%;"></JSelectInput>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="model">
+                  <template #label><span title="机型(model)">机型(model)</span></template>
+                  <JDictSelectTag v-model:value="queryParam.model" placeholder="请选择" dictCode="model_typer" style="width: 100%;"/>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="maker">
+                  <template #label><span title="厂家(maker)">厂家(maker)</span></template>
+                  <a-input placeholder="请输入厂家(maker)" v-model:value="queryParam.maker" allow-clear ></a-input>
+                </a-form-item>
+              </a-col>            
+              <a-col :lg="8">
+                <a-form-item name="productCode">
+                  <template #label><span title="产品编号(productCode)">产品编号(productCode)</span></template>
+                  <a-input placeholder="请输入产品编号(productCode)" v-model:value="queryParam.productCode" allow-clear ></a-input>
+                </a-form-item>
+              </a-col> 
+              <a-col :lg="8">
+                <a-form-item name="warehouse">
+                  <template #label><span title="仓库(warehouse)">仓库(warehouse)</span></template>
+                  <a-input placeholder="请输" v-model:value="queryParam.warehouse" allow-clear ></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="goodsAllocation">
+                  <template #label><span title="货位(goods allocation)">货位(goods allocation)</span></template>
+                  <a-input placeholder="请输" v-model:value="queryParam.goodsAllocation" allow-clear ></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="submit">
+                  <template #label><span title="提交(submit)">提交(submit)</span></template>
+                  <JDictSelectTag v-model:value="queryParam.submit" placeholder="请选择" dictCode="yes_or_no" style="width: 100%;"/>
+                </a-form-item>
+              </a-col>
+            </template>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+                <a-col :lg="6">
+                  <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
+                  <a-button preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                  <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                  </a>
+                </a-col>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!--引用表格-->
+     <BasicTable @register="registerTable" :rowSelection="rowSelection" size="small" >
+       <!--插槽:table标题-->
+        <template #tableTitle>
+            <a-button type="primary" v-auth="'saleCode:sale_order:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
+            <a-button  type="primary" v-auth="'saleCode:sale_order:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出(export)</a-button>
+            <a-button  type="primary"  @click="submit" > 提交(submit)</a-button>
+            <a-button  type="primary"  @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+                <template #overlay>
+                  <a-menu>
+                    <a-menu-item key="1" @click="batchHandleDelete"  v-auth="'saleCode:sale_order_form:deleteBatch'">
+                      <Icon icon="ant-design:delete-outlined"></Icon>
+                      删除(delete)
+                    </a-menu-item>
+                  </a-menu>
+                </template>
+                <a-button v-auth="'saleCode:sale_order:delete'">批量操作
+                  <Icon icon="mdi:chevron-down"></Icon>
+                </a-button>
+          </a-dropdown>
+        </template>
+         <!--操作栏-->
+        <template #action="{ record }">
+          <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        </template>
+        <!--字段回显插槽-->
+        <template v-slot:bodyCell="{ column, record, index, text }">
+        </template>
+      </BasicTable>
+      <!-- 表单区域 -->
+      <otherInFormModal @register="registerModal" @success="handleSuccess"></otherInFormModal>
+    </div>
+  </template>
+  
+  <script lang="ts" name="saleCode-saleInquiryForm" setup>
+    import {ref, reactive, computed, unref,onMounted} from 'vue';
+    import {BasicTable, useTable, TableAction} from '/@/components/Table';
+    import { useListPage } from '/@/hooks/system/useListPage'
+    import {useModal} from '/@/components/Modal';
+    import otherInFormModal from './components/otherInFormModal.vue'
+    import {columns} from './otherInForm.data';
+    import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit} from './otherInForm.api';
+    import { cloneDeep } from "lodash-es";
+    import { defHttp } from '/@/utils/http/axios';
+    import { JDictSelectTag} from '/@/components/Form';
+    import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+    import { message } from 'ant-design-vue';
+    const formRef = ref();
+    const queryParam = reactive<any>({});
+    //注册model
+    const [registerModal, {openModal}] = useModal();
+    var classOption = ref([]);
+     //注册table数据
+    const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+        tableProps:{
+             title: '采购入库',
+             api: list,
+             columns,
+             canResize:false,
+             useSearchForm: false,
+             actionColumn: {
+                 width: 200,
+                 fixed:'right'
+             },
+             scroll:{
+              x:'2500px'
+             },
+             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: 'saleCode:sale_order:edit',
+             ifShow: record.submit=='0'||!record.submit
+           },
+           {
+             label: '详情(detail)',
+             onClick: handleDetail.bind(null, record),
+             ifShow: record.submit=='1'
+           },
+         ]
+     }
+       /**
+          * 下拉操作栏
+          */
+    function getDropDownAction(record){
+         return [
+           {
+             label: '详情(detail)',
+             onClick: handleDetail.bind(null, record),
+             ifShow: record.submit=='0'||!record.submit
+           },
+           {
+             label: '删除(delete)',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+               placement: 'topLeft'
+             },
+             auth: 'saleCode:sale_order:delete',
+             ifShow: record.submit=='0'||!record.submit
+           }
+         ]
+     }
+    function submit(){
+      if(selectedRowKeys.value.length==0){
+        message.warning('请选择数据')
+      }else{
+        var ids=selectedRowKeys.value.join(',')
+        batchSubmit({ids: ids},handleSuccess);
+      }
+    }
+    function cancelSubmit(){
+      if(selectedRowKeys.value.length==0){
+        message.warning('请选择数据')
+      }else{
+        var ids=selectedRowKeys.value.join(',')
+        cancelBatchSubmit({ids: ids},handleSuccess);
+      }
+    }
+  
+    /* ----------------------以下为原生查询需要添加的-------------------------- */
+    const toggleSearchStatus = ref<boolean>(false);
+    const labelCol = reactive({
+      xs:24,
+      sm:8,
+    });
+    const wrapperCol = reactive({
+      xs: 24,
+      sm: 16,
+    });
+    const labelCol1 = reactive({
+      xs:24,
+      sm:12,
+    });
+    const wrapperCol1 = reactive({
+      xs: 24,
+      sm: 12,
+    });
+    /**
+     * 重置
+     */
+    function searchReset() {
+      formRef.value.resetFields();
+      selectedRowKeys.value = [];
+      //刷新数据
+      reload();
+    }
+  
+    
+    let rangeField = 'billDate,'
+    
+    /**
+     * 设置范围查询条件
+     */
+    async function setRangeQuery(){
+      let queryParamClone = cloneDeep(queryParam);
+      if (rangeField) {
+        let fieldsValue = rangeField.split(',');
+        fieldsValue.forEach(item => {
+          if (queryParamClone[item]) {
+            let range = queryParamClone[item];
+            queryParamClone[item+'_begin'] = range[0];
+            queryParamClone[item+'_end'] = range[1];
+            delete queryParamClone[item];
+          } else {
+            queryParamClone[item+'_begin'] = '';
+            queryParamClone[item+'_end'] = '';
+          }
+        })
+      }
+      return queryParamClone;
+    }
+  </script>
+  <style lang="less" scoped>
+    .jeecg-basic-table-form-container {
+      padding: 0;
+      .table-page-search-submitButtons {
+        display: block;
+        margin-bottom: 8px;
+        white-space: nowrap;
+      }
+      .query-group-cust{
+        min-width: 100px !important;
+      }
+      .query-group-split-cust{
+        width: 30px;
+        display: inline-block;
+        text-align: center
+      }
+      .ant-form-item:not(.ant-form-item-with-help){
+        margin-bottom: 8px;
+        height: 32px;
+      }
+      :deep(.ant-picker),:deep(.ant-input-number){
+        width: 100%;
+      }
+    }
+  </style>