meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
yanggongyan
2020-02-08 17:01:54 +08:00
parent b78549aa5a 8331401261
commit df3b5b2011
64 changed files with 921 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/views/Assembly/MakeAssemblyPlan/index.vue
View File

@@ -13,8 +13,8 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
<el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -34,7 +34,7 @@
</div>
</el-card>
<el-card style="width: 40%; float: left">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -45,7 +45,7 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center">
<el-table-column label="机床名称" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
@@ -97,9 +97,13 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -284,3 +288,21 @@ export default {
<style scoped>
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

16
src/views/Assembly/MakeColdWorkPlan/index.vue
View File

@@ -13,8 +13,8 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
<el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -34,7 +34,7 @@
</div>
</el-card>
<el-card style="width: 40%; float: left">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -97,9 +97,13 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>

16
src/views/Assembly/MakeElectricalAssembly/index.vue
View File

@@ -13,8 +13,8 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
<el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -34,7 +34,7 @@
</div>
</el-card>
<el-card style="width: 40%; float: left">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -97,9 +97,13 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>

18
src/views/Assembly/MakePaintPlan/index.vue
View File

@@ -13,8 +13,8 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
<el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -34,7 +34,7 @@
</div>
</el-card>
<el-card style="width: 40%; float: left">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -45,7 +45,7 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center">
<el-table-column label="机床名称" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
@@ -97,9 +97,13 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>

2
src/views/Assembly/SparePartsOutStockRecord/index.vue
View File

@@ -40,7 +40,7 @@
type="date"
placeholder="选择日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="查询备料出库记录" placement="top">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
</el-tooltip>
</el-row>
</el-card>