From fb1d57f4bce31fe4f8147a144f8ef4afbca0a4cd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 二月 2023 13:48:29 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/message/myIndex/update/index.vue | 91 ++++++++++++++++++++++++++++++++-------------
1 files changed, 65 insertions(+), 26 deletions(-)
diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index 9ea2741..6d8400a 100644
--- a/src/views/operate/message/myIndex/update/index.vue
+++ b/src/views/operate/message/myIndex/update/index.vue
@@ -9,7 +9,7 @@
:model="role"
:rules="createRoleRules"
label-position="right"
- :disabled="edit"
+ :disabled="type === 'view'"
>
<!-- 鎻愰啋鏂瑰紡 -->
<el-form-item class="optionItem" label="鎻愰啋鏂瑰紡:" prop="channelCode" >
@@ -85,24 +85,24 @@
type="primary"
@click.native.prevent="handleSubmit(0)"
class="btn save"
- v-if="this.type=='update'||this.type=='create'"
+ v-if="type !== 'view'"
>淇濆瓨
</el-button>
<el-button
type="primary"
@click.native.prevent="handleSubmit(1)"
class="btn submit"
- v-if="this.type=='update'||this.type=='create'"
+ v-if="type !== 'view'"
>鍙戝竷
</el-button>
<el-button
type="primary"
@click.native.prevent="handleView"
class="btn submit"
- v-if="this.type=='update'||this.type=='create'"
+ v-if="type !== 'view'"
>棰勮
</el-button>
- <el-button class="btn cancel" @click.native.prevent="handleReset" v-if="this.type=='update'||this.type=='create'"
+ <el-button class="btn cancel" @click.native.prevent="handleReset" v-if="type !== 'view'"
>閲嶇疆</el-button
>
</div>
@@ -138,7 +138,7 @@
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";
+import { sendMessage, updateMessage, getMessageById,saveMessage } from "@/api/operate/messageManagement";
export default {
components: { MyEditor, MyColumnAdd, MyColView },
@@ -178,7 +178,6 @@
},
],
},
- edit: false,
colList: [],
departList: [],
typeList: [],
@@ -198,16 +197,13 @@
this.getColumnList();
this.getDepartList();
this.getLoginUserInfo();
- if(this.type=="view"){
- this.edit=true;
- }
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}浜篳;
+ this.role.targetTo = `${this.checkedList.length}浜篳;
}
})
.catch(err => this.$message.error(`${err}`))
@@ -217,7 +213,7 @@
if (this.type !== 'create') {
this.$refs.edit.editor.txt.append(this.myDataRow.body);
}
-
+
},
methods: {
// 鍏抽棴寮圭獥
@@ -231,7 +227,7 @@
async getColumnList() {
await this.$axios({
method: "get",
- url: "sccg/message_column/getShowColumn",
+ url: "sccg/message_column/show ",
}).then((res) => {
this.colList = res.data;
});
@@ -291,7 +287,8 @@
this.role.body = this.$refs.edit.editor.txt.html();
this.$refs.user.validate((valid) => {
if (valid) {
- const { body, head, messageType, channelCode } = this.role;
+ if(mystatus==1){
+ const { body, head, messageType, channelCode } = this.role;
const params = {
body,
head,
@@ -329,6 +326,48 @@
})
);
}
+ }
+ if(mystatus==0){
+ 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") {
+ saveMessage(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: "璇锋鏌ュ繀濉」" });
}
@@ -384,28 +423,28 @@
<style lang="scss" scoped>
.createUser {
border-radius: 1px;
- background-color: #09152f;
+ background-color: white;
main {
text-align: left;
padding: 0 55px;
- background-color: #09152f;
+ background-color: white;
.mainContent {
display: flex;
justify-content: center;
padding-top: 50px;
&:deep(.el-dialog__title) {
- color: #4b9bb7;
+ //color: #4b9bb7;
}
&::v-deep .el-form-item__label {
- color: #4b9bb7;
+ //color: #4b9bb7;
}
&::v-deep .el-input__inner {
width: 400px;
- background-color: #09152f;
- border: 1px solid #17324c;
+ //background-color: #09152f;
+ //border: 1px solid #17324c;
}
.message-item__left {
@@ -431,7 +470,7 @@
span {
margin-left: 20px;
- color: #4b9bb7;
+ color: #606266;
}
}
@@ -443,10 +482,10 @@
width: 400px;
}
- &::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ // &::v-deep .el-textarea__inner {
+ // //background-color: #09152f;
+ // //border: 1px solid #17324c;
+ // }
.el-form-item__content {
width: 400px;
@@ -480,4 +519,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0