Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master

wl

2022-11-28 03ea193468fe07ee216e6916a1dd55a5adf68479

 src/views/operate/sms/smsIndex/createSms/index.vue

@@ -9,7 +9,7 @@
                        <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"
                                    <el-option v-for="item in colList" :key="item.id" :label="item.title"
                                        :value="item.id">
                                    </el-option>
                                </el-select>
@@ -53,6 +53,7 @@
<script>
import MyEditor from '@/components/edit'
import { sendMessage } from "@/api/operate/messageManagement";
import SMS from "@/api/operate/SMS";

export default {
    components: { MyEditor },
@@ -103,7 +104,7 @@
        }
    },
    created() {
        this.setColumnList();
        this.getSMSTemplateList();
        this.setDepartList();
        this.getLoginUserInfo();
    },
@@ -115,29 +116,18 @@
                    done();
                })
        },
        // 设置栏目
        async setColumnList() {
            this.colList = await this.getColumnList();

        getSMSTemplateList() {
          SMS.getSMSTemplateList({ current: 1, pageSize: 100 })
              .then(({ records }) => {
                this.colList = records;
              })
              .catch(err => this.$message.error(err))
        },
        // 获取栏目
        async getColumnList() {
            let arr;
            await this.$axios({
                method: 'get',
                url: 'sccg/message_column/getAllColumn'
            })
                .then(res => {
                    arr = res.data;
                })
            return arr;
        },

        // 关闭弹窗
        closeDialog({ flag, index }) {
        closeDialog({ flag }) {
            this.dialogCreate = flag;
            if (index === 1) {
                // 重新设置栏目
                this.setColumnList();
            }
        },
        // 获取部门树
        async getDepartList() {