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

创建询价单上个版本查询bug

Browse Source
This commit is contained in:
zhangdingyu
2019-11-11 11:30:09 +08:00
parent 3b69fe4403
commit e8f24c3964
2 changed files with 71 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -46,7 +46,7 @@
<!--: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-input v-model="materialName" placeholder="名称规格" size="small" style="width:120px" clearable @keyup.enter.native="materialStatusValue=[0];pageCurrent11=1;pageSize11=20;total11=0;searchTable11()"/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option
v-for="item in machine"
@@ -63,6 +63,9 @@
<!--</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-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="materialStatusValue=[0];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-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
<el-date-picker
v-model="startTime"
size="small"
@@ -75,22 +78,27 @@
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">
<div style="text-align: right; margin: 0">
<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="mini" @click="visible = false;tiaozheng1()">确定</el-button>
</div>
<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover>
<el-button type="success" size="small" style="float: right" @click="visible2 = false;tiaozheng1()">调整采购任务</el-button>
<el-select v-model="PersonValue" style="width:100px;float: right" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-popover v-model="visible" title="调整采购任务" placement="top" width="180">-->
<!--<div style="text-align: right; margin: 0">-->
<!--<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>-->
<!--<el-option-->
<!--v-for="item in Person"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<el-button type="primary" size="mini" @click="visible = false;tiaozheng1()">确定</el-button>-->
<!--</div>-->
<!--<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>-->
<!--</el-popover>-->
</el-row>
<el-row>
<el-table
@@ -189,7 +197,7 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="分配时间" align="center" min-width="80">
<el-table-column label="分配时间" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
@@ -233,7 +241,7 @@
<!--: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-input v-model="partNum" placeholder="图号名称规格" size="small" clearable @keyup.enter.native="materialStatusValue=[0];pageCurrent11=1;pageSize11=20;total11=0;searchTable12()"/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option
v-for="item in machine"
@@ -249,6 +257,8 @@
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="materialStatusValue=[0];pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
<el-date-picker
v-model="endTime"
size="small"
@@ -261,21 +271,27 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="timeChange2()"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
<el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">
<div style="text-align: right; margin: 0">
<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="mini" @click="visible2 = false;tiaozheng2()">确定</el-button>
</div>
<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover>
<el-button type="success" size="small" style="float: right" @click="visible2 = false;tiaozheng2()">调整采购任务</el-button>
<el-select v-model="PersonValue" style="width:100px;float: right" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">-->
<!--<div style="text-align: right; margin: 0">-->
<!--<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>-->
<!--<el-option-->
<!--v-for="item in Person"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<el-button type="primary" size="mini" @click="visible2 = false;tiaozheng2()">确定</el-button>-->
<!--</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>
@@ -736,8 +752,8 @@
</el-table-column>
<el-table-column label="操作" align="center" width="50">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="将该物料从询价单中删除" placement="top">
<el-button type="text" size="mini" icon="el-icon-delete" @click="outInquirySheet(scope.row)"/>
<el-tooltip :open-delay="1000" effect="dark" content="将该物料从询价单中移出" placement="top">
<el-button type="text" size="mini" icon="el-icon-right" @click="outInquirySheet(scope.row)"/>
</el-tooltip>
</template>
</el-table-column>
@@ -1691,11 +1707,15 @@ export default {
return row['供货商'].trim() === value
},
searchTable11() { // 查询外购件列表
let check5, check7, check9
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
this.machineValue ? check5 = 1 : check5 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = [])
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.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.tableData11 = response.data.rows
this.total11 = response.data.total
const remark = []
@@ -1726,11 +1746,15 @@ export default {
this.searchTable11()
},
searchTable12() { // 查询基本件列表
let check3, check7, check5
this.partNum ? check3 = 1 : check3 = 0
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
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, check3, this.partNum, this.id, check5, this.machineValue, check7, this.endTime[0], this.endTime[1]).then(response => {
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 => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []