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 {
};
for (let key in row) {
console.log("row[key]11",row[key],key);
console.log("www",strategies[key],key);
if (row[key] === 1 && strategies[key]) {
console.log("row[key]22",row[key]);
keys++;
if (keys == 1) {
text += strategies[key];
if(text){
text += ',' +strategies[key];
}else{
text += strategies[key];
}
} else {
text += ',' + strategies[key];
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-12-19 09:40:39
* @LastEditTime: 2024-03-05 16:03:50
-->
<template>
<el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
......@@ -169,11 +169,11 @@
that.loadStatus = '1';
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) {
// LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
} else {
LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4
}
LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
//窗口关闭后,回调函数中保存的设计代码
if (LODOP.CVERSION)
......
......@@ -30,30 +30,30 @@
<el-row>
<el-col :span="3">
<el-form-item label="身份证读卡器">
<el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button>
<el-button type="text" icon="el-icon-tickets" :disabled="show" @click="readClick">读取</el-button>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="领证人" prop="lzrxm" label-width="70px">
<el-input v-model="ruleForm.lzrxm"></el-input>
<el-input :disabled="show" v-model="ruleForm.lzrxm"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
<el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
<el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-select :disabled="show" v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
<el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="证件号" prop="lzrzjh" label-width="70px">
<el-input v-model="ruleForm.lzrzjh"></el-input>
<el-input :disabled="show" v-model="ruleForm.lzrzjh"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="领证人电话" prop="lzrdh">
<el-input v-model="ruleForm.lzrdh"></el-input>
<el-input :disabled="show" v-model="ruleForm.lzrdh"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -133,7 +133,8 @@
total: 0,
columns: datas.columns().lzgrid,
data: []
}
},
show:true
}
},
mounted () {
......@@ -202,6 +203,7 @@
getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
if (res.code === 200) {
this.tableData.data = res.result.list;
this.show=!res.result.list.length>0;
this.$nextTick(() => {
this.tableData.data.forEach(item => {
that.$refs.table.toggleRowSelection(item)
......
......@@ -380,9 +380,9 @@
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrList"
@upDateQlrxxList="upDateQlrxxList"
:disabled="!viewEdit"
:tableData="ruleForm.qlrList"
:disabled="viewEdit"
:gyfs="ruleForm.sldy.gyfs" />
<div class="slxx_title title-block">
登记原因
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-02-06 13:26:37
* @LastEditTime: 2024-03-05 16:43:23
-->
<template>
<div>
......@@ -635,7 +635,7 @@
// 保存当前字体设置
const originalFont = context.font;
// 设置新的字体大小
context.font = '16px 楷体'; // 替换为你想要的字体和大小
context.font = '15px 楷体'; // 替换为你想要的字体和大小
// 绘制 bdcdyh
context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
// 恢复原始字体设置
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-02-23 16:27:17
* @LastEditTime: 2024-03-07 09:13:26
*/
import Vue from 'vue'
import { getPrintTemplateByCode, getPrintAcceptance,getPrintReceiveSupplementalMaterials,getPrintRejectForms,getPrintSendBackMaterials,getPrintRiviseForms} from "@/api/print";
import { getPrintTemplateByCode, getPrintAcceptance, getPrintReceiveSupplementalMaterials, getPrintRejectForms, getPrintSendBackMaterials, getPrintRiviseForms } from "@/api/print";
import { uploadUndo } from "@/api/clxx";
import { getLodop } from "@/utils/LodopFuncs";
import { getNewDate } from '@/utils/util'
......@@ -151,7 +151,8 @@ export default {
unitData: window.unitData,
bsmSlsq: this.bsmSlsq,
showSave: true,
djlx: window.djlx
djlx: window.djlx,
isworkFrame: true
}, '85%', true, false)
} else {
this.$message.error(res.message)
......@@ -259,8 +260,8 @@ export default {
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
infoRes.result.nowyue = this.newDate.slice(5, 7)
infoRes.result.nowri = this.newDate.slice(8, 10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......@@ -285,13 +286,13 @@ export default {
}
})
break;
// 补充材料通知书
// 补充材料通知书
case "bccltzs":
this.$popupDialog("补充材料通知书", "workflow/top/bccltzs/index",
{ bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy,type:"bccltzs" },
{ bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy, type: "bccltzs" },
'70%', true)
break;
// 补充材料接收凭证
// 补充材料接收凭证
case "bccljspz":
getPrintTemplateByCode({ tmpno: 'bdcdjbccljspz' }).then(res => {
if (res.code === 200) {
......@@ -302,12 +303,12 @@ export default {
let key = index + 1
this.$set(infoRes.result, "file" + key, it.sjmc)
this.$set(infoRes.result, "file" + key + 'ys', it.ys)
this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件")
this.$set(infoRes.result, "file" + key + 'lx', it.sjlx == 1 ? "原件" : "复印件")
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
infoRes.result.nowyue = this.newDate.slice(5, 7)
infoRes.result.nowri = this.newDate.slice(8, 10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......@@ -333,7 +334,7 @@ export default {
})
break;
// 不予登记告知书
// 不予登记告知书
case "bydjgzs":
getPrintTemplateByCode({ tmpno: 'bydjgzs' }).then(res => {
if (res.code === 200) {
......@@ -347,8 +348,8 @@ export default {
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
infoRes.result.nowyue = this.newDate.slice(5, 7)
infoRes.result.nowri = this.newDate.slice(8, 10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......@@ -373,7 +374,7 @@ export default {
}
})
break;
// 申请材料退回通知书
// 申请材料退回通知书
case "sqclthtzs":
getPrintTemplateByCode({ tmpno: 'bdcdjsqclthtzs' }).then(res => {
if (res.code === 200) {
......@@ -387,8 +388,8 @@ export default {
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
infoRes.result.nowyue = this.newDate.slice(5, 7)
infoRes.result.nowri = this.newDate.slice(8, 10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......@@ -413,7 +414,7 @@ export default {
}
})
break;
// 不动产更正登记通知书
// 不动产更正登记通知书
case "gzdjtzs":
getPrintTemplateByCode({ tmpno: 'bdcgzdjtzs' }).then(res => {
if (res.code === 200) {
......@@ -428,8 +429,8 @@ export default {
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
infoRes.result.nowyue = this.newDate.slice(5, 7)
infoRes.result.nowri = this.newDate.slice(8, 10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-02-06 13:23:44
* @LastEditTime: 2024-03-05 16:42:30
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
......@@ -558,7 +558,7 @@
// 保存当前字体设置
const originalFont = context.font;
// 设置新的字体大小
context.font = '16px 楷体'; // 替换为你想要的字体和大小
context.font = '15px 楷体'; // 替换为你想要的字体和大小
// 绘制 bdcdyh
context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
// 恢复原始字体设置
......
......@@ -207,6 +207,7 @@
queryClick () {
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
this.queryForm.bhqkbsm = ""
selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
......
......@@ -98,6 +98,7 @@
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./djbcxdata";
import { getDjbBysearch } from "@/api/search.js";
import { getZrzListByBsmSlsq } from "@/api/workflow/zjgcdyFlow.js";
export default {
name: "djbcx",
......@@ -137,7 +138,8 @@
},
qllxs: [],
isDialog: false,
djbxxData: {}
djbxxData: {},
zrzbsm:""
}
},
computed: {
......@@ -188,15 +190,18 @@
* @author: renchao
*/
handleLpbClick (item) {
this.$popup('楼盘表', 'lpb/index', {
width: '85%',
formData: {
bsm: item.zrzbsm,
let params = {zdbsm:item.bsmZd};
getZrzListByBsmSlsq(params).then((res) => {
if (res.code === 200) {
}
});
console.log("zrzbsm",item,item.zrzbsm);
this.$popupDialog('楼盘表', 'lpb/index', {
bsm: item.zrzbsm,
zrzbsm: item.zrzbsm,
zdbsm: item.zrzbsm,
onlyShow: true
}
})
}, '90%', true)
}
}
}
......