分解方式不能为必填（产品分类字典）

a7b11106 · 董晓奇 · 0b0273d7 · a7b11106 · a7b11106 · a7b11106
Commit a7b11106 authored Mar 18, 2026 by 董晓奇
Show whitespace changes
Inline Side-by-side

Showing with 185 additions and 176 deletions

xjrsoft-vue3/src/views/jcsj/cplx/components/Form.vue
+106 -33

xjrsoft-vue3/src/views/jcsj/cplx/components/config.ts
+1 -1

xjrsoft-vue3/src/views/jcsj/cplx/index.vue
+78 -142

No files found.
--- a/xjrsoft-vue3/src/views/jcsj/cplx/components/Form.vue
+++ b/xjrsoft-vue3/src/views/jcsj/cplx/components/Form.vue
 <template>
  <div class="pt-4">
    <SimpleForm
      ref="systemFormRef"
      :formProps="data.formDataProps"
      :formModel="state.formModel"
-      :isWorkFlow="props.fromPage!=FromPageType.MENU"
+      :isWorkFlow="props.fromPage != FromPageType.MENU"
      :isCamelCase="true"
      @model-change="handleChange"
    />
@@ -21,15 +20,19 @@
  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 {
+    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 emits = defineEmits(['changeUploadComponentIds', 'loadingCompleted', 'update:value']);
  const props = defineProps({
    fromPage: {
      type: Number,
@@ -42,7 +45,7 @@
  });
  const state = reactive({
    formModel: {},
-    formInfo:{formId:'',formName:''}
+    formInfo: { formId: '', formName: '' },
  });
  const { currentRoute } = useRouter();
  watch(
@@ -59,17 +62,35 @@
    try {
      if (props.fromPage == FromPageType.MENU) {
        setMenuPermission();
-        if(currentRoute.value.meta){
+        if (currentRoute.value.meta) {
-          state.formInfo.formName = currentRoute.value.meta.title&&isString(currentRoute.value.meta.title)?currentRoute.value.meta.title:'';
+          state.formInfo.formName =
-          state.formInfo.formId = currentRoute.value.meta.formId&&isString(currentRoute.value.meta.formId)?currentRoute.value.meta.formId:'';
+            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,
+        await createFormEvent(
+          formEventConfigs,
+          state.formModel,
          systemFormRef.value,
-          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+          formProps.schemas,
+          true,
+          state.formInfo.formName,
+          state.formInfo.formId,
+        ); //表单事件：初始化表单
        await nextTick();
-        await loadFormEvent(formEventConfigs, state.formModel,
+        await loadFormEvent(
+          formEventConfigs,
+          state.formModel,
          systemFormRef.value,
-          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+          formProps.schemas,
+          true,
+          state.formInfo.formName,
+          state.formInfo.formId,
+        ); //表单事件：加载表单
      } else if (props.fromPage == FromPageType.FLOW) {
        emits('loadingCompleted'); //告诉系统表单已经加载完毕
        // loadingCompleted后 工作流页面直接利用Ref调用setWorkFlowForm方法
@@ -78,15 +99,28 @@
      } else if (props.fromPage == FromPageType.DESKTOP) {
        // 桌面设计 表单事件需要执行
        emits('loadingCompleted'); //告诉系统表单已经加载完毕
-        await createFormEvent(formEventConfigs, state.formModel,
+        await createFormEvent(
+          formEventConfigs,
+          state.formModel,
          systemFormRef.value,
-          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+          formProps.schemas,
-        await loadFormEvent(formEventConfigs, state.formModel,
+          true,
+          state.formInfo.formName,
+          state.formInfo.formId,
+        ); //表单事件：初始化表单
+        await loadFormEvent(
+          formEventConfigs,
+          state.formModel,
          systemFormRef.value,
-          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+          formProps.schemas,
+          true,
+          state.formInfo.formName,
+          state.formInfo.formId,
+        ); //表单事件：加载表单
      }
    } catch (error) {}
  });
  // 根据菜单页面权限，设置表单属性（必填，禁用，显示）
  function setMenuPermission() {
    data.formDataProps.schemas = filterFormSchemaAuth(data.formDataProps.schemas!);
@@ -107,19 +141,25 @@
    }
    return values;
  }
  // 根据行唯一ID查询行数据，并设置表单数据   【编辑】
  async function setFormDataFromId(rowId) {
    try {
      const record = await getMesBaseCplx(rowId);
      setFieldsValue(record);
      state.formModel = record;
-      await getFormDataEvent(formEventConfigs, state.formModel,
+      await getFormDataEvent(
+        formEventConfigs,
+        state.formModel,
        systemFormRef.value,
-        formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：获取表单数据
+        formProps.schemas,
-    } catch (error) {
+        true,
+        state.formInfo.formName,
-    }
+        state.formInfo.formId,
+      ); //表单事件：获取表单数据
+    } catch (error) {}
  }
  // 辅助返回表单数据
  async function getFieldsValue() {
    let values = [];
@@ -135,45 +175,64 @@
    }
    return values;
  }
  // 辅助设置表单数据
  function setFieldsValue(record) {
    systemFormRef.value.setFieldsValue(record);
  }
  // 重置表单数据
  async function resetFields() {
    await systemFormRef.value.resetFields();
  }
  //  设置表单数据全部为Disabled  【查看】
-  async function setDisabledForm( ) {
+  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 updateMesBaseCplx(values);
-      await submitFormEvent(formEventConfigs, state.formModel,
+      await submitFormEvent(
+        formEventConfigs,
+        state.formModel,
        systemFormRef.value,
-        formProps.schemas, true,  state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
+        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 addMesBaseCplx(values);
-      await submitFormEvent(formEventConfigs, state.formModel,
+      await submitFormEvent(
+        formEventConfigs,
+        state.formModel,
        systemFormRef.value,
-        formProps.schemas, true,  state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
+        formProps.schemas,
+        true,
+        state.formInfo.formName,
+        state.formInfo.formId,
+      ); //表单事件：提交表单
      return saveVal;
    } catch (error) {}
  }
  // 根据工作流页面权限，设置表单属性（必填，禁用，显示）
  async function setWorkFlowForm(obj: WorkFlowFormParams) {
    try {
@@ -189,16 +248,30 @@
      state.formModel = formModels;
      setFieldsValue(formModels);
    } catch (error) {}
-    await createFormEvent(formEventConfigs, state.formModel,
+    await createFormEvent(
+      formEventConfigs,
+      state.formModel,
      systemFormRef.value,
-      formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+      formProps.schemas,
-    await loadFormEvent(formEventConfigs, state.formModel,
+      true,
+      state.formInfo.formName,
+      state.formInfo.formId,
+    ); //表单事件：初始化表单
+    await loadFormEvent(
+      formEventConfigs,
+      state.formModel,
      systemFormRef.value,
-      formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+      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) {
@@ -206,6 +279,7 @@
      }
    } catch (error) {}
  }
  defineExpose({
    setFieldsValue,
    resetFields,
@@ -218,7 +292,6 @@
    setWorkFlowForm,
    getRowKey,
    getFieldsValue,
-    sendMessageForAllIframe
+    sendMessageForAllIframe,
  });
 </script>
--- a/xjrsoft-vue3/src/views/jcsj/cplx/components/config.ts
+++ b/xjrsoft-vue3/src/views/jcsj/cplx/components/config.ts
@@ -349,7 +349,7 @@ export const formProps: FormProps = {
                  apiId: '93d735dcb7364a0f8102188ec4d77ac7',
                },
                dicOptions: [],
-                required: true,
+                required: false,
                rules: [],
                events: {},
                isShow: true,

--- a/xjrsoft-vue3/src/views/jcsj/cplx/index.vue
+++ b/xjrsoft-vue3/src/views/jcsj/cplx/index.vue
 <template>
+  <ResizePageWrapper :hasLeft="false">
-<ResizePageWrapper   :hasLeft="false">
    <template #resizeRight>
-<BasicTable @register="registerTable" isMenuTable ref="tableRef"  
+      <BasicTable @register="registerTable" isMenuTable ref="tableRef">
-  >
        <template #toolbar>
          <template v-for="button in tableButtonConfig" :key="button.code">
            <a-button v-if="button.isDefault" type="primary" @click="buttonClick(button.code)">
-              <template #icon><Icon :icon="button.icon" /></template>
+              <template #icon>
+                <Icon :icon="button.icon" />
+              </template>
              {{ button.name }}
            </a-button>
            <CustomButtonModal v-else-if="button.buttonType == 'modal'" :info="button" />
-            <a-button v-else :type="button.buttonType === 'danger' ? 'default' : button.buttonType || 'primary'" :danger="button.buttonType === 'danger'" >
+            <a-button
-              <template #icon><Icon :icon="button.icon" /></template>
+              v-else
+              :type="button.buttonType === 'danger' ? 'default' : button.buttonType || 'primary'"
+              :danger="button.buttonType === 'danger'"
+            >
+              <template #icon>
+                <Icon :icon="button.icon" />
+              </template>
              {{ button.name }}
            </a-button>
          </template>
        </template>
        <template #bodyCell="{ column, record }">
          <template v-if="column.dataIndex === 'action'">
            <TableAction
              :actions="getLessActions(record)"
              :dropDownActions="getMoreActions(record)"
@@ -41,81 +37,46 @@
            }}</span>
          </template>
        </template>
      </BasicTable>
    </template>
+    <CplxModal @register="registerModal" @success="handleFormSuccess" @cancel="handleFormCancel" />
+  </ResizePageWrapper>
-   <CplxModal @register="registerModal" @success="handleFormSuccess"   @cancel="handleFormCancel"/>
-</ResizePageWrapper>
 </template>
 <script lang="ts" setup>
-  import { ref, computed,provide,Ref, createVNode, 
+  import { ref, computed, provide, Ref, createVNode } from 'vue';
-} from 'vue';
  import { Modal } from 'ant-design-vue';
  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
  import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table';
-  import { getMesBaseCplxPage, deleteMesBaseCplx} from '/@/api/jcsj/cplx';
+  import { getMesBaseCplxPage, deleteMesBaseCplx } from '/@/api/jcsj/cplx';
  import { ResizePageWrapper } from '/@/components/Page';
  import { useMessage } from '/@/hooks/web/useMessage';
  import { useI18n } from '/@/hooks/web/useI18n';
  import { usePermission } from '/@/hooks/web/usePermission';
  import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
-  import { executeListStyle, getValue } from '/@/hooks/web/useListStyle';//列表样式配置
+  import { executeListStyle, getValue } from '/@/hooks/web/useListStyle'; //列表样式配置
  import { useRouter } from 'vue-router';
  import { useModal } from '/@/components/Modal';
  import CplxModal from './components/CplxModal.vue';
  import { searchFormSchema, columns } from './components/config';
  import Icon from '/@/components/Icon/index';
  const listSpliceNum = ref(3); //操作列最先展示几个
  import { useConcurrentLock } from '/@/hooks/web/useConcurrentLock';
  const pageParamsInfo = ref<any>({});
-  const { enableLockeData,handleOpenFormEnableLockeData, handleCloseFormEnableLocke, handleHasEnableLocke } =
+  const {
-    useConcurrentLock();
+    enableLockeData,
+    handleOpenFormEnableLockeData,
+    handleCloseFormEnableLocke,
+    handleHasEnableLocke,
+  } = useConcurrentLock();
  const { notification } = useMessage();
  const { t } = useI18n();
@@ -125,17 +86,46 @@
  const filterColumns = filterColumnAuth(columns);
  const tableRef = ref();
  //展示在列表内的按钮
-  const actionButtons = ref<string[]>(["view","edit","delete"]);
+  const actionButtons = ref<string[]>(['view', 'edit', 'delete']);
-  const buttonConfigs = computed(()=>{
+  const buttonConfigs = computed(() => {
-    const list = [{"buttonId":"2019334653844258816","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2019334653844258817","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2019334653844258818","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2019334653844258819","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
+    const list = [
+      {
+        buttonId: '2019334653844258816',
+        name: '查看',
+        code: 'view',
+        icon: 'ant-design:eye-outlined',
+        isDefault: true,
+        isUse: true,
+      },
+      {
+        buttonId: '2019334653844258817',
+        name: '新增',
+        code: 'add',
+        icon: 'ant-design:plus-outlined',
+        isDefault: true,
+        isUse: true,
+      },
+      {
+        buttonId: '2019334653844258818',
+        name: '编辑',
+        code: 'edit',
+        icon: 'ant-design:form-outlined',
+        isDefault: true,
+        isUse: true,
+        isEnableLock: true,
+      },
+      {
+        buttonId: '2019334653844258819',
+        name: '删除',
+        code: 'delete',
+        icon: 'ant-design:delete-outlined',
+        isDefault: true,
+        isUse: true,
+      },
+    ];
    return filterButtonAuth(list);
-  })
+  });
  const tableButtonConfig = computed(() => {
    return buttonConfigs.value?.filter((x) => !actionButtons.value.includes(x.code));
@@ -145,27 +135,16 @@
    return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code));
  });
-  const btnEvent = {view : handleView,add : handleAdd,edit : handleEdit,delete : handleDelete,}
+  const btnEvent = { view: handleView, add: handleAdd, edit: handleEdit, delete: handleDelete };
  const { currentRoute } = useRouter();
  const formIdComputedRef = computed(() => currentRoute.value.meta.formId as string);
  provide<Ref<string>>('currentFormId', formIdComputedRef);
  const [registerModal, { openModal }] = useModal();
+  const [registerTable, { reload }] = useTable({
-  const [registerTable, { reload,   }] = useTable({
    title: 'Cplx列表',
    api: getMesBaseCplxPage,
    rowKey: 'id',
@@ -179,23 +158,15 @@
      fieldMapToTime: [],
      showResetButton: false,
    },
-     bordered:false,
+    bordered: false,
    beforeFetch: (params) => {
-      pageParamsInfo.value = {...params, FormId: formIdComputedRef.value,PK: 'id' }
+      pageParamsInfo.value = { ...params, FormId: formIdComputedRef.value, PK: 'id' };
      return pageParamsInfo.value;
    },
-    afterFetch: (res) => {
+    afterFetch: (res) => {},
-    },
    useSearchForm: true,
    showTableSetting: true,
    striped: false,
    actionColumn: {
      width: 195,
@@ -212,32 +183,20 @@
    objectId: formIdComputedRef.value, ////系统表单formId,自定义表单releaseId的id值
  });
  function buttonClick(code) {
    btnEvent[code]();
  }
  function handleAdd() {
+    openModal(true, { isUpdate: false });
-      openModal(true, { isUpdate: false, });
  }
  async function handleEdit(record: Recordable) {
    let field = 'id';
    try {
      let hasIn = handleHasEnableLocke(buttonConfigs.value, 'edit');
      if (hasIn) {
-        let res = await handleOpenFormEnableLockeData(
+        let res = await handleOpenFormEnableLockeData(record[field], formIdComputedRef.value);
-          record[field],
-          formIdComputedRef.value,
-        );
        if (res !== null) {
          return;
        }
@@ -247,16 +206,12 @@
        id: record[field],
        isUpdate: true,
      };
      openModal(true, info);
    } catch (error) {}
  }
  function handleDelete(record: Recordable) {
    deleteList([record.id]);
  }
@@ -281,16 +236,10 @@
    });
  }
  function customRow(record: Recordable) {
    return {
      ondblclick: () => {
-        if (record.isCanEdit && hasPermission("cplx:edit")) {
+        if (record.isCanEdit && hasPermission('cplx:edit')) {
          handleEdit(record);
        }
      },
@@ -298,43 +247,38 @@
  }
  function handleSuccess() {
    reload();
  }
  function handleFormSuccess() {
    handleSuccess();
    handleCloseFormEnableLocke(buttonConfigs.value, 'edit');
  }
  function handleFormCancel() {
    handleCloseFormEnableLocke(buttonConfigs.value, 'edit');
  }
  function handleView(record: Recordable) {
-  let info={
+    let info = {
      isView: true,
      id: record.id,
-    }
+    };
    openModal(true, info);
  }
  function getLessActions(record: Recordable) {
    let list = getActions(record);
    return list.slice(0, listSpliceNum.value);
  }
  function getMoreActions(record: Recordable) {
    let list = getActions(record);
    return list.slice(listSpliceNum.value);
  }
-  function getActions(record: Recordable):ActionItem[] {
+  function getActions(record: Recordable): ActionItem[] {
    record.isCanEdit = false;
    let actionsList: ActionItem[] = [];
@@ -352,7 +296,6 @@
      } else {
        if (!['edit', 'delete'].includes(button.code)) {
          actionsList.push({
            auth: `cplx:${button.code}`,
            label: button?.name,
            onClick: btnEvent[button.code]?.bind(null, record),
@@ -362,24 +305,17 @@
    });
    return actionsList;
  }
 </script>
 <style lang="less" scoped>
  :deep(.ant-table-selection-col) {
    width: 50px;
  }
-  .show{
+  .show {
    display: flex;
  }
-  .hide{
+  .hide {
    display: none !important;
  }
 </style>