|
@@ -1,18 +1,14 @@
|
|
|
<template>
|
|
<template>
|
|
|
<div class="qualityControl">
|
|
<div class="qualityControl">
|
|
|
<div v-if="!readonly && shiFouGuoShen" class="btn">
|
|
<div v-if="!readonly && shiFouGuoShen" class="btn">
|
|
|
- <el-button type="primary" icon="ibps-icon-plus" @click="onAddClick"
|
|
|
|
|
|
|
+ <el-button type="success" icon="ibps-icon-plus" @click="onAddClick"
|
|
|
>添加</el-button
|
|
>添加</el-button
|
|
|
>
|
|
>
|
|
|
<el-button type="danger" icon="ibps-icon-close" @click="onRemoveClick"
|
|
<el-button type="danger" icon="ibps-icon-close" @click="onRemoveClick"
|
|
|
>删除</el-button
|
|
>删除</el-button
|
|
|
>
|
|
>
|
|
|
- <el-button type="primary" icon="ibps-icon-import" @click="onImportClick"
|
|
|
|
|
- >导入</el-button
|
|
|
|
|
- >
|
|
|
|
|
- <el-button type="primary" icon="ibps-icon-export" @click="onExportClick"
|
|
|
|
|
- >导出</el-button
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ <el-button icon="ibps-icon-import" @click="onImportClick">导入</el-button>
|
|
|
|
|
+ <el-button icon="ibps-icon-export" @click="onExportClick">导出</el-button>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="table">
|
|
<div class="table">
|
|
|
<el-table
|
|
<el-table
|
|
@@ -334,8 +330,8 @@ export default {
|
|
|
const importData = this.switchDeviceObj(data, this.columns)
|
|
const importData = this.switchDeviceObj(data, this.columns)
|
|
|
// console.log(JSON.parse(JSON.stringify(importData)))
|
|
// console.log(JSON.parse(JSON.stringify(importData)))
|
|
|
this.checkDate(importData)
|
|
this.checkDate(importData)
|
|
|
- await this.switchXmToId(importData)
|
|
|
|
|
- this.tableData.push(...importData)
|
|
|
|
|
|
|
+ // await this.switchXmToId(importData)
|
|
|
|
|
+ // this.tableData.push(...importData)
|
|
|
// console.log(JSON.parse(JSON.stringify(this.tableData)))
|
|
// console.log(JSON.parse(JSON.stringify(this.tableData)))
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
this.$message.warning(error?.message || '导入失败')
|
|
this.$message.warning(error?.message || '导入失败')
|
|
@@ -467,10 +463,11 @@ export default {
|
|
|
margin-top: 20px;
|
|
margin-top: 20px;
|
|
|
.btn {
|
|
.btn {
|
|
|
padding: 0;
|
|
padding: 0;
|
|
|
|
|
+ margin-bottom: 4px;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
justify-content: flex-end;
|
|
justify-content: flex-end;
|
|
|
- .el-button {
|
|
|
|
|
- margin: 0;
|
|
|
|
|
|
|
+ .el-button + .el-button {
|
|
|
|
|
+ margin-left: 6px;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|