Merge branch 'dev'
Showing
37 changed files
with
595 additions
and
239 deletions
| 1 | /* | 1 | /* |
| 2 | * @Description: 不动产权证 | 2 | * @Description: 不动产权证 |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-05 13:24:14 | 4 | * @LastEditTime: 2023-09-13 16:06:55 |
| 5 | */ | 5 | */ |
| 6 | import request from '@/utils/request'; | 6 | import request from '@/utils/request'; |
| 7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) | 7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) |
| ... | @@ -146,3 +146,17 @@ export function getBdcqzDetail (bsmBdcqz) { | ... | @@ -146,3 +146,17 @@ export function getBdcqzDetail (bsmBdcqz) { |
| 146 | } | 146 | } |
| 147 | }) | 147 | }) |
| 148 | } | 148 | } |
| 149 | /** | ||
| 150 | * @description: 根据bsmBdcqz获取权利人信息 | ||
| 151 | * @param {*} bsmBdcqz | ||
| 152 | * @author: renchao | ||
| 153 | */ | ||
| 154 | export function getBdcqzQlr (bsmBdcqz) { | ||
| 155 | return request({ | ||
| 156 | url: SERVER.SERVERAPI + '/rest/ywbl/bdcqz/getBdcqzQlr', | ||
| 157 | method: 'get', | ||
| 158 | params: { | ||
| 159 | bsmBdcqz: bsmBdcqz | ||
| 160 | } | ||
| 161 | }) | ||
| 162 | } | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Description: 材料信息 | 2 | * @Description: 材料信息 |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-13 11:09:48 | 4 | * @LastEditTime: 2023-09-13 15:56:03 |
| 5 | */ | 5 | */ |
| 6 | import request from '@/utils/request' | 6 | import request from '@/utils/request' |
| 7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) | 7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) |
| ... | @@ -49,9 +49,9 @@ export function saveClml (data) { | ... | @@ -49,9 +49,9 @@ export function saveClml (data) { |
| 49 | * @param {*} data | 49 | * @param {*} data |
| 50 | * @author: renchao | 50 | * @author: renchao |
| 51 | */ | 51 | */ |
| 52 | export function updateClml (data, bsmSldy) { | 52 | export function updateClml (data, bsmSldy, bsmSlsq) { |
| 53 | return request({ | 53 | return request({ |
| 54 | url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy, | 54 | url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy + '/' + bsmSlsq, |
| 55 | method: 'post', | 55 | method: 'post', |
| 56 | data | 56 | data |
| 57 | }) | 57 | }) |
| ... | @@ -115,6 +115,22 @@ export function deleteClmx (bsmClmx) { | ... | @@ -115,6 +115,22 @@ export function deleteClmx (bsmClmx) { |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | /** | 117 | /** |
| 118 | * @description: 材料移动 | ||
| 119 | * @param {*} data | ||
| 120 | * @author: renchao | ||
| 121 | */ | ||
| 122 | export function move (direction, clmxBsm) { | ||
| 123 | return request({ | ||
| 124 | url: SERVER.SERVERAPI + '/rest/ywbl/clxx/move', | ||
| 125 | method: 'post', | ||
| 126 | params: { | ||
| 127 | direction: direction, | ||
| 128 | clmxBsm: clmxBsm | ||
| 129 | } | ||
| 130 | }) | ||
| 131 | } | ||
| 132 | |||
| 133 | /** | ||
| 118 | * @description: 材料导入 | 134 | * @description: 材料导入 |
| 119 | * @param {*} data | 135 | * @param {*} data |
| 120 | * @author: renchao | 136 | * @author: renchao | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Description: 企业银行接口 | 2 | * @Description: 企业银行接口 |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-12 08:35:25 | 4 | * @LastEditTime: 2023-09-13 17:08:10 |
| 5 | */ | 5 | */ |
| 6 | import request from '@/utils/request' | 6 | import request from '@/utils/request' |
| 7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) | 7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) |
| ... | @@ -11,7 +11,6 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap | ... | @@ -11,7 +11,6 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap |
| 11 | * @description: 获取材料目录 | 11 | * @description: 获取材料目录 |
| 12 | * @author: renchao | 12 | * @author: renchao |
| 13 | */ | 13 | */ |
| 14 | |||
| 15 | export function getCompanyMaterialList (bsmCompany) { | 14 | export function getCompanyMaterialList (bsmCompany) { |
| 16 | return request({ | 15 | return request({ |
| 17 | url: SERVER.SERVERAPI + '/rest/sys/company/getCompanyMaterialList', | 16 | url: SERVER.SERVERAPI + '/rest/sys/company/getCompanyMaterialList', |
| ... | @@ -97,4 +96,16 @@ export function move (bsmFile, direction) { | ... | @@ -97,4 +96,16 @@ export function move (bsmFile, direction) { |
| 97 | direction: direction | 96 | direction: direction |
| 98 | } | 97 | } |
| 99 | }) | 98 | }) |
| 99 | } | ||
| 100 | /** | ||
| 101 | * @description: 编辑材料目录 | ||
| 102 | * @param {*} data | ||
| 103 | * @author: renchao | ||
| 104 | */ | ||
| 105 | export function editCompanyMaterialList (data, bsmCompany) { | ||
| 106 | return request({ | ||
| 107 | url: SERVER.SERVERAPI + '/rest/sys/company/editCompanyMaterialList/' + bsmCompany, | ||
| 108 | method: 'post', | ||
| 109 | data | ||
| 110 | }) | ||
| 100 | } | 111 | } |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-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-13 09:10:29 | 4 | * @LastEditTime: 2023-09-14 16:16:57 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="rlPopup"> | 7 | <div class="rlPopup"> |
| ... | @@ -53,7 +53,7 @@ | ... | @@ -53,7 +53,7 @@ |
| 53 | <script> | 53 | <script> |
| 54 | import PhotoZoom from '@/components/PhotoZoom' | 54 | import PhotoZoom from '@/components/PhotoZoom' |
| 55 | import { getAltimeterInfo, getUuid } from '@/utils/operation.js' | 55 | import { getAltimeterInfo, getUuid } from '@/utils/operation.js' |
| 56 | import { uploadBatch, deleteClmx } from "@/api/clxx.js"; | 56 | import { uploadBatch, deleteClmx, move } from "@/api/clxx.js"; |
| 57 | import publicPicture from '@/components/publicPicture/index.vue' | 57 | import publicPicture from '@/components/publicPicture/index.vue' |
| 58 | export default { | 58 | export default { |
| 59 | name: 'PreviewImage', | 59 | name: 'PreviewImage', |
| ... | @@ -141,7 +141,23 @@ | ... | @@ -141,7 +141,23 @@ |
| 141 | }, | 141 | }, |
| 142 | // 左右移动 | 142 | // 左右移动 |
| 143 | handleMove (direction) { | 143 | handleMove (direction) { |
| 144 | 144 | move(direction, this.previewImg.imgList[this.previewImg.index].bsmClmx).then(res => { | |
| 145 | if (res.code == 200) { | ||
| 146 | if (direction == 'left') { | ||
| 147 | this.previewImg.index = this.previewImg.index - 1 | ||
| 148 | } else { | ||
| 149 | this.previewImg.index = this.previewImg.index + 1 | ||
| 150 | } | ||
| 151 | this.initialIndex = this.previewImg.index | ||
| 152 | this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj }) | ||
| 153 | this.$message({ | ||
| 154 | message: '移动成功!', | ||
| 155 | type: 'success' | ||
| 156 | }) | ||
| 157 | } else { | ||
| 158 | this.$message.error(res.message); | ||
| 159 | } | ||
| 160 | }) | ||
| 145 | }, | 161 | }, |
| 146 | /** | 162 | /** |
| 147 | * @description: 拍照 | 163 | * @description: 拍照 |
| ... | @@ -219,6 +235,7 @@ | ... | @@ -219,6 +235,7 @@ |
| 219 | */ | 235 | */ |
| 220 | showCurrent (index) { | 236 | showCurrent (index) { |
| 221 | this.previewImg.index = index | 237 | this.previewImg.index = index |
| 238 | this.initialIndex = index | ||
| 222 | }, | 239 | }, |
| 223 | /** | 240 | /** |
| 224 | * @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,10 +238,7 @@ export default { | ... | @@ -229,10 +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 | }) | ||
| 236 | startBusinessFlow({ | 242 | startBusinessFlow({ |
| 237 | bsmSqyw: this.sqywInfo.bsmSqyw, | 243 | bsmSqyw: this.sqywInfo.bsmSqyw, |
| 238 | bdcdysz: this.bsmList, | 244 | bdcdysz: this.bsmList, |
| ... | @@ -249,7 +255,7 @@ export default { | ... | @@ -249,7 +255,7 @@ export default { |
| 249 | } else { | 255 | } else { |
| 250 | store.dispatch('user/refreshPage', true); | 256 | store.dispatch('user/refreshPage', true); |
| 251 | } | 257 | } |
| 252 | this.$popupCacel() | 258 | this.close() |
| 253 | } else { | 259 | } else { |
| 254 | if (res.result && res.result.length > 0) { | 260 | if (res.result && res.result.length > 0) { |
| 255 | this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} }) | 261 | this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} }) |
| ... | @@ -261,6 +267,14 @@ export default { | ... | @@ -261,6 +267,14 @@ export default { |
| 261 | this.loading = false | 267 | this.loading = false |
| 262 | }) | 268 | }) |
| 263 | }, | 269 | }, |
| 270 | /** | ||
| 271 | * @description: close | ||
| 272 | * @param {*} val | ||
| 273 | * @author: renchao | ||
| 274 | */ | ||
| 275 | close(){ | ||
| 276 | ywPopupCacel() | ||
| 277 | }, | ||
| 264 | }, | 278 | }, |
| 265 | computed:{ | 279 | computed:{ |
| 266 | 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 | /> | ... | ... |
| ... | @@ -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"> | ... | ... |
| 1 | <!-- | ||
| 2 | * @Description: | ||
| 3 | * @Autor: renchao | ||
| 4 | * @LastEditTime: 2023-09-14 10:53:42 | ||
| 5 | --> | ||
| 6 | <template> | ||
| 7 | <div> | ||
| 8 | <div class="fieldcheck"> | ||
| 9 | <div class="left"> | ||
| 10 | <div class="header"> | ||
| 11 | <el-checkbox | ||
| 12 | class="check" | ||
| 13 | :indeterminate="isIndeterminate" | ||
| 14 | v-model="checkAll" | ||
| 15 | @change="handleCheckAllChange">待选合集</el-checkbox> | ||
| 16 | <div class="num">/</div> | ||
| 17 | </div> | ||
| 18 | <el-checkbox-group | ||
| 19 | class="concent" | ||
| 20 | v-model="checkedCities" | ||
| 21 | @change="handleCheckedCitiesChange"> | ||
| 22 | <el-checkbox | ||
| 23 | v-for="city in cities" | ||
| 24 | :label="city.name" | ||
| 25 | :key="city.name">{{ city.despriction }}({{ city.name }})</el-checkbox> | ||
| 26 | </el-checkbox-group> | ||
| 27 | </div> | ||
| 28 | <div class="right"> | ||
| 29 | <el-table | ||
| 30 | class="tablelist" | ||
| 31 | :data="datalist" | ||
| 32 | ref="listTable" | ||
| 33 | :key="key" | ||
| 34 | row-key="name" | ||
| 35 | :pagination="false" | ||
| 36 | :header-cell-style="{ 'text-align': 'center' }" | ||
| 37 | :heightNumSetting="true" | ||
| 38 | :minHeight="150" | ||
| 39 | height="590" | ||
| 40 | style="width: 100%"> | ||
| 41 | <el-table-column label="字段" prop="name" min-width="100"> | ||
| 42 | </el-table-column> | ||
| 43 | |||
| 44 | <el-table-column | ||
| 45 | label="字段名称" | ||
| 46 | prop="desprictionor" | ||
| 47 | min-width="100"> | ||
| 48 | </el-table-column> | ||
| 49 | <el-table-column label="字段别名" min-width="100"> | ||
| 50 | <template slot-scope="scope"> | ||
| 51 | <el-input | ||
| 52 | v-model="scope.row.despriction" | ||
| 53 | placeholder="请输入内容" | ||
| 54 | @input="sumTime(scope.$index, scope.row.tdsyqx)"> | ||
| 55 | ></el-input> | ||
| 56 | </template> | ||
| 57 | </el-table-column> | ||
| 58 | </el-table> | ||
| 59 | </div> | ||
| 60 | </div> | ||
| 61 | <div class="btn"> | ||
| 62 | <el-button @click="$popupCacel">取消</el-button> | ||
| 63 | <el-button type="primary" @click="submitForm" plain>确定</el-button> | ||
| 64 | </div> | ||
| 65 | </div> | ||
| 66 | </template> | ||
| 67 | |||
| 68 | <script> | ||
| 69 | import Sortable from 'sortablejs' | ||
| 70 | import { getFieldList, getFieldListByQlxx, save } from "@/api/SysDjbFieldDO"; | ||
| 71 | export default { | ||
| 72 | props: { | ||
| 73 | formData: { | ||
| 74 | type: Object, | ||
| 75 | default: () => { }, | ||
| 76 | }, | ||
| 77 | }, | ||
| 78 | data () { | ||
| 79 | return { | ||
| 80 | checkAll: false, | ||
| 81 | sortable: null, | ||
| 82 | checkedCities: [], | ||
| 83 | cities: [], | ||
| 84 | datalist: [], | ||
| 85 | tablelist: [], | ||
| 86 | key: 0, | ||
| 87 | isIndeterminate: true, | ||
| 88 | }; | ||
| 89 | }, | ||
| 90 | mounted () { | ||
| 91 | this.generateData() | ||
| 92 | }, | ||
| 93 | beforeDestroy () { | ||
| 94 | if (this.sortable) { | ||
| 95 | this.sortable.destroy(); | ||
| 96 | } | ||
| 97 | }, | ||
| 98 | watch: { | ||
| 99 | key: { | ||
| 100 | handler (newName, oldName) { | ||
| 101 | this.initSort() | ||
| 102 | } | ||
| 103 | } | ||
| 104 | }, | ||
| 105 | methods: { | ||
| 106 | changeIndex (array, index1, index2) { | ||
| 107 | array[index1] = array.splice(index2, 1, array[index1])[0]; | ||
| 108 | }, | ||
| 109 | initSort () { | ||
| 110 | const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0] | ||
| 111 | // const sortable = new Sortable(el, options); | ||
| 112 | // 根据具体需求配置options配置项 | ||
| 113 | const sortable = new Sortable(el, { | ||
| 114 | onEnd: (evt) => { // 监听拖动结束事件 | ||
| 115 | console.log(this) // this是当前vue上下文 | ||
| 116 | console.log(evt.oldIndex) // 当前行的被拖拽前的顺序 | ||
| 117 | console.log(evt.newIndex) // 当前行的被拖拽后的顺序 | ||
| 118 | // 这里就可以写我们需要传给后台的逻辑代码 | ||
| 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 | }); | ||
| 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 | }); | ||
| 178 | }); | ||
| 179 | this.checkedCities = orlist | ||
| 180 | this.datalist = lists; | ||
| 181 | // 其他排序逻辑 | ||
| 182 | this.initSort() | ||
| 183 | }, | ||
| 184 | handleCheckedCitiesChange (value) { | ||
| 185 | console.log("value", value, this.checkedCities); | ||
| 186 | let checkedCount = value.length; | ||
| 187 | this.checkAll = checkedCount === this.cities.length; | ||
| 188 | this.isIndeterminate = | ||
| 189 | checkedCount > 0 && checkedCount < this.cities.length; | ||
| 190 | let lists = []; | ||
| 191 | this.cities.forEach((item, index) => { | ||
| 192 | this.checkedCities.forEach((el) => { | ||
| 193 | if (item.name == el) { | ||
| 194 | console.log("1"); | ||
| 195 | lists.push(this.cities[index]); | ||
| 196 | } | ||
| 197 | }); | ||
| 198 | }); | ||
| 199 | this.datalist = lists; | ||
| 200 | // 其他排序逻辑 | ||
| 201 | this.initSort() | ||
| 202 | }, | ||
| 203 | submitForm () { | ||
| 204 | save(this.formData.bsmMb, this.datalist).then((res) => { | ||
| 205 | if (res.code == 200) { | ||
| 206 | this.$popupCacel(); | ||
| 207 | this.$message({ | ||
| 208 | message: "保存成功", | ||
| 209 | type: "success", | ||
| 210 | }); | ||
| 211 | } else { | ||
| 212 | this.$message({ | ||
| 213 | message: "保存失败", | ||
| 214 | type: "error", | ||
| 215 | }); | ||
| 216 | } | ||
| 217 | }); | ||
| 218 | }, | ||
| 219 | }, | ||
| 220 | }; | ||
| 221 | </script> | ||
| 222 | <style scoped lang="scss"> | ||
| 223 | @import "~@/styles/mixin.scss"; | ||
| 224 | @import "~@/styles/dialogBoxheader.scss"; | ||
| 225 | .fieldcheck { | ||
| 226 | width: 100%; | ||
| 227 | height: 650px; | ||
| 228 | display: flex; | ||
| 229 | justify-content: space-between; | ||
| 230 | .left, | ||
| 231 | .right { | ||
| 232 | width: 47%; | ||
| 233 | height: 650px; | ||
| 234 | border: 1px solid rgb(230, 230, 230); | ||
| 235 | } | ||
| 236 | .left { | ||
| 237 | .header { | ||
| 238 | width: 100%; | ||
| 239 | height: 50px; | ||
| 240 | line-height: 50px; | ||
| 241 | background-color: rgba(243, 242, 242, 0.897); | ||
| 242 | display: flex; | ||
| 243 | justify-content: space-around; | ||
| 244 | align-items:center .check { | ||
| 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 | } | ||
| 268 | } | ||
| 269 | .right { | ||
| 270 | .header { | ||
| 271 | width: 100%; | ||
| 272 | height: 50px; | ||
| 273 | line-height: 50px; | ||
| 274 | background-color: rgba(243, 242, 242, 0.897); | ||
| 275 | } | ||
| 276 | .tablelist { | ||
| 277 | margin-top: 10px; | ||
| 278 | height: 680px; | ||
| 279 | } | ||
| 280 | } | ||
| 281 | } | ||
| 282 | .btn { | ||
| 283 | margin-top: 10px; | ||
| 284 | width: 100%; | ||
| 285 | text-align: center; | ||
| 286 | } | ||
| 287 | </style> |
| 1 | /* | 1 | /* |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-04-11 13:53:12 | 4 | * @LastEditTime: 2023-09-14 10:51:36 |
| 5 | */ | 5 | */ |
| 6 | import filter from '@/utils/filter.js' | 6 | import filter from '@/utils/filter.js' |
| 7 | let vm = null | 7 | let vm = null |
| ... | @@ -61,11 +61,11 @@ class data extends filter { | ... | @@ -61,11 +61,11 @@ class data extends filter { |
| 61 | }, | 61 | }, |
| 62 | { | 62 | { |
| 63 | label: '操作', | 63 | label: '操作', |
| 64 | width: '160', | 64 | width: '130', |
| 65 | render: (h, scope) => { | 65 | render: (h, scope) => { |
| 66 | return ( | 66 | return ( |
| 67 | <div> | 67 | <div> |
| 68 | <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.djbdisposition(scope.row) }}>配置</el-button> | 68 | <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.djbdisposition(scope.row) }}>配置</el-button> |
| 69 | <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.editClick(scope.row) }}>修改</el-button> | 69 | <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.editClick(scope.row) }}>修改</el-button> |
| 70 | </div> | 70 | </div> |
| 71 | ) | 71 | ) | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-08-09 10:09:12 | 4 | * @LastEditTime: 2023-09-14 10:02:08 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
| ... | @@ -89,8 +89,8 @@ | ... | @@ -89,8 +89,8 @@ |
| 89 | editClick (row) { | 89 | editClick (row) { |
| 90 | this.$popupDialog("其他及附记模板", "system/qtjfjmb/components/editDialog", row, '60%') | 90 | this.$popupDialog("其他及附记模板", "system/qtjfjmb/components/editDialog", row, '60%') |
| 91 | }, | 91 | }, |
| 92 | djbdisposition(row){ | 92 | djbdisposition (row) { |
| 93 | this.$popupDialog("配置登记簿打印字段", "system/qtjfjmb/components/djbdisposition", row, '60%') | 93 | this.$popupDialog("配置登记簿打印字段", "system/qtjfjmb/components/djbdispositions", row, '70%') |
| 94 | } | 94 | } |
| 95 | } | 95 | } |
| 96 | } | 96 | } | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-13 13:48:47 | 4 | * @LastEditTime: 2023-09-13 15:58:06 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="clmlmx-box"> | 7 | <div class="clmlmx-box"> |
| ... | @@ -182,7 +182,7 @@ | ... | @@ -182,7 +182,7 @@ |
| 182 | handleSubmit () { | 182 | handleSubmit () { |
| 183 | this.loading = true | 183 | this.loading = true |
| 184 | store.dispatch('user/reWorkFresh', false) | 184 | store.dispatch('user/reWorkFresh', false) |
| 185 | updateClml(this.tableData, this.formData.bsmSldy).then(res => { | 185 | updateClml(this.tableData, this.formData.bsmSldy, Vue.prototype.$currentRoute.query.bsmSlsq).then(res => { |
| 186 | this.loading = false | 186 | this.loading = false |
| 187 | if (res.code == 200) { | 187 | if (res.code == 200) { |
| 188 | this.$message({ | 188 | this.$message({ | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-08-28 12:53:50 | 4 | * @LastEditTime: 2023-09-13 17:08:19 |
| 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"> |
| ... | @@ -22,7 +22,6 @@ | ... | @@ -22,7 +22,6 @@ |
| 22 | </el-form-item> | 22 | </el-form-item> |
| 23 | </el-col> | 23 | </el-col> |
| 24 | </el-row> | 24 | </el-row> |
| 25 | |||
| 26 | <lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange" | 25 | <lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange" |
| 27 | :data="tableData.data" | 26 | :data="tableData.data" |
| 28 | :pagination="false" | 27 | :pagination="false" |
| ... | @@ -37,7 +36,7 @@ | ... | @@ -37,7 +36,7 @@ |
| 37 | <el-col :span="6"> | 36 | <el-col :span="6"> |
| 38 | <el-form-item label="证件类型" prop="lzrzjlb"> | 37 | <el-form-item label="证件类型" prop="lzrzjlb"> |
| 39 | <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择"> | 38 | <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择"> |
| 40 | <el-option v-for="item in zjzlData" :key="item.dcode" :label="item.dname" :value="item.dcode"> | 39 | <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode"> |
| 41 | </el-option> | 40 | </el-option> |
| 42 | </el-select> | 41 | </el-select> |
| 43 | </el-form-item> | 42 | </el-form-item> |
| ... | @@ -63,7 +62,7 @@ | ... | @@ -63,7 +62,7 @@ |
| 63 | import Vue from 'vue' | 62 | import Vue from 'vue' |
| 64 | import store from '@/store/index.js' | 63 | import store from '@/store/index.js' |
| 65 | import table from "@/utils/mixin/table"; | 64 | import table from "@/utils/mixin/table"; |
| 66 | import { getUnclaimedBdcqz, issueCertificate } from "@/api/bdcqz.js"; | 65 | import { getUnclaimedBdcqz, issueCertificate,getBdcqzQlr } from "@/api/bdcqz.js"; |
| 67 | import { datas } from "../../javascript/fzxxdata"; | 66 | import { datas } from "../../javascript/fzxxdata"; |
| 68 | import { log } from 'bpmn-js-token-simulation'; | 67 | import { log } from 'bpmn-js-token-simulation'; |
| 69 | export default { | 68 | export default { |
| ... | @@ -78,7 +77,7 @@ | ... | @@ -78,7 +77,7 @@ |
| 78 | mixins: [table], | 77 | mixins: [table], |
| 79 | data () { | 78 | data () { |
| 80 | return { | 79 | return { |
| 81 | zjzlData: store.getters.dictData['A30'], | 80 | lzrzjlbData: store.getters.dictData['A30'], |
| 82 | ruleForm: { | 81 | ruleForm: { |
| 83 | fzrmc: '', | 82 | fzrmc: '', |
| 84 | fzsj: '', | 83 | fzsj: '', |
| ... | @@ -134,6 +133,21 @@ | ... | @@ -134,6 +133,21 @@ |
| 134 | this.ruleForm.fzsj = res.result.fzsj | 133 | this.ruleForm.fzsj = res.result.fzsj |
| 135 | this.ruleForm.fzsl = res.result.fzsl | 134 | this.ruleForm.fzsl = res.result.fzsl |
| 136 | this.ruleForm.bdcqzList = res.result.list; | 135 | this.ruleForm.bdcqzList = res.result.list; |
| 136 | res.result.list.length && this.getQlr(res.result.list[0].bsmBdcqz) | ||
| 137 | } | ||
| 138 | }) | ||
| 139 | }, | ||
| 140 | /** | ||
| 141 | * @description: 获取权利人信息 | ||
| 142 | * @author: renchao | ||
| 143 | */ | ||
| 144 | getQlr (bsmBdcqz) { | ||
| 145 | getBdcqzQlr(bsmBdcqz).then(res => { | ||
| 146 | if (res.code === 200) { | ||
| 147 | this.ruleForm.lzrxm = res.result.qlrmc; | ||
| 148 | this.ruleForm.lzrzjlb = res.result.zjzl; | ||
| 149 | this.ruleForm.lzrzjh = res.result.zjh; | ||
| 150 | this.ruleForm.lzrdh = res.result.dh; | ||
| 137 | } | 151 | } |
| 138 | }) | 152 | }) |
| 139 | }, | 153 | }, | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-07-18 14:26:54 | 4 | * @LastEditTime: 2023-09-14 16:06:51 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <canvas id="mxcad"> | 7 | <div style="width:90%;height:100%;"> |
| 8 | </canvas> | 8 | <canvas id="mxcad" style="width:90%;height:80%; position: relative;top:0"> |
| 9 | </canvas> | ||
| 10 | </div> | ||
| 9 | </template> | 11 | </template> |
| 10 | <script> | 12 | <script> |
| 11 | import Mx from "mxdraw" | 13 | import Mx from "mxdraw" |
| ... | @@ -18,14 +20,11 @@ | ... | @@ -18,14 +20,11 @@ |
| 18 | Mx.MxFun.createMxObject({ | 20 | Mx.MxFun.createMxObject({ |
| 19 | canvasId: "mxcad", // canvas元素的id | 21 | canvasId: "mxcad", // canvas元素的id |
| 20 | cadFile: "buf/hhhh.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸 | 22 | cadFile: "buf/hhhh.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸 |
| 21 | // cadFile: "test2.dwg", // socket通信方式请直接提供图纸名称 如:text.dwg | ||
| 22 | callback: (mxDraw, { | 23 | callback: (mxDraw, { |
| 23 | canvas, | 24 | canvas, |
| 24 | canvasParent | 25 | canvasParent |
| 25 | }) => { | 26 | }) => { |
| 26 | // 可以拿到canvas元素和它的父级元素 | 27 | // 可以拿到canvas元素和它的父级元素 |
| 27 | console.log(canvas, canvasParent) | ||
| 28 | console.log(mxDraw) | ||
| 29 | // 拿到图层数据 | 28 | // 拿到图层数据 |
| 30 | mxDraw.addEvent('uiSetLayerData', (listLayer) => { | 29 | mxDraw.addEvent('uiSetLayerData', (listLayer) => { |
| 31 | console.log(listLayer) | 30 | console.log(listLayer) | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-13 13:46:03 | 4 | * @LastEditTime: 2023-09-14 11:14:54 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="clmlmx-box"> | 7 | <div class="clmlmx-box"> |
| ... | @@ -15,10 +15,10 @@ | ... | @@ -15,10 +15,10 @@ |
| 15 | </div> | 15 | </div> |
| 16 | </template> | 16 | </template> |
| 17 | <script> | 17 | <script> |
| 18 | import Vue from 'vue' | ||
| 19 | import store from '@/store/index.js' | 18 | import store from '@/store/index.js' |
| 19 | import Sortable from 'sortablejs' | ||
| 20 | import { ywPopupCacel } from "@/utils/popup.js"; | 20 | import { ywPopupCacel } from "@/utils/popup.js"; |
| 21 | import { InitClml, updateClml, deleteSjClml, moveClml } from "@/api/clxx.js"; | 21 | import { editCompanyMaterialList } from "@/api/company.js"; |
| 22 | export default { | 22 | export default { |
| 23 | props: { | 23 | props: { |
| 24 | formData: { | 24 | formData: { |
| ... | @@ -34,31 +34,11 @@ | ... | @@ -34,31 +34,11 @@ |
| 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 ( |
| 61 | <el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input> | 40 | (scope.row.sfxjcl == '1') ? |
| 41 | <el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input> : <span>{scope.row.clmc}</span> | ||
| 62 | ) | 42 | ) |
| 63 | } | 43 | } |
| 64 | }, | 44 | }, |
| ... | @@ -81,24 +61,6 @@ | ... | @@ -81,24 +61,6 @@ |
| 81 | } | 61 | } |
| 82 | }, | 62 | }, |
| 83 | { | 63 | { |
| 84 | label: "份数", | ||
| 85 | width: "50", | ||
| 86 | render: (h, scope) => { | ||
| 87 | return ( | ||
| 88 | <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> | ||
| 89 | ) | ||
| 90 | } | ||
| 91 | }, | ||
| 92 | { | ||
| 93 | label: "扫描时间", | ||
| 94 | width: "140", | ||
| 95 | render: (h, scope) => { | ||
| 96 | return ( | ||
| 97 | <span>{scope.row.sjsj}</span> | ||
| 98 | ) | ||
| 99 | } | ||
| 100 | }, | ||
| 101 | { | ||
| 102 | label: "页数", | 64 | label: "页数", |
| 103 | width: "80", | 65 | width: "80", |
| 104 | render: (h, scope) => { | 66 | render: (h, scope) => { |
| ... | @@ -118,21 +80,6 @@ | ... | @@ -118,21 +80,6 @@ |
| 118 | }, | 80 | }, |
| 119 | }, | 81 | }, |
| 120 | { | 82 | { |
| 121 | label: "是否新建材料", | ||
| 122 | width: "80", | ||
| 123 | render: (h, scope) => { | ||
| 124 | if (scope.row.sfxjcl && scope.row.sfxjcl == '1') { | ||
| 125 | return ( | ||
| 126 | <span>是</span> | ||
| 127 | ); | ||
| 128 | } else { | ||
| 129 | return ( | ||
| 130 | <span>否</span> | ||
| 131 | ); | ||
| 132 | } | ||
| 133 | }, | ||
| 134 | }, | ||
| 135 | { | ||
| 136 | label: "操作", | 83 | label: "操作", |
| 137 | width: "100", | 84 | width: "100", |
| 138 | render: (h, scope) => { | 85 | render: (h, scope) => { |
| ... | @@ -140,7 +87,7 @@ | ... | @@ -140,7 +87,7 @@ |
| 140 | <el-button | 87 | <el-button |
| 141 | type="text" | 88 | type="text" |
| 142 | icon="el-icon-delete" | 89 | icon="el-icon-delete" |
| 143 | disabled={!(scope.row.count == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation} | 90 | disabled={scope.row.count != 0} |
| 144 | onClick={() => { | 91 | onClick={() => { |
| 145 | this.handleDelete(scope.$index, scope.row); | 92 | this.handleDelete(scope.$index, scope.row); |
| 146 | }} | 93 | }} |
| ... | @@ -157,6 +104,7 @@ | ... | @@ -157,6 +104,7 @@ |
| 157 | }, | 104 | }, |
| 158 | mounted () { | 105 | mounted () { |
| 159 | this.initSort() | 106 | this.initSort() |
| 107 | this.tableData = _.cloneDeep(this.formData.data) | ||
| 160 | }, | 108 | }, |
| 161 | beforeDestroy () { | 109 | beforeDestroy () { |
| 162 | if (this.sortable) { | 110 | if (this.sortable) { |
| ... | @@ -176,79 +124,36 @@ | ... | @@ -176,79 +124,36 @@ |
| 176 | handleCancel () { | 124 | handleCancel () { |
| 177 | ywPopupCacel() | 125 | ywPopupCacel() |
| 178 | }, | 126 | }, |
| 179 | handleAdd () { | ||
| 180 | this.tableData.push({ | ||
| 181 | clmc: '', | ||
| 182 | cllx: '1', | ||
| 183 | sjsl: '', | ||
| 184 | smzt: '', | ||
| 185 | count: 0 | ||
| 186 | }) | ||
| 187 | }, | ||
| 188 | handleSubmit () { | 127 | handleSubmit () { |
| 189 | this.loading = true | 128 | this.loading = true |
| 190 | store.dispatch('user/reWorkFresh', false) | 129 | store.dispatch('user/reWorkFresh', false) |
| 191 | updateClml(this.tableData).then(res => { | 130 | editCompanyMaterialList(this.tableData, this.formData.bsmCompany).then(res => { |
| 192 | this.loading = false | 131 | this.loading = false |
| 193 | if (res.code == 200) { | 132 | if (res.code == 200) { |
| 194 | this.$message({ | 133 | this.$message({ |
| 195 | message: '保存成功', | 134 | message: '保存成功', |
| 196 | type: 'success' | 135 | type: 'success' |
| 197 | }) | 136 | }) |
| 198 | this.$popupCacel() | ||
| 199 | store.dispatch('user/reWorkFresh', true) | 137 | store.dispatch('user/reWorkFresh', true) |
| 138 | ywPopupCacel() | ||
| 200 | } | 139 | } |
| 201 | }).catch(() => { | 140 | }).catch(() => { |
| 202 | this.loading = false | 141 | this.loading = false |
| 203 | }) | 142 | }) |
| 204 | }, | 143 | }, |
| 205 | /** | 144 | /** |
| 206 | * @description: 材料目录明细初始化 | ||
| 207 | * @author: renchao | ||
| 208 | */ | ||
| 209 | clmlInitList () { | ||
| 210 | return new Promise(resolve => { | ||
| 211 | this.unitData = this.$parent.unitData; | ||
| 212 | var formdata = new FormData(); | ||
| 213 | formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq); | ||
| 214 | InitClml(formdata).then((res) => { | ||
| 215 | if (res.code == 200) { | ||
| 216 | resolve(res.code) | ||
| 217 | if (res.result && res.result.length > 0) { | ||
| 218 | this.tableData = res.result; | ||
| 219 | } else { | ||
| 220 | this.tableData = [] | ||
| 221 | } | ||
| 222 | } else { | ||
| 223 | this.$message.error(res.message) | ||
| 224 | } | ||
| 225 | }) | ||
| 226 | }) | ||
| 227 | }, | ||
| 228 | /** | ||
| 229 | * @description: 材料目录删除 | 145 | * @description: 材料目录删除 |
| 230 | * @param {*} index | 146 | * @param {*} index |
| 231 | * @param {*} row | 147 | * @param {*} row |
| 232 | * @author: renchao | 148 | * @author: renchao |
| 233 | */ | 149 | */ |
| 234 | handleDelete (index, row) { | 150 | handleDelete (index, row) { |
| 235 | let that = this | ||
| 236 | this.$confirm('此操作将永久删除该 是否继续?', '提示', { | 151 | this.$confirm('此操作将永久删除该 是否继续?', '提示', { |
| 237 | confirmButtonText: '确定', | 152 | confirmButtonText: '确定', |
| 238 | cancelButtonText: '取消', | 153 | cancelButtonText: '取消', |
| 239 | type: 'warning' | 154 | type: 'warning' |
| 240 | }).then(() => { | 155 | }).then(() => { |
| 241 | deleteSjClml({ sjBsm: row.bsmSj }).then(async (res) => { | 156 | this.tableData.splice(index, 1); |
| 242 | if (res.code == 200) { | ||
| 243 | let res = await that.clmlInitList() | ||
| 244 | if (res == 200) { | ||
| 245 | that.$message({ | ||
| 246 | message: "删除成功", | ||
| 247 | type: "success" | ||
| 248 | }) | ||
| 249 | } | ||
| 250 | } | ||
| 251 | }) | ||
| 252 | }).catch(() => { | 157 | }).catch(() => { |
| 253 | this.$message({ | 158 | this.$message({ |
| 254 | type: 'info', | 159 | type: 'info', | ... | ... |
| 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-11 13:52:42 | 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,8 +90,22 @@ | ... | @@ -90,8 +90,22 @@ |
| 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 | }, |
| 96 | methods: { | 110 | methods: { |
| 97 | /** | 111 | /** |
| ... | @@ -274,6 +288,7 @@ | ... | @@ -274,6 +288,7 @@ |
| 274 | store.dispatch("user/reWorkFresh", false); | 288 | store.dispatch("user/reWorkFresh", false); |
| 275 | ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", { | 289 | ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", { |
| 276 | data: this.tableData, | 290 | data: this.tableData, |
| 291 | bsmCompany: this.formData.bsmCompany | ||
| 277 | }, "60%", true, false) | 292 | }, "60%", true, false) |
| 278 | }, | 293 | }, |
| 279 | //设置tableData | 294 | //设置tableData | ... | ... |
| 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: ssq | 3 | * @Autor: ssq |
| 4 | * @LastEditTime: 2023-09-12 09:55:25 | 4 | * @LastEditTime: 2023-09-13 14:41:34 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="slxx"> | 7 | <div class="slxx"> |
| ... | @@ -69,7 +69,7 @@ | ... | @@ -69,7 +69,7 @@ |
| 69 | </el-col> | 69 | </el-col> |
| 70 | <el-col :span="8"> | 70 | <el-col :span="8"> |
| 71 | <el-form-item label="坐落:"> | 71 | <el-form-item label="坐落:"> |
| 72 | <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input> | 72 | <el-input maxlength="100" disabled v-model="ruleForm.sldy.zl"></el-input> |
| 73 | </el-form-item> | 73 | </el-form-item> |
| 74 | </el-col> | 74 | </el-col> |
| 75 | </el-row> | 75 | </el-row> |
| ... | @@ -103,18 +103,46 @@ | ... | @@ -103,18 +103,46 @@ |
| 103 | </el-col> | 103 | </el-col> |
| 104 | </el-row> | 104 | </el-row> |
| 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 |
| ... | @@ -298,6 +326,7 @@ | ... | @@ -298,6 +326,7 @@ |
| 298 | disabled: true, | 326 | disabled: true, |
| 299 | tdytOption: [], | 327 | tdytOption: [], |
| 300 | czrOptions: [], | 328 | czrOptions: [], |
| 329 | mjdw: "1", | ||
| 301 | czr: "", | 330 | czr: "", |
| 302 | ruleForm: { | 331 | ruleForm: { |
| 303 | flow: { | 332 | flow: { | ... | ... |
| ... | @@ -69,7 +69,7 @@ | ... | @@ -69,7 +69,7 @@ |
| 69 | </el-col> | 69 | </el-col> |
| 70 | <el-col :span="8"> | 70 | <el-col :span="8"> |
| 71 | <el-form-item label="坐落:"> | 71 | <el-form-item label="坐落:"> |
| 72 | <el-input maxlength="100" v-model="ruleForm.sldy.zl" disabled></el-input> | 72 | <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input> |
| 73 | </el-form-item> | 73 | </el-form-item> |
| 74 | </el-col> | 74 | </el-col> |
| 75 | </el-row> | 75 | </el-row> | ... | ... |
| ... | @@ -37,7 +37,7 @@ | ... | @@ -37,7 +37,7 @@ |
| 37 | </div> | 37 | </div> |
| 38 | <!-- 表格 --> | 38 | <!-- 表格 --> |
| 39 | <div class="from-clues-content loadingtext"> | 39 | <div class="from-clues-content loadingtext"> |
| 40 | 国有房屋变更信息 | 40 | 预告买卖登记信息 |
| 41 | <el-table | 41 | <el-table |
| 42 | :data="tableData.data" | 42 | :data="tableData.data" |
| 43 | height="210" | 43 | height="210" |
| ... | @@ -168,7 +168,7 @@ | ... | @@ -168,7 +168,7 @@ |
| 168 | @current-change="handleCurrentChange"></el-pagination> | 168 | @current-change="handleCurrentChange"></el-pagination> |
| 169 | </div> | 169 | </div> |
| 170 | <div class="from-clues-content loadingtext"> | 170 | <div class="from-clues-content loadingtext"> |
| 171 | 抵押变更信息 | 171 | 预告抵押信息 |
| 172 | <lb-table ref="table" :pagination="false" :calcHeight="500" :column="tableData.columns" | 172 | <lb-table ref="table" :pagination="false" :calcHeight="500" :column="tableData.columns" |
| 173 | :data="tableData.dataList"> | 173 | :data="tableData.dataList"> |
| 174 | </lb-table> | 174 | </lb-table> |
| ... | @@ -185,10 +185,10 @@ | ... | @@ -185,10 +185,10 @@ |
| 185 | import store from '@/store/index.js' | 185 | import store from '@/store/index.js' |
| 186 | import table from "@/utils/mixin/table"; | 186 | import table from "@/utils/mixin/table"; |
| 187 | import { ywPopupDialog } from "@/utils/popup.js"; | 187 | import { ywPopupDialog } from "@/utils/popup.js"; |
| 188 | import { datas, sendThis } from "../javascript/selectFwbjDybgSplitMerge.js"; | 188 | import { datas, sendThis } from "../javascript/selectYgdy.js"; |
| 189 | import { defaultParameters } from "../javascript/publicDefaultPar.js"; | 189 | import { defaultParameters } from "../javascript/publicDefaultPar.js"; |
| 190 | import { selectYgdj200, selectDiyaq } from "@/api/ywsq.js"; | 190 | import { selectYgdj200, selectYgdy } from "@/api/ywsq.js"; |
| 191 | import { startBusinessFlow } from "@/api/workFlow.js"; | 191 | import { startTogetherFlow } from "@/api/workFlow.js"; |
| 192 | export default { | 192 | export default { |
| 193 | mixins: [table, jump], | 193 | mixins: [table, jump], |
| 194 | props: { | 194 | props: { |
| ... | @@ -266,7 +266,7 @@ | ... | @@ -266,7 +266,7 @@ |
| 266 | getCurrentRow (row) { | 266 | getCurrentRow (row) { |
| 267 | this.radioVal = row.bdcdyh; | 267 | this.radioVal = row.bdcdyh; |
| 268 | this.bdcdysz = [row] | 268 | this.bdcdysz = [row] |
| 269 | selectDiyaq({ bdcdyh: this.radioVal, currentPage: 1, pageSize: 10 }).then((res) => { | 269 | selectYgdy({ bdcdyh: this.radioVal, currentPage: 1, pageSize: 10 }).then((res) => { |
| 270 | if (res.code === 200) { | 270 | if (res.code === 200) { |
| 271 | this.tableData.dataList = res.result.records | 271 | this.tableData.dataList = res.result.records |
| 272 | this.bdcdysz = [this.bdcdysz[0], ...this.tableData.dataList] | 272 | this.bdcdysz = [this.bdcdysz[0], ...this.tableData.dataList] |
| ... | @@ -305,7 +305,7 @@ | ... | @@ -305,7 +305,7 @@ |
| 305 | */ | 305 | */ |
| 306 | submitForm () { | 306 | submitForm () { |
| 307 | this.loading = true | 307 | this.loading = true |
| 308 | startBusinessFlow({ | 308 | startTogetherFlow({ |
| 309 | bsmSqyw: this.sqywInfo.bsmSqyw, | 309 | bsmSqyw: this.sqywInfo.bsmSqyw, |
| 310 | bdcdysz: this.bdcdysz, | 310 | bdcdysz: this.bdcdysz, |
| 311 | }).then((res) => { | 311 | }).then((res) => { | ... | ... |
| ... | @@ -45,6 +45,17 @@ class data extends filter { | ... | @@ -45,6 +45,17 @@ class data extends filter { |
| 45 | } | 45 | } |
| 46 | }, | 46 | }, |
| 47 | { | 47 | { |
| 48 | label: "业务号", | ||
| 49 | width: '120', | ||
| 50 | render: (h, scope) => { | ||
| 51 | return ( | ||
| 52 | <el-tooltip effect="dark" content={scope.row.ywh} placement="top" popper-class="tooltip-width"> | ||
| 53 | <span class="ellipsis-table"> {scope.row.ywh}</span> | ||
| 54 | </el-tooltip> | ||
| 55 | ) | ||
| 56 | } | ||
| 57 | }, | ||
| 58 | { | ||
| 48 | label: "权利类型", | 59 | label: "权利类型", |
| 49 | width: '120', | 60 | width: '120', |
| 50 | render: (h, scope) => { | 61 | render: (h, scope) => { | ... | ... |
| ... | @@ -3,6 +3,9 @@ export function queueDjywmc (djywbm, djqxbm) { | ... | @@ -3,6 +3,9 @@ export function queueDjywmc (djywbm, djqxbm) { |
| 3 | if (djqxbm == "A0320099" || djqxbm == "A0330099") { | 3 | if (djqxbm == "A0320099" || djqxbm == "A0330099") { |
| 4 | return "selectJsydsyqSplitMerge"; | 4 | return "selectJsydsyqSplitMerge"; |
| 5 | } | 5 | } |
| 6 | if (djqxbm == "A37100S2") { | ||
| 7 | return "selectYgdy"; | ||
| 8 | } | ||
| 6 | if (djqxbm == "DJBBL001") { | 9 | if (djqxbm == "DJBBL001") { |
| 7 | return "selectDjbbl"; | 10 | return "selectDjbbl"; |
| 8 | } | 11 | } |
| ... | @@ -89,12 +92,11 @@ export function queueDjywmc (djywbm, djqxbm) { | ... | @@ -89,12 +92,11 @@ export function queueDjywmc (djywbm, djqxbm) { |
| 89 | case "B41400": //预告抵押注销 | 92 | case "B41400": //预告抵押注销 |
| 90 | vm = "selectYgdy"; | 93 | vm = "selectYgdy"; |
| 91 | break; | 94 | break; |
| 92 | case "C40100": //一并申请首次 | 95 | case "C40100": //预告买卖抵押首次一并申请 |
| 93 | vm = "selectYbsc"; | 96 | vm = "selectYbsc"; |
| 94 | break; | 97 | break; |
| 95 | case "C40300": //一并申请变更 | 98 | case "C40300": //预告买卖变更+预告抵押变更一并申请 |
| 96 | case "C40400": //一并申请注销 | 99 | case "C40400": //预告买卖注销+预告抵押注销一并申请 |
| 97 | // vm = "selectYbbg"; | ||
| 98 | vm = "selectYbbgSplitMerge" | 100 | vm = "selectYbbgSplitMerge" |
| 99 | break; | 101 | break; |
| 100 | case "C04371": //一并国有房屋转移 | 102 | case "C04371": //一并国有房屋转移 | ... | ... |
-
Please register or sign in to post a comment