diff --git a/src/assets/img/project/select-staff/arrow-down.png b/src/assets/img/project/select-staff/arrow-down.png new file mode 100644 index 00000000..81ea3f7d Binary files /dev/null and b/src/assets/img/project/select-staff/arrow-down.png differ diff --git a/src/assets/img/project/select-staff/arrow-right.png b/src/assets/img/project/select-staff/arrow-right.png new file mode 100644 index 00000000..01bf885d Binary files /dev/null and b/src/assets/img/project/select-staff/arrow-right.png differ diff --git a/src/assets/img/project/select-staff/arrow2-right.png b/src/assets/img/project/select-staff/arrow2-right.png new file mode 100644 index 00000000..1f967cdd Binary files /dev/null and b/src/assets/img/project/select-staff/arrow2-right.png differ diff --git a/src/assets/img/project/select-staff/arrow3-left.png b/src/assets/img/project/select-staff/arrow3-left.png new file mode 100644 index 00000000..0eef456d Binary files /dev/null and b/src/assets/img/project/select-staff/arrow3-left.png differ diff --git a/src/assets/img/project/select-staff/arrow4-down.png b/src/assets/img/project/select-staff/arrow4-down.png new file mode 100644 index 00000000..104b1acf Binary files /dev/null and b/src/assets/img/project/select-staff/arrow4-down.png differ diff --git a/src/assets/img/project/select-staff/btn-add.png b/src/assets/img/project/select-staff/btn-add.png new file mode 100644 index 00000000..140885be Binary files /dev/null and b/src/assets/img/project/select-staff/btn-add.png differ diff --git a/src/assets/img/project/select-staff/btn-more.png b/src/assets/img/project/select-staff/btn-more.png new file mode 100644 index 00000000..714c4079 Binary files /dev/null and b/src/assets/img/project/select-staff/btn-more.png differ diff --git a/src/assets/img/project/select-staff/checked.png b/src/assets/img/project/select-staff/checked.png new file mode 100644 index 00000000..a66646cb Binary files /dev/null and b/src/assets/img/project/select-staff/checked.png differ diff --git a/src/assets/img/project/select-staff/close.png b/src/assets/img/project/select-staff/close.png new file mode 100644 index 00000000..a77645b3 Binary files /dev/null and b/src/assets/img/project/select-staff/close.png differ diff --git a/src/assets/img/project/select-staff/close2.png b/src/assets/img/project/select-staff/close2.png new file mode 100644 index 00000000..eebdfd7f Binary files /dev/null and b/src/assets/img/project/select-staff/close2.png differ diff --git a/src/assets/img/project/select-staff/edit.png b/src/assets/img/project/select-staff/edit.png new file mode 100644 index 00000000..d34b2eec Binary files /dev/null and b/src/assets/img/project/select-staff/edit.png differ diff --git a/src/assets/img/project/select-staff/f5.png b/src/assets/img/project/select-staff/f5.png new file mode 100644 index 00000000..439b0f3f Binary files /dev/null and b/src/assets/img/project/select-staff/f5.png differ diff --git a/src/assets/img/project/select-staff/house.png b/src/assets/img/project/select-staff/house.png new file mode 100644 index 00000000..17dab895 Binary files /dev/null and b/src/assets/img/project/select-staff/house.png differ diff --git a/src/assets/img/project/select-staff/nothing.png b/src/assets/img/project/select-staff/nothing.png new file mode 100644 index 00000000..f1407a7e Binary files /dev/null and b/src/assets/img/project/select-staff/nothing.png differ diff --git a/src/assets/img/project/select-staff/phone.png b/src/assets/img/project/select-staff/phone.png new file mode 100644 index 00000000..9b1072e5 Binary files /dev/null and b/src/assets/img/project/select-staff/phone.png differ diff --git a/src/assets/img/project/select-staff/pos.png b/src/assets/img/project/select-staff/pos.png new file mode 100644 index 00000000..578dcaa2 Binary files /dev/null and b/src/assets/img/project/select-staff/pos.png differ diff --git a/src/assets/img/project/select-staff/rhombus.png b/src/assets/img/project/select-staff/rhombus.png new file mode 100644 index 00000000..cfef37ff Binary files /dev/null and b/src/assets/img/project/select-staff/rhombus.png differ diff --git a/src/assets/img/project/select-staff/rotate.png b/src/assets/img/project/select-staff/rotate.png new file mode 100644 index 00000000..91bef26c Binary files /dev/null and b/src/assets/img/project/select-staff/rotate.png differ diff --git a/src/assets/img/project/select-staff/select.png b/src/assets/img/project/select-staff/select.png new file mode 100644 index 00000000..67f00c52 Binary files /dev/null and b/src/assets/img/project/select-staff/select.png differ diff --git a/src/assets/img/project/select-staff/selected.png b/src/assets/img/project/select-staff/selected.png new file mode 100644 index 00000000..f1952432 Binary files /dev/null and b/src/assets/img/project/select-staff/selected.png differ diff --git a/src/assets/img/project/select-staff/selected2.png b/src/assets/img/project/select-staff/selected2.png new file mode 100644 index 00000000..ad3e0dd3 Binary files /dev/null and b/src/assets/img/project/select-staff/selected2.png differ diff --git a/src/assets/img/project/select-staff/sort1.png b/src/assets/img/project/select-staff/sort1.png new file mode 100644 index 00000000..c001250d Binary files /dev/null and b/src/assets/img/project/select-staff/sort1.png differ diff --git a/src/assets/img/project/select-staff/sort2.png b/src/assets/img/project/select-staff/sort2.png new file mode 100644 index 00000000..3e1b56d0 Binary files /dev/null and b/src/assets/img/project/select-staff/sort2.png differ diff --git a/src/assets/img/project/select-staff/sort3.png b/src/assets/img/project/select-staff/sort3.png new file mode 100644 index 00000000..de0f2709 Binary files /dev/null and b/src/assets/img/project/select-staff/sort3.png differ diff --git a/src/assets/img/project/select-staff/staff-default-avatar-boy.png b/src/assets/img/project/select-staff/staff-default-avatar-boy.png new file mode 100644 index 00000000..c7e813d3 Binary files /dev/null and b/src/assets/img/project/select-staff/staff-default-avatar-boy.png differ diff --git a/src/assets/img/project/select-staff/staff-default-avatar-girl.png b/src/assets/img/project/select-staff/staff-default-avatar-girl.png new file mode 100644 index 00000000..8b8f2426 Binary files /dev/null and b/src/assets/img/project/select-staff/staff-default-avatar-girl.png differ diff --git a/src/assets/img/project/select-staff/staff-default-avatar.png b/src/assets/img/project/select-staff/staff-default-avatar.png new file mode 100644 index 00000000..c7e813d3 Binary files /dev/null and b/src/assets/img/project/select-staff/staff-default-avatar.png differ diff --git a/src/assets/img/project/select-staff/user-add.png b/src/assets/img/project/select-staff/user-add.png new file mode 100644 index 00000000..6289b0b3 Binary files /dev/null and b/src/assets/img/project/select-staff/user-add.png differ diff --git a/src/assets/img/project/select-staff/xuncha.png b/src/assets/img/project/select-staff/xuncha.png new file mode 100644 index 00000000..e5f39de2 Binary files /dev/null and b/src/assets/img/project/select-staff/xuncha.png differ diff --git a/src/assets/scss/c/function.scss b/src/assets/scss/c/function.scss index 74b02097..08686f38 100644 --- a/src/assets/scss/c/function.scss +++ b/src/assets/scss/c/function.scss @@ -57,13 +57,13 @@ transform: translate(-50%, -50%); } // 已知高度的容器在页面中水平垂直居中 -@mixin hub($w, $h) { +@mixin hub { position: absolute; - top: 50%; - left: 50%; - width: $w; - height: $h; - margin: -$h * 0.5 0 0 -$w * 0.5; + top: 0; + bottom: 0; + left: 0; + right: 0; + margin: auto; } // 未知高度容器在页面居中,父元素必须相对定位 @mixin hub2($sel, $w, $h) { diff --git a/src/utils/deepClone.js b/src/utils/deepClone.js new file mode 100644 index 00000000..eaae9761 --- /dev/null +++ b/src/utils/deepClone.js @@ -0,0 +1,10 @@ +/** + * 深度克隆 + */ +export default function(arg) { + if (typeof arg == 'object' || typeof arg == 'array') { + return JSON.parse(JSON.stringify(arg)); + } else { + return arg; + } +} diff --git a/src/views/components/selectStaff.vue b/src/views/components/selectStaff.vue new file mode 100644 index 00000000..f0627597 --- /dev/null +++ b/src/views/components/selectStaff.vue @@ -0,0 +1,1362 @@ + + + + + + + + + 确定 + + + + + + + 选中 + + + + + + 上级组织 + + + {{ item.agencyName }} + + + + (已选{{ item.selectedTotal }}人) + + + + 我所在的 + + {{ agency.agencyName }} + + + + (已选{{ agency.selectedTotal }}人) + + + + 下级组织 + + + {{ item.agencyName }} + + + + (已选{{ item.selectedTotal }}人) + + + + 加载中…… + + + + 加载中…… + + 暂无可选人员 + + + + + 组织工作人员 + + + + + + + + + + + + + {{ item.staffName }} + {{ + item.roleName + }} + + + + + + + + + + + + + 部门 + + + + + + + + {{ department.departmentName }} + + + + + + + + + + + + + {{ item.staffName }} + {{ + item.roleName + }} + + + + + + + + + + + + + 网格 + + + + + + + + {{ grid.gridName }} + + + + + + + + + + + + + {{ item.staffName }} + {{ + item.roleName + }} + + + + + + + + + + + + diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue index ea9ea60e..8378e920 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue @@ -100,7 +100,7 @@ - + + + + + (fmData.staffList = ret)" + @close="visibleStaffPanel = false" + /> + + + + 点击选择 + 已选 {{ fmData.staffList.length }} 人 + + + + import { requestPost } from "@/js/dai/request"; import foldText from "@/views/components/foldText"; +import selectStaff from "@/views/components/selectStaff"; import issueInfo from "./issue-info"; import eventInfo from "./event-info"; import projectEvaluation from "./project-evaluation"; @@ -370,7 +402,10 @@ function iniData() { projectProcessId: "", closedStatus: "", + + staffList: "", }, + visibleStaffPanel: false, myDepartmentList: [], assistanceUnitList: [], @@ -470,6 +505,7 @@ export default { issueInfo, eventInfo, projectEvaluation, + selectStaff, }, data: iniData, @@ -485,7 +521,7 @@ export default { { required: true, message: "处理方式不能为空", trigger: "blur" }, ], projectStaffId: [ - { required: true, message: "请选择处理部门", trigger: "blur" }, + { required: true, message: "请选择您的身份", trigger: "blur" }, ], }; })(); @@ -497,6 +533,10 @@ export default { obj.closedStatus = [ { required: true, message: "请选择结案状态", trigger: "blur" }, ]; + } else if (operateType == "turn") { + obj.staffList = [ + { required: true, message: "请选择处理部门", trigger: "blur" }, + ]; } else { obj.internalRemark = [ { required: true, message: "请填写内部备注", trigger: "blur" }, @@ -610,7 +650,7 @@ export default { this.submitDispose(); } else if (operateType == "close") { this.submitClose(); - } else if (operateType == "trun") { + } else if (operateType == "turn") { this.submitTurn(); } else if (operateType == "back") { this.submitBack(); @@ -690,7 +730,7 @@ export default { //加载组织数据 async submitTurn() { - const url = "/gov/project/trace/return-v2"; + const url = "/gov/project/trace/transfer-v2"; const { fmData } = this; const loading = this.$loading({ @@ -708,6 +748,7 @@ export default { projectStaffId: fmData.projectStaffId, publicReply: fmData.publicReply, internalFile: fmData.internalFile, + staffList: fmData.staffList, }); loading.close();