This commit is contained in:
caoxinyu
2019-09-25 16:15:30 +08:00
parent 0d820bec95
commit c90acc6a85
13 changed files with 164 additions and 129 deletions

View File

@@ -21,7 +21,7 @@
<el-tooltip :open-delay="1000" effect="dark" content="将三表信息传递给零件分配" placement="top">
<el-button :loading="listLoading" :disabled="disabled" type="primary" plain icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="在三表中删除导入的机床信息" placement="top">
<el-tooltip :open-delay="1000" effect="dark" content="删除导入信息" placement="top">
<el-button type="danger" plain icon="el-icon-delete" size="small" style="margin-left: 10px" @click="allDelete">一键删除</el-button>
</el-tooltip>
<el-row style="margin-top: 10px">
@@ -555,7 +555,7 @@ export default {
})
},
allDelete() {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

View File

@@ -30,9 +30,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-tooltip :open-delay="1000" effect="dark" content="上传项目设计总图" placement="top">
<el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
</el-tooltip>
</div>
<upload-excel-component @on-selected-file="selected"/>
</div>

View File

@@ -21,7 +21,9 @@
<el-tooltip content="asdsdr" placement="top" effect="light">
<el-button :loading="listLoading" :disabled="disabled" type="primary" plain icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
</el-tooltip>
<el-button type="danger" icon="el-icon-delete" plain size="small" @click="allDelete">一键删除</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="删除三表中导入的信息" placement="top">
<el-button type="danger" icon="el-icon-delete" plain size="small" @click="allDelete">一键删除</el-button>
</el-tooltip>
<el-row style="margin-top: 5px;margin-bottom: 3px">
<span>机床名称</span>
<el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>