27b504fb by xiaomiao

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

2 parents 1060b43d 5680bd2e
...@@ -208,10 +208,16 @@ aside { ...@@ -208,10 +208,16 @@ aside {
208 } 208 }
209 209
210 .ellipsis-line { 210 .ellipsis-line {
211 width: 200px; 211 display: inline-block;
212 width: 300px !important;
213 word-break: break-all;
214 text-overflow: ellipsis;
215 display: -webkit-box;
216 -webkit-box-orient: vertical;
217 -webkit-line-clamp: 2;
218 /* 这里是超出几行省略 */
212 overflow: hidden; 219 overflow: hidden;
213 text-overflow: ellipsis; //文本溢出显示省略号 220 margin: 0 auto;
214 white-space: nowrap; //文本不会换行
215 } 221 }
216 222
217 .tooltip-width { 223 .tooltip-width {
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 } 40 }
41 41
42 .menu-con { 42 .menu-con {
43 width: 87%; 43 width: 93%;
44 } 44 }
45 45
46 .batchDel { 46 .batchDel {
...@@ -55,8 +55,10 @@ ...@@ -55,8 +55,10 @@
55 55
56 .title-detail { 56 .title-detail {
57 display: flex; 57 display: flex;
58 flex-wrap: wrap;
59 width: 100%; 58 width: 100%;
59 overflow: hidden;
60 text-overflow: ellipsis; //文本溢出显示省略号
61 white-space: nowrap; //文本不会换行
60 } 62 }
61 63
62 .title-batch { 64 .title-batch {
...@@ -209,7 +211,8 @@ ...@@ -209,7 +211,8 @@
209 box-sizing: border-box; 211 box-sizing: border-box;
210 width: 70px; 212 width: 70px;
211 margin: 0 5px; 213 margin: 0 5px;
212 .icon{ 214
215 .icon {
213 font-size: 10px; 216 font-size: 10px;
214 } 217 }
215 } 218 }
...@@ -229,4 +232,4 @@ ...@@ -229,4 +232,4 @@
229 position: absolute; 232 position: absolute;
230 left: 0; 233 left: 0;
231 bottom: 0; 234 bottom: 0;
232 } 235 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 09:52:13 4 * @LastEditTime: 2023-08-25 17:06:44
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -50,11 +50,14 @@ ...@@ -50,11 +50,14 @@
50 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 50 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
51 正在注销 51 正在注销
52 </div> 52 </div>
53 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
54 53
55 <span v-if="!['djyy','fj'].includes(item.prop)"> 54 <p v-if="!['djyy','fj'].includes(item.prop)">
56 {{ row[item.prop] }} 55 <span v-if="item.prop == 'qszt'">
57 </span> 56 {{ getQsztName(row[item.prop]) }}
57 </span>
58 <span v-else>{{ row[item.prop] }}</span>
59 </p>
60
58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 61 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
59 <span class="ellipsis-line"> 62 <span class="ellipsis-line">
60 {{ row[item.prop] }} 63 {{ row[item.prop] }}
......
...@@ -58,13 +58,14 @@ ...@@ -58,13 +58,14 @@
58 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 58 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
59 正在注销 59 正在注销
60 </div> 60 </div>
61 <span v-if="item.prop == 'qszt'">
62 {{ getQsztName(row[item.prop]) }}
63 </span>
64 61
65 <span v-if="!['djyy','fj'].includes(item.prop)"> 62 <p v-if="!['djyy','fj'].includes(item.prop)">
66 {{ row[item.prop] }} 63 <span v-if="item.prop == 'qszt'">
67 </span> 64 {{ getQsztName(row[item.prop]) }}
65 </span>
66 <span v-else>{{ row[item.prop] }}</span>
67 </p>
68
68 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 69 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
69 <span class="ellipsis-line"> 70 <span class="ellipsis-line">
70 {{ row[item.prop] }} 71 {{ row[item.prop] }}
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 15:54:23 4 * @LastEditTime: 2023-08-25 17:12:43
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -52,13 +52,14 @@ ...@@ -52,13 +52,14 @@
52 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 52 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
53 正在注销 53 正在注销
54 </div> 54 </div>
55 <span v-if="item.prop == 'qszt'">
56 {{ getQsztName(row[item.prop]) }}
57 </span>
58 55
59 <span v-if="!['djyy','fj'].includes(item.prop)"> 56 <p v-if="!['djyy','fj'].includes(item.prop)">
60 {{ row[item.prop] }} 57 <span v-if="item.prop == 'qszt'">
61 </span> 58 {{ getQsztName(row[item.prop]) }}
59 </span>
60 <span v-else>{{ row[item.prop] }}</span>
61 </p>
62
62 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 63 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
63 <span class="ellipsis-line"> 64 <span class="ellipsis-line">
64 {{ row[item.prop] }} 65 {{ row[item.prop] }}
......
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
52 </span> 52 </span>
53 </el-tooltip> 53 </el-tooltip>
54 54
55 <span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)"> {{ row[item.prop] }}</span> 55 <span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)">
56 {{ row[item.prop] }}
57 </span>
56 <div class="many" v-if="judge(item.label)"> 58 <div class="many" v-if="judge(item.label)">
57 <div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index"> 59 <div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index">
58 {{ label[item.prop] }} 60 {{ label[item.prop] }}
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-24 16:14:57 4 * @LastEditTime: 2023-08-25 17:17:06
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -58,13 +58,14 @@ ...@@ -58,13 +58,14 @@
58 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 58 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
59 正在注销 59 正在注销
60 </div> 60 </div>
61 <span v-if="item.prop == 'qszt'">
62 {{ getQsztName(row[item.prop]) }}
63 </span>
64 61
65 <span v-if="!['djyy','fj'].includes(item.prop)"> 62 <p v-if="!['djyy','fj'].includes(item.prop)">
66 {{ row[item.prop] }} 63 <span v-if="item.prop == 'qszt'">
67 </span> 64 {{ getQsztName(row[item.prop]) }}
65 </span>
66 <span v-else>{{ row[item.prop] }}</span>
67 </p>
68
68 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 69 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
69 <span class="ellipsis-line"> 70 <span class="ellipsis-line">
70 {{ row[item.prop] }} 71 {{ row[item.prop] }}
......
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
48 正在注销 48 正在注销
49 </div> 49 </div>
50 <span v-if="item.prop == 'qszt'">
51 {{ getQsztName(row[item.prop]) }}
52 </span>
53 50
54 <span v-if="!['djyy','fj'].includes(item.prop)"> 51 <p v-if="!['djyy','fj'].includes(item.prop)">
55 {{ row[item.prop] }} 52 <span v-if="item.prop == 'qszt'">
56 </span> 53 {{ getQsztName(row[item.prop]) }}
54 </span>
55 <span v-else>{{ row[item.prop] }}</span>
56 </p>
57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
58 <span class="ellipsis-line"> 58 <span class="ellipsis-line">
59 {{ row[item.prop] }} 59 {{ row[item.prop] }}
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 11:29:20 4 * @LastEditTime: 2023-08-25 17:16:32
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
13 <el-checkbox 13 <el-checkbox
14 v-for="item in qsztList" 14 v-for="item in qsztList"
15 :key="item.value" 15 :key="item.value"
16 :label="item.value" 16 :label="item.value">{{ item.label }}</el-checkbox>
17 >{{ item.label }}</el-checkbox>
18 </el-checkbox-group> 17 </el-checkbox-group>
19 </div> 18 </div>
20 </div> 19 </div>
...@@ -35,8 +34,7 @@ ...@@ -35,8 +34,7 @@
35 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 34 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
36 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 35 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
37 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '' 36 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
38 ]" 37 ]">
39 >
40 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 38 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
41 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 39 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
42 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 40 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
...@@ -45,9 +43,19 @@ ...@@ -45,9 +43,19 @@
45 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div> 43 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div> 44 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div> 45 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div>
48 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
49 46
50 <span v-else>{{ row[item.prop] }}</span> 47 <p v-if="!['djyy','fj'].includes(item.prop)">
48 <span v-if="item.prop == 'qszt'">
49 {{ getQsztName(row[item.prop]) }}
50 </span>
51 <span v-else>{{ row[item.prop] }}</span>
52 </p>
53 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
54 <span class="ellipsis-line">
55 {{ row[item.prop] }}
56 </span>
57 </el-tooltip>
58
51 </td> 59 </td>
52 <td v-for="count in emptycolNum" :key="~count"></td> 60 <td v-for="count in emptycolNum" :key="~count"></td>
53 </tr> 61 </tr>
...@@ -58,122 +66,122 @@ ...@@ -58,122 +66,122 @@
58 </template> 66 </template>
59 67
60 <script> 68 <script>
61 import { datas } from "./qlxxFormData.js"; 69 import { datas } from "./qlxxFormData.js";
62 import { getSjlx, getDictLeabel } from "@/utils/dictionary.js"; 70 import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
63 import { getLqList } from "@/api/djbDetail.js"; 71 import { getLqList } from "@/api/djbDetail.js";
64 export default { 72 export default {
65 data() { 73 data () {
66 return { 74 return {
67 title: "林权登记信息", 75 title: "林权登记信息",
68 qsztList: datas.columns().qsztList, 76 qsztList: datas.columns().qsztList,
69 checkList: datas.columns().checkList, 77 checkList: datas.columns().checkList,
70 //传递参数 78 //传递参数
71 propsParam: this.$attrs, 79 propsParam: this.$attrs,
72 //列表数据 80 //列表数据
73 tableData: [], 81 tableData: [],
74 //空列值个数 82 //空列值个数
75 emptycolNum: datas.columns().emptycolNum, 83 emptycolNum: datas.columns().emptycolNum,
76 //列名称对象 84 //列名称对象
77 columns: datas.columns().LDSYQ, 85 columns: datas.columns().LDSYQ,
78 }; 86 };
79 }, 87 },
80 created() { 88 created () {
81 this.loadData(); 89 this.loadData();
82 }, 90 },
83 methods: { 91 methods: {
84 /** 92 /**
85 * @description: loadData 93 * @description: loadData
86 * @author: renchao 94 * @author: renchao
87 */ 95 */
88 loadData() { 96 loadData () {
89 if (this.$parent.addRepairRecord) { 97 if (this.$parent.addRepairRecord) {
90 this.columns.unshift({ 98 this.columns.unshift({
91 prop: "cz", 99 prop: "cz",
92 label: "操作", 100 label: "操作",
93 });
94 }
95 getLqList({
96 bdcdyid: this.propsParam.bdcdyid,
97 qllx: this.propsParam.qllx,
98 qszt: this.checkList,
99 }).then((res) => {
100 if (res.code === 200) {
101 this.tableData = res.result;
102 this.tableData.forEach((item) => {
103 item.sjlx = getSjlx(item.sjlx);
104 item.ldsyqxz = getDictLeabel(item.ldsyqxz, 'A45')
105 item.lz = getDictLeabel(item.lz, 'A26')
106 item.qy = getDictLeabel(item.qy, 'A52')
107 }); 101 });
108 if (this.tableData.length < datas.columns().emptycolNum) { 102 }
109 this.emptycolNum = 103 getLqList({
110 datas.columns().emptycolNum - this.tableData.length; 104 bdcdyid: this.propsParam.bdcdyid,
111 } else { 105 qllx: this.propsParam.qllx,
112 this.emptycolNum = 0; 106 qszt: this.checkList,
107 }).then((res) => {
108 if (res.code === 200) {
109 this.tableData = res.result;
110 this.tableData.forEach((item) => {
111 item.sjlx = getSjlx(item.sjlx);
112 item.ldsyqxz = getDictLeabel(item.ldsyqxz, 'A45')
113 item.lz = getDictLeabel(item.lz, 'A26')
114 item.qy = getDictLeabel(item.qy, 'A52')
115 });
116 if (this.tableData.length < datas.columns().emptycolNum) {
117 this.emptycolNum =
118 datas.columns().emptycolNum - this.tableData.length;
119 } else {
120 this.emptycolNum = 0;
121 }
113 } 122 }
123 });
124 },
125 /**
126 * @description: checkChange
127 * @author: renchao
128 */
129 checkChange () {
130 if (this.checkList.length === 0) {
131 this.tableData = [];
132 this.emptycolNum = datas.columns().emptycolNum;
133 } else {
134 this.loadData();
114 } 135 }
115 }); 136 },
116 }, 137 /**
117 /** 138 * @description: getQsztName
118 * @description: checkChange 139 * @param {*} code
119 * @author: renchao 140 * @author: renchao
120 */ 141 */
121 checkChange() { 142 getQsztName (code) {
122 if (this.checkList.length === 0) { 143 let name = "";
123 this.tableData = []; 144 for (let item of this.qsztList) {
124 this.emptycolNum = datas.columns().emptycolNum; 145 if (item.value == code) {
125 } else { 146 name = item.label;
126 this.loadData(); 147 break;
127 } 148 }
128 },
129 /**
130 * @description: getQsztName
131 * @param {*} code
132 * @author: renchao
133 */
134 getQsztName(code) {
135 let name = "";
136 for (let item of this.qsztList) {
137 if (item.value == code) {
138 name = item.label;
139 break;
140 } 149 }
141 } 150 return name;
142 return name; 151 },
143 }, 152 // 新增一条补录信息
144 // 新增一条补录信息 153 /**
145 /** 154 * @description: 新增一条补录信息
146 * @description: 新增一条补录信息 155 * @param {*} row
147 * @param {*} row 156 * @param {*} del
148 * @param {*} del 157 * @author: renchao
149 * @author: renchao 158 */
150 */ 159 editDialog (row, del) {
151 editDialog(row, del) { 160 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
152 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 161 confirmButtonText: "确定",
153 confirmButtonText: "确定", 162 cancelButtonText: "取消",
154 cancelButtonText: "取消", 163 type: "warning",
155 type: "warning",
156 })
157 .then(() => {
158 this.$parent.addRepairRecord(row, del);
159
160 this.$message({
161 type: "success",
162 message: "补录成功!",
163 });
164 }) 164 })
165 .catch(() => { 165 .then(() => {
166 this.$message({ 166 this.$parent.addRepairRecord(row, del);
167 type: "info", 167
168 message: "取消编辑", 168 this.$message({
169 type: "success",
170 message: "补录成功!",
171 });
172 })
173 .catch(() => {
174 this.$message({
175 type: "info",
176 message: "取消编辑",
177 });
169 }); 178 });
170 }); 179 },
171 }, 180 },
172 }, 181 };
173 };
174 </script> 182 </script>
175 183
176 <style lang="scss" scoped> 184 <style lang="scss" scoped>
177 @import "./qlxxCommon.scss"; 185 @import "./qlxxCommon.scss";
178 </style> 186 </style>
179 187
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-24 16:15:05 4 * @LastEditTime: 2023-08-25 17:19:17
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
47 <div class="icon" v-if="row.qlzt == '4'"> 47 <div class="icon" v-if="row.qlzt == '4'">
48 正在注销 48 正在注销
49 </div> 49 </div>
50 <span v-if="item.prop == 'qszt'">
51 {{ getQsztName(row[item.prop]) }}
52 </span>
53 50
54 <span v-if="!['djyy','fj'].includes(item.prop)"> 51 <p v-if="!['djyy','fj'].includes(item.prop)">
55 {{ row[item.prop] }} 52 <span v-if="item.prop == 'qszt'">
56 </span> 53 {{ getQsztName(row[item.prop]) }}
54 </span>
55 <span v-else>{{ row[item.prop] }}</span>
56 </p>
57 57
58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
59 <span class="ellipsis-line"> 59 <span class="ellipsis-line">
...@@ -93,13 +93,14 @@ ...@@ -93,13 +93,14 @@
93 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 93 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
94 正在注销 94 正在注销
95 </div> 95 </div>
96 <span v-if="item.prop == 'qszt'">
97 {{ getQsztName(row[item.prop]) }}
98 </span>
99 96
100 <span v-if="!['djyy','fj'].includes(item.prop)"> 97 <p v-if="!['djyy','fj'].includes(item.prop)">
101 {{ row[item.prop] }} 98 <span v-if="item.prop == 'qszt'">
102 </span> 99 {{ getQsztName(row[item.prop]) }}
100 </span>
101 <span v-else>{{ row[item.prop] }}</span>
102 </p>
103
103 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 104 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
104 <span class="ellipsis-line"> 105 <span class="ellipsis-line">
105 {{ row[item.prop] }} 106 {{ row[item.prop] }}
......
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
23 <el-checkbox 23 <el-checkbox
24 v-for="item in qsztList" 24 v-for="item in qsztList"
25 :key="item.value" 25 :key="item.value"
26 :label="item.value" 26 :label="item.value">{{ item.label }}</el-checkbox>
27 >{{ item.label }}</el-checkbox>
28 </el-checkbox-group> 27 </el-checkbox-group>
29 </div> 28 </div>
30 </div> 29 </div>
...@@ -45,8 +44,7 @@ ...@@ -45,8 +44,7 @@
45 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 44 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
46 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 45 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
47 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '' 46 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
48 ]" 47 ]">
49 >
50 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 48 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
51 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 49 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
52 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 50 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
...@@ -55,9 +53,23 @@ ...@@ -55,9 +53,23 @@
55 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div> 53 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
56 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div> 54 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
57 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div> 55 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div>
58 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
59 56
60 <span v-else>{{ row[item.prop] }}</span> 57 <!-- <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
58 <span v-else>{{ row[item.prop] }}</span> -->
59
60 <p v-if="!['djyy','fj'].includes(item.prop)">
61 <span v-if="item.prop == 'qszt'">
62 {{ getQsztName(row[item.prop]) }}
63 </span>
64 <span v-else>{{ row[item.prop] }}</span>
65 </p>
66
67 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
68 <span class="ellipsis-line">
69 {{ row[item.prop] }}
70 </span>
71 </el-tooltip>
72
61 </td> 73 </td>
62 <td v-for="count in emptycolNum" :key="~count"></td> 74 <td v-for="count in emptycolNum" :key="~count"></td>
63 </tr> 75 </tr>
...@@ -68,119 +80,119 @@ ...@@ -68,119 +80,119 @@
68 </template> 80 </template>
69 81
70 <script> 82 <script>
71 import { datas } from "./qlxxFormData.js"; 83 import { datas } from "./qlxxFormData.js";
72 import { getSjlx } from "@/utils/dictionary.js"; 84 import { getSjlx } from "@/utils/dictionary.js";
73 import { getLqList } from "@/api/djbDetail.js"; 85 import { getLqList } from "@/api/djbDetail.js";
74 export default { 86 export default {
75 data() { 87 data () {
76 return { 88 return {
77 title: "林权登记信息", 89 title: "林权登记信息",
78 qsztList: datas.columns().qsztList, 90 qsztList: datas.columns().qsztList,
79 checkList: datas.columns().checkList, 91 checkList: datas.columns().checkList,
80 //传递参数 92 //传递参数
81 propsParam: this.$attrs, 93 propsParam: this.$attrs,
82 //列表数据 94 //列表数据
83 tableData: [], 95 tableData: [],
84 //空列值个数 96 //空列值个数
85 emptycolNum: datas.columns().emptycolNum, 97 emptycolNum: datas.columns().emptycolNum,
86 //列名称对象 98 //列名称对象
87 columns: datas.columns().LDSYQ, 99 columns: datas.columns().LDSYQ,
88 }; 100 };
89 }, 101 },
90 created() { 102 created () {
91 this.loadData(); 103 this.loadData();
92 }, 104 },
93 methods: { 105 methods: {
94 /** 106 /**
95 * @description: loadData 107 * @description: loadData
96 * @author: renchao 108 * @author: renchao
97 */ 109 */
98 loadData() { 110 loadData () {
99 if (this.$parent.addRepairRecord) { 111 if (this.$parent.addRepairRecord) {
100 this.columns.unshift({ 112 this.columns.unshift({
101 prop: "cz", 113 prop: "cz",
102 label: "操作", 114 label: "操作",
103 });
104 }
105 getLqList({
106 bdcdyid: this.propsParam.bdcdyid,
107 qllx: this.propsParam.qllx,
108 qszt: this.checkList,
109 }).then((res) => {
110 if (res.code === 200) {
111 this.tableData = res.result;
112 this.tableData.forEach((item) => {
113 item.sjlx = getSjlx(item.sjlx);
114 }); 115 });
115 if (this.tableData.length < datas.columns().emptycolNum) { 116 }
116 this.emptycolNum = 117 getLqList({
117 datas.columns().emptycolNum - this.tableData.length; 118 bdcdyid: this.propsParam.bdcdyid,
118 } else { 119 qllx: this.propsParam.qllx,
119 this.emptycolNum = 0; 120 qszt: this.checkList,
121 }).then((res) => {
122 if (res.code === 200) {
123 this.tableData = res.result;
124 this.tableData.forEach((item) => {
125 item.sjlx = getSjlx(item.sjlx);
126 });
127 if (this.tableData.length < datas.columns().emptycolNum) {
128 this.emptycolNum =
129 datas.columns().emptycolNum - this.tableData.length;
130 } else {
131 this.emptycolNum = 0;
132 }
120 } 133 }
134 });
135 },
136 /**
137 * @description: checkChange
138 * @author: renchao
139 */
140 checkChange () {
141 if (this.checkList.length === 0) {
142 this.tableData = [];
143 this.emptycolNum = datas.columns().emptycolNum;
144 } else {
145 this.loadData();
121 } 146 }
122 }); 147 },
123 }, 148 /**
124 /** 149 * @description: getQsztName
125 * @description: checkChange 150 * @param {*} code
126 * @author: renchao 151 * @author: renchao
127 */ 152 */
128 checkChange() { 153 getQsztName (code) {
129 if (this.checkList.length === 0) { 154 let name = "";
130 this.tableData = []; 155 for (let item of this.qsztList) {
131 this.emptycolNum = datas.columns().emptycolNum; 156 if (item.value == code) {
132 } else { 157 name = item.label;
133 this.loadData(); 158 break;
134 } 159 }
135 },
136 /**
137 * @description: getQsztName
138 * @param {*} code
139 * @author: renchao
140 */
141 getQsztName(code) {
142 let name = "";
143 for (let item of this.qsztList) {
144 if (item.value == code) {
145 name = item.label;
146 break;
147 } 160 }
148 } 161 return name;
149 return name; 162 },
150 }, 163 // 新增一条补录信息
151 // 新增一条补录信息 164 /**
152 /** 165 * @description: 新增一条补录信息
153 * @description: 新增一条补录信息 166 * @param {*} row
154 * @param {*} row 167 * @param {*} del
155 * @param {*} del 168 * @author: renchao
156 * @author: renchao 169 */
157 */ 170 editDialog (row, del) {
158 editDialog(row, del) { 171 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
159 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 172 confirmButtonText: "确定",
160 confirmButtonText: "确定", 173 cancelButtonText: "取消",
161 cancelButtonText: "取消", 174 type: "warning",
162 type: "warning",
163 })
164 .then(() => {
165 this.$parent.addRepairRecord(row, del);
166
167 this.$message({
168 type: "success",
169 message: "补录成功!",
170 });
171 }) 175 })
172 .catch(() => { 176 .then(() => {
173 this.$message({ 177 this.$parent.addRepairRecord(row, del);
174 type: "info", 178
175 message: "取消编辑", 179 this.$message({
180 type: "success",
181 message: "补录成功!",
182 });
183 })
184 .catch(() => {
185 this.$message({
186 type: "info",
187 message: "取消编辑",
188 });
176 }); 189 });
177 }); 190 },
178 }, 191 },
179 }, 192 };
180 };
181 </script> 193 </script>
182 194
183 <style lang="scss" scoped> 195 <style lang="scss" scoped>
184 @import "./qlxxCommon.scss"; 196 @import "./qlxxCommon.scss";
185 </style> 197 </style>
186 198
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -47,13 +47,14 @@ ...@@ -47,13 +47,14 @@
47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
48 正在注销 48 正在注销
49 </div> 49 </div>
50 <span v-if="item.prop == 'qszt'">
51 {{ getQsztName(row[item.prop]) }}
52 </span>
53 50
54 <span v-if="!['djyy','fj'].includes(item.prop)"> 51 <p v-if="!['djyy','fj'].includes(item.prop)">
55 {{ row[item.prop] }} 52 <span v-if="item.prop == 'qszt'">
56 </span> 53 {{ getQsztName(row[item.prop]) }}
54 </span>
55 <span v-else>{{ row[item.prop] }}</span>
56 </p>
57
57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
58 <span class="ellipsis-line"> 59 <span class="ellipsis-line">
59 {{ row[item.prop] }} 60 {{ row[item.prop] }}
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-24 16:15:42 4 * @LastEditTime: 2023-08-25 17:14:29
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -46,13 +46,14 @@ ...@@ -46,13 +46,14 @@
46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
47 正在注销 47 正在注销
48 </div> 48 </div>
49 <span v-if="item.prop == 'qszt'">
50 {{ getQsztName(row[item.prop]) }}
51 </span>
52 49
53 <span v-if="!['djyy','fj'].includes(item.prop)"> 50 <p v-if="!['djyy','fj'].includes(item.prop)">
54 {{ row[item.prop] }} 51 <span v-if="item.prop == 'qszt'">
55 </span> 52 {{ getQsztName(row[item.prop]) }}
53 </span>
54 <span v-else>{{ row[item.prop] }}</span>
55 </p>
56
56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
57 <span class="ellipsis-line"> 58 <span class="ellipsis-line">
58 {{ row[item.prop] }} 59 {{ row[item.prop] }}
......
...@@ -46,13 +46,14 @@ ...@@ -46,13 +46,14 @@
46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
47 正在注销 47 正在注销
48 </div> 48 </div>
49 <span v-if="item.prop == 'qszt'">
50 {{ getQsztName(row[item.prop]) }}
51 </span>
52 49
53 <span v-if="!['djyy','fj'].includes(item.prop)"> 50 <p v-if="!['djyy','fj'].includes(item.prop)">
54 {{ row[item.prop] }} 51 <span v-if="item.prop == 'qszt'">
55 </span> 52 {{ getQsztName(row[item.prop]) }}
53 </span>
54 <span v-else>{{ row[item.prop] }}</span>
55 </p>
56
56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
57 <span class="ellipsis-line"> 58 <span class="ellipsis-line">
58 {{ row[item.prop] }} 59 {{ row[item.prop] }}
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-13 16:42:26 4 * @LastEditTime: 2023-08-28 09:02:00
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">
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
120 } 120 }
121 }) 121 })
122 }, 122 },
123 //编辑
124 /** 123 /**
125 * @description: 编辑 124 * @description: 编辑
126 * @author: renchao 125 * @author: renchao
...@@ -184,6 +183,12 @@ ...@@ -184,6 +183,12 @@
184 ); 183 );
185 setTimeout(() => { 184 setTimeout(() => {
186 that.ruleForm.tmpcontent = document.getElementById("S1").value; 185 that.ruleForm.tmpcontent = document.getElementById("S1").value;
186 debugger
187 if (that.ruleForm.tmpno == 'zsdy') {
188 LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg'>");
189 LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图
190 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4");
191 }
187 that.loadStatus = '2'; 192 that.loadStatus = '2';
188 }, 1000); 193 }, 1000);
189 }; 194 };
......
...@@ -70,11 +70,11 @@ ...@@ -70,11 +70,11 @@
70 label: "权利性质" 70 label: "权利性质"
71 }, 71 },
72 { 72 {
73 prop: "ytmc", 73 prop: "qlytmc",
74 label: "用途" 74 label: "用途"
75 }, 75 },
76 { 76 {
77 prop: "mjmc", 77 prop: "qlmjmc",
78 label: "面积" 78 label: "面积"
79 }, 79 },
80 { 80 {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-25 10:34:46 4 * @LastEditTime: 2023-08-25 16:25:57
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
26 <canvas ref="zs" width="1000" class="zsyl" height="700"></canvas> 26 <canvas ref="zs" width="1000" class="zsyl" height="700"></canvas>
27 </div> 27 </div>
28 </div> 28 </div>
29 <!-- 打印模板需要此模块 -->
30 <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" v-show="false">
31 <embed id="LODOP_EM" type="application/x-print-lodop" width="1180" height="720" pluginspage="install_lodop32.exe" />
32 </object>
29 <div class="text-center pt-10"> 33 <div class="text-center pt-10">
30 <el-button @click="$popupCacel">取消</el-button> 34 <el-button @click="$popupCacel">取消</el-button>
31 <el-button type="primary" @click="handleSubmit">确定</el-button> 35 <el-button type="primary" @click="handleSubmit">确定</el-button>
...@@ -36,6 +40,8 @@ ...@@ -36,6 +40,8 @@
36 <script> 40 <script>
37 import store from '@/store/index.js' 41 import store from '@/store/index.js'
38 import { datas } from "../../javascript/zsyl.js"; 42 import { datas } from "../../javascript/zsyl.js";
43 import { getPrintTemplateByCode } from "@/api/print";
44 import { getLodop } from "@/utils/LodopFuncs"
39 import { readYsxlh, certificate, getSlsqBdcqzList } from "@/api/bdcqz.js"; 45 import { readYsxlh, certificate, getSlsqBdcqzList } from "@/api/bdcqz.js";
40 export default { 46 export default {
41 props: { 47 props: {
...@@ -89,7 +95,6 @@ ...@@ -89,7 +95,6 @@
89 } 95 }
90 }) 96 })
91 }, 97 },
92 //获取受理申请下全部不动产权证
93 /** 98 /**
94 * @description: 获取受理申请下全部不动产权证 99 * @description: 获取受理申请下全部不动产权证
95 * @author: renchao 100 * @author: renchao
...@@ -189,30 +194,32 @@ ...@@ -189,30 +194,32 @@
189 }) 194 })
190 }) 195 })
191 } 196 }
192 197 // 权利其他状态
193 // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429); 198 const maxWidth = 332; // 最大宽度限制
194 // qlqtzk
195 const maxWidth = 330; // 最大宽度限制
196 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; 199 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
197 lines.forEach((line, index) => { 200 for (let i = 0; i < lines.length; i++) {
198 const y = 463 + (index * 40); // 每行文本的垂直位置 201 if (getByteLen(lines[i]) > 41) {
199 let currentLine = ''; 202 let currentLine = '';
200 let arr = []; 203 let arr = [];
201 for (let word of line) { 204 for (let word of lines[i]) {
202 const testLine = currentLine + word; 205 const testLine = currentLine + word;
203 const lineWidth = context.measureText(testLine).width; 206 const lineWidth = context.measureText(testLine).width;
204 if (lineWidth <= maxWidth) { 207 if (lineWidth <= maxWidth) {
205 currentLine = testLine; 208 currentLine = testLine;
206 } else { 209 } else {
207 arr.push(currentLine); 210 arr.push(currentLine);
208 currentLine = word; 211 currentLine = word;
212 }
209 } 213 }
214 arr.push(currentLine);
215 arr.forEach((line, index) => {
216 context.fillText(line, 129, 490 + (28 * (i - 1)) + (index * 14)); // 调整行高
217 })
218 } else {
219 context.fillText(lines[i] ? lines[i] : '', 129, 495 + (30 * (i - 1)));
210 } 220 }
211 arr.push(currentLine); 221 }
212 arr.forEach((line, index) => { 222
213 context.fillText(line, 129, y + (index * 20)); // 调整行高
214 })
215 })
216 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : []; 223 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
217 lines1.forEach((line, index) => { 224 lines1.forEach((line, index) => {
218 const y = 100 + (index * 30); // 每行文本的垂直位置 225 const y = 100 + (index * 30); // 每行文本的垂直位置
...@@ -328,19 +335,44 @@ ...@@ -328,19 +335,44 @@
328 handleSubmit () { 335 handleSubmit () {
329 this.savePrintRecord() 336 this.savePrintRecord()
330 }, 337 },
331 //保存打印记录
332 /** 338 /**
333 * @description: 保存打印记录 339 * @description: 保存打印记录
334 * @author: renchao 340 * @author: renchao
335 */ 341 */
336 savePrintRecord () { 342 savePrintRecord () {
343 let that = this
337 this.ruleForm.bsmBdcqz = this.formData.bdcqz.bsmBdcqz; 344 this.ruleForm.bsmBdcqz = this.formData.bdcqz.bsmBdcqz;
338 this.ruleForm.bdcqzlx = this.formData.bdcqz.bdcqzlx; 345 this.ruleForm.bdcqzlx = this.formData.bdcqz.bdcqzlx;
339 this.ruleForm.szzh = this.formData.bdcqz.bdcqzh; 346 this.ruleForm.szzh = this.formData.bdcqz.bdcqzh;
340 certificate(this.ruleForm).then((res) => { 347 certificate(this.ruleForm).then((res) => {
341 if (res.code === 200) { 348 if (res.code === 200) {
342 this.$popupCacel() 349 that.$popupCacel()
343 this.$message.success("提交成功") 350 // this.$message.success("提交成功")
351 getPrintTemplateByCode({ tmpno: 'zsdy' }).then(res => {
352 if (res.code == 200) {
353 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(infoRes => {
354 if (infoRes.code == 200) {
355 if (infoRes.result && infoRes.result.length > 0) {
356 //打开模板设计
357 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
358 LODOP.ADD_PRINT_DATA("ProgramData", res.result.tmpcontent); //装载模板
359
360 infoRes.result[0].bdcdyh1 = infoRes.result[0].bdcdyh.slice(0, 6) + ' ' + infoRes.result[0].bdcdyh.slice(6, 12) + ' ' +
361 infoRes.result[0].bdcdyh.slice(12, 19) + ' ' + infoRes.result[0].bdcdyh.slice(19, infoRes.result[0].bdcdyh.length)
362 //todo 调取后端接口获取数据 循环set
363 for (let key in infoRes.result[0]) {
364 LODOP.SET_PRINT_STYLEA(key, "CONTENT", infoRes.result[0][key]);
365 }
366 LODOP.PREVIEW();
367 that.$popupCacel()
368 }
369 }
370 })
371 } else {
372 this.$message.error(res.message)
373 }
374 })
375
344 //刷新列表 376 //刷新列表
345 store.dispatch('user/reWorkFresh', true) 377 store.dispatch('user/reWorkFresh', true)
346 } else { 378 } else {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-25 10:44:31 4 * @LastEditTime: 2023-08-25 14:10:54
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -201,28 +201,51 @@ ...@@ -201,28 +201,51 @@
201 }) 201 })
202 } 202 }
203 // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429); 203 // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
204 // qlqtzk 204 // 权利其他状态
205 const maxWidth = 330; // 最大宽度限制 205 const maxWidth = 332; // 最大宽度限制
206 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; 206 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
207 lines.forEach((line, index) => { 207 // lines.forEach((line, index) => {
208 const y = 463 + (index * 40); // 每行文本的垂直位置 208 // const y = 463 + (index * 33); // 每行文本的垂直位置
209 let currentLine = ''; 209 // let currentLine = '';
210 let arr = []; 210 // let arr = [];
211 for (let word of line) { 211 // for (let word of line) {
212 const testLine = currentLine + word; 212 // const testLine = currentLine + word;
213 const lineWidth = context.measureText(testLine).width; 213 // const lineWidth = context.measureText(testLine).width;
214 if (lineWidth <= maxWidth) { 214 // if (lineWidth <= maxWidth) {
215 currentLine = testLine; 215 // currentLine = testLine;
216 } else { 216 // } else {
217 arr.push(currentLine); 217 // arr.push(currentLine);
218 currentLine = word; 218 // currentLine = word;
219 // }
220 // }
221 // arr.push(currentLine);
222 // arr.forEach((line, index) => {
223 // context.fillText(line, 129, y + (index * 17)); // 调整行高
224 // })
225 // })
226 for (let i = 0; i < lines.length; i++) {
227 if (getByteLen(lines[i]) > 41) {
228 let currentLine = '';
229 let arr = [];
230 for (let word of lines[i]) {
231 const testLine = currentLine + word;
232 const lineWidth = context.measureText(testLine).width;
233 if (lineWidth <= maxWidth) {
234 currentLine = testLine;
235 } else {
236 arr.push(currentLine);
237 currentLine = word;
238 }
219 } 239 }
240 arr.push(currentLine);
241 arr.forEach((line, index) => {
242 context.fillText(line, 129, 485 + (28 * (i - 1)) + (index * 14)); // 调整行高
243 })
244 } else {
245 context.fillText(lines[i] ? lines[i] : '', 129, 495 + (25 * (i - 1)));
220 } 246 }
221 arr.push(currentLine); 247 }
222 arr.forEach((line, index) => { 248
223 context.fillText(line, 129, y + (index * 20)); // 调整行高
224 })
225 })
226 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : []; 249 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
227 lines1.forEach((line, index) => { 250 lines1.forEach((line, index) => {
228 const y = 100 + (index * 30); // 每行文本的垂直位置 251 const y = 100 + (index * 30); // 每行文本的垂直位置
...@@ -383,7 +406,7 @@ ...@@ -383,7 +406,7 @@
383 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; 406 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
384 if (lines[0]) { 407 if (lines[0]) {
385 lines[0].split(' ').forEach((line, index) => { 408 lines[0].split(' ').forEach((line, index) => {
386 const y = 415 + (index * 60); // 每行文本的垂直位置 409 const y = 415 + (index * 30); // 每行文本的垂直位置
387 let currentLine = ''; 410 let currentLine = '';
388 let arr = []; 411 let arr = [];
389 for (let word of line) { 412 for (let word of line) {
...@@ -398,13 +421,13 @@ ...@@ -398,13 +421,13 @@
398 } 421 }
399 arr.push(currentLine); 422 arr.push(currentLine);
400 arr.forEach((line, index) => { 423 arr.forEach((line, index) => {
401 context.fillText(line, 775, y + (index * 23)); // 调整行高 424 context.fillText(line, 775, y + (index * 14)); // 调整行高
402 }); 425 });
403 }); 426 });
404 } 427 }
405 428
406 lines.slice(1).forEach((line, index) => { 429 lines.slice(1).forEach((line, index) => {
407 const y = ((parseInt(lines[0].length) / 19) * 22) + 415 + (index * 30); // 每行文本的垂直位置 430 const y = ((parseInt(lines[0].length) / 19) * 22) + 415 + (index * 20); // 每行文本的垂直位置
408 let currentLine = ''; 431 let currentLine = '';
409 let arr = []; 432 let arr = [];
410 for (let word of line) { 433 for (let word of line) {
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-25 14:55:49 4 * @LastEditTime: 2023-08-28 08:44:31
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
20 <p class="dot" v-if="item.issave == '0'"></p> 20 <p class="dot" v-if="item.issave == '0'"></p>
21 <div class="menu-con"> 21 <div class="menu-con">
22 <p>{{ item.bdcdyh }}</p> 22 <p>{{ item.bdcdyh }}</p>
23 <p class="title-detail">{{ item.zl }}</p> 23 <el-tooltip effect="dark" :content="item.zl" placement="top">
24 <p class="title-detail">{{ item.zl }}</p>
25 </el-tooltip>
24 </div> 26 </div>
25 <i class="el-icon-delete" v-if="unitData.length > 1" @click.stop="handleDel(item)"></i> 27 <i class="el-icon-delete" v-if="unitData.length > 1" @click.stop="handleDel(item)"></i>
26 </el-menu-item> 28 </el-menu-item>
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-分割 2 * @Description: workFrame左侧菜单列表-分割
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-25 14:52:40 4 * @LastEditTime: 2023-08-28 08:46:04
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
19 <el-menu-item v-for="(item, index) in aroundUnitData" :index="index.toString()" :key="index"> 19 <el-menu-item v-for="(item, index) in aroundUnitData" :index="index.toString()" :key="index">
20 <div> 20 <div>
21 <p>{{ item.bdcdyh }}</p> 21 <p>{{ item.bdcdyh }}</p>
22 <p class="title-detail">{{ item.zl }}</p> 22 <el-tooltip effect="dark" :content="item.zl" placement="top">
23 <p class="title-detail">{{ item.zl }}</p>
24 </el-tooltip>
23 </div> 25 </div>
24 <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item)"></i> 26 <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item)"></i>
25 </el-menu-item> 27 </el-menu-item>
...@@ -33,7 +35,9 @@ ...@@ -33,7 +35,9 @@
33 <span class="dot" v-if="item.issave == '0'"></span> 35 <span class="dot" v-if="item.issave == '0'"></span>
34 <div> 36 <div>
35 <p>{{ item.bdcdyh }}</p> 37 <p>{{ item.bdcdyh }}</p>
36 <p class="title-detail">{{ item.zl }}</p> 38 <el-tooltip effect="dark" :content="item.zl" placement="top">
39 <p class="title-detail">{{ item.zl }}</p>
40 </el-tooltip>
37 </div> 41 </div>
38 <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item)"></i> 42 <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item)"></i>
39 </el-menu-item> 43 </el-menu-item>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div class="szxx"> 7 <div class="szxx">
8 <el-card class="box-card" v-for="(item, index) in tableData" :key="index"> 8 <el-card :class="item.szcs == 0 ? 'box-card':'box-card bg-red'" v-for="(item, index) in tableData" :key="index">
9 <div slot="header" class="szxx_header"> 9 <div slot="header" class="szxx_header">
10 <span class="header_type">{{ 10 <span class="header_type">{{
11 item.bdcqzlx == 1 ? "不动产权证书" : "不动产登记证明" 11 item.bdcqzlx == 1 ? "不动产权证书" : "不动产登记证明"
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 <el-button class="operation_button" type="text" @click="openRecordPop(item)">缮证记录</el-button> 49 <el-button class="operation_button" type="text" @click="openRecordPop(item)">缮证记录</el-button>
50 </div> 50 </div>
51 <div class="text" v-else> 51 <div class="text" v-else>
52 <el-button class="operation_button" type="text" @click="openZsylDialog(item, 2)">证书打印1{{ item.szcs 52 <el-button class="operation_button" type="text" @click="openZsylDialog(item, 2)">证书打印({{ item.szcs
53 }}</el-button> 53 }}</el-button>
54 <el-button class="operation_button" type="text" @click="openRecordPop(item)">缮证记录</el-button> 54 <el-button class="operation_button" type="text" @click="openRecordPop(item)">缮证记录</el-button>
55 </div> 55 </div>
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
75 <script> 75 <script>
76 import { mapGetters } from 'vuex' 76 import { mapGetters } from 'vuex'
77 import store from '@/store/index.js' 77 import store from '@/store/index.js'
78 import { getPrintTemplateByCode } from "@/api/print";
78 import { getSlsqBdcqzList, invalidCertificate } from "@/api/bdcqz.js"; 79 import { getSlsqBdcqzList, invalidCertificate } from "@/api/bdcqz.js";
79 export default { 80 export default {
80 props: {}, 81 props: {},
...@@ -210,7 +211,7 @@ ...@@ -210,7 +211,7 @@
210 } 211 }
211 212
212 .szxx_header { 213 .szxx_header {
213 color: #ffffff; 214 // color: #ffffff;
214 font-weight: bolder; 215 font-weight: bolder;
215 font-size: 16px; 216 font-size: 16px;
216 217
...@@ -291,9 +292,18 @@ ...@@ -291,9 +292,18 @@
291 justify-content: flex-end; 292 justify-content: flex-end;
292 } 293 }
293 } 294 }
294 295 .box-card{
295 /deep/.el-card__header { 296 .szxx_header{
296 background-color: rgb(198, 67, 83); 297 color: #303133;
298 }
299 }
300 .bg-red{
301 .szxx_header{
302 color: #FFF;
303 }
304 /deep/.el-card__header {
305 background-color: rgb(198, 67, 83);
306 }
297 } 307 }
298 308
299 /deep/.el-card__body { 309 /deep/.el-card__body {
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 } 40 }
41 41
42 .menu-con { 42 .menu-con {
43 width: 87%; 43 width: 93%;
44 } 44 }
45 45
46 .batchDel { 46 .batchDel {
...@@ -54,8 +54,10 @@ ...@@ -54,8 +54,10 @@
54 } 54 }
55 55
56 .title-detail { 56 .title-detail {
57 word-wrap: break-word;
58 width: 100%; 57 width: 100%;
58 overflow: hidden;
59 text-overflow: ellipsis; //文本溢出显示省略号
60 white-space: nowrap; //文本不会换行
59 } 61 }
60 62
61 .title-batch { 63 .title-batch {
...@@ -208,7 +210,8 @@ ...@@ -208,7 +210,8 @@
208 box-sizing: border-box; 210 box-sizing: border-box;
209 width: 70px; 211 width: 70px;
210 margin: 0 5px; 212 margin: 0 5px;
211 .icon{ 213
214 .icon {
212 font-size: 10px; 215 font-size: 10px;
213 } 216 }
214 } 217 }
...@@ -228,4 +231,4 @@ ...@@ -228,4 +231,4 @@
228 position: absolute; 231 position: absolute;
229 left: 0; 232 left: 0;
230 bottom: 0; 233 bottom: 0;
231 } 234 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -133,12 +133,12 @@ ...@@ -133,12 +133,12 @@
133 </el-col> 133 </el-col>
134 <el-col :span="8"> 134 <el-col :span="8">
135 <el-form-item :class="flag ? 'marginBot0' : ''" label="用途:"> 135 <el-form-item :class="flag ? 'marginBot0' : ''" label="用途:">
136 <el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input> 136 <el-input disabled v-model="ruleForm.ztQlxx.qlytmc"></el-input>
137 </el-form-item> 137 </el-form-item>
138 </el-col> 138 </el-col>
139 <el-col :span="8"> 139 <el-col :span="8">
140 <el-form-item :class="flag ? 'marginBot0' : ''" label="面积:"> 140 <el-form-item :class="flag ? 'marginBot0' : ''" label="面积:">
141 <el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input> 141 <el-input disabled v-model="ruleForm.ztQlxx.qlmjmc"></el-input>
142 </el-form-item> 142 </el-form-item>
143 </el-col> 143 </el-col>
144 </el-row> 144 </el-row>
......
...@@ -46,13 +46,14 @@ ...@@ -46,13 +46,14 @@
46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
47 正在注销 47 正在注销
48 </div> 48 </div>
49 <span v-if="item.prop == 'qszt'">
50 {{ getQsztName(row[item.prop]) }}
51 </span>
52 49
53 <span v-if="!['djyy','fj'].includes(item.prop)"> 50 <p v-if="!['djyy','fj'].includes(item.prop)">
54 {{ row[item.prop] }} 51 <span v-if="item.prop == 'qszt'">
55 </span> 52 {{ getQsztName(row[item.prop]) }}
53 </span>
54 <span v-else>{{ row[item.prop] }}</span>
55 </p>
56
56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
57 <span class="ellipsis-line"> 58 <span class="ellipsis-line">
58 {{ row[item.prop] }} 59 {{ row[item.prop] }}
......
...@@ -104,7 +104,7 @@ class data extends filter { ...@@ -104,7 +104,7 @@ class data extends filter {
104 minWidth: '150', 104 minWidth: '150',
105 }, 105 },
106 { 106 {
107 prop: "mjmc", 107 prop: "qlmjmc",
108 label: "面积", 108 label: "面积",
109 width: '130' 109 width: '130'
110 }, 110 },
...@@ -114,7 +114,7 @@ class data extends filter { ...@@ -114,7 +114,7 @@ class data extends filter {
114 minWidth: '130' 114 minWidth: '130'
115 }, 115 },
116 { 116 {
117 prop: "ytmc", 117 prop: "qlytmc",
118 label: "用途", 118 label: "用途",
119 minWidth: '130' 119 minWidth: '130'
120 }, 120 },
......