2ac8114f by “miaofang

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

2 parents 78a18e95 f1796538
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 15:52:44 4 * @LastEditTime: 2023-09-22 09:30:34
5 --> 5 -->
6 <template> 6 <template>
7 <div class='ywdialog'> 7 <div class='ywdialog'>
...@@ -35,5 +35,6 @@ ...@@ -35,5 +35,6 @@
35 @import "~@/styles/public.scss"; 35 @import "~@/styles/public.scss";
36 .ywdialog { 36 .ywdialog {
37 min-width: 230px; 37 min-width: 230px;
38 padding-bottom: 20px;
38 } 39 }
39 </style> 40 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-09-21 15:45:27
5 */
6 import filter from '@/utils/filter.js'
7 let vm = null
8
9 const sendThis = (_this) => {
10 vm = _this
11 }
12 class data1 extends filter {
13 constructor() {
14 super()
15 }
16 columns () {
17 return [
18 {
19 prop: "qlrmc",
20 label: "姓名/名称",
21 },
22 {
23 prop: "zjzlMc",
24 label: "证件种类"
25 },
26 {
27 prop: "zjh",
28 label: "证件号",
29 },
30 {
31 prop: "frmc",
32 label: "法人名称",
33 },
34 {
35 prop: "dwdz",
36 label: "地址",
37 },
38 {
39 prop: "dh",
40 label: "联系电话",
41 }
42 ]
43 }
44
45 }
46 class data2 extends filter {
47 constructor() {
48 super()
49
50 }
51 columns () {
52 return [
53 {
54 prop: "qlrmc",
55 label: "姓名/名称",
56 },
57 {
58 prop: "zjzlMc",
59 label: "证件种类",
60 },
61 {
62 prop: "zjh",
63 label: "证件号",
64 },
65 {
66 prop: "frmc",
67 label: "法人名称",
68 },
69 {
70 prop: "dwdz",
71 label: "地址",
72 },
73 {
74 prop: "dh",
75 label: "联系电话",
76 },
77 ]
78 }
79
80 }
81 let dataYh = new data1()
82 let dataQy = new data2()
83 export {
84 dataYh,
85 dataQy,
86 sendThis
87 }
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-17 16:16:13 4 * @LastEditTime: 2023-09-21 16:02:05
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -171,7 +171,6 @@ ...@@ -171,7 +171,6 @@
171 this.$parent.loadComponent(this.currentSelectProps, data); 171 this.$parent.loadComponent(this.currentSelectProps, data);
172 this.$parent.tabset(); 172 this.$parent.tabset();
173 }, 173 },
174 //申请单元点击事件
175 /** 174 /**
176 * @description: 申请单元点击事件 175 * @description: 申请单元点击事件
177 * @param {*} index 176 * @param {*} index
...@@ -180,6 +179,7 @@ ...@@ -180,6 +179,7 @@
180 unitClick (index) { 179 unitClick (index) {
181 this.clickindex = index 180 this.clickindex = index
182 this.currentSelectProps = this.supplementarylist[index]; 181 this.currentSelectProps = this.supplementarylist[index];
182 window.currentSelect = this.supplementarylist[index]
183 this.$emit("getCurrentSelectProps", this.currentSelectProps); 183 this.$emit("getCurrentSelectProps", this.currentSelectProps);
184 }, 184 },
185 /** 185 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-01 13:30:54 4 * @LastEditTime: 2023-09-21 16:02:53
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
21 </div> 21 </div>
22 </template> 22 </template>
23 <script> 23 <script>
24 import addQlr from "./dialog/addQlr.vue";
25 import { mapGetters } from "vuex"; 24 import { mapGetters } from "vuex";
25 import addQlr from "./dialog/addQlr.vue";
26 import { getIdCardInfo } from '@/utils/operation.js'
26 export default { 27 export default {
27 components: { 28 components: {
28 addQlr, 29 addQlr,
...@@ -102,7 +103,7 @@ ...@@ -102,7 +103,7 @@
102 icon="el-icon-tickets" 103 icon="el-icon-tickets"
103 disabled={!this.ableOperation} 104 disabled={!this.ableOperation}
104 onClick={() => { 105 onClick={() => {
105 this.readClick(scope); 106 this.readClick(scope.row)
106 }} 107 }}
107 > 108 >
108 读取 109 读取
...@@ -178,12 +179,12 @@ ...@@ -178,12 +179,12 @@
178 this.$nextTick(() => { 179 this.$nextTick(() => {
179 if (val.length == 0 || !val) { 180 if (val.length == 0 || !val) {
180 that.tableDataList = _.cloneDeep([ 181 that.tableDataList = _.cloneDeep([
181 { 182 // {
182 qlrmc: "", 183 // qlrmc: "",
183 dlrzjlx: "", 184 // dlrzjlx: "",
184 dlrzjh: "", 185 // dlrzjh: "",
185 fr: "", 186 // fr: "",
186 }, 187 // },
187 ]); 188 ]);
188 } else { 189 } else {
189 that.tableDataList = _.cloneDeep(val); 190 that.tableDataList = _.cloneDeep(val);
...@@ -255,15 +256,32 @@ ...@@ -255,15 +256,32 @@
255 this.tableDataList.splice(index, 1); 256 this.tableDataList.splice(index, 1);
256 this.$emit("upDateQlrxxList", this.tableDataList); 257 this.$emit("upDateQlrxxList", this.tableDataList);
257 }, 258 },
258
259 // 身份证读取
260 /** 259 /**
261 * @description: 身份证读取 260 * @description: 身份证读取
262 * @author: renchao 261 * @author: renchao
263 */ 262 */
264 readClick () { }, 263 readClick (row) {
265 264 getIdCardInfo().then(res => {
266 // 身份证读取按钮禁用 265 if (res.data.code == 0) {
266 let data = res.data.IDCardInfo
267 row.qlrmc = data.name
268 row.zjzl = '1'
269 row.zjh = data.cardID
270 row.xb = data.sexCode
271 row.dz = data.address
272 row.fzjg = data.issueOrgan
273 this.$message({
274 message: '读取成功!',
275 type: 'success'
276 })
277 } else {
278 this.$message({
279 message: res.data.message,
280 type: 'warning'
281 })
282 }
283 })
284 },
267 /** 285 /**
268 * @description: 身份证读取按钮禁用 286 * @description: 身份证读取按钮禁用
269 * @author: renchao 287 * @author: renchao
......
1 <template> 1 <template>
2 <div class="all"> 2 <div class="all">
3 <div class="tbalede"> 3 <div class="tbalede">
4 <div class="title"> 4 <div class="title">
5 {{ title }} 5 {{ title }}
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 {{ getQsztName(row[item.prop]) }} 44 {{ getQsztName(row[item.prop]) }}
45 </span> 45 </span>
46 46
47 <el-tooltip v-if="['djyy','fj'].includes(item.prop)" > 47 <el-tooltip v-if="['djyy','fj'].includes(item.prop)">
48 <span> 48 <span>
49 {{ row[item.prop] }} 49 {{ row[item.prop] }}
50 </span> 50 </span>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 </tr> 63 </tr>
64 </table> 64 </table>
65 </div> 65 </div>
66 </div> 66 </div>
67 </template> 67 </template>
68 68
69 <script> 69 <script>
...@@ -199,9 +199,9 @@ ...@@ -199,9 +199,9 @@
199 height: 100%; 199 height: 100%;
200 margin: auto; 200 margin: auto;
201 background-color: rgb(255, 255, 255); 201 background-color: rgb(255, 255, 255);
202 overflow: hidden 202 overflow: hidden;
203 } 203 }
204 .tbalede { 204 .tbalede {
205 width: 794px; 205 width: 794px;
206 height: 1123px; 206 height: 1123px;
207 margin: auto; 207 margin: auto;
...@@ -215,49 +215,48 @@ overflow: hidden ...@@ -215,49 +215,48 @@ overflow: hidden
215 position: relative; 215 position: relative;
216 margin: 0 3px; 216 margin: 0 3px;
217 } 217 }
218 } 218 }
219 .top { 219 .top {
220 width: 80%; 220 width: 80%;
221 height: 100px; 221 height: 100px;
222 margin: auto; 222 margin: auto;
223 display: flex; 223 display: flex;
224 position: relative; 224 position: relative;
225 } 225 }
226 p { 226 p {
227 position: absolute; 227 position: absolute;
228 bottom: 10px; 228 bottom: 10px;
229 right: 10px; 229 right: 10px;
230 } 230 }
231 table { 231 table {
232 width: 80%; 232 width: 80%;
233 border: 1px solid black; 233 border: 1px solid black;
234 margin: 0 auto; 234 margin: 0 auto;
235 border-collapse: collapse; 235 border-collapse: collapse;
236 } 236 }
237 .head { 237 .head {
238 font-size: 20px; 238 font-size: 20px;
239 width: 100%; 239 width: 100%;
240 height: 40px; 240 height: 40px;
241 margin: auto; 241 margin: auto;
242 } 242 }
243 .dyh { 243 .dyh {
244 padding: 10px; 244 padding: 10px;
245 font-size: 12px; 245 font-size: 12px;
246 text-align: left; 246 text-align: left;
247 } 247 }
248
249 248
250 .content { 249 .content {
251 height: 40px; 250 height: 40px;
252 } 251 }
253 .slash-wrap { 252 .slash-wrap {
254 position: relative; 253 position: relative;
255 box-sizing: border-box; 254 box-sizing: border-box;
256 width: 150px; 255 width: 150px;
257 height: 40px; 256 height: 40px;
258 } 257 }
259 /* 斜线 */ 258 /* 斜线 */
260 .slash1 { 259 .slash1 {
261 position: absolute; 260 position: absolute;
262 display: block; 261 display: block;
263 top: 0; 262 top: 0;
...@@ -267,27 +266,25 @@ table { ...@@ -267,27 +266,25 @@ table {
267 background-color: #949393; 266 background-color: #949393;
268 transform: rotate(17.93010235415598deg); 267 transform: rotate(17.93010235415598deg);
269 transform-origin: top left; 268 transform-origin: top left;
270 } 269 }
271 /* 左下角文字 */ 270 /* 左下角文字 */
272 .left { 271 .left {
273 position: absolute; 272 position: absolute;
274 left: 30px; 273 left: 30px;
275 bottom: 5px; 274 bottom: 5px;
276 } 275 }
277 276
278 /* 右上角文字 */ 277 /* 右上角文字 */
279 .mid { 278 .mid {
280 position: absolute; 279 position: absolute;
281 /* 右上角 right:0; top: 0; */ 280 /* 右上角 right:0; top: 0; */
282 right: 29px; 281 right: 29px;
283 top: 4px; 282 top: 4px;
284 } 283 }
285 .xxTable { 284 .xxTable {
286 width: 100%; 285 width: 100%;
287 border-collapse: collapse; 286 border-collapse: collapse;
288 287
289
290
291 tr td { 288 tr td {
292 border: 2px solid rgb(227, 226, 226); 289 border: 2px solid rgb(227, 226, 226);
293 text-align: center; 290 text-align: center;
...@@ -299,25 +296,22 @@ table { ...@@ -299,25 +296,22 @@ table {
299 // justify-content: center; 296 // justify-content: center;
300 min-width: 80px; 297 min-width: 80px;
301 z-index: 1; 298 z-index: 1;
302 .ooo{ 299 .ooo {
303 width: 190px!important; 300 width: 190px !important;
304
305 } 301 }
306 } 302 }
307 td:first-child{ 303 td:first-child {
308 flex: inherit !important; 304 flex: inherit !important;
309 // width: 200px !important; 305 // min-width: 180px !important;
310 min-width: 180px !important;
311 } 306 }
312
313 } 307 }
314 .ellipsis-line { 308 .ellipsis-line {
315 display: inline-block; 309 display: inline-block;
316 width: 300px; 310 width: 300px;
317 height: 100px!important; 311 height: 100px !important;
318 line-height: 20px!important; 312 line-height: 20px !important;
319 word-break: break-all; 313 word-break: break-all;
320 text-overflow: ellipsis; 314 text-overflow: ellipsis;
321 overflow: hidden; 315 overflow: hidden;
322 } 316 }
323 </style> 317 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-25 17:16:32 4 * @LastEditTime: 2023-09-22 09:56:51
5 --> 5 -->
6 <template> 6 <template>
7 <div class="all"> 7 <div class="all">
...@@ -156,54 +156,53 @@ ...@@ -156,54 +156,53 @@
156 height: 100%; 156 height: 100%;
157 margin: auto; 157 margin: auto;
158 background-color: rgb(255, 255, 255); 158 background-color: rgb(255, 255, 255);
159 } 159 }
160 .tbalede { 160 .tbalede {
161 width: 794px; 161 width: 794px;
162 height: 1123px; 162 height: 1123px;
163 margin: auto; 163 margin: auto;
164 } 164 }
165 .top { 165 .top {
166 width: 80%; 166 width: 80%;
167 height: 100px; 167 height: 100px;
168 margin: auto; 168 margin: auto;
169 display: flex; 169 display: flex;
170 position: relative; 170 position: relative;
171 } 171 }
172 p { 172 p {
173 position: absolute; 173 position: absolute;
174 bottom: 10px; 174 bottom: 10px;
175 right: 10px; 175 right: 10px;
176 } 176 }
177 table { 177 table {
178 width: 80%; 178 width: 80%;
179 border: 1px solid black; 179 border: 1px solid black;
180 margin: 0 auto; 180 margin: 0 auto;
181 border-collapse: collapse; 181 border-collapse: collapse;
182 } 182 }
183 .head { 183 .head {
184 font-size: 20px; 184 font-size: 20px;
185 width: 100%; 185 width: 100%;
186 height: 40px; 186 height: 40px;
187 margin: auto; 187 margin: auto;
188 } 188 }
189 .dyh { 189 .dyh {
190 padding: 10px; 190 padding: 10px;
191 font-size: 12px; 191 font-size: 12px;
192 text-align: left; 192 text-align: left;
193 } 193 }
194
195 194
196 .content { 195 .content {
197 height: 40px; 196 height: 40px;
198 } 197 }
199 .slash-wrap { 198 .slash-wrap {
200 position: relative; 199 position: relative;
201 box-sizing: border-box; 200 box-sizing: border-box;
202 width: 150px; 201 width: 150px;
203 height: 40px; 202 height: 40px;
204 } 203 }
205 /* 斜线 */ 204 /* 斜线 */
206 .slash1 { 205 .slash1 {
207 position: absolute; 206 position: absolute;
208 display: block; 207 display: block;
209 top: 0; 208 top: 0;
...@@ -213,46 +212,44 @@ table { ...@@ -213,46 +212,44 @@ table {
213 background-color: #949393; 212 background-color: #949393;
214 transform: rotate(17.93010235415598deg); 213 transform: rotate(17.93010235415598deg);
215 transform-origin: top left; 214 transform-origin: top left;
216 } 215 }
217 /* 左下角文字 */ 216 /* 左下角文字 */
218 .left { 217 .left {
219 position: absolute; 218 position: absolute;
220 left: 30px; 219 left: 30px;
221 bottom: 5px; 220 bottom: 5px;
222 } 221 }
223 222
224 /* 右上角文字 */ 223 /* 右上角文字 */
225 .mid { 224 .mid {
226 position: absolute; 225 position: absolute;
227 /* 右上角 right:0; top: 0; */ 226 /* 右上角 right:0; top: 0; */
228 right: 29px; 227 right: 29px;
229 top: 4px; 228 top: 4px;
230 } 229 }
231 .xxTable { 230 .xxTable {
232 width: 100%; 231 width: 100%;
233 border-collapse: collapse; 232 border-collapse: collapse;
234 table-layout:fixed; 233 table-layout: fixed;
235
236 234
237 td { 235 td {
238 border: 1px solid rgb(0, 0, 0); 236 border: 1px solid rgb(0, 0, 0);
239 text-align: center; 237 text-align: center;
240 height: 40px; 238 height: 40px;
241 width: 80px!important; 239 width: 80px !important;
242 word-wrap:break-word 240 word-wrap: break-word;
243 } 241 }
244 td:first-child{ 242 td:first-child {
245 min-width: 180px !important; 243 // min-width: 180px !important;
246 } 244 }
247
248 } 245 }
249 .ellipsis-line { 246 .ellipsis-line {
250 display: inline-block; 247 display: inline-block;
251 width: 300px; 248 width: 300px;
252 height: 100px!important; 249 height: 100px !important;
253 line-height: 20px!important; 250 line-height: 20px !important;
254 word-break: break-all; 251 word-break: break-all;
255 text-overflow: ellipsis; 252 text-overflow: ellipsis;
256 overflow: hidden; 253 overflow: hidden;
257 } 254 }
258 </style> 255 </style>
......
...@@ -60,7 +60,8 @@ ...@@ -60,7 +60,8 @@
60 top: 0px; 60 top: 0px;
61 z-index: 3; 61 z-index: 3;
62 margin-top: -2px; 62 margin-top: -2px;
63 &:after{ 63
64 &:after {
64 content: ""; 65 content: "";
65 display: inline-block; 66 display: inline-block;
66 width: 100%; 67 width: 100%;
...@@ -77,7 +78,8 @@ ...@@ -77,7 +78,8 @@
77 position: sticky; 78 position: sticky;
78 top: 40px; 79 top: 40px;
79 z-index: 3; 80 z-index: 3;
80 &:after{ 81
82 &:after {
81 content: ""; 83 content: "";
82 display: inline-block; 84 display: inline-block;
83 width: 100%; 85 width: 100%;
...@@ -102,7 +104,9 @@ ...@@ -102,7 +104,9 @@
102 left: 0; 104 left: 0;
103 z-index: 2; 105 z-index: 2;
104 margin-left: -2px; 106 margin-left: -2px;
105 &:before{ 107 width: 200px;
108
109 &:before {
106 content: ""; 110 content: "";
107 display: inline-block; 111 display: inline-block;
108 width: 2px; 112 width: 2px;
...@@ -113,7 +117,8 @@ ...@@ -113,7 +117,8 @@
113 left: -2px; 117 left: -2px;
114 z-index: 3; 118 z-index: 3;
115 } 119 }
116 &:after{ 120
121 &:after {
117 content: ""; 122 content: "";
118 display: inline-block; 123 display: inline-block;
119 width: 2px; 124 width: 2px;
...@@ -228,11 +233,12 @@ ...@@ -228,11 +233,12 @@
228 min-width: 340px; 233 min-width: 340px;
229 z-index: 1; 234 z-index: 1;
230 } 235 }
231 td:first-child{ 236
237 td:first-child {
232 flex: inherit !important; 238 flex: inherit !important;
233 // width: 200px !important; 239 // min-width: 180px !important;
234 min-width: 180px !important;
235 } 240 }
241
236 >tr:nth-child(odd) td { 242 >tr:nth-child(odd) td {
237 background: #f2f2f2; 243 background: #f2f2f2;
238 } 244 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 15:07:44 4 * @LastEditTime: 2023-09-22 09:49:24
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -40,14 +40,14 @@ ...@@ -40,14 +40,14 @@
40 * @description: loadData 40 * @description: loadData
41 * @author: renchao 41 * @author: renchao
42 */ 42 */
43 loadData () { 43 loadData (checkList = []) {
44 if (this.$parent.addRepairRecord) { 44 if (this.$parent.addRepairRecord) {
45 this.columns.unshift({ prop: "cz", label: "操作" }); 45 this.columns.unshift({ prop: "cz", label: "操作" });
46 } 46 }
47 getCfdjList({ 47 getCfdjList({
48 bdcdyid: this.propsParam.bdcdyid, 48 bdcdyid: this.propsParam.bdcdyid,
49 qllx: this.propsParam.qllx, 49 qllx: this.propsParam.qllx,
50 qszt: this.checkList, 50 qszt: checkList
51 }).then((res) => { 51 }).then((res) => {
52 if (res.code === 200) { 52 if (res.code === 200) {
53 this.tableData = res.result; 53 this.tableData = res.result;
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
27 {{ index?"变化后": "变化前"}} 27 {{ index?"变化后": "变化前"}}
28 </div> 28 </div>
29 <div 29 <div
30 v-if="item.prop == 'cz' && row.sjlx != '系统数据'" 30 v-if="item.prop == 'cz' && row.sjlx != '系统数据'"></div>
31 ></div>
32 <span v-if="item.prop == 'qszt'" :class="item.co"> 31 <span v-if="item.prop == 'qszt'" :class="item.co">
33 {{ getQsztName(row[item.prop]) }} 32 {{ getQsztName(row[item.prop]) }}
34 </span> 33 </span>
...@@ -42,17 +41,17 @@ ...@@ -42,17 +41,17 @@
42 </template> 41 </template>
43 42
44 <script> 43 <script>
45 import { datas } from "./qlxxFormData.js"; 44 import { datas } from "./qlxxFormData.js";
46 import { getSjlx } from "@/utils/dictionary.js"; 45 import { getSjlx } from "@/utils/dictionary.js";
47 import { getDjbQlxxDiff } from "@/api/djbDetail.js"; 46 import { getDjbQlxxDiff } from "@/api/djbDetail.js";
48 export default { 47 export default {
49 props: { 48 props: {
50 formData: { 49 formData: {
51 type: Object, 50 type: Object,
52 default: {}, 51 default: {},
53 }, 52 },
54 }, 53 },
55 data() { 54 data () {
56 return { 55 return {
57 radio: 1, 56 radio: 1,
58 title: "变化情况对比", 57 title: "变化情况对比",
...@@ -63,11 +62,11 @@ export default { ...@@ -63,11 +62,11 @@ export default {
63 emptycolNum: 1, 62 emptycolNum: 1,
64 //列名称对象 63 //列名称对象
65 columns: [], 64 columns: [],
66 columnsall:[], 65 columnsall: [],
67 columnsum:[] 66 columnsum: []
68 }; 67 };
69 }, 68 },
70 created() { 69 created () {
71 switch (this.formData.dqqllx) { 70 switch (this.formData.dqqllx) {
72 case "JSYDSYQ": 71 case "JSYDSYQ":
73 this.columns = datas.columns().JSYDSYQ; 72 this.columns = datas.columns().JSYDSYQ;
...@@ -97,16 +96,16 @@ export default { ...@@ -97,16 +96,16 @@ export default {
97 this.getdata(); 96 this.getdata();
98 }, 97 },
99 methods: { 98 methods: {
100 getArrDifference: function(arr1, arr2){ 99 getArrDifference: function (arr1, arr2) {
101 return arr1.concat(arr2).filter(function(value, i, arr){ 100 return arr1.concat(arr2).filter(function (value, i, arr) {
102 return arr.indexOf(value) === arr.lastIndexOf(value); 101 return arr.indexOf(value) === arr.lastIndexOf(value);
103 }) 102 })
104 }, 103 },
105 /** 104 /**
106 * @description: checkChange 105 * @description: checkChange
107 * @author: renchao 106 * @author: renchao
108 */ 107 */
109 getdata() { 108 getdata () {
110 getDjbQlxxDiff(this.formData.bsmQlxx).then((res) => { 109 getDjbQlxxDiff(this.formData.bsmQlxx).then((res) => {
111 if (res.code === 200) { 110 if (res.code === 200) {
112 this.tableData.push(res.result.ssQlxx) 111 this.tableData.push(res.result.ssQlxx)
...@@ -116,12 +115,12 @@ export default { ...@@ -116,12 +115,12 @@ export default {
116 item.sjlx = getSjlx(item.sjlx); 115 item.sjlx = getSjlx(item.sjlx);
117 }); 116 });
118 for (let key in this.tableData[0]) { 117 for (let key in this.tableData[0]) {
119 this.columnsum=this.columns.filter((item,index) => { 118 this.columnsum = this.columns.filter((item, index) => {
120 if(this.tableData[1][key]!==this.tableData[0][key]&&this.columns[index].prop==key){ 119 if (this.tableData[1][key] !== this.tableData[0][key] && this.columns[index].prop == key) {
121 this.columns[index].bt="bgc" 120 this.columns[index].bt = "bgc"
122 this.columns[index].co="red" 121 this.columns[index].co = "red"
123 } 122 }
124 return this.columns[index].bt=="bgc" 123 return this.columns[index].bt == "bgc"
125 }) 124 })
126 } 125 }
127 this.columns.unshift({ 126 this.columns.unshift({
...@@ -132,7 +131,7 @@ export default { ...@@ -132,7 +131,7 @@ export default {
132 prop: "bhqk", 131 prop: "bhqk",
133 label: "" 132 label: ""
134 }) 133 })
135 this.columnsall= this.columns 134 this.columnsall = this.columns
136 135
137 136
138 137
...@@ -144,7 +143,7 @@ export default { ...@@ -144,7 +143,7 @@ export default {
144 * @param {*} code 143 * @param {*} code
145 * @author: renchao 144 * @author: renchao
146 */, 145 */,
147 getQsztName(code) { 146 getQsztName (code) {
148 let name = ""; 147 let name = "";
149 for (let item of this.qsztList) { 148 for (let item of this.qsztList) {
150 if (item.value == code) { 149 if (item.value == code) {
...@@ -155,37 +154,33 @@ export default { ...@@ -155,37 +154,33 @@ export default {
155 return name; 154 return name;
156 }, 155 },
157 156
158 checkChange() { 157 checkChange () {
159 if(this.radio==2){ 158 if (this.radio == 2) {
160 this.columnsall=this.columnsum 159 this.columnsall = this.columnsum
161 160
162 }else{ 161 } else {
163 this.columnsall=this.columns 162 this.columnsall = this.columns
164 163
165 } 164 }
166 }, 165 },
167 }, 166 },
168 }; 167 };
169 </script> 168 </script>
170 169
171 <style lang="scss" scoped> 170 <style lang="scss" scoped>
172 @import "./qlxxCommon.scss"; 171 @import "./qlxxCommon.scss";
173 .bgc{ 172 .bgc {
174 173 td {
175 td{
176 // background-color: rgb(182, 203, 207) !important; 174 // background-color: rgb(182, 203, 207) !important;
177
178 } 175 }
179 } 176 }
180 .xxTable tr td{ 177 .xxTable tr td {
181 178 min-width: 520px !important;
182 min-width: 520px!important; 179 }
183 180 .red {
184 }
185 .red{
186 color: red; 181 color: red;
187 } 182 }
188 .setbut{ 183 .setbut {
189 font-size: 18px; 184 font-size: 18px;
190 font-weight: 700; 185 font-weight: 700;
191 } 186 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-21 10:53:44 4 * @LastEditTime: 2023-09-22 09:47:08
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableBox"> 7 <div class="tableBox">
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
172 this.tableData = []; 172 this.tableData = [];
173 this.emptycolNum = datas.columns().emptycolNum; 173 this.emptycolNum = datas.columns().emptycolNum;
174 } else { 174 } else {
175 this.$parent.loadData(); 175 this.$parent.loadData(this.checkList);
176 } 176 }
177 }, 177 },
178 /** 178 /**
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
9 class="tbalede" 9 class="tbalede"
10 v-for="(el, indexx) in datass" 10 v-for="(el, indexx) in datass"
11 :key="indexx" 11 :key="indexx"
12 style="page-break-after: always" 12 style="page-break-after: always">
13 >
14 <div class="title">{{ title }}</div> 13 <div class="title">{{ title }}</div>
15 <div class="num">{{ datass.length }}页,第{{ indexx + 1 }}</div> 14 <div class="num">{{ datass.length }}页,第{{ indexx + 1 }}</div>
16 <table class="xxTable"> 15 <table class="xxTable">
...@@ -25,8 +24,7 @@ ...@@ -25,8 +24,7 @@
25 <td 24 <td
26 v-show="el.emptycolNum" 25 v-show="el.emptycolNum"
27 v-for="count in emptycolNum" 26 v-for="count in emptycolNum"
28 :key="count" 27 :key="count"></td>
29 ></td>
30 </tr> 28 </tr>
31 </table> 29 </table>
32 </div> 30 </div>
...@@ -34,12 +32,12 @@ ...@@ -34,12 +32,12 @@
34 </template> 32 </template>
35 33
36 <script> 34 <script>
37 import { datas } from "./qlxxFormData.js"; 35 import { datas } from "./qlxxFormData.js";
38 import { getSjlx } from "@/utils/dictionary.js"; 36 import { getSjlx } from "@/utils/dictionary.js";
39 import { getFieldListByQlxx } from "@/api/SysDjbFieldDO.js"; 37 import { getFieldListByQlxx } from "@/api/SysDjbFieldDO.js";
40 38
41 export default { 39 export default {
42 data() { 40 data () {
43 return { 41 return {
44 title: this.$parent.title, 42 title: this.$parent.title,
45 //列表数据 43 //列表数据
...@@ -60,17 +58,17 @@ export default { ...@@ -60,17 +58,17 @@ export default {
60 default: false, 58 default: false,
61 }, 59 },
62 }, 60 },
63 created() {}, 61 created () { },
64 watch: { 62 watch: {
65 tableData: { 63 tableData: {
66 handler(newValue, oldValue) { 64 handler (newValue, oldValue) {
67 this.tableData = newValue; 65 this.tableData = newValue;
68 }, 66 },
69 }, 67 },
70 render: { 68 render: {
71 handler(newValue, oldValue) { 69 handler (newValue, oldValue) {
72 console.log("newValue",newValue); 70 console.log("newValue", newValue);
73 console.log("columns",this.columns); 71 console.log("columns", this.columns);
74 if (newValue) { 72 if (newValue) {
75 this.loadData(); 73 this.loadData();
76 } 74 }
...@@ -84,13 +82,13 @@ export default { ...@@ -84,13 +82,13 @@ export default {
84 * @description: loadData 82 * @description: loadData
85 * @author: miaofang 83 * @author: miaofang
86 */ 84 */
87 loadData() { 85 loadData () {
88 getFieldListByQlxx({ 86 getFieldListByQlxx({
89 qllx: this.tableData[0].qllx, 87 qllx: this.tableData[0].qllx,
90 }).then((res) => { 88 }).then((res) => {
91 if (res.code === 200) { 89 if (res.code === 200) {
92 this.columns = res.result; 90 this.columns = res.result;
93 console.log("columnssssssssssss",this.columns); 91 console.log("columnssssssssssss", this.columns);
94 } 92 }
95 }); 93 });
96 if (this.tableData.length && this.datass.length == 0) { 94 if (this.tableData.length && this.datass.length == 0) {
...@@ -107,11 +105,11 @@ export default { ...@@ -107,11 +105,11 @@ export default {
107 } 105 }
108 }, 106 },
109 }, 107 },
110 }; 108 };
111 </script> 109 </script>
112 110
113 <style lang="scss" scoped> 111 <style lang="scss" scoped>
114 .tbalede { 112 .tbalede {
115 width: 100%; 113 width: 100%;
116 margin: auto; 114 margin: auto;
117 position: relative; 115 position: relative;
...@@ -147,13 +145,7 @@ export default { ...@@ -147,13 +145,7 @@ export default {
147 td { 145 td {
148 width: 20px !important; 146 width: 20px !important;
149 word-break: break-all; 147 word-break: break-all;
150 // /* 方法一:使用 word-break */
151 // word-break: break-all;
152 // // /* 方法二:使用 white-space */
153 // // white-space: pre-wrap;
154 // // /* 方法三:使用 overflow-wrap */
155 // // overflow-wrap: break-word;
156 } 148 }
157 } 149 }
158 } 150 }
159 </style> 151 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 15:04:32 4 * @LastEditTime: 2023-09-22 09:50:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -40,14 +40,14 @@ ...@@ -40,14 +40,14 @@
40 * @description: loadData 40 * @description: loadData
41 * @author: renchao 41 * @author: renchao
42 */ 42 */
43 loadData () { 43 loadData (checkList = []) {
44 if (this.$parent.addRepairRecord) { 44 if (this.$parent.addRepairRecord) {
45 this.columns.unshift({ prop: "cz", label: "操作" }); 45 this.columns.unshift({ prop: "cz", label: "操作" });
46 } 46 }
47 getDiyaqList({ 47 getDiyaqList({
48 bdcdyid: this.propsParam.bdcdyid, 48 bdcdyid: this.propsParam.bdcdyid,
49 qllx: this.propsParam.qllx, 49 qllx: this.propsParam.qllx,
50 qszt: this.checkList, 50 qszt: checkList
51 }).then((res) => { 51 }).then((res) => {
52 if (res.code === 200) { 52 if (res.code === 200) {
53 this.tableData = res.result; 53 this.tableData = res.result;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-09-18 15:04:54 4 * @LastEditTime: 2023-09-22 09:50:28
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
36 this.loadData(); 36 this.loadData();
37 }, 37 },
38 methods: { 38 methods: {
39 loadData () { 39 loadData (checkList = []) {
40 if (this.$parent.addRepairRecord) { 40 if (this.$parent.addRepairRecord) {
41 this.columns.unshift({ prop: "cz", label: "操作" }); 41 this.columns.unshift({ prop: "cz", label: "操作" });
42 } 42 }
43 getDiyiqList({ 43 getDiyiqList({
44 bdcdyid: this.propsParam.bdcdyid, 44 bdcdyid: this.propsParam.bdcdyid,
45 qllx: this.propsParam.qllx, 45 qllx: this.propsParam.qllx,
46 qszt: this.checkList, 46 qszt: checkList
47 }).then((res) => { 47 }).then((res) => {
48 if (res.code === 200) { 48 if (res.code === 200) {
49 this.tableData = res.result; 49 this.tableData = res.result;
......
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
14 :default-expand-all="true" 14 :default-expand-all="true"
15 :expand-on-click-node="false" 15 :expand-on-click-node="false"
16 node-key="id" 16 node-key="id"
17 :default-checked-keys="[showTab]" 17 :default-checked-keys="[showTab]">
18 >
19 </el-tree> 18 </el-tree>
20 <el-collapse v-model="activeName" accordion> 19 <el-collapse v-model="activeName" accordion>
21 <el-collapse-item 20 <el-collapse-item
...@@ -23,8 +22,7 @@ ...@@ -23,8 +22,7 @@
23 ref="sfq" 22 ref="sfq"
24 v-for="(item, index) in sfqdata" 23 v-for="(item, index) in sfqdata"
25 :key="index" 24 :key="index"
26 :name="index" 25 :name="index">
27 >
28 <template slot="title"> 26 <template slot="title">
29 <span class="text" @click="tap(item)"> 27 <span class="text" @click="tap(item)">
30 <span> 28 <span>
...@@ -37,8 +35,7 @@ ...@@ -37,8 +35,7 @@
37 :re="item" 35 :re="item"
38 :key="index" 36 :key="index"
39 :class="[isActive == index ? activeCls : '', errorCls]" 37 :class="[isActive == index ? activeCls : '', errorCls]"
40 @click="taplist(item, index)" 38 @click="taplist(item, index)">
41 >
42 <span> 39 <span>
43 {{ item.label }} 40 {{ item.label }}
44 </span> 41 </span>
...@@ -53,18 +50,17 @@ ...@@ -53,18 +50,17 @@
53 <component 50 <component
54 :is="componentTag" 51 :is="componentTag"
55 @getBdcdyh="getBdcdyh" 52 @getBdcdyh="getBdcdyh"
56 v-bind="currentSelectProps" 53 v-bind="currentSelectProps" />
57 />
58 </div> 54 </div>
59 </div> 55 </div>
60 </template> 56 </template>
61 <script> 57 <script>
62 import { getBdcqljqtsx } from "@/api/djbDetail.js"; 58 import { getBdcqljqtsx } from "@/api/djbDetail.js";
63 import { loadTreeData,loadsfqData, getNode } from "./djbFrameData.js"; 59 import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
64 import { searchTaskToDo } from "@/api/workflow/search.js"; 60 import { searchTaskToDo } from "@/api/workflow/search.js";
65 import { leftMenu } from "@/api/workFlow.js"; 61 import { leftMenu } from "@/api/workFlow.js";
66 export default { 62 export default {
67 data() { 63 data () {
68 return { 64 return {
69 //接收参数 65 //接收参数
70 // propsParam: this.$attrs, 66 // propsParam: this.$attrs,
...@@ -95,7 +91,7 @@ export default { ...@@ -95,7 +91,7 @@ export default {
95 showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断 91 showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
96 }; 92 };
97 }, 93 },
98 mounted() { 94 mounted () {
99 this.getdata(); 95 this.getdata();
100 }, 96 },
101 methods: { 97 methods: {
...@@ -105,7 +101,7 @@ export default { ...@@ -105,7 +101,7 @@ export default {
105 * @param {*} obj 101 * @param {*} obj
106 * @author: renchao 102 * @author: renchao
107 */ 103 */
108 getCaption(obj) { 104 getCaption (obj) {
109 let index = obj.lastIndexOf("="); 105 let index = obj.lastIndexOf("=");
110 obj = obj.substring(index + 1, obj.length); 106 obj = obj.substring(index + 1, obj.length);
111 return obj; 107 return obj;
...@@ -115,7 +111,7 @@ export default { ...@@ -115,7 +111,7 @@ export default {
115 * @description: 通过不动产业务号获取参数 111 * @description: 通过不动产业务号获取参数
116 * @author: renchao 112 * @author: renchao
117 */ 113 */
118 getdata() { 114 getdata () {
119 this.queryForm = { 115 this.queryForm = {
120 bdcdyh: this.getCaption(window.location.href), 116 bdcdyh: this.getCaption(window.location.href),
121 currentPage: 1, 117 currentPage: 1,
...@@ -147,7 +143,7 @@ export default { ...@@ -147,7 +143,7 @@ export default {
147 * @param {*} b 143 * @param {*} b
148 * @author: renchao 144 * @author: renchao
149 */ 145 */
150 loadBdcdylist(a, b) { 146 loadBdcdylist (a, b) {
151 var formdata = new FormData(); 147 var formdata = new FormData();
152 formdata.append("bsmSlsq", a); 148 formdata.append("bsmSlsq", a);
153 formdata.append("bestepid", b); 149 formdata.append("bestepid", b);
...@@ -166,14 +162,14 @@ export default { ...@@ -166,14 +162,14 @@ export default {
166 * @author: miaofang 162 * @author: miaofang
167 * 点击不动产单元号事件 163 * 点击不动产单元号事件
168 */ 164 */
169 getBdcdyh(val) { 165 getBdcdyh (val) {
170 this.addloadData(val); 166 this.addloadData(val);
171 }, 167 },
172 /** 168 /**
173 * @description: addloadData 169 * @description: addloadData
174 * @author: miaofang 170 * @author: miaofang
175 */ 171 */
176 addloadData(val) { 172 addloadData (val) {
177 getBdcqljqtsx({ 173 getBdcqljqtsx({
178 bdcdyid: val.bdcdyid, 174 bdcdyid: val.bdcdyid,
179 bdcdyh: val.bdcdyh, 175 bdcdyh: val.bdcdyh,
...@@ -201,7 +197,7 @@ export default { ...@@ -201,7 +197,7 @@ export default {
201 * @description: loadData 197 * @description: loadData
202 * @author: renchao 198 * @author: renchao
203 */ 199 */
204 loadData(val) { 200 loadData (val) {
205 getBdcqljqtsx({ 201 getBdcqljqtsx({
206 bdcdyid: this.currentSelectProps.bdcdyid, 202 bdcdyid: this.currentSelectProps.bdcdyid,
207 bdcdyh: val, 203 bdcdyh: val,
...@@ -215,7 +211,7 @@ export default { ...@@ -215,7 +211,7 @@ export default {
215 this.defaultNode = getNode( 211 this.defaultNode = getNode(
216 this.currentSelectProps.qllx, 212 this.currentSelectProps.qllx,
217 { linShi: 0, xianShi: 0, liShi: 0 }, 213 { linShi: 0, xianShi: 0, liShi: 0 },
218 res.result.bdcdylx|| "" 214 res.result.bdcdylx || ""
219 ); 215 );
220 this.sfqdata[0].children.forEach((item, index) => { 216 this.sfqdata[0].children.forEach((item, index) => {
221 if (item.id == this.defaultNode.id) { 217 if (item.id == this.defaultNode.id) {
...@@ -247,16 +243,16 @@ export default { ...@@ -247,16 +243,16 @@ export default {
247 * @param {*} data 243 * @param {*} data
248 * @author: renchao 244 * @author: renchao
249 */ 245 */
250 handleNodeClick(data) { 246 handleNodeClick (data) {
251 this.loadComponent(data.form); 247 this.loadComponent(data.form);
252 }, 248 },
253 249
254 /** 250 /**
255 * @description: setstyle 251 * @description: setstyle
256 * @param {*} data 252 * @param {*} data
257 * @author: renchao 253 * @author: renchao
258 * 设置样式和点击定位到当前功能 254 * 设置样式和点击定位到当前功能
259 */ 255 */
260 // setstyle (newindex, index, key) { 256 // setstyle (newindex, index, key) {
261 // if (key != undefined || this.keyy == index) { 257 // if (key != undefined || this.keyy == index) {
262 // if (key != undefined) { 258 // if (key != undefined) {
...@@ -280,7 +276,7 @@ export default { ...@@ -280,7 +276,7 @@ export default {
280 * @author: renchao 276 * @author: renchao
281 * 新增列表功能 277 * 新增列表功能
282 */ 278 */
283 tap(data, index) { 279 tap (data, index) {
284 this.loadComponent(data.form); 280 this.loadComponent(data.form);
285 }, 281 },
286 /** 282 /**
...@@ -289,7 +285,7 @@ export default { ...@@ -289,7 +285,7 @@ export default {
289 * @author: renchao 285 * @author: renchao
290 * 新增列表功能 286 * 新增列表功能
291 */ 287 */
292 taplist(data, index) { 288 taplist (data, index) {
293 this.loadComponent(data.form); 289 this.loadComponent(data.form);
294 this.isActive = index; 290 this.isActive = index;
295 }, 291 },
...@@ -298,19 +294,19 @@ export default { ...@@ -298,19 +294,19 @@ export default {
298 * @param {*} form 294 * @param {*} form
299 * @author: renchao 295 * @author: renchao
300 */ 296 */
301 loadComponent(form) { 297 loadComponent (form) {
302 this.componentTag = (r) => 298 this.componentTag = (r) =>
303 require.ensure([], () => r(require("@/views/registerBook/" + form))); 299 require.ensure([], () => r(require("@/views/registerBook/" + form)));
304 }, 300 },
305 }, 301 },
306 }; 302 };
307 </script> 303 </script>
308 <style scoped lang="scss"> 304 <style scoped lang="scss">
309 /deep/.rollTable { 305 /deep/.rollTable {
310 height: calc(120vh - 254px) !important; 306 height: calc(120vh - 254px) !important;
311 } 307 }
312 308
313 .content { 309 .content {
314 width: 100%; 310 width: 100%;
315 height: 100%; 311 height: 100%;
316 display: flex; 312 display: flex;
...@@ -331,34 +327,34 @@ export default { ...@@ -331,34 +327,34 @@ export default {
331 background-color: #f5f5f5; 327 background-color: #f5f5f5;
332 border: 1px solid rgb(228, 228, 228); 328 border: 1px solid rgb(228, 228, 228);
333 } 329 }
334 } 330 }
335 331
336 /deep/ .expanded.el-tree-node__expand-icon, 332 /deep/ .expanded.el-tree-node__expand-icon,
337 /deep/ .el-tree-node__expand-icon { 333 /deep/ .el-tree-node__expand-icon {
338 visibility: hidden; 334 visibility: hidden;
339 } 335 }
340 336
341 /deep/ .el-tree-node__content { 337 /deep/ .el-tree-node__content {
342 border: 1px solid rgb(228, 228, 228); 338 border: 1px solid rgb(228, 228, 228);
343 height: 45px; 339 height: 45px;
344 } 340 }
345 341
346 /deep/ .el-tree-node:focus > .el-tree-node__content { 342 /deep/ .el-tree-node:focus > .el-tree-node__content {
347 // background-color: #f5f5f5; 343 // background-color: #f5f5f5;
348 // color: #0079fe; 344 // color: #0079fe;
349 // border-right: 4px solid #0079fe; 345 // border-right: 4px solid #0079fe;
350 } 346 }
351 347
352 /deep/.el-tree-node { 348 /deep/.el-tree-node {
353 white-space: pre-wrap; 349 white-space: pre-wrap;
354 } 350 }
355 351
356 /deep/ .is-current > .el-tree-node__content { 352 /deep/ .is-current > .el-tree-node__content {
357 // background-color: #f5f5f5; 353 // background-color: #f5f5f5;
358 // color: #0079fe; 354 // color: #0079fe;
359 // border-right: 4px solid #0079fe; 355 // border-right: 4px solid #0079fe;
360 } 356 }
361 /deep/.el-collapse-item__header { 357 /deep/.el-collapse-item__header {
362 width: 100%; 358 width: 100%;
363 cursor: pointer; 359 cursor: pointer;
364 position: relative; 360 position: relative;
...@@ -383,11 +379,11 @@ export default { ...@@ -383,11 +379,11 @@ export default {
383 display: inline-block; 379 display: inline-block;
384 line-height: 45px; 380 line-height: 45px;
385 border: 1px solid rgb(228, 228, 228); 381 border: 1px solid rgb(228, 228, 228);
386 } 382 }
387 /deep/.el-collapse-item__content { 383 /deep/.el-collapse-item__content {
388 padding-bottom: 5px; 384 padding-bottom: 5px;
389 } 385 }
390 /deep/.unselected { 386 /deep/.unselected {
391 // white-space: wrap; 387 // white-space: wrap;
392 border: none; 388 border: none;
393 cursor: pointer; 389 cursor: pointer;
...@@ -404,9 +400,9 @@ export default { ...@@ -404,9 +400,9 @@ export default {
404 justify-content: center; 400 justify-content: center;
405 align-items: center; 401 align-items: center;
406 } 402 }
407 } 403 }
408 404
409 .select { 405 .select {
410 border: none; 406 border: none;
411 cursor: pointer; 407 cursor: pointer;
412 width: 250px; 408 width: 250px;
...@@ -423,5 +419,5 @@ export default { ...@@ -423,5 +419,5 @@ export default {
423 justify-content: center; 419 justify-content: center;
424 align-items: center; 420 align-items: center;
425 } 421 }
426 } 422 }
427 </style> 423 </style>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 </p> 35 </p>
36 </div> 36 </div>
37 </div> 37 </div>
38 </div> 38 </div>
39 39
40 </template> 40 </template>
41 41
...@@ -78,18 +78,15 @@ ...@@ -78,18 +78,15 @@
78 width: 100%; 78 width: 100%;
79 height: 100%; 79 height: 100%;
80 position: relative; 80 position: relative;
81 .print{ 81 .print {
82 // background-color: #0079fe; 82 // background-color: #0079fe;
83 z-index: 10; 83 z-index: 10;
84 position: absolute; 84 position: absolute;
85 left: 11px; 85 left: 11px;
86 top: 5px; 86 top: 5px;
87
88
89 } 87 }
90
91 } 88 }
92 .fm{ 89 .fm {
93 width: 100%; 90 width: 100%;
94 height: 100%; 91 height: 100%;
95 background: #fff; 92 background: #fff;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-09-18 15:01:13 4 * @LastEditTime: 2023-09-22 09:49:44
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -39,14 +39,14 @@ ...@@ -39,14 +39,14 @@
39 * @description: loadData 39 * @description: loadData
40 * @author: miaofang 40 * @author: miaofang
41 */ 41 */
42 loadData () { 42 loadData (checkList = []) {
43 if (this.$parent.addRepairRecord) { 43 if (this.$parent.addRepairRecord) {
44 this.columns.unshift({ prop: "cz", label: "操作" }); 44 this.columns.unshift({ prop: "cz", label: "操作" });
45 } 45 }
46 getFdcq2List({ 46 getFdcq2List({
47 bdcdyid: this.propsParam.bdcdyid, 47 bdcdyid: this.propsParam.bdcdyid,
48 qllx: this.propsParam.qllx, 48 qllx: this.propsParam.qllx,
49 qszt: this.checkList, 49 qszt: checkList
50 }).then((res) => { 50 }).then((res) => {
51 if (res.code === 200) { 51 if (res.code === 200) {
52 this.tableData = res.result; 52 this.tableData = res.result;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-09-18 13:43:36 4 * @LastEditTime: 2023-09-22 09:49:31
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -40,11 +40,11 @@ ...@@ -40,11 +40,11 @@
40 this.loadData(); 40 this.loadData();
41 }, 41 },
42 methods: { 42 methods: {
43 loadData () { 43 loadData (checkList = []) {
44 getJsydsyqList({ 44 getJsydsyqList({
45 bdcdyid: this.propsParam.bdcdyid, 45 bdcdyid: this.propsParam.bdcdyid,
46 qllx: this.propsParam.qllx, 46 qllx: this.propsParam.qllx,
47 qszt: this.checkList, 47 qszt: checkList
48 }).then((res) => { 48 }).then((res) => {
49 if (res.code === 200) { 49 if (res.code === 200) {
50 this.tableData = res.result; 50 this.tableData = res.result;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-09-18 13:44:04 4 * @LastEditTime: 2023-09-22 09:53:54
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 this.loadData(); 40 this.loadData();
41 }, 41 },
42 methods: { 42 methods: {
43 loadData () { 43 loadData (checkList = []) {
44 if (this.$parent.addRepairRecord) { 44 if (this.$parent.addRepairRecord) {
45 this.columns.unshift({ 45 this.columns.unshift({
46 prop: "cz", 46 prop: "cz",
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 getLqList({ 50 getLqList({
51 bdcdyid: this.propsParam.bdcdyid, 51 bdcdyid: this.propsParam.bdcdyid,
52 qllx: this.propsParam.qllx, 52 qllx: this.propsParam.qllx,
53 qszt: this.checkList, 53 qszt: checkList
54 }).then((res) => { 54 }).then((res) => {
55 if (res.code === 200) { 55 if (res.code === 200) {
56 this.tableData = res.result; 56 this.tableData = res.result;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-09-18 13:44:35 4 * @LastEditTime: 2023-09-22 09:53:31
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 this.loadData(); 46 this.loadData();
47 }, 47 },
48 methods: { 48 methods: {
49 loadData () { 49 loadData (checkList = []) {
50 if (this.$parent.addRepairRecord) { 50 if (this.$parent.addRepairRecord) {
51 this.columns.unshift({ 51 this.columns.unshift({
52 prop: "cz", 52 prop: "cz",
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 getNydsyqList({ 56 getNydsyqList({
57 bdcdyid: this.propsParam.bdcdyid, 57 bdcdyid: this.propsParam.bdcdyid,
58 qllx: this.propsParam.qllx, 58 qllx: this.propsParam.qllx,
59 qszt: this.checkList, 59 qszt: checkList
60 }).then((res) => { 60 }).then((res) => {
61 if (res.code === 200) { 61 if (res.code === 200) {
62 this.tableData = res.result; 62 this.tableData = res.result;
...@@ -68,13 +68,13 @@ ...@@ -68,13 +68,13 @@
68 this.emptycolNum = 68 this.emptycolNum =
69 datas.columns().emptycolNum - this.tableData.length; 69 datas.columns().emptycolNum - this.tableData.length;
70 } else { 70 } else {
71 this.emptycolNum = 0; 71 this.emptycolNum = 0
72 } 72 }
73 } 73 }
74 }); 74 })
75 }
75 } 76 }
76 } 77 }
77 };
78 </script> 78 </script>
79 79
80 <style lang="scss" scoped> 80 <style lang="scss" scoped>
......
...@@ -60,7 +60,8 @@ ...@@ -60,7 +60,8 @@
60 top: 0px; 60 top: 0px;
61 z-index: 3; 61 z-index: 3;
62 margin-top: -2px; 62 margin-top: -2px;
63 &:after{ 63
64 &:after {
64 content: ""; 65 content: "";
65 display: inline-block; 66 display: inline-block;
66 width: 100%; 67 width: 100%;
...@@ -77,7 +78,8 @@ ...@@ -77,7 +78,8 @@
77 position: sticky; 78 position: sticky;
78 top: 40px; 79 top: 40px;
79 z-index: 3; 80 z-index: 3;
80 &:after{ 81
82 &:after {
81 content: ""; 83 content: "";
82 display: inline-block; 84 display: inline-block;
83 width: 100%; 85 width: 100%;
...@@ -102,7 +104,8 @@ ...@@ -102,7 +104,8 @@
102 left: 0; 104 left: 0;
103 z-index: 2; 105 z-index: 2;
104 margin-left: -2px; 106 margin-left: -2px;
105 &:before{ 107
108 &:before {
106 content: ""; 109 content: "";
107 display: inline-block; 110 display: inline-block;
108 width: 2px; 111 width: 2px;
...@@ -113,7 +116,8 @@ ...@@ -113,7 +116,8 @@
113 left: -2px; 116 left: -2px;
114 z-index: 3; 117 z-index: 3;
115 } 118 }
116 &:after{ 119
120 &:after {
117 content: ""; 121 content: "";
118 display: inline-block; 122 display: inline-block;
119 width: 2px; 123 width: 2px;
...@@ -228,11 +232,12 @@ ...@@ -228,11 +232,12 @@
228 min-width: 340px; 232 min-width: 340px;
229 z-index: 1; 233 z-index: 1;
230 } 234 }
231 td:first-child{ 235
236 td:first-child {
232 flex: inherit !important; 237 flex: inherit !important;
233 // width: 200px !important; 238 // min-width: 180px !important;
234 min-width: 180px !important;
235 } 239 }
240
236 >tr:nth-child(odd) td { 241 >tr:nth-child(odd) td {
237 background: #f2f2f2; 242 background: #f2f2f2;
238 } 243 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-09-18 13:45:03 4 * @LastEditTime: 2023-09-22 09:53:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 this.loadData(); 36 this.loadData();
37 }, 37 },
38 methods: { 38 methods: {
39 loadData () { 39 loadData (checkList = []) {
40 if (this.$parent.addRepairRecord) { 40 if (this.$parent.addRepairRecord) {
41 this.columns.unshift({ 41 this.columns.unshift({
42 prop: "cz", 42 prop: "cz",
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 getLqList({ 46 getLqList({
47 bdcdyid: this.propsParam.bdcdyid, 47 bdcdyid: this.propsParam.bdcdyid,
48 qllx: this.propsParam.qllx, 48 qllx: this.propsParam.qllx,
49 qszt: this.checkList, 49 qszt: checkList
50 }).then((res) => { 50 }).then((res) => {
51 if (res.code === 200) { 51 if (res.code === 200) {
52 this.tableData = res.result; 52 this.tableData = res.result;
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 * @description: loadData 44 * @description: loadData
45 * @author: miaofang 45 * @author: miaofang
46 */ 46 */
47 loadData () { 47 loadData (checkList = []) {
48 if (this.$parent.addRepairRecord) { 48 if (this.$parent.addRepairRecord) {
49 this.columns.unshift({ 49 this.columns.unshift({
50 prop: "cz", 50 prop: "cz",
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 getTdsyqList({ 54 getTdsyqList({
55 bdcdyid: this.propsParam.bdcdyid, 55 bdcdyid: this.propsParam.bdcdyid,
56 qllx: this.propsParam.qllx, 56 qllx: this.propsParam.qllx,
57 qszt: this.checkList, 57 qszt: checkList
58 }).then((res) => { 58 }).then((res) => {
59 if (res.code === 200) { 59 if (res.code === 200) {
60 this.tableData = res.result; 60 this.tableData = res.result;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-09-18 13:40:33 4 * @LastEditTime: 2023-09-22 09:52:50
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 this.loadData(); 36 this.loadData();
37 }, 37 },
38 methods: { 38 methods: {
39 loadData () { 39 loadData (checkList = []) {
40 // 判断是否在登记簿补录调的子页面 40 // 判断是否在登记簿补录调的子页面
41 if (this.$parent.addRepairRecord) { 41 if (this.$parent.addRepairRecord) {
42 this.columns.unshift({ 42 this.columns.unshift({
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 getYgdjList({ 47 getYgdjList({
48 bdcdyid: this.propsParam.bdcdyid, 48 bdcdyid: this.propsParam.bdcdyid,
49 qllx: this.propsParam.qllx, 49 qllx: this.propsParam.qllx,
50 qszt: this.checkList, 50 qszt: checkList
51 }).then((res) => { 51 }).then((res) => {
52 if (res.code === 200) { 52 if (res.code === 200) {
53 this.tableData = res.result; 53 this.tableData = res.result;
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 this.emptycolNum = 60 this.emptycolNum =
61 datas.columns().emptycolNum - this.tableData.length; 61 datas.columns().emptycolNum - this.tableData.length;
62 } else { 62 } else {
63 this.emptycolNum = 0; 63 this.emptycolNum = 0
64 } 64 }
65 } 65 }
66 }) 66 })
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-09-18 15:06:35 4 * @LastEditTime: 2023-09-22 09:52:37
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 this.loadData(); 36 this.loadData();
37 }, 37 },
38 methods: { 38 methods: {
39 loadData () { 39 loadData (checkList = []) {
40 if (this.$parent.addRepairRecord) { 40 if (this.$parent.addRepairRecord) {
41 this.columns.unshift({ 41 this.columns.unshift({
42 prop: "cz", 42 prop: "cz",
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 getYydjList({ 46 getYydjList({
47 bdcdyid: this.propsParam.bdcdyid, 47 bdcdyid: this.propsParam.bdcdyid,
48 qllx: this.propsParam.qllx, 48 qllx: this.propsParam.qllx,
49 qszt: this.checkList, 49 qszt: checkList
50 }).then((res) => { 50 }).then((res) => {
51 if (res.code === 200) { 51 if (res.code === 200) {
52 this.tableData = res.result; 52 this.tableData = res.result;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-20 16:07:43 4 * @LastEditTime: 2023-09-21 16:42:53
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox 7 <dialogBox
...@@ -543,7 +543,7 @@ ...@@ -543,7 +543,7 @@
543 cancelButtonText: '取消', 543 cancelButtonText: '取消',
544 }).then(() => { 544 }).then(() => {
545 replace(val.bsmCompany, this.$route.query.bsmSlsq, bsmSldy).then(res => { 545 replace(val.bsmCompany, this.$route.query.bsmSlsq, bsmSldy).then(res => {
546 that.$emit("updateDetail", _.cloneDeep(val)); 546 that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' }));
547 that.$emit("input", false); 547 that.$emit("input", false);
548 if (res.code == 200) { 548 if (res.code == 200) {
549 that.$message({ 549 that.$message({
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 14:04:13 4 * @LastEditTime: 2023-09-22 10:09:05
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;">
...@@ -224,18 +224,18 @@ ...@@ -224,18 +224,18 @@
224 arr.push(currentLine); 224 arr.push(currentLine);
225 if (i > 0) { 225 if (i > 0) {
226 arr.forEach((line, index) => { 226 arr.forEach((line, index) => {
227 context.fillText(line, 129, 490 + (26 * (i - 1)) + 4 * num + (index * 14)); // 调整行高 227 context.fillText(line, 129, 485 + (24 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
228 }) 228 })
229 } else { 229 } else {
230 arr.forEach((line, index) => { 230 arr.forEach((line, index) => {
231 context.fillText(line, 129, 500 + (26 * (i - 1)) + (index * 14)); // 调整行高 231 context.fillText(line, 129, 495 + (26 * (i - 1)) + (index * 14)); // 调整行高
232 }) 232 })
233 } 233 }
234 } else { 234 } else {
235 if (i > 0) { 235 if (i > 0) {
236 context.fillText(lines[i] ? lines[i] : '', 129, 500 + 4 * num + (24 * (i - 1))); 236 context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (24 * (i - 1)));
237 } else { 237 } else {
238 context.fillText(lines[i] ? lines[i] : '', 129, 505 + (24 * (i - 1))); 238 context.fillText(lines[i] ? lines[i] : '', 129, 500 + (24 * (i - 1)));
239 } 239 }
240 } 240 }
241 } 241 }
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-14 16:59:38 4 * @LastEditTime: 2023-09-21 16:18:47
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -39,17 +39,6 @@ class data extends filter { ...@@ -39,17 +39,6 @@ class data extends filter {
39 <div> 39 <div>
40 <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a> 40 <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
41 <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span> 41 <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
42 {/* <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
43 <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
44 <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
45 <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
46 <span v-show={scope.row.cfzt == 1}>,已查封</span>
47 <span v-show={scope.row.diyizt == 1}>,已地役</span>
48 <span v-show={scope.row.yyzt == 1}>,异议中</span>
49 <span v-show={scope.row.xzzt == 1}>,已限制</span>
50 <span v-show={scope.row.ygmmzt == 1}>,已预告买卖</span>
51 <span v-show={scope.row.ygdyzt == 1}>,已预告抵押</span>
52 <span v-show={scope.row.dyzt == 1}>,已抵押</span> */}
53 </div> 42 </div>
54 ) 43 )
55 } 44 }
...@@ -72,7 +61,7 @@ class data extends filter { ...@@ -72,7 +61,7 @@ class data extends filter {
72 label: "权利性质", 61 label: "权利性质",
73 }, 62 },
74 { 63 {
75 prop: "mj", 64 prop: "zdmj",
76 label: "面积(㎡)", 65 label: "面积(㎡)",
77 }, 66 },
78 { 67 {
...@@ -80,7 +69,7 @@ class data extends filter { ...@@ -80,7 +69,7 @@ class data extends filter {
80 label: "权利设定方式", 69 label: "权利设定方式",
81 }, 70 },
82 { 71 {
83 prop: "ytmc", 72 prop: "showTdyt",
84 label: "土地用途", 73 label: "土地用途",
85 }, 74 },
86 { 75 {
......