Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
e42974c7 by renchao@pashanhoo.com
Options

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

2 parents ef094ce7 48321a3b
Inline Side-by-side
Showing 7 changed files with 143 additions and 58 deletions
1 /* 1 /*
2 * @Description: 楼盘表查询 2 * @Description: 楼盘表查询
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 15:00:43 4 * @LastEditTime: 2023-09-12 10:25:47
5 */ 5 */
6 import request from "@/utils/request"; 6 import request from "@/utils/request";
7 let SERVER = window.config 7 let SERVER = window.config
...@@ -26,10 +26,14 @@ export function getLpZrz (data) { ...@@ -26,10 +26,14 @@ export function getLpZrz (data) {
26 * @param {*} zrzbsm 26 * @param {*} zrzbsm
27 * @author: renchao 27 * @author: renchao
28 */ 28 */
29 export function getLpb (zrzbsm) { 29 export function getLpb (zrzbsm,lx) {
30 return request({ 30 return request({
31 url: "service-lpb/rest/zhcx/lpcx/getLpb?scyclx=0&zrzbsm=" + zrzbsm, 31 url: "service-lpb/rest/zhcx/lpcx/getLpb",
32 method: "get", 32 method: "get",
33 params: {
34 zrzbsm:zrzbsm,
35 scyclx:lx,
36 },
33 }); 37 });
34 } 38 }
35 /** 39 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-01 09:18:29 4 * @LastEditTime: 2023-09-12 16:55:35
5 --> 5 -->
6 <template> 6 <template>
7 <div class="edit"> 7 <div class="edit">
...@@ -20,8 +20,10 @@ ...@@ -20,8 +20,10 @@
20 <lpbContent 20 <lpbContent
21 ref="lpbContent" 21 ref="lpbContent"
22 :zrzbsm="formData.bsm" 22 :zrzbsm="formData.bsm"
23 :scyclx="formData.scyclx"
23 :onlyShow="formData.onlyShow" 24 :onlyShow="formData.onlyShow"
24 :unitData="formData.unitData" 25 :unitData="formData.unitData"
26 :sqywInfo="formData"
25 :key="time"></lpbContent> 27 :key="time"></lpbContent>
26 </div> 28 </div>
27 <!-- 右侧图例 --> 29 <!-- 右侧图例 -->
......
...@@ -12,13 +12,14 @@ ...@@ -12,13 +12,14 @@
12 <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/> 12 <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/>
13 </div> 13 </div>
14 <!-- 自然幢名称 --> 14 <!-- 自然幢名称 -->
15 <p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}"> 15 <!-- <p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}"> -->
16 <el-checkbox @change="zdySelectAll($event)" v-if="!onlyShow">{{ 16 <p class="lpb-xmmc" :style="{ 'border-bottom':'1px solid #e6e6e6'}">
17 <el-checkbox @change="zdySelectAll($event)">{{
17 lpbData.xmmc 18 lpbData.xmmc
18 }}</el-checkbox> 19 }}</el-checkbox>
19 <span v-else>{{lpbData.xmmc}}</span>
20 </p> 20 </p>
21 <el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button> 21 <el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button>
22 <el-button type="primary" class="save-btn" v-else @click="submitForm" :loading="loading">发起申请</el-button>
22 <!-- 右键菜单 --> 23 <!-- 右键菜单 -->
23 <ul 24 <ul
24 v-show="lpbChVisible" 25 v-show="lpbChVisible"
...@@ -35,6 +36,7 @@ import { getLpb } from "@/api/lpcx.js"; ...@@ -35,6 +36,7 @@ import { getLpb } from "@/api/lpcx.js";
35 import chCpn from "./ch.vue"; 36 import chCpn from "./ch.vue";
36 import zdyCpn from "./zdys.vue"; 37 import zdyCpn from "./zdys.vue";
37 import ljzsCpn from "./ljzs.vue"; 38 import ljzsCpn from "./ljzs.vue";
39 import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
38 export default { 40 export default {
39 provide() { 41 provide() {
40 return { 42 return {
...@@ -63,7 +65,15 @@ export default { ...@@ -63,7 +65,15 @@ export default {
63 onlyShow:{ 65 onlyShow:{
64 type: Boolean, 66 type: Boolean,
65 default: true, 67 default: true,
66 } 68 },
69 scyclx: {
70 type: Number,
71 default: 0,
72 },
73 sqywInfo: {
74 type: Object,
75 default: () => { }
76 },
67 }, 77 },
68 data() { 78 data() {
69 return { 79 return {
...@@ -87,11 +97,12 @@ export default { ...@@ -87,11 +97,12 @@ export default {
87 color:'' 97 color:''
88 }, 98 },
89 // 选中户bsm合集 99 // 选中户bsm合集
90 bsmList:[] 100 bsmList:[],
101 loading: false,
91 }; 102 };
92 }, 103 },
93 mounted() { 104 mounted() {
94 this.getLpb(this.zrzbsm); 105 this.scyclx ? this.getLpb(this.zrzbsm,this.scyclx):this.getLpb(this.zrzbsm);
95 window.lpbContent = this; 106 window.lpbContent = this;
96 }, 107 },
97 methods: { 108 methods: {
...@@ -151,13 +162,15 @@ export default { ...@@ -151,13 +162,15 @@ export default {
151 getLpb(zrzbsm, scyclx, actual) { 162 getLpb(zrzbsm, scyclx, actual) {
152 getLpb(zrzbsm, scyclx).then((res) => { 163 getLpb(zrzbsm, scyclx).then((res) => {
153 if (res.code == 200) { 164 if (res.code == 200) {
154 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place")); 165 if(scyclx){
155 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb; 166 if(res.result.syclx == "1") {
156 // this.$nextTick(() => { 167 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
157 // //渲染楼盘表 168 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
158 // this.dataChange(); 169 }
159 // }); 170 }else{
160 console.log(this.lpbData, "this.lpbData"); 171 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
172 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
173 }
161 } else { 174 } else {
162 this.$message({ 175 this.$message({
163 message: res.message, 176 message: res.message,
...@@ -207,10 +220,50 @@ export default { ...@@ -207,10 +220,50 @@ export default {
207 return value1 - value2; 220 return value1 - value2;
208 }; 221 };
209 }, 222 },
223 /**
224 * @description: submitForm
225 * @author: renchao
226 */
227 submitForm () {
228 debugger
229 if (this.bsmList.length == 0) {
230 this.$message.error("请至少选择一条数据");
231 return;
232 }
233 this.loading = true
234 startBusinessFlow({
235 bsmSqyw: this.sqywInfo.bsmSqyw,
236 bdcdysz: this.bsmList,
237 }).then((res) => {
238 this.loading = false
239 if (res.code == 200) {
240 this.$message({
241 showClose: true,
242 message: '发起申请成功',
243 type: 'success'
244 })
245 if (!this.isJump) {
246 this.jump(res.result, this.sqywInfo.djywbm)
247 } else {
248 store.dispatch('user/refreshPage', true);
249 }
250 this.$popupCacel()
251 } else {
252 if (res.result && res.result.length > 0) {
253 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
254 } else {
255 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
256 }
257 }
258 }).catch(() => {
259 this.loading = false
260 })
261 },
210 }, 262 },
211 computed:{ 263 computed:{
212 lpbContentHeight(){ 264 lpbContentHeight(){
213 return this.onlyShow ? 36 : 76 265 // return this.onlyShow ? 36 : 76
266 return 76
214 } 267 }
215 }, 268 },
216 watch: { 269 watch: {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-09-01 10:39:03 3 * @Date: 2023-09-01 10:39:03
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-09-11 15:48:03 5 * @LastEditTime: 2023-09-12 15:12:09
6 * @FilePath: \bdcdj-web\src\views\sjgx\gbmhlgxsjgx\gbmhlgxsjgx.vue 6 * @FilePath: \bdcdj-web\src\views\sjgx\gbmhlgxsjgx\gbmhlgxsjgx.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -85,11 +85,12 @@ ...@@ -85,11 +85,12 @@
85 :style="{ 85 :style="{
86 backgroundColor: 'rgba(' + item.bgColor + ',0.12)', 86 backgroundColor: 'rgba(' + item.bgColor + ',0.12)',
87 border: '1px solid ' + 'rgba(' + item.bgColor + ',0.3)', 87 border: '1px solid ' + 'rgba(' + item.bgColor + ',0.3)',
88 '--hover-color': 'rgba(' + item.bgColor + ',1)'
88 }" 89 }"
89 > 90 >
90 <img :src="item.svg" alt="" /> 91 <img :src="item.svg" alt="" />
91 </div> 92 </div>
92 <p>{{ item.name }}</p> 93 <p>{{ item.interfaceDescription }}</p>
93 </div> 94 </div>
94 </div> 95 </div>
95 <el-dialog 96 <el-dialog
...@@ -200,6 +201,12 @@ export default { ...@@ -200,6 +201,12 @@ export default {
200 comp: "zgfbm", 201 comp: "zgfbm",
201 svg: require("./images/zgfbm.svg"), 202 svg: require("./images/zgfbm.svg"),
202 }, 203 },
204 {
205 name: "未知",
206 bgColor: "109, 114, 120",
207 comp: "",
208 svg: require("./images/unknow.svg"),
209 },
203 ], 210 ],
204 dialogVisible: false, 211 dialogVisible: false,
205 dialogTitle: "", 212 dialogTitle: "",
...@@ -210,10 +217,19 @@ export default { ...@@ -210,10 +217,19 @@ export default {
210 mounted() { 217 mounted() {
211 getSysInterfaceList({ interfaceType: "4",pageSize:100 }).then((res) => { 218 getSysInterfaceList({ interfaceType: "4",pageSize:100 }).then((res) => {
212 if (res.code == 200) { 219 if (res.code == 200) {
213 this.searchType.forEach(item=>{ 220 res.result.records.forEach(i=>{
214 let a = res.result.records.filter(i => i.interfaceService == item.name) 221 let a = this.searchType.filter(item => i.interfaceService == item.name)
215 222 if (a.length) {
223 i.bgColor = a[0].bgColor
224 i.svg = a[0].svg
225 i.comp = a[0].comp
226 }else{
227 i.bgColor = '109, 114, 120'
228 i.svg = require("./images/unknow.svg")
229 i.comp = ''
230 }
216 }) 231 })
232 this.searchType = res.result.records
217 } 233 }
218 }); 234 });
219 }, 235 },
...@@ -225,10 +241,10 @@ export default { ...@@ -225,10 +241,10 @@ export default {
225 * @author: renchao 241 * @author: renchao
226 */ 242 */
227 openDialog(item) { 243 openDialog(item) {
228 this.dialogTitle = item.name; 244 this.dialogTitle = item.interfaceDescription;
229 this.dialogVisible = true;
230 this.dialogComp = (r) => 245 this.dialogComp = (r) =>
231 require.ensure([], () => r(require(`./components/${item.comp}.vue`))); 246 require.ensure([], () => r(require(`./components/${item.comp}.vue`)));
247 item.comp && (this.dialogVisible = true);
232 }, 248 },
233 }, 249 },
234 computed: { 250 computed: {
...@@ -254,6 +270,9 @@ export default { ...@@ -254,6 +270,9 @@ export default {
254 border-radius: 4px; 270 border-radius: 4px;
255 margin: 0 auto; 271 margin: 0 auto;
256 cursor: pointer; 272 cursor: pointer;
273 &:hover{
274 border-color: var(--hover-color)!important;
275 }
257 i { 276 i {
258 text-align: center; 277 text-align: center;
259 line-height: 60px; 278 line-height: 60px;
......
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694481575357" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3080" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M908.91 937.6c0 17.67-14.33 32-32 32H147.09c-17.67 0-32-14.33-32-32V116.19c0-23.52 19.07-42.59 42.59-42.59h544.3l206.93 206.93V937.6z" fill="#B5B5B5" p-id="3081"></path><path d="M495.53 620.39c-37.63 0-44.43 6.79-44.43 43.38 0 37.63 6.8 43.91 44.43 43.91 37.11 0 44.43-6.27 44.43-43.91 0-36.59-7.32-43.38-44.43-43.38zM490.83 335.53c-31.36 0-59.58 3.66-78.92 9.41v64.82c18.29-5.76 42.33-8.89 63.77-8.89 42.33 0 55.4 6.79 55.4 38.15 0 21.95-4.7 31.88-27.7 50.18-30.84 26.65-40.25 42.85-40.25 72.64v23.52h63.77v-12.03c0-17.76 6.28-27.69 38.16-51.22 35.54-26.65 47.04-45.48 47.04-94.08-0.01-73.17-35.55-92.5-121.27-92.5zM700.91 73.6v173.92c0 17.47 14.05 31.7 31.52 31.91l176.48 2.18-208-208.01z" fill="#FFFFFF" p-id="3082"></path></svg>
...\ 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-08-18 13:56:32 4 * @LastEditTime: 2023-09-13 11:19:54
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 </el-form> 61 </el-form>
62 </div> 62 </div>
63 <div class="from-clues-content loadingtext"> 63 <div class="from-clues-content loadingtext">
64 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300" 64 <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
65 :current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange" @select="select" 65 :current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange" @select="select"
66 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns" 66 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
67 :data="zrztableData.data"> 67 :data="zrztableData.data">
...@@ -303,14 +303,11 @@ ...@@ -303,14 +303,11 @@
303 * @author: renchao 303 * @author: renchao
304 */ 304 */
305 handleLpbClick (item) { 305 handleLpbClick (item) {
306 this.$popup('楼盘表', 'lpb/index', { 306 ywPopupDialog('楼盘表', 'lpb/index', {
307 width: '85%',
308 formData: {
309 bsm: item.bsm, 307 bsm: item.bsm,
310 bsmSqyw:this.sqywInfo.bsmSqyw 308 bsmSqyw:this.sqywInfo.bsmSqyw,
311 309 scyclx:1
312 } 310 }, '85%', true,false)
313 })
314 }, 311 },
315 /** 312 /**
316 * @description: select 313 * @description: select
...@@ -335,26 +332,27 @@ ...@@ -335,26 +332,27 @@
335 */ 332 */
336 handleRowClick (row) { 333 handleRowClick (row) {
337 // 自然幢多选，多幢单选 334 // 自然幢多选，多幢单选
335 let refs = 'table1';
338 if (this.activeName == 'dz') { 336 if (this.activeName == 'dz') {
339 const bdcdysz = this.bdcdysz 337 refs = 'table';
340 this.$refs.table.clearSelection() 338 this.$refs[refs].clearSelection()
341 if (bdcdysz.length == 1) {
342 bdcdysz.forEach(item => {
343 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
344 if (item == row) {
345 this.$refs.table.toggleRowSelection(row, false);
346 }
347 // 不然就让当前的一行勾选
348 else {
349 this.$refs.table.toggleRowSelection(row, true);
350 }
351 })
352 }
353 else {
354 this.$refs.table.toggleRowSelection(row, true);
355 }
356 } else { 339 } else {
357 this.$refs.table.toggleRowSelection(row); 340 }
341 const bdcdysz = this.bdcdysz
342 if (bdcdysz.length > 0) {
343 bdcdysz.forEach(item => {
344 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
345 if (item == row) {
346 this.$nextTick(()=>{this.$refs[refs].toggleRowSelection(row, false);})
347 }
348 // 不然就让当前的一行勾选
349 else {
350 this.$refs[refs].toggleRowSelection(row, true);
351 }
352 })
353 }
354 else {
355 this.$refs[refs].toggleRowSelection(row, true);
358 } 356 }
359 }, 357 },
360 /** 358 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-01 09:18:46 4 * @LastEditTime: 2023-09-13 10:01:27
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
45 </lb-table> 45 </lb-table>
46 </div> 46 </div>
47 <div class="submit_button" style="text-align:center"> 47 <div class="submit_button" style="text-align:center">
48 <el-button @click="$popupCacel">取消</el-button> 48 <el-button @click="close">取消</el-button>
49 <el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button> 49 <el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
50 </div> 50 </div>
51 </div> 51 </div>
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 } from "@/utils/popup.js"; 55 import { ywPopupDialog,ywPopupCacel } 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";
...@@ -125,12 +125,12 @@ ...@@ -125,12 +125,12 @@
125 } else { 125 } else {
126 store.dispatch('user/refreshPage', true); 126 store.dispatch('user/refreshPage', true);
127 } 127 }
128 this.$popupCacel() 128 this.close()
129 } else { 129 } else {
130 if (res.result && res.result.length > 0) { 130 if (res.result && res.result.length > 0) {
131 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true) 131 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
132 } else { 132 } else {
133 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true) 133 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
134 } 134 }
135 } 135 }
136 }).catch(() => { 136 }).catch(() => {
...@@ -138,6 +138,14 @@ ...@@ -138,6 +138,14 @@
138 }) 138 })
139 }, 139 },
140 /** 140 /**
141 * @description: close
142 * @param {*} val
143 * @author: renchao
144 */
145 close(){
146 ywPopupCacel()
147 },
148 /**
141 * @description: handleSelectionChange 149 * @description: handleSelectionChange
142 * @param {*} val 150 * @param {*} val
143 * @author: renchao 151 * @author: renchao
......