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

Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

Browse Source
This commit is contained in:
bryan sun
2019-10-18 14:19:53 +08:00
parent 68ac498183 763f310dc8
commit 8d7ed0ccdf
4 changed files with 28 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,24 +77,18 @@
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
</el-row>
<el-row style="margin-bottom: 10px">
<span class="demonstration">开始时间: </span>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="startTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 200px"
type="date"
placeholder="选择日期"/>
<span class="demonstration">结束时间:</span>
<el-date-picker
v-model="endTime"
type="daterange"
align="center"
value-format="yyyy-MM-dd"
size="small"
style="width: 200px"
type="date"
placeholder="选择日期"/>
format="yyyy-MM-dd"
range-separator="～"
style="width:250px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<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">
@@ -296,6 +290,18 @@
<el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
<span>零件规格:</span>
<el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="endTime"
size="small"
type="daterange"
align="center"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
style="width:250px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<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">
@@ -1515,8 +1521,8 @@ export default {
this.projectValue ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.startTime && this.endTime ? check7 = 1 : check7 = 0
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, this.endTime).then(response => {
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 = []
@@ -1547,14 +1553,15 @@ export default {
this.searchTable11()
},
searchTable12() { // 查询基本件列表
let check1, check2, check3, check4, check5, check6
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
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).then(response => {
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 => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []