From 61ce61386bbb5ac886fb1f577b1acd2d7a4fb0df Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 21 十二月 2022 11:29:24 +0800
Subject: [PATCH] fix：修改部门bug和对齐违规违建
---
src/views/operate/message/myIndex/update/index.vue | 616 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 458 insertions(+), 158 deletions(-)
diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index 76bddbc..fe819ed 100644
--- a/src/views/operate/message/myIndex/update/index.vue
+++ b/src/views/operate/message/myIndex/update/index.vue
@@ -1,179 +1,479 @@
<template>
- <div class="createUser">
- <main>
- <div class="mainContent">
- <el-form ref="user" label-width="140px" autoComplete="on" :model="role" :rules="createRoleRules"
- label-position="right">
- <!-- 鏍忕洰鍚嶇О -->
- <el-form-item class="optionItem" label="鏍忕洰鍚嶇О:" prop="name">
- <el-input v-model="role.name" placeholder="璇峰～鍐欐爮鐩悕绉�"></el-input>
- </el-form-item>
- <!-- 瑙掕壊鎻忚堪 -->
- <el-form-item class="optionItem" label="瑙掕壊鎻忚堪:" prop="description">
- <el-input type="textarea" :rows="5" maxlength="300" show-word-limit v-model="role.description"
- placeholder="璇疯緭鍏ユ弿杩板唴瀹�200瀛椾互鍐�"></el-input>
- </el-form-item>
- <el-form-item>
- <div class="optionBtn">
- <el-button class="btn cancel" @click.native.prevent="handleCancel">鍙栨秷</el-button>
- <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">纭畾
- </el-button>
- </div>
- </el-form-item>
- </el-form>
-
+ <div class="createUser">
+ <main>
+ <div class="mainContent">
+ <el-form
+ ref="user"
+ label-width="140px"
+ autoComplete="on"
+ :model="role"
+ :rules="createRoleRules"
+ label-position="right"
+ :disabled="type === 'view'"
+ >
+ <!-- 鎻愰啋鏂瑰紡 -->
+ <el-form-item class="optionItem" label="鎻愰啋鏂瑰紡:" prop="channelCode" >
+ <el-radio-group v-model="role.channelCode">
+ <el-radio label="01">绔欏唴淇�</el-radio>
+ <el-radio label="03">閭欢</el-radio>
+ </el-radio-group>
+ <span class="message-tip">(鐭俊鍙敤鏁�: 1000鏉�)</span>
+ </el-form-item>
+ <!-- 娑堟伅鏍忕洰 -->
+ <el-form-item
+ v-if="role.channelCode === '01'"
+ class="optionItem"
+ label="娑堟伅鏍忕洰:"
+ prop="messageType"
+ >
+ <div class="message-item">
+ <div class="message-item__left">
+ <el-select
+ v-model="role.messageType"
+ placeholder="璇烽�夋嫨娑堟伅鏍忕洰"
+ >
+ <el-option
+ v-for="item in colList"
+ :key="item.id"
+ :label="item.columnName"
+ :value="item.id"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ <span class="message-add" @click="dialogCreate = true">
+ 娣诲姞鏍忕洰</span
+ >
</div>
- </main>
- </div>
+ </el-form-item>
+ <!-- 娑堟伅鏍囬 -->
+ <el-form-item class="optionItems" label="娑堟伅鏍囬:" prop="head">
+ <div class="message-item__left">
+ <el-input
+ v-model="role.head"
+ placeholder="璇烽�夋嫨娑堟伅鏍囬"
+ ></el-input>
+ </div>
+ </el-form-item>
+ <!-- 鎺ユ敹瀵硅薄 -->
+ <el-form-item class="optionItem" label="鎺ユ敹瀵硅薄:" prop="targetTo">
+ <div class="message-item__left">
+ <el-select v-model="role.targetTo" placeholder="璇烽�夋嫨鎺ユ敹瀵硅薄">
+ <el-option :value="role.targetTo">
+ <el-tree
+ ref="tree"
+ :data="departList"
+ :props="defaultProps"
+ show-checkbox
+ @check="handleCheck"
+ default-expand-all
+ :default-checked-keys="checkedList"
+ node-key="id"
+ >
+ </el-tree>
+ </el-option>
+ </el-select>
+ </div>
+ </el-form-item>
+ <!-- 娑堟伅鍐呭 -->
+ <el-form-item class="optionItem" label="娑堟伅鍐呭:" prop="body">
+ <MyEditor ref="edit"></MyEditor>
+ </el-form-item>
+ <el-form-item>
+ <div class="optionBtn">
+ <el-button
+ type="primary"
+ @click.native.prevent="handleSubmit(0)"
+ class="btn save"
+ v-if="type !== 'view'"
+ >淇濆瓨
+ </el-button>
+ <el-button
+ type="primary"
+ @click.native.prevent="handleSubmit(1)"
+ class="btn submit"
+ v-if="type !== 'view'"
+ >鍙戝竷
+ </el-button>
+ <el-button
+ type="primary"
+ @click.native.prevent="handleView"
+ class="btn submit"
+ v-if="type !== 'view'"
+ >棰勮
+ </el-button>
+ <el-button class="btn cancel" @click.native.prevent="handleReset" v-if="type !== 'view'"
+ >閲嶇疆</el-button
+ >
+ </div>
+ </el-form-item>
+ </el-form>
+ <!-- 鏂板鏍忕洰 -->
+ <el-dialog
+ title="娣诲姞鏍忕洰"
+ :visible.sync="dialogCreate"
+ v-if="dialogCreate"
+ width="60%"
+ :before-close="handleConfirmClose"
+ append-to-body
+ >
+ <MyColumnAdd @closeDialog="closeDialog"></MyColumnAdd>
+ </el-dialog>
+ <!-- 棰勮娑堟伅 -->
+ <el-dialog
+ title="娑堟伅棰勮"
+ :visible.sync="dialogView"
+ v-if="dialogView"
+ width="60%"
+ :before-close="handleConfirmClose"
+ append-to-body
+ >
+ <MyColView :info="info" @closeDialog="closeDialog"></MyColView>
+ </el-dialog>
+ </div>
+ </main>
+ </div>
</template>
<script>
+import MyEditor from "@/components/edit";
+import MyColumnAdd from "@/views/operate/message/mycontrol/createUser";
+import MyColView from "../messageView";
+import { sendMessage, updateMessage, getMessageById } from "@/api/operate/messageManagement";
+
export default {
- data() {
- const validateNickname = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欐爮鐩悕绉�"));
- } else {
- callback();
+ components: { MyEditor, MyColumnAdd, MyColView },
+ props: ["type", "myDataRow"],
+ data() {
+ const validateEditor = (rule, value, callback) => {
+ if (value) {
+ callback();
+ } else {
+ callback(new Error('璇疯緭鍏�'));
+ }
+ };
+ return {
+ role: {
+ messageType: null,
+ head: "",
+ targetTo: "",
+ body: "",
+ channelCode: null,
+ },
+ createRoleRules: {
+ messageType: [
+ {
+ required: true,
+ trigger: ["blur", "change"],
+ message: "璇疯緭鍏ユ秷鎭爮鐩�",
+ },
+ ],
+ head: [{ required: true, trigger: "blur", message: "璇烽�夋嫨娑堟伅鏍囬" }],
+ targetTo: [
+ { required: true, trigger: "blur", message: "璇烽�夋嫨鎺ュ彈瀵硅薄" },
+ ],
+ body: [
+ {
+ required: true,
+ validator: validateEditor
+ },
+ ],
+ },
+ colList: [],
+ departList: [],
+ typeList: [],
+ dialogCreate: false,
+ dialogView: false,
+ defaultProps: {
+ children: "children",
+ label: "departName",
+ },
+ checkedList: [],
+ tempNameArr: [],
+ info: {},
+ sendUser: "",
+ };
+ },
+ created() {
+ this.getColumnList();
+ this.getDepartList();
+ this.getLoginUserInfo();
+ if (this.type !== "create" && this.myDataRow) {
+ getMessageById(this.myDataRow.id)
+ .then(res => {
+ this.role = res;
+ if (res.targetTo) {
+ this.checkedList = res.targetTo.split(',');
+ this.role.targetTo = `${this.checkedList.length}浜篳;
}
- };
- const validateTruename = (rule, value, callback) => {
- if (value) {
- callback();
- } else {
- // const rep = /^[\u4E00-\u9FA5]{2,4}$/;
- // if (!rep.test(value)) {
- // callback("璇疯緭鍏ユ纭殑鐢ㄦ埛濮撳悕");
- // }
- callback();
- }
- };
- return {
- role: {
- name: '',
- description: '',
- },
- createRoleRules: {
- name: [
- { required: true, trigger: "blur", validator: validateNickname },
- ],
- description: [
- { required: false, trigger: "blur", validator: validateTruename },
- ],
- },
- typeList: [],
+ })
+ .catch(err => this.$message.error(`${err}`))
+ }
+ },
+ mounted() {
+ if (this.type !== 'create') {
+ this.$refs.edit.editor.txt.append(this.myDataRow.body);
+ }
+
+ },
+ methods: {
+ // 鍏抽棴寮圭獥
+ handleConfirmClose(done) {
+ this.$confirm("纭鍏抽棴?").then((_) => {
+ done();
+ });
+ },
+
+ // 鑾峰彇鏍忕洰
+ async getColumnList() {
+ await this.$axios({
+ method: "get",
+ url: "sccg/message_column/getShowColumn",
+ }).then((res) => {
+ this.colList = res.data;
+ });
+ },
+ // 鍏抽棴寮圭獥
+ closeDialog({ flag, index }) {
+ this.dialogCreate = flag;
+ if (index === 1) {
+ // 閲嶆柊璁剧疆鏍忕洰
+ this.getColumnList();
+ }
+ },
+ getType(){
+ return this.type;
+ },
+ // 鑾峰彇閮ㄩ棬鏍�
+ async getDepartList() {
+ await this.$axios({
+ method: "get",
+ url: "sccg/depart/tree",
+ }).then((res) => {
+ res.data.forEach((item) => {
+ this.departList.push(this.setChildren(item));
+ });
+ });
+ },
+
+ // 閫掑綊children
+ setChildren(obj) {
+ if (obj.children !== null) {
+ if (obj.children.length !== 0) {
+ obj.children.forEach((item) => {
+ return this.setChildren(item);
+ });
}
- },
- created() {
- },
- methods: {
- handleUser() {
- this.$refs['user'].validate((valid) => {
- console.log(valid);
- if (valid) {
- const { role } = this;
- console.log(role);
- this.$axios({
- method: 'post',
- url: 'sccg/message_column/addColumn',
- data: {
- columnName: role.name,
- createUser: 3,
- description: role.description,
- isShow: 0,
- }
- })
- .then(res=>{
- if(res.code === 200){
- this.$message({
- type:'success',
- message:'娣诲姞鎴愬姛'
- })
- this.$emit('closeDialog',{flag:false,index:1});
- }else{
- this.$message({
- type:'error',
- message:res.message
- })
- }
- })
- } else {
- return false;
- }
- })
- },
- // 鍏抽棴寮圭獥
- handleCancel(){
- this.$emit('closeDialog',{flag:false,index:0});
+ } else {
+ if (obj.userInfoDTOS.length !== 0) {
+ obj.children = [];
+ obj.userInfoDTOS.forEach((item) => {
+ obj.children.push({ id: item.userId, departName: item.username });
+ });
}
+ }
+ return obj;
},
- props: ['closeDialog']
-}
+
+ // 閫変腑id
+ handleCheck(data, node) {
+ const checkedNodes = node.checkedNodes.filter(item => !item.children);
+ this.checkedList = checkedNodes.map(item => item.id);
+ this.tempNameArr = checkedNodes.map(item => item.departName);
+ this.role.targetTo = this.checkedList.length ? this.checkedList.length + "浜�" : null;
+ },
+
+ // 鏂板缓/淇濆瓨娑堟伅(1:鏂板缓,0淇濆瓨娑堟伅)
+ handleSubmit(mystatus) {
+ this.role.body = this.$refs.edit.editor.txt.html();
+ this.$refs.user.validate((valid) => {
+ if (valid) {
+ const { body, head, messageType, channelCode } = this.role;
+ const params = {
+ body,
+ head,
+ messageType,
+ channelCode: `${channelCode}`,
+ sendTime: new Date(),
+ targetTo: this.checkedList.join(","),
+ status: mystatus,
+ };
+ if (this.role.channelCode === '03') {
+ delete params.messageType;
+ }
+ if (this.type === "create") {
+ sendMessage(params)
+ .then(() => {
+ this.$emit("closeMyDialog");
+ this.$message({ type: "success", message: "鎿嶄綔鎴愬姛" });
+ })
+ .catch((err) =>
+ this.$message({
+ type: "error",
+ message: err.data || err.message,
+ })
+ );
+ } else {
+ updateMessage({ id: this.myDataRow.id, ...params })
+ .then(() => {
+ this.$emit("closeMyDialog");
+ this.$message({ type: "success", message: "鎿嶄綔鎴愬姛" });
+ })
+ .catch((err) =>
+ this.$message({
+ type: "error",
+ message: err.data || err.message,
+ })
+ );
+ }
+ } else {
+ this.$message.error({ type: "warning", message: "璇锋鏌ュ繀濉」" });
+ }
+ });
+ },
+
+ // 閲嶇疆琛ㄥ崟
+ handleReset() {
+ this.$refs.edit.editor.txt.clear();
+ this.$refs.user.resetFields();
+ },
+
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅
+ getLoginUserInfo() {
+ const name = sessionStorage.getItem("name");
+ this.$axios({
+ method: "get",
+ url: "sccg/admin/info?name=" + name,
+ }).then((res) => {
+ this.role.targetFrom = res.data.userId;
+ this.sendUser = res.data.username;
+ });
+ },
+
+ // 娑堟伅棰勮
+ handleView() {
+ this.role.body = this.$refs.edit.editor.txt.html();
+ this.$refs.user.validate((valid) => {
+ if (valid) {
+ const { body, head, channelCode } = this.role;
+ this.dialogView = true;
+ this.info = {
+ body,
+ head,
+ channelCode:
+ channelCode === "01"
+ ? "绔欏唴淇�"
+ : channelCode === "03"
+ ? "閭欢"
+ : "鐭俊",
+ messageType: this.role.messageType,
+ targetTo: this.tempNameArr,
+ targetFrom: this.sendUser
+ };
+ } else {
+ this.$message({ type: "warning", message: "璇锋鏌ュ繀濉」" });
+ }
+ });
+ }
+ },
+};
</script>
<style lang="scss" scoped>
.createUser {
- border-radius: 1px;
+ border-radius: 1px;
+ background-color: #09152f;
+
+ main {
+ text-align: left;
+ padding: 0 55px;
background-color: #09152f;
- main {
- text-align: left;
- padding: 0 55px;
+ .mainContent {
+ display: flex;
+ justify-content: center;
+ padding-top: 50px;
+ &:deep(.el-dialog__title) {
+ color: #4b9bb7;
+ }
+ &::v-deep .el-form-item__label {
+ color: #4b9bb7;
+ }
+
+ &::v-deep .el-input__inner {
+ width: 400px;
background-color: #09152f;
- padding-bottom: 50px;
+ border: 1px solid #17324c;
+ }
- .mainContent {
- display: flex;
- justify-content: center;
- padding-top: 50px;
+ .message-item__left {
+ width: 400px;
+ }
- &::v-deep .el-form-item__label {
- color: #4b9bb7;
- }
-
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-
- &::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-
- :deep(.el-input__count) {
- background-color: #09152f;
- }
-
- .el-form-item__content {
- width: 400px;
-
- .el-select {
- width: 100%;
- }
- }
-
- .optionHandleSp {
- display: flex;
-
- .areaNumber,
- .moreNumber {
- flex: 1;
- }
-
- .telNumber {
- flex: 2;
- }
- }
-
- .optionBtn {
- display: flex;
- margin-top: 20px;
-
- .btn {
- padding: 12px 50px;
- }
- }
-
+ .message-add {
+ &:hover {
+ cursor: pointer;
}
+ }
+
+ .el-form-item__content :deep(.el-select) {
+ width: 400px;
+ }
+
+ :deep(.el-input) {
+ width: 400px;
+ }
+
+ .message-item {
+ display: flex;
+
+ span {
+ margin-left: 20px;
+ color: #4b9bb7;
+ }
+ }
+
+ .message-tip {
+ margin-left: 20px;
+ }
+
+ :deep(.el-input--suffix) {
+ width: 400px;
+ }
+
+ &::v-deep .el-textarea__inner {
+ background-color: #09152f;
+ border: 1px solid #17324c;
+ }
+
+ .el-form-item__content {
+ width: 400px;
+
+ .el-select {
+ width: 100%;
+ }
+ }
+
+ .optionHandleSp {
+ display: flex;
+
+ .areaNumber,
+ .moreNumber {
+ flex: 1;
+ }
+
+ .telNumber {
+ flex: 2;
+ }
+ }
+
+ .optionBtn {
+ display: flex;
+ margin-top: 20px;
+
+ .btn {
+ padding: 12px 50px;
+ }
+ }
}
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0