Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0
This commit is contained in:
liushuai
@@ -89,14 +89,14 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2
|
||||
})
|
||||
}
|
||||
// 查询分配后的基本件
|
||||
export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6) {
|
||||
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: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}`,
|
||||
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
|
||||
}
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = []
|
||||
|
||||
Reference in New Issue
Block a user