diff --git a/.env.development b/.env.development index 81cf2b3..2f86c58 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,2 @@ VITE_BASE=/ -VITE_BASE_URL=http://192.168.0.16:8471/qhd-regulatoryV2/ +VITE_BASE_URL=http://192.168.0.18:8059/docking/ diff --git a/src/components/area_cascader/index.vue b/src/components/area_cascader/index.vue index 26b29ff..61aa07a 100644 --- a/src/components/area_cascader/index.vue +++ b/src/components/area_cascader/index.vue @@ -8,7 +8,7 @@ :show-all-levels="false" :level="level" :join-separator="joinSeparator" - value="bianma" + value="code" /> diff --git a/src/components/cascader/index.vue b/src/components/cascader/index.vue index a28b6d6..1cdb300 100644 --- a/src/components/cascader/index.vue +++ b/src/components/cascader/index.vue @@ -52,13 +52,13 @@ const administrativeDivisionProps = { lazy: true, lazyLoad: async (node, resolve) => { const resData = await appFnGetDataDictionary({ - parentId: node.data.dictionariesId || props.id, + parentId: node.data.dictionaryId || props.id, }); resolve( resData.map((item) => { return { - dictionariesId: item.dictionariesId, - bianma: item.bianma, + dictionaryId: item.dictionaryId, + code: item.code, name: item.name, leaf: props.controlLevel ? node.level >= props.level @@ -68,7 +68,7 @@ const administrativeDivisionProps = { ); }, value: props.value, - id: "dictionariesId", + id: "dictionaryId", label: "name", children: "children", checkStrictly: props.checkStrictly, diff --git a/src/views/corp/manager/components/app-add.vue b/src/views/corp/manager/components/app-add.vue index 0aff2fd..3d75591 100644 --- a/src/views/corp/manager/components/app-add.vue +++ b/src/views/corp/manager/components/app-add.vue @@ -1,4 +1,98 @@ - + diff --git a/src/views/corp/manager/index.vue b/src/views/corp/manager/index.vue index a15793c..093fdce 100644 --- a/src/views/corp/manager/index.vue +++ b/src/views/corp/manager/index.vue @@ -17,8 +17,15 @@ + - + diff --git a/src/views/system_management/data_dictionary/components/add.vue b/src/views/system_management/data_dictionary/components/add.vue index 4b9e270..6b6a664 100644 --- a/src/views/system_management/data_dictionary/components/add.vue +++ b/src/views/system_management/data_dictionary/components/add.vue @@ -56,7 +56,7 @@ const props = defineProps({ type: Object, required: false, default: () => ({ - dictionariesId: "0", + dictionaryId: "0", name: "(无)此项为顶级菜单", bianma: "", parentIds: "", @@ -106,25 +106,25 @@ const fnSubmit = debounce( } await setDataDictionaryAdd({ ...form.value, - parentId: props.parent.dictionariesId, + parentId: props.parent.dictionaryId, parentIds: - props.parent.dictionariesId === "0" + props.parent.dictionaryId === "0" ? "" : (props.parent.parentIds ? props.parent.parentIds + "," : "") + - props.parent.dictionariesId, + props.parent.dictionaryId, parentBianmas: - props.parent.dictionariesId === "0" + props.parent.dictionaryId === "0" ? "" : (props.parent.parentBianmas ? props.parent.parentBianmas + "," : "") + props.parent.bianma, parentNames: - props.parent.dictionariesId === "0" + props.parent.dictionaryId === "0" ? "" : (props.parent.parentNames ? props.parent.parentNames + "," : "") + props.parent.name, - rootId: props.parent.dictionariesId === "0" ? "" : props.parent.rootId, - dictionariesId: undefined, + rootId: props.parent.dictionaryId === "0" ? "" : props.parent.rootId, + dictionaryId: undefined, }); } if (props.type === "edit")