diff --git a/public/index.html b/public/index.html index 65983e7..41857cc 100644 --- a/public/index.html +++ b/public/index.html @@ -39,8 +39,8 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% } %> @@ -53,10 +53,11 @@ <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> <% } %> +
diff --git a/src/mixins/printModel.js b/src/mixins/printModel.js new file mode 100644 index 0000000..442b0d6 --- /dev/null +++ b/src/mixins/printModel.js @@ -0,0 +1,35 @@ +export default { + data() { + return { + printHidden: true, + printIndex: 0, + printType: '', + print: { + id: '', + closeCallback: () => { + console.log('关闭') + this.$nextTick(() => { + this.printHidden = true + }) + }, + clickMounted: () => { + console.log('触发点击打印回调') + }, + openCallback: () => { + console.log('执行打印') + this.printIndex += 1 + } + } + } + }, + watch: { + printIndex(val) { + if (val) { + this.printType = 'warning' + } + } + }, + created() { + this.print.id = this.printId + } +} diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue index 65cbea4..7fc3a92 100644 --- a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue +++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue @@ -476,7 +476,7 @@ export default { }) }, goFormList(scopeRow) { - const { href } = this.$router.resolve({ + this.$router.push({ path: '/360view', query: { onlyRead: false, @@ -485,7 +485,6 @@ export default { jzNumber: scopeRow.jzNumber } }) - window.open(href, '_blank') }, // 取消预约 cancelClick(scopeRow) {