This commit is contained in:
zhangdingyu
2019-09-20 16:57:43 +08:00
parent 8d70b74a1e
commit eba60fd687
3 changed files with 36 additions and 36 deletions

View File

@@ -88,12 +88,12 @@
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" align="center" min-width="120">
<el-table-column label="图号或型号" align="center" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" min-width="120">
<el-table-column label="规格" align="center" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>

View File

@@ -8,7 +8,7 @@
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
</div>
<h4 style="margin-top: 5px">发票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;height: 300px;overflow:auto" size="mini" @row-click="searchTable2">
<el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="350px" size="mini" @row-click="searchTable2">
<el-table-column type="expand">
<template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand">
@@ -41,7 +41,7 @@
</el-form>
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="200">
<el-table-column label="供应商" align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -51,7 +51,7 @@
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column label="发票金额" align="center" min-width="70">
<el-table-column label="发票金额" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.发票金额 }}
</template>
@@ -61,7 +61,7 @@
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
</template>
</el-table-column>
<el-table-column label="申请时间" align="center" min-width="115">
<el-table-column label="申请时间" align="center" min-width="115" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
</template>
@@ -71,7 +71,7 @@
{{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="115">
<el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
</template>
@@ -81,7 +81,7 @@
{{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="115">
<el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
</template>
@@ -91,16 +91,16 @@
{{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="115">
<el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="300">
<el-table-column label="操作" align="center" width="300" fixed="right">
<template slot-scope="scope">
<el-button :disabled="Number(scope.row.是否提交申请)===1" type="primary" icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button :disabled="Number(scope.row.是否提交申请)===1" type="danger" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
<el-button :disabled="Number(scope.row.是否提交申请)===1" type="primary" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
<el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" icon="el-icon-edit" plain size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button :disabled="Number(scope.row.是否提交申请)===1" type="danger" icon="el-icon-delete" plain size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
<el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" plain size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
</template>
</el-table-column>
</el-table>

View File

@@ -45,7 +45,7 @@
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" width="100px">
<el-table-column align="center" label="机床图号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -55,27 +55,27 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="名称" width="100px">
<el-table-column align="center" label="名称" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="型号" min-width="100px">
<el-table-column align="center" label="型号" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="规格" min-width="200px">
<el-table-column align="center" label="规格" min-width="200px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="供货商" min-width="100px">
<el-table-column align="center" label="供货商" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" min-width="100px">
<el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 || '—' }}
</template>
@@ -95,7 +95,7 @@
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="供应商" min-width="150px">
<el-table-column align="center" label="供应商" min-width="150px" show-overflow-tooltip>
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
</template>
@@ -133,7 +133,7 @@
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" width="100px">
<el-table-column align="center" label="机床图号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -143,27 +143,27 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="名称" width="100px">
<el-table-column align="center" label="名称" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="型号" min-width="100px">
<el-table-column align="center" label="型号" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="规格" min-width="200px">
<el-table-column align="center" label="规格" min-width="200px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="供货商" min-width="100px">
<el-table-column align="center" label="供货商" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" min-width="100px">
<el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 || '—' }}
</template>
@@ -183,12 +183,12 @@
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="供应商" min-width="150px">
<el-table-column align="center" label="供应商" min-width="150px" show-overflow-tooltip>
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" min-width="100px">
<el-table-column align="center" label="合同编号" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.采购合同编号 || scope.row.离线合同编号 || '—' }}
</template>
@@ -221,7 +221,7 @@
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" width="100px">
<el-table-column align="center" label="机床图号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -231,32 +231,32 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="名称" min-width="100px">
<el-table-column align="center" label="名称" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="100px">
<el-table-column align="center" label="图号" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="规格" min-width="100px">
<el-table-column align="center" label="规格" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="材料" min-width="100px">
<el-table-column align="center" label="材料" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column align="center" label="供货商" min-width="100px">
<el-table-column align="center" label="供货商" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" min-width="100px">
<el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 || '—' }}
</template>
@@ -276,7 +276,7 @@
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="供应商" min-width="100px">
<el-table-column align="center" label="供应商" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }}
</template>