This commit is contained in:
Vergil
2020-05-06 17:45:29 +08:00
parent 5a070ed755
commit bdd9e92628
3 changed files with 42 additions and 83 deletions

View File

@@ -46,6 +46,16 @@
@selection-change="handleSelectionChange1" @selection-change="handleSelectionChange1"
@select="handleSelection"> @select="handleSelection">
<el-table-column :selectable="selectable" align="center" width="43" type="selection"/> <el-table-column :selectable="selectable" align="center" width="43" type="selection"/>
<el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="名称" align="center" prop="物料名称" width="100" show-overflow-tooltip> <el-table-column label="名称" align="center" prop="物料名称" width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
@@ -66,16 +76,6 @@
{{ scope.row.供货商 === '0' ? '-' : scope.row.供货商 }} {{ scope.row.供货商 === '0' ? '-' : scope.row.供货商 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料类别" align="center" width="80" show-overflow-tooltip> <el-table-column label="物料类别" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料类别 }} {{ scope.row.物料类别 }}
@@ -144,17 +144,6 @@
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top"> <el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button> <el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip> </el-tooltip>
<!--<div class="block" style="margin: 10px 0 0 0;display: inline-block">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent11"-->
<!--:page-sizes="[10, 20, 30, 40, 100]"-->
<!--:page-size="pageSize11"-->
<!--:total="total11"-->
<!--style="display:inline-block;width:800px"-->
<!--layout="total, sizes, prev, pager, next, jumper"-->
<!--@size-change="handleSizeChange11"-->
<!--@current-change="handleCurrentChange11"/>-->
<!--</div>-->
<div class="block" style="display: inline-block;width:1150px;float: right;"> <div class="block" style="display: inline-block;width:1150px;float: right;">
<div style="display: inline-block;float: right;"> <div style="display: inline-block;float: right;">
<el-pagination <el-pagination
@@ -335,7 +324,7 @@
<el-card> <el-card>
<!--<h3>合同详细信息</h3>--> <!--<h3>合同详细信息</h3>-->
<el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border stripe style="max-height: 500px;" height="450px" size="mini" show-summary> <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border stripe style="max-height: 500px;" height="450px" size="mini" show-summary>
<el-table-column label="物料名称" align="center" width="120" show-overflow-tooltip> <el-table-column label="物料名称" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }} {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template> </template>
@@ -612,13 +601,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="离线合同备注" prop="离线合同备注">-->
<!-- <el-input v-model="form2.离线合同备注" size="small" type="textarea" style="width: 550px"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button <el-button

View File

@@ -58,26 +58,11 @@
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="离线合同名称" align="center" min-width="150">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.离线合同名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="离线合同编号" align="center" prop="离线合同编号" min-width="130" sortable="custom" show-overflow-tooltip> <el-table-column label="离线合同编号" align="center" prop="离线合同编号" min-width="130" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.离线合同编号 }} {{ scope.row.离线合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建日期" align="center" prop="创建日期" min-width="110" sortable="custom">
<template slot-scope="scope">
{{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : '-' }}
</template>
</el-table-column>
<!-- <el-table-column label="采购员" align="center" min-width="60">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.采购员 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="合同金额(元)" align="center" min-width="110"> <el-table-column label="合同金额(元)" align="center" min-width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ Number(scope.row.合同总额).toFixed(2) }} {{ Number(scope.row.合同总额).toFixed(2) }}
@@ -103,7 +88,7 @@
{{ scope.row.采购员 }} {{ scope.row.采购员 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提交日期" align="center" prop="提交日期" min-width="110" sortable="custom"> <el-table-column label="采购日期" align="center" prop="采购日期" min-width="110" sortable="custom">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.提交日期 ? scope.row.提交日期.split(' ')[0] : '-' }} {{ scope.row.提交日期 ? scope.row.提交日期.split(' ')[0] : '-' }}
</template> </template>
@@ -122,44 +107,42 @@
</div> </div>
</el-card> </el-card>
<el-card style="width: 50%"> <el-card style="width: 50%">
<!-- <div id="offlineContract" style="background-color:white;min-height:500px;margin: 0 auto;width: 800px;border:1px solid black">-->
<table v-show="contractDetail.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="500px"> <table v-show="contractDetail.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="500px">
<tr> <tr>
<th colspan="14"><h1>离线合同</h1></th> <th colspan="14"><h1>离线合同</h1></th>
</tr> </tr>
<tr> <tr>
<td colspan="3" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td> <td colspan="3" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
<td width="80px">合同名称</td> <td style="text-align: center;" width="80px">合同名称</td>
<td id="contractName" colspan="2" style="text-align: left;"/> <td id="contractName" colspan="2" style="text-align: center;"/>
<td width="80px">供应商</td> <td style="text-align: center;" width="80px">供应商</td>
<td id="supplier" colspan="5" style="text-align: left;"/> <td id="supplier" colspan="5" style="text-align: center;"/>
<td id="qrCode" colspan="2" rowspan="2"/> <td id="qrCode" style="text-align: center;" colspan="2" rowspan="2"/>
</tr> </tr>
<tr> <tr>
<td width="80px">合同编号</td> <td style="text-align: center;" width="80px">合同编号</td>
<td id="contractNum" colspan="2" style="text-align: left;"/> <td id="contractNum" colspan="2" style="text-align: center;"/>
<td width="80px">采购员</td> <td style="text-align: center;" width="80px">采购员</td>
<td id="buyer" colspan="5" style="text-align: left;"/> <td id="buyer" colspan="5" style="text-align: center;"/>
</tr> </tr>
<tr id="tablehead"> <tr id="tablehead">
<td width="50px">序号</td> <td style="text-align: center;" width="50px">序号</td>
<td colspan="2">名称</td> <td style="text-align: center;" colspan="2">名称</td>
<td>规格</td> <td style="text-align: center;">规格</td>
<td colspan="2">型号</td> <td style="text-align: center;" colspan="2">型号</td>
<td>数量</td> <td style="text-align: center;">数量</td>
<td colspan="2">单价</td> <td style="text-align: center;" colspan="2">单价</td>
<td colspan="2">合计</td> <td style="text-align: center;" colspan="2">合计</td>
<td>交货期</td> <td style="text-align: center;">交货期</td>
<td colspan="2">备注</td> <td style="text-align: center;" colspan="2">备注</td>
</tr> </tr>
<tr> <tr>
<td>总计</td> <td style="text-align: center;">总计</td>
<td id="remark" colspan="10"/> <td id="remark" colspan="12" style="text-align: center;"/>
<td id="total" colspan="2" style="text-align: left;"/> <!--<td id="total" colspan="2" style="text-align: center;"/>-->
<td/> <!--<td/>-->
</tr> </tr>
</table> </table>
<!-- </div>-->
</el-card> </el-card>
</el-row> </el-row>
</div> </div>
@@ -323,7 +306,7 @@ export default {
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
tr[i] = document.createElement('tr') tr[i] = document.createElement('tr')
tr[i].setAttribute('class', 'tableData') tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = `<td style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/>` tr[i].innerHTML = `<td style="text-align:center;height: 40px"/><td colspan="2" style="text-align:center;height: 40px"/><td style="text-align:center;height: 40px"/><td colspan="2" style="text-align:center;height: 40px"/><td style="text-align:center;height: 40px"/><td colspan="2" style="text-align:center;height: 40px"/><td colspan="2" style="text-align:center;height: 40px"/><td style="text-align:center;height: 40px"/><td colspan="2" style="text-align:center;height: 40px"/>`
$('#tablehead').after(tr[i]) $('#tablehead').after(tr[i])
} }
let total = 0 let total = 0
@@ -344,10 +327,10 @@ export default {
document.getElementById('contractName').innerHTML = row.离线合同名称 document.getElementById('contractName').innerHTML = row.离线合同名称
document.getElementById('supplier').innerHTML = row.供应商名称 document.getElementById('supplier').innerHTML = row.供应商名称
document.getElementById('buyer').innerHTML = row.采购员 document.getElementById('buyer').innerHTML = row.采购员
document.getElementById('total').innerHTML = total document.getElementById('total').innerHTML = ''
document.getElementById('remark').innerHTML = row.离线合同备注 document.getElementById('remark').innerHTML = total + ' 元'
$('#qrCode').html(`<img id="img">`) $('#qrCode').html(`<img id="img">`)
this.useqrcode(row.离线合同流水) // 显示二维码 this.useqrcode(row.离线合同) // 显示二维码
}, },
useqrcode(contractNum) { // 二维码 useqrcode(contractNum) { // 二维码
const opts = { const opts = {

View File

@@ -11,8 +11,7 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1350px"> <el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1350px">
<el-table-column label="序号" align="center" type="index" width="55"/> <el-table-column label="名称" align="center" width="120px">
<el-table-column label="名称" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
@@ -47,27 +46,22 @@
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }} {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货金额(元)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.到货金额 }}
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" width="160px"> <el-table-column label="合同编号" align="center" width="160px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.离线合同编号 }} {{ scope.row.离线合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" align="center" width="220" show-overflow-tooltip> <el-table-column label="供应商" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购员" align="center" width="100"> <el-table-column label="采购员" align="center" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购员 }} {{ scope.row.采购员 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购日期" align="center" width="100"> <el-table-column label="采购日期" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.创建日期 }} {{ scope.row.创建日期 }}
</template> </template>