Merge branch 'dev'
Showing
10 changed files
with
55 additions
and
37 deletions
... | @@ -119,7 +119,7 @@ export function getSlsqBdcqzList (params) { | ... | @@ -119,7 +119,7 @@ export function getSlsqBdcqzList (params) { |
119 | } | 119 | } |
120 | 120 | ||
121 | /** | 121 | /** |
122 | * @description: 证书预览 | 122 | * @description: 证书证明预览 |
123 | * @param {*} data | 123 | * @param {*} data |
124 | * @author: renchao | 124 | * @author: renchao |
125 | */ | 125 | */ | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-30 08:40:36 | 4 | * @LastEditTime: 2023-09-01 08:20:51 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> | 7 | <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> |
... | @@ -187,9 +187,9 @@ | ... | @@ -187,9 +187,9 @@ |
187 | setTimeout(() => { | 187 | setTimeout(() => { |
188 | that.ruleForm.tmpcontent = document.getElementById("S1").value; | 188 | that.ruleForm.tmpcontent = document.getElementById("S1").value; |
189 | if (that.ruleForm.tmpno == 'zsdy') { | 189 | if (that.ruleForm.tmpno == 'zsdy') { |
190 | LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg'>"); | 190 | LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src=" + window._config.services.management + "':9000/bdcdj/zhengshu_image/bdcqzs2.jpg'>"); |
191 | } else if (that.ruleForm.tmpno == 'zmdy') { | 191 | } else if (that.ruleForm.tmpno == 'zmdy') { |
192 | LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcdjzm.jpg'>"); | 192 | LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src=" + window._config.services.management + "':9000/bdcdj/zhengshu_image/bdcdjzm.jpg'>"); |
193 | } | 193 | } |
194 | LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图 | 194 | LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图 |
195 | that.loadStatus = '2'; | 195 | that.loadStatus = '2'; | ... | ... |
... | @@ -5,7 +5,7 @@ | ... | @@ -5,7 +5,7 @@ |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div> | 7 | <div> |
8 | <ul class="edit-title-list" v-if="djlxList.length > 0"> | 8 | <ul class="edit-title-list" v-if="djlxList.length > 0 "> |
9 | <li v-for="(item, index) in djlxList" @click="handleTitleSelct(item, index)" :key="index" | 9 | <li v-for="(item, index) in djlxList" @click="handleTitleSelct(item, index)" :key="index" |
10 | :class="{ active: index == tn }"> | 10 | :class="{ active: index == tn }"> |
11 | {{ item.nodename }} | 11 | {{ item.nodename }} |
... | @@ -190,6 +190,9 @@ | ... | @@ -190,6 +190,9 @@ |
190 | */ | 190 | */ |
191 | init () { | 191 | init () { |
192 | this.tn = 0; | 192 | this.tn = 0; |
193 | if(this.formData.sqfl=="2"){ | ||
194 | this.getDetail(this.formData.bsmSqyw); | ||
195 | }else{ | ||
193 | getDjlxInfo(this.formData.bsmSqyw).then((res) => { | 196 | getDjlxInfo(this.formData.bsmSqyw).then((res) => { |
194 | let { result } = res; | 197 | let { result } = res; |
195 | this.djlxList = result ? result : []; | 198 | this.djlxList = result ? result : []; |
... | @@ -199,6 +202,7 @@ | ... | @@ -199,6 +202,7 @@ |
199 | this.getDetail(this.formData.bsmSqyw); | 202 | this.getDetail(this.formData.bsmSqyw); |
200 | } | 203 | } |
201 | }) | 204 | }) |
205 | } | ||
202 | }, | 206 | }, |
203 | /** | 207 | /** |
204 | * @description: orderNoChange | 208 | * @description: orderNoChange | ... | ... |
... | @@ -54,10 +54,11 @@ | ... | @@ -54,10 +54,11 @@ |
54 | </el-form> | 54 | </el-form> |
55 | </template> | 55 | </template> |
56 | <script> | 56 | <script> |
57 | import { addSysNotice, updateSysNotice } from "@/api/sysNotice.js"; | 57 | import { addSysNotice, updateSysNotice } from "@/api/sysNotice.js"; |
58 | import { upload } from "@/api/file.js"; | 58 | import { upload } from "@/api/file.js"; |
59 | import { quillEditor } from "vue-quill-editor"; | 59 | import store from '@/store' |
60 | export default { | 60 | import { quillEditor } from "vue-quill-editor"; |
61 | export default { | ||
61 | props: { | 62 | props: { |
62 | formData: { | 63 | formData: { |
63 | type: Object, | 64 | type: Object, |
... | @@ -194,9 +195,9 @@ export default { | ... | @@ -194,9 +195,9 @@ export default { |
194 | addSysNotice(this.ruleForm).then(res => { | 195 | addSysNotice(this.ruleForm).then(res => { |
195 | if (res.code == 200) { | 196 | if (res.code == 200) { |
196 | this.$message.success("保存成功"); | 197 | this.$message.success("保存成功"); |
198 | store.dispatch("user/refreshPage", true); | ||
197 | this.$popupCacel() | 199 | this.$popupCacel() |
198 | this.resetRuleForm(); | 200 | this.resetRuleForm(); |
199 | this.$parent.queryClick(); | ||
200 | } else { | 201 | } else { |
201 | this.$message.error(res.message); | 202 | this.$message.error(res.message); |
202 | } | 203 | } |
... | @@ -213,13 +214,12 @@ export default { | ... | @@ -213,13 +214,12 @@ export default { |
213 | this.$message.success("编辑成功"); | 214 | this.$message.success("编辑成功"); |
214 | this.$popupCacel() | 215 | this.$popupCacel() |
215 | this.resetRuleForm(); | 216 | this.resetRuleForm(); |
216 | this.$parent.queryClick(); | 217 | store.dispatch("user/refreshPage", true); |
217 | } else { | 218 | } else { |
218 | this.$message.error(res.message); | 219 | this.$message.error(res.message); |
219 | } | 220 | } |
220 | }); | 221 | }); |
221 | }, | 222 | }, |
222 | //重置表单 | ||
223 | /** | 223 | /** |
224 | * @description: 重置表单 | 224 | * @description: 重置表单 |
225 | * @author: renchao | 225 | * @author: renchao |
... | @@ -349,22 +349,23 @@ export default { | ... | @@ -349,22 +349,23 @@ export default { |
349 | //this.content = html; | 349 | //this.content = html; |
350 | } | 350 | } |
351 | } | 351 | } |
352 | }; | 352 | }; |
353 | </script> | 353 | </script> |
354 | <style scoped lang="scss"> | 354 | <style scoped lang="scss"> |
355 | @import "~@/styles/dialogBoxheader.scss"; | 355 | @import "~@/styles/dialogBoxheader.scss"; |
356 | 356 | ||
357 | .quill-editor { | 357 | .quill-editor { |
358 | padding: 0; | 358 | padding: 0; |
359 | } | 359 | } |
360 | 360 | ||
361 | .ql-editor { | 361 | .ql-editor { |
362 | height: auto !important; | 362 | height: auto !important; |
363 | } | 363 | } |
364 | 364 | ||
365 | /deep/.ql-container { | 365 | /deep/.ql-container { |
366 | padding: 0; | 366 | padding: 0; |
367 | max-height: 400px; | 367 | max-height: 400px; |
368 | min-height: 160px; | 368 | min-height: 160px; |
369 | overflow-y: scroll; | 369 | overflow-y: scroll; |
370 | }</style> | 370 | } |
371 | </style> | ... | ... |
... | @@ -38,6 +38,7 @@ | ... | @@ -38,6 +38,7 @@ |
38 | </template> | 38 | </template> |
39 | <script> | 39 | <script> |
40 | import table from "@/utils/mixin/table"; | 40 | import table from "@/utils/mixin/table"; |
41 | import { mapGetters } from 'vuex' | ||
41 | import { datas, sendThis } from "./xttzdata"; | 42 | import { datas, sendThis } from "./xttzdata"; |
42 | import { getSysNoticeList, deleteSysNotice, publishNotice, unPublishNotice } from "@/api/sysNotice.js" | 43 | import { getSysNoticeList, deleteSysNotice, publishNotice, unPublishNotice } from "@/api/sysNotice.js" |
43 | import addDialog from "./components/addDialog.vue"; | 44 | import addDialog from "./components/addDialog.vue"; |
... | @@ -73,6 +74,17 @@ | ... | @@ -73,6 +74,17 @@ |
73 | isDiglog: false | 74 | isDiglog: false |
74 | } | 75 | } |
75 | }, | 76 | }, |
77 | computed: { | ||
78 | ...mapGetters(['isRefresh']) | ||
79 | }, | ||
80 | watch: { | ||
81 | isRefresh: { | ||
82 | handler (newVal, oldVal) { | ||
83 | if (newVal) this.queryClick() | ||
84 | }, | ||
85 | immediate: true | ||
86 | } | ||
87 | }, | ||
76 | methods: { | 88 | methods: { |
77 | // 列表渲染接口 | 89 | // 列表渲染接口 |
78 | /** | 90 | /** |
... | @@ -90,7 +102,6 @@ | ... | @@ -90,7 +102,6 @@ |
90 | } | 102 | } |
91 | }) | 103 | }) |
92 | }, | 104 | }, |
93 | //打开新增弹窗 | ||
94 | /** | 105 | /** |
95 | * @description: 打开新增弹窗 | 106 | * @description: 打开新增弹窗 |
96 | * @param {*} item | 107 | * @param {*} item |
... | @@ -102,6 +113,7 @@ | ... | @@ -102,6 +113,7 @@ |
102 | } else { | 113 | } else { |
103 | this.$popupDialog("新增系统通知", "system/xttz/components/addDialog", { "isButtonFlag": true }, "50%") | 114 | this.$popupDialog("新增系统通知", "system/xttz/components/addDialog", { "isButtonFlag": true }, "50%") |
104 | } | 115 | } |
116 | this.$store.dispatch("user/refreshPage", false); | ||
105 | }, | 117 | }, |
106 | //删除 | 118 | //删除 |
107 | delNotice (item) { | 119 | delNotice (item) { | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-31 09:25:12 | 4 | * @LastEditTime: 2023-08-31 09:48:52 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> | 7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> |
... | @@ -468,7 +468,7 @@ | ... | @@ -468,7 +468,7 @@ |
468 | }) | 468 | }) |
469 | } else { | 469 | } else { |
470 | arr.forEach((line, index) => { | 470 | arr.forEach((line, index) => { |
471 | context.fillText(line, 770, 428 + (23 * (i - 1)) + (index * 14)); // 调整行高 | 471 | context.fillText(line, 770, 435 + (23 * (i - 1)) + (index * 14)); // 调整行高 |
472 | }) | 472 | }) |
473 | } | 473 | } |
474 | } else { | 474 | } else { | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-30 16:03:09 | 4 | * @LastEditTime: 2023-09-01 08:21:18 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div> | 7 | <div> |
... | @@ -66,13 +66,13 @@ | ... | @@ -66,13 +66,13 @@ |
66 | ) | 66 | ) |
67 | } | 67 | } |
68 | }, | 68 | }, |
69 | // { | 69 | { |
70 | // label: '身份证读卡器', | 70 | label: '身份证读卡器', |
71 | // align: 'center', | 71 | align: 'center', |
72 | // render: (h, scope) => { | 72 | render: (h, scope) => { |
73 | // return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button> | 73 | return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button> |
74 | // } | 74 | } |
75 | // }, | 75 | }, |
76 | { | 76 | { |
77 | prop: "sqrmc", | 77 | prop: "sqrmc", |
78 | label: "姓名/名称" | 78 | label: "姓名/名称" | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-30 17:31:53 | 4 | * @LastEditTime: 2023-08-31 09:36:04 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="szxx"> | 7 | <div class="szxx"> |
... | @@ -134,7 +134,7 @@ | ... | @@ -134,7 +134,7 @@ |
134 | store.dispatch('user/reWorkFresh', false) | 134 | store.dispatch('user/reWorkFresh', false) |
135 | 135 | ||
136 | if (type == 1) { | 136 | if (type == 1) { |
137 | //证书预览 | 137 | //证书证明预览 |
138 | this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true); | 138 | this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true); |
139 | } else { | 139 | } else { |
140 | this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true); | 140 | this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true); | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-30 14:13:47 | 4 | * @LastEditTime: 2023-08-31 09:35:49 |
5 | */ | 5 | */ |
6 | import { getPrintTemplateByCode } from "@/api/print"; | 6 | import { getPrintTemplateByCode } from "@/api/print"; |
7 | import { uploadUndo } from "@/api/clxx"; | 7 | import { uploadUndo } from "@/api/clxx"; |
... | @@ -122,7 +122,7 @@ export default { | ... | @@ -122,7 +122,7 @@ export default { |
122 | this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true) | 122 | this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true) |
123 | break; | 123 | break; |
124 | case "B5": | 124 | case "B5": |
125 | this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { | 125 | this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { |
126 | bsmSlsq: this.bsmSlsq, | 126 | bsmSlsq: this.bsmSlsq, |
127 | entryType: '1' | 127 | entryType: '1' |
128 | }, '1210px', true) | 128 | }, '1210px', true) | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-31 09:24:28 | 4 | * @LastEditTime: 2023-09-01 08:42:43 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -106,7 +106,8 @@ | ... | @@ -106,7 +106,8 @@ |
106 | openDialog (item) { | 106 | openDialog (item) { |
107 | this.$startLoading() | 107 | this.$startLoading() |
108 | bdcqzPreview(item).then(res => { | 108 | bdcqzPreview(item).then(res => { |
109 | this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { | 109 | this.$endLoading() |
110 | this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { | ||
110 | bsmSlsq: item.bsmSlsq, | 111 | bsmSlsq: item.bsmSlsq, |
111 | bsmBdcqz: item.bsmBdcqz | 112 | bsmBdcqz: item.bsmBdcqz |
112 | }, '1210px', true) | 113 | }, '1210px', true) | ... | ... |
-
Please register or sign in to post a comment