diff --git a/src/api/base/material/materialApi.js b/src/api/base/material/materialApi.js
new file mode 100644
index 0000000..e34d881
--- /dev/null
+++ b/src/api/base/material/materialApi.js
@@ -0,0 +1,32 @@
+import { baseRequest } from '@/utils/request'
+
+const request = (url, ...arg) => baseRequest(`/base/material/` + url, ...arg)
+
+/**
+ * 物料Api接口管理器
+ *
+ * @author Luck
+ * @date 2024/07/24 19:54
+ **/
+export default {
+ // 获取物料分页
+ materialPage(data) {
+ return request('page', data, 'get')
+ },
+ // 获取物料 -- 物料包装数据
+ materialPackageData(data) {
+ return request('package/data', data, 'get')
+ },
+ // 提交物料表单 edit为true时为编辑,默认为新增
+ materialSubmitForm(data, edit = false) {
+ return request(edit ? 'edit' : 'add', data)
+ },
+ // 删除物料
+ materialDelete(data) {
+ return request('delete', data)
+ },
+ // 获取物料详情
+ materialDetail(data) {
+ return request('detail', data, 'get')
+ }
+}
diff --git a/src/api/base/material/materialCategoryApi.js b/src/api/base/material/materialCategoryApi.js
new file mode 100644
index 0000000..5c32f5e
--- /dev/null
+++ b/src/api/base/material/materialCategoryApi.js
@@ -0,0 +1,32 @@
+import { baseRequest } from '@/utils/request'
+
+const request = (url, ...arg) => baseRequest(`/base/materialCategory/` + url, ...arg)
+
+/**
+ * 物料分类Api接口管理器
+ *
+ * @author Luck
+ * @date 2024/07/24 19:35
+ **/
+export default {
+ // 获取物料分类分页
+ materialCategoryPage(data) {
+ return request('page', data, 'get')
+ },
+ // 获取物料分类 树结构
+ materialCategoryTree(data) {
+ return request('tree', data, 'get')
+ },
+ // 提交物料分类表单 edit为true时为编辑,默认为新增
+ materialCategorySubmitForm(data, edit = false) {
+ return request(edit ? 'edit' : 'add', data)
+ },
+ // 删除物料分类
+ materialCategoryDelete(data) {
+ return request('delete', data)
+ },
+ // 获取物料分类详情
+ materialCategoryDetail(data) {
+ return request('detail', data, 'get')
+ }
+}
diff --git a/src/api/base/unit/unitApi.js b/src/api/base/unit/unitApi.js
index 9275952..41360c4 100644
--- a/src/api/base/unit/unitApi.js
+++ b/src/api/base/unit/unitApi.js
@@ -24,5 +24,9 @@ export default {
// 获取单位详情
sysUnitDetail(data) {
return request('detail', data, 'get')
- }
+ },
+ // 获取单位列表
+ sysUnitList(data) {
+ return request(`groupList`, data, 'get')
+ },
}
diff --git a/src/components/DynamicForm/index.vue b/src/components/DynamicForm/index.vue
index 2fb2409..5fb3952 100644
--- a/src/components/DynamicForm/index.vue
+++ b/src/components/DynamicForm/index.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/components/Selector/userSelectorPlus.vue b/src/components/Selector/userSelectorPlus.vue
index a000738..a0a0496 100644
--- a/src/components/Selector/userSelectorPlus.vue
+++ b/src/components/Selector/userSelectorPlus.vue
@@ -186,6 +186,7 @@
if (dataIsConverterFlw) {
ids = goDataConverter(ids)
}
+ console.log(ids, 'ids')
recordIds.value = ids
// 加载机构树
if (props.orgTreeApi) {
@@ -213,12 +214,14 @@
searchFormState.value.size = pageSize.value
loadData()
if (props.checkedUserListApi) {
+ console.log(recordIds.value)
if (isEmpty(recordIds.value)) {
return
}
const param = {
idList: recordIds.value
}
+
selectedTableListLoading.value = true
props
.checkedUserListApi(param)
diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index ade42c6..18f6582 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -41,9 +41,9 @@
{
emit('deleteRowData')
diff --git a/src/hook/useFormHandler.js b/src/hook/useFormHandler.js
index a185ba3..a434eab 100644
--- a/src/hook/useFormHandler.js
+++ b/src/hook/useFormHandler.js
@@ -15,7 +15,7 @@ export default function useFormHandler(formItems, api) {
const initializeFormData = (formItems, formData) => {
formItems.forEach((item) => {
- formData[item.name] = item.defaultValue || ''
+ formData[item.name] = item.defaultValue || null
})
}
diff --git a/src/hook/useTableManagement.js b/src/hook/useTableManagement.js
index b628b21..76dbae1 100644
--- a/src/hook/useTableManagement.js
+++ b/src/hook/useTableManagement.js
@@ -11,10 +11,11 @@ import useTabs from '@/utils/useTabs'
*/
export function useTableManagement(apiModule = {}, tableColumns, hasPermData) {
const searchFormState = ref({})
- const searchFormRef = ref({})
+ const searchFormRef = ref(null)
const tableRef = ref(null)
const selectedRowKeys = ref([])
const router = useRouter()
+ let advanced = ref(false)
// 动态列配置
const columns = ref(tableColumns)
@@ -47,7 +48,7 @@ export function useTableManagement(apiModule = {}, tableColumns, hasPermData) {
// 重置
const reset = () => {
if (tableRef.value) {
- tableRef.value.resetFields()
+ searchFormRef.value.resetFields()
tableRef.value.refresh(true)
}
}
@@ -55,7 +56,7 @@ export function useTableManagement(apiModule = {}, tableColumns, hasPermData) {
// 删除
const deleteRecord = (record) => {
let params = [{ id: record.id }]
- apiModule.delete(params).then(() => {
+ return apiModule.delete(params).then(() => {
if (tableRef.value) {
tableRef.value.refresh(true)
}
@@ -94,6 +95,10 @@ export function useTableManagement(apiModule = {}, tableColumns, hasPermData) {
})
}
+ const toggleAdvanced = () => {
+ advanced.value = !advanced.value
+ }
+
// 返回Hook的值
return {
searchFormState,
@@ -107,6 +112,8 @@ export function useTableManagement(apiModule = {}, tableColumns, hasPermData) {
deleteBatchRecords,
options,
toolConfig,
- navigateTo
+ navigateTo,
+ toggleAdvanced,
+ advanced
}
}
diff --git a/src/views/basicData/brand/index.vue b/src/views/basicData/brand/index.vue
index 382a0dd..f4d9f47 100644
--- a/src/views/basicData/brand/index.vue
+++ b/src/views/basicData/brand/index.vue
@@ -2,14 +2,23 @@
+
+
+
+
+
-
-
+
+
@@ -54,13 +63,14 @@
-
+ />-->
+ {{ $TOOL.dictTypeData('COMMON_STATUS', record.enabledState) }}
@@ -96,7 +106,7 @@
-
diff --git a/src/views/basicData/materiel/detail/materialCategoryForm.vue b/src/views/basicData/materiel/detail/materialCategoryForm.vue
new file mode 100644
index 0000000..f7d91c7
--- /dev/null
+++ b/src/views/basicData/materiel/detail/materialCategoryForm.vue
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+ 保存
+
+
+
+
+
diff --git a/src/views/basicData/materiel/index.vue b/src/views/basicData/materiel/index.vue
index a2f4c97..ccc7b29 100644
--- a/src/views/basicData/materiel/index.vue
+++ b/src/views/basicData/materiel/index.vue
@@ -8,8 +8,17 @@
-
-
+
+
+
+
+
+
+
@@ -33,28 +42,33 @@
-
+
-
+
-
+
-
@@ -136,12 +150,16 @@
+
-
diff --git a/src/views/basicData/publicAccount/index.vue b/src/views/basicData/publicAccount/index.vue
index 0459fe1..734d915 100644
--- a/src/views/basicData/publicAccount/index.vue
+++ b/src/views/basicData/publicAccount/index.vue
@@ -8,8 +8,12 @@
-
-
+
+
@@ -54,13 +58,14 @@
-
+ />-->
+ {{ $TOOL.dictTypeData('COMMON_STATUS', record.enabledState) }}
{{ $TOOL.dictTypeData('OFFICIAL_ACCOUNT_TYPE', record.type) }}
@@ -99,20 +104,11 @@
-