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
9e386675
Commit
9e386675
authored
Dec 03, 2024
by
tanjunxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 排班日历数据获取接口修改
parent
3d75d4ee
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
7 deletions
+24
-7
team.vue
src/views/mes/cal/calendar/team.vue
+6
-3
index.vue
src/views/mes/cal/plan/index.vue
+4
-2
index.vue
src/views/mes/qc/abnormal/index.vue
+5
-1
index.vue
src/views/mes/qc/qcindex/index.vue
+5
-1
index.vue
src/views/mes/qc/qctemplate/index.vue
+4
-0
No files found.
src/views/mes/cal/calendar/team.vue
View file @
9e386675
...
@@ -191,6 +191,7 @@ export default {
...
@@ -191,6 +191,7 @@ export default {
},
},
/** 查询节假日设置列表 */
/** 查询节假日设置列表 */
getList
(
type
)
{
getList
(
type
)
{
console
.
log
(
type
);
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
holidayList
=
[];
this
.
holidayList
=
[];
this
.
workdayList
=
[];
this
.
workdayList
=
[];
...
@@ -202,10 +203,12 @@ export default {
...
@@ -202,10 +203,12 @@ export default {
if
(
type
)
{
if
(
type
)
{
delete
params
.
workunitName
;
delete
params
.
workunitName
;
}
else
{
}
else
{
delete
params
.
workunitIds
;
// delete params.workunitIds;
params
[
"workunitId"
]
=
this
.
selectRow
.
id
;
// params["workunitId"] = this.selectRow.id;
params
.
workunitIds
=
[
this
.
selectRow
.
id
];
}
}
const
fn
=
type
?
getCalWorkunits
:
listCalholiday
;
// const fn = type ? getCalWorkunits : listCalholiday;
const
fn
=
getCalWorkunits
;
fn
(
params
).
then
((
response
)
=>
{
fn
(
params
).
then
((
response
)
=>
{
this
.
calendarDayList
=
response
.
data
;
this
.
calendarDayList
=
response
.
data
;
if
(
response
.
data
!=
null
)
{
if
(
response
.
data
!=
null
)
{
...
...
src/views/mes/cal/plan/index.vue
View file @
9e386675
...
@@ -121,8 +121,10 @@
...
@@ -121,8 +121,10 @@
<
dict
-
tag
:
options
=
"dict.type.mes_order_status"
:
value
=
"scope.row.status"
/>
<
dict
-
tag
:
options
=
"dict.type.mes_order_status"
:
value
=
"scope.row.status"
/>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"创建人"
align
=
"center"
prop
=
"createBy"
/>
<
el
-
table
-
column
label
=
"创建人"
align
=
"center"
prop
=
"createBy"
width
=
"150"
/>
<
el
-
table
-
column
label
=
"创建时间"
align
=
"center"
prop
=
"createTime"
width
=
"150"
/>
<
el
-
table
-
column
label
=
"更新人"
align
=
"center"
prop
=
"updateBy"
width
=
"150"
/>
<
el
-
table
-
column
label
=
"更新时间"
align
=
"center"
prop
=
"updateTime"
width
=
"150"
/>
<
el
-
table
-
column
label
=
"操作"
align
=
"center"
class
-
name
=
"small-padding fixed-width"
>
<
el
-
table
-
column
label
=
"操作"
align
=
"center"
class
-
name
=
"small-padding fixed-width"
>
<
template
slot
-
scope
=
"scope"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
button
<
el
-
button
...
...
src/views/mes/qc/abnormal/index.vue
View file @
9e386675
...
@@ -99,6 +99,10 @@
...
@@ -99,6 +99,10 @@
<el-table-column
label=
"异常原因"
align=
"center"
prop=
"abnormalReason"
/>
<el-table-column
label=
"异常原因"
align=
"center"
prop=
"abnormalReason"
/>
<el-table-column
label=
"异常处理人"
align=
"center"
prop=
"nickName"
/>
<el-table-column
label=
"异常处理人"
align=
"center"
prop=
"nickName"
/>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
/>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
/>
<el-table-column
label=
"创建人"
align=
"center"
prop=
"createBy"
width=
"100"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"150"
/>
<el-table-column
label=
"更新人"
align=
"center"
prop=
"updateBy"
width=
"100"
/>
<el-table-column
label=
"更新时间"
align=
"center"
prop=
"updateTime"
width=
"150"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
<el-button
...
...
src/views/mes/qc/qcindex/index.vue
View file @
9e386675
...
@@ -111,6 +111,10 @@
...
@@ -111,6 +111,10 @@
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"检验名称"
align=
"center"
prop=
"qcTool"
/>
<el-table-column
label=
"检验名称"
align=
"center"
prop=
"qcTool"
/>
<el-table-column
label=
"创建人"
align=
"center"
prop=
"createBy"
width=
"100"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"150"
/>
<el-table-column
label=
"更新人"
align=
"center"
prop=
"updateBy"
width=
"100"
/>
<el-table-column
label=
"更新时间"
align=
"center"
prop=
"updateTime"
width=
"150"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
<el-button
...
...
src/views/mes/qc/qctemplate/index.vue
View file @
9e386675
...
@@ -113,6 +113,10 @@
...
@@ -113,6 +113,10 @@
<dict-tag
:options=
"dict.type.sys_yes_no"
:value=
"scope.row.enableFlag"
/>
<dict-tag
:options=
"dict.type.sys_yes_no"
:value=
"scope.row.enableFlag"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"创建人"
align=
"center"
prop=
"createBy"
width=
"100"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"150"
/>
<el-table-column
label=
"更新人"
align=
"center"
prop=
"updateBy"
width=
"100"
/>
<el-table-column
label=
"更新时间"
align=
"center"
prop=
"updateTime"
width=
"150"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
<el-button
...
...
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