Merge branch 'dev'
Showing
8 changed files
with
147 additions
and
177 deletions
| 1 | .tableDivCss { | 1 | .tableDivCss { |
| 2 | width: 100%; | 2 | width: 100%; |
| 3 | height: 100%; | 3 | height: 95%; |
| 4 | background-color: #f5f5f5; | 4 | background-color: #f5f5f5; |
| 5 | padding: 5px; | 5 | padding: 5px; |
| 6 | overflow-y: scroll; | 6 | overflow-y: scroll; |
| 7 | box-sizing: border-box; | ||
| 7 | } | 8 | } |
| 8 | 9 | ||
| 9 | .tableCss { | 10 | .tableCss { | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Description:workFramezu.vue组件的方法 头部按钮弹框方法 | 2 | * @Description:workFramezu.vue组件的方法 头部按钮弹框方法 |
| 3 | * @Autor: miaofang | 3 | * @Autor: miaofang |
| 4 | * @LastEditTime: 2023-09-26 14:25:23 | 4 | * @LastEditTime: 2023-12-19 10:02:20 |
| 5 | */ | 5 | */ |
| 6 | import { getPrintTemplateByCode } from "@/api/print"; | 6 | import { getPrintTemplateByCode } from "@/api/print"; |
| 7 | import { getQllxByBdcdyid } from "@/api/djbDetail.js"; | 7 | import { getQllxByBdcdyid } from "@/api/djbDetail.js"; |
| ... | @@ -142,27 +142,9 @@ export default { | ... | @@ -142,27 +142,9 @@ export default { |
| 142 | } | 142 | } |
| 143 | break; | 143 | break; |
| 144 | case "B6": | 144 | case "B6": |
| 145 | //根据编号获取对应信息 | 145 | this.$popupDialog("打印申请书", "workflow/components/dialog/sqs", |
| 146 | getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => { | 146 | { bsmSldy: this.currentSelectProps.bsmSldy }, '30%', true |
| 147 | if (res.code == 200) { | 147 | ) |
| 148 | getPrintApplicationForm(this.currentSelectProps.bsmSldy).then(infoRes => { | ||
| 149 | if (infoRes.code == 200) { | ||
| 150 | //打开模板设计 | ||
| 151 | let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); | ||
| 152 | LODOP.ADD_PRINT_DATA("ProgramData", res.result.tmpcontent); //装载模板 | ||
| 153 | //todo 调取后端接口获取数据 循环set | ||
| 154 | for (let key in infoRes.result) { | ||
| 155 | LODOP.SET_PRINT_STYLEA(key, "CONTENT", infoRes.result[key]); | ||
| 156 | } | ||
| 157 | LODOP.PREVIEW(); | ||
| 158 | } else { | ||
| 159 | this.$message.error(infoRes.message) | ||
| 160 | } | ||
| 161 | }) | ||
| 162 | } else { | ||
| 163 | this.$message.error(res.message) | ||
| 164 | } | ||
| 165 | }) | ||
| 166 | break; | 148 | break; |
| 167 | case "B7": | 149 | case "B7": |
| 168 | this.$popupDialog("证书领取", "workflow/components/dialog/zslq", | 150 | this.$popupDialog("证书领取", "workflow/components/dialog/zslq", | ... | ... |
| ... | @@ -219,10 +219,9 @@ | ... | @@ -219,10 +219,9 @@ |
| 219 | </script> | 219 | </script> |
| 220 | <style lang="scss" scoped> | 220 | <style lang="scss" scoped> |
| 221 | @import "~@/styles/tablecss.scss"; | 221 | @import "~@/styles/tablecss.scss"; |
| 222 | .tableDivCss{ | 222 | .tableDivCss { |
| 223 | width: 100%; | 223 | width: 100%; |
| 224 | height: 100%; | 224 | height: 100%; |
| 225 | background-color: rgb(255, 255, 255); | 225 | background-color: rgb(255, 255, 255); |
| 226 | |||
| 227 | } | 226 | } |
| 228 | </style> | 227 | </style> | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description :宗地基本信息 | 2 | * @Description :宗地基本信息 |
| 3 | * @Autor : miaofang | 3 | * @Autor : miaofang |
| 4 | * @LastEditTime: 2023-08-04 10:06:45 | 4 | * @LastEditTime: 2023-12-19 14:48:11 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="tableDivCss"> | 7 | <div class="tableDivCss"> |
| 8 | <el-button class="print" v-print="printObj">打印</el-button> | 8 | <el-button class="print" v-print="printObj">打印</el-button> |
| 9 | <table cellpadding="0" cellspacing="0" id="box" class="tableCss"> | 9 | <table cellpadding="0" cellspacing="0" id="box" class="tableCss"> |
| 10 | <tr> | 10 | <tr> |
| 11 | <th colspan="5" class="title">宗地基本信息</th> | 11 | <th colspan="5" class="title">宗地基本信息</th> |
| ... | @@ -29,7 +29,7 @@ | ... | @@ -29,7 +29,7 @@ |
| 29 | <td style="width: 15%">宗地面积</td> | 29 | <td style="width: 15%">宗地面积</td> |
| 30 | <td style="width: 30%">{{ zdjbxx.zdmj }}m²</td> | 30 | <td style="width: 30%">{{ zdjbxx.zdmj }}m²</td> |
| 31 | <td style="width: 15%">用途</td> | 31 | <td style="width: 15%">用途</td> |
| 32 | <td style="width: 30%">{{ zdjbxx.yt | dicyt("tdyt") }}</td> | 32 | <td style="width: 30%">{{ zdjbxx.ghytmc }}</td> |
| 33 | </tr> | 33 | </tr> |
| 34 | <tr> | 34 | <tr> |
| 35 | <td>等级</td> | 35 | <td>等级</td> |
| ... | @@ -112,125 +112,125 @@ | ... | @@ -112,125 +112,125 @@ |
| 112 | </template> | 112 | </template> |
| 113 | 113 | ||
| 114 | <script> | 114 | <script> |
| 115 | import store from "@/store/index.js"; | 115 | import store from "@/store/index.js"; |
| 116 | import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js"; | 116 | import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js"; |
| 117 | 117 | ||
| 118 | export default { | 118 | export default { |
| 119 | data() { | 119 | data () { |
| 120 | return { | 120 | return { |
| 121 | printObj: { | 121 | printObj: { |
| 122 | id: "box", | 122 | id: "box", |
| 123 | //其他配置项, | 123 | //其他配置项, |
| 124 | }, | ||
| 125 | bhqkColumns: [ | ||
| 126 | { | ||
| 127 | prop: "ssywh", | ||
| 128 | label: "上手业务号", | ||
| 129 | }, | ||
| 130 | { | ||
| 131 | prop: "zddm", | ||
| 132 | label: "宗地代码", | ||
| 133 | }, | ||
| 134 | { | ||
| 135 | prop: "bhqzddm", | ||
| 136 | label: "变化前宗地代码", | ||
| 137 | }, | ||
| 138 | { | ||
| 139 | prop: "bhnr", | ||
| 140 | label: "变化内容", | ||
| 141 | }, | ||
| 142 | { | ||
| 143 | prop: "bhyy", | ||
| 144 | label: "变化原因", | ||
| 145 | }, | 124 | }, |
| 146 | { | 125 | bhqkColumns: [ |
| 147 | prop: "djsj", | 126 | { |
| 148 | label: "登记时间", | 127 | prop: "ssywh", |
| 149 | }, | 128 | label: "上手业务号", |
| 150 | { | 129 | }, |
| 151 | prop: "dbr", | 130 | { |
| 152 | label: "登簿人", | 131 | prop: "zddm", |
| 153 | }, | 132 | label: "宗地代码", |
| 154 | { | 133 | }, |
| 155 | prop: "fj", | 134 | { |
| 156 | label: "附记", | 135 | prop: "bhqzddm", |
| 157 | }, | 136 | label: "变化前宗地代码", |
| 158 | ], | 137 | }, |
| 159 | bhqkTableWidth: 745, | 138 | { |
| 160 | zdjbxx: {}, | 139 | prop: "bhnr", |
| 161 | zdbhqks: [], | 140 | label: "变化内容", |
| 162 | propsParam: this.$attrs, | 141 | }, |
| 163 | showGroup: false, | 142 | { |
| 164 | bdclxList: ["", "宗地", "宗海", "自然幢", "多幢", "构筑物", "林权", "户"], | 143 | prop: "bhyy", |
| 165 | foundItemaa: {}, | 144 | label: "变化原因", |
| 166 | foundItemaaa: {}, | 145 | }, |
| 167 | }; | 146 | { |
| 168 | }, | 147 | prop: "djsj", |
| 169 | filters: { | 148 | label: "登记时间", |
| 170 | dictionary: function (value, param) { | 149 | }, |
| 171 | const foundItem = store.getters.dictData[param].find( | 150 | { |
| 172 | (item) => item.dcode === String(value) | 151 | prop: "dbr", |
| 173 | ); | 152 | label: "登簿人", |
| 174 | if (foundItem) { | 153 | }, |
| 175 | return foundItem.dname; | 154 | { |
| 176 | } | 155 | prop: "fj", |
| 156 | label: "附记", | ||
| 157 | }, | ||
| 158 | ], | ||
| 159 | bhqkTableWidth: 745, | ||
| 160 | zdjbxx: {}, | ||
| 161 | zdbhqks: [], | ||
| 162 | propsParam: this.$attrs, | ||
| 163 | showGroup: false, | ||
| 164 | bdclxList: ["", "宗地", "宗海", "自然幢", "多幢", "构筑物", "林权", "户"], | ||
| 165 | foundItemaa: {}, | ||
| 166 | foundItemaaa: {}, | ||
| 167 | }; | ||
| 177 | }, | 168 | }, |
| 178 | dicyt: function (value, param) { | 169 | filters: { |
| 179 | const res = store.getters.dictData[param].filter((item) => { | 170 | dictionary: function (value, param) { |
| 180 | if (item.dcode === String(value)) { | 171 | const foundItem = store.getters.dictData[param].find( |
| 181 | return item; | 172 | (item) => item.dcode === String(value) |
| 182 | } else { | 173 | ); |
| 183 | if (item.children.length) { | 174 | if (foundItem) { |
| 184 | const res2 = item.children.filter((items) => { | 175 | return foundItem.dname; |
| 185 | if (items.dcode === String(value)) { | 176 | } |
| 186 | return items; | 177 | }, |
| 178 | dicyt: function (value, param) { | ||
| 179 | const res = store.getters.dictData[param].filter((item) => { | ||
| 180 | if (item.dcode === String(value)) { | ||
| 181 | return item; | ||
| 182 | } else { | ||
| 183 | if (item.children.length) { | ||
| 184 | const res2 = item.children.filter((items) => { | ||
| 185 | if (items.dcode === String(value)) { | ||
| 186 | return items; | ||
| 187 | } | ||
| 188 | }); | ||
| 189 | if (res2.length) { | ||
| 190 | return res2; | ||
| 187 | } | 191 | } |
| 188 | }); | ||
| 189 | if (res2.length) { | ||
| 190 | return res2; | ||
| 191 | } | 192 | } |
| 192 | } | 193 | } |
| 194 | }); | ||
| 195 | if (res[0]) { | ||
| 196 | return res[0].dname; | ||
| 193 | } | 197 | } |
| 194 | }); | 198 | }, |
| 195 | if (res[0]) { | ||
| 196 | return res[0].dname; | ||
| 197 | } | ||
| 198 | }, | 199 | }, |
| 199 | }, | 200 | created () { |
| 200 | created() { | 201 | this.loadData(); |
| 201 | this.loadData(); | ||
| 202 | }, | ||
| 203 | methods: { | ||
| 204 | /** | ||
| 205 | * @description: loadData | ||
| 206 | * @author: renchao | ||
| 207 | */ | ||
| 208 | loadData() { | ||
| 209 | getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => { | ||
| 210 | if (res.code === 200) { | ||
| 211 | this.zdjbxx = res.result.zdjbxx; | ||
| 212 | this.zdbhqks = res.result.zdbhqkList; | ||
| 213 | if (this.zdbhqks != null && this.zdbhqks.length > 0) { | ||
| 214 | this.showGroup = true; | ||
| 215 | } | ||
| 216 | } | ||
| 217 | }); | ||
| 218 | }, | 202 | }, |
| 203 | methods: { | ||
| 204 | /** | ||
| 205 | * @description: loadData | ||
| 206 | * @author: renchao | ||
| 207 | */ | ||
| 208 | loadData () { | ||
| 209 | getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => { | ||
| 210 | if (res.code === 200) { | ||
| 211 | this.zdjbxx = res.result.zdjbxx; | ||
| 212 | this.zdbhqks = res.result.zdbhqkList; | ||
| 213 | if (this.zdbhqks != null && this.zdbhqks.length > 0) { | ||
| 214 | this.showGroup = true; | ||
| 215 | } | ||
| 216 | } | ||
| 217 | }); | ||
| 218 | }, | ||
| 219 | 219 | ||
| 220 | }, | 220 | }, |
| 221 | }; | 221 | }; |
| 222 | </script> | 222 | </script> |
| 223 | <style lang="scss" scoped> | 223 | <style lang="scss" scoped> |
| 224 | @import "~@/styles/tablecss.scss"; | 224 | @import "~@/styles/tablecss.scss"; |
| 225 | .tableDivCss { | 225 | .tableDivCss { |
| 226 | position: relative; | 226 | position: relative; |
| 227 | .print { | 227 | .print { |
| 228 | display: inline; | 228 | display: inline; |
| 229 | // background-color: #0079fe; | 229 | // background-color: #0079fe; |
| 230 | z-index: 10; | 230 | z-index: 10; |
| 231 | position: absolute; | 231 | position: absolute; |
| 232 | left: 11px; | 232 | left: 11px; |
| 233 | top: 11px; | 233 | top: 11px; |
| 234 | } | ||
| 234 | } | 235 | } |
| 235 | } | ||
| 236 | </style> | 236 | </style> | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-12-18 16:08:26 | 4 | * @LastEditTime: 2023-12-19 09:40:39 |
| 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,7 +169,7 @@ | ... | @@ -169,7 +169,7 @@ |
| 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 IS) 旋转"); // 设置纸张大小为 B4 | 172 | // LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4 |
| 173 | LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向 | 173 | LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向 |
| 174 | } else { | 174 | } else { |
| 175 | LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4 | 175 | LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4 | ... | ... |
| ... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
| 28 | <el-tab-pane label="第二页" name="title2"></el-tab-pane> | 28 | <el-tab-pane label="第二页" name="title2"></el-tab-pane> |
| 29 | </el-tabs> | 29 | </el-tabs> |
| 30 | </el-col> | 30 | </el-col> |
| 31 | <el-col :span="2" v-if="this.formData.ysxlh"> | 31 | <el-col :span="2" v-if="this.formData.ysxlh" style="float:right"> |
| 32 | <el-button type="primary" @click="handleZF" v-if="disabled">作废</el-button> | 32 | <el-button type="primary" @click="handleZF" v-if="disabled">作废</el-button> |
| 33 | </el-col> | 33 | </el-col> |
| 34 | </el-row> | 34 | </el-row> | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-12-19 08:54:37 | 4 | * @LastEditTime: 2023-12-19 09:17:03 |
| 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;"> |
| 8 | <!-- 表单部分 --> | 8 | <!-- 表单部分 --> |
| 9 | <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length >1" style="margin-top:-23px"> | 9 | <div style="margin-top:-20px"> |
| 10 | <el-tab-pane :label="item.qlr + (item.bdcqzh !== null ? '(' + item.bdcqzh + ')' : '')" :name="item.bsmBdcqz" | 10 | <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length >1"> |
| 11 | v-for="(item, index) in headTabBdcqz" :key="index"> | 11 | <el-tab-pane :label="item.qlr + (item.bdcqzh !== null ? '(' + item.bdcqzh + ')' : '')" :name="item.bsmBdcqz" |
| 12 | </el-tab-pane> | 12 | v-for="(item, index) in headTabBdcqz" :key="index"> |
| 13 | </el-tabs> | 13 | </el-tab-pane> |
| 14 | <el-tabs v-model="activeTitle" style="margin-top:-20px"> | 14 | </el-tabs> |
| 15 | <el-tab-pane label="第一页" name="title1"></el-tab-pane> | 15 | </div> |
| 16 | <el-tab-pane label="第二页" name="title2"></el-tab-pane> | ||
| 17 | </el-tabs> | ||
| 18 | <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty> | 16 | <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty> |
| 19 | <div :style="{'width':'1180px','overflow-y': 'auto'}"> | 17 | <div style="height:85vh"> |
| 20 | <canvas ref="zs1" width="1000" v-show="this.bdcqz.bdcqzlx==1 && activeTitle=='title1'" height="700"></canvas> | 18 | <div v-show="this.bdcqz.bdcqzlx==1"> |
| 21 | <canvas ref="zs" width="1000" v-show="this.bdcqz.bdcqzlx==1 && activeTitle=='title2'" height="700"></canvas> | 19 | <el-tabs v-model="activeTitle"> |
| 22 | <canvas ref="zm" width="1180" v-show="this.bdcqz.bdcqzlx==2" height="780"></canvas> | 20 | <el-tab-pane label="第一页" name="title1"></el-tab-pane> |
| 21 | <el-tab-pane label="第二页" name="title2"></el-tab-pane> | ||
| 22 | </el-tabs> | ||
| 23 | <div :style="{'width':'1185px','overflow-y': 'auto','height': '670px',}"> | ||
| 24 | <canvas ref="zs1" width="1000" v-show="activeTitle=='title1'" height="700"></canvas> | ||
| 25 | <canvas ref="zs" width="1000" v-show="activeTitle=='title2'" height="700"></canvas> | ||
| 26 | </div> | ||
| 27 | </div> | ||
| 28 | <div style="width:1185px;overflow-x: hidden;height: 700px;overflow-y:auto" v-show="this.bdcqz.bdcqzlx==2"> | ||
| 29 | <canvas ref="zm" width="1180" height="780"></canvas> | ||
| 30 | </div> | ||
| 23 | </div> | 31 | </div> |
| 24 | </div> | 32 | </div> |
| 25 | </template> | 33 | </template> |
| ... | @@ -573,6 +581,9 @@ | ... | @@ -573,6 +581,9 @@ |
| 573 | /deep/.el-form-item--small.el-form-item { | 581 | /deep/.el-form-item--small.el-form-item { |
| 574 | margin-bottom: 0; | 582 | margin-bottom: 0; |
| 575 | } | 583 | } |
| 584 | /deep/.mask-content { | ||
| 585 | padding-top: 10px !important; | ||
| 586 | } | ||
| 576 | .imgClass { | 587 | .imgClass { |
| 577 | display: inline-block; | 588 | display: inline-block; |
| 578 | height: auto; | 589 | height: auto; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-11-22 17:05:55 | 4 | * @LastEditTime: 2023-12-19 10:02:03 |
| 5 | */ | 5 | */ |
| 6 | import Vue from 'vue' | 6 | import Vue from 'vue' |
| 7 | import { getPrintTemplateByCode } from "@/api/print"; | 7 | import { getPrintTemplateByCode } from "@/api/print"; |
| ... | @@ -137,29 +137,6 @@ export default { | ... | @@ -137,29 +137,6 @@ export default { |
| 137 | this.$popupDialog("打印申请书", "workflow/components/dialog/sqs", | 137 | this.$popupDialog("打印申请书", "workflow/components/dialog/sqs", |
| 138 | { bsmSldy: this.currentSelectProps.bsmSldy }, '30%', true | 138 | { bsmSldy: this.currentSelectProps.bsmSldy }, '30%', true |
| 139 | ) | 139 | ) |
| 140 | //根据编号获取对应信息 | ||
| 141 | // getPrintTemplateByCode({ tmpno: Vue.prototype.BASE_API.adapter }).then(res => { | ||
| 142 | // if (res.code === 200) { | ||
| 143 | // getPrintApplicationForm(this.currentSelectProps.bsmSldy).then(infoRes => { | ||
| 144 | // if (infoRes.code === 200) { | ||
| 145 | // let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); | ||
| 146 | |||
| 147 | // // 装载第一个模板并设置数据 | ||
| 148 | // LODOP.ADD_PRINT_DATA("ProgramData", res.result.tmpcontent); | ||
| 149 | // for (let key in infoRes.result) { | ||
| 150 | // LODOP.SET_PRINT_STYLEA(key, "CONTENT", infoRes.result[key]); | ||
| 151 | // } | ||
| 152 | |||
| 153 | // // 进行预览 | ||
| 154 | // LODOP.PREVIEW(); | ||
| 155 | // } else { | ||
| 156 | // this.$message.error(infoRes.message); | ||
| 157 | // } | ||
| 158 | // }); | ||
| 159 | // } else { | ||
| 160 | // this.$message.error(res.message); | ||
| 161 | // } | ||
| 162 | // }) | ||
| 163 | break; | 140 | break; |
| 164 | case "B7": | 141 | case "B7": |
| 165 | this.$popupDialog("证书领取", "workflow/components/dialog/zslq", | 142 | this.$popupDialog("证书领取", "workflow/components/dialog/zslq", | ... | ... |
-
Please register or sign in to post a comment