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

fixed bug

Browse Source
This commit is contained in:
chenjianan
2019-05-23 13:33:07 +08:00
parent 7644e3f591
commit 07093aa4f4
5 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/index.js
View File

@@ -7,8 +7,8 @@ const os = require('os')
const networkInterfaces = os.networkInterfaces() const networkInterfaces = os.networkInterfaces()
// const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
const ip = '127.0.0.1' // const ip = '127.0.0.1'
module.exports = { module.exports = {
dev: { dev: {
// Paths // Paths

4
src/api/PurchasingCenter/PurchaseSituationSearch.js
View File

@@ -30,7 +30,7 @@ export function searchTable1(...params) {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '采购管理_采购部采购_查询物料_分配后', name: '采购管理_采购部采购_查询物料_分配后_加供应商',
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`, param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
Pagination: params[4] + '&' + params[5] Pagination: params[4] + '&' + params[5]
} }
@@ -43,7 +43,7 @@ export function searchTable2(...params) {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '采购管理_采购部采购_查询物料_基本件_分配后', name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商',
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`, param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
Pagination: params[4] + '&' + params[5] Pagination: params[4] + '&' + params[5]
} }

18
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -812,16 +812,24 @@ export default {
}, },
{ {
value: 1, value: 1,
label: '未询价' label: '未分配'
}, { },
{
value: 2, value: 2,
label: '已询价', label: '已分配',
children: [{ children: [{
value: 3, value: 3,
label: '未采购' label: '未询价'
}, { }, {
value: 4, value: 4,
label: '已采购' label: '已询价',
children: [{
value: 5,
label: '未采购'
}, {
value: 6,
label: '已采购'
}]
}] }]
} }
], // 物料状态 ], // 物料状态

18
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -659,16 +659,24 @@ export default {
}, },
{ {
value: 1, value: 1,
label: '未询价' label: '未分配'
}, { },
{
value: 2, value: 2,
label: '已询价', label: '已分配',
children: [{ children: [{
value: 3, value: 3,
label: '未采购' label: '未询价'
}, { }, {
value: 4, value: 4,
label: '已采购' label: '已询价',
children: [{
value: 5,
label: '未采购'
}, {
value: 6,
label: '已采购'
}]
}] }]
} }
], // 物料状态 ], // 物料状态

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

@@ -28,11 +28,10 @@
<el-table :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe> <el-table :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe>
<el-table-column align="center" label="采购情况" width="80px"> <el-table-column align="center" label="采购情况" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.是否未通过" type="info" size="small">已作废</el-tag> <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
<el-tag v-else-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
<el-tag v-else-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
<el-tag v-else-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
<el-tag v-else-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" width="100px"> <el-table-column align="center" label="机床图号" width="100px">
@@ -107,11 +106,10 @@
<el-table :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe> <el-table :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe>
<el-table-column align="center" label="采购情况" width="80px"> <el-table-column align="center" label="采购情况" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.是否未通过" type="info" size="small">已作废</el-tag> <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
<el-tag v-else-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
<el-tag v-else-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
<el-tag v-else-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
<el-tag v-else-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" width="100px"> <el-table-column align="center" label="机床图号" width="100px">