Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev
Showing
9 changed files
with
61 additions
and
17 deletions
| 1 | /* | 1 | /* |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-05-17 10:32:45 | 4 | * @LastEditTime: 2023-09-20 10:24:29 |
| 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')) |
| ... | @@ -108,3 +108,19 @@ export function sjClmxDelete (bsmClmx) { | ... | @@ -108,3 +108,19 @@ export function sjClmxDelete (bsmClmx) { |
| 108 | method: 'delete' | 108 | method: 'delete' |
| 109 | }) | 109 | }) |
| 110 | } | 110 | } |
| 111 | |||
| 112 | |||
| 113 | /** | ||
| 114 | * @description: 获取自然幢列表 | ||
| 115 | * @param {*} data | ||
| 116 | * @author: renchao | ||
| 117 | */ | ||
| 118 | export function getZrzListByBsmSlsq (params) { | ||
| 119 | return request({ | ||
| 120 | url: SERVER.SERVERAPI + '/rest/ywbl/zjgcdy/getZrzListByBsmSlsq', | ||
| 121 | method: 'get', | ||
| 122 | params | ||
| 123 | }) | ||
| 124 | } | ||
| 125 | |||
| 126 | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | /* | 2 | /* |
| 3 | * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器 | 3 | * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器 |
| 4 | * @Autor: renchao | 4 | * @Autor: renchao |
| 5 | * @LastEditTime: 2023-08-16 15:16:49 | 5 | * @LastEditTime: 2023-09-20 14:20:39 |
| 6 | */ | 6 | */ |
| 7 | import axios from 'axios' | 7 | import axios from 'axios' |
| 8 | import Router from '@/router' | 8 | import Router from '@/router' |
| ... | @@ -77,7 +77,7 @@ service.interceptors.response.use( | ... | @@ -77,7 +77,7 @@ service.interceptors.response.use( |
| 77 | Router.replace({ | 77 | Router.replace({ |
| 78 | path: '/login', | 78 | path: '/login', |
| 79 | query: { | 79 | query: { |
| 80 | redirect: Router.currentRoute.value.fullPath | 80 | redirect: Router.currentRoute.fullPath |
| 81 | } | 81 | } |
| 82 | }) | 82 | }) |
| 83 | return false | 83 | return false | ... | ... |
This diff is collapsed.
Click to expand it.
| ... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
| 19 | }}</el-checkbox> | 19 | }}</el-checkbox> |
| 20 | </p> | 20 | </p> |
| 21 | <el-button type="primary" class="save-btn" v-if="!onlyShow && showSave" @click="saveLpb">保存</el-button> | 21 | <el-button type="primary" class="save-btn" v-if="!onlyShow && showSave" @click="saveLpb">保存</el-button> |
| 22 | <el-button type="primary" class="save-btn" v-if="!onlyShow" @click="submitForm" :loading="loading">发起申请</el-button> | 22 | <el-button type="primary" class="save-btn" v-if="!onlyShow && !showSave" @click="submitForm" :loading="loading">发起申请</el-button> |
| 23 | <!-- 右键菜单 --> | 23 | <!-- 右键菜单 --> |
| 24 | <ul | 24 | <ul |
| 25 | v-show="lpbChVisible" | 25 | v-show="lpbChVisible" | ... | ... |
src/views/lpb/zjgcdy.vue
0 → 100644
This diff is collapsed.
Click to expand it.
| ... | @@ -41,11 +41,24 @@ | ... | @@ -41,11 +41,24 @@ |
| 41 | { | 41 | { |
| 42 | prop: "bdcdyh", | 42 | prop: "bdcdyh", |
| 43 | label: "不动产单元号", | 43 | label: "不动产单元号", |
| 44 | width: '250', | ||
| 45 | }, | ||
| 46 | { | ||
| 47 | prop: "qllxmc", | ||
| 48 | label: "权利类型", | ||
| 49 | }, | ||
| 50 | { | ||
| 51 | prop: "jzwmc", | ||
| 52 | label: "建筑物名称", | ||
| 53 | }, | ||
| 54 | { | ||
| 55 | prop: "xmmc", | ||
| 56 | label: "项目名称", | ||
| 44 | }, | 57 | }, |
| 45 | { | 58 | { |
| 46 | prop: "zl", | 59 | prop: "zl", |
| 47 | label: "坐落", | 60 | label: "坐落", |
| 48 | }, | 61 | } |
| 49 | ], | 62 | ], |
| 50 | dataList: [], | 63 | dataList: [], |
| 51 | selectBdcdy: [], | 64 | selectBdcdy: [], | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-18 11:11:19 | 4 | * @LastEditTime: 2023-09-20 16:56:46 |
| 5 | */ | 5 | */ |
| 6 | import { getPrintTemplateByCode } from "@/api/print"; | 6 | import { getPrintTemplateByCode } from "@/api/print"; |
| 7 | import { uploadUndo } from "@/api/clxx"; | 7 | import { uploadUndo } from "@/api/clxx"; |
| ... | @@ -157,20 +157,30 @@ export default { | ... | @@ -157,20 +157,30 @@ export default { |
| 157 | ) | 157 | ) |
| 158 | break; | 158 | break; |
| 159 | case "B8": | 159 | case "B8": |
| 160 | getZrzbsmList(this.bsmSlsq).then((res) => { | 160 | !window.djlx && getZrzbsmList(this.bsmSlsq).then((res) => { |
| 161 | if (res.code === 200) { | 161 | if (res.code === 200) { |
| 162 | this.$popupDialog('楼盘表', 'lpb/index', { | 162 | this.$popupDialog('楼盘表', 'lpb/index', { |
| 163 | bsm: res.result[0], | 163 | bsm: res.result[0], |
| 164 | onlyShow: false, | 164 | onlyShow: false, |
| 165 | unitData: window.unitData | 165 | unitData: window.unitData, |
| 166 | bsmSlsq:this.bsmSlsq, | ||
| 167 | showSave:true, | ||
| 168 | djlx: window.djlx | ||
| 166 | }, '90%', true) | 169 | }, '90%', true) |
| 167 | } else { | 170 | } else { |
| 168 | this.$message.error(res.message) | 171 | this.$message.error(res.message) |
| 169 | } | 172 | } |
| 170 | }) | 173 | }) |
| 171 | .catch((err) => { | 174 | .catch((err) => { |
| 172 | this.$message.error(err) | 175 | this.$message.error(err) |
| 173 | }); | 176 | }); |
| 177 | window.djlx && this.$popupDialog('楼盘表', 'lpb/zjgcdy', { | ||
| 178 | onlyShow: false, | ||
| 179 | unitData: window.unitData, | ||
| 180 | bsmSlsq:this.bsmSlsq, | ||
| 181 | showSave:true, | ||
| 182 | djlx: window.djlx | ||
| 183 | }, '90%', true) | ||
| 174 | break; | 184 | break; |
| 175 | // 图形定位 | 185 | // 图形定位 |
| 176 | case "B-TXDW": | 186 | case "B-TXDW": | ... | ... |
| ... | @@ -342,6 +342,8 @@ | ... | @@ -342,6 +342,8 @@ |
| 342 | this.loading = false | 342 | this.loading = false |
| 343 | if (res.code === 200 && res.result) { | 343 | if (res.code === 200 && res.result) { |
| 344 | this.ruleForm = res.result; | 344 | this.ruleForm = res.result; |
| 345 | window.djlx = res.result.sldy.djlx | ||
| 346 | this.czrOptions = this.ruleForm.qlrList; | ||
| 345 | this.ruleForm.qlrList.forEach((item) => { | 347 | this.ruleForm.qlrList.forEach((item) => { |
| 346 | item.id = item.bsmSqr | 348 | item.id = item.bsmSqr |
| 347 | if (item.sfczr == '1') { | 349 | if (item.sfczr == '1') { | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-13 10:01:27 | 4 | * @LastEditTime: 2023-09-20 17:08:30 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <!-- 主体权利信息查询 --> | 7 | <!-- 主体权利信息查询 --> |
| ... | @@ -38,7 +38,7 @@ | ... | @@ -38,7 +38,7 @@ |
| 38 | </div> | 38 | </div> |
| 39 | <!-- 表格 --> | 39 | <!-- 表格 --> |
| 40 | <div class="loadingtext"> | 40 | <div class="loadingtext"> |
| 41 | <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="210" | 41 | <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="this.zrzbsm ? 390 : 290" |
| 42 | :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select" | 42 | :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select" |
| 43 | @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns" | 43 | @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns" |
| 44 | :data="tableData.data"> | 44 | :data="tableData.data"> |
| ... | @@ -52,7 +52,7 @@ | ... | @@ -52,7 +52,7 @@ |
| 52 | </template> | 52 | </template> |
| 53 | <script> | 53 | <script> |
| 54 | import store from '@/store/index.js' | 54 | import store from '@/store/index.js' |
| 55 | import { ywPopupDialog,ywPopupCacel } from "@/utils/popup.js"; | 55 | import { ywPopupDialog,popupCacel } from "@/utils/popup.js"; |
| 56 | import { datas, sendThis } from "../javascript/selectAllHInfo.js"; | 56 | import { datas, sendThis } from "../javascript/selectAllHInfo.js"; |
| 57 | import { defaultParameters } from "../javascript/publicDefaultPar.js"; | 57 | import { defaultParameters } from "../javascript/publicDefaultPar.js"; |
| 58 | import table from "@/utils/mixin/table"; | 58 | import table from "@/utils/mixin/table"; |
| ... | @@ -64,7 +64,10 @@ | ... | @@ -64,7 +64,10 @@ |
| 64 | props: { | 64 | props: { |
| 65 | isJump: { type: Boolean, default: false }, | 65 | isJump: { type: Boolean, default: false }, |
| 66 | sqywInfo: { type: Object, default: () => { } }, | 66 | sqywInfo: { type: Object, default: () => { } }, |
| 67 | 67 | zrzbsm: { | |
| 68 | type: String, | ||
| 69 | default: "", | ||
| 70 | }, | ||
| 68 | }, | 71 | }, |
| 69 | data () { | 72 | data () { |
| 70 | return { | 73 | return { |
| ... | @@ -88,7 +91,7 @@ | ... | @@ -88,7 +91,7 @@ |
| 88 | */ | 91 | */ |
| 89 | queryClick () { | 92 | queryClick () { |
| 90 | this.$startLoading(); | 93 | this.$startLoading(); |
| 91 | this.queryForm.zrzbsm = this.sqywInfo.bsm; | 94 | this.queryForm.zrzbsm = this.zrzbsm || this.sqywInfo.bsm; |
| 92 | // this.queryForm.zrzbsm = this.sqywInfo.zrzbsm; | 95 | // this.queryForm.zrzbsm = this.sqywInfo.zrzbsm; |
| 93 | selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { | 96 | selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { |
| 94 | this.$endLoading(); | 97 | this.$endLoading(); |
| ... | @@ -143,7 +146,7 @@ | ... | @@ -143,7 +146,7 @@ |
| 143 | * @author: renchao | 146 | * @author: renchao |
| 144 | */ | 147 | */ |
| 145 | close(){ | 148 | close(){ |
| 146 | ywPopupCacel() | 149 | popupCacel() |
| 147 | }, | 150 | }, |
| 148 | /** | 151 | /** |
| 149 | * @description: handleSelectionChange | 152 | * @description: handleSelectionChange | ... | ... |
-
Please register or sign in to post a comment