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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-12-23 12:34:00 +08:00
parent 2aa051ff90 c1f87f5834
commit be42004625
8 changed files with 665 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -77,12 +77,23 @@
</el-table-column>
<el-table-column align="center" label="采购数量" width="100px">
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
{{ scope.row.采购数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="到货数量" width="100px">
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
{{ scope.row.到货数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不合格数量" width="100px">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="到货状态" width="100px">
<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>
@@ -165,12 +176,23 @@
</el-table-column>
<el-table-column align="center" label="采购数量" width="100px">
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
{{ scope.row.采购数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="到货数量" width="100px">
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
{{ scope.row.到货数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不合格数量" width="100px">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="到货状态" width="100px">
<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>
@@ -258,14 +280,27 @@
</el-table-column>
<el-table-column align="center" label="采购数量" width="100px">
<template slot-scope="scope">
{{ scope.row.采购数量 }}
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="到货数量" width="100px">
<template slot-scope="scope">
{{ scope.row.到货数量 }}
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="不合格数量" width="100px">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="到货状态" width="100px">
<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>
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }}
@@ -502,7 +537,34 @@ export default {
this.model ? check5 = 1 : check5 = 0
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model).then(response => {
console.log(this.tableData0)
this.tableData0 = response.data.rows
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData0.push({
人员编号: response.data.rows[i].人员编号,
询价状态编号: response.data.rows[i].询价状态编号,
采购状态编号: response.data.rows[i].采购状态编号,
机床图号: response.data.rows[i].机床图号,
组号: response.data.rows[i].组号,
物料名称: response.data.rows[i].物料名称,
物料型号: response.data.rows[i].物料型号,
物料规格: response.data.rows[i].物料规格,
供货商: response.data.rows[i].供货商,
零件数量: response.data.rows[i].零件数量,
数量: response.data.rows[i].数量,
离线采购数量: response.data.rows[i].离线采购数量,
已到货数量: response.data.rows[i].已到货数量,
离线到货数量: response.data.rows[i].离线到货数量,
供应商名称: response.data.rows[i].供应商名称,
离线合同供应商名称: response.data.rows[i].离线合同供应商名称,
采购合同编号: response.data.rows[i].采购合同编号,
离线合同编号: response.data.rows[i].离线合同编号,
备注: response.data.rows[i].备注,
采购数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].数量 || response.data.rows[i].离线采购数量 || '—',
到货数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].已到货数量 || response.data.rows[i].离线到货数量 || '—',
不合格数量: response.data.rows[i].不合格数量
})
}
}
this.total0 = response.data.total
})
},
@@ -514,8 +576,36 @@ export default {
this.spec ? check4 = 1 : check4 = 0
this.model ? check5 = 1 : check5 = 0
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData1.push({
人员编号: response.data.rows[i].人员编号,
询价状态编号: response.data.rows[i].询价状态编号,
采购状态编号: response.data.rows[i].采购状态编号,
机床图号: response.data.rows[i].机床图号,
组号: response.data.rows[i].组号,
物料名称: response.data.rows[i].物料名称,
物料型号: response.data.rows[i].物料型号,
物料规格: response.data.rows[i].物料规格,
供货商: response.data.rows[i].供货商,
零件数量: response.data.rows[i].零件数量,
数量: response.data.rows[i].数量,
离线采购数量: response.data.rows[i].离线采购数量,
已到货数量: response.data.rows[i].已到货数量,
离线到货数量: response.data.rows[i].离线到货数量,
供应商名称: response.data.rows[i].供应商名称,
离线合同供应商名称: response.data.rows[i].离线合同供应商名称,
采购合同编号: response.data.rows[i].采购合同编号,
离线合同编号: response.data.rows[i].离线合同编号,
备注: response.data.rows[i].备注,
采购数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].数量 || response.data.rows[i].离线采购数量 || '—',
到货数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].已到货数量 || response.data.rows[i].离线到货数量 || '—',
不合格数量: response.data.rows[i].不合格数量
})
}
}
console.log(response.data.total, this.total1, 898989)
})
},
searchTable2() { // 查询基本件