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

This commit is contained in:
liushuai
2018-11-23 13:38:19 +08:00
10 changed files with 172 additions and 93 deletions

View File

@@ -72,7 +72,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="searchBasicPartRecord(scope.row)">选择</el-button>
<el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchBasicPartRecord(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
@@ -114,11 +114,6 @@
{{ scope.row.入库时间 ? scope.row.入库时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<el-table
v-loading="listLoading2"
@@ -151,11 +146,6 @@
{{ scope.row.出库备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-tab-pane>
@@ -232,7 +222,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="searchGeneralPartRecord(scope.row)">选择</el-button>
<el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchGeneralPartRecord(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
@@ -274,11 +264,6 @@
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<el-table
v-loading="listLoading5"
@@ -306,11 +291,6 @@
{{ scope.row.领用者 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-tab-pane>
@@ -385,7 +365,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
<el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
@@ -427,11 +407,6 @@
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<el-table
v-loading="listLoading8"
@@ -459,11 +434,6 @@
{{ scope.row.领用者 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-tab-pane>
@@ -540,7 +510,7 @@
</el-table-column>
<el-table-column label="操作" align="center" width="200px">
<template slot-scope="scope" align="center">
<el-button size="mini" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="standardselecting(scope.row)" >选择</el-button>
<el-button size="mini" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="standardselecting(scope.row)" >选择</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button>
</template>
</el-table-column>
@@ -595,11 +565,6 @@
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<el-table
v-loading="listLoading11"
@@ -627,11 +592,6 @@
{{ scope.row.领用者 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-tab-pane>