Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
founder_vue
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
founder_vue
Commits
2880cf39
Commit
2880cf39
authored
Dec 11, 2021
by
liyuhang19990520
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://47.92.108.28/changchao/founder_vue
into dev_zwpt
parents
a852f068
3d4bdd62
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
293 additions
and
11 deletions
+293
-11
src/views/AllPersonnelBase/AllPersonnelBase.vue
+3
-0
src/views/AllPersonnelBase/dclb.vue
+170
-0
src/views/AllPersonnelBase/gzlb.vue
+4
-0
src/views/AllPersonnelBase/qbalk.vue
+2
-0
src/views/drFPTX/RAList.vue
+110
-9
src/views/zljc/Index.vue
+4
-2
No files found.
src/views/AllPersonnelBase/AllPersonnelBase.vue
View file @
2880cf39
...
...
@@ -135,18 +135,21 @@
prop=
"ysxtAsjxgrybh"
label=
"人员编号"
:width=
"width1"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop=
"xm"
label=
"姓名"
:width=
"width2"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop=
"zjhm"
label=
"身份证号"
:width=
"width3"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
src/views/AllPersonnelBase/dclb.vue
View file @
2880cf39
...
...
@@ -171,6 +171,7 @@
hasChildren: 'hasChildren',
}"
@selection-change="handleSelectionChange"
@expand-change="hadnlExpandChange1"
>
<el-table-column
type=
"selection"
...
...
@@ -220,6 +221,7 @@
prop=
"barcode"
label=
"人员编号"
:width=
"width2"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -257,12 +259,30 @@
label=
"数据类型"
:width=
"width2"
>
<
template
slot-scope=
"scope"
>
<div>
<span>
{{
scope
.
row
.
dataTypeName
}}
</span>
<span
class=
'tz'
v-if=
"scope.row.featureName"
>
特征
</span>
</div>
</
template
>
</el-table-column>
<el-table-column
prop=
"exportName"
label=
"导出模式"
width=
"auto"
>
<
template
slot-scope=
"scope"
>
<div>
<span>
{{
scope
.
row
.
exportName
}}
</span>
<span
class=
'tm'
v-if=
"scope.row.declassificationName"
>
脱密
</span>
</div>
</
template
>
</el-table-column>
</el-table>
</div>
...
...
@@ -282,6 +302,7 @@
hasChildren: 'hasChildren',
}"
@
selection-change=
"handleSelectionChange"
@
expand-change=
"hadnlExpandChange2"
>
<el-table-column
type=
"selection"
...
...
@@ -331,6 +352,7 @@
prop=
"barcode"
label=
"案事件编号"
:width=
"width4"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -344,6 +366,15 @@
label=
"导出模式"
:width=
"width1"
>
<
template
slot-scope=
"scope"
>
<div>
<span>
{{
scope
.
row
.
exportName
}}
</span>
<span
class=
'tm'
v-if=
"scope.row.declassificationName"
>
脱密
</span>
</div>
</
template
>
</el-table-column>
<el-table-column
width=
"auto"
>
</el-table-column>
...
...
@@ -418,6 +449,7 @@ export default {
multipleSelection
:
[],
// 表单选择项目
isShowTip
:
false
,
//批量操作提示
selectBoo
:
false
,
// 是否批量操作
expanded
:
false
,
// 展开标志
};
},
created
()
{
...
...
@@ -535,6 +567,116 @@ export default {
this
.
$message
.
error
(
"抱歉,复制条码号失败!"
);
}
},
// 展开或关闭行
hadnlExpandChange1
(
row
,
expanded
)
{
// console.log(row, expanded, "hadnlExpandChange1")
// let oldObj = row;
// 获取展开标志
this
.
expanded
=
expanded
;
// 获取下标
var
i
=
this
.
tableDate1
.
findIndex
((
table
)
=>
table
.
sequenceNumber
===
row
.
sequenceNumber
);
// var i = this.tableData.findIndex(table => table.id === row.id);
console
.
log
(
i
,
112233
);
if
(
expanded
)
{
this
.
tableDate1
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
personExportRecordGrandchildren
:
row
.
personExportRecordGrandchildren
,
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
expanded
:
true
,
};
this
.
$forceUpdate
();
}
else
{
//console.info("折叠时row数据", this.list[i]);
this
.
tableDate1
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
personExportRecordGrandchildren
:
row
.
personExportRecordGrandchildren
,
barcode
:
row
.
personExportRecordGrandchildren
[
0
].
barcode
,
collectIdName
:
row
.
personExportRecordGrandchildren
[
0
].
collectIdName
,
collectIdCard
:
row
.
personExportRecordGrandchildren
[
0
].
collectIdCard
,
dataType
:
row
.
personExportRecordGrandchildren
[
0
].
dataType
,
dataTypeName
:
row
.
personExportRecordGrandchildren
[
0
].
dataTypeName
,
declassificationName
:
row
.
personExportRecordGrandchildren
[
0
].
declassificationName
,
declassificationStatus
:
row
.
personExportRecordGrandchildren
[
0
].
declassificationStatus
,
exportName
:
row
.
personExportRecordGrandchildren
[
0
].
exportName
,
exportTime
:
row
.
personExportRecordGrandchildren
[
0
].
exportTime
,
exportType
:
row
.
personExportRecordGrandchildren
[
0
].
exportType
,
failReason
:
row
.
personExportRecordGrandchildren
[
0
].
failReason
,
featureName
:
row
.
personExportRecordGrandchildren
[
0
].
featureName
,
featureStatus
:
row
.
personExportRecordGrandchildren
[
0
].
featureStatus
,
id
:
row
.
personExportRecordGrandchildren
[
0
].
id
,
picCount
:
row
.
personExportRecordGrandchildren
[
0
].
picCount
,
plainCount
:
row
.
personExportRecordGrandchildren
[
0
].
plainCount
,
plamCount
:
row
.
personExportRecordGrandchildren
[
0
].
plamCount
,
rollCount
:
row
.
personExportRecordGrandchildren
[
0
].
rollCount
,
status
:
row
.
personExportRecordGrandchildren
[
0
].
status
,
statusName
:
row
.
personExportRecordGrandchildren
[
0
].
statusName
,
expanded
:
false
,
};
//console.log(this.list[i]);
this
.
$forceUpdate
();
// //console.info("塞完数据的row", this.list[i]);
}
},
// 展开或关闭行
hadnlExpandChange2
(
row
,
expanded
)
{
console
.
log
(
row
,
expanded
,
"hadnlExpandChange2"
)
// let oldObj = row;
// 获取展开标志
this
.
expanded
=
expanded
;
// 获取下标
var
i
=
this
.
tableDate2
.
findIndex
((
table
)
=>
table
.
sequenceNumber
===
row
.
sequenceNumber
);
// var i = this.tableData.findIndex(table => table.id === row.id);
console
.
log
(
i
,
112233
);
if
(
expanded
)
{
this
.
tableDate2
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
caseExportRecordGrandchildren
:
row
.
caseExportRecordGrandchildren
,
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
expanded
:
true
,
};
this
.
$forceUpdate
();
}
else
{
//console.info("折叠时row数据", this.list[i]);
this
.
tableDate2
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
caseExportRecordGrandchildren
:
row
.
caseExportRecordGrandchildren
,
barcode
:
row
.
caseExportRecordGrandchildren
[
0
].
barcode
,
collectIdName
:
row
.
caseExportRecordGrandchildren
[
0
].
collectIdName
,
collectIdCard
:
row
.
caseExportRecordGrandchildren
[
0
].
collectIdCard
,
dataType
:
row
.
caseExportRecordGrandchildren
[
0
].
dataType
,
dataTypeName
:
row
.
caseExportRecordGrandchildren
[
0
].
dataTypeName
,
declassificationName
:
row
.
caseExportRecordGrandchildren
[
0
].
declassificationName
,
declassificationStatus
:
row
.
caseExportRecordGrandchildren
[
0
].
declassificationStatus
,
exportName
:
row
.
caseExportRecordGrandchildren
[
0
].
exportName
,
exportTime
:
row
.
caseExportRecordGrandchildren
[
0
].
exportTime
,
exportType
:
row
.
caseExportRecordGrandchildren
[
0
].
exportType
,
failReason
:
row
.
caseExportRecordGrandchildren
[
0
].
failReason
,
featureName
:
row
.
caseExportRecordGrandchildren
[
0
].
featureName
,
featureStatus
:
row
.
caseExportRecordGrandchildren
[
0
].
featureStatus
,
id
:
row
.
caseExportRecordGrandchildren
[
0
].
id
,
picCount
:
row
.
caseExportRecordGrandchildren
[
0
].
picCount
,
plainCount
:
row
.
caseExportRecordGrandchildren
[
0
].
plainCount
,
plamCount
:
row
.
caseExportRecordGrandchildren
[
0
].
plamCount
,
rollCount
:
row
.
caseExportRecordGrandchildren
[
0
].
rollCount
,
status
:
row
.
caseExportRecordGrandchildren
[
0
].
status
,
statusName
:
row
.
caseExportRecordGrandchildren
[
0
].
statusName
,
expanded
:
false
,
};
//console.log(this.list[i]);
this
.
$forceUpdate
();
// //console.info("塞完数据的row", this.list[i]);
}
},
/**
* @description: 是否是批量操作
* @param {*}
...
...
@@ -661,6 +803,34 @@ export default {
};
</
script
>
<
style
scoped
lang=
"scss"
>
//
特征
.tz
{
display
:
inline-block
;
width
:
32px
;
height
:
20px
;
background
:
#ddebff
;
border-radius
:
2px
;
font-size
:
12px
;
font-family
:
MicrosoftYaHei
;
color
:
#055fe7
;
line-height
:
20px
;
text-align
:
center
;
margin-left
:
8px
;
}
//
脱密
.tm
{
display
:
inline-block
;
width
:
32px
;
height
:
20px
;
background
:
#ffebed
;
border-radius
:
2px
;
font-size
:
12px
;
font-family
:
MicrosoftYaHei
;
color
:
#e60012
;
line-height
:
20px
;
text-align
:
center
;
margin-left
:
8px
;
}
//
隐藏掉
table
多选框
.delSelection
/
deep
/
.el-table-column--selection
.cell
{
display
:
none
;
...
...
src/views/AllPersonnelBase/gzlb.vue
View file @
2880cf39
...
...
@@ -258,6 +258,7 @@
prop=
"followPerson.barcode"
label=
"人员编号"
:width=
"width2"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -279,6 +280,7 @@
prop=
"followPerson.idcard"
label=
"身份证号"
:width=
"width3"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -420,6 +422,7 @@
prop=
"followCase.barcode"
label=
"案事件编号"
:width=
"width6"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -433,6 +436,7 @@
prop=
"followCase.collectunitName"
label=
"提取单位"
:width=
"width3"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
src/views/AllPersonnelBase/qbalk.vue
View file @
2880cf39
...
...
@@ -124,6 +124,7 @@
prop=
"ysxtAsjbh"
label=
"案事件编号"
:width=
"width1"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -137,6 +138,7 @@
prop=
"xckybh"
label=
"现勘编号"
:width=
"width1"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
src/views/drFPTX/RAList.vue
View file @
2880cf39
...
...
@@ -341,6 +341,7 @@
prop=
"barcode"
:label=
"showType == 1?'人员编号':'案事件编号'"
:width=
"width1"
show-overflow-tooltip
>
</el-table-column>
<!-- <el-table-column
...
...
@@ -359,8 +360,36 @@
<el-table-column
prop=
"statusName"
label=
"状态"
:width=
"width3"
:width=
"width6"
>
<
template
slot-scope=
"scope"
>
<span
class=
"zt1"
v-if=
"scope.row.status==1"
></span>
<span
class=
"zt0"
v-if=
"scope.row.status==0"
></span>
<span>
{{
scope
.
row
.
statusName
}}
</span>
<!-- scope.row.status==1?'zt1':'zt0' -->
<span
v-if=
"scope.row.failReason"
class=
"history"
>
<el-tooltip
class=
"item"
effect=
"dark"
placement=
"left"
>
<div
slot=
"content"
>
{{
scope
.
row
.
failReason
}}
</div>
<img
src=
"../../assets/img/confirm/history2x.png"
@
click
.
stop=
"getDialog(scope.row)"
/>
</el-tooltip>
</span>
</
template
>
</el-table-column>
<el-table-column
fixed=
"right"
...
...
@@ -527,6 +556,7 @@
prop=
"barcode"
label=
"人员编号/案事件编号"
:width=
"width1"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<div>
{{
scope
.
row
.
srcBarcode
}}
</div>
...
...
@@ -549,8 +579,36 @@
<el-table-column
prop=
"statusName"
label=
"状态"
:width=
"width3"
:width=
"width6"
>
<
template
slot-scope=
"scope"
>
<span
class=
"zt1"
v-if=
"scope.row.status==1"
></span>
<span
class=
"zt0"
v-if=
"scope.row.status==0"
></span>
<span>
{{
scope
.
row
.
statusName
}}
</span>
<!-- scope.row.status==1?'zt1':'zt0' -->
<span
v-if=
"scope.row.failReason"
class=
"history"
>
<el-tooltip
class=
"item"
effect=
"dark"
placement=
"left"
>
<div
slot=
"content"
>
{{
scope
.
row
.
failReason
}}
</div>
<img
src=
"../../assets/img/confirm/history2x.png"
@
click
.
stop=
"getDialog(scope.row)"
/>
</el-tooltip>
</span>
</
template
>
</el-table-column>
<el-table-column
fixed=
"right"
...
...
@@ -718,6 +776,7 @@ export default {
this
.
width3
=
(
this
.
width3
*
w2
)
/
w1
;
this
.
width4
=
(
this
.
width4
*
w2
)
/
w1
;
this
.
width5
=
(
this
.
width5
*
w2
)
/
w1
;
this
.
width6
=
(
this
.
width6
*
w2
)
/
w1
;
},
data
()
{
return
{
...
...
@@ -727,6 +786,7 @@ export default {
width2
:
250
,
width1
:
250
,
height
:
460
,
width6
:
160
,
dataType
:
null
,
// 导入类型
barcode
:
""
,
// 条码号
logicDatabaseoptions
:
[
...
...
@@ -949,8 +1009,12 @@ export default {
statusName
:
row
.
pcImportRecordGrandchildren
[
0
].
statusName
,
logicBatabaseName
:
row
.
pcImportRecordGrandchildren
[
0
].
logicBatabaseName
,
pcImportRecordGrandchildren
:
row
.
pcImportRecordGrandchildren
,
dataTypeName
:
row
.
pcImportRecordGrandchildren
[
0
].
dataTypeName
,
failReason
:
row
.
pcImportRecordGrandchildren
[
0
].
failReason
,
id
:
row
.
pcImportRecordGrandchildren
[
0
].
id
,
importTime
:
row
.
pcImportRecordGrandchildren
[
0
].
importTime
,
loginDatabaseCode
:
row
.
pcImportRecordGrandchildren
[
0
].
loginDatabaseCode
,
status
:
row
.
pcImportRecordGrandchildren
[
0
].
status
,
expanded
:
false
,
};
//console.log(this.list[i]);
...
...
@@ -1040,6 +1104,8 @@ export default {
this
.
copyNum
=
[];
if
(
this
.
multipleSelection
.
length
===
0
)
{
this
.
$message
.
error
(
"请选择需要复制条码号的数据!"
);
this
.
selectBoo
=
true
;
this
.
isShowTip
=
true
;
}
else
{
self
.
multipleSelection
.
forEach
((
item
)
=>
{
self
.
copyNum
.
push
(
item
.
barcode
);
...
...
@@ -1100,26 +1166,30 @@ export default {
//console.log("添加到队列");
if
(
this
.
multipleSelection
.
length
===
0
)
{
this
.
$message
.
error
(
"请选择需要添加到队列的数据!"
);
this
.
isSelected
=
true
;
this
.
selectBoo
=
true
;
this
.
isShowTip
=
true
}
else
{
if
(
this
.
showType
==
1
)
{
this
.
type
=
"ry"
this
.
rowData
=
this
.
multipleSelection
;
this
.
isShowTjddl
=
true
;
//console.log('人员人员')
}
else
if
(
this
.
showType
==
3
)
{
this
.
type
=
'aj'
//console.log('案件案件')
}
this
.
rowData
=
this
.
multipleSelection
;
this
.
isShowTjddl
=
true
;
//
this.rowData = this.multipleSelection;
//
this.isShowTjddl = true;
}
},
closeTjddl
(
val
)
{
this
.
$bus
.
emit
(
'isBlur'
,
val
)
//console.log("添加到队列关闭", val);
this
.
isShowTjddl
=
val
;
},
//复制条码列表操作
isShowFztmBtn
(
val
)
{
console
.
log
(
val
,
'hahahahahah '
)
//
console.log(val, 'hahahahahah ')
//console.log("复制条码", val);
if
(
this
.
showType
==
1
)
{
this
.
type
=
"ry"
...
...
@@ -1147,7 +1217,8 @@ export default {
isShowFcxBtn
()
{
if
(
this
.
multipleSelection
.
length
===
0
)
{
this
.
$message
.
error
(
"请选择需要发查询的数据!"
);
this
.
isSelected
=
true
;
this
.
selectBoo
=
true
;
this
.
isShowTip
=
true
}
else
{
if
(
this
.
showType
==
1
)
{
this
.
type
=
"ry"
...
...
@@ -1315,6 +1386,36 @@ export default {
};
</
script
>
<
style
scoped
lang=
"scss"
>
.zt1
{
display
:
inline-block
;
width
:
8px
;
height
:
8px
;
background
:
#055fe7
;
border-radius
:
50%
;
margin-right
:
6px
;
}
.zt0
{
display
:
inline-block
;
width
:
8px
;
height
:
8px
;
border-radius
:
50%
;
background
:
#fe0000
;
margin-right
:
6px
;
}
.history
{
width
:
12px
;
height
:
12px
;
margin-left
:
4px
;
margin-bottom
:
3px
;
cursor
:
pointer
;
img
{
width
:
12px
;
height
:
12px
;
margin-left
:
4px
;
margin-bottom
:
3px
;
cursor
:
pointer
;
}
}
.delSelection
/
deep
/
.el-table-column--selection
.cell
{
display
:
none
;
}
...
...
src/views/zljc/Index.vue
View file @
2880cf39
...
...
@@ -31,7 +31,7 @@
@
keyup
.
enter
.
native=
"search"
>
<el-option
label=
"
未
检查"
label=
"
待
检查"
value=
"0"
></el-option>
<el-option
...
...
@@ -142,12 +142,14 @@
prop=
"barcode"
label=
"人员编号"
:width=
"width1"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop=
"name"
label=
"姓名"
:width=
"width3"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -187,7 +189,7 @@
:width=
"width3"
>
<template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.inspectionFlag==0"
>
未
检查
</div>
<div
v-if=
"scope.row.inspectionFlag==0"
>
待
检查
</div>
<div
v-if=
"scope.row.inspectionFlag==1"
>
已检查
</div>
<div
v-if=
"scope.row.inspectionFlag==2"
>
合格
</div>
<div
v-if=
"scope.row.inspectionFlag==3"
>
不合格
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment