diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index 1990c3e1..f19da89b 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -498,7 +498,8 @@ export default {
}, 2000)
this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) {
- app.util.validateRule(messageObj)
+ // app.util.validateRule(messageObj)
+ console.log('error submit!')
} else {
if (this.dataForm.type === 'in') {
@@ -522,7 +523,9 @@ export default {
},
async saveForm () {
- const url = '/epmetuser/changeRelocation/saveOutOfInfo'
+
+ // saveOutOfInfo
+ const url = '/epmetuser/changeRelocation/moveOutHome'
let noData = new Date()
noData = util.dateFormatter(noData, 'time')
this.dataForm.transferTime = noData
@@ -530,7 +533,7 @@ export default {
const { data, code, msg } = await requestPost(url, this.dataForm)
if (code === 0) {
- this.$message.success('调动成功')
+ this.$message.success('操作成功')
this.handleCancle()
} else {
this.$message.error(msg)
diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue
index 60a38284..eb118d6a 100644
--- a/src/views/components/tinymce2/index.vue
+++ b/src/views/components/tinymce2/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -48,9 +48,16 @@ import "tinymce/plugins/visualblocks"; //
import "tinymce/plugins/visualchars"; //
import "tinymce/plugins/wordcount"; //数字统计
import { debounce } from "throttle-debounce";
-
+let num = 1;
export default {
props: {
+ id: {
+ type: String,
+ default: () => {
+ num === 10000 && (num = 1);
+ return `tinymce${+new Date()}${num++}`;
+ },
+ },
value: {
default: "",
},
@@ -67,7 +74,7 @@ export default {
let token = this.getUserToken();
let init = {
- selector: '#editors',
+ selector: `#${this.id}`,
language_url: require("./zh_CN.js"), // 中文语言包路径
language: "zh_CN",
skin_url: require("tinymce/skins/ui/oxide/skin.css"), // 编辑器皮肤样式
@@ -154,7 +161,7 @@ export default {
};
},
mounted() {
- tinymce.init(this.init)
+ // tinymce.init(this.init)
},
methods: {
vModel(editor) {
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 19736156..fdf86681 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -7,7 +7,7 @@
class="diy-button--reset"
size="small"
:loading="yhymLoading"
- @click="handleYhymInfo">补全一户一码信息
+ @click="handleYhymInfo">补全一房一码信息
导出一户一码
+ @click="handleExportYihuyima()">导出一房一码