From 69549de4909bf9c07f18caeaf168f550c865fe0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=B4=E6=99=B6=E5=9C=9F=E8=B1=86?= <水晶土豆@devide> Date: Thu, 16 Nov 2023 21:10:00 +0800 Subject: [PATCH] Thu Nov 16 21:10:00 CST 2023 inscode --- "public/\345\257\274\345\207\272Excel.svg" | 1 + src/App.vue | 8 +-- .../contractCategory/contractCategory.vue | 46 +++++++--------- .../contractList/contractList.vue | 7 +-- .../announcementType.vue | 4 +- src/component/humanResources/department.vue | 53 ++++++++++++------- .../main/header/add_download/downloadItem.vue | 6 +-- .../header/add_download/downloadItem/item.vue | 14 ++--- .../tableList/table/operation/operations.vue | 10 ++-- src/component/main/tableList/table/table.vue | 2 +- src/util/message.js | 17 ++++++ 11 files changed, 93 insertions(+), 75 deletions(-) create mode 100644 "public/\345\257\274\345\207\272Excel.svg" create mode 100644 src/util/message.js diff --git "a/public/\345\257\274\345\207\272Excel.svg" "b/public/\345\257\274\345\207\272Excel.svg" new file mode 100644 index 0000000..8a534bf --- /dev/null +++ "b/public/\345\257\274\345\207\272Excel.svg" @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index cee8e63..f23afd3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,10 +7,10 @@ import departments from './component/humanResources/department.vue' - + + diff --git a/src/component/enterpriseAnnouncement/announcementType.vue b/src/component/enterpriseAnnouncement/announcementType.vue index aa407e1..f83727b 100644 --- a/src/component/enterpriseAnnouncement/announcementType.vue +++ b/src/component/enterpriseAnnouncement/announcementType.vue @@ -109,7 +109,7 @@ const disabledDialog = ref(false); const detailsDialog = ref(false); const editDialog = ref(false); const deleteDialog = ref(false); -const rowID = ref(); +const row = ref(); provide("addSubcategoriesDialog", addSubcategoriesDialog); provide("disabledDialog", disabledDialog); provide("detailsDialog", detailsDialog); @@ -117,7 +117,7 @@ provide("editDialog", editDialog); provide("deleteDialog", deleteDialog); provide("tableData", tableData); -provide("rowID", rowID); +provide("row", row); provide("changeState",()=>{ console.log(1111); }) diff --git a/src/component/humanResources/department.vue b/src/component/humanResources/department.vue index 23fc31a..f9a7005 100644 --- a/src/component/humanResources/department.vue +++ b/src/component/humanResources/department.vue @@ -9,14 +9,20 @@ import { ref, provide, onMounted } from 'vue'; import { getHumanResourcesDepartment } from '@/api/api'; import { FlatToTree } from '@/util/toTree'; import { deepClone } from '@/util/deepCode'; +import { computed } from '@vue/reactivity'; const addText = ref('添加部门'); let tableData = ref([ ]) +let respData = ref(); +const getData = () => { + getHumanResourcesDepartment().then((res)=>{ + respData.value = res.data.data.data; + tableData.value = FlatToTree(deepClone(res.data.data.data)).tree; + }) +} onMounted(async () => { - let data = (await getHumanResourcesDepartment()).data.data.data; - console.log(deepClone(data)); - tableData.value = FlatToTree(deepClone(data)).tree; + getData(); }) let tableType = ref([ @@ -63,21 +69,25 @@ let tableType = ref([ align: "center" }, { - name:'状态', - type:'state', - width:'120px', + name: '状态', + type: 'state', + width: '120px', } ] ); let operation = ref({ type: ["addSubcategories", "edit", "delete"], width: "220px" }); - - - - - - - +const addDept = ref(); +const addSubDept = ref(); +const editDept = computed({ + get: () => { + return row.value.departmentName; + }, + set: (val) => { + row.value.departmentName = val; + getData(); + } +}) @@ -99,7 +109,7 @@ const disabledDialog = ref(false); const detailsDialog = ref(false); const editDialog = ref(false); const deleteDialog = ref(false); -const rowID = ref(); +const row = ref(); provide("addSubcategoriesDialog", addSubcategoriesDialog); provide("disabledDialog", disabledDialog); provide("detailsDialog", detailsDialog); @@ -107,11 +117,11 @@ provide("editDialog", editDialog); provide("deleteDialog", deleteDialog); provide("tableData", tableData); -provide("rowID", rowID); +provide("row", row); provide("changeState", () => { console.log(1111); }) -provide("subString","子部门"); +provide("subString", "子部门"); provide("cellSetStyle", ({ row, column, rowIndex, columnIndex }) => { if (column.property === "state") { if (row.state == "正常") { @@ -140,16 +150,19 @@ provide("cellSetStyle", ({ row, column, rowIndex, columnIndex }) => { - + + - + + - + + - + diff --git a/src/component/main/header/add_download/downloadItem.vue b/src/component/main/header/add_download/downloadItem.vue index 3f8d793..74bcb13 100644 --- a/src/component/main/header/add_download/downloadItem.vue +++ b/src/component/main/header/add_download/downloadItem.vue @@ -1,14 +1,14 @@ diff --git a/src/component/main/header/add_download/downloadItem/item.vue b/src/component/main/header/add_download/downloadItem/item.vue index e65c9f6..2fdb1fa 100644 --- a/src/component/main/header/add_download/downloadItem/item.vue +++ b/src/component/main/header/add_download/downloadItem/item.vue @@ -1,19 +1,13 @@ diff --git a/src/component/main/tableList/table/operation/operations.vue b/src/component/main/tableList/table/operation/operations.vue index fec8c53..c9753bb 100644 --- a/src/component/main/tableList/table/operation/operations.vue +++ b/src/component/main/tableList/table/operation/operations.vue @@ -5,11 +5,11 @@ import detailss from './details.vue'; import disabled from './disabled.vue'; import addSubcategories from './addSubcategories.vue'; import { inject } from 'vue'; - +import { deepClone } from '../../../../../util/deepCode' const prop = defineProps<{ operationNul: { type: string[], width: string, coordin: Map> }, - row: number + row: {id:number} }>() const isExist = (tempString: string) => { if (prop.operationNul.type.includes(tempString)) { @@ -18,7 +18,7 @@ const isExist = (tempString: string) => { if(!prop.operationNul.coordin){ return false; } - if(prop.operationNul.coordin.get(prop.row)?.has(tempString)){ + if(prop.operationNul.coordin.get(prop.row.id)?.has(tempString)){ return true; } return false; @@ -28,9 +28,9 @@ const disabledDialog = inject("disabledDialog"); const detailsDialog = inject("detailsDialog"); const editDialog = inject("editDialog"); const deleteDialog = inject("deleteDialog"); -const rowID: any = inject("rowID"); +const row: any = inject("row"); const clickButton = (callback: Function) => { - rowID.value = prop.row; + row.value = deepClone(prop.row); callback(0); } diff --git a/src/component/main/tableList/table/table.vue b/src/component/main/tableList/table/table.vue index 54f84b3..e62e9dc 100644 --- a/src/component/main/tableList/table/table.vue +++ b/src/component/main/tableList/table/table.vue @@ -54,7 +54,7 @@ const changeState:any = inject("changeState"); diff --git a/src/util/message.js b/src/util/message.js new file mode 100644 index 0000000..4f6ec31 --- /dev/null +++ b/src/util/message.js @@ -0,0 +1,17 @@ +import { ElMessage } from 'element-plus' + +export function message(code){ + if (code === 10000) { + ElMessage({ + showClose: true, + message: '成功', + type: 'success', + }) + } else { + ElMessage({ + showClose: true, + message: '成功', + type: 'error', + }) + } +} \ No newline at end of file -- GitLab