Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
bdc
/
bdcdj-web
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
0750c758
authored
2023-10-17 10:46:11 +0800
by
renchao@pashanhoo.com
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
style:同一权利人分割或者合并国有建设用地模块功能的完善
1 parent
818ef1d0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
63 deletions
src/views/workflow/components/leftmenu/ordinaryMenu.vue
src/views/workflow/components/leftmenu/segmentMenu.vue
src/views/ywbl/ywsq/components/selectJsydsyqSplitMerge.vue
src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @
0750c75
<!--
* @Description: workFrame左侧菜单列表-普通
* @Autor: renchao
* @LastEditTime: 2023-10-17 09:
49:08
* @LastEditTime: 2023-10-17 09:
54:06
-->
<
template
>
<div
class=
"leftmenu"
:class=
"
{ 'animation-map-drawer': isShowdrawer }">
...
...
@@ -187,7 +187,6 @@
if
(
res
.
code
==
200
)
{
that
.
$message
.
success
(
"删除成功"
);
that
.
loadBdcdylist
()
debugger
if
(
that
.
activeIndex
!=
'-1'
)
{
that
.
activeIndex
=
'0'
sessionStorage
.
setItem
(
'keyPath'
,
'0'
);
...
...
src/views/workflow/components/leftmenu/segmentMenu.vue
View file @
0750c75
<!--
* @Description: workFrame左侧菜单列表-分割
* @Autor: renchao
* @LastEditTime: 2023-10-17
09:30:20
* @LastEditTime: 2023-10-17
10:08:16
-->
<
template
>
<div
class=
"leftmenu"
:class=
"
{ 'animation-map-drawer': isShowdrawer }">
<el-menu
:default-active=
"activeIndex"
@
select=
"batchUnitClick"
class=
"title-batch"
v-if=
"showBatch"
>
<el-menu
:default-active=
"active
Batch
Index"
@
select=
"batchUnitClick"
class=
"title-batch"
v-if=
"showBatch"
>
<el-menu-item
index=
"-1"
key=
"-1"
class=
"menus"
>
<div>
{{
batchButtonName
}}
</div>
</el-menu-item>
...
...
@@ -23,7 +23,7 @@
<p
class=
"title-detail"
>
{{
item
.
zl
}}
</p>
</el-tooltip>
</div>
<i
class=
"el-icon-delete"
v-if=
"aroundUnitData.length > 1"
@
click
.
stop=
"handleDel(item)"
></i>
<i
class=
"el-icon-delete"
v-if=
"aroundUnitData.length > 1"
@
click
.
stop=
"handleDel(item
,'around'
)"
></i>
</el-menu-item>
</el-menu>
<!-- 变更后单元 -->
...
...
@@ -39,7 +39,7 @@
<p
class=
"title-detail"
>
{{
item
.
zl
}}
</p>
</el-tooltip>
</div>
<i
class=
"el-icon-delete"
v-if=
"afterUnitData.length > 1"
@
click
.
stop=
"handleDel(item)"
></i>
<i
class=
"el-icon-delete"
v-if=
"afterUnitData.length > 1"
@
click
.
stop=
"handleDel(item
, 'after'
)"
></i>
</el-menu-item>
</el-menu>
</div>
...
...
@@ -65,6 +65,8 @@
bsmBusiness
:
this
.
$route
.
query
.
bsmBusiness
,
bestepid
:
this
.
$route
.
query
.
bestepid
,
type
:
this
.
$route
.
query
.
type
,
// 批量操作
activeBatchIndex
:
'0'
,
// 变更前单元默认选中
activeIndex
:
'0'
,
// 变更后单元默认选中
...
...
@@ -176,11 +178,12 @@
}
},
/**
* @description: 删除左侧列表
* @description: 删除左侧列表
-变更前
* @param {*} item
* @author: renchao
*/
handleDel
(
item
)
{
handleDel
(
item
,
type
)
{
let
that
=
this
this
.
$confirm
(
"确定要删除吗, 是否继续?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
...
...
@@ -192,8 +195,17 @@
formdata
.
append
(
"bsmSlsq"
,
this
.
bsmSlsq
);
deleteFlow
(
formdata
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
this
.
$message
.
success
(
"删除成功"
);
this
.
$parent
.
updateDialog
();
that
.
$message
.
success
(
"删除成功"
);
that
.
loadBdcdylist
()
if
(
type
==
'around'
)
{
that
.
activeIndex
=
'0'
sessionStorage
.
setItem
(
'keyPath'
,
'0'
);
}
else
{
that
.
activeIndex
=
'0'
sessionStorage
.
setItem
(
'keyPath'
,
'0'
);
}
that
.
$parent
.
updateDialog
();
}
else
{
this
.
$message
.
error
(
res
.
message
);
}
...
...
@@ -212,16 +224,19 @@
*/
batchUnitClick
()
{
window
.
currentSelect
=
{}
this
.
currentSelectProps
.
batchOperation
=
true
;
// this.activeIndex = "-1";
this
.
$parent
.
stepForm
(
0
);
this
.
currentSelectProps
.
batchOperation
=
true
this
.
activeIndex
=
"-1"
this
.
activeHIndex
=
"-1"
this
.
activeBatchIndex
=
"0"
this
.
$parent
.
stepForm
(
0
)
},
/**
* @description: 申请单元点击事件
* @description: 申请单元点击事件
-变更前
* @param {*} index
* @author: renchao
*/
unitClick
(
index
)
{
this
.
activeBatchIndex
=
"-1"
window
.
currentSelect
=
this
.
aroundUnitData
[
index
]
this
.
activeHIndex
=
'-1'
this
.
currentSelectProps
=
this
.
aroundUnitData
[
index
];
...
...
@@ -239,11 +254,13 @@
* @author: renchao
*/
handleAfterunitClick
(
index
)
{
this
.
activeBatchIndex
=
"-1"
window
.
currentSelect
=
this
.
afterUnitData
[
index
]
this
.
activeIndex
=
'-1'
this
.
currentSelectProps
=
this
.
afterUnitData
[
index
];
this
.
currentSelectProps
.
batchOperation
=
false
;
this
.
activeHIndex
=
index
.
toString
();
sessionStorage
.
setItem
(
'keyPath'
,
this
.
activeHIndex
);
//选中表单传递数据
this
.
$emit
(
'getCurrentSelectProps'
,
this
.
currentSelectProps
);
this
.
$parent
.
stepForm
(
index
);
...
...
src/views/ywbl/ywsq/components/selectJsydsyqSplitMerge.vue
View file @
0750c75
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-
08-02 09:56:41
* @LastEditTime: 2023-
10-17 10:42:49
-->
<
template
>
<div
class=
"from-clues"
>
...
...
@@ -59,7 +59,7 @@
label=
"选择"
width=
"50"
>
<template
slot-scope=
"scope"
>
<el-radio
v-model=
"radioVal"
:label=
"scope.row.bhqkbsm
"
>
{{
''
}}
</el-radio>
<el-radio
v-model=
"radioVal"
@
change=
"handleSelect"
@
click
.
native
.
stop
:label=
"scope.row.bdcdyh
"
>
{{
''
}}
</el-radio>
</
template
>
</el-table-column>
<el-table-column
...
...
@@ -142,7 +142,7 @@
import
store
from
'@/store/index.js'
import
table
from
"@/utils/mixin/table"
;
import
{
ywPopupDialog
}
from
"@/utils/popup.js"
;
import
{
datas
,
datas
two
,
sendThis
}
from
"../javascript/selectJsydsyqhbfg.js"
;
import
{
datastwo
,
sendThis
}
from
"../javascript/selectJsydsyqhbfg.js"
;
import
{
defaultParameters
}
from
"../javascript/publicDefaultPar.js"
;
import
{
selectJsydQlxxSplitMergeBefore
,
selectZdjbxxSplitMergeLast
}
from
"@/api/ywsq.js"
;
import
{
startBusinessFlow
}
from
"@/api/workFlow.js"
;
...
...
@@ -158,19 +158,6 @@
queryForm
:
defaultParameters
.
defaultParameters
(),
// 表格数据
tableData
:
{
columns
:
[{
label
:
'选择'
,
width
:
'50px'
,
render
:
(
h
,
scope
)
=>
{
return
(
<
div
class
=
"orgColumn"
>
<
el
-
radio
v
-
model
=
{
this
.
radioVal
}
label
=
{
scope
.
row
.
bhqkbsm
}
>
&
ensp
;
<
/el-radio
>
<
/div
>
)
}
},].
concat
(
datas
.
columns
()),
data
:
[],
columns1
:
datastwo
.
columns1
(),
datastwo
:
[]
...
...
@@ -179,31 +166,22 @@
radioVal
:
""
}
},
watch
:
{
radioVal
:
{
deep
:
true
,
handler
(
newVal
,
oldVal
)
{
this
.
close
()
}
}
},
mounted
()
{
sendThis
(
this
)
},
methods
:
{
// 单选事件
/**
* @description: 单选事件
* @author: renchao
*/
close
()
{
handleSelect
()
{
this
.
tableData
.
data
.
forEach
(
item
=>
{
if
(
this
.
radioVal
==
item
.
b
hqkbsm
)
{
if
(
this
.
radioVal
==
item
.
b
dcdyh
)
{
item
.
bglx
=
'1'
this
.
bdcdysz
[
0
]
=
item
this
.
queryForm
.
bhqkbsm
=
item
.
bhqkbsm
}
})
this
.
queryForm
.
bhqkbsm
=
this
.
radioVal
selectZdjbxxSplitMergeLast
({
...
this
.
queryForm
}).
then
((
res
)
=>
{
this
.
$endLoading
();
if
(
res
.
code
===
200
)
{
...
...
@@ -302,29 +280,20 @@
* @author: renchao
*/
handleRowClick
(
row
)
{
// 如果状态是1,那就是单选
if
(
this
.
sqywInfo
.
sqywdylx
==
"1"
)
{
const
bdcdysz
=
this
.
bdcdysz
this
.
$refs
.
table
.
clearSelection
()
if
(
bdcdysz
.
length
==
1
)
{
bdcdysz
.
forEach
(
item
=>
{
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if
(
item
==
row
)
{
this
.
$refs
.
table
.
toggleRowSelection
(
row
,
false
);
}
// 不然就让当前的一行勾选
else
{
this
.
$refs
.
table
.
toggleRowSelection
(
row
,
true
);
}
this
.
queryForm
.
bhqkbsm
=
row
.
bhqkbsm
this
.
radioVal
=
row
.
bdcdyh
selectZdjbxxSplitMergeLast
({
...
this
.
queryForm
}).
then
((
res
)
=>
{
this
.
$endLoading
();
if
(
res
.
code
===
200
)
{
this
.
tableData
.
datastwo
=
res
.
result
this
.
tableData
.
datastwo
.
forEach
(
item
=>
{
item
.
bsm
=
item
.
zdbsm
;
item
.
bglx
=
'2'
})
this
.
bdcdysz
=
[
row
,
...
this
.
tableData
.
datastwo
]
}
else
{
this
.
$refs
.
table
.
toggleRowSelection
(
row
,
true
);
}
}
else
{
this
.
$refs
.
table
.
toggleRowSelection
(
row
);
}
},
})
}
}
}
</
script
>
...
...
Please
register
or
sign in
to post a comment