Skip to content

M
mes-ui
Commit 99c15111 authored by tanjunxin's avatar tanjunxin
Browse files
Options

fix: 导入功能细节优化

parent 09bcc16d
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 40 deletions
src/views/mes/md/product/index.vue
View file @ 99c15111
......@@ -334,8 +334,9 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
<!-- <el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的物料产品数据 -->
物料编码重复则覆盖
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
......@@ -432,7 +433,8 @@ export default {
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// updateSupport: false,
updateSupport: true,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
......@@ -697,7 +699,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download(
"mes/md/mditem/importData",
"mes/md/mditem/export",
{
...this.queryParams,
},
......@@ -726,9 +728,10 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
const msg = response.msg ? response.msg : "导入失败";
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
......
src/views/mes/md/workshop/index.vue
View file @ 99c15111
......@@ -60,9 +60,9 @@
<el-col :span="1.5">
<el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport">导入</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-col>
</el-col> -->
</el-row>
<el-table v-loading="loading" :data="workshopList" @selection-change="handleSelectionChange">
......@@ -199,8 +199,9 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
<!-- <el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据 -->
车间编码重复则覆盖
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
......@@ -255,7 +256,8 @@ export default {
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// updateSupport: false,
updateSupport: true,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
......@@ -428,7 +430,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('md/workshop/importTemplate', {
this.download('md/workshop/export', {
...this.queryParams
}, `workshop_${new Date().getTime()}.xlsx`)
},
......@@ -440,7 +442,7 @@ export default {
/** 下载模板操作 */
importTemplate() {
this.download(
"mes/md/workshop/importData",
"mes/md/workshop/importTemplate",
{},
`workshop_${new Date().getTime()}.xlsx`
);
......@@ -454,9 +456,10 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
const msg = response.msg ? response.msg : "导入失败";
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
......
src/views/mes/md/workstation/index.vue
View file @ 99c15111
......@@ -514,8 +514,9 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
<!-- <el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的工作中心数据 -->
工作中心编码重复则覆盖
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
......@@ -615,7 +616,8 @@ export default {
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// updateSupport: false,
updateSupport: true,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
......@@ -891,7 +893,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download(
"mes/md/workstation/importTemplate",
"mes/md/workstation/export",
{
...this.queryParams,
},
......@@ -906,7 +908,7 @@ export default {
/** 下载模板操作 */
importTemplate() {
this.download(
"mes/md/workstation/importData",
"mes/md/workstation/importTemplate",
{},
`workshop_${new Date().getTime()}.xlsx`
);
......@@ -920,9 +922,10 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
const msg = response.msg ? response.msg : "导入失败";
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
......
src/views/mes/md/workunit/index.vue
View file @ 99c15111
......@@ -606,8 +606,9 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
<!-- <el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的工作单元数据 -->
工作单元编码重复则覆盖
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
......@@ -669,7 +670,8 @@ export default {
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// updateSupport: false,
updateSupport: true,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
......@@ -886,7 +888,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download(
"md/cal/workunit/importTemplate",
"md/cal/workunit/export",
{
...this.queryParams,
},
......@@ -901,7 +903,7 @@ export default {
/** 下载模板操作 */
importTemplate() {
this.download(
"md/cal/workunit/importData",
"md/cal/workunit/importTemplate",
{},
`workunit_${new Date().getTime()}.xlsx`
);
......@@ -915,9 +917,10 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
const msg = response.msg ? response.msg : "导入失败";
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
......
src/views/mes/pro/arrangeRule/index.vue
View file @ 99c15111
......@@ -567,8 +567,8 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
<!-- <el-checkbox v-model="upload.updateSupport" /> -->
货品分类与工序重复则覆盖
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
......@@ -628,7 +628,8 @@ export default {
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// updateSupport: false,
updateSupport: true,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
......@@ -815,7 +816,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('/mes/pro/ProWorkOrderArrangeRule/importTemplate', {
this.download('/mes/pro/ProWorkOrderArrangeRule/export', {
...this.queryParams
}, `ProWorkOrderArrangeRule_${new Date().getTime()}.xlsx`)
},
......@@ -827,7 +828,7 @@ export default {
/** 下载模板操作 */
importTemplate() {
this.download(
"mes/pro/ProWorkOrderArrangeRule/importData",
"mes/pro/ProWorkOrderArrangeRule/importTemplate",
{},
`ProWorkOrderArrangeRule_${new Date().getTime()}.xlsx`
);
......@@ -841,9 +842,10 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
const msg = response.msg ? response.msg : "导入失败";
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
......
src/views/mes/pro/process/index.vue
View file @ 99c15111
......@@ -252,8 +252,9 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
<!-- <el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的工序数据 -->
工序编码重复则覆盖
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
......@@ -323,7 +324,8 @@ export default {
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// updateSupport: false,
updateSupport: true,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
......@@ -483,7 +485,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/pro/process/importTemplate', {
this.download('mes/pro/process/export', {
...this.queryParams
}, `process_${new Date().getTime()}.xlsx`)
},
......@@ -495,7 +497,7 @@ export default {
/** 下载模板操作 */
importTemplate() {
this.download(
"mes/pro/process/importData",
"mes/pro/process/importTemplate",
{},
`process_${new Date().getTime()}.xlsx`
);
......@@ -509,9 +511,10 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
const msg = response.msg ? response.msg : "导入失败";
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
......
src/views/system/user/index.vue
View file @ 99c15111
......@@ -388,7 +388,8 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
<!-- <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 -->
用户编码重复则覆盖
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
......@@ -474,7 +475,8 @@ export default {
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// updateSupport: 0,
updateSupport: true,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
......@@ -787,9 +789,10 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
const msg = response.msg ? response.msg : "导入失败";
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment