13be7fe2 by liangyifan

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

# Conflicts:
#	src/components/tanchuang/index.vue
2 parents 18300c13 fd656fa4
......@@ -5,4 +5,4 @@ NODE_ENV=development
VUE_APP_BASE_API = '/bdcdj'
# 开发环境
VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018'
VUE_APP_API_BASE_URL = 'http://192.168.2.95:8018'
......
......@@ -106,3 +106,21 @@ export function selectCfdj (data) {
data
})
}
/*
业务办理-业务申请-添加收藏业务
*/
export function addCollectBiz (bsmSqyw) {
return request({
url: '/ywbl/BusinessApply/addCollectBiz?bsmSqyw=' + bsmSqyw,
method: 'post'
})
}
/*
业务办理-业务申请-添加收藏业务
*/
export function deleteCollectBiz (bsmSqyw) {
return request({
url: '/ywbl/BusinessApply/deleteCollectBiz?bsmSqyw=' + bsmSqyw,
method: 'post'
})
}
\ No newline at end of file
......
......@@ -59,7 +59,7 @@ export default {
},
heightNum: {
type: Number,
default: 285,
default: 260,
},
maxHeight: {
type: Number,
......
......@@ -93,6 +93,7 @@ export default {
left: 0;
top: 0;
background: rgba(0, 0, 0, 0.3);
}
.ls-mask-window {
......@@ -102,6 +103,7 @@ export default {
top: 50%;
min-height: 200px;
transform: translate(-50%, -50%);
border-radius: 10px;
}
.ls-head{
position: relative;
......
<!--
功能:流程图
作者:calliope
-->
<template>
<div class='flowChart'>
<img :src="formData" alt="">
</div>
</template>
<script>
export default {
props: {
formData: {
type: String,
default: ''
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
.flowChart {
margin: 20px 0;
}
</style>
\ No newline at end of file
......@@ -56,9 +56,6 @@
</div>
</div>
</div>
<dialogBox title="流程图" width="70%" isMain v-model="myValue" :isFullscreen="false" :isButton="false">
<img :src="imgSrc" style="margin: 20px 0" />
</dialogBox>
</div>
</template>
......@@ -82,7 +79,6 @@ export default {
return {
// 流程图
imgSrc: '',
myValue: false,
// 折叠
isShowdrawer: true,
// 默认选中
......@@ -149,18 +145,24 @@ export default {
},
//流程环节操作按钮
operation (index, item) {
//按钮 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6:打印申请书
//操作按钮 登簿:record 转件:transfer 退回:back 退出:signout
let that = this;
switch (item.value) {
case "B1":
getWorkFlowImage(this.bsmSlsq).then(res => {
this.imgSrc = URL.createObjectURL(res)
this.myValue = true
this.$popup({
title: '流程图',
editItem: 'workflow/components/flowChart',
formData: this.imgSrc
})
})
break;
case "zsyl":
case "B5":
this.zsylFlag = true;
break;
case "clfp": //材料分屏按钮
case "B2": //材料分屏按钮
this.splitScreen = this.splitScreen ? false : true;
this.$store.dispatch('app/settScreen', this.splitScreen)
if (this.splitScreen) {
......@@ -174,9 +176,9 @@ export default {
this.tabList.splice(this.clxxIndex, 1, this.clxxTab);
}
break;
case "th": //退回按钮
case "back": //退回按钮
break;
case "zc": //转件按钮
case "transfer": //转件按钮
getNextLinkInfo({
bsmSlsq: this.bsmSlsq,
bestepid: this.bestepid,
......@@ -186,10 +188,10 @@ export default {
}
});
break;
case "tc":
case "signout":
window.close();
break;
case "db":
case "record":
var formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
formdata.append("bestepid", this.bestepid);
......
......@@ -106,7 +106,7 @@ export default {
fetchData () {
if (this.bsmSqyw) {
this.queryForm.sqywbm = this.djywbm;
console.log(this.queryForm, this.bsmSqyw);
selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => {
if (res.code === 200) {
let { total, records } = res.result;
......
......@@ -9,6 +9,8 @@ export function queueDjywmc (djywbm) {
case "A03200":
case "A03300":
case "A03400":
vm = "jsydsyq200";
break;
case "A04100":
vm = "houseOwnership";
break;
......
......@@ -23,8 +23,9 @@
<p>
{{ item.nodename }}
</p>
<p v-if="item.sffqlc == 1" :class="item.select ? 'active' : ''" @click.stop="handleCollection(item)">
<i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i>
<p v-if="item.sffqlc == 1" :class="item.userCollect==1 ? 'active' : ''"
@click.stop="handleCollection(item)">
<i class="el-icon-star-off" :class="item.userCollect==1 ? 'active' : ''"></i>
</p>
</li>
</ul>
......@@ -38,8 +39,9 @@
<p>
{{ item.nodename }}
</p>
<p v-if="item.sffqlc == 1" :class="item.select ? 'active' : ''" @click="handleCollection(item)">
<i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i>
<p v-if="item.sffqlc == 1" :class="item.userCollect==1 ? 'active' : ''"
@click.stop="handleCollection(item)">
<i class="el-icon-star-off" :class="item.userCollect==1 ? 'active' : ''"></i>
</p>
</li>
</ul>
......@@ -52,8 +54,8 @@
<p>
{{ item.nodename }}
</p>
<p :class="item.select ? 'active' : ''" @click.stop="handleCollection(item)">
<i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i>
<p :class="item.userCollect==1 ? 'active' : ''" @click.stop="handleCollection(item)">
<i class="el-icon-star-off" :class="item.userCollect==1 ? 'active' : ''"></i>
</p>
</li>
</ul>
......@@ -67,7 +69,7 @@
</div>
</template>
<script>
import { getCollectBiz, getleftMenu, getNextNode } from "@/api/ywbl"
import { getCollectBiz, getleftMenu, getNextNode, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
import fqsqDialog from "./slectBdc.vue"
export default {
data () {
......@@ -88,8 +90,7 @@ export default {
djqxObj: {
djqxbm: "",
djqxmc: "",
},
}
}
},
components: {
......@@ -161,7 +162,28 @@ export default {
})
},
handleCollection (item) {
item.select = !item.select
let that = this
if (item.userCollect == '2') {
addCollectBiz(item.bsmSqyw).then(res => {
if (res.code == 200) {
item.userCollect = '1'
that.$message({
message: '收藏成功!',
type: 'success'
})
}
})
} else {
deleteCollectBiz(item.bsmSqyw).then(res => {
if (res.code == 200) {
item.userCollect = '2'
that.$message({
message: '取消收藏成功!',
type: 'success'
})
}
})
}
},
handleSelect (item) {
this.busList.forEach(item => {
......