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

样式

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/TechnologyCenter/ImportParts/index.vue
View File

@@ -1,19 +1,11 @@
<template>
<div class="app-container">
<el-card v-loading="loading">
<<<<<<< HEAD
<div style="width: 650px;margin: 0 auto">
<div style="overflow: hidden">
<div style="margin-bottom: 10px;">
<span>项目：</span>
<el-select v-model="projectValue" filterable size="small" placeholder="项目名称" style="margin-top: 3px">
=======
<div style="width: 620px;margin: 0 auto">
<div style="overflow: hidden">
<div style="margin-bottom: 10px;">
<span>项目：</span>
<el-select v-model="projectValue" filterable size="small" placeholder="项目名称">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in project"
:key="item.value"
@@ -28,11 +20,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
=======
<el-button type="primary" size="small" @click="opendialogVisibleMachine()">上传总图</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</div>
<upload-excel-component @on-selected-file="selected"/>
</div>
@@ -42,11 +30,7 @@
</el-tooltip>
<el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/>
</div>
<<<<<<< HEAD
<div v-if="worksheet.length !== 0" style="float: right;margin: 3px 0">
=======
<div v-if="worksheet.length !== 0" style="float: right;margin: 20px 0">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-button :disabled="disabled" icon="el-icon-upload2" type="primary" size="small" @click="basicPartsToSQL">导入到数据库</el-button>
</div>
</div>

40
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -3,11 +3,7 @@
<el-card>
<div style="width: 900px;margin: 0 auto">
<span>机床名称：</span>
<<<<<<< HEAD
<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="机床名称" @change="getGroups">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in machineNames"
:key="item.value"
@@ -22,15 +18,9 @@
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<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" icon="el-icon-delete" plain size="small" @click="allDelete">一键删除</el-button>
<el-row style="margin-top: 5px;margin-bottom: 3px">
=======
<el-button :loading="listLoading" :disabled="disabled" type="primary" icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
<el-button type="danger" icon="el-icon-delete" size="small" @click="allDelete">一键删除</el-button>
<el-row style="margin-top: 20px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span>机床名称：</span>
<el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>
<span>机床数量：</span>
@@ -45,11 +35,8 @@
:row-class-name="tableRowClassName"
size="mini"
border
<<<<<<< HEAD
stripe
height="280px"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
highlight-current-row
@row-click="searchMaterial1">
<el-table-column
@@ -57,7 +44,6 @@
align="center"
type="index"
width="50"/>
<<<<<<< HEAD
<el-table-column align="center" label="物料状态" min-width="50">
<template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="small" style="margin: 0px">不存在</el-tag>
@@ -65,24 +51,11 @@
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="150">
=======
<el-table-column align="center" label="物料状态" min-width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="small">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="small">存在</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.图号或者型号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="名称" min-width="200" show-overflow-tooltip>
=======
<el-table-column align="center" label="名称" min-width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
@@ -92,11 +65,7 @@
{{ scope.row.材料或者规格 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="规格" width="150">
=======
<el-table-column align="center" label="规格" width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
@@ -146,11 +115,7 @@
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<<<<<<< HEAD
<div class="block">
=======
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 40, 100]"
@@ -167,15 +132,10 @@
:cell-class-name="cell"
style="width: 100%"
size="mini"
<<<<<<< HEAD
height="200px"
highlight-current-row
border
stripe>
=======
highlight-current-row
border>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column
label="序号"
align="center"