Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
89ab78e5 by xiaomiao
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 292daf21 dabdac6e
Inline Side-by-side
Showing 5 changed files with 34 additions and 88 deletions
...@@ -94,9 +94,9 @@ ...@@ -94,9 +94,9 @@
94 <el-col :span="8"> 94 <el-col :span="8">
95 <!-- 下拉框 --> 95 <!-- 下拉框 -->
96 <el-form-item label="土地性质：" style="margin-bottom:3px"> 96 <el-form-item label="土地性质：" style="margin-bottom:3px">
97 <treeselect v-model="ruleForm.fdcq2.jedw" placeholder="" 97 <treeselect v-model="ruleForm.tdytqxList[0].qlxzbm" placeholder=""
98 :normalizer="normalizer" 98 :normalizer="normalizer"
99 :show-count="true" :options="dictData['A45']" /> 99 :show-count="true" :options="dictData['A9']" />
100 </el-form-item> 100 </el-form-item>
101 </el-col> 101 </el-col>
102 <el-col :span="8"> 102 <el-col :span="8">
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
119 import { getIdCardInfo } from '@/utils/operation.js' 119 import { getIdCardInfo } from '@/utils/operation.js'
120 import { getPrintTemplateByCode } from "@/api/system"; 120 import { getPrintTemplateByCode } from "@/api/system";
121 import { addJtfcCxjgXx, getJtfcInfo, printJtcfInfo } from "@/api/sqcx"; 121 import { addJtfcCxjgXx, getJtfcInfo, printJtcfInfo } from "@/api/sqcx";
122 import { log } from 'bpmn-js-token-simulation';
122 export default { 123 export default {
123 props: { 124 props: {
124 formData: { 125 formData: {
...@@ -297,7 +298,8 @@ ...@@ -297,7 +298,8 @@
297 } 298 }
298 }, 299 },
299 watch: { 300 watch: {
300 "form.djSqcxDO.ycqrgx" (val) { 301 "form.djSqcxDO.ycqrgx": {
302 handler: function (val) {
301 if (val == "1") { 303 if (val == "1") {
302 this.form.qlrList = _.cloneDeep(this.form.sqrList); 304 this.form.qlrList = _.cloneDeep(this.form.sqrList);
303 } else { 305 } else {
...@@ -305,10 +307,15 @@ ...@@ -305,10 +307,15 @@
305 this.add("qlr"); 307 this.add("qlr");
306 } 308 }
307 }, 309 },
308 "form.sqrList" (val) { 310 immediate: true
311 },
312 "form.sqrList": {
313 handler: function (val) {
309 if (this.form.djSqcxDO.ycqrgx == '1') { 314 if (this.form.djSqcxDO.ycqrgx == '1') {
310 this.form.qlrList = _.cloneDeep(val) 315 this.form.qlrList = _.cloneDeep(val)
311 } 316 }
317 },
318 deep: true
312 } 319 }
313 }, 320 },
314 methods: { 321 methods: {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 </el-col> 25 </el-col>
26 </el-row> 26 </el-row>
27 <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" v-show="false"> 27 <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" v-show="false">
28 <embed id="LODOP_EM" type="application/x-print-lodop" width=820 height=450 pluginspage="install_lodop32.exe" /> 28 <embed id="LODOP_EM" type="application/x-print-lodop" width=800 height=600 pluginspage="install_lodop32.exe" />
29 </object> 29 </object>
30 <textarea rows="0" id="S1" cols="0" v-show="false"></textarea> 30 <textarea rows="0" id="S1" cols="0" v-show="false"></textarea>
31 31
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
37 </template> 37 </template>
38 38
39 <script> 39 <script>
40 import { getLodop } from "@/utils/LodopFuncs" 40 import { getLodop } from "@/utils/LodopFuncs"
41 import { mapGetters } from 'vuex' 41 import { mapGetters } from 'vuex'
42 import store from '@/store/index.js' 42 import store from '@/store/index.js'
43 import { addPrintTemplate, editPrintTemplate } from "@/api/system.js" 43 import { addPrintTemplate, editPrintTemplate } from "@/api/system.js"
44 export default { 44 export default {
45 computed: { 45 computed: {
46 ...mapGetters(['dictData']), 46 ...mapGetters(['dictData']),
47 }, 47 },
...@@ -160,17 +160,17 @@ export default { ...@@ -160,17 +160,17 @@ export default {
160 LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后 160 LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后
161 } 161 }
162 } 162 }
163 } 163 }
164 </script> 164 </script>
165 <style scoped lang="scss"> 165 <style scoped lang="scss">
166 @import "~@/styles/mixin.scss"; 166 @import "~@/styles/mixin.scss";
167 @import "~@/styles/dialogBoxheader.scss"; 167 @import "~@/styles/dialogBoxheader.scss";
168 168
169 .font-red { 169 .font-red {
170 color: red 170 color: red;
171 } 171 }
172 172
173 .middle-margin-bottom { 173 .middle-margin-bottom {
174 margin-top: 20px 174 margin-top: 20px;
175 } 175 }
176 </style> 176 </style>
......
...@@ -57,8 +57,9 @@ ...@@ -57,8 +57,9 @@
57 watch: { 57 watch: {
58 isRefresh: { 58 isRefresh: {
59 handler (newVal, oldVal) { 59 handler (newVal, oldVal) {
60 if (newVal) this.fetchData 60 if (newVal) this.fetchData()
61 } 61 },
62 immediate: true
62 } 63 }
63 }, 64 },
64 methods: { 65 methods: {
...@@ -101,72 +102,9 @@ ...@@ -101,72 +102,9 @@
101 message: "已取消删除", 102 message: "已取消删除",
102 }); 103 });
103 }); 104 });
104 }, 105 }
105 //设计打印模板 106 }
106 DesignByPRGData (item) { 107 }
107 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
108 LODOP.ADD_PRINT_DATA("ProgramData", item.tmpcontent); //装载模板
109 //窗口关闭后，回调函数中保存的设计代码
110 if (LODOP.CVERSION)
111 CLODOP.On_Return = function (TaskID, printList) {
112 if (LODOP.CVERSION)
113 LODOP.On_Return = function (TaskID, Value) {
114 document.getElementById("S1").value = Value;
115 };
116 document.getElementById("S1").value = LODOP.GET_VALUE(
117 "ProgramData",
118 0
119 );
120 setTimeout(() => {
121 item.tmpcontent = document.getElementById("S1").value;
122 }, 1000);
123 };
124 LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后
125 },
126 editClick () {
127 let LODOP = getLodop();
128 LODOP.SET_PRINT_MODE("PRINT_SETUP_PROGRAM", true);
129 LODOP.PRINT_INITA(0, 0, 850, 560, "不动产证明");
130 LODOP.ADD_PRINT_SETUP_BKIMG("<img border='1' src=" + this.images + ">");
131 LODOP.ADD_PRINT_TEXT(403, 220, 39, 25, this.printList.year); //year
132 LODOP.ADD_PRINT_TEXT(403, 278, 25, 25, this.printList.month); //month
133 LODOP.ADD_PRINT_TEXT(403, 309, 25, 25, this.printList.day); //day
134 LODOP.ADD_PRINT_TEXT(493, 205, 160, 25, this.printList.bh); //编号
135 // 头部信息
136 LODOP.ADD_PRINT_TEXT(78, 419, 39, 25, this.printList.xzq); //陕
137 LODOP.ADD_PRINT_TEXT(78, 466, 39, 25, this.printList.xh); //
138 LODOP.ADD_PRINT_TEXT(78, 520, 60, 25, this.printList.d); //
139 LODOP.ADD_PRINT_TEXT(78, 670, 60, 25, this.printList.h); //
140
141 LODOP.ADD_PRINT_TEXT(119, 555, 190, 25, this.printList.zmsx); //然后多个ADD语句及SET语句
142 LODOP.ADD_PRINT_TEXT(152, 557, 190, 25, this.printList.qlr); //权利人
143 LODOP.ADD_PRINT_TEXT(186, 557, 190, 25, this.printList.ywr); //义务人
144 LODOP.ADD_PRINT_TEXT(219, 557, 190, 25, this.printList.zl); //坐落
145 LODOP.ADD_PRINT_TEXT(254, 557, 190, 25, this.printList.bdcdyh); //不动产单元号
146 LODOP.ADD_PRINT_TEXT(318, 557, 190, 67, this.printList.qt); //其他
147 LODOP.ADD_PRINT_TEXT(426, 557, 190, 67, this.printList.fj); //附记
148 LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);
149 LODOP.SET_SHOW_MODE("BKIMG_IN_PREVIEW", 1);
150 //窗口关闭后，回调函数中保存的设计代码
151 if (LODOP.CVERSION)
152 CLODOP.On_Return = function (TaskID, printList) {
153 if (LODOP.CVERSION)
154 LODOP.On_Return = function (TaskID, Value) {
155 document.getElementById("S1").value = Value;
156 };
157 document.getElementById("S1").value = LODOP.GET_VALUE(
158 "ProgramData",
159 0
160 );
161 setTimeout(() => {
162 let printValue = document.getElementById("S1").value;
163 console.log("value", printValue);
164 }, 1000);
165 };
166 LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后
167 },
168 },
169 };
170 </script> 108 </script>
171 <style scoped lang="scss"> 109 <style scoped lang="scss">
172 @import "~@/styles/public.scss"; 110 @import "~@/styles/public.scss";
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-20 11:28:09 4 * @LastEditTime: 2023-06-26 17:03:07
5 */ 5 */
6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"; 6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
7 import { getPrintTemplateByCode } from "@/api/system"; 7 import { getPrintTemplateByCode } from "@/api/system";
...@@ -113,6 +113,7 @@ export default { ...@@ -113,6 +113,7 @@ export default {
113 getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => { 113 getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
114 if (res.code == 200) { 114 if (res.code == 200) {
115 getPrintApplicationInfo(this.currentSelectProps).then(infoRes => { 115 getPrintApplicationInfo(this.currentSelectProps).then(infoRes => {
116 console.log(infoRes, 'infoRes');
116 if (infoRes.code == 200) { 117 if (infoRes.code == 200) {
117 //打开模板设计 118 //打开模板设计
118 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); 119 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
......