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

创建询价单查询

Browse Source
This commit is contained in:
zhangdingyu
2019-11-11 09:40:03 +08:00
parent 4c575a56fb
commit 3b69fe4403
3 changed files with 83 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/PurchasingCenter/CreateInquirySheet.js
View File

@@ -76,27 +76,27 @@ export function getExport2(num) {
})
}
// 查询分配后的标准件和外购件
export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) {
export function searchMaterial(pageCurrent, pageSize, person, check5, val5, val8, val9, val10, val11, val12) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存',
param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_创建询价单',
param: `人员编号=${person}&机床流水号_check=${check5}&机床流水号=${val5}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}&名称规格型号_check=${val11}&名称规格型号=${val12}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 查询分配后的基本件
export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
export function searchPart(pageCurrent, pageSize, check1, val1, person, check5, val5, val8, val9, val10) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_采购部采购_查询物料_基本件_分配后',
param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
name: '采购管理_采购部采购_查询物料_基本件_分配后_创建询价单',
param: `名称图号规格材料_check=${check1}&名称图号规格材料=${val1}&人员编号=${person}&机床流水号_check=${check5}&机床流水号=${val5}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
Pagination: pageCurrent + '&' + pageSize
}
})
@@ -301,7 +301,7 @@ export function searchMachine(num) {
data: {
type: '1',
name: 'PDM_机床名称_查询数据',
param: '项目流水号_check=1&项目流水号=' + num
param: '项目流水号_check=0&项目流水号=' + num
}
})
}

2
src/utils/request.js
View File

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service

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

@@ -39,34 +39,30 @@
<el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="外购件" name="外购件">
<el-row style="margin-bottom: 10px">
<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width:100px" filterable clearable @change="projectChange">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable @change="machineChange">
<!--<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width:100px" filterable clearable @change="projectChange">-->
<!--<el-option-->
<!--v-for="item in project"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="materialName" placeholder="名称规格" size="small" style="width:120px" clearable @keyup.enter.native="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()"/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="groupValue" placeholder="组号" style="width:100px" size="small" clearable filterable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>
<el-input v-model="materialName" placeholder="物料名称" size="small" style="width:120px" clearable/>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>
<el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
</el-row>
<el-row style="margin-bottom: 10px">
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>-->
<!--<el-select v-model="groupValue" placeholder="组号" style="width:100px" size="small" clearable filterable>-->
<!--<el-option-->
<!--v-for="item in group"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
<!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>-->
<el-date-picker
v-model="startTime"
size="small"
@@ -79,6 +75,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="timeChange1()"/>
<el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
<el-popover v-model="visible" title="调整采购任务" placement="top" width="180">
@@ -95,7 +92,7 @@
<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover>
</el-row>
<el-rows>
<el-row>
<el-table
v-loading=""
:data="tableData11"
@@ -117,10 +114,6 @@
<span v-if="inquiry(scope.row)" style="color: blue">已询价</span>
<span v-if="approval(scope.row)" style="color: green">审批中</span>
<span v-if="purchased(scope.row)">已采购</span>
<!-- <el-tag v-if="unInquiry(scope.row)" type="warning" size="mini">未询价</el-tag>-->
<!-- <el-tag v-if="inquiry(scope.row)" type="success" size="mini">已询价</el-tag>-->
<!-- <el-tag v-if="approval(scope.row)" type="primary" size="mini">审批中</el-tag>-->
<!-- <el-tag v-if="purchased(scope.row)" type="info" size="mini">已采购</el-tag>-->
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商" show-overflow-tooltip>
@@ -128,44 +121,29 @@
{{ scope.row.供货商 }}
</template>
</el-table-column>
<!--<el-table-column label="项目名称" align="center" min-width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.项目名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="机床图号" align="center" min-width="130" prop="机床图号" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" min-width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<!--<el-table-column label="物料类别" align="center" min-width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料类别 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="物料品种" align="center" min-width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料品种 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="名称" align="center" width="100" prop="名称">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" min-width="100" prop="物料规格" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" align="center" min-width="130" prop="物料型号">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" min-width="100" prop="物料规格" show-overflow-tooltip>
<el-table-column label="组号" align="center" min-width="50">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="分配数" align="center" min-width="60">
@@ -244,37 +222,33 @@
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
</div>
</el-rows>
</el-row>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-row style="margin-bottom: 10px">
<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 100px" filterable clearable @change="projectChange">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable @change="machineChange">
<!--<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 100px" filterable clearable @change="projectChange">-->
<!--<el-option-->
<!--v-for="item in project"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="partNum" placeholder="图号名称规格" size="small" clearable @keyup.enter.native="pageCurrent11=1;pageSize11=20;total11=0;searchTable12()"/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="groupValue" placeholder="组号" size="small" style="width: 100px" clearable filterable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>
<el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
<el-input v-model="partName" placeholder="零件名称" size="small" style="width: 120px" clearable/>
<el-input v-model="partSpec" placeholder="零件规格" size="small" style="width: 120px" clearable/>
</el-row>
<el-row style="margin-bottom: 10px">
<!--<el-select v-model="groupValue" placeholder="组号" size="small" style="width: 100px" clearable filterable>-->
<!--<el-option-->
<!--v-for="item in group"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
<el-date-picker
v-model="endTime"
size="small"
@@ -302,6 +276,8 @@
</div>
<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover>
<!--<el-input v-model="partName" placeholder="零件名称" size="small" style="width: 120px" clearable/>-->
<!--<el-input v-model="partSpec" placeholder="零件规格" size="small" style="width: 120px" clearable/>-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-table
@@ -332,21 +308,6 @@
{{ scope.row.供货商 }}
</template>
</el-table-column>
<!-- <el-table-column label="项目名称" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.项目名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="机床图号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" min-width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="图号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -362,6 +323,21 @@
{{ scope.row.规格 }}
</template>
</el-table-column>
<!-- <el-table-column label="项目名称" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.项目名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="机床图号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" min-width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.材料 }}
@@ -1293,6 +1269,7 @@ export default {
this.timeSearch()
this.getPerson()
this.fetchData()
this.projectChange()
// this.searchTable11() // 查表1
this.searchTable2() // 查表2
this.searchUnInquiryPartNumber()
@@ -1313,10 +1290,14 @@ export default {
})
},
timeChange1() {
timeChange1(this.startTime[0], this.startTime[1])
if (this.startTime) {
timeChange1(this.startTime[0], this.startTime[1])
}
},
timeChange2() {
timeChange2(this.endTime[0], this.endTime[1])
if (this.endTime) {
timeChange2(this.endTime[0], this.endTime[1])
}
},
Jump() {
window.location.hash = '#PurchasingCenter/CreateInquirySheet'
@@ -1710,15 +1691,11 @@ export default {
return row['供货商'].trim() === value
},
searchTable11() { // 查询外购件列表
let check1, check2, check3, check4, check5, check6, check7
this.materialName ? check1 = 1 : check1 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
this.projectValue ? check4 = 1 : check4 = 0
let check5, check7, check9
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = [])
searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2, check7, this.startTime[0], this.startTime[1]).then(response => {
this.materialName ? check9 = 1 : check9 = 0
searchMaterial(this.pageCurrent11, this.pageSize11, this.id, check5, this.machineValue, check7, this.startTime[0], this.startTime[1], check9, this.materialName).then(response => {
this.tableData11 = response.data.rows
this.total11 = response.data.total
const remark = []
@@ -1749,15 +1726,11 @@ export default {
this.searchTable11()
},
searchTable12() { // 查询基本件列表
let check1, check2, check3, check4, check5, check6, check7
this.partNum ? check1 = 1 : check1 = 0
this.partName ? check2 = 1 : check2 = 0
this.partSpec ? check3 = 1 : check3 = 0
this.projectValue ? check4 = 1 : check4 = 0
let check3, check7, check5
this.partNum ? check3 = 1 : check3 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
searchPart(this.pageCurrent12, this.pageSize12, check3, this.partNum, this.id, check5, this.machineValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []