Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pda-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
pda
pda-ui
Commits
a9a6933a
Commit
a9a6933a
authored
Jul 25, 2024
by
chenzj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工作单元和刀模版具导出的bug修复
parent
beb4ef6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
23 deletions
+1
-23
index.vue
src/views/mes/md/workunit/index.vue
+0
-22
index.vue
src/views/mes/tm/tool/index.vue
+1
-1
No files found.
src/views/mes/md/workunit/index.vue
View file @
a9a6933a
...
...
@@ -64,11 +64,6 @@
<dict-tag
:options=
"dict.type.sys_yes_no"
:value=
"scope.row.faultFlag"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"是否固化"
align=
"center"
width=
"150"
prop=
"solidify"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.sys_yes_no"
:value=
"scope.row.solidify"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"固化时间"
align=
"center"
prop=
"solidifyTime"
/>
<el-table-column
label=
"加工处理最小厚度"
align=
"center"
prop=
"treatingThicknessMin"
/>
<el-table-column
label=
"加工处理最大厚度"
align=
"center"
prop=
"treatingThicknessMax"
/>
...
...
@@ -197,21 +192,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"是否固化"
label-width=
"120px"
>
<el-radio-group
v-model=
"form.solidify"
disabled
v-if=
"optType == 'view'"
>
<el-radio
v-for=
"dict in dict.type.sys_yes_no"
:key=
"dict.value"
:label=
"dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
<el-radio-group
v-model=
"form.solidify"
v-else
>
<el-radio
v-for=
"dict in dict.type.sys_yes_no"
:key=
"dict.value"
:label=
"dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"20"
>
<el-form-item
label=
"备注"
label-width=
"120px"
prop=
"remark"
>
...
...
@@ -280,7 +260,6 @@ export default {
workunitName
:
''
,
enableFlag
:
'Y'
,
faultFlag
:
'N'
,
solidify
:
'N'
,
solidifyTime
:
''
,
treatingThicknessMin
:
''
,
treatingThicknessMax
:
''
,
...
...
@@ -331,7 +310,6 @@ export default {
workunitName
:
''
,
enableFlag
:
'Y'
,
faultFlag
:
'N'
,
solidify
:
'N'
,
solidifyTime
:
''
,
treatingThicknessMin
:
''
,
treatingThicknessMax
:
''
,
...
...
src/views/mes/tm/tool/index.vue
View file @
a9a6933a
...
...
@@ -584,7 +584,7 @@ export default {
}
,
/** 导出按钮操作 */
handleExport
()
{
this
.
download
(
'tm/tool/export'
,
{
this
.
download
(
'
mes/
tm/tool/export'
,
{
...
this
.
queryParams
}
,
`tool_${new Date().getTime()
}
.xlsx`
)
}
,
...
...
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