74b5cb33 by tianhaohao@pashanhoo.com

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

2 parents 41561225 b4f32752
...@@ -159,13 +159,15 @@ export default class filter { ...@@ -159,13 +159,15 @@ export default class filter {
159 }; 159 };
160 160
161 for (let key in row) { 161 for (let key in row) {
162 console.log("row[key]11",row[key],key);
163 console.log("www",strategies[key],key);
164 if (row[key] === 1 && strategies[key]) { 162 if (row[key] === 1 && strategies[key]) {
165 console.log("row[key]22",row[key]);
166 keys++; 163 keys++;
167 if (keys == 1) { 164 if (keys == 1) {
168 text += strategies[key]; 165 if(text){
166 text += ',' +strategies[key];
167 }else{
168 text += strategies[key];
169 }
170
169 } else { 171 } else {
170 text += ',' + strategies[key]; 172 text += ',' + strategies[key];
171 } 173 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-12-19 09:40:39 4 * @LastEditTime: 2024-03-05 16:03:50
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">
...@@ -169,11 +169,11 @@ ...@@ -169,11 +169,11 @@
169 that.loadStatus = '1'; 169 that.loadStatus = '1';
170 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); 170 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
171 if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) { 171 if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) {
172 // LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4 172 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
173 LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
174 } else { 173 } else {
175 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4 174 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4
176 } 175 }
176 LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
177 LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板 177 LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
178 //窗口关闭后,回调函数中保存的设计代码 178 //窗口关闭后,回调函数中保存的设计代码
179 if (LODOP.CVERSION) 179 if (LODOP.CVERSION)
......
...@@ -30,30 +30,30 @@ ...@@ -30,30 +30,30 @@
30 <el-row> 30 <el-row>
31 <el-col :span="3"> 31 <el-col :span="3">
32 <el-form-item label="身份证读卡器"> 32 <el-form-item label="身份证读卡器">
33 <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button> 33 <el-button type="text" icon="el-icon-tickets" :disabled="show" @click="readClick">读取</el-button>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 <el-col :span="5"> 36 <el-col :span="5">
37 <el-form-item label="领证人" prop="lzrxm" label-width="70px"> 37 <el-form-item label="领证人" prop="lzrxm" label-width="70px">
38 <el-input v-model="ruleForm.lzrxm"></el-input> 38 <el-input :disabled="show" v-model="ruleForm.lzrxm"></el-input>
39 </el-form-item> 39 </el-form-item>
40 </el-col> 40 </el-col>
41 <el-col :span="5"> 41 <el-col :span="5">
42 <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px"> 42 <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
43 <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择"> 43 <el-select :disabled="show" v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
44 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode"> 44 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
45 </el-option> 45 </el-option>
46 </el-select> 46 </el-select>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 <el-col :span="5"> 49 <el-col :span="5">
50 <el-form-item label="证件号" prop="lzrzjh" label-width="70px"> 50 <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
51 <el-input v-model="ruleForm.lzrzjh"></el-input> 51 <el-input :disabled="show" v-model="ruleForm.lzrzjh"></el-input>
52 </el-form-item> 52 </el-form-item>
53 </el-col> 53 </el-col>
54 <el-col :span="5"> 54 <el-col :span="5">
55 <el-form-item label="领证人电话" prop="lzrdh"> 55 <el-form-item label="领证人电话" prop="lzrdh">
56 <el-input v-model="ruleForm.lzrdh"></el-input> 56 <el-input :disabled="show" v-model="ruleForm.lzrdh"></el-input>
57 </el-form-item> 57 </el-form-item>
58 </el-col> 58 </el-col>
59 </el-row> 59 </el-row>
...@@ -133,7 +133,8 @@ ...@@ -133,7 +133,8 @@
133 total: 0, 133 total: 0,
134 columns: datas.columns().lzgrid, 134 columns: datas.columns().lzgrid,
135 data: [] 135 data: []
136 } 136 },
137 show:true
137 } 138 }
138 }, 139 },
139 mounted () { 140 mounted () {
...@@ -202,6 +203,7 @@ ...@@ -202,6 +203,7 @@
202 getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => { 203 getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
203 if (res.code === 200) { 204 if (res.code === 200) {
204 this.tableData.data = res.result.list; 205 this.tableData.data = res.result.list;
206 this.show=!res.result.list.length>0;
205 this.$nextTick(() => { 207 this.$nextTick(() => {
206 this.tableData.data.forEach(item => { 208 this.tableData.data.forEach(item => {
207 that.$refs.table.toggleRowSelection(item) 209 that.$refs.table.toggleRowSelection(item)
......
...@@ -380,9 +380,9 @@ ...@@ -380,9 +380,9 @@
380 </el-col> 380 </el-col>
381 </el-row> 381 </el-row>
382 <qlrCommonTable 382 <qlrCommonTable
383 :tableData="ruleForm.qlrList"
383 @upDateQlrxxList="upDateQlrxxList" 384 @upDateQlrxxList="upDateQlrxxList"
384 :disabled="!viewEdit" 385 :disabled="viewEdit"
385 :tableData="ruleForm.qlrList"
386 :gyfs="ruleForm.sldy.gyfs" /> 386 :gyfs="ruleForm.sldy.gyfs" />
387 <div class="slxx_title title-block"> 387 <div class="slxx_title title-block">
388 登记原因 388 登记原因
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-02-06 13:26:37 4 * @LastEditTime: 2024-03-05 16:43:23
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -635,7 +635,7 @@ ...@@ -635,7 +635,7 @@
635 // 保存当前字体设置 635 // 保存当前字体设置
636 const originalFont = context.font; 636 const originalFont = context.font;
637 // 设置新的字体大小 637 // 设置新的字体大小
638 context.font = '16px 楷体'; // 替换为你想要的字体和大小 638 context.font = '15px 楷体'; // 替换为你想要的字体和大小
639 // 绘制 bdcdyh 639 // 绘制 bdcdyh
640 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373); 640 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
641 // 恢复原始字体设置 641 // 恢复原始字体设置
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-02-23 16:27:17 4 * @LastEditTime: 2024-03-07 09:13:26
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import { getPrintTemplateByCode, getPrintAcceptance,getPrintReceiveSupplementalMaterials,getPrintRejectForms,getPrintSendBackMaterials,getPrintRiviseForms} from "@/api/print"; 7 import { getPrintTemplateByCode, getPrintAcceptance, getPrintReceiveSupplementalMaterials, getPrintRejectForms, getPrintSendBackMaterials, getPrintRiviseForms } from "@/api/print";
8 import { uploadUndo } from "@/api/clxx"; 8 import { uploadUndo } from "@/api/clxx";
9 import { getLodop } from "@/utils/LodopFuncs"; 9 import { getLodop } from "@/utils/LodopFuncs";
10 import { getNewDate } from '@/utils/util' 10 import { getNewDate } from '@/utils/util'
...@@ -151,7 +151,8 @@ export default { ...@@ -151,7 +151,8 @@ export default {
151 unitData: window.unitData, 151 unitData: window.unitData,
152 bsmSlsq: this.bsmSlsq, 152 bsmSlsq: this.bsmSlsq,
153 showSave: true, 153 showSave: true,
154 djlx: window.djlx 154 djlx: window.djlx,
155 isworkFrame: true
155 }, '85%', true, false) 156 }, '85%', true, false)
156 } else { 157 } else {
157 this.$message.error(res.message) 158 this.$message.error(res.message)
...@@ -259,8 +260,8 @@ export default { ...@@ -259,8 +260,8 @@ export default {
259 }) 260 })
260 } 261 }
261 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 262 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
262 infoRes.result.nowyue = this.newDate.slice(5,7) 263 infoRes.result.nowyue = this.newDate.slice(5, 7)
263 infoRes.result.nowri = this.newDate.slice(8,10) 264 infoRes.result.nowri = this.newDate.slice(8, 10)
264 let date = infoRes.result.sqrq 265 let date = infoRes.result.sqrq
265 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 266 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
266 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 267 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
...@@ -285,13 +286,13 @@ export default { ...@@ -285,13 +286,13 @@ export default {
285 } 286 }
286 }) 287 })
287 break; 288 break;
288 // 补充材料通知书 289 // 补充材料通知书
289 case "bccltzs": 290 case "bccltzs":
290 this.$popupDialog("补充材料通知书", "workflow/top/bccltzs/index", 291 this.$popupDialog("补充材料通知书", "workflow/top/bccltzs/index",
291 { bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy,type:"bccltzs" }, 292 { bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy, type: "bccltzs" },
292 '70%', true) 293 '70%', true)
293 break; 294 break;
294 // 补充材料接收凭证 295 // 补充材料接收凭证
295 case "bccljspz": 296 case "bccljspz":
296 getPrintTemplateByCode({ tmpno: 'bdcdjbccljspz' }).then(res => { 297 getPrintTemplateByCode({ tmpno: 'bdcdjbccljspz' }).then(res => {
297 if (res.code === 200) { 298 if (res.code === 200) {
...@@ -302,12 +303,12 @@ export default { ...@@ -302,12 +303,12 @@ export default {
302 let key = index + 1 303 let key = index + 1
303 this.$set(infoRes.result, "file" + key, it.sjmc) 304 this.$set(infoRes.result, "file" + key, it.sjmc)
304 this.$set(infoRes.result, "file" + key + 'ys', it.ys) 305 this.$set(infoRes.result, "file" + key + 'ys', it.ys)
305 this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件") 306 this.$set(infoRes.result, "file" + key + 'lx', it.sjlx == 1 ? "原件" : "复印件")
306 }) 307 })
307 } 308 }
308 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 309 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
309 infoRes.result.nowyue = this.newDate.slice(5,7) 310 infoRes.result.nowyue = this.newDate.slice(5, 7)
310 infoRes.result.nowri = this.newDate.slice(8,10) 311 infoRes.result.nowri = this.newDate.slice(8, 10)
311 let date = infoRes.result.sqrq 312 let date = infoRes.result.sqrq
312 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 313 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
313 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 314 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
...@@ -333,7 +334,7 @@ export default { ...@@ -333,7 +334,7 @@ export default {
333 }) 334 })
334 break; 335 break;
335 336
336 // 不予登记告知书 337 // 不予登记告知书
337 case "bydjgzs": 338 case "bydjgzs":
338 getPrintTemplateByCode({ tmpno: 'bydjgzs' }).then(res => { 339 getPrintTemplateByCode({ tmpno: 'bydjgzs' }).then(res => {
339 if (res.code === 200) { 340 if (res.code === 200) {
...@@ -347,8 +348,8 @@ export default { ...@@ -347,8 +348,8 @@ export default {
347 }) 348 })
348 } 349 }
349 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 350 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
350 infoRes.result.nowyue = this.newDate.slice(5,7) 351 infoRes.result.nowyue = this.newDate.slice(5, 7)
351 infoRes.result.nowri = this.newDate.slice(8,10) 352 infoRes.result.nowri = this.newDate.slice(8, 10)
352 let date = infoRes.result.sqrq 353 let date = infoRes.result.sqrq
353 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 354 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
354 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 355 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
...@@ -373,7 +374,7 @@ export default { ...@@ -373,7 +374,7 @@ export default {
373 } 374 }
374 }) 375 })
375 break; 376 break;
376 // 申请材料退回通知书 377 // 申请材料退回通知书
377 case "sqclthtzs": 378 case "sqclthtzs":
378 getPrintTemplateByCode({ tmpno: 'bdcdjsqclthtzs' }).then(res => { 379 getPrintTemplateByCode({ tmpno: 'bdcdjsqclthtzs' }).then(res => {
379 if (res.code === 200) { 380 if (res.code === 200) {
...@@ -387,8 +388,8 @@ export default { ...@@ -387,8 +388,8 @@ export default {
387 }) 388 })
388 } 389 }
389 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 390 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
390 infoRes.result.nowyue = this.newDate.slice(5,7) 391 infoRes.result.nowyue = this.newDate.slice(5, 7)
391 infoRes.result.nowri = this.newDate.slice(8,10) 392 infoRes.result.nowri = this.newDate.slice(8, 10)
392 let date = infoRes.result.sqrq 393 let date = infoRes.result.sqrq
393 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 394 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
394 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 395 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
...@@ -413,7 +414,7 @@ export default { ...@@ -413,7 +414,7 @@ export default {
413 } 414 }
414 }) 415 })
415 break; 416 break;
416 // 不动产更正登记通知书 417 // 不动产更正登记通知书
417 case "gzdjtzs": 418 case "gzdjtzs":
418 getPrintTemplateByCode({ tmpno: 'bdcgzdjtzs' }).then(res => { 419 getPrintTemplateByCode({ tmpno: 'bdcgzdjtzs' }).then(res => {
419 if (res.code === 200) { 420 if (res.code === 200) {
...@@ -428,8 +429,8 @@ export default { ...@@ -428,8 +429,8 @@ export default {
428 }) 429 })
429 } 430 }
430 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 431 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
431 infoRes.result.nowyue = this.newDate.slice(5,7) 432 infoRes.result.nowyue = this.newDate.slice(5, 7)
432 infoRes.result.nowri = this.newDate.slice(8,10) 433 infoRes.result.nowri = this.newDate.slice(8, 10)
433 let date = infoRes.result.sqrq 434 let date = infoRes.result.sqrq
434 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 435 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
435 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 436 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-02-06 13:23:44 4 * @LastEditTime: 2024-03-05 16:42:30
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
558 // 保存当前字体设置 558 // 保存当前字体设置
559 const originalFont = context.font; 559 const originalFont = context.font;
560 // 设置新的字体大小 560 // 设置新的字体大小
561 context.font = '16px 楷体'; // 替换为你想要的字体和大小 561 context.font = '15px 楷体'; // 替换为你想要的字体和大小
562 // 绘制 bdcdyh 562 // 绘制 bdcdyh
563 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373); 563 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
564 // 恢复原始字体设置 564 // 恢复原始字体设置
......
...@@ -207,6 +207,7 @@ ...@@ -207,6 +207,7 @@
207 queryClick () { 207 queryClick () {
208 this.$startLoading(); 208 this.$startLoading();
209 this.queryForm.sqywbm = this.sqywInfo.djywbm; 209 this.queryForm.sqywbm = this.sqywInfo.djywbm;
210 this.queryForm.bhqkbsm = ""
210 selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => { 211 selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
211 this.$endLoading(); 212 this.$endLoading();
212 if (res.code === 200) { 213 if (res.code === 200) {
......
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
98 import table from "@/utils/mixin/table"; 98 import table from "@/utils/mixin/table";
99 import { datas, sendThis } from "./djbcxdata"; 99 import { datas, sendThis } from "./djbcxdata";
100 import { getDjbBysearch } from "@/api/search.js"; 100 import { getDjbBysearch } from "@/api/search.js";
101 import { getZrzListByBsmSlsq } from "@/api/workflow/zjgcdyFlow.js";
101 102
102 export default { 103 export default {
103 name: "djbcx", 104 name: "djbcx",
...@@ -137,7 +138,8 @@ ...@@ -137,7 +138,8 @@
137 }, 138 },
138 qllxs: [], 139 qllxs: [],
139 isDialog: false, 140 isDialog: false,
140 djbxxData: {} 141 djbxxData: {},
142 zrzbsm:""
141 } 143 }
142 }, 144 },
143 computed: { 145 computed: {
...@@ -188,15 +190,18 @@ ...@@ -188,15 +190,18 @@
188 * @author: renchao 190 * @author: renchao
189 */ 191 */
190 handleLpbClick (item) { 192 handleLpbClick (item) {
191 this.$popup('楼盘表', 'lpb/index', { 193 let params = {zdbsm:item.bsmZd};
192 width: '85%', 194 getZrzListByBsmSlsq(params).then((res) => {
193 formData: { 195 if (res.code === 200) {
194 bsm: item.zrzbsm, 196 }
197 });
198 console.log("zrzbsm",item,item.zrzbsm);
199 this.$popupDialog('楼盘表', 'lpb/index', {
200 bsm: item.zrzbsm,
195 zrzbsm: item.zrzbsm, 201 zrzbsm: item.zrzbsm,
196 zdbsm: item.zrzbsm, 202 zdbsm: item.zrzbsm,
197 onlyShow: true 203 onlyShow: true
198 } 204 }, '90%', true)
199 })
200 } 205 }
201 } 206 }
202 } 207 }
......