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
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
57 deletions
+24
-57
common.scss
src/assets/sass/common.scss
+6
-0
index.js
src/router/index.js
+1
-0
ManageList.vue
src/views/education/ManageList.vue
+0
-0
SearchForm.vue
src/views/education/component/SearchForm.vue
+2
-0
relateDialog.vue
src/views/education/component/relateDialog.vue
+1
-1
schedulingStatistics.vue
src/views/education/schedulingStatistics.vue
+14
-56
No files found.
src/assets/sass/common.scss
View file @
69564844
...
@@ -137,3 +137,8 @@
...
@@ -137,3 +137,8 @@
}
}
}
}
}
}
.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
This diff is collapsed.
Click to expand it.
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
(()
=>
{
if
(
this
.
$refs
.
codeInput
)
{
this
.
$refs
.
codeInput
.
focus
()
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
:
[],
...
@@ -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
({
...
@@ -292,3 +249,4 @@ export default {
...
@@ -292,3 +249,4 @@ export default {
}
}
}
}
</
script
>
</
script
>
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