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
8f020ea9
Commit
8f020ea9
authored
Mar 25, 2025
by
tanjunxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 工序检测及检测模版导入功能细节优化
parent
99c15111
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
index.vue
src/views/mes/qc/qcindex/index.vue
+2
-1
index.vue
src/views/mes/qc/templateProcess/index.vue
+7
-4
No files found.
src/views/mes/qc/qcindex/index.vue
View file @
8f020ea9
...
@@ -447,7 +447,8 @@ export default {
...
@@ -447,7 +447,8 @@ export default {
this
.
upload
.
open
=
false
;
this
.
upload
.
open
=
false
;
this
.
upload
.
isUploading
=
false
;
this
.
upload
.
isUploading
=
false
;
this
.
$refs
.
upload
.
clearFiles
();
this
.
$refs
.
upload
.
clearFiles
();
this
.
$alert
(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>"
+
response
.
msg
+
"</div>"
,
"导入结果"
,
{
dangerouslyUseHTMLString
:
true
});
const
msg
=
response
.
msg
?
response
.
msg
:
"导入失败"
;
this
.
$alert
(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>"
+
msg
+
"</div>"
,
"导入结果"
,
{
dangerouslyUseHTMLString
:
true
});
this
.
getList
();
this
.
getList
();
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
...
...
src/views/mes/qc/templateProcess/index.vue
View file @
8f020ea9
...
@@ -231,8 +231,9 @@
...
@@ -231,8 +231,9 @@
<div
class=
"el-upload__text"
>
将文件拖到此处,或
<em>
点击上传
</em></div>
<div
class=
"el-upload__text"
>
将文件拖到此处,或
<em>
点击上传
</em></div>
<div
class=
"el-upload__tip text-center"
slot=
"tip"
>
<div
class=
"el-upload__tip text-center"
slot=
"tip"
>
<div
class=
"el-upload__tip"
slot=
"tip"
>
<div
class=
"el-upload__tip"
slot=
"tip"
>
<el-checkbox
v-model=
"upload.updateSupport"
/>
<!-- <el-checkbox v-model="upload.updateSupport"/>
是否更新已经存在的用户数据
是否更新已经存在的用户数据 -->
检测模板和工序重复则覆盖
</div>
</div>
<span>
仅允许导入xls、xlsx格式文件。
</span>
<span>
仅允许导入xls、xlsx格式文件。
</span>
<el-link
type=
"primary"
:underline=
"false"
style=
"font-size:12px;vertical-align: baseline;"
<el-link
type=
"primary"
:underline=
"false"
style=
"font-size:12px;vertical-align: baseline;"
...
@@ -342,7 +343,8 @@ export default {
...
@@ -342,7 +343,8 @@ export default {
// 是否禁用上传
// 是否禁用上传
isUploading
:
false
,
isUploading
:
false
,
// 是否更新已经存在的用户数据
// 是否更新已经存在的用户数据
updateSupport
:
0
,
// updateSupport: 0,
updateSupport
:
true
,
// 设置上传的请求头部
// 设置上传的请求头部
headers
:
{
Authorization
:
"Bearer "
+
getToken
()},
headers
:
{
Authorization
:
"Bearer "
+
getToken
()},
// 上传的地址
// 上传的地址
...
@@ -514,7 +516,8 @@ export default {
...
@@ -514,7 +516,8 @@ export default {
this
.
upload
.
open
=
false
;
this
.
upload
.
open
=
false
;
this
.
upload
.
isUploading
=
false
;
this
.
upload
.
isUploading
=
false
;
this
.
$refs
.
upload
.
clearFiles
();
this
.
$refs
.
upload
.
clearFiles
();
this
.
$alert
(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>"
+
response
.
msg
+
"</div>"
,
"导入结果"
,
{
dangerouslyUseHTMLString
:
true
});
const
msg
=
response
.
msg
?
response
.
msg
:
"导入失败"
;
this
.
$alert
(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>"
+
msg
+
"</div>"
,
"导入结果"
,
{
dangerouslyUseHTMLString
:
true
});
this
.
getList
();
this
.
getList
();
},
},
/** 导入按钮操作 */
/** 导入按钮操作 */
...
...
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