From f6657e0c6b274e145cd5e6316a0f253d16763c07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E6=99=8F=E5=BD=AD?= <995457985@qq.com>
Date: Mon, 22 May 2023 17:09:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=94=BF?=
=?UTF-8?q?=E7=AD=96=E6=B3=95=E8=A7=84=E9=87=8D=E7=BD=AE=E5=92=8C=E5=8F=96?=
=?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/enterprise/notice/myReceive/index.scss | 2 +-
src/views/goverment/notice/myPosted/index.scss | 2 +-
src/views/goverment/notice/myReceive/index.scss | 2 +-
.../goverment/policyLows/releaseLows/index.vue | 8 +++++++-
.../userManagement/departmentManage/index.vue | 16 +++++++---------
src/views/project/notice/myReceive/index.scss | 2 +-
6 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/views/enterprise/notice/myReceive/index.scss b/src/views/enterprise/notice/myReceive/index.scss
index 70eae45..d05d0cf 100644
--- a/src/views/enterprise/notice/myReceive/index.scss
+++ b/src/views/enterprise/notice/myReceive/index.scss
@@ -5,7 +5,7 @@
height: 36px;
}
.el-table :deep(.el-table__inner-wrapper) {
- min-height: 140px;
+ min-height: 120px;
}
.list {
diff --git a/src/views/goverment/notice/myPosted/index.scss b/src/views/goverment/notice/myPosted/index.scss
index 70eae45..d05d0cf 100644
--- a/src/views/goverment/notice/myPosted/index.scss
+++ b/src/views/goverment/notice/myPosted/index.scss
@@ -5,7 +5,7 @@
height: 36px;
}
.el-table :deep(.el-table__inner-wrapper) {
- min-height: 140px;
+ min-height: 120px;
}
.list {
diff --git a/src/views/goverment/notice/myReceive/index.scss b/src/views/goverment/notice/myReceive/index.scss
index 70eae45..d05d0cf 100644
--- a/src/views/goverment/notice/myReceive/index.scss
+++ b/src/views/goverment/notice/myReceive/index.scss
@@ -5,7 +5,7 @@
height: 36px;
}
.el-table :deep(.el-table__inner-wrapper) {
- min-height: 140px;
+ min-height: 120px;
}
.list {
diff --git a/src/views/goverment/policyLows/releaseLows/index.vue b/src/views/goverment/policyLows/releaseLows/index.vue
index c43a784..99e2d1f 100644
--- a/src/views/goverment/policyLows/releaseLows/index.vue
+++ b/src/views/goverment/policyLows/releaseLows/index.vue
@@ -43,7 +43,8 @@
@@ -59,6 +60,7 @@ import { getDicList } from "@/api/modules/jxjview";
import Editor from "@/components/Editor/index.vue";
import { formData, onReset, rules, annexFileList } from "./index";
import { formDataType } from "./index";
+import router from "@/routers";
const store = GlobalStore();
const headers = ref({ Authorization: "Bearer " + store.token });
@@ -101,6 +103,10 @@ const onRemove: UploadProps["onRemove"] = (file, uploadFiles) => {
annexFileList.value = reactive([]);
};
+const onCancel = () => {
+ router.go(-1);
+};
+
// 标记表单文件上传校验
const confirm = async (formEl: FormInstance | undefined, params: any) => {
if (!formEl) return;
diff --git a/src/views/goverment/userManagement/departmentManage/index.vue b/src/views/goverment/userManagement/departmentManage/index.vue
index 523c6a5..6df7318 100644
--- a/src/views/goverment/userManagement/departmentManage/index.vue
+++ b/src/views/goverment/userManagement/departmentManage/index.vue
@@ -43,7 +43,7 @@
- 重置
+
保存
@@ -148,12 +148,10 @@ const initParam = reactive({
// 树形筛选切换
const changeTreeFilter = async (val: string) => {
- // const { result } = await getTableList({ deptId: val.data.deptId });
- // proTable.value.tableData = result.records;
- // proTable.value.pageable.total = +result.total;
initParam.deptId = val.data.deptId;
baseFrom.value = { ...val.data };
- console.log(baseFrom.value);
+ baseFrom.value.parentId = val.parent.data.deptName;
+ console.log(val);
};
// 表格配置项
@@ -406,7 +404,7 @@ const onSubmit = async () => {
// 修改数据按钮
const handleEditItem = async (index: number, row: any) => {
- const res1 = await getTreeList({ deptId: "" });
+ const res1 = await getTreeList({ deptId: "", status: 1 });
formConfig.formItemConfig[7].data = res1.result.map(i => {
return {
label: i.deptName,
@@ -426,7 +424,7 @@ const handleEditItem = async (index: number, row: any) => {
//新增部门的弹窗
const onAddDept = async () => {
// 获取最新的部门列表信息
- const res1 = await getTreeList({ deptId: "" });
+ const res1 = await getTreeList({ deptId: "", status: 1 });
formConfigDept.formItemConfig[0].data = res1.result.map(i => {
return {
label: i.deptName,
@@ -468,7 +466,7 @@ const handleSubmit = async form => {
const res = await getTreeDeptList();
proTree.value.treeAllData = res.result;
// 新增成功后刷新基本信息的上级部门的下拉框数据
- const res1 = await getTreeList({ deptId: "" });
+ const res1 = await getTreeList({ deptId: "", status: 1 });
treeDeptList.value = res1.result;
};
@@ -490,7 +488,7 @@ watch(
);
onMounted(async () => {
- const res1 = await getTreeList({ deptId: "" });
+ const res1 = await getTreeList({ deptId: "", status: 1 });
treeDeptList.value = res1.result;
const res = await getRoleNamelist({ state: 1 });
formConfig.formItemConfig[7].data = res1.result.map(i => {
diff --git a/src/views/project/notice/myReceive/index.scss b/src/views/project/notice/myReceive/index.scss
index 70eae45..d05d0cf 100644
--- a/src/views/project/notice/myReceive/index.scss
+++ b/src/views/project/notice/myReceive/index.scss
@@ -5,7 +5,7 @@
height: 36px;
}
.el-table :deep(.el-table__inner-wrapper) {
- min-height: 140px;
+ min-height: 120px;
}
.list {