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

zhanghua

2022-11-28 ca150d38b8ecb9c69b0b32ac865e28fcf8c8fc8f

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

# Conflicts:
#	src/views/operate/fivepack/threepack/components/updateUser/index.vue

 src/views/layout/components/Header/updatePassword/index.vue

@@ -27,6 +27,11 @@
export default {
    data() {
        return {
            updatePasswordParam:{
                newPassword:"",
                oldPassword:"",
                username:""
            },
          password: {
            oldPassword: null,
            newPassword: null,
@@ -45,13 +50,15 @@
      onSubmit() {
        this.$refs.password.validate(valid => {
          if (valid) {
            const userName = JSON.parse(sessionStorage.getItem('name'));
            const passwordParams = Object.assign({}, this.password);
            delete passwordParams.confirmPassword;
            users.updatePassword({ username: userName, ...passwordParams })
           this.updatePasswordParam.oldPassword=this.password.oldPassword;
           this.updatePasswordParam.username=sessionStorage.getItem('name');
           this.updatePasswordParam.newPassword=this.password.newPassword;
           console.log(this.updatePasswordParam);
            users.updatePassword(this.updatePasswordParam)
                .then(() => {
                  this.$message.success('修改密码成功, 即将重新登录');
                  this.logout();
                  location.reload();
                })
                .catch(err => this.$message.error(err))
          }

 src/views/operate/message/myIndex/index.vue

@@ -3,7 +3,6 @@
        <header>
            <div class="header-nav">
                <span class="nav-left">数据筛选</span>
                <span class="nav-right" @click="showMoreParamsDialog">高级搜索</span>
            </div>
            <div class="header-content">
                <div class="search">

 src/views/operate/message/myIndex/update/index.vue

@@ -218,7 +218,7 @@
    async getColumnList() {
      await this.$axios({
        method: "get",
        url: "sccg/message_column/getAllColumn",
        url: "sccg/message_column/getShowColumn",
      }).then((res) => {
        this.colList = res.data;
      });

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

@@ -8,7 +8,7 @@
                    <el-form-item class="optionItem" label="短信模板:" prop="messageType">
                        <div class="message-item">
                            <div class="message-item__left">
                                <el-select v-model="role.messageType" placeholder="请选择短信模板">
                                <el-select v-model="role.messageType" placeholder="请选择短信模板" @change="setTemplateValue">
                                    <el-option v-for="item in colList" :key="item.id" :label="item.title"
                                        :value="item.id">
                                    </el-option>
@@ -199,6 +199,14 @@
                }
            })
        },
        setTemplateValue(obj){
            var _this=this
            SMS.getSMSTemplateById(obj).then((result) =>{
                _this.role.head=result.title
                _this.role.body=result.body
                _this.$refs.edit.editor.txt.html(result.body)
            })
        },
        // 重置表单
        handleReset() {
            this.$refs.edit.editor.txt.clear();

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

@@ -3,7 +3,6 @@
        <header>
            <div class="header-nav">
                <span class="nav-left">数据筛选</span>
                <span class="nav-right">高级搜索</span>
            </div>
            <div class="header-content">
                <div class="search">
@@ -195,7 +194,7 @@

        getTableData() {
          const respondResult = this.messageStatus === '全部' ? null : this.messageStatus;
          getMessageList({ channelCode: '03', current: this.currentPage,
          getMessageList({ channelCode: '02', current: this.currentPage,
            respondResult, pageSize: this.pageSize, head: this.context })
              .then(({ records, total  }) => {
                this.tableData = records;

 src/views/operate/sms/smsTemplate/index.vue

@@ -3,7 +3,6 @@
        <header>
            <div class="header-nav">
                <span class="nav-left">数据筛选</span>
                <span class="nav-right">高级搜索</span>
            </div>
            <div class="header-content">
                <div class="search">