Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
d5c4bd2a by liangyifan
Options

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

# Conflicts:
#	src/components/tanchuang/index.vue
2 parents c62bec40 56e5520d
Inline Side-by-side
Showing 8 changed files with 134 additions and 18 deletions
...@@ -142,3 +142,21 @@ export function deleteCollectBiz (bsmSqyw) { ...@@ -142,3 +142,21 @@ export function deleteCollectBiz (bsmSqyw) {
142 method: 'post' 142 method: 'post'
143 }) 143 })
144 } 144 }
145 // 国有建设用地使用权/房屋使用权 -选择不动产单元
146 export function choiceBdcdy (data) {
147 return request({
148 url: 'business/workFlow/choiceBdcdy',
149 method: 'post',
150 data,
151 showLoading: true
152 })
153 }
154
155 // 申请列表删除
156 export function deleteBdcdy (data) {
157 return request({
158 url: 'business/workFlow/deleteBdcdy?sldybsm=' + data,
159 method: 'get',
160 showLoading: true
161 })
162 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -56,20 +56,19 @@ export default { ...@@ -56,20 +56,19 @@ export default {
56 mounted () { 56 mounted () {
57 // 计算滚动条高度 57 // 计算滚动条高度
58 setTimeout(() => { 58 setTimeout(() => {
59 if(this.btnShow){ //判断按钮的显影来决定是否需要计算高度 59 if (this.btnShow) { //判断按钮的显影来决定是否需要计算高度
60 if(this.height == 'auto'){ 60 if (this.height == 'auto') {
61 this.contentHeight = (this.$refs.contentRef.offsetHeight - 100) + 'px' 61 this.contentHeight = (this.$refs.contentRef.offsetHeight - 100) + 'px'
62 }else{ 62 }else{
63 this.contentHeight =(parseInt(this.height)-parseInt('100px'))+'px'; 63 this.contentHeight = this.height
64 } 64 }
65 } else {
66 if(this.height=='auto'){
67 this.contentHeight = this.$refs.contentRef.offsetHeight
65 }else{ 68 }else{
66 if(this.height == 'auto'){ 69 this.contentHeight = this.height
67 this.contentHeight = this.$refs.contentRef.offsetHeight + 'px'
68 }else{
69 this.contentHeight =this.height
70 } 70 }
71 } 71 }
72
73 }, 500) 72 }, 500)
74 }, 73 },
75 methods: { 74 methods: {
...@@ -132,7 +131,7 @@ export default { ...@@ -132,7 +131,7 @@ export default {
132 .ls-title { 131 .ls-title {
133 padding: 16px; 132 padding: 16px;
134 color: #ffffff; 133 color: #ffffff;
135 background: linear-gradient(3deg,#409EFF, transparent) 134 background: linear-gradient(-2deg, #409EFF, transparent; background: linear-gradient(3deg, #409EFF, transparent));
136 } 135 }
137 136
138 .ls-title .svg-icon { 137 .ls-title .svg-icon {
......
1 <!--
2 功能：申请单元列表批量删除
3 作者：calliope
4 -->
5 <template>
6 <div class='batchDel'>
7 <lb-table :column="columns" :data="dataList" :heightNum="500" :pagination="false">
8 </lb-table>
9 </div>
10 </template>
11 <script>
12
13 export default {
14 components: {},
15 props: {
16 formData: {
17 type: Object,
18 default: {}
19 }
20 },
21 data () {
22 return {
23 columns: [
24 {
25 type: 'selection',
26 label: '全选'
27 },
28 {
29 label: '序号',
30 type: 'index',
31 width: '50',
32 },
33 {
34 prop: "status",
35 label: "状态",
36 },
37 ],
38 dataList: []
39 }
40 }
41 }
42 </script>
43 <style scoped lang='scss'>
44
45 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -6,9 +6,15 @@ ...@@ -6,9 +6,15 @@
6 border: 1px solid #ebeef5; 6 border: 1px solid #ebeef5;
7 z-index: 100; 7 z-index: 100;
8 @include flex; 8 @include flex;
9
9 /deep/.el-tabs__header { 10 /deep/.el-tabs__header {
10 margin-bottom: 0 !important; 11 margin-bottom: 0 !important;
11 } 12 }
13
14 /deep/.el-menu-item {
15 display: flex;
16 align-items: center;
17 }
12 } 18 }
13 19
14 .leftmenu { 20 .leftmenu {
...@@ -24,6 +30,12 @@ ...@@ -24,6 +30,12 @@
24 text-align: center; 30 text-align: center;
25 } 31 }
26 32
33 .batchDel {
34 float: right;
35 position: relative;
36 top: 3px;
37 }
38
27 .title-detail { 39 .title-detail {
28 display: flex; 40 display: flex;
29 flex-wrap: wrap; 41 flex-wrap: wrap;
...@@ -115,8 +127,8 @@ ...@@ -115,8 +127,8 @@
115 } 127 }
116 128
117 .map-drawer { 129 .map-drawer {
118 width: 20px; 130 width: 16px;
119 height: 79px; 131 height: 70px;
120 position: absolute; 132 position: absolute;
121 top: 30%; 133 top: 30%;
122 z-index: 99; 134 z-index: 99;
......
...@@ -22,11 +22,16 @@ ...@@ -22,11 +22,16 @@
22 <!-- 左侧菜单栏 --> 22 <!-- 左侧菜单栏 -->
23 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 23 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
24 <div v-if="this.isShowdrawer"> 24 <div v-if="this.isShowdrawer">
25 <div class="title">申请单元列表({{ unitData.length }})</div> 25 <div class="title">申请单元列表({{ unitData.length }})
26 <el-button type="text" class="batchDel" @click="handleBatchDel">批量删除</el-button>
27 </div>
26 <el-menu :default-active="activeIndex" @select="unitClick"> 28 <el-menu :default-active="activeIndex" @select="unitClick">
27 <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index"> 29 <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
30 <div>
28 <p>{{ item.bdcdyh }}</p> 31 <p>{{ item.bdcdyh }}</p>
29 <p class="title-detail">{{ item.zl }}</p> 32 <p class="title-detail">{{ item.zl }}</p>
33 </div>
34 <i class="el-icon-delete" v-if="unitData.length>1" @click.stop="handleDel(item)"></i>
30 </el-menu-item> 35 </el-menu-item>
31 </el-menu> 36 </el-menu>
32 </div> 37 </div>
...@@ -56,7 +61,7 @@ ...@@ -56,7 +61,7 @@
56 </div> 61 </div>
57 </div> 62 </div>
58 </div> 63 </div>
59 <fqsqDialog v-model="isDialog" :djywbm="$route.query.sqywbm" :isJump="true" /> 64 <fqsqDialog v-model="isDialog" :djywbm="$route.query.sqywbm" :isJump="true" @updateDialog="updateDialog" />
60 </div> 65 </div>
61 </template> 66 </template>
62 67
...@@ -72,6 +77,7 @@ import { ...@@ -72,6 +77,7 @@ import {
72 getNextLinkInfo, 77 getNextLinkInfo,
73 completeTask, 78 completeTask,
74 } from "@/api/fqsq.js" 79 } from "@/api/fqsq.js"
80 import { deleteBdcdy } from "@/api/ywbl.js"
75 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js" 81 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"
76 import { getForm } from "./flowform.js" 82 import { getForm } from "./flowform.js"
77 import fqsqDialog from "@/views/ywbl/ywsq/slectBdc.vue" 83 import fqsqDialog from "@/views/ywbl/ywsq/slectBdc.vue"
...@@ -124,6 +130,27 @@ export default { ...@@ -124,6 +130,27 @@ export default {
124 this.flowInitParam(); 130 this.flowInitParam();
125 }, 131 },
126 methods: { 132 methods: {
133 // 更新列表
134 updateDialog () {
135 this.loadBdcdylist();
136 },
137 // 删除左侧列表
138 handleDel (item) {
139 deleteBdcdy(item.sldybsm).then(res => {
140
141 })
142 },
143 handleBatchDel () {
144 this.$popup({
145 title: '批量删除',
146 width: '50%',
147 btnShow: true,
148 editItem: 'workflow/components/batchDel',
149 formData: {},
150 cancel: function () { }, //取消事件的回调
151 confirm: function () { }, //确认事件的回调
152 })
153 },
127 //加载流程初始参数 154 //加载流程初始参数
128 flowInitParam () { 155 flowInitParam () {
129 var formdata = new FormData(); 156 var formdata = new FormData();
...@@ -164,6 +191,7 @@ export default { ...@@ -164,6 +191,7 @@ export default {
164 this.imgSrc = URL.createObjectURL(res) 191 this.imgSrc = URL.createObjectURL(res)
165 this.$popup({ 192 this.$popup({
166 title: '流程图', 193 title: '流程图',
194 btnShow: true,
167 editItem: 'workflow/components/flowChart', 195 editItem: 'workflow/components/flowChart',
168 formData: this.imgSrc 196 formData: this.imgSrc
169 }) 197 })
......
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
171 }) 171 })
172 }, 172 },
173 ywhClick (item) { 173 ywhClick (item) {
174 const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1'); 174 const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1' + '&sqywbm=' + item.djywbm);
175 window.open(href, '_blank'); 175 window.open(href, '_blank');
176 } 176 }
177 } 177 }
......
...@@ -45,7 +45,7 @@ import Cookies from 'js-cookie' ...@@ -45,7 +45,7 @@ import Cookies from 'js-cookie'
45 import { datas, sendThis } from "../javascript/fwsyq.js"; 45 import { datas, sendThis } from "../javascript/fwsyq.js";
46 import table from "@/utils/mixin/table"; 46 import table from "@/utils/mixin/table";
47 import jump from "@/views/ywbl/ywsq/components/mixin/jump"; 47 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
48 import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js"; 48 import { selectFwsyq, startBusinessFlow, choiceBdcdy } from "@/api/ywbl.js";
49 export default { 49 export default {
50 mixins: [table, jump], 50 mixins: [table, jump],
51 props: { 51 props: {
...@@ -96,6 +96,7 @@ export default { ...@@ -96,6 +96,7 @@ export default {
96 this.$message.error("请至少选择一条数据"); 96 this.$message.error("请至少选择一条数据");
97 return; 97 return;
98 } 98 }
99 if (!this.isJump) {
99 startBusinessFlow({ 100 startBusinessFlow({
100 bsmSqyw: Cookies.get("bsmSqyw"), 101 bsmSqyw: Cookies.get("bsmSqyw"),
101 bdcdysz: this.bdcdysz, 102 bdcdysz: this.bdcdysz,
...@@ -108,15 +109,28 @@ export default { ...@@ -108,15 +109,28 @@ export default {
108 message: '发起申请成功', 109 message: '发起申请成功',
109 type: 'success' 110 type: 'success'
110 }) 111 })
111 if (!this.isJump) {
112 this.jump(res.result, this.djywbm) 112 this.jump(res.result, this.djywbm)
113 } else { 113 } else {
114 this.$emit('updateDialog', true) 114 this.$message.error(res.message);
115 } 115 }
116 })
117 } else {
118 choiceBdcdy({
119 bsmSlsq: this.$route.query.bsmSlsq,
120 bdcdysz: this.bdcdysz
121 }).then(res => {
122 if (res.code == 200) {
123 this.$message({
124 showClose: true,
125 message: '发起申请成功',
126 type: 'success'
127 })
128 this.$emit('updateDialog', true)
116 } else { 129 } else {
117 this.$message.error(res.message); 130 this.$message.error(res.message);
118 } 131 }
119 }) 132 })
133 }
120 }, 134 },
121 handleSelectionChange (val) { 135 handleSelectionChange (val) {
122 this.bdcdysz = val 136 this.bdcdysz = val
......
...@@ -42,7 +42,7 @@ export default { ...@@ -42,7 +42,7 @@ export default {
42 }, 42 },
43 updateDialog () { 43 updateDialog () {
44 this.$emit("input", false) 44 this.$emit("input", false)
45 this.key++ 45 this.$emit("updateDialog", true)
46 } 46 }
47 } 47 }
48 } 48 }
......