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()">导出一房一码 取 消 @@ -240,7 +240,7 @@ export default { showImportBtn: false,//是否显示操作按钮,根据登录人所属组织判断 roleList: [],//角色列表 - showYhymInfo: false, // 是否显示补全一户一码信息按钮 + showYhymInfo: false, // 是否显示补全一房一码信息按钮 yhymLoading: false, agencyObj: {},//树所选的组织对象 @@ -282,7 +282,7 @@ export default { async loadTable (fromTree, treeObj) { console.log(111, this.staffAgencyId) - // 是否显示补全一户一码信息按钮 + // 是否显示补全一房一码信息按钮 this.roleList = localStorage.getItem('roleList') if (this.roleList.indexOf('root_manager') > -1 || this.roleList.indexOf('manager') > -1) { this.showYhymInfo = true @@ -372,7 +372,7 @@ export default { }) }, - // 补全一户一码点击事件 + // 补全一房一码点击事件 async handleYhymInfo () { this.yhymLoading = true const url = "/gov/org/house/createBatchHouseCodeAndUrl" @@ -691,13 +691,13 @@ export default { }, - // 导出一户一码 + // 导出一房一码 handleExportYihuyima () { this.exportBtn = true this.yihuyimaDisabled = true let title = this.agencyObj.label - title = title + '-一户一码' + title = title + '-一房一码' let url = "/gov/org/house/downloadZip" diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue index 5b199952..cc9c0f3b 100644 --- a/src/views/modules/cabaseinfo/caresident.vue +++ b/src/views/modules/cabaseinfo/caresident.vue @@ -123,6 +123,7 @@ + + + + diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue new file mode 100644 index 00000000..99c19afe --- /dev/null +++ b/src/views/modules/plugins/change/verifyForm.vue @@ -0,0 +1,806 @@ + + + + diff --git a/src/views/modules/workPc/guidance/DetailForm.vue b/src/views/modules/workPc/guidance/DetailForm.vue index 74b0cf3c..8b878642 100644 --- a/src/views/modules/workPc/guidance/DetailForm.vue +++ b/src/views/modules/workPc/guidance/DetailForm.vue @@ -69,6 +69,8 @@