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

new

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/views/TechnologyCenter/CreatePackingList/index.vue
View File

@@ -1,25 +1,41 @@
<template>
<div class="app-container">
<el-card>
<<<<<<< HEAD
<span style="margin-left: 0">项目名称:</span>
<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small" style="margin-top: 3px">
=======
<span>项目名称</span>
<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<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-button type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addReceipt">增加</el-button>
<el-button type="warning" size="small" icon="el-icon-download" @click="exportTable()">导出</el-button>
<div class="title">总装箱单</div>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table
v-loading="loading"
:data="receiptData"
border
<<<<<<< HEAD
stripe
size="mini"
highlight-current-row
style="margin-top:3px;margin-bottom: 0"
height="170px"
=======
size="mini"
style="margin-top:20px"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@row-click="searchTable">
<el-table-column
label="装箱单号"
@@ -54,6 +70,7 @@
align="center">
<template slot-scope="scope">{{ scope.row.联系方式 }}</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="150">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
@@ -75,28 +92,56 @@
@click="handleDeleteReceipt(scope.row)"/>
</div>
</el-tooltip>
=======
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleEditReceipt(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDeleteReceipt(scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
</el-card>
<<<<<<< HEAD
<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-card style="margin-top: 10px">
<el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
<div class="title">主机</div>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table
v-loading="loading"
:data="machineTableData"
border
<<<<<<< HEAD
stripe
highlight-current-row
size="mini"
height="170px"
style="margin-top:3px;margin-bottom: 0">
=======
size="mini"
style="margin-top:20px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column type="expand">
<template slot-scope="props">
<el-table
:data="groupData"
border
<<<<<<< HEAD
stripe
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini"
style="width: 90%">
<el-table-column
@@ -168,6 +213,7 @@
align="center">
<template slot-scope="scope">{{ scope.row.备注 }}</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="150">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
@@ -189,22 +235,47 @@
@click="deleteMachine(scope.row)"/>
</div>
</el-tooltip>
=======
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="editMachine(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="deleteMachine(scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
</el-card>
<<<<<<< HEAD
<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-card style="margin-top: 10px">
<el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
<div class="title">随机供应的备件</div>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table
v-loading="loading"
:data="spareData"
border
<<<<<<< HEAD
stripe
highlight-current-row
height="170px"
size="mini"
style="margin-top:3px;margin-bottom: 0">
=======
size="mini"
style="margin-top:20px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column
label="序号"
type="index"
@@ -237,6 +308,7 @@
align="center">
<template slot-scope="scope">{{ scope.row.备注 }}</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="150">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -258,17 +330,38 @@
@click="deleteSpare(scope.row)"/>
</div>
</el-tooltip>
=======
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="editSpare(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="deleteSpare(scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
</el-card>
<<<<<<< HEAD
<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-card style="margin-top: 10px">
<el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
<div class="title">随机技术文件</div>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table
v-loading="fileLoading"
:data="fileData"
border
<<<<<<< HEAD
highlight-current-row
stripe
height="170px"
@@ -281,15 +374,34 @@
<el-table-column
label="名称"
align="center">
=======
size="mini"
style="margin-top:20px">
<el-table-column
label="序号"
align="center"
type="index"
min-width="150px"/>
<el-table-column
label="名称"
align="center"
min-width="200px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">{{ scope.row.名称 }}</template>
</el-table-column>
<el-table-column
label="数量"
<<<<<<< HEAD
align="center">
=======
align="center"
min-width="100px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">{{ scope.row.数量 }}</template>
</el-table-column>
<el-table-column
label="备注"
<<<<<<< HEAD
align="center">
<template slot-scope="scope">{{ scope.row.备注 }}</template>
</el-table-column>
@@ -314,6 +426,24 @@
@click="deleteFile(scope.row)"/>
</div>
</el-tooltip>
=======
align="center"
min-width="500px">
<template slot-scope="scope">{{ scope.row.备注 }}</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="editFile(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="deleteFile(scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>