8f7d18cc by renchao@pashanhoo.com

Merge branch 'dev'

2 parents b2097061 26ff6321
Showing 44 changed files with 743 additions and 249 deletions
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
23 "node-sass": "^4.14.1", 23 "node-sass": "^4.14.1",
24 "normalize.css": "7.0.0", 24 "normalize.css": "7.0.0",
25 "nprogress": "0.2.0", 25 "nprogress": "0.2.0",
26 "print-js": "^1.6.0",
26 "qrcode": "^1.5.3", 27 "qrcode": "^1.5.3",
27 "vue": "2.6.10", 28 "vue": "2.6.10",
28 "vue-json-editor": "^1.4.3", 29 "vue-json-editor": "^1.4.3",
......
...@@ -16,6 +16,7 @@ import Loading from '@/components/Loading/index.js'; ...@@ -16,6 +16,7 @@ import Loading from '@/components/Loading/index.js';
16 import '@riophae/vue-treeselect/dist/vue-treeselect.css' 16 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
17 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading' 17 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
18 import Print from 'vue-print-nb' 18 import Print from 'vue-print-nb'
19 import printJS from 'print-js'
19 Vue.use(Print); 20 Vue.use(Print);
20 Vue.mixin(mixin); 21 Vue.mixin(mixin);
21 Vue.use(Loading.directive); 22 Vue.use(Loading.directive);
...@@ -27,7 +28,6 @@ Vue.prototype.$x2js = new x2js() ...@@ -27,7 +28,6 @@ Vue.prototype.$x2js = new x2js()
27 // 全局加载 28 // 全局加载
28 Vue.prototype.$startLoading = startLoadingAddCount 29 Vue.prototype.$startLoading = startLoadingAddCount
29 Vue.prototype.$endLoading = endLoadingSubCount 30 Vue.prototype.$endLoading = endLoadingSubCount
30
31 // 弹框 31 // 弹框
32 import { popupDialog, popupCacel } from "./utils/popup.js"; 32 import { popupDialog, popupCacel } from "./utils/popup.js";
33 // 全局加载 33 // 全局加载
......
...@@ -41,4 +41,4 @@ export function getDictLeabel (level, code) { ...@@ -41,4 +41,4 @@ export function getDictLeabel (level, code) {
41 return node.dcode === level 41 return node.dcode === level
42 }) 42 })
43 return data.dname 43 return data.dname
44 }
...\ No newline at end of file ...\ No newline at end of file
44 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-07 16:09:13 4 * @LastEditTime: 2023-09-12 13:58:04
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <div class="next handle-btn" v-if="!isScan" @click="next()"> 11 <div class="next handle-btn" v-if="!isScan" @click="next()">
12 <i class="el-icon-arrow-right"></i> 12 <i class="el-icon-arrow-right"></i>
13 </div> 13 </div>
14 <div class="img-list-wrap"> 14 <div class="img-list-wrap" v-Loading="loading">
15 <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="高拍仪"> 15 <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="高拍仪">
16 <div v-for="(img, i) in previewImg.imgList" :key="i" v-else> 16 <div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
17 <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2" 17 <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete" 34 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
35 v-if="thumbnailImages.length>0 && ableOperation">删除</el-button> 35 v-if="thumbnailImages.length>0 && ableOperation">删除</el-button>
36 <div v-if="ableOperation" class="pl-5"> 36 <div v-if="ableOperation" class="pl-5">
37 <el-button type="primary" @click="handleOpenScan" v-if="ableOperation">{{scanTitle}}</el-button> 37 <el-button type="primary" @click="handleOpenScan" v-if="ableOperation" :loading="loading">{{scanTitle}}</el-button>
38 <el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button> 38 <el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button>
39 </div> 39 </div>
40 </div> 40 </div>
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
73 }, 73 },
74 data () { 74 data () {
75 return { 75 return {
76 loading: false,
76 key: 0, 77 key: 0,
77 isScan: false, 78 isScan: false,
78 // 打开高拍仪 79 // 打开高拍仪
...@@ -125,20 +126,22 @@ ...@@ -125,20 +126,22 @@
125 handleOpenScan () { 126 handleOpenScan () {
126 this.isScan = !this.isScan 127 this.isScan = !this.isScan
127 if (this.isScan) { 128 if (this.isScan) {
129 this.loading = true
128 this.$message({ 130 this.$message({
129 message: '正在启动程序请稍等', 131 message: '正在启动程序请稍等',
130 type: 'success' 132 type: 'success'
131 }) 133 })
132 setTimeout(() => { 134 setTimeout(() => {
133 this.scanTitle = '关闭高拍仪' 135 this.scanTitle = '关闭高拍仪'
136 this.loading = false
134 }, 4000) 137 }, 4000)
135 } else { 138 } else {
136 this.scanTitle = '打开高拍仪' 139 this.scanTitle = '打开高拍仪'
137 } 140 }
138 }, 141 },
139 // 左右移动 142 // 左右移动
140 handleMove(direction) { 143 handleMove (direction) {
141 144
142 }, 145 },
143 /** 146 /**
144 * @description: 拍照 147 * @description: 拍照
......
...@@ -6,12 +6,14 @@ ...@@ -6,12 +6,14 @@
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="box" :propsParam="propsParam" :tableData="tableData"/> 9 <printTemplate id="boxcfdj" :propsParam="propsParam" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
13 {{ title }} 13 {{ title }}
14 <el-button class="print" v-show="shows" v-print="printObj">打印</el-button> 14 <el-button class="print" v-show="shows" @click="openPrint()"
15 >打印</el-button
16 >
15 <div class="checkbox"> 17 <div class="checkbox">
16 <el-checkbox-group v-model="checkList" @change="checkChange"> 18 <el-checkbox-group v-model="checkList" @change="checkChange">
17 <el-checkbox 19 <el-checkbox
...@@ -125,12 +127,42 @@ export default { ...@@ -125,12 +127,42 @@ export default {
125 emptycolNum: datas.columns().emptycolNum, 127 emptycolNum: datas.columns().emptycolNum,
126 //列名称对象 128 //列名称对象
127 columns: datas.columns().CFDJ, 129 columns: datas.columns().CFDJ,
130 render: false,
128 }; 131 };
129 }, 132 },
130 created() { 133 created() {
131 this.loadData(); 134 this.loadData();
132 }, 135 },
133 methods: { 136 methods: {
137 /**
138 * @description: openPrint
139 * @author: miaofang
140 */
141 openPrint() {
142 this.render = true;
143 setTimeout(() => {
144 this.prinsss();
145 }, 100);
146 },
147 /**
148 * @description: prinsss
149 * @author: miaofang
150 */
151 prinsss() {
152 printJS({
153 printable: "boxcfdj", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
154 type: "html",
155 maxWidth: 800, // 最大宽度
156 font_size: "", // 不设置则使用默认字体大小
157 style: `@font-face {
158 font-family: "STZHONGS";
159 src: url(${window.ttf}) format("truetype");
160 }`,
161 // 继承原来的所有样式
162 targetStyles: ["*"],
163 });
164 this.render=false
165 },
134 /** 166 /**
135 * @description: loadData 167 * @description: loadData
136 * @author: renchao 168 * @author: renchao
......
...@@ -5,18 +5,27 @@ ...@@ -5,18 +5,27 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div id="box"> 7 <div id="box">
8 <div class="tbalede" v-for="(el, indexx) in datass" :key="indexx" style="page-break-after: always"> 8 <div
9 class="tbalede"
10 v-for="(el, indexx) in datass"
11 :key="indexx"
12 style="page-break-after: always"
13 >
9 <div class="title">{{ title }}</div> 14 <div class="title">{{ title }}</div>
10 <table class="xxTable"> 15 <table class="xxTable">
11 <tr v-for="(item) in columns" :key="item.name"> 16 <tr v-for="item in columns" :key="item.name">
12 <td> 17 <td>
13 {{ item.despriction }} 18 {{ item.despriction }}
14 </td> 19 </td>
15 <td v-for="(row, index) in el" :key="index+'2'"> 20 <td v-for="(row, index) in el" :key="index + '2'">
16 {{ row[item.name] }} 21 {{ row[item.name] }}
17 </td> 22 </td>
18 23
19 <td v-show="el.emptycolNum" v-for="count in emptycolNum" :key="count"></td> 24 <td
25 v-show="el.emptycolNum"
26 v-for="count in emptycolNum"
27 :key="count"
28 ></td>
20 </tr> 29 </tr>
21 </table> 30 </table>
22 </div> 31 </div>
...@@ -32,13 +41,12 @@ export default { ...@@ -32,13 +41,12 @@ export default {
32 data() { 41 data() {
33 return { 42 return {
34 title: this.$parent.title, 43 title: this.$parent.title,
35 checkList: datas.columns().checkList,
36 //列表数据 44 //列表数据
37 //空列值个数 45 //空列值个数
38 emptycolNum:3, 46 emptycolNum: 4,
39 //列名称对象 47 //列名称对象
40 columns: [], 48 columns: [],
41 datass:[], 49 datass: [],
42 }; 50 };
43 }, 51 },
44 props: { 52 props: {
...@@ -46,50 +54,55 @@ export default { ...@@ -46,50 +54,55 @@ export default {
46 type: Object, 54 type: Object,
47 default: () => {}, 55 default: () => {},
48 }, 56 },
49 tableData: { 57 tableData: {
50 type: Array, 58 type: Array,
51 default: () => [], 59 default: () => [],
52 }, 60 },
61 render:{
62 type: Boolean,
63 default: false,
64 }
53 }, 65 },
54 created() { 66 created() {},
55 },
56 watch: { 67 watch: {
57 tableData: { 68 tableData: {
58 handler (newValue, oldValue) { 69 handler(newValue, oldValue) {
59 this.tableData=newValue 70 this.tableData = newValue;
60 this.loadData() 71 },
61 }, 72 },
62 } 73 render: {
74 handler(newValue, oldValue) {
75 this.loadData();
76 },
77 },
78 immediate: true,
79 deep: true,
63 }, 80 },
64 methods: { 81 methods: {
65 /** 82 /**
66 * @description: loadData 83 * @description: loadData
67 * @author: renchao 84 * @author: miaofang
68 */ 85 */
69 loadData() { 86 loadData() {
70 getFieldListByQlxx({ 87 getFieldListByQlxx({
71 qllx: this.propsParam.qllx 88 qllx: this.propsParam.qllx,
72 }).then((res) => { 89 }).then((res) => {
73 if (res.code === 200) { 90 if (res.code === 200) {
74 this.columns = res.result; 91 this.columns = res.result;
75
76 } 92 }
77 }); 93 });
78 94 if (this.tableData.length&&this.datass.length==0) {
79 this.tableData.forEach((item) => { 95 for (let i = 0; i < this.tableData.length; i += 4) {
80 item.sjlx = getSjlx(item.sjlx); 96 this.datass.push(this.tableData.slice(i, i + 4));
81 }) 97 }
82 for (let i = 0; i < this.tableData.length; i+=3) { 98 let num = this.datass[this.datass.length - 1].length;
83 this.datass.push(this.tableData.slice(i,i+3)) 99 if (num < 4) {
84 } 100 this.emptycolNum = 4 - num;
85 let num=this.datass[this.datass.length-1].length 101 this.datass[this.datass.length - 1].emptycolNum = true;
86 if (num < 3) { 102 } else {
87 this.emptycolNum = 103 this.emptycolNum = 0;
88 3 - num; 104 }
89 this.datass[this.datass.length-1].emptycolNum=true 105 }
90 } else {
91 this.emptycolNum = 0;
92 }
93 }, 106 },
94 }, 107 },
95 }; 108 };
...@@ -97,7 +110,7 @@ export default { ...@@ -97,7 +110,7 @@ export default {
97 110
98 <style lang="scss" scoped> 111 <style lang="scss" scoped>
99 .tbalede { 112 .tbalede {
100 width: 794px; 113 width: 100%;
101 // height: 1123px; 114 // height: 1123px;
102 margin: auto; 115 margin: auto;
103 .title { 116 .title {
...@@ -124,6 +137,17 @@ export default { ...@@ -124,6 +137,17 @@ export default {
124 min-width: 80px; 137 min-width: 80px;
125 padding: 5px; 138 padding: 5px;
126 } 139 }
140 td {
141 width: 20px!important;
142 word-break: break-all;
143 // /* 方法一:使用 word-break */
144 // word-break: break-all;
145 // // /* 方法二:使用 white-space */
146 // // white-space: pre-wrap;
147 // // /* 方法三:使用 overflow-wrap */
148 // // overflow-wrap: break-word;
149 }
150
127 } 151 }
128 } 152 }
129 </style> 153 </style>
......
...@@ -6,12 +6,14 @@ ...@@ -6,12 +6,14 @@
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="box" :propsParam="propsParam" :tableData="tableData"/> 9 <printTemplate id="boxdiyaq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
13 {{ title }} 13 {{ title }}
14 <el-button class="print" v-show="shows" v-print="printObj">打印</el-button> 14 <el-button class="print" v-show="shows" @click="openPrint()"
15 >打印</el-button
16 >
15 <div class="checkbox"> 17 <div class="checkbox">
16 <el-checkbox-group v-model="checkList" @change="checkChange"> 18 <el-checkbox-group v-model="checkList" @change="checkChange">
17 <el-checkbox 19 <el-checkbox
...@@ -127,12 +129,42 @@ export default { ...@@ -127,12 +129,42 @@ export default {
127 emptycolNum: datas.columns().emptycolNum, 129 emptycolNum: datas.columns().emptycolNum,
128 //列名称对象 130 //列名称对象
129 columns: datas.columns().DYAQ, 131 columns: datas.columns().DYAQ,
132 render: false,
130 }; 133 };
131 }, 134 },
132 created() { 135 created() {
133 this.loadData(); 136 this.loadData();
134 }, 137 },
135 methods: { 138 methods: {
139 /**
140 * @description: openPrint
141 * @author: miaofang
142 */
143 openPrint() {
144 this.render = true;
145 setTimeout(() => {
146 this.prinsss();
147 }, 100);
148 },
149 /**
150 * @description: prinsss
151 * @author: miaofang
152 */
153 prinsss() {
154 printJS({
155 printable: "boxdiyaq", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
156 type: "html",
157 maxWidth: 800, // 最大宽度
158 font_size: "", // 不设置则使用默认字体大小
159 style: `@font-face {
160 font-family: "STZHONGS";
161 src: url(${window.ttf}) format("truetype");
162 }`,
163 // 继承原来的所有样式
164 targetStyles: ["*"],
165 });
166 this.render=false
167 },
136 /** 168 /**
137 * @description: loadData 169 * @description: loadData
138 * @author: renchao 170 * @author: renchao
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: miaofang
4 * @LastEditTime: 2023-08-23 15:54:12 4 * @LastEditTime: 2023-08-23 15:54:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="box" :propsParam="propsParam" :tableData="tableData"/> 9 <printTemplate id="boxdiyiq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
13 {{ title }} 13 {{ title }}
14 <el-button class="print" v-show="shows" v-print="printObj">打印</el-button> 14 <el-button class="print" v-show="shows" @click="openPrint()"
15 >打印</el-button
16 >
15 <div class="checkbox"> 17 <div class="checkbox">
16 <el-checkbox-group v-model="checkList" @change="checkChange"> 18 <el-checkbox-group v-model="checkList" @change="checkChange">
17 <el-checkbox 19 <el-checkbox
...@@ -127,15 +129,44 @@ export default { ...@@ -127,15 +129,44 @@ export default {
127 emptycolNum: datas.columns().emptycolNum, 129 emptycolNum: datas.columns().emptycolNum,
128 //列名称对象 130 //列名称对象
129 columns: datas.columns().DYIQ, 131 columns: datas.columns().DYIQ,
132 render: false,
130 }; 133 };
131 }, 134 },
132 created() { 135 created() {
133 this.loadData(); 136 this.loadData();
134 }, 137 },
135 methods: { 138 methods: { /**
139 * @description: openPrint
140 * @author: miaofang
141 */
142 openPrint() {
143 this.render = true;
144 setTimeout(() => {
145 this.prinsss();
146 }, 100);
147 },
148 /**
149 * @description: prinsss
150 * @author: miaofang
151 */
152 prinsss() {
153 printJS({
154 printable: "boxdiyiq", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
155 type: "html",
156 maxWidth: 800, // 最大宽度
157 font_size: "", // 不设置则使用默认字体大小
158 style: `@font-face {
159 font-family: "STZHONGS";
160 src: url(${window.ttf}) format("truetype");
161 }`,
162 // 继承原来的所有样式
163 targetStyles: ["*"],
164 });
165 this.render=false
166 },
136 /** 167 /**
137 * @description: loadData 168 * @description: loadData
138 * @author: renchao 169 * @author: miaofang
139 */ 170 */
140 loadData() { 171 loadData() {
141 if (this.$parent.addRepairRecord) { 172 if (this.$parent.addRepairRecord) {
...@@ -164,7 +195,7 @@ export default { ...@@ -164,7 +195,7 @@ export default {
164 }, 195 },
165 /** 196 /**
166 * @description: checkChange 197 * @description: checkChange
167 * @author: renchao 198 * @author: miaofang
168 */ 199 */
169 checkChange() { 200 checkChange() {
170 if (this.checkList.length === 0) { 201 if (this.checkList.length === 0) {
...@@ -177,7 +208,7 @@ export default { ...@@ -177,7 +208,7 @@ export default {
177 /** 208 /**
178 * @description: getQsztName 209 * @description: getQsztName
179 * @param {*} code 210 * @param {*} code
180 * @author: renchao 211 * @author: miaofang
181 */ 212 */
182 getQsztName(code) { 213 getQsztName(code) {
183 let name = ""; 214 let name = "";
...@@ -194,7 +225,7 @@ export default { ...@@ -194,7 +225,7 @@ export default {
194 * @description: 新增一条补录信息 225 * @description: 新增一条补录信息
195 * @param {*} row 226 * @param {*} row
196 * @param {*} del 227 * @param {*} del
197 * @author: renchao 228 * @author: miaofang
198 */ 229 */
199 editDialog(row, del) { 230 editDialog(row, del) {
200 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 231 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: miaofang
4 * @LastEditTime: 2023-08-23 15:54:12 4 * @LastEditTime: 2023-08-23 15:54:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="box" :propsParam="propsParam" :tableData="tableData"/> 9 <printTemplate
10 id="boxfdcq"
11 :propsParam="propsParam" :tableData="tableData" :render="render"/>
10 </div> 12 </div>
11 <div class="tableBox"> 13 <div class="tableBox">
12 <div class="title"> 14 <div class="title">
13 {{ title }} 15 {{ title }}
14 <el-button class="print" v-show="shows" v-print="printObj">打印</el-button> 16 <el-button class="print" v-show="shows" @click="openPrint()"
17 >打印</el-button
18 >
15 <div class="checkbox"> 19 <div class="checkbox">
16 <el-checkbox-group v-model="checkList" @change="checkChange"> 20 <el-checkbox-group v-model="checkList" @change="checkChange">
17 <el-checkbox 21 <el-checkbox
...@@ -121,7 +125,7 @@ ...@@ -121,7 +125,7 @@
121 </template> 125 </template>
122 126
123 <script> 127 <script>
124 128 import printJS from "print-js";
125 import { datas } from "./qlxxFormData.js"; 129 import { datas } from "./qlxxFormData.js";
126 import { getSjlx } from "@/utils/dictionary.js"; 130 import { getSjlx } from "@/utils/dictionary.js";
127 import { getFdcq1List } from "@/api/djbDetail.js"; 131 import { getFdcq1List } from "@/api/djbDetail.js";
...@@ -136,7 +140,7 @@ export default { ...@@ -136,7 +140,7 @@ export default {
136 id: "box", 140 id: "box",
137 //其他配置项, 141 //其他配置项,
138 }, 142 },
139 shows:false, 143 shows: false,
140 title: "房地产权登记信息(多幢)", 144 title: "房地产权登记信息(多幢)",
141 qsztList: datas.columns().qsztList, 145 qsztList: datas.columns().qsztList,
142 checkList: datas.columns().checkList, 146 checkList: datas.columns().checkList,
...@@ -144,22 +148,54 @@ export default { ...@@ -144,22 +148,54 @@ export default {
144 propsParam: this.$attrs, 148 propsParam: this.$attrs,
145 //列表数据 149 //列表数据
146 tableData: [], 150 tableData: [],
151 // 异步传值
152 datalist: [],
147 //空列值个数 153 //空列值个数
148 emptycolNum: datas.columns().emptycolNum, 154 emptycolNum: datas.columns().emptycolNum,
149 //列名称对象 155 //列名称对象
150 columns: datas.columns().FDCQ1, 156 columns: datas.columns().FDCQ1,
157 render: false,
151 }; 158 };
152 }, 159 },
153 created() { 160 created() {
154 this.loadData(); 161 this.loadData();
155 }, 162 },
156 methods: { 163 methods: {
164 /**
165 * @description: openPrint
166 * @author: miaofang
167 */
168 openPrint() {
169 this.render = true;
170 setTimeout(() => {
171 this.prinsss();
172 }, 100);
173 },
174 /**
175 * @description: prinsss
176 * @author: miaofang
177 */
178 prinsss() {
179 printJS({
180 printable: "boxfdcq", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
181 type: "html",
182 maxWidth: 800, // 最大宽度
183 font_size: "", // 不设置则使用默认字体大小
184 style: `@font-face {
185 font-family: "STZHONGS";
186 src: url(${window.ttf}) format("truetype");
187 }`,
188 // 继承原来的所有样式
189 targetStyles: ["*"],
190 });
191 this.render=false
192 },
157 /** 193 /**
158 * @description: loadData 194 * @description: loadData
159 * @author: renchao 195 * @author: miaofang
160 */ 196 */
161 loadData() { 197 loadData() {
162 if (this.$parent.addRepairRecord) { 198 if (this.$parent.addRepairRecord) {
163 this.columns.unshift({ prop: "cz", label: "操作" }); 199 this.columns.unshift({ prop: "cz", label: "操作" });
164 } 200 }
165 getFdcq1List({ 201 getFdcq1List({
...@@ -169,7 +205,7 @@ export default { ...@@ -169,7 +205,7 @@ export default {
169 }).then((res) => { 205 }).then((res) => {
170 if (res.code === 200) { 206 if (res.code === 200) {
171 this.tableData = res.result; 207 this.tableData = res.result;
172 this.shows=this.tableData.length>0 208 this.shows = this.tableData.length > 0;
173 this.tableData.forEach((item) => { 209 this.tableData.forEach((item) => {
174 item.sjlx = getSjlx(item.sjlx); 210 item.sjlx = getSjlx(item.sjlx);
175 }); 211 });
...@@ -184,7 +220,7 @@ export default { ...@@ -184,7 +220,7 @@ export default {
184 }, 220 },
185 /** 221 /**
186 * @description: checkChange 222 * @description: checkChange
187 * @author: renchao 223 * @author: miaofang
188 */ 224 */
189 checkChange() { 225 checkChange() {
190 if (this.checkList.length === 0) { 226 if (this.checkList.length === 0) {
...@@ -197,7 +233,7 @@ export default { ...@@ -197,7 +233,7 @@ export default {
197 /** 233 /**
198 * @description: getQsztName 234 * @description: getQsztName
199 * @param {*} code 235 * @param {*} code
200 * @author: renchao 236 * @author: miaofang
201 */ 237 */
202 getQsztName(code) { 238 getQsztName(code) {
203 let name = ""; 239 let name = "";
...@@ -212,7 +248,7 @@ export default { ...@@ -212,7 +248,7 @@ export default {
212 /** 248 /**
213 * @description: judge 249 * @description: judge
214 * @param {*} lable 250 * @param {*} lable
215 * @author: renchao 251 * @author: miaofang
216 */ 252 */
217 judge(label) { 253 judge(label) {
218 if ( 254 if (
...@@ -230,7 +266,7 @@ export default { ...@@ -230,7 +266,7 @@ export default {
230 * @description: 新增一条补录信息 266 * @description: 新增一条补录信息
231 * @param {*} row 267 * @param {*} row
232 * @param {*} del 268 * @param {*} del
233 * @author: renchao 269 * @author: miaofang
234 */ 270 */
235 editDialog(row, del) { 271 editDialog(row, del) {
236 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 272 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: miaofang
4 * @LastEditTime: 2023-08-23 15:54:12 4 * @LastEditTime: 2023-08-23 15:54:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div>
9 <printTemplate id="box" :propsParam="propsParam" :tableData="tableData"/> 9 <printTemplate
10 id="boxfdcq"
11 :propsParam="propsParam"
12 :tableData="tableData"
13 :render="render"
14 />
10 </div> 15 </div>
11 <div class="tableBox"> 16 <div class="tableBox">
12 <div class="title"> 17 <div class="title">
13 {{ title }} 18 {{ title }}
14 <el-button class="print" v-show="shows" v-print="printObj">打印</el-button> 19 <el-button class="print" v-show="shows" @click="openPrint()"
20 >打印</el-button
21 >
15 <div class="checkbox"> 22 <div class="checkbox">
16 <el-checkbox-group v-model="checkList" @change="checkChange"> 23 <el-checkbox-group v-model="checkList" @change="checkChange">
17 <el-checkbox 24 <el-checkbox
...@@ -106,16 +113,13 @@ import { datas } from "./qlxxFormData.js"; ...@@ -106,16 +113,13 @@ import { datas } from "./qlxxFormData.js";
106 import { getSjlx } from "@/utils/dictionary.js"; 113 import { getSjlx } from "@/utils/dictionary.js";
107 import { getFdcq2List } from "@/api/djbDetail.js"; 114 import { getFdcq2List } from "@/api/djbDetail.js";
108 export default { 115 export default {
109 components: { 116 components: {
110 printTemplate, 117 printTemplate,
111 }, 118 },
112 data() { 119 data() {
113 return { 120 return {
114 printObj: { 121
115 id: "box", 122 shows: false,
116 //其他配置项,
117 },
118 shows:false,
119 title: "房地产权登记信息(独幢、层、套、间房屋)", 123 title: "房地产权登记信息(独幢、层、套、间房屋)",
120 qsztList: datas.columns().qsztList, 124 qsztList: datas.columns().qsztList,
121 checkList: datas.columns().checkList, 125 checkList: datas.columns().checkList,
...@@ -127,6 +131,7 @@ export default { ...@@ -127,6 +131,7 @@ export default {
127 emptycolNum: datas.columns().emptycolNum, 131 emptycolNum: datas.columns().emptycolNum,
128 //列名称对象 132 //列名称对象
129 columns: datas.columns().FDCQ2, 133 columns: datas.columns().FDCQ2,
134 render: false,
130 }; 135 };
131 }, 136 },
132 created() { 137 created() {
...@@ -134,8 +139,37 @@ export default { ...@@ -134,8 +139,37 @@ export default {
134 }, 139 },
135 methods: { 140 methods: {
136 /** 141 /**
142 * @description: openPrint
143 * @author: miaofang
144 */
145 openPrint() {
146 this.render = true;
147 setTimeout(() => {
148 this.prinsss();
149 }, 100);
150 },
151 /**
152 * @description: prinsss
153 * @author: miaofang
154 */
155 prinsss() {
156 printJS({
157 printable: "boxfdcq", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
158 type: "html",
159 maxWidth: 800, // 最大宽度
160 font_size: "", // 不设置则使用默认字体大小
161 style: `@font-face {
162 font-family: "STZHONGS";
163 src: url(${window.ttf}) format("truetype");
164 }`,
165 // 继承原来的所有样式
166 targetStyles: ["*"],
167 });
168 this.render = false
169 },
170 /**
137 * @description: loadData 171 * @description: loadData
138 * @author: renchao 172 * @author: miaofang
139 */ 173 */
140 loadData() { 174 loadData() {
141 if (this.$parent.addRepairRecord) { 175 if (this.$parent.addRepairRecord) {
...@@ -148,8 +182,7 @@ export default { ...@@ -148,8 +182,7 @@ export default {
148 }).then((res) => { 182 }).then((res) => {
149 if (res.code === 200) { 183 if (res.code === 200) {
150 this.tableData = res.result; 184 this.tableData = res.result;
151 this.shows=this.tableData.length>0 185 this.shows = this.tableData.length > 0;
152 console.log("this.tableData111",this.tableData);
153 this.tableData.forEach((item) => { 186 this.tableData.forEach((item) => {
154 item.sjlx = getSjlx(item.sjlx); 187 item.sjlx = getSjlx(item.sjlx);
155 }); 188 });
...@@ -164,7 +197,7 @@ export default { ...@@ -164,7 +197,7 @@ export default {
164 }, 197 },
165 /** 198 /**
166 * @description: checkChange 199 * @description: checkChange
167 * @author: renchao 200 * @author: miaofang
168 */ 201 */
169 checkChange() { 202 checkChange() {
170 if (this.checkList.length === 0) { 203 if (this.checkList.length === 0) {
...@@ -177,7 +210,7 @@ export default { ...@@ -177,7 +210,7 @@ export default {
177 /** 210 /**
178 * @description: getQsztName 211 * @description: getQsztName
179 * @param {*} code 212 * @param {*} code
180 * @author: renchao 213 * @author: miaofang
181 */ 214 */
182 getQsztName(code) { 215 getQsztName(code) {
183 let name = ""; 216 let name = "";
...@@ -194,7 +227,7 @@ export default { ...@@ -194,7 +227,7 @@ export default {
194 * @description: 新增一条补录信息 227 * @description: 新增一条补录信息
195 * @param {*} row 228 * @param {*} row
196 * @param {*} del 229 * @param {*} del
197 * @author: renchao 230 * @author: miaofang
198 */ 231 */
199 editDialog(row, del) { 232 editDialog(row, del) {
200 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 233 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: miaofang
4 * @LastEditTime: 2023-08-23 15:54:12 4 * @LastEditTime: 2023-08-23 15:54:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="box" :propsParam="propsParam" :tableData="tableData"/> 9 <printTemplate
10 id="boxjsydsyq"
11 :propsParam="propsParam"
12 :tableData="tableData"
13 :render="render"
14 />
10 </div> 15 </div>
11 <div class="tableBox"> 16 <div class="tableBox">
12 <div class="title"> 17 <div class="title">
13 {{ title }} 18 {{ title }}
14 <el-button class="print" v-show="shows" v-print="printObj">打印</el-button> 19 <el-button class="print" v-show="shows" @click="openPrint()"
20 >打印</el-button
21 >
15 <div class="checkbox"> 22 <div class="checkbox">
16 <el-checkbox-group v-model="checkList" @change="checkChange"> 23 <el-checkbox-group v-model="checkList" @change="checkChange">
17 <el-checkbox 24 <el-checkbox
...@@ -115,7 +122,7 @@ export default { ...@@ -115,7 +122,7 @@ export default {
115 id: "box", 122 id: "box",
116 //其他配置项, 123 //其他配置项,
117 }, 124 },
118 shows:false, 125 shows: false,
119 title: "建设用地使用权、宅基地使用权登记信息", 126 title: "建设用地使用权、宅基地使用权登记信息",
120 qsztList: datas.columns().qsztList, 127 qsztList: datas.columns().qsztList,
121 checkList: datas.columns().checkList, 128 checkList: datas.columns().checkList,
...@@ -127,18 +134,47 @@ export default { ...@@ -127,18 +134,47 @@ export default {
127 emptycolNum: datas.columns().emptycolNum, 134 emptycolNum: datas.columns().emptycolNum,
128 //列名称对象 135 //列名称对象
129 columns: datas.columns().JSYDSYQ, 136 columns: datas.columns().JSYDSYQ,
137 render: false,
130 }; 138 };
131 }, 139 },
132 created() { 140 created() {
133 this.loadData(); 141 this.loadData();
134 }, 142 },
135 methods: { 143 methods: {
144 /**
145 * @description: openPrint
146 * @author: miaofang
147 */
148 openPrint() {
149 this.render = true;
150 setTimeout(() => {
151 this.prinsss();
152 }, 100);
153 },
154 /**
155 * @description: prinsss
156 * @author: miaofang
157 */
158 prinsss() {
159 printJS({
160 printable: "boxjsydsyq", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
161 type: "html",
162 maxWidth: 800, // 最大宽度
163 font_size: "", // 不设置则使用默认字体大小
164 style: `@font-face {
165 font-family: "STZHONGS";
166 src: url(${window.ttf}) format("truetype");
167 }`,
168 // 继承原来的所有样式
169 targetStyles: ["*"],
170 });
171 this.render=false
172 },
136 /** 173 /**
137 * @description: loadData 174 * @description: loadData
138 * @author: renchao 175 * @author: miaofang
139 */ 176 */
140 loadData() { 177 loadData() {
141
142 getJsydsyqList({ 178 getJsydsyqList({
143 bdcdyid: this.propsParam.bdcdyid, 179 bdcdyid: this.propsParam.bdcdyid,
144 qllx: this.propsParam.qllx, 180 qllx: this.propsParam.qllx,
...@@ -146,7 +182,7 @@ export default { ...@@ -146,7 +182,7 @@ export default {
146 }).then((res) => { 182 }).then((res) => {
147 if (res.code === 200) { 183 if (res.code === 200) {
148 this.tableData = res.result; 184 this.tableData = res.result;
149 this.shows=this.tableData.length>0 185 this.shows = this.tableData.length > 0;
150 this.tableData.forEach((item) => { 186 this.tableData.forEach((item) => {
151 item.sjlx = getSjlx(item.sjlx); 187 item.sjlx = getSjlx(item.sjlx);
152 }); 188 });
...@@ -161,7 +197,7 @@ export default { ...@@ -161,7 +197,7 @@ export default {
161 }, 197 },
162 /** 198 /**
163 * @description: checkChange 199 * @description: checkChange
164 * @author: renchao 200 * @author: miaofang
165 */ 201 */
166 checkChange() { 202 checkChange() {
167 if (this.checkList.length === 0) { 203 if (this.checkList.length === 0) {
...@@ -174,7 +210,7 @@ export default { ...@@ -174,7 +210,7 @@ export default {
174 /** 210 /**
175 * @description: getQsztName 211 * @description: getQsztName
176 * @param {*} code 212 * @param {*} code
177 * @author: renchao 213 * @author: miaofang
178 */ 214 */
179 getQsztName(code) { 215 getQsztName(code) {
180 let name = ""; 216 let name = "";
...@@ -191,7 +227,7 @@ export default { ...@@ -191,7 +227,7 @@ export default {
191 * @description: 新增一条补录信息 227 * @description: 新增一条补录信息
192 * @param {*} row 228 * @param {*} row
193 * @param {*} del 229 * @param {*} del
194 * @author: renchao 230 * @author: miaofang
195 */ 231 */
196 editDialog(row, del) { 232 editDialog(row, del) {
197 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 233 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
...@@ -220,14 +256,14 @@ export default { ...@@ -220,14 +256,14 @@ export default {
220 256
221 <style lang="scss" scoped> 257 <style lang="scss" scoped>
222 @import "./qlxxCommon.scss"; 258 @import "./qlxxCommon.scss";
223 .title { 259 .title {
224 position: relative; 260 position: relative;
225 .print { 261 .print {
226 // background-color: #0079fe; 262 // background-color: #0079fe;
227 z-index: 10; 263 z-index: 10;
228 position: absolute; 264 position: absolute;
229 left: 11px; 265 left: 11px;
230 top: 5px; 266 top: 5px;
231 } 267 }
232 } 268 }
233 </style> 269 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: miaofang
4 * @LastEditTime: 2023-08-23 15:54:12 4 * @LastEditTime: 2023-08-23 15:54:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="box" :propsParam="propsParam" :tableData="tableData"/> 9 <printTemplate
10 id="boxldsyq"
11 :propsParam="propsParam"
12 :tableData="tableData"
13 :render="render"
14 />
10 </div> 15 </div>
11 <div class="tableBox"> 16 <div class="tableBox">
12 <div class="title"> 17 <div class="title">
13 {{ title }} 18 {{ title }}
14 <el-button class="print" v-show="shows" v-print="printObj">打印</el-button> 19 <el-button class="print" v-show="shows" @click="openPrint()"
20 >打印</el-button
21 >
15 <div class="checkbox"> 22 <div class="checkbox">
16 <el-checkbox-group v-model="checkList" @change="checkChange"> 23 <el-checkbox-group v-model="checkList" @change="checkChange">
17 <el-checkbox 24 <el-checkbox
...@@ -113,7 +120,7 @@ export default { ...@@ -113,7 +120,7 @@ export default {
113 id: "box", 120 id: "box",
114 //其他配置项, 121 //其他配置项,
115 }, 122 },
116 shows:false, 123 shows: false,
117 title: "林权登记信息", 124 title: "林权登记信息",
118 qsztList: datas.columns().qsztList, 125 qsztList: datas.columns().qsztList,
119 checkList: datas.columns().checkList, 126 checkList: datas.columns().checkList,
...@@ -125,6 +132,7 @@ export default { ...@@ -125,6 +132,7 @@ export default {
125 emptycolNum: datas.columns().emptycolNum, 132 emptycolNum: datas.columns().emptycolNum,
126 //列名称对象 133 //列名称对象
127 columns: datas.columns().LDSYQ, 134 columns: datas.columns().LDSYQ,
135 render: false,
128 }; 136 };
129 }, 137 },
130 created() { 138 created() {
...@@ -132,8 +140,37 @@ export default { ...@@ -132,8 +140,37 @@ export default {
132 }, 140 },
133 methods: { 141 methods: {
134 /** 142 /**
143 * @description: openPrint
144 * @author: miaofang
145 */
146 openPrint() {
147 this.render = true;
148 setTimeout(() => {
149 this.prinsss();
150 }, 100);
151 },
152 /**
153 * @description: prinsss
154 * @author: miaofang
155 */
156 prinsss() {
157 printJS({
158 printable: "boxldsyq", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
159 type: "html",
160 maxWidth: 800, // 最大宽度
161 font_size: "", // 不设置则使用默认字体大小
162 style: `@font-face {
163 font-family: "STZHONGS";
164 src: url(${window.ttf}) format("truetype");
165 }`,
166 // 继承原来的所有样式
167 targetStyles: ["*"],
168 });
169 this.render=false
170 },
171 /**
135 * @description: loadData 172 * @description: loadData
136 * @author: renchao 173 * @author: miaofang
137 */ 174 */
138 loadData() { 175 loadData() {
139 if (this.$parent.addRepairRecord) { 176 if (this.$parent.addRepairRecord) {
...@@ -149,7 +186,7 @@ export default { ...@@ -149,7 +186,7 @@ export default {
149 }).then((res) => { 186 }).then((res) => {
150 if (res.code === 200) { 187 if (res.code === 200) {
151 this.tableData = res.result; 188 this.tableData = res.result;
152 this.shows=this.tableData.length>0 189 this.shows = this.tableData.length > 0;
153 this.tableData.forEach((item) => { 190 this.tableData.forEach((item) => {
154 item.sjlx = getSjlx(item.sjlx); 191 item.sjlx = getSjlx(item.sjlx);
155 item.ldsyqxz = getDictLeabel(item.ldsyqxz, "A45"); 192 item.ldsyqxz = getDictLeabel(item.ldsyqxz, "A45");
...@@ -167,7 +204,7 @@ export default { ...@@ -167,7 +204,7 @@ export default {
167 }, 204 },
168 /** 205 /**
169 * @description: checkChange 206 * @description: checkChange
170 * @author: renchao 207 * @author: miaofang
171 */ 208 */
172 checkChange() { 209 checkChange() {
173 if (this.checkList.length === 0) { 210 if (this.checkList.length === 0) {
...@@ -180,7 +217,7 @@ export default { ...@@ -180,7 +217,7 @@ export default {
180 /** 217 /**
181 * @description: getQsztName 218 * @description: getQsztName
182 * @param {*} code 219 * @param {*} code
183 * @author: renchao 220 * @author: miaofang
184 */ 221 */
185 getQsztName(code) { 222 getQsztName(code) {
186 let name = ""; 223 let name = "";
...@@ -197,7 +234,7 @@ export default { ...@@ -197,7 +234,7 @@ export default {
197 * @description: 新增一条补录信息 234 * @description: 新增一条补录信息
198 * @param {*} row 235 * @param {*} row
199 * @param {*} del 236 * @param {*} del
200 * @author: renchao 237 * @author: miaofang
201 */ 238 */
202 editDialog(row, del) { 239 editDialog(row, del) {
203 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 240 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: miaofang
4 * @LastEditTime: 2023-08-23 15:54:12 4 * @LastEditTime: 2023-08-23 15:54:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="box" :propsParam="propsParam" :tableData="tableData"/> 9 <printTemplate
10 id="boxnydsyq"
11 :propsParam="propsParam"
12 :tableData="tableData"
13 :render="render"
14 />
10 </div> 15 </div>
11 <div class="tableBox"> 16 <div class="tableBox">
12 <div class="title"> 17 <div class="title">
13 {{ title }} 18 {{ title }}
14 <el-button class="print" v-show="shows" v-print="printObj">打印</el-button> 19 <el-button class="print" v-show="shows" @click="openPrint()"
20 >打印</el-button
21 >
15 <div class="checkbox"> 22 <div class="checkbox">
16 <el-checkbox-group v-model="checkList" @change="checkChange"> 23 <el-checkbox-group v-model="checkList" @change="checkChange">
17 <el-checkbox 24 <el-checkbox
...@@ -162,7 +169,7 @@ export default { ...@@ -162,7 +169,7 @@ export default {
162 id: "box", 169 id: "box",
163 //其他配置项, 170 //其他配置项,
164 }, 171 },
165 shows:false, 172 shows: false,
166 title: "农用地使用权登记信息", 173 title: "农用地使用权登记信息",
167 qsztList: datas.columns().qsztList, 174 qsztList: datas.columns().qsztList,
168 checkList: datas.columns().checkList, 175 checkList: datas.columns().checkList,
...@@ -174,6 +181,7 @@ export default { ...@@ -174,6 +181,7 @@ export default {
174 emptycolNum: datas.columns().emptycolNum, 181 emptycolNum: datas.columns().emptycolNum,
175 //列名称对象 182 //列名称对象
176 columns: datas.columns().NYDSYQ, 183 columns: datas.columns().NYDSYQ,
184 render: false,
177 }; 185 };
178 }, 186 },
179 created() { 187 created() {
...@@ -187,8 +195,37 @@ export default { ...@@ -187,8 +195,37 @@ export default {
187 }, 195 },
188 methods: { 196 methods: {
189 /** 197 /**
198 * @description: openPrint
199 * @author: miaofang
200 */
201 openPrint() {
202 this.render = true;
203 setTimeout(() => {
204 this.prinsss();
205 }, 100);
206 },
207 /**
208 * @description: prinsss
209 * @author: miaofang
210 */
211 prinsss() {
212 printJS({
213 printable: "boxnydsyq", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
214 type: "html",
215 maxWidth: 800, // 最大宽度
216 font_size: "", // 不设置则使用默认字体大小
217 style: `@font-face {
218 font-family: "STZHONGS";
219 src: url(${window.ttf}) format("truetype");
220 }`,
221 // 继承原来的所有样式
222 targetStyles: ["*"],
223 });
224 this.render=false
225 },
226 /**
190 * @description: loadData 227 * @description: loadData
191 * @author: renchao 228 * @author: miaofang
192 */ 229 */
193 loadData() { 230 loadData() {
194 if (this.$parent.addRepairRecord) { 231 if (this.$parent.addRepairRecord) {
...@@ -204,7 +241,7 @@ export default { ...@@ -204,7 +241,7 @@ export default {
204 }).then((res) => { 241 }).then((res) => {
205 if (res.code === 200) { 242 if (res.code === 200) {
206 this.tableData = res.result; 243 this.tableData = res.result;
207 this.shows=this.tableData.length>0 244 this.shows = this.tableData.length > 0;
208 this.tableData.forEach((item) => { 245 this.tableData.forEach((item) => {
209 item.sjlx = getSjlx(item.sjlx); 246 item.sjlx = getSjlx(item.sjlx);
210 }); 247 });
...@@ -219,7 +256,7 @@ export default { ...@@ -219,7 +256,7 @@ export default {
219 }, 256 },
220 /** 257 /**
221 * @description: checkChange 258 * @description: checkChange
222 * @author: renchao 259 * @author: miaofang
223 */ 260 */
224 checkChange() { 261 checkChange() {
225 if (this.checkList.length === 0) { 262 if (this.checkList.length === 0) {
...@@ -231,7 +268,7 @@ export default { ...@@ -231,7 +268,7 @@ export default {
231 }, 268 },
232 /** 269 /**
233 * @description: getQsztName 270 * @description: getQsztName
234 * @author: renchao 271 * @author: miaofang
235 */ 272 */
236 getQsztName(code) { 273 getQsztName(code) {
237 let name = ""; 274 let name = "";
...@@ -248,7 +285,7 @@ export default { ...@@ -248,7 +285,7 @@ export default {
248 * @description: 新增一条补录信息 285 * @description: 新增一条补录信息
249 * @param {*} row 286 * @param {*} row
250 * @param {*} del 287 * @param {*} del
251 * @author: renchao 288 * @author: miaofang
252 */ 289 */
253 editDialog(row, del) { 290 editDialog(row, del) {
254 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 291 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: miaofang
4 * @LastEditTime: 2023-08-23 15:54:12 4 * @LastEditTime: 2023-08-23 15:54:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="box" :propsParam="propsParam" :tableData="tableData"/> 9 <printTemplate id="boxtdsyq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
13 {{ title }} 13 {{ title }}
14 <el-button class="print" v-show="shows" v-print="printObj">打印</el-button> 14 <el-button class="print" v-show="shows" @click="openPrint()">打印</el-button>
15 <div class="checkbox"> 15 <div class="checkbox">
16 <el-checkbox-group v-model="checkList" @change="checkChange"> 16 <el-checkbox-group v-model="checkList" @change="checkChange">
17 <el-checkbox v-for="item in qsztList" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox> 17 <el-checkbox v-for="item in qsztList" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
...@@ -100,15 +100,37 @@ export default { ...@@ -100,15 +100,37 @@ export default {
100 emptycolNum: datas.columns().emptycolNum, 100 emptycolNum: datas.columns().emptycolNum,
101 //列名称对象 101 //列名称对象
102 columns: datas.columns().TDSYQ, 102 columns: datas.columns().TDSYQ,
103 render:false
103 }; 104 };
104 }, 105 },
105 created () { 106 created () {
106 this.loadData(); 107 this.loadData();
107 }, 108 },
108 methods: { 109 methods: {
110 openPrint(){
111 this.render=true
112 setTimeout(() => {
113 this.prinsss()
114 }, 100)
115 },
116 prinsss(){
117 printJS({
118 printable: "boxtdsyq", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
119 type: "html",
120 maxWidth: 800, // 最大宽度
121 font_size: "", // 不设置则使用默认字体大小
122 style: `@font-face {
123 font-family: "STZHONGS";
124 src: url(${window.ttf}) format("truetype");
125 }`,
126 // 继承原来的所有样式
127 targetStyles: ["*"]
128 });
129 this.render=false
130 },
109 /** 131 /**
110 * @description: loadData 132 * @description: loadData
111 * @author: renchao 133 * @author: miaofang
112 */ 134 */
113 loadData () { 135 loadData () {
114 136
...@@ -140,7 +162,7 @@ export default { ...@@ -140,7 +162,7 @@ export default {
140 }, 162 },
141 /** 163 /**
142 * @description: checkChange 164 * @description: checkChange
143 * @author: renchao 165 * @author: miaofang
144 */ 166 */
145 checkChange () { 167 checkChange () {
146 if (this.checkList.length === 0) { 168 if (this.checkList.length === 0) {
...@@ -153,7 +175,7 @@ export default { ...@@ -153,7 +175,7 @@ export default {
153 /** 175 /**
154 * @description: getQsztName 176 * @description: getQsztName
155 * @param {*} code 177 * @param {*} code
156 * @author: renchao 178 * @author: miaofang
157 */ 179 */
158 getQsztName (code) { 180 getQsztName (code) {
159 let name = ""; 181 let name = "";
...@@ -170,7 +192,7 @@ export default { ...@@ -170,7 +192,7 @@ export default {
170 * @description: 新增一条补录信息 192 * @description: 新增一条补录信息
171 * @param {*} row 193 * @param {*} row
172 * @param {*} del 194 * @param {*} del
173 * @author: renchao 195 * @author: miaofang
174 */ 196 */
175 editDialog (row, del) { 197 editDialog (row, del) {
176 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 198 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: miaofang
4 * @LastEditTime: 2023-08-23 15:54:12 4 * @LastEditTime: 2023-08-23 15:54:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="box" :propsParam="propsParam" :tableData="tableData"/> 9 <printTemplate id="boxygdj" :propsParam="propsParam" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
13 {{ title }} 13 {{ title }}
14 <el-button class="print" v-show="shows" v-print="printObj">打印</el-button> 14 <el-button class="print" v-show="shows" @click="openPrint()">打印</el-button>
15 <div class="checkbox"> 15 <div class="checkbox">
16 <el-checkbox-group v-model="checkList" @change="checkChange"> 16 <el-checkbox-group v-model="checkList" @change="checkChange">
17 <el-checkbox 17 <el-checkbox
...@@ -108,10 +108,10 @@ export default { ...@@ -108,10 +108,10 @@ export default {
108 }, 108 },
109 data() { 109 data() {
110 return { 110 return {
111 printObj: { 111 // printObj: {
112 id: "box", 112 // id: "box",
113 //其他配置项, 113 // //其他配置项,
114 }, 114 // },
115 shows:false, 115 shows:false,
116 title: "预告登记信息", 116 title: "预告登记信息",
117 qsztList: datas.columns().qsztList, 117 qsztList: datas.columns().qsztList,
...@@ -124,15 +124,37 @@ export default { ...@@ -124,15 +124,37 @@ export default {
124 emptycolNum: datas.columns().emptycolNum, 124 emptycolNum: datas.columns().emptycolNum,
125 //列名称对象 125 //列名称对象
126 columns: datas.columns().YGDJ, 126 columns: datas.columns().YGDJ,
127 render:false
127 }; 128 };
128 }, 129 },
129 created() { 130 created() {
130 this.loadData(); 131 this.loadData();
131 }, 132 },
132 methods: { 133 methods: {
134 openPrint(){
135 this.render=true
136 setTimeout(() => {
137 this.prinsss()
138 }, 100)
139 },
140 prinsss(){
141 printJS({
142 printable: "boxygdj", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象
143 type: "html",
144 maxWidth: 800, // 最大宽度
145 font_size: "", // 不设置则使用默认字体大小
146 style: `@font-face {
147 font-family: "STZHONGS";
148 src: url(${window.ttf}) format("truetype");
149 }`,
150 // 继承原来的所有样式
151 targetStyles: ["*"]
152 });
153 this.render=false
154 },
133 /** 155 /**
134 * @description: loadData 156 * @description: loadData
135 * @author: renchao 157 * @author: miaofang
136 */ 158 */
137 loadData() { 159 loadData() {
138 // 判断是否在登记簿补录调的子页面 160 // 判断是否在登记簿补录调的子页面
...@@ -165,7 +187,7 @@ export default { ...@@ -165,7 +187,7 @@ export default {
165 }, 187 },
166 /** 188 /**
167 * @description: checkChange 189 * @description: checkChange
168 * @author: renchao 190 * @author: miaofang
169 */ 191 */
170 checkChange() { 192 checkChange() {
171 if (this.checkList.length === 0) { 193 if (this.checkList.length === 0) {
...@@ -178,7 +200,7 @@ export default { ...@@ -178,7 +200,7 @@ export default {
178 /** 200 /**
179 * @description: getQsztName 201 * @description: getQsztName
180 * @param {*} code 202 * @param {*} code
181 * @author: renchao 203 * @author: miaofang
182 */ 204 */
183 getQsztName(code) { 205 getQsztName(code) {
184 let name = ""; 206 let name = "";
...@@ -195,7 +217,7 @@ export default { ...@@ -195,7 +217,7 @@ export default {
195 * @description: 新增一条补录信息 217 * @description: 新增一条补录信息
196 * @param {*} row 218 * @param {*} row
197 * @param {*} del 219 * @param {*} del
198 * @author: renchao 220 * @author: miaofang
199 */ 221 */
200 editDialog(row, del) { 222 editDialog(row, del) {
201 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 223 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-07 16:01:19 4 * @LastEditTime: 2023-09-12 14:48:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -334,7 +334,6 @@ ...@@ -334,7 +334,6 @@
334 }) 334 })
335 }) 335 })
336 }, 336 },
337 // 字典
338 /** 337 /**
339 * @description: 字典 338 * @description: 字典
340 * @param {*} val 339 * @param {*} val
......
1 <!--
2 * @Description:
3 * @Autor: miaofang
4 * @LastEditTime: 2023-07-19 09:52:42
5 -->
6 <template>
7 <div class="fm" id="boxaaa">
8 <div class="title">不动产登记簿</div>
9 <div class="title">(回执)</div>
10 <p class="bian">
11 编号: <span>{{ Receiptdata.sldyList[0].ybdcqzsh||"" }}</span>
12 </p>
13 <div class="texts">
14 <p class="jsjg">{{ Receiptdata.cfdjList[0].cfjg }}:</p>
15 <p class="concent">
16 <span>{{ sj }}</span> ,你院协助执行通知书订单号为:<font>{{
17 Receiptdata.qlxxList[0].ywh||""
18 }}</font
19 >收悉,具体执行情况如下。
20 </p>
21 </div>
22
23 <p class="bian">{{ Receiptdata.user.organizationName }}</p>
24 <p class="bian">{{ sj }}(盖章)</p>
25 <table class="xxTable">
26 <tr>
27 <td>序号</td>
28 <td>坐落</td>
29 <td>控制反馈</td>
30 <td>控制措施</td>
31 </tr>
32 <tr v-for="(item, index) in Receiptdata.sldyList" :key="index">
33 <td>{{ index + 1 }}</td>
34 <td>{{ item.zl }}</td>
35 <td>已控</td>
36 <td>{{ item.djlxmc }}</td>
37 </tr>
38 </table>
39 </div>
40 </template>
41
42 <script>
43 export default {
44 props: {
45 Receiptdata: {
46 type: Object,
47 default: {},
48 },
49 },
50 data() {
51 return {
52 sj: "",
53 data:false
54 };
55 },
56 mounted() {
57 this.loadData();
58 },
59 watch: {
60 Receiptdata: {
61 handler(newValue, oldValue) {
62 this.$nextTick(() => {
63 this.Receiptdata = newValue;
64 this.loadData();
65 });
66 },
67 },
68 },
69 methods: {
70 /**
71 * @description: loadData
72 * @author: miaofang
73 */
74 loadData() {
75 let dateTime = new Date(this.Receiptdata.slsq.slsj);
76 let y = dateTime.getFullYear();
77 let m = dateTime.getMonth() + 1;
78 m = m < 10 ? "0" + m : m;
79 let d = dateTime.getDate();
80 d = d < 10 ? "0" + d : d;
81 let h = dateTime.getHours();
82 h = h < 10 ? "0" + h : h;
83 let M = dateTime.getMinutes();
84 M = M < 10 ? "0" + M : M;
85 let s = dateTime.getSeconds();
86 s = s < 10 ? "0" + s : s;
87 this.sj = y + "年" + m + "月" + d + "日";
88 },
89 },
90 };
91 </script>
92
93 <style lang="scss" scoped>
94 #boxaaa{
95 font {
96 border-bottom: 1px solid #000;
97 display: inline-block;
98 padding: 0 15px;
99 line-height: 16px;
100 }
101
102 .title {
103 height: 60px;
104 display: flex;
105 font-size: 32px;
106 color: #000;
107 justify-content: center;
108 align-items: center;
109 }
110 .bian {
111 text-align: right;
112 }
113 .texts{
114 margin-top: 40px;
115 margin-bottom: 40px;
116
117 }
118 .jsjg {
119 text-align: left;
120 }
121 .concent {
122 width: 100%;
123
124 line-height: 40px;
125 text-align: left;
126 text-indent: 2em;
127 }
128 p {
129 font-family: serif;
130 }
131 .xxTable {
132
133 width: 100%;
134 border-collapse: collapse;
135 font-family: serif;
136 margin-top: 20px;
137
138 tr td {
139 border: 1px solid #000;
140 text-align: center;
141 height: 40px;
142 line-height: 17px;
143 font-size: 13px;
144 min-width: 80px;
145 z-index: 1;
146 min-width: 80px;
147 padding: 5px;
148 }
149 }
150 }
151 .fm {
152 background: #fff;
153 font-size: 18px;
154 margin: auto;
155 }
156
157 </style>
...@@ -17,8 +17,10 @@ import { ...@@ -17,8 +17,10 @@ import {
17 unClaimTask, 17 unClaimTask,
18 getZdInfo 18 getZdInfo
19 } from "@/api/workFlow.js"; 19 } from "@/api/workFlow.js";
20
20 import { getZrzbsmList } from "@/api/search.js"; 21 import { getZrzbsmList } from "@/api/search.js";
21 import { ywPopupDialog } from "@/utils/popup.js"; 22 import { ywPopupDialog } from "@/utils/popup.js";
23
22 export default { 24 export default {
23 data () { 25 data () {
24 return { 26 return {
...@@ -73,7 +75,7 @@ export default { ...@@ -73,7 +75,7 @@ export default {
73 * @author: renchao 75 * @author: renchao
74 */ 76 */
75 operation (item) { 77 operation (item) {
76 //按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6:打印申请书 B7:证书领取 B8:楼盘表 B9:登簿 78 //按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6:打印申请书 B7:证书领取 B8:楼盘表 B9:登簿,B10:打印回执
77 //操作按钮 登簿:record 转件:transfer 退回:back 退出:signout 79 //操作按钮 登簿:record 转件:transfer 退回:back 退出:signout
78 let that = this; 80 let that = this;
79 switch (item.value) { 81 switch (item.value) {
...@@ -237,6 +239,8 @@ export default { ...@@ -237,6 +239,8 @@ export default {
237 }) 239 })
238 }) 240 })
239 break; 241 break;
242 case "B10":
243 break;
240 case "rm": 244 case "rm":
241 this.del() 245 this.del()
242 break; 246 break;
......
...@@ -210,7 +210,15 @@ ...@@ -210,7 +210,15 @@
210 box-sizing: border-box; 210 box-sizing: border-box;
211 width: 70px; 211 width: 70px;
212 margin: 0 5px; 212 margin: 0 5px;
213 213 div{
214 @include flex-center;
215 cursor: pointer;
216 flex-direction: column;
217 margin-right: 15px;
218 box-sizing: border-box;
219 width: 70px;
220 margin: 0 5px;
221 }
214 .icon { 222 .icon {
215 font-size: 10px; 223 font-size: 10px;
216 } 224 }
...@@ -231,4 +239,4 @@ ...@@ -231,4 +239,4 @@
231 position: absolute; 239 position: absolute;
232 left: 0; 240 left: 0;
233 bottom: 0; 241 bottom: 0;
234 }
...\ No newline at end of file ...\ No newline at end of file
242 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-11 13:35:33 4 * @LastEditTime: 2023-09-12 15:18:52
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
8 <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData"> 8 <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="500" :pagination="false" :data="tableData">
9 </lb-table> 9 </lb-table>
10 <div class="text-center"> 10 <div class="text-center">
11 <el-button @click="handleCancel">取消</el-button> 11 <el-button @click="handleCancel">取消</el-button>
12 <el-button type="primary" @click="handleSubmit" :loading="loading" v-if="formData.ableOperation && tableData.length>0">保存</el-button> 12 <el-button type="primary" @click="handleSubmit" :loading="loading">保存</el-button>
13 </div> 13 </div>
14 </div> 14 </div>
15 </template> 15 </template>
...@@ -32,37 +32,28 @@ ...@@ -32,37 +32,28 @@
32 loading: false, 32 loading: false,
33 column: [ 33 column: [
34 { 34 {
35 width: "50", 35 width: '50',
36 label: '序号', 36 renderHeader: (h, scope) => {
37 type: 'index' 37 return <div> {
38 }, 38 <i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }}></i>
39 {
40 prop: "isrequired",
41 label: "是否必选",
42 width: "80",
43 render: (h, scope) => {
44 if (scope.row.isrequired === "1") {
45 return (
46 <div>
47 <span>必选</span>
48 </div>
49 );
50 }
51 else {
52 return (
53 <div>
54 <span>可选</span>
55 </div>
56 )
57 } 39 }
40 </div>
41 },
42 render: (h, scope) => {
43 return (
44 <div>
45 {
46 <i class="el-icon-minus pointer" onClick={() => { this.handleDelete(scope.$index, scope.row) }}></i>
47 }
48 </div>
49 )
58 } 50 }
59 }, 51 },
60 { 52 {
61 label: "材料名称", 53 label: "材料名称",
62 render: (h, scope) => { 54 render: (h, scope) => {
63 return ( 55 return (
64 (this.formData.ableOperation && scope.row.isrequired != '1') ? 56 <el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input>
65 <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
66 ) 57 )
67 } 58 }
68 }, 59 },
...@@ -71,32 +62,25 @@ ...@@ -71,32 +62,25 @@
71 width: "110", 62 width: "110",
72 render: (h, scope) => { 63 render: (h, scope) => {
73 return ( 64 return (
74 this.formData.ableOperation ? 65 <el-select value={scope.row.cllx}
75 <el-select value={scope.row.sjlx} 66 onChange={(val) => { scope.row.cllx = val }}>
76 onChange={(val) => { scope.row.sjlx = val }}> 67 {
77 { 68 store.getters.dictData['A40'].map(option => {
78 store.getters.dictData['A40'].map(option => { 69 return (
79 return ( 70 <el-option label={option.dname} value={option.dcode}></el-option>
80 <el-option label={option.dname} value={option.dcode}></el-option> 71 )
81 ) 72 })
82 }) 73 }
83 } 74 </el-select>
84 </el-select> : <span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
85 ) 75 )
86 } 76 }
87 }, 77 },
88 { 78 {
89 prop: "sjsl",
90 label: "份数", 79 label: "份数",
91 width: "50", 80 width: "50",
92 render: (h, scope) => { 81 render: (h, scope) => {
93 return ( 82 return (
94 <div> 83 <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input>
95 {
96 scope.row.sjsl ?
97 <span>{scope.row.sjsl}</span> : 1
98 }
99 </div>
100 ) 84 )
101 } 85 }
102 }, 86 },
...@@ -147,7 +131,7 @@ ...@@ -147,7 +131,7 @@
147 <div> 131 <div>
148 <el-button 132 <el-button
149 type="text" 133 type="text"
150 disabled={scope.$index == 0 || !this.formData.ableOperation} 134 disabled={scope.$index == 0}
151 onClick={() => { 135 onClick={() => {
152 this.moveUpward(scope.$index, scope.row); 136 this.moveUpward(scope.$index, scope.row);
153 }} 137 }}
...@@ -156,16 +140,13 @@ ...@@ -156,16 +140,13 @@
156 </el-button> 140 </el-button>
157 <el-button 141 <el-button
158 type="text" 142 type="text"
159 disabled={scope.$index + 1 == this.tableData.length || !this.formData.ableOperation} 143 disabled={scope.$index + 1 == this.tableData.length}
160 onClick={() => { 144 onClick={() => {
161 this.moveDown(scope.$index, scope.row); 145 this.moveDown(scope.$index, scope.row);
162 }} 146 }}
163 > 147 >
164 下移 148 下移
165 </el-button> 149 </el-button>
166 <i v-show={scope.row.isrequired != '1' && this.formData.ableOperation} onClick={() => {
167 this.handleDelete(scope.$index, scope.row);
168 }} class="el-icon-delete pointer" style="color:#409EFF;margin-left:5px;position: relative;top: 1px;"></i>
169 </div > 150 </div >
170 ) 151 )
171 } 152 }
...@@ -188,6 +169,15 @@ ...@@ -188,6 +169,15 @@
188 handleCancel () { 169 handleCancel () {
189 ywPopupCacel() 170 ywPopupCacel()
190 }, 171 },
172 handleAdd () {
173 this.tableData.push({
174 clmc: '',
175 cllx: '1',
176 sjsl: '',
177 smzt: '',
178 count: 0
179 })
180 },
191 handleSubmit () { 181 handleSubmit () {
192 this.loading = true 182 this.loading = true
193 updateClml(this.tableData).then(res => { 183 updateClml(this.tableData).then(res => {
...@@ -311,25 +301,6 @@ ...@@ -311,25 +301,6 @@
311 message: '已取消删除' 301 message: '已取消删除'
312 }) 302 })
313 }) 303 })
314 },
315 // 字典
316 /**
317 * @description: 字典
318 * @param {*} val
319 * @param {*} code
320 * @author: renchao
321 */
322 dicStatus (val, code) {
323 let data = store.getters.dictData[code],
324 name = "暂无";
325 if (data) {
326 data.map((item) => {
327 if (item.dcode == val) {
328 name = item.dname;
329 }
330 });
331 return name;
332 }
333 } 304 }
334 } 305 }
335 } 306 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 08:51:36 4 * @LastEditTime: 2023-09-12 13:46:29
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <div class="next handle-btn" v-if="!isScan" @click="next()"> 11 <div class="next handle-btn" v-if="!isScan" @click="next()">
12 <i class="el-icon-arrow-right"></i> 12 <i class="el-icon-arrow-right"></i>
13 </div> 13 </div>
14 <div class="img-list-wrap"> 14 <div class="img-list-wrap" v-Loading="loading">
15 <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="高拍仪"> 15 <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="高拍仪">
16 <div v-for="(img, i) in previewImg.imgList" :key="i" v-else> 16 <div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
17 <photo-zoom :url="img.fileurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2" 17 <photo-zoom :url="img.fileurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete" 34 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
35 v-if="thumbnailImages.length>0 && ableOperation">删除</el-button> 35 v-if="thumbnailImages.length>0 && ableOperation">删除</el-button>
36 <div v-if="ableOperation" class="pl-5"> 36 <div v-if="ableOperation" class="pl-5">
37 <el-button type="primary" @click="handleOpenScan" v-if="ableOperation">{{scanTitle}}</el-button> 37 <el-button type="primary" @click="handleOpenScan" v-if="ableOperation" :loading="loading">{{scanTitle}}</el-button>
38 <el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button> 38 <el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button>
39 </div> 39 </div>
40 </div> 40 </div>
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
73 }, 73 },
74 data () { 74 data () {
75 return { 75 return {
76 loading: false,
76 key: 0, 77 key: 0,
77 isScan: false, 78 isScan: false,
78 // 打开高拍仪 79 // 打开高拍仪
...@@ -125,18 +126,19 @@ ...@@ -125,18 +126,19 @@
125 handleOpenScan () { 126 handleOpenScan () {
126 this.isScan = !this.isScan 127 this.isScan = !this.isScan
127 if (this.isScan) { 128 if (this.isScan) {
129 this.loading = true
128 this.$message({ 130 this.$message({
129 message: '正在启动程序请稍等', 131 message: '正在启动程序请稍等',
130 type: 'success' 132 type: 'success'
131 }) 133 })
132 setTimeout(() => { 134 setTimeout(() => {
133 this.scanTitle = '关闭高拍仪' 135 this.scanTitle = '关闭高拍仪'
134 }, 4000) 136 this.loading = false
137 }, 3000)
135 } else { 138 } else {
136 this.scanTitle = '打开高拍仪' 139 this.scanTitle = '打开高拍仪'
137 } 140 }
138 }, 141 },
139 // 左右移动
140 /** 142 /**
141 * @description: 左右移动 143 * @description: 左右移动
142 * @param {*} direction 144 * @param {*} direction
...@@ -144,11 +146,20 @@ ...@@ -144,11 +146,20 @@
144 */ 146 */
145 handleMove (direction) { 147 handleMove (direction) {
146 move(this.previewImg.imgList[this.previewImg.index].bsmFile, direction).then(res => { 148 move(this.previewImg.imgList[this.previewImg.index].bsmFile, direction).then(res => {
147 this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial }) 149 if (res.code == 200) {
148 this.$message({ 150 if (direction == 'left') {
149 message: '移动成功!', 151 this.previewImg.index = this.previewImg.index - 1
150 type: 'success' 152 } else {
151 }) 153 this.previewImg.index = this.previewImg.index + 1
154 }
155 this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial })
156 this.$message({
157 message: '移动成功!',
158 type: 'success'
159 })
160 } else {
161 this.$message.error(res.message);
162 }
152 }) 163 })
153 }, 164 },
154 /** 165 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 11:26:18 4 * @LastEditTime: 2023-09-12 13:39:20
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -293,7 +293,6 @@ ...@@ -293,7 +293,6 @@
293 * @author: renchao 293 * @author: renchao
294 */ 294 */
295 ywhClick (item) { 295 ywhClick (item) {
296 sessionStorage.removeItem('keyPath')
297 //判断用户是否拥有该任务的权限,若有则跳转,无权限则给予提示并刷新页面 296 //判断用户是否拥有该任务的权限,若有则跳转,无权限则给予提示并刷新页面
298 judgeUserTaskPermission({ 297 judgeUserTaskPermission({
299 bsmSlsq: item.bsmSlsq, 298 bsmSlsq: item.bsmSlsq,
......
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
386 } 386 }
387 this.ruleForm.qlrList.forEach((item) => { 387 this.ruleForm.qlrList.forEach((item) => {
388 if (item.sfczr == 1) { 388 if (item.sfczr == 1) {
389 this.czr = item.sqrmc; 389 this.czr = item.zjh
390 } 390 }
391 }); 391 });
392 }).catch(() => { 392 }).catch(() => {
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,7 @@
506 } 506 }
507 this.num = 0 507 this.num = 0
508 this.ruleForm.qlrList.forEach(item => { 508 this.ruleForm.qlrList.forEach(item => {
509 if (item.sqrmc == this.czr) { 509 if (item.zjh == this.czr) {
510 this.num++ 510 this.num++
511 } 511 }
512 }) 512 })
......
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
281 }; 281 };
282 this.ruleForm.qlrList.forEach((item) => { 282 this.ruleForm.qlrList.forEach((item) => {
283 if (item.sfczr == 1) { 283 if (item.sfczr == 1) {
284 this.czr = item.sqrmc; 284 this.czr = item.zjh
285 } 285 }
286 }); 286 });
287 this.czrOptions = this.ruleForm.qlrList; 287 this.czrOptions = this.ruleForm.qlrList;
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
355 } 355 }
356 this.num = 0 356 this.num = 0
357 this.ruleForm.qlrList.forEach(item => { 357 this.ruleForm.qlrList.forEach(item => {
358 if (item.sqrmc == this.czr) { 358 if (item.zjh == this.czr) {
359 this.num++ 359 this.num++
360 } 360 }
361 }) 361 })
......
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
436 }; 436 };
437 this.ruleForm.qlrList.forEach((item) => { 437 this.ruleForm.qlrList.forEach((item) => {
438 if (item.sfczr == 1) { 438 if (item.sfczr == 1) {
439 this.czr = item.sqrmc; 439 this.czr = item.zjh
440 } 440 }
441 }); 441 });
442 this.czrOptions = this.ruleForm.qlrList; 442 this.czrOptions = this.ruleForm.qlrList;
...@@ -513,7 +513,7 @@ ...@@ -513,7 +513,7 @@
513 this.czrOptions = this.ruleForm.qlrList; 513 this.czrOptions = this.ruleForm.qlrList;
514 this.num = 0 514 this.num = 0
515 this.ruleForm.qlrList.forEach(item => { 515 this.ruleForm.qlrList.forEach(item => {
516 if (item.sqrmc == this.czr) { 516 if (item.zjh == this.czr) {
517 this.num++ 517 this.num++
518 } 518 }
519 }) 519 })
......
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
295 }; 295 };
296 this.ruleForm.qlrList.forEach((item) => { 296 this.ruleForm.qlrList.forEach((item) => {
297 if (item.sfczr == 1) { 297 if (item.sfczr == 1) {
298 this.czr = item.sqrmc; 298 this.czr = item.zjh
299 } 299 }
300 }); 300 });
301 this.czrOptions = this.ruleForm.qlrList; 301 this.czrOptions = this.ruleForm.qlrList;
......
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
264 this.czrOptions = this.ruleForm.qlrList; 264 this.czrOptions = this.ruleForm.qlrList;
265 this.ruleForm.qlrList.forEach((item) => { 265 this.ruleForm.qlrList.forEach((item) => {
266 if (item.sfczr == 1) { 266 if (item.sfczr == 1) {
267 this.czr = item.sqrmc; 267 this.czr = item.zjh
268 console.log("this.ruleForm.qlrList1", this.ruleForm.qlrList, this.czr); 268 console.log("this.ruleForm.qlrList1", this.ruleForm.qlrList, this.czr);
269 } 269 }
270 }); 270 });
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
321 this.key++; 321 this.key++;
322 this.num = 0 322 this.num = 0
323 this.ruleForm.qlrList.forEach(item => { 323 this.ruleForm.qlrList.forEach(item => {
324 if (item.sqrmc == this.czr) { 324 if (item.zjh == this.czr) {
325 this.num++ 325 this.num++
326 } 326 }
327 }) 327 })
......
...@@ -340,7 +340,7 @@ ...@@ -340,7 +340,7 @@
340 }; 340 };
341 this.ruleForm.qlrList.forEach((item) => { 341 this.ruleForm.qlrList.forEach((item) => {
342 if (item.sfczr == 1) { 342 if (item.sfczr == 1) {
343 this.czr = item.sqrmc; 343 this.czr = item.zjh
344 } 344 }
345 }); 345 });
346 //初始化发证方式,1:小证,2:大正 346 //初始化发证方式,1:小证,2:大正
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
422 this.czrOptions = this.ruleForm.qlrList; 422 this.czrOptions = this.ruleForm.qlrList;
423 this.num = 0 423 this.num = 0
424 this.ruleForm.qlrList.forEach(item => { 424 this.ruleForm.qlrList.forEach(item => {
425 if (item.sqrmc == this.czr) { 425 if (item.zjh == this.czr) {
426 this.num++ 426 this.num++
427 } 427 }
428 }) 428 })
......
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
347 this.czrOptions = this.ruleForm.qlrList; 347 this.czrOptions = this.ruleForm.qlrList;
348 this.ruleForm.qlrList.forEach((item) => { 348 this.ruleForm.qlrList.forEach((item) => {
349 if (item.sfczr == 1) { 349 if (item.sfczr == 1) {
350 this.czr = item.sqrmc; 350 this.czr = item.zjh
351 } 351 }
352 }); 352 });
353 this.$endLoading(); 353 this.$endLoading();
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
458 this.czrOptions = this.ruleForm.qlrList; 458 this.czrOptions = this.ruleForm.qlrList;
459 this.num = 0 459 this.num = 0
460 this.ruleForm.qlrList.forEach(item => { 460 this.ruleForm.qlrList.forEach(item => {
461 if (item.sqrmc == this.czr) { 461 if (item.zjh == this.czr) {
462 this.num++ 462 this.num++
463 } 463 }
464 }) 464 })
......
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
337 }; 337 };
338 this.ruleForm.qlrList.forEach((item) => { 338 this.ruleForm.qlrList.forEach((item) => {
339 if (item.sfczr == 1) { 339 if (item.sfczr == 1) {
340 this.czr = item.sqrmc; 340 this.czr = item.zjh
341 } 341 }
342 }); 342 });
343 //初始化发证方式,1:小证,2:大正 343 //初始化发证方式,1:小证,2:大正
...@@ -408,7 +408,7 @@ ...@@ -408,7 +408,7 @@
408 this.czrOptions = this.ruleForm.qlrList; 408 this.czrOptions = this.ruleForm.qlrList;
409 this.num = 0 409 this.num = 0
410 this.ruleForm.qlrList.forEach(item => { 410 this.ruleForm.qlrList.forEach(item => {
411 if (item.sqrmc == this.czr) { 411 if (item.zjh == this.czr) {
412 this.num++ 412 this.num++
413 } 413 }
414 }) 414 })
......
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
375 this.czrOptions = this.ruleForm.qlrList; 375 this.czrOptions = this.ruleForm.qlrList;
376 this.ruleForm.qlrList.forEach((item) => { 376 this.ruleForm.qlrList.forEach((item) => {
377 if (item.sfczr == 1) { 377 if (item.sfczr == 1) {
378 this.czr = item.sqrmc; 378 this.czr = item.zjh
379 } 379 }
380 }); 380 });
381 }); 381 });
...@@ -431,7 +431,7 @@ ...@@ -431,7 +431,7 @@
431 this.czrOptions = this.ruleForm.qlrList; 431 this.czrOptions = this.ruleForm.qlrList;
432 this.num = 0 432 this.num = 0
433 this.ruleForm.qlrList.forEach(item => { 433 this.ruleForm.qlrList.forEach(item => {
434 if (item.sqrmc == this.czr) { 434 if (item.zjh == this.czr) {
435 this.num++ 435 this.num++
436 } 436 }
437 }) 437 })
......
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
354 this.czrOptions = this.ruleForm.qlrList; 354 this.czrOptions = this.ruleForm.qlrList;
355 this.num = 0 355 this.num = 0
356 this.ruleForm.qlrList.forEach(item => { 356 this.ruleForm.qlrList.forEach(item => {
357 if (item.sqrmc == this.czr) { 357 if (item.zjh == this.czr) {
358 this.num++ 358 this.num++
359 } 359 }
360 }) 360 })
......
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
225 this.czrOptions = this.ruleForm.qlrList; 225 this.czrOptions = this.ruleForm.qlrList;
226 this.ruleForm.qlrList.forEach((item) => { 226 this.ruleForm.qlrList.forEach((item) => {
227 if (item.sfczr == 1) { 227 if (item.sfczr == 1) {
228 this.czr = item.sqrmc; 228 this.czr = item.zjh
229 } 229 }
230 }); 230 });
231 } 231 }
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
272 this.czrOptions = this.ruleForm.qlrList; 272 this.czrOptions = this.ruleForm.qlrList;
273 this.num = 0 273 this.num = 0
274 this.ruleForm.qlrList.forEach(item => { 274 this.ruleForm.qlrList.forEach(item => {
275 if (item.sqrmc == this.czr) { 275 if (item.zjh == this.czr) {
276 this.num++ 276 this.num++
277 } 277 }
278 }) 278 })
......
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
321 that.czrOptions = this.ruleForm.qlrList; 321 that.czrOptions = this.ruleForm.qlrList;
322 that.ruleForm.qlrList.forEach((item) => { 322 that.ruleForm.qlrList.forEach((item) => {
323 if (item.sfczr == 1) { 323 if (item.sfczr == 1) {
324 that.czr = item.sqrmc; 324 that.czr = item.zjh;
325 } 325 }
326 }); 326 });
327 setTimeout(() => { 327 setTimeout(() => {
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
360 this.czrOptions = this.ruleForm.qlrList; 360 this.czrOptions = this.ruleForm.qlrList;
361 this.num = 0 361 this.num = 0
362 this.ruleForm.qlrList.forEach(item => { 362 this.ruleForm.qlrList.forEach(item => {
363 if (item.sqrmc == this.czr) { 363 if (item.zjh == this.czr) {
364 this.num++ 364 this.num++
365 } 365 }
366 }) 366 })
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 11:25:49 4 * @LastEditTime: 2023-09-12 13:39:30
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -219,7 +219,6 @@ ...@@ -219,7 +219,6 @@
219 * @author: renchao 219 * @author: renchao
220 */ 220 */
221 ywhClick (item) { 221 ywhClick (item) {
222 sessionStorage.removeItem('keyPath')
223 //有任务权限 222 //有任务权限
224 if (item.sjlx == "3") { 223 if (item.sjlx == "3") {
225 item.djywbm = "DJBBL"; 224 item.djywbm = "DJBBL";
...@@ -241,9 +240,9 @@ ...@@ -241,9 +240,9 @@
241 ); 240 );
242 window.open(href, `workFrameView${item.bsmSlsq}`); 241 window.open(href, `workFrameView${item.bsmSlsq}`);
243 } 242 }
244 }, 243 }
245 }, 244 }
246 }; 245 }
247 </script> 246 </script>
248 <style scoped lang="scss"> 247 <style scoped lang="scss">
249 @import "~@/styles/public.scss"; 248 @import "~@/styles/public.scss";
......