From 119fbfc8bd44ec224b39ae2fb310575ecf6d0cb7 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 17 Oct 2024 19:38:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3-?= =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E9=A1=B9=E7=9B=AE=E9=83=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login.vue | 4 +- src/views/process/branchPro/index.vue | 73 ++++++++++++++------ src/views/process/branchProExamine/index.vue | 67 ++++++++++++------ src/views/process/roles/index.vue | 4 +- src/views/process/rolesExamine/index.vue | 1 + src/views/process/rolesRemind/index.vue | 1 + 6 files changed, 105 insertions(+), 45 deletions(-) diff --git a/src/views/login.vue b/src/views/login.vue index c0c131b..1dee47c 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -72,8 +72,8 @@ export default { return { codeUrl: "", loginForm: { - username: "admin", - password: "admin123", + username: "15240004260", + password: "YNsbd@123456", rememberMe: false, code: "", uuid: "" diff --git a/src/views/process/branchPro/index.vue b/src/views/process/branchPro/index.vue index d049e3e..08e0095 100644 --- a/src/views/process/branchPro/index.vue +++ b/src/views/process/branchPro/index.vue @@ -35,7 +35,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - + v-hasPermi="['dept:org:add']" >新增 @@ -46,6 +46,7 @@ icon="el-icon-download" size="mini" @click="handleExport" + v-hasPermi="['dept:org:export']" >导出 @@ -56,6 +57,7 @@ icon="el-icon-s-custom" size="mini" @click="allocation" + v-hasPermi="['dept:org:all']" >权限分配 @@ -91,6 +93,7 @@ type="text" icon="el-icon-search" @click="detailsUpdate(scope.row)" + v-hasPermi="['dept:org:query']" >详情 修改 撤回 删除 @@ -148,17 +154,29 @@ - - + + + + - + + + @@ -285,6 +303,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import {treeselect as staffTreeselect} from "@/api/process/tree"; import {exportSubOrg} from "@/api/process/branchProExamine"; import {downloadFile} from "@/utils/download"; +import {getPersonSelect} from "@/api/system/userInfo"; export default { name: "BranchPro", @@ -321,7 +340,7 @@ export default { orgName: [ {required: true, message: "部门名称不能为空", trigger: "blur"} ], - orgHeadUserId: [ + orgHeadUserIdList: [ {required: true, message: "部门负责人不能为空", trigger: "blur"} ], attendanceUserId: [ @@ -414,10 +433,17 @@ export default { oldOrgName: [], }; }, - created() { + mounted() { this.getList(); + this.getPersonSelect(); }, methods: { + /** 人员选择下拉 */ + getPersonSelect() { + getPersonSelect().then(response => { + this.personOptions=response.data + }); + }, /** 查询列表 */ getList() { this.loading = true; @@ -442,6 +468,7 @@ export default { attendanceUserId: undefined, attendanceUserName: undefined, orgHeadUserId: undefined, + orgHeadUserIdList: [], orgHeadUserName: undefined, province: undefined, isProvince: "1", @@ -479,12 +506,7 @@ export default { await listDept().then(response => { this.deptOptions = this.handleTree(response.data, "id"); }); - /** - * 项目部负责人 - */ - await orgPersonSelect().then(response => { - this.personOptions = this.changeData(response.data); - }); + /** 人员 */ this.getStaffTreeselect("-1", "1", "", "manager"); @@ -526,14 +548,18 @@ export default { this.form = response.data; this.oldOrgName = row.orgName + if(!this.form.parentId){ + this.form.parentId=0 + } + if(this.form.orgHeadUserId!=null){ + let arr = this.form.orgHeadUserId.split(',') + this.$set(this.form,"orgHeadUserIdList",arr) + } + listDept().then(response => { this.deptOptions = this.handleTree(response.data, "id"); }); - orgPersonSelect().then(response => { - this.personOptions = this.changeData(response.data); - }); - /** 人员 */ this.getStaffTreeselect(ids, "1", "", "manager"); this.getStaffTreeselect(ids, "2", "", "safety"); @@ -592,12 +618,16 @@ export default { const ids = row.id getType(ids).then(response => { this.form = response.data; + if(!this.form.parentId){ + this.form.parentId=0 + } + if(this.form.orgHeadUserId!=null){ + let arr = this.form.orgHeadUserId.split(',') + this.$set(this.form,"orgHeadUserIdList",arr) + } listDept().then(response => { this.deptOptions = this.handleTree(response.data, "id"); }); - orgPersonSelect().then(response => { - this.personOptions = this.changeData(response.data); - }); /** 人员 */ this.getStaffTreeselect(ids, "1", "", "manager"); @@ -653,6 +683,7 @@ export default { this.$refs["form"].validate(valid => { console.log(this.form); if (valid) { + this.form.orgHeadUserId=this.form.orgHeadUserIdList.join(','); let managerIds = this.form.managerId; let safetyIds = this.form.safetyId; diff --git a/src/views/process/branchProExamine/index.vue b/src/views/process/branchProExamine/index.vue index 2eabff9..ce47f33 100644 --- a/src/views/process/branchProExamine/index.vue +++ b/src/views/process/branchProExamine/index.vue @@ -41,6 +41,7 @@ icon="el-icon-download" size="mini" @click="handleExport" + v-hasPermi="['dept:org:export']" >导出 @@ -77,6 +78,7 @@ type="text" icon="el-icon-search" @click="detailsUpdate(scope.row)" + v-hasPermi="['dept:org:query']" >详情 审核 @@ -117,16 +120,28 @@ - - + + + + - + + + @@ -253,6 +268,7 @@ import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import {treeselect as staffTreeselect} from "@/api/process/tree"; import {downloadFile} from "@/utils/download"; +import {getPersonSelect} from "@/api/system/userInfo"; export default { name: "BranchPro", @@ -291,7 +307,7 @@ export default { orgName: [ {required: true, message: "部门名称不能为空", trigger: "blur"} ], - orgHeadUserId: [ + orgHeadUserIdList: [ {required: true, message: "部门负责人不能为空", trigger: "blur"} ], attendanceUserId: [ @@ -386,8 +402,17 @@ export default { this.queryParams.applyName=this.$route.query.param } this.getList(); + this.getPersonSelect(); }, + + methods: { + /** 人员选择下拉 */ + getPersonSelect() { + getPersonSelect().then(response => { + this.personOptions=response.data + }); + }, /** 查询列表 */ getList() { this.loading = true; @@ -412,6 +437,7 @@ export default { attendanceUserId: undefined, attendanceUserName: undefined, orgHeadUserId: undefined, + orgHeadUserIdList: [], orgHeadUserName: undefined, province: undefined, applyName: undefined, @@ -463,17 +489,18 @@ export default { await getType(ids).then(response => { this.form = response.data; + if(!this.form.parentId){ + this.form.parentId=0 + } + if(this.form.orgHeadUserId!=null){ + let arr = this.form.orgHeadUserId.split(',') + this.$set(this.form,"orgHeadUserIdList",arr) + } + listDept().then(response => { this.deptOptions = this.handleTree(response.data, "id"); }); - /** - * 项目部负责人 - */ - orgPersonSelect().then(response => { - this.personOptions = this.changeData(response.data); - }); - /** 人员 */ this.getStaffTreeselect(ids, "1", "", "manager"); this.getStaffTreeselect(ids, "2", "", "safety"); @@ -530,17 +557,17 @@ export default { const ids = row.id getType(ids).then(response => { this.form = response.data; + if(!this.form.parentId){ + this.form.parentId=0 + } + if(this.form.orgHeadUserId!=null){ + let arr = this.form.orgHeadUserId.split(',') + this.$set(this.form,"orgHeadUserIdList",arr) + } listDept().then(response => { this.deptOptions = this.handleTree(response.data, "id"); }); - /** - * 项目部负责人 - */ - orgPersonSelect().then(response => { - this.personOptions = this.changeData(response.data); - }); - /** 人员 */ this.getStaffTreeselect(ids, "1", "", "manager"); this.getStaffTreeselect(ids, "2", "", "safety"); diff --git a/src/views/process/roles/index.vue b/src/views/process/roles/index.vue index c3a20e5..db67af3 100644 --- a/src/views/process/roles/index.vue +++ b/src/views/process/roles/index.vue @@ -66,7 +66,7 @@ icon="el-icon-edit" v-if="scope.row.reviewerStatus == null" @click="handleAllocation(scope.row)" - + v-hasPermi="['dept:role:edit']" >分配人员 人员变更 diff --git a/src/views/process/rolesExamine/index.vue b/src/views/process/rolesExamine/index.vue index 46d3b20..9756cf3 100644 --- a/src/views/process/rolesExamine/index.vue +++ b/src/views/process/rolesExamine/index.vue @@ -65,6 +65,7 @@ type="text" icon="el-icon-edit" @click="handleAllocation(scope.row)" + v-hasPermi="['dept:check:edit']" >审核 diff --git a/src/views/process/rolesRemind/index.vue b/src/views/process/rolesRemind/index.vue index 3108b98..8847ad6 100644 --- a/src/views/process/rolesRemind/index.vue +++ b/src/views/process/rolesRemind/index.vue @@ -58,6 +58,7 @@ icon="el-icon-edit" v-if="scope.row.reviewerStatus == null" @click="handleAllocation(scope.row)" + v-hasPermi="['dept:role:edit']" >分配人员 From 68d450652427da64c043087e6a746eef3258161a Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Thu, 17 Oct 2024 20:18:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=AB=E5=A4=A7=E5=91=98=EF=BC=8C?= =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=98=8E=E7=BB=86=E4=BF=AE=E6=94=B9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eightMembers/partTimeSituation.vue | 2 +- src/views/report/attReport/record.vue | 107 ++++++++++++++++-- 2 files changed, 98 insertions(+), 11 deletions(-) diff --git a/src/views/process/eightMembers/partTimeSituation.vue b/src/views/process/eightMembers/partTimeSituation.vue index 64138d0..26a2aac 100644 --- a/src/views/process/eightMembers/partTimeSituation.vue +++ b/src/views/process/eightMembers/partTimeSituation.vue @@ -72,7 +72,7 @@ @@ -210,9 +288,11 @@ export default { title: "", // 是否显示弹出层 open: false, + openReason: false, dialogList:[], // 日期范围 dateRange: this.getDefaultDateRange(), + reasonStr:undefined, deptOptions: [], // 查询参数 queryParams: { @@ -280,7 +360,6 @@ export default { }, /** 重置按钮操作 */ resetQuery() { - this.dateRange = []; this.resetForm("queryForm"); this.handleQuery(); }, @@ -350,6 +429,14 @@ export default { } }); }, + reasonDialog(reason){ + this.reasonStr=reason + this.openReason = true; + this.title="原因说明"; + }, + cancelRecord(){ + this.openReason = false; + }, /** 导出按钮操作 */ handleExport() { this.download('system/dict/type/export', {