This commit is contained in:
liushuai
2020-03-27 17:21:28 +08:00
parent d968be25f2
commit 9078070157
10 changed files with 288 additions and 115 deletions

View File

@@ -111,12 +111,12 @@
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="到货状态" width="90px">
<template slot-scope="scope">
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>
<span v-else>未到货</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="到货状态" width="90px">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>-->
<!-- <span v-else>未到货</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
@@ -137,6 +137,16 @@
{{ scope.row.备注 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="采购日期" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.采购时间 ? scope.row.采购时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="分配日期" width="100px">
<template slot-scope="scope">
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
@@ -159,7 +169,7 @@
<el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe @sort-change="sortChange1">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
@@ -170,7 +180,7 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="70px" sortable="custom">
<el-table-column align="center" label="组号" prop="组号" width="80px" sortable="custom">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
@@ -215,13 +225,13 @@
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="到货状态" width="90px">
<template slot-scope="scope">
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>
<span v-else-if="0 < Number(scope.row.到货数量) < Number(scope.row.采购数量)">部分到货</span>
<span v-else>未到货</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="到货状态" width="90px">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>-->
<!-- <span v-else-if="0 < Number(scope.row.到货数量) < Number(scope.row.采购数量)">部分到货</span>-->
<!-- <span v-else>未到货</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
@@ -242,6 +252,16 @@
{{ scope.row.备注 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="采购日期" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.采购时间 ? scope.row.采购时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="分配日期" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
@@ -275,7 +295,7 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="70px" sortable="custom">
<el-table-column align="center" label="组号" prop="组号" width="80px" sortable="custom">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
@@ -327,12 +347,12 @@
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="到货状态" width="90px">
<template slot-scope="scope">
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>
<span v-else>未到货</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="到货状态" width="90px">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>-->
<!-- <span v-else>未到货</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="100px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }}
@@ -353,6 +373,16 @@
{{ scope.row.备注 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="采购日期" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.采购时间 ? scope.row.采购时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="分配日期" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
@@ -670,7 +700,9 @@ export default {
采购数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].数量 || response.data.result[i].离线采购数量 || '—',
到货数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].已到货数量 || response.data.result[i].离线到货数量 || '—',
不合格数量: response.data.result[i].不合格数量,
操作日期: response.data.result[i].操作日期
任务分配时间: response.data.result[i].任务分配时间,
操作日期: response.data.result[i].操作日期,
采购时间: response.data.result[i].采购时间
})
}
}
@@ -742,7 +774,9 @@ export default {
采购数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].数量 || response.data.result[i].离线采购数量 || '—',
到货数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].已到货数量 || response.data.result[i].离线到货数量 || '—',
不合格数量: response.data.result[i].不合格数量,
操作日期: response.data.result[i].操作日期
操作日期: response.data.result[i].操作日期,
采购时间: response.data.result[i].采购时间,
任务分配时间: response.data.result[i].任务分配时间
})
}
}