Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Releases
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-ui
Commits
6957e42f
Commit
6957e42f
authored
Apr 01, 2020
by
康振飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
data
parent
a37bc7cf
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
24 deletions
+24
-24
index.vue
pages/basicData/user/index.vue
+3
-3
index.vue
pages/dispatched/index.vue
+3
-3
entryMovie.vue
pages/implement/components/entryMovie.vue
+4
-4
entryPause.vue
pages/implement/components/entryPause.vue
+3
-3
index.vue
pages/implement/index.vue
+11
-11
No files found.
pages/basicData/user/index.vue
View file @
6957e42f
...
@@ -537,7 +537,7 @@ export default {
...
@@ -537,7 +537,7 @@ export default {
var
url
=
`
${
systemUrl
}
/MyRole/GetRolesAsync`
;
var
url
=
`
${
systemUrl
}
/MyRole/GetRolesAsync`
;
var
data
=
[];
var
data
=
[];
service
.
get
(
`
${
url
}
`
,
{
params
:
{
role_type
:
type
}
}).
then
(
response
=>
{
service
.
get
(
`
${
url
}
`
,
{
params
:
{
role_type
:
type
}
}).
then
(
response
=>
{
data
=
response
.
data
.
result
.
items
;
data
=
response
.
result
.
items
;
if
(
type
==
1
)
{
if
(
type
==
1
)
{
this
.
authList
=
data
;
this
.
authList
=
data
;
}
}
...
@@ -554,7 +554,7 @@ export default {
...
@@ -554,7 +554,7 @@ export default {
this
.
show3
=
true
;
this
.
show3
=
true
;
var
url
=
`
${
systemUrl
}
/MyUserRole/GetPaged`
;
var
url
=
`
${
systemUrl
}
/MyUserRole/GetPaged`
;
service
.
get
(
`
${
url
}
`
,
{
params
:
{
userId
:
id
}
}).
then
(
response
=>
{
service
.
get
(
`
${
url
}
`
,
{
params
:
{
userId
:
id
}
}).
then
(
response
=>
{
var
data
=
response
.
data
.
result
.
items
;
var
data
=
response
.
result
.
items
;
var
dt1
=
data
.
filter
(
function
(
ite
)
{
var
dt1
=
data
.
filter
(
function
(
ite
)
{
return
ite
.
role_type
==
0
;
return
ite
.
role_type
==
0
;
});
});
...
@@ -582,7 +582,7 @@ export default {
...
@@ -582,7 +582,7 @@ export default {
})
})
)
)
.
then
(
response
=>
{
.
then
(
response
=>
{
if
(
response
.
data
.
success
)
{
if
(
response
.
success
)
{
this
.
$Message
.
success
(
"保存成功"
);
this
.
$Message
.
success
(
"保存成功"
);
this
.
authModel
.
extra
=
[];
this
.
authModel
.
extra
=
[];
this
.
authModel
.
default
=
[];
this
.
authModel
.
default
=
[];
...
...
pages/dispatched/index.vue
View file @
6957e42f
...
@@ -189,9 +189,9 @@ export default {
...
@@ -189,9 +189,9 @@ export default {
let
urlget
=
`
${
PlanUrl
}
/dispatch/getschemes?RoutingId=`
+
usId
+
let
urlget
=
`
${
PlanUrl
}
/dispatch/getschemes?RoutingId=`
+
usId
+
'&IsMain=0'
+
order_ids
'&IsMain=0'
+
order_ids
service
.
get
(
`
${
urlget
}
`
).
then
((
res
)
=>
{
service
.
get
(
`
${
urlget
}
`
).
then
((
res
)
=>
{
if
(
res
.
data
.
result
)
{
if
(
res
.
result
)
{
var
savedUl
=
[]
var
savedUl
=
[]
res
.
data
.
result
.
map
((
u
)
=>
{
res
.
result
.
map
((
u
)
=>
{
let
detailnew
=
{
let
detailnew
=
{
detailId
:
u
.
routingDetailId
,
//工序id--后端接收
detailId
:
u
.
routingDetailId
,
//工序id--后端接收
detailNumber
:
u
.
routingDetailNumber
,
//工序序号
detailNumber
:
u
.
routingDetailNumber
,
//工序序号
...
@@ -223,7 +223,7 @@ export default {
...
@@ -223,7 +223,7 @@ export default {
let
urlList
=
`
${
designUrl
}
/routingdetail/getlistbyheaderid?headerID=`
+
usId
let
urlList
=
`
${
designUrl
}
/routingdetail/getlistbyheaderid?headerID=`
+
usId
service
.
get
(
`
${
urlList
}
`
).
then
((
res
)
=>
{
service
.
get
(
`
${
urlList
}
`
).
then
((
res
)
=>
{
var
ul
=
[]
var
ul
=
[]
res
.
data
.
result
.
map
((
u
)
=>
{
res
.
result
.
map
((
u
)
=>
{
let
detail
=
{
let
detail
=
{
detailId
:
u
.
id
,
//工序id--后端接收
detailId
:
u
.
id
,
//工序id--后端接收
detailNumber
:
u
.
task_seq
,
//工序序号
detailNumber
:
u
.
task_seq
,
//工序序号
...
...
pages/implement/components/entryMovie.vue
View file @
6957e42f
...
@@ -188,8 +188,8 @@ export default {
...
@@ -188,8 +188,8 @@ export default {
var
url
=
var
url
=
`
${
PlanUrl
}
/orderexecutemovie/getpaged?`
+
QS
.
stringify
(
this
.
datasearch
)
`
${
PlanUrl
}
/orderexecutemovie/getpaged?`
+
QS
.
stringify
(
this
.
datasearch
)
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
this
.
moviedata
=
response
.
data
.
result
.
items
this
.
moviedata
=
response
.
result
.
items
this
.
datatotal
=
response
.
data
.
result
.
totalCount
this
.
datatotal
=
response
.
result
.
totalCount
})
})
},
},
onPageChanged
(
page_index
)
{
onPageChanged
(
page_index
)
{
...
@@ -217,7 +217,7 @@ export default {
...
@@ -217,7 +217,7 @@ export default {
})
})
)
)
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
if
(
response
.
data
.
success
)
{
if
(
response
.
success
)
{
this
.
$Message
.
success
(
'保存成功'
)
this
.
$Message
.
success
(
'保存成功'
)
this
.
procedure
=
false
this
.
procedure
=
false
this
.
cleardata
()
this
.
cleardata
()
...
@@ -252,7 +252,7 @@ export default {
...
@@ -252,7 +252,7 @@ export default {
service
service
.
delete
(
`
${
url
}
`
)
.
delete
(
`
${
url
}
`
)
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
if
(
response
.
data
.
success
)
{
if
(
response
.
success
)
{
this
.
$Message
.
success
(
'删除成功'
)
this
.
$Message
.
success
(
'删除成功'
)
this
.
loaddata
()
this
.
loaddata
()
}
else
{
}
else
{
...
...
pages/implement/components/entryPause.vue
View file @
6957e42f
...
@@ -171,8 +171,8 @@ export default {
...
@@ -171,8 +171,8 @@ export default {
QS
.
stringify
(
this
.
datasearch
)
QS
.
stringify
(
this
.
datasearch
)
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
this
.
data1
=
response
.
data
.
result
.
items
this
.
data1
=
response
.
result
.
items
this
.
datatotal
=
response
.
data
.
result
.
totalCount
this
.
datatotal
=
response
.
result
.
totalCount
})
})
},
},
onPageChanged
(
page_index
)
{
onPageChanged
(
page_index
)
{
...
@@ -198,7 +198,7 @@ export default {
...
@@ -198,7 +198,7 @@ export default {
})
})
)
)
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
if
(
response
.
data
.
success
)
{
if
(
response
.
success
)
{
this
.
$Message
.
success
(
'保存成功'
)
this
.
$Message
.
success
(
'保存成功'
)
this
.
loaddata
()
this
.
loaddata
()
this
.
cleardata
()
this
.
cleardata
()
...
...
pages/implement/index.vue
View file @
6957e42f
...
@@ -369,11 +369,11 @@ export default {
...
@@ -369,11 +369,11 @@ export default {
this
.
currententry
=
null
this
.
currententry
=
null
var
url
=
`
${
PlanUrl
}
/orderexecute/getentrylist?ExecuteId=`
+
ExecuteId
var
url
=
`
${
PlanUrl
}
/orderexecute/getentrylist?ExecuteId=`
+
ExecuteId
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
this
.
entryData
=
response
.
data
.
result
.
entryList
this
.
entryData
=
response
.
result
.
entryList
this
.
entryHistoryData
=
this
.
entryData
this
.
entryHistoryData
=
this
.
entryData
let
data
=
[]
let
data
=
[]
for
(
var
i
=
0
;
i
<
this
.
entryData
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
this
.
entryData
.
length
;
i
++
)
{
if
(
this
.
entryData
[
i
].
id
==
response
.
data
.
result
.
currentID
)
{
if
(
this
.
entryData
[
i
].
id
==
response
.
result
.
currentID
)
{
data
=
this
.
entryData
[
i
]
data
=
this
.
entryData
[
i
]
this
.
currententry
=
data
this
.
currententry
=
data
this
.
currentID
=
this
.
entryData
[
i
].
id
this
.
currentID
=
this
.
entryData
[
i
].
id
...
@@ -431,8 +431,8 @@ export default {
...
@@ -431,8 +431,8 @@ export default {
'&headerID='
+
'&headerID='
+
this
.
data
.
routing_header_id
this
.
data
.
routing_header_id
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
if
(
response
.
data
.
result
!=
null
)
{
if
(
response
.
result
!=
null
)
{
let
ordata
=
response
.
data
.
result
let
ordata
=
response
.
result
for
(
let
j
=
0
;
j
<
this
.
data
.
row
.
length
;
j
++
)
{
for
(
let
j
=
0
;
j
<
this
.
data
.
row
.
length
;
j
++
)
{
let
obj
=
this
.
data
.
row
[
j
]
let
obj
=
this
.
data
.
row
[
j
]
var
gh
=
ordata
.
filter
(
function
(
number
)
{
var
gh
=
ordata
.
filter
(
function
(
number
)
{
...
@@ -456,9 +456,9 @@ export default {
...
@@ -456,9 +456,9 @@ export default {
`
${
designUrl
}
/orderbillrel/getorderbilllistbyorders?orderids=`
+
`
${
designUrl
}
/orderbillrel/getorderbilllistbyorders?orderids=`
+
this
.
data
.
orderIDs
this
.
data
.
orderIDs
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
if
(
response
.
data
.
result
!=
null
)
{
if
(
response
.
result
!=
null
)
{
if
(
response
.
data
.
result
.
length
>
0
)
{
if
(
response
.
result
.
length
>
0
)
{
this
.
loadMaterial
(
response
.
data
.
result
)
this
.
loadMaterial
(
response
.
result
)
}
}
}
}
})
})
...
@@ -468,9 +468,9 @@ export default {
...
@@ -468,9 +468,9 @@ export default {
var
url
=
var
url
=
`
${
designUrl
}
/ordermaterial/getbyid?Id=`
+
Bill
[
0
].
material_bill_id
`
${
designUrl
}
/ordermaterial/getbyid?Id=`
+
Bill
[
0
].
material_bill_id
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
if
(
response
.
data
.
result
!=
null
)
{
if
(
response
.
result
!=
null
)
{
this
.
material_bill_id
=
Bill
[
0
].
material_bill_id
this
.
material_bill_id
=
Bill
[
0
].
material_bill_id
this
.
material_bill
=
response
.
data
.
result
.
orderMaterial
this
.
material_bill
=
response
.
result
.
orderMaterial
}
}
})
})
},
},
...
@@ -541,7 +541,7 @@ export default {
...
@@ -541,7 +541,7 @@ export default {
})
})
)
)
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
if
(
response
.
data
.
success
)
{
if
(
response
.
success
)
{
this
.
updateentrystatus
(
row
.
id
,
14
)
this
.
updateentrystatus
(
row
.
id
,
14
)
}
}
})
})
...
@@ -566,7 +566,7 @@ export default {
...
@@ -566,7 +566,7 @@ export default {
})
})
)
)
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
if
(
response
.
data
.
success
)
{
if
(
response
.
success
)
{
this
.
updateentrystatus
(
row
.
id
,
14
)
this
.
updateentrystatus
(
row
.
id
,
14
)
}
}
})
})
...
...
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