Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
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
mes
mes-ui
Commits
1a3a4c44
Commit
1a3a4c44
authored
Jan 27, 2024
by
何远江
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug 修改
parent
9cd82a65
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
28 deletions
+42
-28
index.vue
src/views/mes/pro/schedule/index.vue
+33
-25
indexApply.vue
src/views/mes/pro/workorder/indexApply.vue
+2
-1
proofingInfo.vue
src/views/mes/pro/workorder/proofingInfo.vue
+7
-2
No files found.
src/views/mes/pro/schedule/index.vue
View file @
1a3a4c44
...
...
@@ -289,7 +289,7 @@
<
el
-
row
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
<
el
-
form
-
item
label
=
"编号"
prop
=
"taskCode"
>
<
el
-
input
v
-
model
=
"form.taskCode"
readonly
=
"readonly"
disabled
/>
<
el
-
input
v
-
model
=
"form.taskCode"
readonly
=
"readonly"
disabled
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
...
...
@@ -299,24 +299,32 @@
<
/el-col
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
<
el
-
form
-
item
label
=
"产品名称"
prop
=
"itemName"
>
<
el
-
input
v
-
model
=
"form.itemName"
readonly
=
"readonly"
disabled
/>
<
el
-
input
v
-
model
=
"form.itemName"
readonly
=
"readonly"
disabled
/>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
<
el
-
form
-
item
label
=
"工序名称"
prop
=
"processName"
>
<
el
-
input
v
-
model
=
"form.processName"
readonly
=
"readonly"
disabled
/>
<
el
-
input
v
-
model
=
"form.processName"
readonly
=
"readonly"
disabled
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
<
el
-
form
-
item
label
=
"工作站"
prop
=
"workstationName"
>
<
el
-
input
v
-
model
=
"form.workstationName"
readonly
=
"readonly"
disabled
/>
<
el
-
input
v
-
model
=
"form.workstationName"
readonly
=
"readonly"
disabled
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
<
el
-
form
-
item
label
=
"工作单元"
prop
=
"workunitId"
required
:
true
>
<
el
-
input
v
-
model
=
"form.workunitName"
>
<
el
-
form
-
item
label
=
"工作单元"
prop
=
"workunitId"
>
<
el
-
input
v
-
model
=
"form.workunitName"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
...
...
@@ -333,12 +341,17 @@
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
<
el
-
form
-
item
label
=
"排产数量"
prop
=
"quantity"
required
:
true
>
<
el
-
input
-
number
:
step
=
"1"
:
min
=
"0"
v
-
model
=
"form.quantity"
placeholder
=
"请输入排产数量"
/>
<
el
-
form
-
item
label
=
"排产数量"
prop
=
"quantity"
>
<
el
-
input
-
number
:
step
=
"1"
:
min
=
"0"
v
-
model
=
"form.quantity"
placeholder
=
"请输入排产数量"
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
<
el
-
form
-
item
label
=
"开始时间"
prop
=
"startTime"
required
:
true
>
<
el
-
form
-
item
label
=
"开始时间"
prop
=
"startTime"
>
<
el
-
date
-
picker
v
-
model
=
"form.startTime"
type
=
"datetime"
...
...
@@ -349,8 +362,13 @@
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
<
el
-
form
-
item
label
=
"生产时长"
prop
=
"duration"
required
:
true
>
<
el
-
input
-
number
:
step
=
"1"
:
min
=
"0"
v
-
model
=
"form.duration"
placeholder
=
"请输入生产时长"
/>
<
el
-
form
-
item
label
=
"生产时长"
prop
=
"duration"
>
<
el
-
input
-
number
:
step
=
"1"
:
min
=
"0"
v
-
model
=
"form.duration"
placeholder
=
"请输入生产时长"
/>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
...
...
@@ -421,13 +439,6 @@
<
/template
>
<
script
>
import
{
listWorkorder
,
getWorkorder
,
delWorkorder
,
addWorkorder
,
updateWorkorder
,
}
from
"@/api/mes/pro/workorder"
;
import
{
listProtask
,
listGanttTaskList
,
...
...
@@ -441,7 +452,6 @@ import { listProductprocess } from "@/api/mes/pro/routeprocess";
import
WorkuintSelect
from
"@/components/workunitSelect/single.vue"
;
import
ProTask
from
"./proTask.vue"
;
import
GanttChar
from
"./ganttx.vue"
;
import
{
listWorkunit
}
from
"@/api/mes/md/workunit"
;
import
Treeselect
from
"@riophae/vue-treeselect"
;
import
"@riophae/vue-treeselect/dist/vue-treeselect.css"
;
...
...
@@ -565,14 +575,11 @@ export default {
}
,
// 获取工作单元
onWorkunitSelect
(
row
)
{
console
.
log
(
45456
,
row
);
if
(
row
!=
undefined
&&
row
!=
null
)
{
this
.
form
.
workunitId
=
row
.
workunitId
;
this
.
form
.
workunitName
=
row
.
workunitName
;
console
.
log
(
111111
,
this
.
form
)
console
.
log
(
111111
,
this
.
form
);
}
}
,
...
...
@@ -753,9 +760,10 @@ export default {
if
(
this
.
form
.
taskId
!=
null
)
{
updateProtask
(
this
.
form
).
then
((
response
)
=>
{
this
.
$modal
.
msgSuccess
(
"修改成功"
);
//
this.open = false;
this
.
$refs
[
"bomlist"
].
getList
();
this
.
open
=
false
;
//
this.$refs["bomlist"].getList();
this
.
getList
();
this
.
getGanttTasks
();
}
);
}
else
{
addProtask
(
this
.
form
).
then
((
response
)
=>
{
...
...
src/views/mes/pro/workorder/indexApply.vue
View file @
1a3a4c44
...
...
@@ -289,6 +289,7 @@
label
=
"操作"
width
=
"150px"
align
=
"center"
fixed
=
"right"
class
-
name
=
"small-padding fixed-width"
>
<
template
slot
-
scope
=
"scope"
>
...
...
@@ -700,7 +701,7 @@ export default {
requestDate
:
null
,
parentId
:
null
,
ancestors
:
null
,
status
:
null
,
status
:
'PREPARE'
,
}
,
// 表单状态
options
:
[
...
...
src/views/mes/pro/workorder/proofingInfo.vue
View file @
1a3a4c44
...
...
@@ -597,8 +597,13 @@ export default {
this
.
loading
=
false
;
this
.
$modal
.
msgSuccess
(
"提交成功!"
);
// 关闭页签
tabPlugins
.
closeOpenPage
();
this
.
$nextTick
(()
=>
{
// 关闭页签
tabPlugins
.
closeOpenPage
();
this
.
$router
.
replace
({
path
:
'/mes/pro/workorder'
})
})
})
.
catch
(()
=>
{
this
.
loading
=
false
;
...
...
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