Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tianjin
Project
Project
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
徐来柯
tianjin
Commits
69564844
Commit
69564844
authored
Jan 13, 2021
by
徐来柯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
6bcd53fc
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
308 additions
and
509 deletions
+308
-509
common.scss
src/assets/sass/common.scss
+6
-0
index.js
src/router/index.js
+1
-0
ManageList.vue
src/views/education/ManageList.vue
+281
-448
SearchForm.vue
src/views/education/component/SearchForm.vue
+3
-1
relateDialog.vue
src/views/education/component/relateDialog.vue
+1
-1
schedulingStatistics.vue
src/views/education/schedulingStatistics.vue
+16
-59
No files found.
src/assets/sass/common.scss
View file @
69564844
...
@@ -136,4 +136,9 @@
...
@@ -136,4 +136,9 @@
margin-left
:
10px
;
margin-left
:
10px
;
}
}
}
}
}
.el-table
.warning-row
td
{
background
:
#ff4949
!
important
;
color
:
#fff
!
important
;
}
}
\ No newline at end of file
src/router/index.js
View file @
69564844
...
@@ -111,6 +111,7 @@ const productManage = () =>
...
@@ -111,6 +111,7 @@ const productManage = () =>
import
(
'@/views/education/productManage.vue'
);
import
(
'@/views/education/productManage.vue'
);
const
ProductionPlan
=
()
=>
const
ProductionPlan
=
()
=>
import
(
'@/views/education/ProductionPlan.vue'
);
import
(
'@/views/education/ProductionPlan.vue'
);
// 生产排程统计页面
const
ManageList
=
()
=>
const
ManageList
=
()
=>
import
(
'@/views/education/ManageList.vue'
);
import
(
'@/views/education/ManageList.vue'
);
const
ProducSchedule
=
()
=>
const
ProducSchedule
=
()
=>
...
...
src/views/education/ManageList.vue
View file @
69564844
<!--
* @Description: 这是***页面(组件)
* @Date: 2020-08-10 09:10:53
* @Author: Tao
* @LastEditors: Tao
* @LastEditTime: 2020-08-27 11:01:37
-->
<
template
>
<
template
>
<div
class=
"lineBox"
>
<div
class=
"box-container"
>
<div
class=
"LineCenten"
>
<div
class=
"wrap"
>
<Head
type=
"12"
></Head>
<search-form
:formList=
"[1,2]"
:searchList=
"searchList"
:formData=
"formData"
@
searchData=
"searchData"
/>
<div
class=
"conterFool_middle"
style=
"width:98%;margin:auto"
>
<el-table
<el-table
border
border
height=
"675"
height=
"675"
ref=
"multipleTable"
class=
"conterFool_middle"
:data=
"tableData"
ref=
"multipleTable"
class=
"table-style"
:data=
"tableData"
tooltip-effect=
"dark"
tooltip-effect=
"dark"
style=
"width: 100%"
style=
"width: 100%"
>
:row-class-name=
"tableRowClassName"
<el-table-column
>
label=
"序号"
<el-table-column
:show-overflow-tooltip=
"true"
label=
"序号"
width=
"185"
:show-overflow-tooltip=
"true"
prop=
"NO"
>
width=
"80"
</el-table-column>
prop=
"NO"
>
<el-table-column
</el-table-column>
label=
"生产计划编号"
<el-table-column
:show-overflow-tooltip=
"true"
label=
"生产排程编号"
width=
"185"
:show-overflow-tooltip=
"true"
prop=
"PlanNO"
>
prop=
"PlanID"
</el-table-column>
width=
"180"
>
<el-table-column
</el-table-column>
label=
"产品编号"
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"ProductID"
width=
"185"
label=
"产品编号"
prop=
"Num"
>
:show-overflow-tooltip=
"true"
</el-table-column>
width=
"180"
>
<el-table-column
</el-table-column>
label=
"产品名称"
<el-table-column
:show-overflow-tooltip=
"true"
label=
"产品名称"
prop=
"ProductName"
:show-overflow-tooltip=
"true"
width=
"300"
>
prop=
"ProductName"
</el-table-column>
width=
"180"
>
<el-table-column
</el-table-column>
prop=
"ProductDescirbe"
<el-table-column
label=
"产品描述"
label=
"产品描述"
:show-overflow-tooltip=
"true"
:show-overflow-tooltip=
"true"
width=
"310"
>
prop=
"Pdesc"
</el-table-column>
width=
"180"
>
<el-table-column
</el-table-column>
prop=
"unit"
<el-table-column
label=
"单位"
label=
"单位"
:show-overflow-tooltip=
"true"
:show-overflow-tooltip=
"true"
width=
"310"
>
prop=
"Prounit"
</el-table-column>
width=
"180"
>
<el-table-column
</el-table-column>
label=
"计划交货日期"
<el-table-column
:show-overflow-tooltip=
"true"
label=
"计划交货日期"
prop=
"PlanDay"
:show-overflow-tooltip=
"true"
width=
"310"
>
prop=
"DeliveryDt"
</el-table-column>
width=
"210"
>
<el-table-column
</el-table-column>
label=
"计划数量"
<el-table-column
:show-overflow-tooltip=
"true"
label=
"排程数量"
prop=
"PlanCount"
:show-overflow-tooltip=
"true"
width=
"185"
>
prop=
"Quantity"
</el-table-column>
width=
"140"
>
<el-table-column
</el-table-column>
label=
"排程数量"
<el-table-column
:show-overflow-tooltip=
"true"
label=
"完工数量"
prop=
"PaiCount"
:show-overflow-tooltip=
"true"
width=
"185"
>
prop=
"FinishQuantity"
</el-table-column>
width=
"180"
>
<el-table-column
<template
slot-scope=
"scope"
>
label=
"完工数量"
<span>
{{
scope
.
row
.
FinishQuantity
}}
</span>
:show-overflow-tooltip=
"true"
<span
@
click=
"openRelate('FinishQuantity',scope.row)"
class=
"relateBtn plan_relateBtn"
>
选 择
</span>
prop=
"FinishCount"
</
template
>
width=
"185"
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
label=
"实际开工日期"
label=
"实际完工日期"
:show-overflow-tooltip=
"true"
:show-overflow-tooltip=
"true"
prop=
"StartDt"
prop=
"finishDay"
width=
"180"
width=
"300"
>
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
label=
"生产计划状态"
label=
"实际完工日期"
:show-overflow-tooltip=
"true"
:show-overflow-tooltip=
"true"
prop=
"status"
prop=
"EndDt"
width=
"210"
width=
"180"
>
>
</el-table-column>
</el-table-column>
</el-table>
<el-table-column
</div>
label=
"生产排程状态"
:show-overflow-tooltip=
"true"
prop=
"TextStatus"
width=
"180"
>
</el-table-column>
</el-table>
<div
class=
"conterFool_bottom"
>
<Pagination
ref=
"page"
:totalCount=
"totalCount"
:totalPage=
"totalPage"
@
pageFun=
"pageFun"
/>
<div
@
click=
"jump"
class=
"bottom_jump"
>
跳转
</div>
<div
class=
"bottom_input"
>
<span>
第
</span>
<input
v-model=
"num"
@
input=
"jumpInp()"
class=
"text"
type=
"text"
/>
<span>
页
</span>
</div>
<div
@
click=
"end"
class=
"bottom_end"
>
末页
</div>
<div
ref=
"next"
@
click=
"next"
class=
"bottom_next"
>
下一页
</div>
<div
ref=
"last"
@
click=
"last"
class=
"bottom_last"
>
上一页
</div>
<div
@
click=
"firest"
class=
"bottom_firest"
>
首页
</div>
<div
class=
"bottom_text"
>
<span>
共
{{
TotalCount
}}
条记录 当前第
{{
PageIndex
}}
页 共
{{
TotalPage
}}
页 每页
{{
PageSize
}}
条记录
</span>
</div>
</div>
</div>
<deletePop
ref=
"delete"
:deletetext=
"deletetext"
:type=
"typeV"
v-if=
"deleteShow"
></deletePop>
<div
v-if=
"popShow || deleteShow"
class=
"box"
></div>
</div>
</div>
<delete-pop
ref=
"delete"
:deletetext=
"deletetext"
:type=
"typeV"
v-if=
"deleteShow"
></delete-pop>
<relate-dialog
v-if=
"relateShow"
:relateType=
"relateType"
@
conserve=
"saveData"
@
closeDialog=
"closeDialog"
/>
</div>
</template>
</template>
<
script
>
<
script
>
import
Head
from
'./component/head.vue
'
import
searchForm
from
'./component/searchForm
'
import
deletePop
from
'./component/deletePop'
import
deletePop
from
'./component/deletePop'
import
Pagination
from
'./component/Pagination.vue'
import
relateDialog
from
'./component/relateDialog'
export
default
{
export
default
{
components
:{
components
:
{
searchForm
,
relateDialog
,
Pagination
},
Head
,
data
()
{
deletePop
return
{
},
tableData
:
[],
data
()
{
AllTableData
:
[],
return
{
cloneData
:
[],
tableData
:[],
popShow
:
false
,
AllTableData
:[],
relateShow
:
false
,
ss
:
''
,
checkList
:
[],
num
:
1
,
ID
:
null
,
TotalCount
:
1
,
searchList
:
[
PageIndex
:
1
,
{
TotalPage
:
1
,
id
:
'不限'
,
PageSize
:
50
,
name
:
''
deleteShow
:
false
,
},
popShow
:
false
,
{
CheckDeleteShow
:
true
,
id
:
'生产计划编号'
,
argKeyWord
:
''
,
name
:
'生产计划编号'
deletetext
:
''
,
},
itemdata
:[],
{
deleteRowData
:[],
id
:
'产品编号'
,
deleteManyData
:[],
name
:
'产品编号'
typeV
:
''
,
},
type
:
''
,
{
}
id
:
'产品名称'
,
},
name
:
'产品名称'
props
:[],
},
watch
:{},
{
created
(){
id
:
'产品描述'
,
this
.
query
()
name
:
'产品描述'
},
{
id
:
'计划交货日期'
,
name
:
'计划交货日期'
},
{
id
:
'实际完工日期'
,
name
:
'实际完工日期'
},
{
id
:
'生产计划状态'
,
name
:
'生产计划状态'
},
],
deletetext
:
''
,
deleteShow
:
false
,
typeV
:
''
,
relateType
:
''
,
formData
:
{
argKeyWord
:
''
,
argWhere
:
''
,
dateValue
:
[
this
.
$moment
().
format
(
'YYYY-MM-DD 00:00:00'
),
this
.
$moment
().
format
(
'YYYY-MM-DD 23:59:59'
)],
scanValue
:
''
,
},
},
methods
:{
// 分页数据
//查询
totalCount
:
0
,
query
(){
// pageIndex: 1,
console
.
log
(
'请求'
)
totalPage
:
1
this
.
$axios
({
}
method
:
"post"
,
},
url
:
`/api/TJStatistics/Statistics_Query?argKeyWord=
${
this
.
argKeyWord
}
`
,
created
()
{
}).
then
((
res
)
=>
{
this
.
searchData
()
console
.
log
(
'res==>'
,
res
)
},
if
(
res
.
data
.
data
.
length
!=
0
){
methods
:
{
for
(
let
i
=
0
;
i
<
res
.
data
.
data
.
length
;
i
++
){
searchData
()
{
res
.
data
.
data
[
i
].
UpdateTime
=
this
.
$moment
(
res
.
data
.
data
[
i
].
UpdateTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
var
$this
=
this
}
var
postData
=
this
.
resetData
()
this
.
AllTableData
=
res
.
data
.
data
this
.
$axios
({
if
(
this
.
AllTableData
.
length
>
50
){
method
:
"post"
,
this
.
tableData
=
this
.
AllTableData
.
slice
(
0
,
50
)
url
:
`/api/StatisticsManage/StatisticsManage_Query?argKeyWord=
${
postData
.
argKeyWord
}
&argWhere=
${
postData
.
argWhere
}
&Stime=
${
postData
.
Stime
}
&Etime=
${
postData
.
Etime
}
`
,
}
else
{
}).
then
((
res
)
=>
{
this
.
tableData
=
this
.
AllTableData
if
(
res
.
data
.
data
.
length
!=
0
){
}
this
.
AllTableData
=
res
.
data
.
data
.
map
(
item
=>
({
this
.
TotalCount
=
this
.
AllTableData
.
length
...
item
,
this
.
PageIndex
=
1
DeliveryDt
:
item
.
DeliveryDt
?
this
.
$moment
(
item
.
DeliveryDt
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
''
,
this
.
TotalPage
=
Math
.
ceil
(
this
.
AllTableData
.
length
/
50
)
EndDt
:
item
.
EndDt
?
this
.
$moment
(
item
.
EndDt
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
''
}
else
{
}))
this
.
tableData
=
[]
// 克隆一份tableData数据
this
.
TotalCount
=
0
this
.
cloneData
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
AllTableData
))
this
.
PageIndex
=
1
if
(
this
.
AllTableData
.
length
>
this
.
$refs
.
page
.
pageSize
){
this
.
TotalPage
=
1
this
.
tableData
=
this
.
AllTableData
.
slice
(
0
,
this
.
$refs
.
page
.
pageSize
)
}
}).
catch
(
function
(
err
){
console
.
log
(
'err'
,
err
)
})
},
//查询值
textFun
(
text
){
this
.
argKeyWord
=
text
},
// 分页方法
pageFun
(
num
){
if
(
num
==
1
){
this
.
tableData
=
this
.
AllTableData
.
slice
(
0
,
50
)
}
else
{
this
.
tableData
=
this
.
AllTableData
.
slice
((
num
-
1
)
*
this
.
PageSize
+
1
,
this
.
PageSize
*
num
)
}
},
//上一页颜色
lastColor
(
text
){
if
(
text
==
'1'
){
this
.
$refs
.
last
.
style
.
color
=
'#F9D79C'
this
.
$refs
.
last
.
style
.
borderColor
=
'#F8CA7A'
this
.
$refs
.
last
.
style
.
background
=
'#F9F9F9'
}
else
{
this
.
$refs
.
last
.
style
.
color
=
'#FDA100'
this
.
$refs
.
last
.
style
.
borderColor
=
'#FDA100'
this
.
$refs
.
last
.
style
.
background
=
'#fff'
}
},
//下一页颜色
nextColor
(
text
){
if
(
text
==
'1'
){
this
.
$refs
.
next
.
style
.
color
=
'#F9D79C'
this
.
$refs
.
next
.
style
.
borderColor
=
'#F8CA7A'
this
.
$refs
.
next
.
style
.
background
=
'#F9F9F9'
}
else
{
}
else
{
this
.
$refs
.
next
.
style
.
color
=
'#FDA100'
this
.
tableData
=
this
.
AllTableData
this
.
$refs
.
next
.
style
.
borderColor
=
'#FDA100'
this
.
$refs
.
next
.
style
.
background
=
'#fff'
}
},
//跳转
jump
(){
if
(
this
.
PageIndex
!=
this
.
num
){
if
(
this
.
num
>
this
.
TotalPage
||
this
.
num
<
1
){
this
.
typeV
=
'3'
this
.
deleteShow
=
true
}
else
{
this
.
PageIndex
=
this
.
num
this
.
pageFun
(
this
.
PageIndex
)
}
if
(
this
.
PageIndex
==
1
){
this
.
lastColor
(
'1'
)
this
.
nextColor
(
'2'
)
}
if
(
this
.
PageIndex
==
this
.
TotalPage
){
this
.
nextColor
(
'1'
)
this
.
lastColor
(
'2'
)
}
}
},
//末页
end
(){
this
.
PageIndex
=
this
.
TotalPage
this
.
num
=
this
.
PageIndex
this
.
nextColor
(
'1'
)
this
.
lastColor
(
'2'
)
this
.
pageFun
(
this
.
PageIndex
)
},
//下一页
next
(){
if
(
this
.
PageIndex
<
this
.
TotalPage
){
this
.
nextColor
(
'2'
)
this
.
lastColor
(
'2'
)
this
.
PageIndex
=
this
.
PageIndex
+
1
this
.
num
=
this
.
PageIndex
this
.
pageFun
(
this
.
PageIndex
)
if
(
this
.
PageIndex
==
this
.
TotalPage
){
this
.
nextColor
(
'1'
)
}
}
}
},
this
.
totalCount
=
this
.
AllTableData
.
length
//上一页
// this.pageIndex = 1
last
(){
this
.
totalPage
=
Math
.
ceil
(
this
.
AllTableData
.
length
/
this
.
$refs
.
page
.
pageSize
)
if
(
this
.
PageIndex
>
1
){
}
else
{
this
.
nextColor
(
'2'
)
this
.
tableData
=
[]
this
.
lastColor
(
'2'
)
this
.
totalCount
=
0
this
.
PageIndex
=
this
.
PageIndex
-
1
// this.pageIndex = 1
this
.
num
=
this
.
PageIndex
this
.
totalPage
=
1
this
.
pageFun
(
this
.
PageIndex
)
}
if
(
this
.
PageIndex
==
1
){
this
.
pageFun
(
1
)
this
.
lastColor
(
'1'
)
}).
catch
(
function
(
err
){
}
console
.
log
(
'err'
,
err
)
}
})
},
},
//首页
tableRowClassName
({
row
,
rowIndex
})
{
firest
(){
row
.
EndDt
=
row
.
EndDt
===
''
?
0
:
row
.
EndDt
this
.
PageIndex
=
1
row
.
DeliveryDt
=
row
.
DeliveryDt
===
''
?
0
:
row
.
DeliveryDt
this
.
num
=
this
.
PageIndex
if
(
new
Date
(
row
.
EndDt
).
getTime
()
>
new
Date
(
row
.
DeliveryDt
).
getTime
())
{
this
.
nextColor
(
'2'
)
return
'warning-row'
this
.
lastColor
(
'1'
)
this
.
pageFun
(
this
.
PageIndex
)
},
jumpInp
(){
this
.
num
=
parseInt
(
this
.
num
)
if
(
String
(
this
.
num
)
==
'NaN'
){
this
.
num
=
''
}
},
}
}
}
return
''
;
</
script
>
},
<
style
lang=
"scss"
>
closeDialog
()
{
.LineCenten
{
this
.
relateShow
=
false
.el-table__header-wrapper
{
},
background
:
#5A6C98
;
saveData
(
data
)
{
}
var
$this
=
this
.el-table
th
.is-leaf
{
this
.
$axios
({
background
:
#5A6C98
;
method
:
"post"
,
color
:
#fff
;
url
:
`/api/ProductStorage/ProductStorage_WindowAddSave?ID=
${
this
.
ID
}
&VFinish=
${
data
.
Name
}
`
,
data
:
data
}).
then
((
res
)
=>
{
$this
.
relateShow
=
false
var
postData
=
$this
.
resetData
()
$this
.
searchData
(
postData
)
})
},
openRelate
(
type
,
row
)
{
this
.
ID
=
row
.
ID
this
.
relateType
=
type
this
.
relateShow
=
true
},
// 分页方法
pageFun
(
num
){
if
(
num
==
1
){
this
.
tableData
=
this
.
cloneData
.
slice
(
0
,
this
.
$refs
.
page
.
pageSize
)
}
else
{
this
.
tableData
=
this
.
cloneData
.
slice
((
num
-
1
)
*
this
.
$refs
.
page
.
pageSize
,
this
.
$refs
.
page
.
pageSize
*
num
)
}
},
resetData
()
{
return
{
argKeyWord
:
this
.
formData
.
argKeyWord
,
argWhere
:
this
.
formData
.
argWhere
,
Stime
:
this
.
formData
.
dateValue
?
this
.
$moment
(
this
.
formData
.
dateValue
[
0
]).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
''
,
Etime
:
this
.
formData
.
dateValue
?
this
.
$moment
(
this
.
formData
.
dateValue
[
1
]).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
''
}
},
//关闭提示弹窗
cancel_delete
(){
this
.
deleteShow
=
false
},
conserve
(
data
)
{
var
$this
=
this
this
.
$axios
({
method
:
"post"
,
url
:
`/api/ProductStorage/ProductStorage_WindowAddSave`
,
data
:
data
}).
then
((
res
)
=>
{
if
(
res
.
data
.
code
!=
0
){
$this
.
typeV
=
'5'
$this
.
deleteShow
=
true
}
else
{
$this
.
typeV
=
'6'
$this
.
popShow
=
false
}
$this
.
deletetext
=
res
.
data
.
msg
var
postData
=
$this
.
resetData
()
$this
.
searchData
(
postData
)
}).
catch
(
function
(
err
){
console
.
log
(
'err'
,
err
)
})
}
}
}
.el-table
td
,
.el-table
th
.is-leaf
{
text-align
:
center
;
}
.el-table--border
th
{
border
:
1px
solid
#EBEEF5
;
}
}
}
</
style
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.lineBox
{
.relateBtn
{
position
:
relative
;
width
:
75px
;
margin-top
:
100px
;
height
:
35px
;
width
:
100%
;
height
:calc
(
100vh
-
130px
)
;
background
:
#EEEEEE
;
padding-top
:
10px
;
.box
{
width
:
100%
;
height
:
100%
;
position
:
absolute
;
top
:
0
;
left
:
0
;
right
:
0
;
bottom
:
0
;
margin
:
auto
;
z-index
:
9
;
}
.table_remove
,
.table_edit
{
width
:
60px
;
height
:
30px
;
background
:rgba
(
255
,
255
,
255
,
1
)
;
border
:
2px
solid
rgba
(
228
,
228
,
228
,
1
);
border-radius
:
15px
;
position
:
relative
;
display
:
inline-block
;
display
:
inline-block
;
margin-left
:
8px
;
margin-left
:
20px
;
text-align
:
center
;
line-height
:
35px
;
cursor
:
pointer
;
cursor
:
pointer
;
}
.remove_img
{
position
:
absolute
;
top
:
0
;
left
:
0
;
bottom
:
0
;
right
:
0
;
margin
:auto
;
width
:
20px
;
height
:
20px
;
background
:
url('../../assets/images/icon_dell.png')
;
background-size
:cover
;
}
.edit_img
{
position
:
absolute
;
top
:
0
;
left
:
0
;
bottom
:
0
;
right
:
0
;
margin
:auto
;
width
:
18px
;
height
:
20px
;
background
:
url('../../assets/images/icon_pensoil.png')
;
background-size
:cover
;
}
.LineCenten
{
width
:
98%
;
height
:
98%
;
margin
:auto
;
background
:
#fff
;
padding-top
:
24px
;
}
.head
{
margin-bottom
:
20px
;
box-sizing
:
border-box
;
}
}
.conterFool_bottom
{
width
:
97%
;
margin
:
auto
;
height
:
60px
;
padding-top
:
15px
;
user-select
:
none
;
user-select
:
none
;
.bottom_text
{
background
:rgba
(
255
,
255
,
255
,
1
)
;
float
:
left
;
border
:
1px
solid
rgba
(
37
,
92
,
193
,
1
);
color
:
#929292
;
border-radius
:
4px
;
font-size
:
14px
;
box-sizing
:
border-box
;
}
font-size
:
14px
;
.bottom_firest
{
font-family
:
Microsoft
YaHei
;
width
:
65px
;
font-weight
:
400
;
height
:
30px
;
color
:rgba
(
51
,
51
,
51
,
1
)
;
line-height
:
28px
;
text-align
:center
;
color
:
#FDA100
;
border
:
1px
solid
#FDA100
;
box-sizing
:
border-box
;
float
:
right
;
border-radius
:
5px
;
margin-left
:
10px
;
cursor
:
pointer
;
}
.bottom_last
{
cursor
:
pointer
;
width
:
80px
;
height
:
30px
;
line-height
:
28px
;
text-align
:center
;
color
:
#F9D79C
;
border
:
1px
solid
#F8CA7A
;
box-sizing
:
border-box
;
background
:
#f9f9f9
;
float
:
right
;
border-radius
:
5px
;
margin-left
:
10px
;
}
.bottom_next
{
cursor
:
pointer
;
float
:
right
;
width
:
80px
;
height
:
30px
;
line-height
:
28px
;
text-align
:center
;
color
:
#FDA100
;
border
:
1px
solid
#FDA100
;
box-sizing
:
border-box
;
border-radius
:
5px
;
margin-left
:
10px
;
}
.bottom_end
{
cursor
:
pointer
;
float
:
right
;
width
:
80px
;
height
:
30px
;
line-height
:
28px
;
text-align
:center
;
color
:
#FDA100
;
border
:
1px
solid
#FDA100
;
box-sizing
:
border-box
;
border-radius
:
5px
;
margin-left
:
10px
;
}
.bottom_input
{
float
:
right
;
margin-left
:
10px
;
color
:
#9C9C9C
;
.text
{
display
:
inline-block
;
width
:
65px
;
height
:
30px
;
margin
:
0
5px
;
text-align
:
center
;
color
:
#FDA100
;
}
}
.bottom_jump
{
cursor
:
pointer
;
float
:
right
;
width
:
80px
;
height
:
30px
;
line-height
:
28px
;
text-align
:center
;
color
:
#FDA100
;
border
:
1px
solid
#FDA100
;
box-sizing
:
border-box
;
border-radius
:
5px
;
margin-left
:
10px
;
}
}
}
</
style
>
</
style
>
\ No newline at end of file
src/views/education/component/SearchForm.vue
View file @
69564844
...
@@ -95,7 +95,9 @@ export default {
...
@@ -95,7 +95,9 @@ export default {
},
},
created
()
{
created
()
{
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
codeInput
.
focus
()
if
(
this
.
$refs
.
codeInput
)
{
this
.
$refs
.
codeInput
.
focus
()
}
})
})
},
},
methods
:
{
methods
:
{
...
...
src/views/education/component/relateDialog.vue
View file @
69564844
...
@@ -247,7 +247,7 @@ export default {
...
@@ -247,7 +247,7 @@ export default {
return
return
}
}
}
}
if
(
this
.
relateType
===
'VPlanQuantity'
)
{
if
(
this
.
relateType
===
'VPlanQuantity'
||
this
.
relateType
===
'FinishQuantity'
)
{
if
(
this
.
currentRow
.
DateType
.
indexOf
(
'整型'
)
!==
-
1
)
{
if
(
this
.
currentRow
.
DateType
.
indexOf
(
'整型'
)
!==
-
1
)
{
return
this
.
$emit
(
'conserve'
,
this
.
currentRow
,
this
.
relateType
)
return
this
.
$emit
(
'conserve'
,
this
.
currentRow
,
this
.
relateType
)
}
else
{
}
else
{
...
...
src/views/education/schedulingStatistics.vue
View file @
69564844
<
template
>
<
template
>
<div
class=
"box-container"
>
<div
class=
"box-container"
>
<div
class=
"wrap"
>
<div
class=
"wrap"
>
<search-form
:formList=
"[1,2]"
:searchList=
"searchList"
:formData=
"formData"
@
s
canGunCode=
"scanGunCode"
@
searchData=
"searchData"
@
openDialog=
"openDialog"
@
delData=
"del
Data"
/>
<search-form
:formList=
"[1,2]"
:searchList=
"searchList"
:formData=
"formData"
@
s
earchData=
"search
Data"
/>
<el-table
<el-table
border
border
height=
"675"
height=
"675"
...
@@ -10,11 +10,8 @@
...
@@ -10,11 +10,8 @@
class=
"table-style"
class=
"table-style"
tooltip-effect=
"dark"
tooltip-effect=
"dark"
style=
"width: 100%"
style=
"width: 100%"
@
selection-change=
"handleSelectionChange"
>
:row-class-name=
"tableRowClassName"
<el-table-column
>
type=
"selection"
width=
"60"
>
</el-table-column>
<el-table-column
<el-table-column
label=
"序号"
label=
"序号"
:show-overflow-tooltip=
"true"
:show-overflow-tooltip=
"true"
...
@@ -93,19 +90,17 @@
...
@@ -93,19 +90,17 @@
<Pagination
ref=
"page"
:totalCount=
"totalCount"
:totalPage=
"totalPage"
@
pageFun=
"pageFun"
/>
<Pagination
ref=
"page"
:totalCount=
"totalCount"
:totalPage=
"totalPage"
@
pageFun=
"pageFun"
/>
</div>
</div>
<store-dialog
:titleText=
"'产品入库单'"
:titleType=
"'pro'"
v-if=
"popShow"
@
closeDialog=
"closeDialog"
@
conserve=
"conserve"
/>
<delete-pop
ref=
"delete"
:deletetext=
"deletetext"
:type=
"typeV"
v-if=
"deleteShow"
></delete-pop>
<delete-pop
ref=
"delete"
:deletetext=
"deletetext"
:type=
"typeV"
v-if=
"deleteShow"
></delete-pop>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
searchForm
from
'./component/searchForm'
import
searchForm
from
'./component/searchForm'
import
storeDialog
from
'./component/storeDialog'
import
deletePop
from
'./component/deletePop'
import
deletePop
from
'./component/deletePop'
import
Pagination
from
'./component/Pagination.vue'
import
Pagination
from
'./component/Pagination.vue'
export
default
{
export
default
{
components
:
{
searchForm
,
storeDialog
,
deletePop
,
Pagination
},
components
:
{
searchForm
,
Pagination
},
data
()
{
data
()
{
return
{
return
{
tableData
:
[],
tableData
:
[],
...
@@ -166,7 +161,7 @@ export default {
...
@@ -166,7 +161,7 @@ export default {
this
.
searchData
()
this
.
searchData
()
},
},
methods
:
{
methods
:
{
searchData
()
{
searchData
()
{
var
$this
=
this
var
$this
=
this
var
postData
=
this
.
resetData
()
var
postData
=
this
.
resetData
()
this
.
$axios
({
this
.
$axios
({
...
@@ -200,8 +195,13 @@ export default {
...
@@ -200,8 +195,13 @@ export default {
console
.
log
(
'err'
,
err
)
console
.
log
(
'err'
,
err
)
})
})
},
},
handleSelectionChange
(
val
)
{
tableRowClassName
({
row
,
rowIndex
})
{
this
.
checkList
=
val
row
.
EndDt
=
row
.
EndDt
===
''
?
0
:
row
.
EndDt
row
.
DeliveryDt
=
row
.
DeliveryDt
===
''
?
0
:
row
.
DeliveryDt
if
(
new
Date
(
row
.
EndDt
).
getTime
()
>
new
Date
(
row
.
DeliveryDt
).
getTime
())
{
return
'warning-row'
}
return
''
;
},
},
// 分页方法
// 分页方法
pageFun
(
num
){
pageFun
(
num
){
...
@@ -211,25 +211,6 @@ export default {
...
@@ -211,25 +211,6 @@ export default {
this
.
tableData
=
this
.
cloneData
.
slice
((
num
-
1
)
*
this
.
$refs
.
page
.
pageSize
,
this
.
$refs
.
page
.
pageSize
*
num
)
this
.
tableData
=
this
.
cloneData
.
slice
((
num
-
1
)
*
this
.
$refs
.
page
.
pageSize
,
this
.
$refs
.
page
.
pageSize
*
num
)
}
}
},
},
// 扫码枪扫码
scanGunCode
(
value
)
{
console
.
log
(
'开始扫码。。。'
)
this
.
$axios
({
method
:
"post"
,
url
:
`/api/ProductStorage/ProductStorage_ScanCodeAdd?ScanCode=
${
value
}
`
,
}).
then
((
res
)
=>
{
console
.
log
(
'扫码成功。。。'
)
var
postData
=
{
argKeyWord
:
this
.
formData
.
argKeyWord
,
argWhere
:
this
.
formData
.
argWhere
,
Stime
:
this
.
formData
.
dateValue
?
this
.
$moment
(
this
.
formData
.
dateValue
[
0
]).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
''
,
Etime
:
this
.
formData
.
dateValue
?
this
.
$moment
(
this
.
formData
.
dateValue
[
1
]).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
''
}
this
.
searchData
(
this
.
postData
)
}).
catch
(()
=>
{
console
.
log
(
'扫码失败。。。'
)
})
},
resetData
()
{
resetData
()
{
return
{
return
{
argKeyWord
:
this
.
formData
.
argKeyWord
,
argKeyWord
:
this
.
formData
.
argKeyWord
,
...
@@ -238,36 +219,12 @@ export default {
...
@@ -238,36 +219,12 @@ export default {
Etime
:
this
.
formData
.
dateValue
?
this
.
$moment
(
this
.
formData
.
dateValue
[
1
]).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
''
Etime
:
this
.
formData
.
dateValue
?
this
.
$moment
(
this
.
formData
.
dateValue
[
1
]).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
''
}
}
},
},
delData
()
{
var
$this
=
this
if
(
$this
.
checkList
.
length
===
0
)
{
$this
.
deleteShow
=
true
$this
.
typeV
=
2
}
else
{
var
list
=
[]
$this
.
checkList
.
forEach
((
item
)
=>
{
list
.
push
(
item
.
ID
)
})
$this
.
$axios
({
method
:
"post"
,
url
:
`/api/ProductStorage/ProductStorage_Delete`
,
data
:
list
}).
then
((
res
)
=>
{
var
postData
=
$this
.
resetData
()
$this
.
searchData
(
postData
)
})
}
},
//关闭提示弹窗
//关闭提示弹窗
cancel_delete
(){
cancel_delete
(){
this
.
deleteShow
=
false
this
.
deleteShow
=
false
},
},
openDialog
()
{
this
.
popShow
=
true
},
closeDialog
()
{
this
.
popShow
=
false
},
conserve
(
data
)
{
conserve
(
data
)
{
var
$this
=
this
var
$this
=
this
this
.
$axios
({
this
.
$axios
({
...
@@ -291,4 +248,5 @@ export default {
...
@@ -291,4 +248,5 @@ export default {
}
}
}
}
}
}
</
script
>
</
script
>
\ No newline at end of file
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