Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
卡
卡车调度系统
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
caicaicai
卡车调度系统
Commits
d504f583
Commit
d504f583
authored
Aug 26, 2022
by
xxx
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://h.gemho.cn:7099/caicaicai/truckDispatching
parents
d755b2ca
3b2948ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
64 additions
and
29 deletions
+64
-29
common.js
src/assets/js/common.js
+18
-0
index.vue
src/views/productionPlanManagement/productionPlan/index.vue
+46
-29
No files found.
src/assets/js/common.js
View file @
d504f583
...
@@ -2292,6 +2292,24 @@ var HttpReq = function(){
...
@@ -2292,6 +2292,24 @@ var HttpReq = function(){
params
:
param
params
:
param
})
})
},
},
//大屏数据分析——采区产量统计
AreaNewPlan
:
function
(
param
){
return
request
({
url
:
'
/api/AreaNew/plan
'
,
method
:
'
get
'
,
params
:
param
})
},
//大屏数据分析——采区产量统计
addOnePlan
:
function
(
data
){
return
request
({
url
:
'
/api/Plan/addOne
'
,
method
:
'
POST
'
,
data
:
data
,
}).
then
((
res
)
=>
{
return
res
})
},
...
...
src/views/productionPlanManagement/productionPlan/index.vue
View file @
d504f583
...
@@ -37,27 +37,27 @@
...
@@ -37,27 +37,27 @@
<el-form-item
label=
"生产计划月份"
prop=
"month"
>
<el-form-item
label=
"生产计划月份"
prop=
"month"
>
<el-date-picker
v-model=
"form.item.month"
type=
"month"
placeholder=
"选择月份"
style=
"width:280px;"
></el-date-picker>
<el-date-picker
v-model=
"form.item.month"
type=
"month"
placeholder=
"选择月份"
style=
"width:280px;"
></el-date-picker>
</el-form-item>
</el-form-item>
<el-table
:data=
"formTable"
style=
"width: 100%"
>
<el-table
:data=
"formTable"
style=
"width: 100%
;margin-bottom:5px;
"
>
<el-table-column
prop=
"
id
"
label=
"采区"
>
<el-table-column
prop=
"
name
"
label=
"采区"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-input
<el-input
size=
"small"
size=
"small"
v-model=
"scope.row.
id
"
v-model=
"scope.row.
name
"
v-show=
"scope.row.showEdit"
v-show=
"scope.row.showEdit"
placeholder=
"请输入内容"
placeholder=
"请输入内容"
></el-input>
></el-input>
<span
v-show=
"!scope.row.showEdit"
>
{{
scope
.
row
.
id
}}
</span>
<span
v-show=
"!scope.row.showEdit"
>
{{
scope
.
row
.
name
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"
name
"
label=
"计划量(kg)"
>
<el-table-column
prop=
"
plan
"
label=
"计划量(kg)"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-input
<el-input
size=
"small"
size=
"small"
v-model=
"scope.row.
name
"
v-model=
"scope.row.
plan
"
v-show=
"scope.row.showEdit"
v-show=
"scope.row.showEdit"
placeholder=
"请输入内容"
placeholder=
"请输入内容"
></el-input>
></el-input>
<span
v-show=
"!scope.row.showEdit"
>
{{
scope
.
row
.
name
}}
</span>
<span
v-show=
"!scope.row.showEdit"
>
{{
scope
.
row
.
plan
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"操作"
>
<el-table-column
label=
"操作"
>
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<el-form-item
label=
"总计划量(T)"
prop=
"plan"
>
<el-form-item
label=
"总计划量(T)"
prop=
"plan"
>
<el-input
v-model=
"form.item.plan"
style=
"width:280px;"
placeholder=
"请输入总计划量(T)"
/>
<el-input
@
input=
"onInput"
v-model=
"form.item.plan"
style=
"width:280px;"
placeholder=
"请输入总计划量(T)"
/>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
@@ -113,6 +113,9 @@
...
@@ -113,6 +113,9 @@
<el-form-item
label=
"计划量(T)"
>
<el-form-item
label=
"计划量(T)"
>
<el-input
v-model=
"gradeFrom.item.plan"
style=
"width:260px;"
placeholder=
"请输入计划量(T)"
></el-input>
<el-input
v-model=
"gradeFrom.item.plan"
style=
"width:260px;"
placeholder=
"请输入计划量(T)"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"今日计划(T)"
>
<el-input
v-model=
"gradeFrom.item.nowPlan"
style=
"width:260px;"
placeholder=
"请输入今日计划量(T)"
></el-input>
</el-form-item>
<el-form-item
label=
"累计完成量(T)"
>
<el-form-item
label=
"累计完成量(T)"
>
<el-input
v-model=
"gradeFrom.item.total"
style=
"width:260px;"
placeholder=
"请输入累计完成量(T)"
></el-input>
<el-input
v-model=
"gradeFrom.item.total"
style=
"width:260px;"
placeholder=
"请输入累计完成量(T)"
></el-input>
</el-form-item>
</el-form-item>
...
@@ -133,22 +136,7 @@ export default {
...
@@ -133,22 +136,7 @@ export default {
components
:
{},
components
:
{},
data
()
{
data
()
{
return
{
return
{
formTable
:[
formTable
:[],
{
id
:
'
采区1
'
,
name
:
'
8000
'
,
showEdit
:
false
},
{
id
:
'
采区2
'
,
name
:
'
5000
'
,
showEdit
:
false
},
{
id
:
'
采区3
'
,
name
:
'
0
'
,
showEdit
:
false
}],
imgSrcStart
:
process
.
env
.
VUE_APP_LOCAL_API2
,
imgSrcStart
:
process
.
env
.
VUE_APP_LOCAL_API2
,
loading
:
false
,
loading
:
false
,
page
:
1
,
page
:
1
,
...
@@ -195,14 +183,23 @@ export default {
...
@@ -195,14 +183,23 @@ export default {
this
.
loadData
();
this
.
loadData
();
})
})
},
},
methods
:
{
methods
:
{
onInput
(
e
){
console
.
log
(
e
);
this
.
formTable
.
forEach
((
v
,
i
,
a
)
=>
{
v
.
plan
=
0
});
},
handleEdit
(
index
,
row
)
{
handleEdit
(
index
,
row
)
{
console
.
log
(
index
,
row
);
console
.
log
(
index
,
row
);
var
total
=
0
row
.
showEdit
=
!
row
.
showEdit
;
row
.
showEdit
=
!
row
.
showEdit
;
if
(
!
row
.
showEdit
)
{
if
(
!
row
.
showEdit
)
{
console
.
log
(
"
提交
"
);
this
.
formTable
.
forEach
((
v
,
i
,
a
)
=>
{
console
.
log
(
row
);
total
+=
Number
(
v
.
plan
)
});
}
}
this
.
form
.
item
.
plan
=
total
;
},
},
//获取生产计划数据
//获取生产计划数据
loadData
()
{
loadData
()
{
...
@@ -248,9 +245,17 @@ export default {
...
@@ -248,9 +245,17 @@ export default {
this
.
form
.
visible
=
true
;
this
.
form
.
visible
=
true
;
this
.
form
.
reqType
=
'
add
'
;
this
.
form
.
reqType
=
'
add
'
;
this
.
form
.
item
=
{};
this
.
form
.
item
=
{};
HttpReq
.
truckDispatching
.
AreaNewPlan
().
then
(
(
res
)
=>
{
if
(
res
.
code
==
200
){
this
.
formTable
=
res
.
data
;
console
.
log
(
res
);
}
})
},
},
toEdit
(
item
)
{
toEdit
(
item
)
{
// 请除表单验证
// 请除表单验证
var
sort
=
'
id,desc
'
;
var
param
=
{};
this
.
$refs
[
'
form1
'
]
&&
this
.
$refs
[
'
form1
'
].
clearValidate
();
this
.
$refs
[
'
form1
'
]
&&
this
.
$refs
[
'
form1
'
].
clearValidate
();
this
.
form
.
title
=
'
修改生产计划
'
;
this
.
form
.
title
=
'
修改生产计划
'
;
this
.
form
.
status
.
cu
=
0
;
this
.
form
.
status
.
cu
=
0
;
...
@@ -261,6 +266,14 @@ export default {
...
@@ -261,6 +266,14 @@ export default {
timePeriodCenter
.
push
(
this
.
form
.
item
.
startTime
);
timePeriodCenter
.
push
(
this
.
form
.
item
.
startTime
);
timePeriodCenter
.
push
(
this
.
form
.
item
.
endTime
);
timePeriodCenter
.
push
(
this
.
form
.
item
.
endTime
);
this
.
timePeriod
=
timePeriodCenter
;
this
.
timePeriod
=
timePeriodCenter
;
param
.
sort
=
sort
;
param
.
planId
=
this
.
form
.
item
.
id
;
HttpReq
.
truckDispatching
.
productionPlanNewAllQuery
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
//this.gradeLoading = false;
this
.
formTable
=
res
.
data
.
content
;
}
})
},
},
toDelete
(
item
)
{
toDelete
(
item
)
{
var
id
=
item
.
id
;
var
id
=
item
.
id
;
...
@@ -284,12 +297,16 @@ export default {
...
@@ -284,12 +297,16 @@ export default {
submitForm
(
validateName
,
item
){
submitForm
(
validateName
,
item
){
if
(
!
this
.
form
.
status
.
cu
){
if
(
!
this
.
form
.
status
.
cu
){
this
.
form
.
status
.
cu
=
2
;
this
.
form
.
status
.
cu
=
2
;
item
.
list
=
this
.
formTable
//return
this
.
$refs
[
validateName
].
validate
(
valid
=>
{
this
.
$refs
[
validateName
].
validate
(
valid
=>
{
if
(
valid
){
if
(
valid
){
if
(
this
.
form
.
reqType
===
'
add
'
){
if
(
this
.
form
.
reqType
===
'
add
'
){
this
.
reqAddItem
(
this
.
form
,
item
)
this
.
reqAddItem
(
this
.
form
,
item
)
this
.
formTable
=
[]
}
else
{
}
else
{
this
.
reqUpdateItem
(
this
.
form
,
item
)
this
.
reqUpdateItem
(
this
.
form
,
item
)
this
.
formTable
=
[]
}
}
}
else
{
}
else
{
this
.
form
.
status
.
cu
=
0
this
.
form
.
status
.
cu
=
0
...
@@ -300,7 +317,7 @@ export default {
...
@@ -300,7 +317,7 @@ export default {
//新增生产计划
//新增生产计划
reqAddItem
(
form
,
item
){
reqAddItem
(
form
,
item
){
let
lastData
=
{...
item
};
let
lastData
=
{...
item
};
HttpReq
.
truckDispatching
.
productionPlanAllAdd
(
lastData
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
addOnePlan
(
item
).
then
((
res
)
=>
{
form
.
visible
=
false
;
form
.
visible
=
false
;
if
(
res
.
code
==
200
){
if
(
res
.
code
==
200
){
this
.
$notify
({
this
.
$notify
({
...
@@ -323,7 +340,7 @@ export default {
...
@@ -323,7 +340,7 @@ export default {
//修改生产计划
//修改生产计划
reqUpdateItem
(
form
,
item
){
reqUpdateItem
(
form
,
item
){
let
lastData
=
{...
item
};
let
lastData
=
{...
item
};
HttpReq
.
truckDispatching
.
productionPlanAllUpdate
(
lastData
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
addOnePlan
(
item
).
then
((
res
)
=>
{
form
.
visible
=
false
;
form
.
visible
=
false
;
if
(
res
.
code
==
200
){
if
(
res
.
code
==
200
){
this
.
$notify
({
this
.
$notify
({
...
...
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