89ab78e5 by xiaomiao

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

2 parents 292daf21 dabdac6e
......@@ -94,9 +94,9 @@
<el-col :span="8">
<!-- 下拉框 -->
<el-form-item label="土地性质:" style="margin-bottom:3px">
<treeselect v-model="ruleForm.fdcq2.jedw" placeholder=""
<treeselect v-model="ruleForm.tdytqxList[0].qlxzbm" placeholder=""
:normalizer="normalizer"
:show-count="true" :options="dictData['A45']" />
:show-count="true" :options="dictData['A9']" />
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -119,6 +119,7 @@
import { getIdCardInfo } from '@/utils/operation.js'
import { getPrintTemplateByCode } from "@/api/system";
import { addJtfcCxjgXx, getJtfcInfo, printJtcfInfo } from "@/api/sqcx";
import { log } from 'bpmn-js-token-simulation';
export default {
props: {
formData: {
......@@ -297,18 +298,24 @@
}
},
watch: {
"form.djSqcxDO.ycqrgx" (val) {
if (val == "1") {
this.form.qlrList = _.cloneDeep(this.form.sqrList);
} else {
this.form.qlrList = [];
this.add("qlr");
}
"form.djSqcxDO.ycqrgx": {
handler: function (val) {
if (val == "1") {
this.form.qlrList = _.cloneDeep(this.form.sqrList);
} else {
this.form.qlrList = [];
this.add("qlr");
}
},
immediate: true
},
"form.sqrList" (val) {
if (this.form.djSqcxDO.ycqrgx == '1') {
this.form.qlrList = _.cloneDeep(val)
}
"form.sqrList": {
handler: function (val) {
if (this.form.djSqcxDO.ycqrgx == '1') {
this.form.qlrList = _.cloneDeep(val)
}
},
deep: true
}
},
methods: {
......
......@@ -25,7 +25,7 @@
</el-col>
</el-row>
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" v-show="false">
<embed id="LODOP_EM" type="application/x-print-lodop" width=820 height=450 pluginspage="install_lodop32.exe" />
<embed id="LODOP_EM" type="application/x-print-lodop" width=800 height=600 pluginspage="install_lodop32.exe" />
</object>
<textarea rows="0" id="S1" cols="0" v-show="false"></textarea>
......@@ -37,140 +37,140 @@
</template>
<script>
import { getLodop } from "@/utils/LodopFuncs"
import { mapGetters } from 'vuex'
import store from '@/store/index.js'
import { addPrintTemplate, editPrintTemplate } from "@/api/system.js"
export default {
computed: {
...mapGetters(['dictData']),
},
props: {
formData: {
type: Object,
default: () => { }
}
},
data () {
return {
editFlag: false,
//打印模板设计保存状态 0:未操作 1:保存中 2:已保存
loadStatus: '0',
//表单提交数据
ruleForm: {
tmpno: '',
tmpname: '',
tmpfont: '',
tmpfontsize: '',
tmpcontent: ''
import { getLodop } from "@/utils/LodopFuncs"
import { mapGetters } from 'vuex'
import store from '@/store/index.js'
import { addPrintTemplate, editPrintTemplate } from "@/api/system.js"
export default {
computed: {
...mapGetters(['dictData']),
},
props: {
formData: {
type: Object,
default: () => { }
}
},
data () {
return {
editFlag: false,
//打印模板设计保存状态 0:未操作 1:保存中 2:已保存
loadStatus: '0',
//表单提交数据
ruleForm: {
tmpno: '',
tmpname: '',
tmpfont: '',
tmpfontsize: '',
tmpcontent: ''
},
rules: {
tmpno: [
{ required: true, message: '模板编号不能为空', trigger: 'blur' }
],
tmpname: [
{ required: true, message: '模板名称不能为空', trigger: 'blur' }
],
},
}
},
mounted () {
if (JSON.stringify(this.formData) != "{}") this.getDetailInfo(this.formData)
},
methods: {
//表单提交
submitForm () {
if (this.loadStatus == '1') {
return this.$message.error("模板设计保存中,请等待...")
}
this.$refs.ruleForm.validate(valid => {
if (valid) {
if (this.editFlag) {
this.editTemplate();
} else {
this.addTemplate();
}
} else {
return false;
}
});
},
rules: {
tmpno: [
{ required: true, message: '模板编号不能为空', trigger: 'blur' }
],
tmpname: [
{ required: true, message: '模板名称不能为空', trigger: 'blur' }
],
//新增
addTemplate () {
addPrintTemplate(this.ruleForm).then(res => {
if (res.code == 200) {
store.dispatch('user/refreshPage', true);
this.$message.success('保存成功');
this.$popupCacel()
} else {
this.$message.error(res.message)
}
})
},
}
},
mounted () {
if (JSON.stringify(this.formData) != "{}") this.getDetailInfo(this.formData)
},
methods: {
//表单提交
submitForm () {
if (this.loadStatus == '1') {
return this.$message.error("模板设计保存中,请等待...")
}
this.$refs.ruleForm.validate(valid => {
if (valid) {
if (this.editFlag) {
this.editTemplate();
//编辑
editTemplate () {
editPrintTemplate(this.ruleForm).then(res => {
if (res.code == 200) {
store.dispatch('user/refreshPage', true);
this.$message.success('保存成功');
this.$popupCacel()
} else {
this.addTemplate();
this.$message.error(res.message)
}
} else {
return false;
}
});
},
//新增
addTemplate () {
addPrintTemplate(this.ruleForm).then(res => {
if (res.code == 200) {
store.dispatch('user/refreshPage', true);
this.$message.success('保存成功');
this.$popupCacel()
} else {
this.$message.error(res.message)
}
})
},
//编辑
editTemplate () {
editPrintTemplate(this.ruleForm).then(res => {
if (res.code == 200) {
store.dispatch('user/refreshPage', true);
this.$message.success('保存成功');
this.$popupCacel()
} else {
this.$message.error(res.message)
})
},
closeDialog () {
this.$popupCacel()
this.ruleForm = {
tmpno: '',
tmpname: '',
tmpfont: '',
tmpfontsize: '',
tmpcontent: ''
}
})
},
closeDialog () {
this.$popupCacel()
this.ruleForm = {
tmpno: '',
tmpname: '',
tmpfont: '',
tmpfontsize: '',
tmpcontent: ''
this.loadStatus = '0'
this.editFlag = false;
},
getDetailInfo (item) {
this.ruleForm = item;
this.editFlag = true;
},
//设计打印模板
designByPRGData () {
let that = this;
that.loadStatus = '1';
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
//窗口关闭后,回调函数中保存的设计代码
if (LODOP.CVERSION)
CLODOP.On_Return = function (TaskID, printList) {
if (LODOP.CVERSION)
LODOP.On_Return = function (TaskID, Value) {
document.getElementById("S1").value = Value;
};
document.getElementById("S1").value = LODOP.GET_VALUE(
"ProgramData",
0
);
setTimeout(() => {
that.ruleForm.tmpcontent = document.getElementById("S1").value;
that.loadStatus = '2';
}, 1000);
};
LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后
}
this.loadStatus = '0'
this.editFlag = false;
},
getDetailInfo (item) {
this.ruleForm = item;
this.editFlag = true;
},
//设计打印模板
designByPRGData () {
let that = this;
that.loadStatus = '1';
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
//窗口关闭后,回调函数中保存的设计代码
if (LODOP.CVERSION)
CLODOP.On_Return = function (TaskID, printList) {
if (LODOP.CVERSION)
LODOP.On_Return = function (TaskID, Value) {
document.getElementById("S1").value = Value;
};
document.getElementById("S1").value = LODOP.GET_VALUE(
"ProgramData",
0
);
setTimeout(() => {
that.ruleForm.tmpcontent = document.getElementById("S1").value;
that.loadStatus = '2';
}, 1000);
};
LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/dialogBoxheader.scss";
@import "~@/styles/mixin.scss";
@import "~@/styles/dialogBoxheader.scss";
.font-red {
color: red
}
.font-red {
color: red;
}
.middle-margin-bottom {
margin-top: 20px
}
.middle-margin-bottom {
margin-top: 20px;
}
</style>
......
......@@ -57,8 +57,9 @@
watch: {
isRefresh: {
handler (newVal, oldVal) {
if (newVal) this.fetchData
}
if (newVal) this.fetchData()
},
immediate: true
}
},
methods: {
......@@ -101,72 +102,9 @@
message: "已取消删除",
});
});
},
//设计打印模板
DesignByPRGData (item) {
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
LODOP.ADD_PRINT_DATA("ProgramData", item.tmpcontent); //装载模板
//窗口关闭后,回调函数中保存的设计代码
if (LODOP.CVERSION)
CLODOP.On_Return = function (TaskID, printList) {
if (LODOP.CVERSION)
LODOP.On_Return = function (TaskID, Value) {
document.getElementById("S1").value = Value;
};
document.getElementById("S1").value = LODOP.GET_VALUE(
"ProgramData",
0
);
setTimeout(() => {
item.tmpcontent = document.getElementById("S1").value;
}, 1000);
};
LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后
},
editClick () {
let LODOP = getLodop();
LODOP.SET_PRINT_MODE("PRINT_SETUP_PROGRAM", true);
LODOP.PRINT_INITA(0, 0, 850, 560, "不动产证明");
LODOP.ADD_PRINT_SETUP_BKIMG("<img border='1' src=" + this.images + ">");
LODOP.ADD_PRINT_TEXT(403, 220, 39, 25, this.printList.year); //year
LODOP.ADD_PRINT_TEXT(403, 278, 25, 25, this.printList.month); //month
LODOP.ADD_PRINT_TEXT(403, 309, 25, 25, this.printList.day); //day
LODOP.ADD_PRINT_TEXT(493, 205, 160, 25, this.printList.bh); //编号
// 头部信息
LODOP.ADD_PRINT_TEXT(78, 419, 39, 25, this.printList.xzq); //陕
LODOP.ADD_PRINT_TEXT(78, 466, 39, 25, this.printList.xh); //
LODOP.ADD_PRINT_TEXT(78, 520, 60, 25, this.printList.d); //
LODOP.ADD_PRINT_TEXT(78, 670, 60, 25, this.printList.h); //
LODOP.ADD_PRINT_TEXT(119, 555, 190, 25, this.printList.zmsx); //然后多个ADD语句及SET语句
LODOP.ADD_PRINT_TEXT(152, 557, 190, 25, this.printList.qlr); //权利人
LODOP.ADD_PRINT_TEXT(186, 557, 190, 25, this.printList.ywr); //义务人
LODOP.ADD_PRINT_TEXT(219, 557, 190, 25, this.printList.zl); //坐落
LODOP.ADD_PRINT_TEXT(254, 557, 190, 25, this.printList.bdcdyh); //不动产单元号
LODOP.ADD_PRINT_TEXT(318, 557, 190, 67, this.printList.qt); //其他
LODOP.ADD_PRINT_TEXT(426, 557, 190, 67, this.printList.fj); //附记
LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);
LODOP.SET_SHOW_MODE("BKIMG_IN_PREVIEW", 1);
//窗口关闭后,回调函数中保存的设计代码
if (LODOP.CVERSION)
CLODOP.On_Return = function (TaskID, printList) {
if (LODOP.CVERSION)
LODOP.On_Return = function (TaskID, Value) {
document.getElementById("S1").value = Value;
};
document.getElementById("S1").value = LODOP.GET_VALUE(
"ProgramData",
0
);
setTimeout(() => {
let printValue = document.getElementById("S1").value;
console.log("value", printValue);
}, 1000);
};
LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后
},
},
};
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-20 11:28:09
* @LastEditTime: 2023-06-26 17:03:07
*/
import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
import { getPrintTemplateByCode } from "@/api/system";
......@@ -113,6 +113,7 @@ export default {
getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
if (res.code == 200) {
getPrintApplicationInfo(this.currentSelectProps).then(infoRes => {
console.log(infoRes, 'infoRes');
if (infoRes.code == 200) {
//打开模板设计
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
......