This commit is contained in:
hedekun
2020-02-08 16:34:57 +08:00
parent 76db4ae54a
commit 79b356d649
28 changed files with 464 additions and 176 deletions

View File

@@ -10,10 +10,10 @@
:value="item.value"/>
</el-select>
<el-tooltip :open-delay="1000" effect="dark" content="新增项目装箱单" placement="top">
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">新增</el-button>
<el-button class="button111" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">新增</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打印装箱单" placement="top">
<el-button type="warning" size="small" style="margin-left: 10px" icon="el-icon-download" @click="exportTable()">导出</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" plain icon="el-icon-download" @click="exportTable()">导出</el-button>
</el-tooltip>
<el-table
v-loading="loading"
@@ -85,12 +85,11 @@
</el-card>
<el-card >
<el-button :disabled="!disabled" plain type="primary" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
<el-button :disabled="!disabled" class="button111" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
<el-table
v-loading="loading"
:data="machineTableData"
border
stripe
highlight-current-row
size="mini"
height="170px"
@@ -200,12 +199,11 @@
</el-card>
<el-card >
<el-button :disabled="!disabled" type="primary" style="margin-top: 3px" plain size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
<el-button :disabled="!disabled" class="button111" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
<el-table
v-loading="loading"
:data="spareData"
border
stripe
highlight-current-row
height="170px"
size="mini"
@@ -269,13 +267,12 @@
</el-card>
<el-card >
<el-button :disabled="!disabled" plain type="primary" size="small" style="margin-top: 3px" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
<el-button :disabled="!disabled" class="button111" size="small" style="margin-top: 3px" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
<el-table
v-loading="fileLoading"
:data="fileData"
border
highlight-current-row
stripe
height="170px"
size="mini"
style="margin-top:3px;margin-bottom: 0">
@@ -1085,3 +1082,21 @@ span{
}
}
</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>

View File

@@ -49,8 +49,8 @@
width="50"/>
<el-table-column align="center" label="物料状态" min-width="90">
<template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini">存在</el-tag>
<span v-if="scope.row.物料流水号===null" type="warning" size="mini">不存在</span>
<span v-if="scope.row.物料流水号!==null" type="primary" size="mini">存在</span>
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="120">
@@ -58,7 +58,7 @@
{{ scope.row.图号或者型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="名称" min-width="80">
<el-table-column align="center" label="名称" min-width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
@@ -137,8 +137,7 @@
size="mini"
highlight-current-row
height="150"
border
stripe>
border>
<el-table-column
label="序号"
align="center"
@@ -168,7 +167,8 @@
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
type="text"
icon="el-icon-sort"
@click="handle(scope.row)">替换
</el-button>
</template>
@@ -784,9 +784,9 @@ export default {
.el-table .warning-row {
background: red;
}
.rgb196{
background: palevioletred !important;
}
/*.rgb196{*/
/* background: palevioletred !important;*/
/*}*/
</style>
<style scoped>

View File

@@ -3,7 +3,7 @@
<input id="excel-upload-input" ref="excel-upload-input" type="file" multiple="multiple" accept=".xlsx, .xls" class="c-hide" @change="handkeFileChange">
<div id="drop" @drop="handleDrop" @dragover="handleDragover" @dragenter="handleDragover">
将Excel文件拖到这或
<el-button style="margin-left:16px;" size="small" icon="el-icon-search" type="success" @click="handleUpload">浏览</el-button>
<el-button style="margin-left:16px;" size="small" icon="el-icon-search" type="primary" plain @click="handleUpload">浏览</el-button>
</div>
</div>
</template>

View File

@@ -30,7 +30,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
<el-button class="button111" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
</div>
<upload-excel-component @on-selected-file="selected"/>
</div>
@@ -490,3 +490,21 @@ a{
color: #999;
}
</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>

View File

@@ -52,8 +52,8 @@
width="50"/>
<el-table-column align="center" label="物料状态" min-width="70">
<template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</el-tag>
<span v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</span>
<span v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</span>
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="100" show-overflow-tooltip>
@@ -66,7 +66,7 @@
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="材料" width="70">
<el-table-column align="center" label="材料" width="70" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.材料或者规格 }}
</template>
@@ -76,32 +76,32 @@
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="备件数量" width="70">
<el-table-column align="center" label="备件数量" width="70" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备件数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="装机数量" width="70">
<el-table-column align="center" label="装机数量" width="70" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.装机数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="部件数量" width="70">
<el-table-column align="center" label="部件数量" width="70" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.部件数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="制造商" min-width="100">
<el-table-column align="center" label="制造商" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.制造商 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" width="80">
<el-table-column align="center" label="备注" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="分类码" width="80">
<el-table-column align="center" label="分类码" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.分类码 }}
</template>
@@ -142,8 +142,7 @@
size="mini"
height="530px"
highlight-current-row
border
stripe>
border>
<el-table-column align="center" label="物料名称" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
@@ -168,7 +167,8 @@
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
type="text"
icon="el-icon-sort"
@click="handle(scope.row)">替换
</el-button>
</template>
@@ -657,9 +657,9 @@ export default {
</script>
<style>
.rgb196{
background: palevioletred !important;
}
/*.rgb196{*/
/* background: palevioletred !important;*/
/* }*/
</style>
<style scoped>

View File

@@ -33,7 +33,7 @@
:value="item.value"/>
</el-select>
<el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
<el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
<el-upload
:disabled="disabled"
:action="action"
@@ -44,7 +44,7 @@
style="float: right; margin: 0px 50px"
class="upload-demo"
multiple>
<el-button type="success" size="small" style="float: right; margin: 0px 50px" @click="batchImportOfDrawings">图纸批量导入</el-button>
<el-button type="primary" size="small" style="float: right; margin: 0px 50px" plain @click="batchImportOfDrawings">图纸批量导入</el-button>
</el-upload>
</el-card>
<el-card>
@@ -87,8 +87,8 @@
</el-table-column>
<el-table-column label="是否导入" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否导入)===1" type="success">已导入</el-tag>
<el-tag v-else type="danger">未导入</el-tag>
<span v-if="Number(scope.row.是否导入)===1" type="success">已导入</span>
<span v-else type="danger">未导入</span>
</template>
</el-table-column>
<el-table-column min-width="50px" label="零件图纸" align="center">
@@ -107,7 +107,7 @@
:file-list="fileList"
class="upload-demo"
multiple>
<el-button :disabled="disabled" size="mini" type="primary" round @click="getAction(scope.row)">点击上传</el-button>
<el-button :disabled="disabled" size="mini" type="text" icon="el-icon-upload2" round @click="getAction(scope.row)">点击上传</el-button>
</el-upload>
</template>
</el-table-column>