feat(ckgl): 新增其他入库功能模块

- 创建MesWarehouseOther模型定义包括分页参数、返回值和表类型
- 实现API接口包括分页查询、详情获取、新增、更新、删除和导出功能
- 设计搜索表单和表格列配置支持仓库和仓管员筛选
- 开发表单组件支持业务伙伴、业务类型、调拨日期等字段录入
- 构建弹窗组件实现新增、编辑、查看和复制功能
- 配置工作流权限控制各字段的显示和编辑权限

xjrsoft-vue3/src/api/ckgl/qtrk/index.ts

+
+import { MesWarehouseOtherPageModel, MesWarehouseOtherPageParams, MesWarehouseOtherPageResult } from './model/QtrkModel';
+import { defHttp } from '/@/utils/http/axios';
+import { ErrorMessageMode } from '/#/axios';
+
+enum Api {
+  Page = '/ckgl/qtrk/page',
+  List = '/ckgl/qtrk/list',
+  Info = '/ckgl/qtrk/info',
+  MesWarehouseOther = '/ckgl/qtrk',
+  
+  
+  Export = '/ckgl/qtrk/export',
+  
+}
+
+/**
+ * @description: 查询MesWarehouseOther分页列表
+ */
+export async function getMesWarehouseOtherPage(params: MesWarehouseOtherPageParams, mode: ErrorMessageMode = 'modal') {
+  return defHttp.get<MesWarehouseOtherPageResult>(
+    {
+      url: Api.Page,
+      params,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+/**
+ * @description: 获取MesWarehouseOther信息
+ */
+export async function getMesWarehouseOther(id: String, mode: ErrorMessageMode = 'modal') {
+  return defHttp.get<MesWarehouseOtherPageModel>(
+    {
+      url: Api.Info,
+      params: { id },
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+/**
+ * @description: 新增MesWarehouseOther
+ */
+export async function addMesWarehouseOther(mesWarehouseOther: Recordable, mode: ErrorMessageMode = 'modal') {
+  return defHttp.post<boolean>(
+    {
+      url: Api.MesWarehouseOther,
+      params: mesWarehouseOther,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+/**
+ * @description: 更新MesWarehouseOther
+ */
+export async function updateMesWarehouseOther(mesWarehouseOther: Recordable, mode: ErrorMessageMode = 'modal') {
+  return defHttp.put<boolean>(
+    {
+      url: Api.MesWarehouseOther,
+      params: mesWarehouseOther,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+/**
+ * @description: 删除MesWarehouseOther（批量删除）
+ */
+export async function deleteMesWarehouseOther(ids: string[], mode: ErrorMessageMode = 'modal') {
+  return defHttp.delete<boolean>(
+    {
+      url: Api.MesWarehouseOther,
+      data: ids,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+
+
+/**
+ * @description: 导出MesWarehouseOther
+ */
+export async function exportMesWarehouseOther(
+  params?: object, 
+  mode: ErrorMessageMode = 'modal'
+) {
+  return defHttp.download(
+    {
+      url: Api.Export,
+      method: 'GET',
+      params,
+      responseType: 'blob',
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+  
+

xjrsoft-vue3/src/api/ckgl/qtrk/model/QtrkModel.ts

+import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
+
+/**
+ * @description: MesWarehouseOther分页参数 模型
+ */
+export interface MesWarehouseOtherPageParams extends BasicPageParams {
+  ck: string;
+
+  cgy: string;
+}
+
+/**
+ * @description: MesWarehouseOther分页返回值模型
+ */
+export interface MesWarehouseOtherPageModel {
+  id: string;
+
+  ywhb: string;
+
+  ywlx: string;
+
+  dbrq: string;
+
+  lydj: string;
+
+  ck: string;
+
+  cgy: string;
+}
+
+/**
+ * @description: MesWarehouseOther表类型
+ */
+export interface MesWarehouseOtherModel {
+  id: string;
+
+  ywhb: string;
+
+  ywlx: string;
+
+  dbrq: string;
+
+  lydj: string;
+
+  ck: string;
+
+  cgy: string;
+
+  mesWarehouseOtherInfoList?: MesWarehouseOtherInfoModel;
+}
+
+/**
+ * @description: MesWarehouseOtherInfo表类型
+ */
+export interface MesWarehouseOtherInfoModel {
+  id: string;
+
+  qtid: string;
+
+  cp: string;
+
+  gg: string;
+
+  xqsl: string;
+
+  hgsl: string;
+
+  bhgsl: string;
+
+  jldw: string;
+
+  hw: string;
+
+  bz: string;
+}
+
+/**
+ * @description: MesWarehouseOther分页返回值结构
+ */
+export type MesWarehouseOtherPageResult = BasicFetchResult<MesWarehouseOtherPageModel>;

xjrsoft-vue3/src/views/ckgl/qtrk/components/Form.vue

+
+<template>
+  <div class="pt-4">
+    <SimpleForm
+      ref="systemFormRef"
+      :formProps="data.formDataProps"
+      :formModel="state.formModel"
+      :isWorkFlow="props.fromPage!=FromPageType.MENU"
+      :isCamelCase="true" 
+      @model-change="handleChange"
+    />
+  </div>
+</template>
+<script lang="ts" setup>
+  import { reactive, ref, onMounted, nextTick, watch } from 'vue';
+  import { formProps, formEventConfigs } from './config';
+  import SimpleForm from '/@/components/SimpleForm/src/SimpleForm.vue';
+  import { addMesWarehouseOther, getMesWarehouseOther, updateMesWarehouseOther } from '/@/api/ckgl/qtrk';
+  import { cloneDeep, isString  } from 'lodash-es';
+  import { FormDataProps } from '/@/components/Designer/src/types';
+  import { usePermission } from '/@/hooks/web/usePermission';
+  import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
+  import { FromPageType } from '/@/enums/workflowEnum';
+  import { createFormEvent, getFormDataEvent, loadFormEvent, submitFormEvent,} from '/@/hooks/web/useFormEvent';
+  import { changeWorkFlowForm, changeSchemaDisabled } from '/@/hooks/web/useWorkFlowForm';
+  import { WorkFlowFormParams } from '/@/model/workflow/bpmnConfig';
+  import { useRouter } from 'vue-router';
+  
+  const { filterFormSchemaAuth } = usePermission();
+
+  const RowKey = 'id';
+  const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'update:value']);
+  const props = defineProps({
+    fromPage: {
+      type: Number,
+      default: FromPageType.MENU,
+    },
+  });
+  const systemFormRef = ref();
+  const data: { formDataProps: FormDataProps } = reactive({
+    formDataProps: cloneDeep(formProps),
+  });
+  const state = reactive({
+    formModel: {},
+    formInfo:{formId:'',formName:''}
+  });
+  const { currentRoute } = useRouter();
+  watch(
+    () => state.formModel,
+    (val) => { 
+      emits('update:value', val);
+    },
+    {
+      deep: true,
+    },
+  );
+  
+  onMounted(async () => {
+    try {
+      if (props.fromPage == FromPageType.MENU) {
+        setMenuPermission();
+        if(currentRoute.value.meta){
+          state.formInfo.formName = currentRoute.value.meta.title&&isString(currentRoute.value.meta.title)?currentRoute.value.meta.title:'';
+          state.formInfo.formId = currentRoute.value.meta.formId&&isString(currentRoute.value.meta.formId)?currentRoute.value.meta.formId:'';
+        }
+        await createFormEvent(formEventConfigs, state.formModel,
+          systemFormRef.value,
+          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+        await nextTick();
+        await loadFormEvent(formEventConfigs, state.formModel,
+          systemFormRef.value,
+          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+      } else if (props.fromPage == FromPageType.FLOW) {
+        emits('loadingCompleted'); //告诉系统表单已经加载完毕
+        // loadingCompleted后 工作流页面直接利用Ref调用setWorkFlowForm方法
+      } else if (props.fromPage == FromPageType.PREVIEW) {
+        // 预览 无需权限，表单事件也无需执行
+      } else if (props.fromPage == FromPageType.DESKTOP) {
+        // 桌面设计 表单事件需要执行
+        emits('loadingCompleted'); //告诉系统表单已经加载完毕
+        await createFormEvent(formEventConfigs, state.formModel,
+          systemFormRef.value,
+          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+        await loadFormEvent(formEventConfigs, state.formModel,
+          systemFormRef.value,
+          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+      }
+    } catch (error) {}
+  });
+  // 根据菜单页面权限，设置表单属性（必填，禁用，显示）
+  function setMenuPermission() {
+    data.formDataProps.schemas = filterFormSchemaAuth(data.formDataProps.schemas!);
+  }
+
+  // 校验form 通过返回表单数据
+  async function validate() {
+    let values = [];
+    try {
+      values = await systemFormRef.value?.validate();
+      //添加隐藏组件
+      if (data.formDataProps.hiddenComponent?.length) {
+        data.formDataProps.hiddenComponent.forEach((component) => {
+          values[component.bindField] = component.value;
+        });
+      }
+    } finally {
+    }
+    return values;
+  }  
+  // 根据行唯一ID查询行数据，并设置表单数据   【编辑】
+  async function setFormDataFromId(rowId) {
+    try {
+    const record = await getMesWarehouseOther(rowId);
+      setFieldsValue(record);
+      state.formModel = record;
+      await getFormDataEvent(formEventConfigs, state.formModel,
+        systemFormRef.value,
+        formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：获取表单数据
+    } catch (error) {
+      
+    }
+  }
+  // 辅助返回表单数据
+  async function getFieldsValue() {
+    let values = [];
+    try {
+      values = await systemFormRef.value?.getFieldsValue();
+      //添加隐藏组件
+      if (data.formDataProps.hiddenComponent?.length) {
+        data.formDataProps.hiddenComponent.forEach((component) => {
+          values[component.bindField] = component.value;
+        });
+      }
+    } finally {
+    }
+    return values;
+  }
+  // 辅助设置表单数据
+  function setFieldsValue(record) {
+    systemFormRef.value.setFieldsValue(record);
+  }
+  // 重置表单数据
+  async function resetFields() {
+    await systemFormRef.value.resetFields();
+  }
+  //  设置表单数据全部为Disabled  【查看】
+  async function setDisabledForm( ) {
+    data.formDataProps.schemas = changeSchemaDisabled(cloneDeep(data.formDataProps.schemas));
+  }
+  // 获取行键值
+  function getRowKey() {
+    return RowKey;
+  }
+  // 更新api表单数据
+  async function update({ values, rowId }) {
+    try {
+      values[RowKey] = rowId;
+      state.formModel = values;
+      let saveVal = await updateMesWarehouseOther(values);
+      await submitFormEvent(formEventConfigs, state.formModel,
+        systemFormRef.value,
+        formProps.schemas, true,  state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
+      return saveVal;
+    } catch (error) {}
+  }
+  // 新增api表单数据
+  async function add(values) {
+    try {
+      state.formModel = values;
+      let saveVal = await addMesWarehouseOther(values);
+      await submitFormEvent(formEventConfigs, state.formModel,
+        systemFormRef.value,
+        formProps.schemas, true,  state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
+      return saveVal;
+    } catch (error) {}
+  }
+  // 根据工作流页面权限，设置表单属性（必填，禁用，显示）
+  async function setWorkFlowForm(obj: WorkFlowFormParams) { 
+    try {
+      if (obj.formId) state.formInfo.formId = obj.formId;
+      if (obj.formName) state.formInfo.formName = obj.formName;
+      let flowData = await changeWorkFlowForm(cloneDeep(formProps), obj);
+      let { buildOptionJson, uploadComponentIds, formModels, isViewProcess } = flowData;
+      data.formDataProps = buildOptionJson;
+      emits('changeUploadComponentIds', uploadComponentIds); //工作流中必须保存上传组件id【附件汇总需要】
+      if (isViewProcess) {
+        setDisabledForm(); //查看
+      }
+      state.formModel = formModels;
+      setFieldsValue(formModels);
+    } catch (error) {}
+    await createFormEvent(formEventConfigs, state.formModel,
+      systemFormRef.value,
+      formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+    await loadFormEvent(formEventConfigs, state.formModel,
+      systemFormRef.value,
+      formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+  }
+  function handleChange(val) { 
+    emits('update:value', val);
+  }
+   async function sendMessageForAllIframe() {
+    try {
+      if (systemFormRef.value && systemFormRef.value.sendMessageForAllIframe) {
+        systemFormRef.value.sendMessageForAllIframe();
+      }
+    } catch (error) {}
+  }
+  defineExpose({
+    setFieldsValue,
+    resetFields,
+    validate,
+    add,
+    update,
+    setFormDataFromId,
+    setDisabledForm,
+    setMenuPermission,
+    setWorkFlowForm,
+    getRowKey,
+    getFieldsValue,
+    sendMessageForAllIframe
+  });
+</script>
+
+  
\ No newline at end of file

xjrsoft-vue3/src/views/ckgl/qtrk/components/QtrkModal.vue

+
+<template>
+
+
+    <BasicModal 
+    :height="1080"   
+     v-bind="$attrs" @register="registerModal" :title="getTitle"
+      @ok="handleSubmit" @cancel="handleClose"  >
+      <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
+      
+    </BasicModal>
+  
+</template>
+<script lang="ts" setup>
+  import { ref, computed, reactive, provide, Ref  } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { formProps  } from './config';
+  import ModalForm from './Form.vue';
+  import { FromPageType } from '/@/enums/workflowEnum';
+  
+   
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { notification } = useMessage();
+  const formRef = ref();
+  const isCopy = ref<boolean>(false)
+  const state = reactive({
+    formModel: {},
+    isUpdate: true,
+    isView: false,
+    rowId: '',
+  });
+  provide<Ref<boolean>>('isCopy', isCopy);
+
+  const { t } = useI18n();
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+      await handleInner(data); 
+  });
+
+  const getTitle = computed(() => (state.isView ? '查看' : state.isUpdate ? '编辑' : isCopy.value ? '复制数据' : '新增'));
+
+  
+  async function handleInner(data){
+    state.isUpdate = !!data?.isUpdate;
+    state.isView = !!data?.isView;
+    isCopy.value = !!data?.isCopy;
+    
+    setModalProps({
+      destroyOnClose: true,
+      maskClosable: false,
+      showCancelBtn: !state.isView,
+      showOkBtn: !state.isView,
+      canFullscreen: true,
+      width: 1980, 
+      footer: state.isView ? null : undefined,defaultFullscreen:true,
+    });
+    
+    if (state.isUpdate || state.isView || isCopy.value) {
+      state.rowId = data.id;
+      if (state.isView) {
+        await formRef.value.setDisabledForm();
+      }
+      
+      await formRef.value.setFormDataFromId(state.rowId);
+    } else {
+      formRef.value.resetFields();
+     
+    }
+    
+  }
+  async function saveModal() {
+    let saveSuccess = false;
+    try {
+      const values = await formRef.value?.validate();
+      //添加隐藏组件
+      if (formProps.hiddenComponent?.length) {
+        formProps.hiddenComponent.forEach((component) => {
+          values[component.bindField] = component.value;
+        });
+      }
+      if (values !== false) {
+        try {
+          if (!state.isUpdate || isCopy.value) {
+            saveSuccess = await formRef.value.add(values);
+          } else {
+            saveSuccess = await formRef.value.update({ values, rowId: state.rowId });
+          }
+          return saveSuccess;
+        } catch (error) {}
+      }
+    } catch (error) {
+      return saveSuccess;
+    }
+  }
+
+  async function handleSubmit() {
+    try {
+      const saveSuccess = await saveModal();
+      
+      setModalProps({ confirmLoading: true });
+      
+      if (saveSuccess) {
+        if (!state.isUpdate || isCopy.value) {
+          //false 新增
+          notification.success({
+            message: 'Tip',
+            description: isCopy.value ? '复制成功' : t('新增成功！'),
+          }); //提示消息
+        } else {
+          notification.success({
+            message: 'Tip',
+            description: t('修改成功！'),
+          }); //提示消息
+        }
+        
+        closeModal();
+        
+        formRef.value.resetFields();
+        emit('success');
+      }
+    } finally {
+      
+      setModalProps({ confirmLoading: false });
+      
+    }
+  }
+    
+  function handleClose() {
+    formRef.value.resetFields();
+  }
+  
+</script>
+
+  
\ No newline at end of file

xjrsoft-vue3/src/views/ckgl/qtrk/components/workflowPermission.ts

+export const permissionList = [
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '业务伙伴',
+    fieldId: 'ywhb',
+    isSubTable: false,
+    showChildren: true,
+    type: 'input',
+    key: '47ec86ca7bf342d798e4ef44e302f987',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: true,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '业务类型',
+    fieldId: 'ywlx',
+    isSubTable: false,
+    showChildren: true,
+    type: 'input',
+    key: '7166ca8f9cf844f1861534df71c2a89b',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: true,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '调拨日期',
+    fieldId: 'dbrq',
+    isSubTable: false,
+    showChildren: true,
+    type: 'date',
+    key: 'ed73ec07895c43f7a1afc23f91496d5b',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '来源单据',
+    fieldId: 'lydj',
+    isSubTable: false,
+    showChildren: true,
+    type: 'input',
+    key: 'a1dd47b56eb34e7297a71bbfb89a3979',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '仓库',
+    fieldId: 'ck',
+    isSubTable: false,
+    showChildren: true,
+    type: 'select',
+    key: '86347f09a22e4ff68a08072bdfffa716',
+    children: [],
+    options: {},
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '仓管员',
+    fieldId: 'cgy',
+    isSubTable: false,
+    showChildren: true,
+    type: 'input',
+    key: 'c5649c27a36b4682aa4a876a6b471c62',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: true,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSubTable: true,
+    showChildren: false,
+    tableName: 'mesWarehouseOtherInfoList',
+    fieldName: '',
+    fieldId: 'mesWarehouseOtherInfoList',
+    type: 'form',
+    key: '1a65fa1a6bf944edb3f887d2b3e61624',
+    children: [
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseOtherInfoList',
+        fieldName: '产品',
+        fieldId: 'cp',
+        type: 'Input',
+        key: 'd2a05114074246eca3ac7943960783a1',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseOtherInfoList',
+        fieldName: '规格',
+        fieldId: 'gg',
+        type: 'Input',
+        key: '4e997bb7abd54c62bc5e9da9297de9dc',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseOtherInfoList',
+        fieldName: '需求数量',
+        fieldId: 'xqsl',
+        type: 'InputNumber',
+        key: 'a5b7d019917140768d5c62887f1c64e5',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseOtherInfoList',
+        fieldName: '合格数量',
+        fieldId: 'hgsl',
+        type: 'InputNumber',
+        key: 'c3396a3b29954b7bba931c5a3eb7dc62',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseOtherInfoList',
+        fieldName: '不合格数量',
+        fieldId: 'bhgsl',
+        type: 'InputNumber',
+        key: 'ebd780a306da44d88290b1bc7a1a9b98',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseOtherInfoList',
+        fieldName: '计量单位',
+        fieldId: 'jldw',
+        type: 'XjrSelect',
+        key: '34529729e8a04e138c79f63620f67ad7',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseOtherInfoList',
+        fieldName: '货位',
+        fieldId: 'hw',
+        type: 'XjrSelect',
+        key: 'f2965da85265488d8fecfe373e1b5adc',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseOtherInfoList',
+        fieldName: '备注',
+        fieldId: 'bz',
+        type: 'Input',
+        key: '42db19d8ca8e4ba9844206d90e76c5e6',
+        children: [],
+      },
+    ],
+  },
+];