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 131 additions and 46 deletions
/*
* @Description: 楼盘表查询
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:00:43
* @LastEditTime: 2023-09-12 10:25:47
*/
import request from "@/utils/request";
let SERVER = window.config
......@@ -26,10 +26,14 @@ export function getLpZrz (data) {
* @param {*} zrzbsm
* @author: renchao
*/
export function getLpb (zrzbsm) {
export function getLpb (zrzbsm,lx) {
return request({
url: "service-lpb/rest/zhcx/lpcx/getLpb?scyclx=0&zrzbsm=" + zrzbsm,
url: "service-lpb/rest/zhcx/lpcx/getLpb",
method: "get",
params: {
zrzbsm:zrzbsm,
scyclx:lx,
},
});
}
/**
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-01 09:18:29
* @LastEditTime: 2023-09-12 16:55:35
-->
<template>
<div class="edit">
......@@ -20,8 +20,10 @@
<lpbContent
ref="lpbContent"
:zrzbsm="formData.bsm"
:scyclx="formData.scyclx"
:onlyShow="formData.onlyShow"
:unitData="formData.unitData"
:sqywInfo="formData"
:key="time"></lpbContent>
</div>
<!-- 右侧图例 -->
......
......@@ -12,13 +12,14 @@
<ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/>
</div>
<!-- 自然幢名称 -->
<p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}">
<el-checkbox @change="zdySelectAll($event)" v-if="!onlyShow">{{
<!-- <p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}"> -->
<p class="lpb-xmmc" :style="{ 'border-bottom':'1px solid #e6e6e6'}">
<el-checkbox @change="zdySelectAll($event)">{{
lpbData.xmmc
}}</el-checkbox>
<span v-else>{{lpbData.xmmc}}</span>
</p>
<el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button>
<el-button type="primary" class="save-btn" v-else @click="submitForm" :loading="loading">发起申请</el-button>
<!-- 右键菜单 -->
<ul
v-show="lpbChVisible"
......@@ -35,6 +36,7 @@ import { getLpb } from "@/api/lpcx.js";
import chCpn from "./ch.vue";
import zdyCpn from "./zdys.vue";
import ljzsCpn from "./ljzs.vue";
import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
export default {
provide() {
return {
......@@ -63,7 +65,15 @@ export default {
onlyShow:{
type: Boolean,
default: true,
}
},
scyclx: {
type: Number,
default: 0,
},
sqywInfo: {
type: Object,
default: () => { }
},
},
data() {
return {
......@@ -87,11 +97,12 @@ export default {
color:''
},
// 选中户bsm合集
bsmList:[]
bsmList:[],
loading: false,
};
},
mounted() {
this.getLpb(this.zrzbsm);
this.scyclx ? this.getLpb(this.zrzbsm,this.scyclx):this.getLpb(this.zrzbsm);
window.lpbContent = this;
},
methods: {
......@@ -151,13 +162,15 @@ export default {
getLpb(zrzbsm, scyclx, actual) {
getLpb(zrzbsm, scyclx).then((res) => {
if (res.code == 200) {
if(scyclx){
if(res.result.syclx == "1") {
res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
// this.$nextTick(() => {
// //渲染楼盘表
// this.dataChange();
// });
console.log(this.lpbData, "this.lpbData");
}
}else{
res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
}
} else {
this.$message({
message: res.message,
......@@ -207,10 +220,50 @@ export default {
return value1 - value2;
};
},
/**
* @description: submitForm
* @author: renchao
*/
submitForm () {
debugger
if (this.bsmList.length == 0) {
this.$message.error("请至少选择一条数据");
return;
}
this.loading = true
startBusinessFlow({
bsmSqyw: this.sqywInfo.bsmSqyw,
bdcdysz: this.bsmList,
}).then((res) => {
this.loading = false
if (res.code == 200) {
this.$message({
showClose: true,
message: '发起申请成功',
type: 'success'
})
if (!this.isJump) {
this.jump(res.result, this.sqywInfo.djywbm)
} else {
store.dispatch('user/refreshPage', true);
}
this.$popupCacel()
} else {
if (res.result && res.result.length > 0) {
ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
}
}
}).catch(() => {
this.loading = false
})
},
},
computed:{
lpbContentHeight(){
return this.onlyShow ? 36 : 76
// return this.onlyShow ? 36 : 76
return 76
}
},
watch: {
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-09-01 10:39:03
* @LastEditors: yangwei
* @LastEditTime: 2023-09-11 15:48:03
* @LastEditTime: 2023-09-12 15:12:09
* @FilePath: \bdcdj-web\src\views\sjgx\gbmhlgxsjgx\gbmhlgxsjgx.vue
* @Description:
*
......@@ -85,11 +85,12 @@
:style="{
backgroundColor: 'rgba(' + item.bgColor + ',0.12)',
border: '1px solid ' + 'rgba(' + item.bgColor + ',0.3)',
'--hover-color': 'rgba(' + item.bgColor + ',1)'
}"
>
<img :src="item.svg" alt="" />
</div>
<p>{{ item.name }}</p>
<p>{{ item.interfaceDescription }}</p>
</div>
</div>
<el-dialog
......@@ -200,6 +201,12 @@ export default {
comp: "zgfbm",
svg: require("./images/zgfbm.svg"),
},
{
name: "未知",
bgColor: "109, 114, 120",
comp: "",
svg: require("./images/unknow.svg"),
},
],
dialogVisible: false,
dialogTitle: "",
......@@ -210,10 +217,19 @@ export default {
mounted() {
getSysInterfaceList({ interfaceType: "4",pageSize:100 }).then((res) => {
if (res.code == 200) {
this.searchType.forEach(item=>{
let a = res.result.records.filter(i => i.interfaceService == item.name)
res.result.records.forEach(i=>{
let a = this.searchType.filter(item => i.interfaceService == item.name)
if (a.length) {
i.bgColor = a[0].bgColor
i.svg = a[0].svg
i.comp = a[0].comp
}else{
i.bgColor = '109, 114, 120'
i.svg = require("./images/unknow.svg")
i.comp = ''
}
})
this.searchType = res.result.records
}
});
},
......@@ -225,10 +241,10 @@ export default {
* @author: renchao
*/
openDialog(item) {
this.dialogTitle = item.name;
this.dialogVisible = true;
this.dialogTitle = item.interfaceDescription;
this.dialogComp = (r) =>
require.ensure([], () => r(require(`./components/${item.comp}.vue`)));
item.comp && (this.dialogVisible = true);
},
},
computed: {
......@@ -254,6 +270,9 @@ export default {
border-radius: 4px;
margin: 0 auto;
cursor: pointer;
&:hover{
border-color: var(--hover-color)!important;
}
i {
text-align: center;
line-height: 60px;
......
<?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
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-18 13:56:32
* @LastEditTime: 2023-09-13 11:19:54
-->
<template>
<div class="from-clues">
......@@ -61,7 +61,7 @@
</el-form>
</div>
<div class="from-clues-content loadingtext">
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
<lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
:current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange" @select="select"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
:data="zrztableData.data">
......@@ -303,14 +303,11 @@
* @author: renchao
*/
handleLpbClick (item) {
this.$popup('楼盘表', 'lpb/index', {
width: '85%',
formData: {
ywPopupDialog('楼盘表', 'lpb/index', {
bsm: item.bsm,
bsmSqyw:this.sqywInfo.bsmSqyw
}
})
bsmSqyw:this.sqywInfo.bsmSqyw,
scyclx:1
}, '85%', true,false)
},
/**
* @description: select
......@@ -335,26 +332,27 @@
*/
handleRowClick (row) {
// 自然幢多选，多幢单选
let refs = 'table1';
if (this.activeName == 'dz') {
refs = 'table';
this.$refs[refs].clearSelection()
} else {
}
const bdcdysz = this.bdcdysz
this.$refs.table.clearSelection()
if (bdcdysz.length == 1) {
if (bdcdysz.length > 0) {
bdcdysz.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item == row) {
this.$refs.table.toggleRowSelection(row, false);
this.$nextTick(()=>{this.$refs[refs].toggleRowSelection(row, false);})
}
// 不然就让当前的一行勾选
else {
this.$refs.table.toggleRowSelection(row, true);
this.$refs[refs].toggleRowSelection(row, true);
}
})
}
else {
this.$refs.table.toggleRowSelection(row, true);
}
} else {
this.$refs.table.toggleRowSelection(row);
this.$refs[refs].toggleRowSelection(row, true);
}
},
/**
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-01 09:18:46
* @LastEditTime: 2023-09-13 10:01:27
-->
<template>
<!-- 主体权利信息查询 -->
......@@ -45,14 +45,14 @@
</lb-table>
</div>
<div class="submit_button" style="text-align:center">
<el-button @click="$popupCacel">取消</el-button>
<el-button @click="close">取消</el-button>
<el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
</div>
</div>
</template>
<script>
import store from '@/store/index.js'
import { ywPopupDialog } from "@/utils/popup.js";
import { ywPopupDialog,ywPopupCacel } from "@/utils/popup.js";
import { datas, sendThis } from "../javascript/selectAllHInfo.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import table from "@/utils/mixin/table";
......@@ -125,12 +125,12 @@
} else {
store.dispatch('user/refreshPage', true);
}
this.$popupCacel()
this.close()
} else {
if (res.result && res.result.length > 0) {
ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
}
}
}).catch(() => {
......@@ -138,6 +138,14 @@
})
},
/**
* @description: close
* @param {*} val
* @author: renchao
*/
close(){
ywPopupCacel()
},
/**
* @description: handleSelectionChange
* @param {*} val
* @author: renchao
......