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
8238d8ff
Commit
8238d8ff
authored
Dec 08, 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
961c218a
9ad52eec
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
12 deletions
+34
-12
src/router/modules/leftMenu.js
+1
-1
src/views/drFPTX/RAList.vue
+31
-9
src/views/zljc/jcxq.vue
+1
-1
src/views/zljc/modules/nyzw.vue
+1
-1
No files found.
src/router/modules/leftMenu.js
View file @
8238d8ff
...
...
@@ -124,7 +124,7 @@ export default [
{
path
:
"/jcxq"
,
name
:
"jcxq"
,
hidden
:
fals
e
,
hidden
:
tru
e
,
icon_d
:
"/img/zljc_d.png"
,
icon_a
:
"/img/zljc_a.png"
,
meta
:
{
...
...
src/views/drFPTX/RAList.vue
View file @
8238d8ff
...
...
@@ -35,7 +35,23 @@
</div>
<div
class=
"search ljfk"
>
<div
class=
"item"
>
逻辑分库:
</div>
<el-select
<div
v-if=
"showType==1"
>
<SelectCode
codeUrl=
"/api/code/personLogic"
width=
"10.5"
:form=
"ruleForm"
id=
"logicDatabase"
></SelectCode>
</div>
<div
v-if=
"showType==3"
>
<SelectCode
codeUrl=
"/api/code/caseLogic"
width=
"10.5"
:form=
"ruleForm"
id=
"logicDatabase"
></SelectCode>
</div>
<!--
<el-select
v-model=
"logicDatabase"
placeholder=
"请选择逻辑分库"
@
keyup
.
enter
.
native=
"search"
...
...
@@ -47,7 +63,7 @@
:value=
"item.value"
>
</el-option>
</el-select>
</el-select>
-->
</div>
<div
class=
'search taskNumber'
>
<div
class=
'item'
>
任务号:
</div>
...
...
@@ -673,6 +689,7 @@ import "@/icons/tree_c.svg";
import
tjddl
from
"../AllPersonnelBase/modules/tjddl.vue"
;
// 添加到队列弹窗
import
fztm
from
"../AllPersonnelBase/modules/fztm.vue"
;
// 复制数据弹窗
import
fcx
from
"../AllPersonnelBase/modules/fcx.vue"
;
// 发查询弹窗
import
SelectCode
from
"@/components/SelectCode.vue"
;
import
moment
from
"moment"
;
export
default
{
name
:
"RAList"
,
...
...
@@ -680,6 +697,7 @@ export default {
tjddl
,
fztm
,
fcx
,
SelectCode
},
created
()
{
let
w1
=
1920
;
...
...
@@ -722,6 +740,10 @@ export default {
],
status
:
null
,
// 入库状态
logicDatabase
:
""
,
// 逻辑库
ruleForm
:
{
logicDatabase
:
""
,
// 逻辑库
},
startEndDate
:
null
,
// 时间
taskNumber
:
""
,
// 任务号
showType
:
1
,
// 1:人 3:案 2:比中
...
...
@@ -808,7 +830,7 @@ export default {
dataType
:
1
,
// 人员or案件
status
:
null
,
// 状态
barcode
:
""
,
// 条码号
logicDatabase
:
""
,
// 逻辑分库
logicDatabase
Code
:
""
,
// 逻辑分库
sendTimeStart
:
null
,
// 开始时间
sendTimeEnd
:
null
,
// 结束时间
offSet
:
null
,
// 当前页数
...
...
@@ -818,7 +840,7 @@ export default {
// reqParam.status = Number(this.status)
reqParam
.
status
=
this
.
status
!=
null
?
Number
(
this
.
status
)
:
null
;
reqParam
.
barcode
=
this
.
barcode
;
reqParam
.
logicDatabase
=
this
.
logicDatabase
;
reqParam
.
logicDatabase
Code
=
this
.
ruleForm
.
logicDatabase
;
reqParam
.
sendTimeStart
=
this
.
sendTimeStart
=
this
.
sendTimeStart
;
reqParam
.
sendTimeEnd
=
this
.
sendTimeEnd
=
this
.
sendTimeStart
;
reqParam
.
offSet
=
this
.
currPage1
;
...
...
@@ -829,14 +851,14 @@ export default {
reqParam
=
{
status
:
null
,
// 状态
barcode
:
""
,
// 条码号
logicDatabase
:
""
,
// 逻辑分库
logicDatabase
Code
:
""
,
// 逻辑分库
queryType
:
""
,
// 类型
offSet
:
null
,
// 当前页数
limit
:
null
// 当页条数
};
reqParam
.
status
=
this
.
status
!=
null
?
Number
(
this
.
status
)
:
null
;
reqParam
.
barcode
=
this
.
barcode
;
reqParam
.
logicDatabase
=
this
.
logicDatabase
;
reqParam
.
logicDatabase
Code
=
this
.
ruleForm
.
logicDatabase
;
reqParam
.
queryType
=
this
.
queryType
;
reqParam
.
offSet
=
this
.
currPage2
;
reqParam
.
limit
=
this
.
pageSize
...
...
@@ -847,7 +869,7 @@ export default {
dataType
:
2
,
// 人员or案件
status
:
null
,
// 状态
barcode
:
""
,
// 条码号
logicDatabase
:
""
,
// 逻辑分库
logicDatabase
Code
:
""
,
// 逻辑分库
sendTimeStart
:
null
,
// 开始时间
sendTimeEnd
:
null
,
// 结束时间
offSet
:
null
,
// 当前页数
...
...
@@ -857,7 +879,7 @@ export default {
// reqParam.status = Number(this.status)
reqParam
.
status
=
this
.
status
!=
null
?
Number
(
this
.
status
)
:
null
;
reqParam
.
barcode
=
this
.
barcode
;
reqParam
.
logicDatabase
=
this
.
logicDatabase
;
reqParam
.
logicDatabase
Code
=
this
.
ruleForm
.
logicDatabase
;
reqParam
.
sendTimeStart
=
this
.
sendTimeStart
=
this
.
sendTimeStart
;
reqParam
.
sendTimeEnd
=
this
.
sendTimeEnd
=
this
.
sendTimeStart
;
reqParam
.
offSet
=
this
.
currPage1
;
...
...
@@ -930,7 +952,7 @@ export default {
this
.
dataType
=
null
;
// 人员or案件
this
.
status
=
null
;
// 状态
this
.
barcode
=
""
;
// 条码号
this
.
logicDatabase
=
""
;
// 逻辑分库
this
.
ruleForm
.
logicDatabase
=
""
;
// 逻辑分库
this
.
queryType
=
""
;
// 类型
this
.
startEndDate
=
null
;
// 时间
this
.
search
()
...
...
src/views/zljc/jcxq.vue
View file @
8238d8ff
...
...
@@ -47,7 +47,7 @@ export default {
},
data
()
{
return
{
radio1
:
'
2
'
,
radio1
:
'
1
'
,
rowData
:
{
barcode
:
''
,
// 人员条码号
id
:
''
,
// 人员id
...
...
src/views/zljc/modules/nyzw.vue
View file @
8238d8ff
...
...
@@ -128,7 +128,7 @@ export default {
}
}
.zw
{
background-color
:
#111
;
//
background-color
:
#111
;
}
}
...
...
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