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
11487ea4
Commit
11487ea4
authored
Nov 29, 2024
by
tanjunxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 1.刀模版表格删除申请单编码字段; 2.刀模版领用表格增加字段
parent
c1dd21f5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
4 deletions
+26
-4
index.vue
src/views/mes/tm/toolmachinesrecord/index.vue
+1
-1
index.vue
src/views/mes/tm/toolrequestlist/index.vue
+1
-1
index.vue
src/views/mes/tm/toolrequestuse/index.vue
+24
-2
No files found.
src/views/mes/tm/toolmachinesrecord/index.vue
View file @
11487ea4
...
...
@@ -112,7 +112,7 @@
<el-table
v-loading=
"loading"
:data=
"recordList"
@
selection-change=
"handleSelectionChange"
>
<!--
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
-->
<el-table-column
label=
"上下机编码"
min-width=
"150"
align=
"center"
prop=
"toolMachinesCode"
/>
<
el-table-column
label=
"申请单编码"
min-width=
"130"
align=
"center"
prop=
"toolRequestCode"
/
>
<
!--
<el-table-column
label=
"申请单编码"
min-width=
"130"
align=
"center"
prop=
"toolRequestCode"
/>
--
>
<el-table-column
label=
"领用单编码"
min-width=
"150"
align=
"center"
prop=
"toolRequestUseCode"
/>
<el-table-column
label=
"编排单号"
align=
"center"
prop=
"arrangeCode"
/>
<el-table-column
label=
"工序任务编码"
width=
"120"
align=
"center"
prop=
"taskCode"
/>
...
...
src/views/mes/tm/toolrequestlist/index.vue
View file @
11487ea4
...
...
@@ -39,7 +39,7 @@
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"物料编码"
width=
"130"
align=
"center"
prop=
"sapItemCode"
/>
<el-table-column
label=
"物料名称"
width=
"100"
align=
"center"
prop=
"itemName"
/>
<
el-table-column
label=
"申请单编码"
min-width=
"130"
align=
"center"
prop=
"toolRequestCode"
/
>
<
!--
<el-table-column
label=
"申请单编码"
min-width=
"130"
align=
"center"
prop=
"toolRequestCode"
/>
--
>
<el-table-column
label=
"领用单编码"
min-width=
"150"
align=
"center"
prop=
"toolRequestUseCode"
/>
<el-table-column
label=
"编排单号"
align=
"center"
prop=
"arrangeCode"
/>
<el-table-column
label=
"工序任务编码"
width=
"120"
align=
"center"
prop=
"taskCode"
/>
...
...
src/views/mes/tm/toolrequestuse/index.vue
View file @
11487ea4
...
...
@@ -98,11 +98,11 @@
align=
"center"
prop=
"toolRequestUseCode"
/>
<el-table-column
<
!--
<
el-table-column
label=
"申请单编码"
align=
"center"
prop=
"toolRequestCode"
/>
/>
-->
<el-table-column
label=
"工序"
align=
"center"
prop=
"processName"
/>
<el-table-column
label=
"作业单元"
align=
"center"
prop=
"workunitName"
/>
<el-table-column
...
...
@@ -135,6 +135,28 @@
<
span
>
{{
parseTime
(
scope
.
row
.
endTime
,
"{y
}
-{m
}
-{d
}
"
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"创建人"
align
=
"center"
prop
=
"createBy"
/>
<
el
-
table
-
column
label
=
"创建时间"
align
=
"center"
prop
=
"createTime"
width
=
"180"
>
<
template
slot
-
scope
=
"scope"
>
<
span
>
{{
parseTime
(
scope
.
row
.
createTime
,
"{y
}
-{m
}
-{d
}
"
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"修改人"
align
=
"center"
prop
=
"updateBy"
/>
<
el
-
table
-
column
label
=
"修改时间"
align
=
"center"
prop
=
"updateTime"
width
=
"180"
>
<
template
slot
-
scope
=
"scope"
>
<
span
>
{{
parseTime
(
scope
.
row
.
updateTime
,
"{y
}
-{m
}
-{d
}
"
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"申请数量"
align
=
"center"
prop
=
"requestNum"
/>
<!--
<
el
-
table
-
column
label
=
"编排单号"
align
=
"center"
prop
=
"arrangeCode"
/>
-->
<
el
-
table
-
column
...
...
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