diff --git a/src/components/OperationalInformation/index.vue b/src/components/OperationalInformation/index.vue
index 9903a9f..8750e81 100644
--- a/src/components/OperationalInformation/index.vue
+++ b/src/components/OperationalInformation/index.vue
@@ -59,6 +59,7 @@
watch(
() => props.detailData,
() => {
+ console.log(props.detailData, 'props.detailData')
detailDataProps.value = props.detailData
},
{
diff --git a/src/hook/useFormHandler.js b/src/hook/useFormHandler.js
index 474e2c9..8471f88 100644
--- a/src/hook/useFormHandler.js
+++ b/src/hook/useFormHandler.js
@@ -1,6 +1,7 @@
import { useRoute, useRouter } from 'vue-router'
import { cloneDeep } from 'lodash-es'
import useTabs from '@/utils/useTabs'
+import extendFieldApi from '@/api/base/extendfield/extendFieldApi'
/**
* 使用表单处理程序封装表单的提交、初始化和回退逻辑。
@@ -13,7 +14,14 @@ export default function useFormHandler(formItems, api) {
const state = reactive({
PAGE_TYPE: ''
})
- let detailData = reactive({})
+ let extendFormData = ref({})
+ // 操作信息
+ let inform = reactive({
+ createUserName: '',
+ createTime: '',
+ updateUserName: '',
+ updateTime: ''
+ })
// 初始化表单数据对象
let formData = reactive({})
@@ -86,7 +94,7 @@ export default function useFormHandler(formItems, api) {
*/
const handleBack = () => {
useTabs.close(route)
- router.go(-1) // 优化为通用的返回上一页操作
+ // router.push('/basicData/unit') // 优化为通用的返回上一页操作
}
/**
@@ -107,6 +115,17 @@ export default function useFormHandler(formItems, api) {
}
}
+ // 操作信息
+ for (let key in inform) {
+ if (res[key] !== undefined) {
+ inform[key] = res[key]
+ }
+ }
+
+ // 扩展字段
+ if (res.extJson) {
+ extendFormData.value = JSON.parse(res.extJson)
+ }
return res
} catch (error) {
console.error('API request failed:', error)
@@ -114,12 +133,58 @@ export default function useFormHandler(formItems, api) {
}
}
+ /**
+ * 扩展字段。
+ */
+ const getExtendField = async (model) => {
+ let extendData = []
+ // 字段扩展
+ const resExtendField = await extendFieldApi.extendFieldTypeList({
+ enabledState: 'ENABLE',
+ model
+ })
+
+ console.log(resExtendField, 'resExtendField')
+
+ if (resExtendField) {
+ resExtendField.forEach((item) => {
+ const showValues = JSON.parse(item.showValues)
+ let options = []
+ showValues.forEach((value) => {
+ options.push({
+ value: value.name,
+ label: value.name
+ })
+ })
+ extendData.push({
+ label: item.name,
+ name: item.fieldName,
+ type: item.showType,
+ span: 6,
+ attrs: {
+ placeholder: '请输入内容',
+ options
+ }
+ })
+ })
+
+ extendData.forEach((item) => {
+ if (item.fieldName) extendFormData.value[item.fieldName] = null
+ })
+ return extendData
+ } else {
+ return []
+ }
+ }
+
// 返回包含各种处理函数和状态的对象
return {
formData,
submitLoading,
formRefs,
- detailData,
+ inform,
+ extendFormData,
+ getExtendField,
onSubmit,
handleBack,
fetchData,
diff --git a/src/layout/components/tags.vue b/src/layout/components/tags.vue
index 16abe77..cc03329 100644
--- a/src/layout/components/tags.vue
+++ b/src/layout/components/tags.vue
@@ -110,7 +110,7 @@
activeKey.value = to.path
if (to.name) {
vStore.pushViewTags(to)
- // kStore.pushKeepLive(to.name)
+ kStore.pushKeepLive(to.name)
}
if (tagList.value.length - 1 > maxTabs.value) {
const firstTag = tagList.value[1]
diff --git a/src/utils/useTabs.js b/src/utils/useTabs.js
index a8f582e..f23bd47 100644
--- a/src/utils/useTabs.js
+++ b/src/utils/useTabs.js
@@ -31,12 +31,12 @@ 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)
const tagList = store.viewTags
const latestView = tagList.slice(-1)[0]
+ console.log(latestView, 'route')
if (latestView) {
router.push(latestView)
} else {
diff --git a/src/views/basicData/brand/detail/index.vue b/src/views/basicData/brand/detail/index.vue
index a36ef10..fc2a040 100644
--- a/src/views/basicData/brand/detail/index.vue
+++ b/src/views/basicData/brand/detail/index.vue
@@ -15,21 +15,24 @@
/>
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/basicData/client/detail/CustomerCategoryForm.vue b/src/views/basicData/client/detail/CustomerCategoryForm.vue
index ddbc88f..6e1d2b1 100644
--- a/src/views/basicData/client/detail/CustomerCategoryForm.vue
+++ b/src/views/basicData/client/detail/CustomerCategoryForm.vue
@@ -42,6 +42,9 @@
+
+
+
关闭
保存
@@ -54,6 +57,9 @@
import { cloneDeep } from 'lodash-es'
import { required } from '@/utils/formRules'
import customerCategoryApi from '@/api/base/customer/customerCategoryApi'
+ import { useRoute } from 'vue-router'
+ const route = useRoute()
+
// 抽屉状态
const visible = ref(false)
const emit = defineEmits({ successful: null })
@@ -74,7 +80,7 @@
}
enabledStateOptions.value = tool.dictList('COMMON_STATUS')
- customerCategoryApi.customerCategoryTree().then(res => {
+ customerCategoryApi.customerCategoryTree().then((res) => {
parentTreeData.value = [
{
id: 0,
@@ -94,7 +100,7 @@
// 默认要校验的
const formRules = {
name: [required('请输入名称')],
- parentId: [required('请选择上级')],
+ parentId: [required('请选择上级')]
}
// 验证并提交数据
const onSubmit = () => {
diff --git a/src/views/basicData/client/detail/index.vue b/src/views/basicData/client/detail/index.vue
index dfe8cfa..9484867 100644
--- a/src/views/basicData/client/detail/index.vue
+++ b/src/views/basicData/client/detail/index.vue
@@ -71,7 +71,7 @@
-
+
diff --git a/src/views/basicData/materiel/detail/index.vue b/src/views/basicData/materiel/detail/index.vue
index 4e595f2..2f3e7af 100644
--- a/src/views/basicData/materiel/detail/index.vue
+++ b/src/views/basicData/materiel/detail/index.vue
@@ -15,9 +15,9 @@
/>
-
+
-
+
-
+
-
+
@@ -74,7 +74,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -129,7 +127,6 @@
diff --git a/src/views/basicData/publicAccount/detail/index.vue b/src/views/basicData/publicAccount/detail/index.vue
index ea98635..5a06d3d 100644
--- a/src/views/basicData/publicAccount/detail/index.vue
+++ b/src/views/basicData/publicAccount/detail/index.vue
@@ -15,18 +15,32 @@
/>
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
@@ -48,14 +62,14 @@
const formRef1 = ref(null)
const formRef2 = ref(null)
let detailData = ref({})
+ let activeKey = ref('1')
+ let extendData = ref([])
- const { formData, formRefs, onSubmit, handleBack, fetchData } = useFormHandler(
- [...officialAccountFormItems, ...basicInfoFormItems],
- {
+ const { formData, formRefs, inform, extendFormData, onSubmit, handleBack, fetchData, getExtendField } =
+ useFormHandler([...officialAccountFormItems, ...basicInfoFormItems], {
submitForm: officialAccountApi.officialAccountSubmitForm,
getDetail: officialAccountApi.officialAccountDetail
- }
- )
+ })
onMounted(async () => {
formRefs.value = [formRef1.value, formRef2.value]
@@ -64,5 +78,7 @@
detailData.value = res
}
})
+
+ extendData.value = await getExtendField('MATERIAL')
})
diff --git a/src/views/basicData/stash/detail/index.vue b/src/views/basicData/stash/detail/index.vue
index afc6748..8ba988a 100644
--- a/src/views/basicData/stash/detail/index.vue
+++ b/src/views/basicData/stash/detail/index.vue
@@ -1,7 +1,7 @@
- 保存
+ 保存
@@ -15,7 +15,7 @@
/>
-
+
+
+
+
+
+
+
+
+
{
+ onSubmit({
+ isDeep: true,
+ ...formData,
+ extJson: JSON.stringify(extendFormData.value) || ''
+ })
+ }
onMounted(async () => {
formRefs.value = [formRef1.value, formRef2.value]
@@ -248,27 +269,9 @@
]
}
})
+
+ extendData.value = await getExtendField('MATERIAL')
})
let activeKey = ref('1')
-
- const data = ref([
- { id: '1', name: 'John', age: 28 },
- { id: '2', name: 'Jane', age: 22 }
- ])
-
- const columns = [
- {
- title: '上游仓库代码',
- dataIndex: 'name',
- editable: true,
- dataType: 'text' // 或 'number', 'select'
- },
- {
- title: '上游仓库名称',
- dataIndex: 'age',
- editable: true,
- dataType: 'number'
- }
- ]
diff --git a/src/views/basicData/unit/columns/unitColumns.js b/src/views/basicData/unit/columns/unitColumns.js
index d4025de..f4da34e 100644
--- a/src/views/basicData/unit/columns/unitColumns.js
+++ b/src/views/basicData/unit/columns/unitColumns.js
@@ -2,37 +2,62 @@ export const unitColumns = [
{
title: '编码',
dataIndex: 'number',
- width: 150,
+ width: 200,
resizable: true,
- align: 'center'
+ align: 'center',
+ sorter: true,
+ sortDirections: ['descend', 'ascend'],
+ ellipsis: true
},
{
title: '名称',
dataIndex: 'name',
- width: 150,
+ width: 200,
resizable: true,
- align: 'center'
+ align: 'center',
+ ellipsis: true
+ },
+ {
+ title: '单位组',
+ dataIndex: 'unitGroupName',
+ width: 200,
+ resizable: true,
+ align: 'center',
+ ellipsis: true
},
{
title: '可用状态',
dataIndex: 'enabledState',
- width: 150,
+ width: 200,
resizable: true,
- align: 'center'
+ align: 'center',
+ ellipsis: true
},
{
title: '换算率',
dataIndex: 'rate',
width: 200,
resizable: true,
- align: 'center'
+ align: 'center',
+ ellipsis: true
},
{
title: '是否基本单位',
dataIndex: 'isBase',
width: 200,
resizable: true,
- align: 'center'
+ align: 'center',
+ ellipsis: true
+ },
+ {
+ title: '换算率',
+ dataIndex: 'rate',
+ width: 200,
+ resizable: true,
+ align: 'center',
+ sorter: true,
+ sortDirections: ['descend', 'ascend'],
+ ellipsis: true
}
]
diff --git a/src/views/basicData/unit/detail/UnitGroupForm.vue b/src/views/basicData/unit/detail/UnitGroupForm.vue
index 3579cb5..9a1084b 100644
--- a/src/views/basicData/unit/detail/UnitGroupForm.vue
+++ b/src/views/basicData/unit/detail/UnitGroupForm.vue
@@ -21,6 +21,7 @@
/>
+
关闭
保存
@@ -41,7 +42,7 @@
const formData = ref({
number: '',
name: '',
- enabledState: 'ENABLE',
+ enabledState: 'ENABLE'
})
const submitLoading = ref(false)
const enabledStateOptions = ref([])
@@ -56,6 +57,7 @@
formData.value.number = ''
formData.value.name = ''
formData.value.enabledState = 'ENABLE'
+ formData.id = ''
}
}
// 关闭抽屉
diff --git a/src/views/basicData/unit/detail/index.vue b/src/views/basicData/unit/detail/index.vue
index 25f8553..0358d68 100644
--- a/src/views/basicData/unit/detail/index.vue
+++ b/src/views/basicData/unit/detail/index.vue
@@ -1,89 +1,51 @@
- 保存
+ 保存
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/basicData/unit/index.vue b/src/views/basicData/unit/index.vue
index 8b1a47e..e25fef1 100644
--- a/src/views/basicData/unit/index.vue
+++ b/src/views/basicData/unit/index.vue
@@ -8,8 +8,12 @@
-
-
+
+
@@ -22,12 +26,12 @@
- 查询
+ 查询
重置
{{ advanced ? '收起' : '展开' }}
@@ -39,7 +43,7 @@
-
+
单位组
@@ -65,20 +73,21 @@
un-checked-children="停用"
v-model:checked="record.enabledState"
/>-->
- {{ $TOOL.dictTypeData('COMMON_STATUS', record.enabledState) }}
+ 启用
+ 停用
@@ -171,20 +180,38 @@