diff --git a/src/components/DynamicForm/index.vue b/src/components/DynamicForm/index.vue
index 6ed391e..2fb2409 100644
--- a/src/components/DynamicForm/index.vue
+++ b/src/components/DynamicForm/index.vue
@@ -1,9 +1,9 @@
-
+
-
+
@@ -26,9 +26,9 @@
type: Object,
default: () => ({})
},
- col: {
- type: Object,
- default: () => ({ span: 8 })
+ allDisabled: {
+ type: Boolean,
+ default: false
}
})
@@ -36,7 +36,8 @@
// Expose validate method
defineExpose({
- validate: () => formRef.value.validate()
+ validate: () => formRef.value.validate(),
+ resetFields: () => formRef.value.resetFields()
})
diff --git a/src/components/DynamicTable/index.vue b/src/components/DynamicTable/index.vue
new file mode 100644
index 0000000..5c88cf4
--- /dev/null
+++ b/src/components/DynamicTable/index.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ record[column.dataIndex] }}
+
+
+
+ 编辑
+ deleteRow(record[props.rowKey])">
+ 删除
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index 25321cf..7d2a13f 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -38,17 +38,20 @@
- {
- emit('deleteRowData')
- }
- "
- >
-
+
+ {
+ emit('deleteRowData')
+ }
+ "
+ >
+
+
@@ -575,7 +578,6 @@
size: data.customSize, // 注意这个size是a-table组件需要的,这里不能跟别的地方成为compSize
columns: data.columnsSetting.filter((value) => value.checked === undefined || value.checked),
...data.localSettings,
- scroll: { x: 100 }
}
// 将值为 undefined 或者 null 的 table里props属性进行一个过滤
renderTableProps.value = Object.entries(renderProps).reduce((x, [y, z]) => (z == null ? x : ((x[y] = z), x)), {})
diff --git a/src/layout/components/tags.vue b/src/layout/components/tags.vue
index a196c5d..f2627cf 100644
--- a/src/layout/components/tags.vue
+++ b/src/layout/components/tags.vue
@@ -52,7 +52,6 @@
-
diff --git a/src/utils/useTabs.js b/src/utils/useTabs.js
index 5b8a926..a8f582e 100644
--- a/src/utils/useTabs.js
+++ b/src/utils/useTabs.js
@@ -31,6 +31,7 @@ export default {
close(tag) {
const route = tag || router.currentRoute.value
const store = viewTagsStore()
+ console.log(route, 'route')
store.removeViewTags(route)
iframeStore().removeIframeList(route)
keepAliveStore().removeKeepLive(route.name)
diff --git a/src/views/basicData/client/detail/CustomerCategoryForm.vue b/src/views/basicData/client/detail/CustomerCategoryForm.vue
new file mode 100644
index 0000000..ab735ba
--- /dev/null
+++ b/src/views/basicData/client/detail/CustomerCategoryForm.vue
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+ 保存
+
+
+
+
+
diff --git a/src/views/basicData/unit/detail/index.vue b/src/views/basicData/unit/detail/index.vue
index 6c71a73..9e5b1e1 100644
--- a/src/views/basicData/unit/detail/index.vue
+++ b/src/views/basicData/unit/detail/index.vue
@@ -11,8 +11,16 @@
-
-
+
+
@@ -26,9 +34,9 @@
-
+
@@ -42,9 +50,9 @@
@@ -64,30 +72,38 @@
import { required } from '@/utils/formRules'
import useTabs from '@/utils/useTabs'
import router from '@/router'
+ import unitGroupsApi from '@/api/base/unit/unitGroupsApi'
+ import unitApi from '@/api/base/unit/unitApi'
+ import { useRoute } from 'vue-router'
+ const useRouter = useRoute()
+
// 抽屉状态
const visible = ref(false)
const emit = defineEmits({ successful: null })
const formRef = ref()
// 表单数据
- const formData = ref({})
+ const formData = ref({
+ enabledState: 'ENABLE',
+ isBase: 'NO'
+ })
const submitLoading = ref(false)
- const stateOptions = ref([])
- const isBaseOptions = ref([])
// 默认要校验的
const formRules = {
+ unitGroupId: [required('请选择单位')],
name: [required('请输入名称')],
- unitGroupId: [required('请输入单位组id')]
+ isBase: [required('请选择是否基本单位')]
}
// 验证并提交数据
const onSubmit = () => {
formRef.value.validate().then(() => {
submitLoading.value = true
const formDataParam = cloneDeep(formData.value)
- sysUnitApi
+ unitApi
.sysUnitSubmitForm(formDataParam, formDataParam.id)
.then(() => {
- emit('successful')
+ // emit('successful')
+ handleBack()
})
.finally(() => {
submitLoading.value = false
@@ -96,7 +112,34 @@
}
// 返回之后关闭标签
const handleBack = () => {
- router.go(-1)
+ router.replace('/basicData/unit')
useTabs.close()
}
+
+ let state = reactive({
+ PAGE_TYPE: ''
+ })
+ let unitGroupList = ref([])
+ onMounted(() => {
+ // 单位组
+ unitGroupsApi
+ .sysUnitGroupList({
+ enabledState: 'ENABLE'
+ })
+ .then((res) => {
+ unitGroupList.value = res
+ })
+
+ state.PAGE_TYPE = useRouter.query.type
+ if (state.PAGE_TYPE && state.PAGE_TYPE !== 'ADD') {
+ state.detailId = useRouter.query.id
+ unitApi
+ .sysUnitDetail({
+ id: useRouter.query.id
+ })
+ .then((res) => {
+ formData.value = res
+ })
+ }
+ })
diff --git a/src/views/basicData/unit/index.vue b/src/views/basicData/unit/index.vue
index 146c6d4..2e18ad4 100644
--- a/src/views/basicData/unit/index.vue
+++ b/src/views/basicData/unit/index.vue
@@ -44,36 +44,42 @@
-
-
+
+
单位组
-
- {{ $TOOL.dictTypeData('COMMON_STATUS', record.state) }}
-
-
- {{ $TOOL.dictTypeData('YES_NO', record.isBase) }}
+
+
-
+
-
- {{ $TOOL.dictTypeData('COMMON_STATUS', record.state) }}
+
+
{{ $TOOL.dictTypeData('YES_NO', record.isBase) }}
- 编辑
+ 查看
+
+ 编辑
删除
@@ -125,7 +156,7 @@
-
+