Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
d076e927 by tianhaohao@pashanhoo.com
Options

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

2 parents a1643f14 82d30000
Inline Side-by-side
Showing 42 changed files with 485 additions and 379 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-11 10:01:32 4 * @LastEditTime: 2023-09-14 16:21:51
5 --> 5 -->
6 <template> 6 <template>
7 <el-image-viewer :on-close="closeViewer" :url-list="urlList"> 7 <el-image-viewer :on-close="closeViewer" :url-list="urlList" :initial-index="initialIndex">
8 </el-image-viewer> 8 </el-image-viewer>
9 </template> 9 </template>
10 <script> 10 <script>
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
19 default: function () { 19 default: function () {
20 return [] 20 return []
21 } 21 }
22 },
23 initialIndex: {
24 type: Number,
25 default: 0
22 } 26 }
23 }, 27 },
24 data () { 28 data () {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-11 10:18:11 4 * @LastEditTime: 2023-09-14 17:11:15
5 --> 5 -->
6 <template> 6 <template>
7 <transition name="msgbox-fade"> 7 <transition name="msgbox-fade">
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
160 .mask-content { 160 .mask-content {
161 padding: 5px 20px 30px 20px; 161 padding: 5px 20px 30px 20px;
162 width: 100%; 162 width: 100%;
163 min-height: 20%; 163 min-height: 253px;
164 max-height: 90vh; 164 max-height: 90vh;
165 overflow-y: scroll; 165 overflow-y: scroll;
166 } 166 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 15:36:42 4 * @LastEditTime: 2023-09-14 16:16:57
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -148,6 +148,7 @@ ...@@ -148,6 +148,7 @@
148 } else { 148 } else {
149 this.previewImg.index = this.previewImg.index + 1 149 this.previewImg.index = this.previewImg.index + 1
150 } 150 }
151 this.initialIndex = this.previewImg.index
151 this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj }) 152 this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
152 this.$message({ 153 this.$message({
153 message: '移动成功!', 154 message: '移动成功!',
...@@ -234,6 +235,7 @@ ...@@ -234,6 +235,7 @@
234 */ 235 */
235 showCurrent (index) { 236 showCurrent (index) {
236 this.previewImg.index = index 237 this.previewImg.index = index
238 this.initialIndex = index
237 }, 239 },
238 /** 240 /**
239 * @description: closeViewer 241 * @description: closeViewer
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 15:47:12 3 * @Date: 2023-02-28 15:47:12
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-07-21 14:39:12 5 * @LastEditTime: 2023-09-14 15:04:20
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -108,13 +108,15 @@ export default { ...@@ -108,13 +108,15 @@ export default {
108 // 边框颜色 108 // 边框颜色
109 borderColor:'rgb(230, 230, 230)', 109 borderColor:'rgb(230, 230, 230)',
110 // 申请单元列表数据 110 // 申请单元列表数据
111 unitIdList:[] 111 unitIdList:[],
112 // 组件标识
113 compFlag:Math.random()
112 }; 114 };
113 }, 115 },
114 mounted() { 116 mounted() {
115 // 根据申请单元列表数据处理选中户 117 // 根据申请单元列表数据处理选中户
116 console.log("window.unitData",window.unitData); 118 console.log("window.unitData",window.unitData);
117 if(window.unitData.length){ 119 if(window.unitData && window.unitData.length){
118 window.unitData.forEach(e => { 120 window.unitData.forEach(e => {
119 this.unitIdList.push(e.bdcdyid) 121 this.unitIdList.push(e.bdcdyid)
120 }) 122 })
...@@ -256,24 +258,27 @@ export default { ...@@ -256,24 +258,27 @@ export default {
256 immediate: true, 258 immediate: true,
257 deep: true, 259 deep: true,
258 }, 260 },
259 hbsmList(val){ 261 hbsmList(val){
260 let list = [] 262 let list = []
261 val.length && val.forEach((i)=>{ 263 val.length && val.forEach((i)=>{
262 this.ch.forEach((c) => { 264 this.ch.forEach((c) => {
263 c.hs.forEach((h) => { 265 c.hs.forEach((h) => {
264 if (i == h.bsm) { 266 if (i == h.bsm) {
265 list.push( 267 list.push(
266 { 268 {
267 bdcdyh:h.bdcdyh, 269 bdcdyh:h.bdcdyh,
268 bsm:h.bsm, 270 bsm:h.bsm,
269 dyhbsm:h.dyhbsm 271 dyhbsm:h.dyhbsm,
270 } 272 bdcdyid:h.dyhbsm,
271 ) 273 bdcdylx:'7',
272 } 274 flag:this.compFlag
275 }
276 )
277 }
278 });
273 }); 279 });
274 });
275 }) 280 })
276 this.getBsmList(list) 281 this.getBsmList(list,this.compFlag)
277 }, 282 },
278 changeChoosedObj: { 283 changeChoosedObj: {
279 handler(val) { 284 handler(val) {
......
...@@ -37,7 +37,11 @@ import chCpn from "./ch.vue"; ...@@ -37,7 +37,11 @@ import chCpn from "./ch.vue";
37 import zdyCpn from "./zdys.vue"; 37 import zdyCpn from "./zdys.vue";
38 import ljzsCpn from "./ljzs.vue"; 38 import ljzsCpn from "./ljzs.vue";
39 import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js"; 39 import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
40 import jump from "../../ywbl/ywsq/components/mixin/jump";
41 import store from '@/store/index.js'
42 import { ywPopupCacel } from "@/utils/popup.js";
40 export default { 43 export default {
44 mixins: [jump],
41 provide() { 45 provide() {
42 return { 46 return {
43 openMenu: this.openMenu, 47 openMenu: this.openMenu,
...@@ -74,6 +78,7 @@ export default { ...@@ -74,6 +78,7 @@ export default {
74 type: Object, 78 type: Object,
75 default: () => { } 79 default: () => { }
76 }, 80 },
81 isJump: { type: Boolean, default: false },
77 }, 82 },
78 data() { 83 data() {
79 return { 84 return {
...@@ -111,8 +116,12 @@ export default { ...@@ -111,8 +116,12 @@ export default {
111 * @param {Array} bsmList 116 * @param {Array} bsmList
112 * @author: renchao 117 * @author: renchao
113 */ 118 */
114 getBsmList(bsmList){ 119 getBsmList(bsmList,compFlag){
115 this.bsmList = bsmList; 120 // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
121 this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
122 // 合并本次数据
123 this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
124 // })
116 }, 125 },
117 /** 126 /**
118 * @description: 保存当前楼盘表 127 * @description: 保存当前楼盘表
...@@ -229,11 +238,7 @@ export default { ...@@ -229,11 +238,7 @@ export default {
229 this.$message.error("请至少选择一条数据"); 238 this.$message.error("请至少选择一条数据");
230 return; 239 return;
231 } 240 }
232 this.loading = true 241 this.loading = true;
233 this.bsmList.forEach(item=>{
234 item['bdcdyid'] = item.dyhbsm;
235 item['bdcdylx'] = '7';
236 })
237 startBusinessFlow({ 242 startBusinessFlow({
238 bsmSqyw: this.sqywInfo.bsmSqyw, 243 bsmSqyw: this.sqywInfo.bsmSqyw,
239 bdcdysz: this.bsmList, 244 bdcdysz: this.bsmList,
...@@ -250,7 +255,7 @@ export default { ...@@ -250,7 +255,7 @@ export default {
250 } else { 255 } else {
251 store.dispatch('user/refreshPage', true); 256 store.dispatch('user/refreshPage', true);
252 } 257 }
253 this.$popupCacel() 258 this.close()
254 } else { 259 } else {
255 if (res.result && res.result.length > 0) { 260 if (res.result && res.result.length > 0) {
256 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} }) 261 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
...@@ -262,6 +267,14 @@ export default { ...@@ -262,6 +267,14 @@ export default {
262 this.loading = false 267 this.loading = false
263 }) 268 })
264 }, 269 },
270 /**
271 * @description: close
272 * @param {*} val
273 * @author: renchao
274 */
275 close(){
276 ywPopupCacel()
277 },
265 }, 278 },
266 computed:{ 279 computed:{
267 lpbContentHeight(){ 280 lpbContentHeight(){
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 17:25:45 3 * @Date: 2023-02-28 17:25:45
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-07-21 14:59:46 5 * @LastEditTime: 2023-09-14 14:35:19
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -21,12 +21,14 @@ ...@@ -21,12 +21,14 @@
21 > 21 >
22 <!-- 逻辑幢名称 --> 22 <!-- 逻辑幢名称 -->
23 <p class="lpb-xmmc ljz-xmmc"> 23 <p class="lpb-xmmc ljz-xmmc">
24 <span>{{ljz.ljzmc}}</span> 24 <el-checkbox @change="zdySelectAll($event,ljz.bsm)">{{
25 ljz.ljzmc
26 }}</el-checkbox>
25 </p> 27 </p>
26 <!-- 独立层户 --> 28 <!-- 独立层户 -->
27 <ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" /> 29 <ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" />
28 <!-- 幢单元 --> 30 <!-- 幢单元 -->
29 <zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" :onlyShow="onlyShow"/> 31 <zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
30 </div> 32 </div>
31 </div> 33 </div>
32 </div> 34 </div>
...@@ -38,11 +40,15 @@ ...@@ -38,11 +40,15 @@
38 v-else 40 v-else
39 > 41 >
40 <!-- 逻辑幢名称 --> 42 <!-- 逻辑幢名称 -->
41 <p class="lpb-xmmc ljz-xmmc">{{ ljzarr[0].ljzmc }}</p> 43 <p class="lpb-xmmc ljz-xmmc">
44 <el-checkbox @change="zdySelectAll($event,ljzarr[0].bsm)">{{
45 ljzarr[0].ljzmc
46 }}</el-checkbox>
47 </p>
42 <!-- 独立层户 --> 48 <!-- 独立层户 -->
43 <ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" /> 49 <ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" />
44 <!-- 幢单元 --> 50 <!-- 幢单元 -->
45 <zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/> 51 <zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
46 </div> 52 </div>
47 </div> 53 </div>
48 </div> 54 </div>
...@@ -90,7 +96,20 @@ export default { ...@@ -90,7 +96,20 @@ export default {
90 return tempArr.filter(Boolean) 96 return tempArr.filter(Boolean)
91 }, 97 },
92 }, 98 },
93 methods: {}, 99 methods: {
100 /**
101 * @description: 逻辑幢全选
102 * @param {*} val
103 * @param {*} r
104 * @return {*}
105 */
106 zdySelectAll(val,r) {
107 // 逻辑幢下的独立层户全选
108 this.$refs[r] && this.$refs[r][0].zdySelectAll(val)
109 // 逻辑幢下的幢单元全选
110 this.$refs['zdy' + r] && this.$refs['zdy' + r][0].selectAll(val)
111 }
112 },
94 }; 113 };
95 </script> 114 </script>
96 115
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 16:29:04 3 * @Date: 2023-02-28 16:29:04
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-07-21 14:55:30 5 * @LastEditTime: 2023-09-14 14:36:51
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -13,10 +13,9 @@ ...@@ -13,10 +13,9 @@
13 <div v-for="zdy in realZdys" :key="zdy.bsm"> 13 <div v-for="zdy in realZdys" :key="zdy.bsm">
14 <!-- 幢单元名称 --> 14 <!-- 幢单元名称 -->
15 <p class="lpb-xmmc"> 15 <p class="lpb-xmmc">
16 <el-checkbox @change="zdySelectAll($event,zdy.bsm)" v-if="!onlyShow">{{ 16 <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
17 zdy.zdymc 17 zdy.zdymc
18 }}</el-checkbox> 18 }}</el-checkbox>
19 <span v-else>aaa{{zdy.zdymc}}</span>
20 </p> 19 </p>
21 <!-- 每个幢单元下的层户 --> 20 <!-- 每个幢单元下的层户 -->
22 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" /> 21 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
...@@ -58,6 +57,16 @@ export default { ...@@ -58,6 +57,16 @@ export default {
58 zdySelectAll(val,r) { 57 zdySelectAll(val,r) {
59 this.$refs[r][0].zdySelectAll(val) 58 this.$refs[r][0].zdySelectAll(val)
60 }, 59 },
60 /**
61 * @description: 逻辑幢全选点击后逻辑幢下的幢单元全选
62 * @param {*} val
63 * @return {*}
64 */
65 selectAll(val){
66 this.realZdys.forEach(i=>{
67 this.zdySelectAll(val,i.bsm)
68 })
69 }
61 }, 70 },
62 computed: { 71 computed: {
63 realZdys() { 72 realZdys() {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
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="boxcfdj" :propsParam="propsParam" :tableData="tableData" :render="render"/> 9 <printTemplate id="boxcfdj" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
12 style="page-break-after: always" 12 style="page-break-after: always"
13 > 13 >
14 <div class="title">{{ title }}</div> 14 <div class="title">{{ title }}</div>
15 <div class="num">共{{ datass.length }}页，第{{ indexx + 1 }}页</div>
15 <table class="xxTable"> 16 <table class="xxTable">
16 <tr v-for="item in columns" :key="item.name"> 17 <tr v-for="item in columns" :key="item.name">
17 <td> 18 <td>
...@@ -50,18 +51,14 @@ export default { ...@@ -50,18 +51,14 @@ export default {
50 }; 51 };
51 }, 52 },
52 props: { 53 props: {
53 propsParam: {
54 type: Object,
55 default: () => {},
56 },
57 tableData: { 54 tableData: {
58 type: Array, 55 type: Array,
59 default: () => [], 56 default: () => [],
60 }, 57 },
61 render:{ 58 render: {
62 type: Boolean, 59 type: Boolean,
63 default: false, 60 default: false,
64 } 61 },
65 }, 62 },
66 created() {}, 63 created() {},
67 watch: { 64 watch: {
...@@ -70,11 +67,11 @@ export default { ...@@ -70,11 +67,11 @@ export default {
70 this.tableData = newValue; 67 this.tableData = newValue;
71 }, 68 },
72 }, 69 },
73 render: { 70 render: {
74 handler(newValue, oldValue) { 71 handler(newValue, oldValue) {
75 if(newValue){ 72 if (newValue) {
76 this.loadData(); 73 this.loadData();
77 } 74 }
78 }, 75 },
79 }, 76 },
80 immediate: true, 77 immediate: true,
...@@ -87,13 +84,13 @@ export default { ...@@ -87,13 +84,13 @@ export default {
87 */ 84 */
88 loadData() { 85 loadData() {
89 getFieldListByQlxx({ 86 getFieldListByQlxx({
90 qllx: this.propsParam.qllx, 87 qllx: this.tableData[0].qllx,
91 }).then((res) => { 88 }).then((res) => {
92 if (res.code === 200) { 89 if (res.code === 200) {
93 this.columns = res.result; 90 this.columns = res.result;
94 } 91 }
95 }); 92 });
96 if (this.tableData.length&&this.datass.length==0) { 93 if (this.tableData.length && this.datass.length == 0) {
97 for (let i = 0; i < this.tableData.length; i += 4) { 94 for (let i = 0; i < this.tableData.length; i += 4) {
98 this.datass.push(this.tableData.slice(i, i + 4)); 95 this.datass.push(this.tableData.slice(i, i + 4));
99 } 96 }
...@@ -113,8 +110,13 @@ export default { ...@@ -113,8 +110,13 @@ export default {
113 <style lang="scss" scoped> 110 <style lang="scss" scoped>
114 .tbalede { 111 .tbalede {
115 width: 100%; 112 width: 100%;
116 // height: 1123px;
117 margin: auto; 113 margin: auto;
114 position: relative;
115 .num {
116 position: absolute;
117 right: 10px;
118 top: 0px;
119 }
118 .title { 120 .title {
119 width: 100%; 121 width: 100%;
120 font-weight: 700; 122 font-weight: 700;
...@@ -140,16 +142,15 @@ export default { ...@@ -140,16 +142,15 @@ export default {
140 padding: 5px; 142 padding: 5px;
141 } 143 }
142 td { 144 td {
143 width: 20px!important; 145 width: 20px !important;
144 word-break: break-all; 146 word-break: break-all;
145 // /* 方法一：使用 word-break */ 147 // /* 方法一：使用 word-break */
146 // word-break: break-all; 148 // word-break: break-all;
147 // // /* 方法二：使用 white-space */ 149 // // /* 方法二：使用 white-space */
148 // // white-space: pre-wrap; 150 // // white-space: pre-wrap;
149 // // /* 方法三：使用 overflow-wrap */ 151 // // /* 方法三：使用 overflow-wrap */
150 // // overflow-wrap: break-word; 152 // // overflow-wrap: break-word;
151 } 153 }
152
153 } 154 }
154 } 155 }
155 </style> 156 </style>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
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="boxdiyaq" :propsParam="propsParam" :tableData="tableData" :render="render"/> 9 <printTemplate id="boxdiyaq" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
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="boxdiyiq" :propsParam="propsParam" :tableData="tableData" :render="render"/> 9 <printTemplate id="boxdiyiq" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxfdcq" 10 id="boxfdcq"
11 :propsParam="propsParam" :tableData="tableData" :render="render"/> 11 :tableData="tableData" :render="render"/>
12 </div> 12 </div>
13 <div class="tableBox"> 13 <div class="tableBox">
14 <div class="title"> 14 <div class="title">
......
...@@ -5,10 +5,9 @@ ...@@ -5,10 +5,9 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxfdcq" 10 id="boxfdcq"
11 :propsParam="propsParam"
12 :tableData="tableData" 11 :tableData="tableData"
13 :render="render" 12 :render="render"
14 /> 13 />
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxjsydsyq" 10 id="boxjsydsyq"
11 :propsParam="propsParam"
12 :tableData="tableData" 11 :tableData="tableData"
13 :render="render" 12 :render="render"
14 /> 13 />
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxldsyq" 10 id="boxldsyq"
11 :propsParam="propsParam"
12 :tableData="tableData" 11 :tableData="tableData"
13 :render="render" 12 :render="render"
14 /> 13 />
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxnydsyq" 10 id="boxnydsyq"
11 :propsParam="propsParam"
12 :tableData="tableData" 11 :tableData="tableData"
13 :render="render" 12 :render="render"
14 /> 13 />
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
18 <div v-show="false"> 18 <div v-show="false">
19 <printTemplate 19 <printTemplate
20 id="boxsllmsyq" 20 id="boxsllmsyq"
21 :propsParam="propsParam"
22 :tableData="tableData" 21 :tableData="tableData"
23 :render="render" 22 :render="render"
24 /> 23 />
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
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="boxtdsyq" :propsParam="propsParam" :tableData="tableData" :render="render"/> 9 <printTemplate id="boxtdsyq" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
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="boxygdj" :propsParam="propsParam" :tableData="tableData" :render="render"/> 9 <printTemplate id="boxygdj" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxyydj" 10 id="boxyydj"
11 :propsParam="propsParam"
12 :tableData="tableData" 11 :tableData="tableData"
13 :render="render" 12 :render="render"
14 /> 13 />
......
...@@ -8,51 +8,64 @@ ...@@ -8,51 +8,64 @@
8 <div class="fieldcheck"> 8 <div class="fieldcheck">
9 <div class="left"> 9 <div class="left">
10 <div class="header"> 10 <div class="header">
11 <el-checkbox 11 <div class="headerconcent">
12 class="check" 12 <el-checkbox
13 :indeterminate="isIndeterminate" 13 class="check"
14 v-model="checkAll" 14 :indeterminate="isIndeterminate"
15 @change="handleCheckAllChange">待选合集</el-checkbox> 15 v-model="checkAll"
16 <div class="num">/</div> 16 @change="handleCheckAllChange"
17 >待选合集</el-checkbox
18 >
19 <div class="num">
20 总数{{ cities.length }} 已选{{ datalist.length }}
21 </div>
22 </div>
17 </div> 23 </div>
18 <el-checkbox-group 24 <el-checkbox-group
19 class="concent" 25 class="concent"
20 v-model="checkedCities" 26 v-model="checkedCities"
21 @change="handleCheckedCitiesChange"> 27 @change="handleCheckedCitiesChange"
28 >
22 <el-checkbox 29 <el-checkbox
23 v-for="city in cities" 30 v-for="city in cities"
24 :label="city.name" 31 :label="city.name"
25 :key="city.name">{{ city.despriction }}({{ city.name }})</el-checkbox> 32 :key="city.name"
33 >{{ city.despriction }}({{ city.name }})</el-checkbox
34 >
26 </el-checkbox-group> 35 </el-checkbox-group>
27 </div> 36 </div>
28 <div class="right"> 37 <div class="right">
29 <el-table 38 <el-table
30 class="tablelist" 39 class="tablelist"
31 :data="datalist" 40 :data="datalist"
41 border
32 ref="listTable" 42 ref="listTable"
33 :key="key" 43 :key="key"
34 row-key="name" 44 row-key="name"
35 :pagination="false" 45 :pagination="false"
36 :header-cell-style="{ 'text-align': 'center' }"
37 :heightNumSetting="true" 46 :heightNumSetting="true"
38 :minHeight="150" 47 :minHeight="150"
39 height="590" 48 height="650"
40 style="width: 100%"> 49 style="width: 100%"
50 >
41 <el-table-column label="字段" prop="name" min-width="100"> 51 <el-table-column label="字段" prop="name" min-width="100">
42 </el-table-column> 52 </el-table-column>
43 53
44 <el-table-column 54 <el-table-column
45 label="字段名称" 55 label="字段名称"
46 prop="desprictionor" 56 prop="desprictionor"
47 min-width="100"> 57 min-width="100"
58 >
48 </el-table-column> 59 </el-table-column>
49 <el-table-column label="字段别名" min-width="100"> 60 <el-table-column label="字段别名" min-width="100">
50 <template slot-scope="scope"> 61 <template slot-scope="scope">
51 <el-input 62 <el-input
52 v-model="scope.row.despriction" 63 v-model="scope.row.despriction"
53 placeholder="请输入内容" 64 placeholder="请输入内容"
54 @input="sumTime(scope.$index, scope.row.tdsyqx)"> 65 @input="sumTime(scope.$index, scope.row.tdsyqx)"
55 ></el-input> 66 >
67 ></el-input
68 >
56 </template> 69 </template>
57 </el-table-column> 70 </el-table-column>
58 </el-table> 71 </el-table>
...@@ -66,222 +79,219 @@ ...@@ -66,222 +79,219 @@
66 </template> 79 </template>
67 80
68 <script> 81 <script>
69 import Sortable from 'sortablejs' 82 import Sortable from "sortablejs";
70 import { getFieldList, getFieldListByQlxx, save } from "@/api/SysDjbFieldDO"; 83 import { getFieldList, getFieldListByQlxx, save } from "@/api/SysDjbFieldDO";
71 export default { 84 export default {
72 props: { 85 props: {
73 formData: { 86 formData: {
74 type: Object, 87 type: Object,
75 default: () => { }, 88 default: () => {},
76 },
77 }, 89 },
78 data () { 90 },
79 return { 91 data() {
80 checkAll: false, 92 return {
81 sortable: null, 93 checkAll: false,
82 checkedCities: [], 94 sortable: null,
83 cities: [], 95 checkedCities: [],
84 datalist: [], 96 cities: [],
85 tablelist: [], 97 datalist: [],
86 key: 0, 98 tablelist: [],
87 isIndeterminate: true, 99 key: 0,
88 }; 100 isIndeterminate: true,
89 }, 101 };
90 mounted () { 102 },
91 this.generateData() 103 mounted() {
104 this.generateData();
105 },
106 beforeDestroy() {
107 if (this.sortable) {
108 this.sortable.destroy();
109 }
110 },
111 watch: {
112 key: {
113 handler(newName, oldName) {
114 this.initSort();
115 },
92 }, 116 },
93 beforeDestroy () { 117 },
94 if (this.sortable) { 118 methods: {
95 this.sortable.destroy(); 119 changeIndex(array, index1, index2) {
96 } 120 array[index1] = array.splice(index2, 1, array[index1])[0];
97 }, 121 },
98 watch: { 122 initSort() {
99 key: { 123 const el = this.$refs.listTable.$el.querySelectorAll(
100 handler (newName, oldName) { 124 ".el-table__body-wrapper > table > tbody"
101 this.initSort() 125 )[0];
102 } 126 // const sortable = new Sortable(el, options);
103 } 127 // 根据具体需求配置options配置项
128 const sortable = new Sortable(el, {
129 onEnd: (evt) => {
130 // 监听拖动结束事件
131 console.log(this); // this是当前vue上下文
132 console.log(evt.oldIndex); // 当前行的被拖拽前的顺序
133 console.log(evt.newIndex); // 当前行的被拖拽后的顺序
134 // 这里就可以写我们需要传给后台的逻辑代码
135 // 我们有了 evt.oldIndex 和 evt.newIndex 这两个参数做索引，我们可以根据绑定在表格上面的 data 这个 Array 找到两个相应的记录。就可以针对数据进行操作啦。
136 // 下面将拖拽后的顺序进行修改
137 const currRow = this.datalist.splice(evt.oldIndex, 1)[0];
138 this.datalist.splice(evt.newIndex, 0, currRow);
139 },
140 });
104 }, 141 },
105 methods: { 142 /**
106 changeIndex (array, index1, index2) { 143 * @description: 初始数据集
107 array[index1] = array.splice(index2, 1, array[index1])[0]; 144 * @author: renchao
108 }, 145 */
109 initSort () { 146 generateData() {
110 const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0] 147 let that = this;
111 // const sortable = new Sortable(el, options); 148 getFieldList({ qllx: this.formData.qllx }).then((res) => {
112 // 根据具体需求配置options配置项 149 if (res.code === 200) {
113 const sortable = new Sortable(el, { 150 let listss = res.result;
114 onEnd: (evt) => { // 监听拖动结束事件 151 listss.forEach((item, index) => {
115 console.log(this) // this是当前vue上下文 152 that.cities.push({
116 console.log(evt.oldIndex) // 当前行的被拖拽前的顺序 153 name: item.name,
117 console.log(evt.newIndex) // 当前行的被拖拽后的顺序 154 despriction: item.despriction,
118 // 这里就可以写我们需要传给后台的逻辑代码 155 desprictionor: item.despriction,
119 // 我们有了 evt.oldIndex 和 evt.newIndex 这两个参数做索引，我们可以根据绑定在表格上面的 data 这个 Array 找到两个相应的记录。就可以针对数据进行操作啦。
120 // 下面将拖拽后的顺序进行修改
121 const currRow = this.datalist.splice(evt.oldIndex, 1)[0]
122 this.datalist.splice(evt.newIndex, 0, currRow)
123 }
124 })
125 },
126 /**
127 * @description: 初始数据集
128 * @author: renchao
129 */
130 generateData () {
131 let that = this
132 getFieldList({ qllx: this.formData.qllx }).then((res) => {
133 if (res.code === 200) {
134 let listss = res.result;
135 listss.forEach((item, index) => {
136 that.cities.push({
137 name: item.name,
138 despriction: item.despriction,
139 desprictionor: item.despriction,
140 });
141 });
142
143 getFieldListByQlxx({ qllx: this.formData.qllx }).then((res) => {
144 if (res.code === 200) {
145 let listss = res.result;
146 listss.forEach((item, index) => {
147 that.tablelist.push({
148 name: item.name,
149 despriction: item.despriction,
150 desprictionor: item.despriction,
151 });
152 that.$nextTick(() => {
153 that.datalist = this.tablelist
154 that.checkedCities.push(item.name);
155 })
156 })
157 that.initSort()
158 }
159 }); 156 });
160 }
161 });
162 },
163 handleCheckAllChange (val) {
164 let checkedlist = []
165 let orlist = []
166 checkedlist = val ? this.cities : [];
167 this.isIndeterminate = false;
168 console.log("this.checkedCities", this.checkedCities);
169 let lists = [];
170 this.cities.forEach((item, index) => {
171
172 checkedlist.forEach((el) => {
173 orlist.push(el.name)
174 if (item.name == el.name) {
175 lists.push(this.cities[index]);
176 }
177 }); 157 });
178 }); 158
179 this.checkedCities = orlist 159 getFieldListByQlxx({ qllx: this.formData.qllx }).then((res) => {
180 this.datalist = lists; 160 if (res.code === 200) {
181 // 其他排序逻辑 161 let listss = res.result;
182 this.initSort() 162 listss.forEach((item, index) => {
183 }, 163 that.tablelist.push({
184 handleCheckedCitiesChange (value) { 164 name: item.name,
185 console.log("value", value, this.checkedCities); 165 despriction: item.despriction,
186 let checkedCount = value.length; 166 desprictionor: item.despriction,
187 this.checkAll = checkedCount === this.cities.length; 167 });
188 this.isIndeterminate = 168 that.$nextTick(() => {
189 checkedCount > 0 && checkedCount < this.cities.length; 169 that.datalist = this.tablelist;
190 let lists = []; 170 that.checkedCities.push(item.name);
191 this.cities.forEach((item, index) => { 171 });
192 this.checkedCities.forEach((el) => { 172 });
193 if (item.name == el) { 173 that.initSort();
194 console.log("1");
195 lists.push(this.cities[index]);
196 } 174 }
197 }); 175 });
176 }
177 });
178 },
179 handleCheckAllChange(val) {
180 let checkedlist = [];
181 let orlist = [];
182 checkedlist = val ? this.cities : [];
183 this.isIndeterminate = false;
184 console.log("this.checkedCities", this.checkedCities);
185 let lists = [];
186 this.cities.forEach((item, index) => {
187 checkedlist.forEach((el) => {
188 orlist.push(el.name);
189 if (item.name == el.name) {
190 lists.push(this.cities[index]);
191 }
198 }); 192 });
199 this.datalist = lists; 193 });
200 // 其他排序逻辑 194 this.checkedCities = orlist;
201 this.initSort() 195 this.datalist = lists;
202 }, 196 // 其他排序逻辑
203 submitForm () { 197 this.initSort();
204 save(this.formData.bsmMb, this.datalist).then((res) => { 198 },
205 if (res.code == 200) { 199 handleCheckedCitiesChange(value) {
206 this.$popupCacel(); 200 console.log("value", value, this.checkedCities);
207 this.$message({ 201 let checkedCount = value.length;
208 message: "保存成功", 202 this.checkAll = checkedCount === this.cities.length;
209 type: "success", 203 this.isIndeterminate =
210 }); 204 checkedCount > 0 && checkedCount < this.cities.length;
211 } else { 205 let lists = [];
212 this.$message({ 206 this.cities.forEach((item, index) => {
213 message: "保存失败", 207 this.checkedCities.forEach((el) => {
214 type: "error", 208 if (item.name == el) {
215 }); 209 lists.push(this.cities[index]);
216 } 210 }
217 }); 211 });
218 }, 212 });
213 this.datalist = lists;
214 // 其他排序逻辑
215 this.initSort();
216 },
217 submitForm() {
218 save(this.formData.bsmMb, this.datalist).then((res) => {
219 if (res.code == 200) {
220 this.$popupCacel();
221 this.$message({
222 message: "保存成功",
223 type: "success",
224 });
225 } else {
226 this.$message({
227 message: "保存失败",
228 type: "error",
229 });
230 }
231 });
219 }, 232 },
220 }; 233 },
234 };
221 </script> 235 </script>
222 <style scoped lang="scss"> 236 <style scoped lang="scss">
223 @import "~@/styles/mixin.scss"; 237 @import "~@/styles/mixin.scss";
224 @import "~@/styles/dialogBoxheader.scss"; 238 @import "~@/styles/dialogBoxheader.scss";
225 .fieldcheck { 239 .fieldcheck {
226 width: 100%; 240 width: 100%;
241 height: 650px;
242 display: flex;
243 justify-content: space-between;
244 .left,
245 .right {
246 width: 49%;
227 height: 650px; 247 height: 650px;
228 display: flex; 248 border: 1px solid rgb(230, 230, 230);
229 justify-content: space-between; 249 }
230 .left, 250 .left {
231 .right { 251 .header {
232 width: 47%; 252 width: 100%;
233 height: 650px; 253 height: 50px;
234 border: 1px solid rgb(230, 230, 230); 254 background-color: rgba(243, 242, 242, 0.897);
235 } 255 .headerconcent {
236 .left { 256 width: 90%;
237 .header {
238 width: 100%;
239 height: 50px; 257 height: 50px;
258 margin: auto;
240 line-height: 50px; 259 line-height: 50px;
241 background-color: rgba(243, 242, 242, 0.897);
242 display: flex; 260 display: flex;
243 justify-content: space-around; 261 justify-content: space-between;
244 align-items:center .check { 262 align-items: center;
245 height: 20px;
246 margin: auto;
247 }
248 .num {
249 height: 20px;
250 }
251 }
252 .concent {
253 padding: 10px;
254 width: 100%;
255 display: inline-block;
256 padding-left: 20px;
257 overflow-x: hidden;
258 height: 600px;
259 .el-checkbox {
260 width: 100%;
261 padding: 10px;
262 }
263 .el-checkbox:hover {
264 padding: 10px;
265 background-color: rgba(243, 242, 242, 0.897);
266 }
267 } 263 }
268 } 264 }
269 .right { 265 .concent {
270 .header { 266 padding: 10px;
267 width: 100%;
268 display: inline-block;
269 padding-left: 20px;
270 overflow-x: hidden;
271 height: 600px;
272 .el-checkbox {
271 width: 100%; 273 width: 100%;
272 height: 50px; 274 padding: 10px;
273 line-height: 50px;
274 background-color: rgba(243, 242, 242, 0.897);
275 } 275 }
276 .tablelist { 276 .el-checkbox:hover {
277 margin-top: 10px; 277 padding: 10px;
278 height: 680px; 278 background-color: rgba(243, 242, 242, 0.897);
279 } 279 }
280 } 280 }
281 } 281 }
282 .btn { 282 .right {
283 margin-top: 10px; 283 .header {
284 width: 100%; 284 width: 100%;
285 text-align: center; 285 height: 50px;
286 line-height: 50px;
287 background-color: rgba(243, 242, 242, 0.897);
288 }
289
286 } 290 }
291 }
292 .btn {
293 margin-top: 10px;
294 width: 100%;
295 text-align: center;
296 }
287 </style> 297 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 17:08:19 4 * @LastEditTime: 2023-09-14 16:37:15
5 --> 5 -->
6 <template> 6 <template>
7 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"> 7 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
...@@ -28,25 +28,30 @@ ...@@ -28,25 +28,30 @@
28 :calcHeight="300"> 28 :calcHeight="300">
29 </lb-table> 29 </lb-table>
30 <el-row> 30 <el-row>
31 <el-col :span="6"> 31 <el-col :span="3">
32 <el-form-item label="领证人" prop="lzrxm"> 32 <el-form-item label="身份证读卡器">
33 <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button>
34 </el-form-item>
35 </el-col>
36 <el-col :span="5">
37 <el-form-item label="领证人" prop="lzrxm" label-width="70px">
33 <el-input v-model="ruleForm.lzrxm"></el-input> 38 <el-input v-model="ruleForm.lzrxm"></el-input>
34 </el-form-item> 39 </el-form-item>
35 </el-col> 40 </el-col>
36 <el-col :span="6"> 41 <el-col :span="5">
37 <el-form-item label="证件类型" prop="lzrzjlb"> 42 <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
38 <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择"> 43 <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
39 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode"> 44 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
40 </el-option> 45 </el-option>
41 </el-select> 46 </el-select>
42 </el-form-item> 47 </el-form-item>
43 </el-col> 48 </el-col>
44 <el-col :span="6"> 49 <el-col :span="5">
45 <el-form-item label="证件号" prop="lzrzjh"> 50 <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
46 <el-input v-model="ruleForm.lzrzjh"></el-input> 51 <el-input v-model="ruleForm.lzrzjh"></el-input>
47 </el-form-item> 52 </el-form-item>
48 </el-col> 53 </el-col>
49 <el-col :span="6"> 54 <el-col :span="5">
50 <el-form-item label="领证人电话" prop="lzrdh"> 55 <el-form-item label="领证人电话" prop="lzrdh">
51 <el-input v-model="ruleForm.lzrdh"></el-input> 56 <el-input v-model="ruleForm.lzrdh"></el-input>
52 </el-form-item> 57 </el-form-item>
...@@ -62,7 +67,8 @@ ...@@ -62,7 +67,8 @@
62 import Vue from 'vue' 67 import Vue from 'vue'
63 import store from '@/store/index.js' 68 import store from '@/store/index.js'
64 import table from "@/utils/mixin/table"; 69 import table from "@/utils/mixin/table";
65 import { getUnclaimedBdcqz, issueCertificate,getBdcqzQlr } from "@/api/bdcqz.js"; 70 import { getIdCardInfo } from '@/utils/operation.js'
71 import { getUnclaimedBdcqz, issueCertificate, getBdcqzQlr } from "@/api/bdcqz.js";
66 import { datas } from "../../javascript/fzxxdata"; 72 import { datas } from "../../javascript/fzxxdata";
67 export default { 73 export default {
68 props: { 74 props: {
...@@ -115,6 +121,29 @@ ...@@ -115,6 +121,29 @@
115 }, 121 },
116 methods: { 122 methods: {
117 /** 123 /**
124 * @description: 身份证打卡器
125 * @author: renchao
126 */
127 readClick () {
128 getIdCardInfo().then(res => {
129 if (res.data.code == 0) {
130 let data = res.data.IDCardInfo
131 this.ruleForm.lzrxm = data.name
132 this.ruleForm.lzrzjlb = '1'
133 this.ruleForm.lzrzjh = data.cardID
134 this.$message({
135 message: '读取成功！',
136 type: 'success'
137 })
138 } else {
139 this.$message({
140 message: res.data.message,
141 type: 'warning'
142 })
143 }
144 })
145 },
146 /**
118 * @description: 列表初始化 147 * @description: 列表初始化
119 * @author: renchao 148 * @author: renchao
120 */ 149 */
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-06 15:20:16 4 * @LastEditTime: 2023-09-14 17:19:26
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx sdqxx"> 7 <div class="slxx sdqxx">
...@@ -119,10 +119,6 @@ ...@@ -119,10 +119,6 @@
119 formdata.append("bsmSldy", this.propsParam.bsmSldy); 119 formdata.append("bsmSldy", this.propsParam.bsmSldy);
120 formdata.append("djlx", this.propsParam.djlx); 120 formdata.append("djlx", this.propsParam.djlx);
121 formdata.append("isEdit", this.viewEdit); 121 formdata.append("isEdit", this.viewEdit);
122 // Init(formdata).then((res) => {
123 // if (res.code === 200 && res.result) {
124 // }
125 // });
126 }, 122 },
127 data () { 123 data () {
128 return { 124 return {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 16:16:08 4 * @LastEditTime: 2023-09-14 16:06:51
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div style="width:90%;height:100%;">
8 <canvas id="mxcad" style="width:100%;height:100%"> 8 <canvas id="mxcad" style="width:90%;height:80%; position: relative;top:0">
9 </canvas> 9 </canvas>
10 </div> 10 </div>
11 </template> 11 </template>
...@@ -20,20 +20,17 @@ ...@@ -20,20 +20,17 @@
20 Mx.MxFun.createMxObject({ 20 Mx.MxFun.createMxObject({
21 canvasId: "mxcad", // canvas元素的id 21 canvasId: "mxcad", // canvas元素的id
22 cadFile: "buf/hhhh.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸 22 cadFile: "buf/hhhh.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸
23 // cadFile: "test2.dwg", // socket通信方式请直接提供图纸名称 如：text.dwg
24 callback: (mxDraw, { 23 callback: (mxDraw, {
25 canvas, 24 canvas,
26 canvasParent 25 canvasParent
27 }) => { 26 }) => {
28 // 可以拿到canvas元素和它的父级元素 27 // 可以拿到canvas元素和它的父级元素
29 console.log(canvas, canvasParent)
30 console.log(mxDraw)
31 // 拿到图层数据 28 // 拿到图层数据
32 mxDraw.addEvent('uiSetLayerData', (listLayer) => { 29 mxDraw.addEvent('uiSetLayerData', (listLayer) => {
33 console.log(listLayer) 30 console.log(listLayer)
34 }) 31 })
35 }, 32 },
36 isNewFile: false // 是否新建文件 33 isNewFile: true // 是否新建文件
37 }) 34 })
38 }) 35 })
39 } 36 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 13:57:48 4 * @LastEditTime: 2023-09-14 17:19:13
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -194,7 +194,8 @@ ...@@ -194,7 +194,8 @@
194 setTimeout(() => { 194 setTimeout(() => {
195 this.prinsss() 195 this.prinsss()
196 }, 100) 196 }, 100)
197 197 } else {
198 this.$message.error(res.message);
198 } 199 }
199 }) 200 })
200 }, 201 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-14 10:12:23 4 * @LastEditTime: 2023-09-14 11:14:54
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -34,27 +34,6 @@ ...@@ -34,27 +34,6 @@
34 sortable: null, 34 sortable: null,
35 column: [ 35 column: [
36 { 36 {
37 prop: "isrequired",
38 label: "是否必选",
39 width: "80",
40 render: (h, scope) => {
41 if (scope.row.isrequired === "1") {
42 return (
43 <div>
44 <span>必选</span>
45 </div>
46 );
47 }
48 else {
49 return (
50 <div>
51 <span>可选</span>
52 </div>
53 )
54 }
55 }
56 },
57 {
58 label: "材料名称", 37 label: "材料名称",
59 render: (h, scope) => { 38 render: (h, scope) => {
60 return ( 39 return (
...@@ -101,21 +80,6 @@ ...@@ -101,21 +80,6 @@
101 }, 80 },
102 }, 81 },
103 { 82 {
104 label: "是否新建材料",
105 width: "80",
106 render: (h, scope) => {
107 if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
108 return (
109 <span>是</span>
110 );
111 } else {
112 return (
113 <span>否</span>
114 );
115 }
116 },
117 },
118 {
119 label: "操作", 83 label: "操作",
120 width: "100", 84 width: "100",
121 render: (h, scope) => { 85 render: (h, scope) => {
...@@ -123,7 +87,7 @@ ...@@ -123,7 +87,7 @@
123 <el-button 87 <el-button
124 type="text" 88 type="text"
125 icon="el-icon-delete" 89 icon="el-icon-delete"
126 disabled={!(scope.row.count == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation} 90 disabled={scope.row.count != 0}
127 onClick={() => { 91 onClick={() => {
128 this.handleDelete(scope.$index, scope.row); 92 this.handleDelete(scope.$index, scope.row);
129 }} 93 }}
...@@ -170,8 +134,8 @@ ...@@ -170,8 +134,8 @@
170 message: '保存成功', 134 message: '保存成功',
171 type: 'success' 135 type: 'success'
172 }) 136 })
173 ywPopupCacel()
174 store.dispatch('user/reWorkFresh', true) 137 store.dispatch('user/reWorkFresh', true)
138 ywPopupCacel()
175 } 139 }
176 }).catch(() => { 140 }).catch(() => {
177 this.loading = false 141 this.loading = false
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 13:46:29 4 * @LastEditTime: 2023-09-14 16:24:07
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 // 缩略图 86 // 缩略图
87 thumbnailImages: [], 87 thumbnailImages: [],
88 showViewer: false, 88 showViewer: false,
89 initialIndex: undefined, 89 initialIndex: 0,
90 allLi: [], 90 allLi: [],
91 } 91 }
92 }, 92 },
...@@ -152,6 +152,7 @@ ...@@ -152,6 +152,7 @@
152 } else { 152 } else {
153 this.previewImg.index = this.previewImg.index + 1 153 this.previewImg.index = this.previewImg.index + 1
154 } 154 }
155 this.initialIndex = this.previewImg.index
155 this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial }) 156 this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial })
156 this.$message({ 157 this.$message({
157 message: '移动成功!', 158 message: '移动成功!',
...@@ -238,6 +239,7 @@ ...@@ -238,6 +239,7 @@
238 */ 239 */
239 showCurrent (index) { 240 showCurrent (index) {
240 this.previewImg.index = index 241 this.previewImg.index = index
242 this.initialIndex = index
241 }, 243 },
242 /** 244 /**
243 * @description: closeViewer 245 * @description: closeViewer
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 17:05:49 4 * @LastEditTime: 2023-09-14 14:23:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
58 </template> 58 </template>
59 <script> 59 <script>
60 import store from '@/store/index.js' 60 import store from '@/store/index.js'
61 import { ywPopupDialog, ywPopupCacel } from "@/utils/popup.js"; 61 import { ywPopupDialog } from "@/utils/popup.js";
62 import imagePreview from "./dialog/imagePreview.vue";
62 import clxxAddDialog from "./dialog/clxxAddDialog.vue"; 63 import clxxAddDialog from "./dialog/clxxAddDialog.vue";
63 import clxxDetailDialog from "./dialog/clxxDetailDialog.vue"; 64 import clxxDetailDialog from "./dialog/clxxDetailDialog.vue";
64 import imagePreview from "./dialog/imagePreview.vue";
65 import { getCompanyMaterialList, addCompanyMaterial, getFileListByBsmMaterial } from "@/api/company.js"; 65 import { getCompanyMaterialList, addCompanyMaterial, getFileListByBsmMaterial } from "@/api/company.js";
66 export default { 66 export default {
67 components: { clxxAddDialog, imagePreview, clxxDetailDialog }, 67 components: { clxxAddDialog, imagePreview, clxxDetailDialog },
...@@ -90,6 +90,20 @@ ...@@ -90,6 +90,20 @@
90 } 90 }
91 } 91 }
92 }, 92 },
93 computed: {
94 workFresh () {
95 return store.state.user.workFresh
96 }
97 },
98 watch: {
99 workFresh: {
100 handler (newValue, oldValue) {
101 this.clmlInitList()
102 },
103 deep: true,
104 immediate: true
105 }
106 },
93 created () { 107 created () {
94 this.clmlInitList() 108 this.clmlInitList()
95 }, 109 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-11 11:23:49 4 * @LastEditTime: 2023-09-14 11:11:10
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
39 </div> 39 </div>
40 </template> 40 </template>
41 <script> 41 <script>
42 import { mapGetters } from 'vuex'
43 import table from "@/utils/mixin/table" 42 import table from "@/utils/mixin/table"
44 import { datas, sendThis } from "./data" 43 import { datas, sendThis } from "./data"
45 import { queryQyByPage, addQy, remove } from "@/api/xxba.js"; 44 import { queryQyByPage, addQy, remove } from "@/api/xxba.js";
...@@ -53,17 +52,6 @@ ...@@ -53,17 +52,6 @@
53 activated () { 52 activated () {
54 this.queryClick() 53 this.queryClick()
55 }, 54 },
56 computed: {
57 ...mapGetters(['workFresh'])
58 },
59 watch: {
60 workFresh: {
61 handler (newVal, oldVal) {
62 console.log(newVal, 'newVal');
63 if (newVal) this.queryClick()
64 }
65 }
66 },
67 data () { 55 data () {
68 return { 56 return {
69 queryForm: { 57 queryForm: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 09:50:02 4 * @LastEditTime: 2023-09-14 17:19:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -310,6 +310,8 @@ ...@@ -310,6 +310,8 @@
310 Init(formdata).then((res) => { 310 Init(formdata).then((res) => {
311 if (res.code === 200 && res.result) { 311 if (res.code === 200 && res.result) {
312 this.ruleForm = res.result; 312 this.ruleForm = res.result;
313 } else {
314 this.$message.error(res.message);
313 } 315 }
314 }); 316 });
315 }, 317 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 09:59:18 4 * @LastEditTime: 2023-09-14 17:19:58
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -365,6 +365,7 @@ ...@@ -365,6 +365,7 @@
365 import { mapGetters } from "vuex"; 365 import { mapGetters } from "vuex";
366 export default { 366 export default {
367 mounted () { 367 mounted () {
368 let that = this
368 this.loading = true 369 this.loading = true
369 this.viewEdit = this.$parent.currentSelectTab.ableOperation; 370 this.viewEdit = this.$parent.currentSelectTab.ableOperation;
370 this.propsParam = this.$attrs; 371 this.propsParam = this.$attrs;
...@@ -381,14 +382,16 @@ ...@@ -381,14 +382,16 @@
381 this.loading = false 382 this.loading = false
382 }, 200) 383 }, 200)
383 if (res.code === 200 && res.result) { 384 if (res.code === 200 && res.result) {
384 this.ruleForm = res.result; 385 that.ruleForm = res.result;
385 this.czrOptions = this.ruleForm.qlrList; 386 that.czrOptions = this.ruleForm.qlrList;
387 that.ruleForm.qlrList.forEach((item) => {
388 if (item.sfczr == 1) {
389 that.czr = item.zjh
390 }
391 })
392 } else {
393 that.$message.error(res.message);
386 } 394 }
387 this.ruleForm.qlrList.forEach((item) => {
388 if (item.sfczr == 1) {
389 this.czr = item.zjh
390 }
391 });
392 }).catch(() => { 395 }).catch(() => {
393 this.loading = false 396 this.loading = false
394 }) 397 })
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-09-13 14:41:34 4 * @LastEditTime: 2023-09-14 17:20:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -105,16 +105,44 @@ ...@@ -105,16 +105,44 @@
105 <el-row :gutter="10" v-if="ruleForm.fdcq1"> 105 <el-row :gutter="10" v-if="ruleForm.fdcq1">
106 <el-col :span="8"> 106 <el-col :span="8">
107 <el-form-item label="独用土地面积："> 107 <el-form-item label="独用土地面积：">
108 <el-input :disabled="!viewEdit" maxlength="12" v-model="ruleForm.fdcq1.dytdmj"></el-input> 108 <div class="flex">
109 <el-input
110 maxlength="12"
111 v-model="ruleForm.fdcq1.dytdmj"
112 :disabled="!viewEdit"
113 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
114 <el-select disabled v-model="mjdw" style="width: 68px">
115 <el-option
116 v-for="item in dictData['A7']"
117 :key="item.dcode"
118 :label="item.dname"
119 :value="item.dcode">
120 </el-option>
121 </el-select>
122 </div>
109 </el-form-item> 123 </el-form-item>
110 </el-col> 124 </el-col>
111 <el-col :span="8"> 125 <el-col :span="8">
112 <el-form-item label="分摊土地面积："> 126 <el-form-item label="分摊土地面积：">
113 <el-input :disabled="!viewEdit" maxlength="12" v-model="ruleForm.fdcq1.fttdmj"></el-input> 127 <div class="flex">
128 <el-input
129 maxlength="12"
130 v-model="ruleForm.fdcq1.fttdmj"
131 :disabled="!viewEdit"
132 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
133 <el-select disabled v-model="mjdw" style="width: 68px">
134 <el-option
135 v-for="item in dictData['A7']"
136 :key="item.dcode"
137 :label="item.dname"
138 :value="item.dcode">
139 </el-option>
140 </el-select>
141 </div>
114 </el-form-item> 142 </el-form-item>
115 </el-col> 143 </el-col>
116
117 <el-col :span="8"> 144 <el-col :span="8">
145
118 <el-form-item label="房地产交易价格："> 146 <el-form-item label="房地产交易价格：">
119 <div class="flex"> 147 <div class="flex">
120 <el-input 148 <el-input
...@@ -285,6 +313,8 @@ ...@@ -285,6 +313,8 @@
285 } 313 }
286 }); 314 });
287 this.czrOptions = this.ruleForm.qlrList; 315 this.czrOptions = this.ruleForm.qlrList;
316 } else {
317 this.$message.error(res.message);
288 } 318 }
289 }) 319 })
290 }, 320 },
...@@ -298,6 +328,7 @@ ...@@ -298,6 +328,7 @@
298 disabled: true, 328 disabled: true,
299 tdytOption: [], 329 tdytOption: [],
300 czrOptions: [], 330 czrOptions: [],
331 mjdw: "1",
301 czr: "", 332 czr: "",
302 ruleForm: { 333 ruleForm: {
303 flow: { 334 flow: {
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 10:04:14 4 * @LastEditTime: 2023-09-14 17:17:56
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -440,6 +440,8 @@ ...@@ -440,6 +440,8 @@
440 } 440 }
441 }); 441 });
442 this.czrOptions = this.ruleForm.qlrList; 442 this.czrOptions = this.ruleForm.qlrList;
443 } else {
444 this.$message.error(res.message);
443 } 445 }
444 }).catch(() => { 446 }).catch(() => {
445 this.loading = false 447 this.loading = false
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 14:16:46 4 * @LastEditTime: 2023-09-14 17:20:53
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -299,6 +299,8 @@ ...@@ -299,6 +299,8 @@
299 } 299 }
300 }); 300 });
301 this.czrOptions = this.ruleForm.qlrList; 301 this.czrOptions = this.ruleForm.qlrList;
302 } else {
303 this.$message.error(res.message);
302 } 304 }
303 }).catch(() => { 305 }).catch(() => {
304 this.loading = false 306 this.loading = false
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 14:17:15 4 * @LastEditTime: 2023-09-14 17:20:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -296,6 +296,8 @@ ...@@ -296,6 +296,8 @@
296 this.czrOptions = this.ruleForm.qlrList; 296 this.czrOptions = this.ruleForm.qlrList;
297 this.gyfs = this.ruleForm.sldyList[0].gyfs; 297 this.gyfs = this.ruleForm.sldyList[0].gyfs;
298 this.splicingFdcq2Info(); 298 this.splicingFdcq2Info();
299 } else {
300 this.$message.error(res.message);
299 } 301 }
300 this.ruleForm.qlrList.forEach((item) => { 302 this.ruleForm.qlrList.forEach((item) => {
301 if (item.sfczr == 1) { 303 if (item.sfczr == 1) {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 14:05:26 4 * @LastEditTime: 2023-09-14 17:21:04
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -264,6 +264,8 @@ ...@@ -264,6 +264,8 @@
264 } 264 }
265 }); 265 });
266 this.czrOptions = this.ruleForm.qlrList; 266 this.czrOptions = this.ruleForm.qlrList;
267 } else {
268 this.$message.error(res.message);
267 } 269 }
268 }).catch(() => { 270 }).catch(() => {
269 this.loading = false 271 this.loading = false
...@@ -356,6 +358,8 @@ ...@@ -356,6 +358,8 @@
356 ...res.result.qlxxdatas, 358 ...res.result.qlxxdatas,
357 ...res.result.jsydsyqdatas, 359 ...res.result.jsydsyqdatas,
358 }; 360 };
361 } else {
362 this.$message.error(res.message);
359 } 363 }
360 }); 364 });
361 }, 365 },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-09-13 14:17:49 5 * @LastEditTime: 2023-09-14 17:21:19
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -239,6 +239,8 @@ ...@@ -239,6 +239,8 @@
239 if (res.code === 200 && res.result) { 239 if (res.code === 200 && res.result) {
240 this.ruleForm = res.result; 240 this.ruleForm = res.result;
241 this.czrOptions = this.ruleForm.qlrList; 241 this.czrOptions = this.ruleForm.qlrList;
242 } else {
243 this.$message.error(res.message);
242 } 244 }
243 this.ruleForm.qlrList.forEach((item) => { 245 this.ruleForm.qlrList.forEach((item) => {
244 if (item.sfczr == 1) { 246 if (item.sfczr == 1) {
......
...@@ -352,6 +352,8 @@ ...@@ -352,6 +352,8 @@
352 setTimeout(() => { 352 setTimeout(() => {
353 this.loading = false 353 this.loading = false
354 }, 200) 354 }, 200)
355 } else {
356 this.$message.error(res.message);
355 } 357 }
356 }) 358 })
357 }, 359 },
......
...@@ -345,6 +345,8 @@ ...@@ -345,6 +345,8 @@
345 ? (this.ruleForm.slsq.fzfs = "1") 345 ? (this.ruleForm.slsq.fzfs = "1")
346 : this.ruleForm.slsq.fzfs; 346 : this.ruleForm.slsq.fzfs;
347 this.czrOptions = this.ruleForm.qlrList; 347 this.czrOptions = this.ruleForm.qlrList;
348 } else {
349 this.$message.error(res.message);
348 } 350 }
349 }); 351 });
350 }, 352 },
......
...@@ -227,9 +227,11 @@ ...@@ -227,9 +227,11 @@
227 if (item.sfczr == 1) { 227 if (item.sfczr == 1) {
228 this.czr = item.zjh 228 this.czr = item.zjh
229 } 229 }
230 }); 230 })
231 } else {
232 this.$message.error(res.message);
231 } 233 }
232 }); 234 })
233 }, 235 },
234 components: { qlrCommonTable, ywrCommonTable }, 236 components: { qlrCommonTable, ywrCommonTable },
235 computed: { 237 computed: {
......
...@@ -327,6 +327,8 @@ ...@@ -327,6 +327,8 @@
327 setTimeout(() => { 327 setTimeout(() => {
328 that.loading = false 328 that.loading = false
329 }, 200) 329 }, 200)
330 } else {
331 this.$message.error(res.message);
330 } 332 }
331 }) 333 })
332 }, 334 },
......
...@@ -345,6 +345,8 @@ ...@@ -345,6 +345,8 @@
345 this.czr = item.zjh 345 this.czr = item.zjh
346 } 346 }
347 }) 347 })
348 } else {
349 this.$message.error(res.message);
348 } 350 }
349 }).catch(() => { 351 }).catch(() => {
350 this.loading = false 352 this.loading = false
......