Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

This commit is contained in:
caoxinyu
2019-09-24 12:15:29 +08:00
4 changed files with 38 additions and 10 deletions

View File

@@ -59,7 +59,7 @@
</el-table-column>
<el-table-column label="操作" align="center" width="120" fixed="right">
<template slot-scope="scope">
<el-tooltip effect="dark" content="将滞货与项目关联并使用" placement="top" open-delay="1200">
<el-tooltip :open-delay="1000" effect="dark" content="将滞货与项目关联并使用" placement="top">
<el-button :disabled="Number(scope.row.是否关联)===1" size="mini" type="warning" plain @click="connectBacklog(scope.row)">关联物料</el-button>
</el-tooltip>
</template>
@@ -111,7 +111,7 @@
</el-table>
</el-card>
<el-dialog :visible.sync="dialogVisible1" title="关联物料" center style="min-height: 300px;" width="900px">
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="关联物料" center style="min-height: 300px;" width="900px">
<el-table :data="tableData01" size="mini" border style="width: 100%;" height="220" show-summary @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/>
<el-table-column label="名称" align="center" min-width="100">
@@ -184,7 +184,7 @@ export default {
])
},
mounted() {
this.initData()
// this.initData()
this.searchTable1()
},
methods: {
@@ -249,7 +249,6 @@ export default {
}
if (sum === Number(this.useNumber)) {
submitConnectBacklog(this.useNum, materialLocalGroup, numGroup).then(response => {
console.log(response.data)
if (response.data[0].result === '1') {
this.$message.success('关联成功')
this.searchTable1()