This commit is contained in:
caoxinyu
2019-09-25 12:09:41 +08:00
parent 676f2a3ec3
commit 76b361ddbd
22 changed files with 82 additions and 72 deletions

View File

@@ -9,8 +9,12 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">增加</el-button>
<el-button type="warning" size="small" style="margin-left: 10px" icon="el-icon-download" @click="exportTable()">导出</el-button>
<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-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-tooltip>
<el-table
v-loading="loading"
:data="receiptData"

View File

@@ -30,7 +30,9 @@
<el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/>
</div>
<div v-if="worksheet.length !== 0" style="float: right;margin: 20px 0">
<el-button :disabled="disabled" icon="el-icon-upload2" type="primary" size="small" @click="basicPartsToSQL">导入到数据库</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="将信息存入系统数据库" placement="top">
<el-button :disabled="disabled" icon="el-icon-upload2" type="primary" size="small" @click="basicPartsToSQL">导入到数据库</el-button>
</el-tooltip>
</div>
</div>
</el-card>

View File

@@ -3,7 +3,7 @@
<el-card>
<div style="width: 900px;margin: 3px auto">
<span>机床名称</span>
<el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" @change="getGroups">
<el-select v-model="machineValue" filterable clearable size="small" style="width: 200px;" placeholder="机床名称" @change="getGroups">
<el-option
v-for="item in machineNames"
:key="item.value"
@@ -11,15 +11,19 @@
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">分组名称</span>
<el-select v-model="groupValue" filterable clearable size="small" placeholder="分组名称">
<el-select v-model="groupValue" filterable clearable size="small" style="width: 200px;" placeholder="分组名称">
<el-option
v-for="item in groupsNames"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<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 type="danger" plain icon="el-icon-delete" size="small" style="margin-left: 10px" @click="allDelete">一键删除</el-button>
<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-tooltip>
<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-tooltip>
<el-row style="margin-top: 10px">
<span>机床名称</span>
<el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>

View File

@@ -13,7 +13,7 @@
<el-col :span="6">
<div style="width: 650px;margin: 0">
<div style="overflow: hidden">
<div style="margin-bottom: 10px;">
<div style="margin-bottom: 0px;">
<span>项目</span>
<el-select v-model="projectValue" filterable size="small" placeholder="项目名称" style="margin-top: 3px">
<el-option
@@ -30,14 +30,14 @@
: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-tooltip :open-delay="1000" effect="dark" content="上传项目设计总图" placement="top">
<el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
</el-tooltip>
</div>
<upload-excel-component @on-selected-file="selected"/>
</div>
<div>
<el-tooltip content="删除全部" placement="top">
<span v-show="worksheet.length > 1" style="cursor: pointer;float: right;margin: 5px" @click="removeAll"><i class="el-icon-close"/></span>
</el-tooltip>
<span v-show="worksheet.length > 1" style="cursor: pointer;width: 100px" @click="removeAll"><i class="el-icon-close"/></span>
<el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/>
</div>
<div v-if="worksheet.length !== 0" style="float: right;margin: 3px 0">

View File

@@ -3,7 +3,7 @@
<el-card>
<div style="width: 900px;margin: 0 auto">
<span>机床名称</span>
<el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" style="margin-top: 3px" @change="getGroups">
<el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" style="margin-top: 3px;width: 200px;" @change="getGroups">
<el-option
v-for="item in machineNames"
:key="item.value"
@@ -11,7 +11,7 @@
:value="item.value"/>
</el-select>
<span>分组名称</span>
<el-select v-model="groupValue" filterable clearable size="small" placeholder="分组名称">
<el-select v-model="groupValue" filterable clearable size="small" placeholder="分组名称" style="width: 200px;">
<el-option
v-for="item in groupsNames"
:key="item.value"