浏览代码

提示语 时长

natasha 1 年之前
父节点
当前提交
b11bacd790

+ 42 - 9
src/components/Setting.vue

@@ -543,8 +543,13 @@ export default {
             .then((res) => {
                 this.loading = false
                 if(res.status===1){
-                    this.$message.success("修改成功")
-                    this.$emit("getInfo")
+                    this.$message({
+                        message: '修改成功',
+                        type: 'success',
+                        duration: 3000
+                    }).then(()=>{
+                        this.$emit("getInfo")
+                    });
                 }
             }).catch((res) =>{
                 this.loading = false
@@ -556,7 +561,11 @@ export default {
     },
     // 取消 恢复到修改前状态
     onCancel(formName){
-        this.$refs[formName].resetFields();
+        if(formName==='managerForm'){
+            this.managerForm.is_manager = this.page==='editOrgPerson'?JSON.parse(JSON.stringify(this.info.is_manager)):"false"
+        }else{
+            this.$refs[formName].resetFields();
+        }
     },
     // 修改设置
     handleSetting(flag){
@@ -630,7 +639,11 @@ export default {
             .then((res) => {
                 this.loading = false
                 if(res.status===1){
-                    this.$message.success("修改成功")
+                    this.$message({
+                        message: '修改成功',
+                        type: 'success',
+                        duration: 3000
+                    })
                     this.$emit("getInfo")
                     this.handleSetting('passwordFlag')
                 }
@@ -659,7 +672,11 @@ export default {
             .then((res) => {
                 this.loading = false
                 if(res.status===1){
-                    this.$message.success("修改成功")
+                    this.$message({
+                        message: '修改成功',
+                        type: 'success',
+                        duration: 3000
+                    })
                     this.$emit("getInfo")
                     this.handleSetting('phoneFlag')
                     this.phoneForm.oldPhone = JSON.parse(JSON.stringify(this.phoneForm.newPhone))
@@ -690,7 +707,11 @@ export default {
             .then((res) => {
                 this.loading = false
                 if(res.status===1){
-                    this.$message.success("修改成功")
+                    this.$message({
+                        message: '修改成功',
+                        type: 'success',
+                        duration: 3000
+                    })
                     this.$emit("getInfo")
                     this.handleSetting('emailFlag')
                     this.emailForm.email = JSON.parse(JSON.stringify(this.emailForm.newEmail))
@@ -742,7 +763,11 @@ export default {
         .then((res) => {
             this.loading = false
             if(res.status===1){
-                this.$message.success("修改成功")
+                this.$message({
+                    message: '修改成功',
+                    type: 'success',
+                    duration: 3000
+                })
             }
         }).catch((res) =>{
             this.loading = false
@@ -783,7 +808,11 @@ export default {
         .then((res) => {
             this.loading = false
             if(res.status===1){
-                this.$message.success("修改成功")
+                this.$message({
+                    message: '修改成功',
+                    type: 'success',
+                    duration: 3000
+                })
             }
         }).catch((res) =>{
             this.loading = false
@@ -802,7 +831,11 @@ export default {
         data.is_pass = "false";
       }
       getLogin(Mname, data).then(res => {
-        this.$message.success("操作成功");
+        this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 3000
+        })
         this.$router.go(-1)
       });
     },

+ 1 - 1
src/views/content_manage/newspaper_manage/CreateNewspaper.vue

@@ -91,7 +91,7 @@
                                 <el-option
                                     v-for="item in vlList"
                                     :key="item.id"
-                                    :label="item.vl_name"
+                                    :label="item.name"
                                     :value="item.id">
                                 </el-option>
                             </el-select>

+ 2 - 2
src/views/organize_manage/PersonList.vue

@@ -488,9 +488,9 @@ export default {
             }
         }else{
             if(this.dataSorts != {}){
-                if(this.dataSort.order=='descending'){
+                if(this.dataSorts.order=='descending'){
                     order_column_list = [this.dataSorts.prop + ':desc']
-                }else if(this.dataSort.order=='ascending'){
+                }else if(this.dataSorts.order=='ascending'){
                     // 升序不传值
                     order_column_list = [this.dataSorts.prop]
                 }else{