This commit is contained in:
caoxinyu
2019-09-25 20:11:52 +08:00
parent c90acc6a85
commit e3035b1d55
8 changed files with 18 additions and 14 deletions

View File

@@ -15,7 +15,8 @@
</el-col> </el-col>
<el-col :span="17"> <el-col :span="17">
<el-card> <el-card>
<el-button type="primary" plain style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button> <div style="height: 37px"/>
<el-button type="primary" plain style="margin-left: 10px" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>

View File

@@ -28,7 +28,7 @@
v-loading="loading" v-loading="loading"
:data="tableData" :data="tableData"
:summary-method="getSummaries" :summary-method="getSummaries"
style="width: 100%" style="width: 100%;margin-top: 6px"
highlight-current-row highlight-current-row
height="400" height="400"
size="mini" size="mini"
@@ -89,7 +89,7 @@
</el-card> </el-card>
<el-card> <el-card>
<h3 style="text-align: center;">采购部采购</h3> <h3 style="text-align: center;">采购部采购</h3>
<el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()"> <el-tabs v-model="PartType" type="border-card" style="margin-top: 10px" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件"> <el-tab-pane label="标准件" name="标准件">
<el-table :data="tableData00" size="mini" height="400px" border stripe> <el-table :data="tableData00" size="mini" height="400px" border stripe>
<el-table-column align="center" label="机床图号"> <el-table-column align="center" label="机床图号">
@@ -268,7 +268,7 @@
<el-table <el-table
:data="tableData1" :data="tableData1"
border border
style="width: 100%;" style="width: 100%;margin-top: 6px;"
height="400"> height="400">
<el-table-column label="机床图号" align="center" min-width="80"> <el-table-column label="机床图号" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">

View File

@@ -1064,7 +1064,7 @@ export default {
<style scoped> <style scoped>
.el-card{ .el-card{
margin-bottom: 15px; margin-bottom: 0px;
} }
.el-date-editor{ .el-date-editor{
width:150px width:150px

View File

@@ -602,7 +602,7 @@
</el-table-column> </el-table-column>
<el-table-column label="更新" size="mini" align="center" width="90"> <el-table-column label="更新" size="mini" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" style="" @click="updateDate(scope.$index)">更新</el-button> <el-button size="mini" type="primary" plain style="" @click="updateDate(scope.$index)">更新</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

View File

@@ -172,9 +172,13 @@
</el-row> </el-row>
<el-divider content-position="right">跳转链接</el-divider> <el-divider content-position="right">跳转链接</el-divider>
<el-row style="margin-left: 20px"> <el-row style="margin-left: 20px">
<el-button size="medium" type="text" @click="toStatusQuery">零件状态查询</el-button> <el-tooltip :open-delay="1000" effect="dark" content="转到零件状态查询模块" placement="top">
<el-button size="medium" type="text" @click="toStatusQuery">零件状态查询</el-button>
</el-tooltip>
<el-divider direction="vertical"/> <el-divider direction="vertical"/>
<el-button size="medium" type="text" @click="toProcessingStatus">加工进度查询</el-button> <el-tooltip :open-delay="1000" effect="dark" content="转到加工进度查询模块" placement="top">
<el-button size="medium" type="text" @click="toProcessingStatus">加工进度查询</el-button>
</el-tooltip>
</el-row> </el-row>
</div> </div>
</div> </div>

View File

@@ -18,10 +18,10 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-tooltip :open-delay="1000" effect="dark" content="将三表信息传递零件分配" placement="top"> <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-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>
<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-button type="danger" plain icon="el-icon-delete" size="small" style="margin-left: 10px" @click="allDelete">一键删除</el-button>
</el-tooltip> </el-tooltip>
<el-row style="margin-top: 10px"> <el-row style="margin-top: 10px">

View File

@@ -30,12 +30,11 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
</div> </div>
<upload-excel-component @on-selected-file="selected"/> <upload-excel-component @on-selected-file="selected"/>
</div> </div>
<div> <div>
<span v-show="worksheet.length > 1" style="cursor: pointer;width: 100px" @click="removeAll"><i class="el-icon-close"/></span> <span v-show="worksheet.length > 1" style="cursor: pointer;width: 50px" @click="removeAll"><i class="el-icon-close"/></span>
<el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/> <el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/>
</div> </div>
<div v-if="worksheet.length !== 0" style="float: right;margin: 3px 0"> <div v-if="worksheet.length !== 0" style="float: right;margin: 3px 0">

View File

@@ -18,10 +18,10 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-tooltip content="asdsdr" placement="top" effect="light"> <el-tooltip :open-delay="1000" content="将系统中的三表信息传递到零件分配" 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-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>
<el-tooltip :open-delay="1000" effect="dark" content="删除三表中导入的信息" placement="top"> <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-button type="danger" icon="el-icon-delete" plain size="small" @click="allDelete">一键删除</el-button>
</el-tooltip> </el-tooltip>
<el-row style="margin-top: 5px;margin-bottom: 3px"> <el-row style="margin-top: 5px;margin-bottom: 3px">