查询
This commit is contained in:
liushuai
@@ -22,6 +22,17 @@ export function QualityType() {
|
||||
}
|
||||
})
|
||||
}
|
||||
// 初始化质检人员
|
||||
export function initPerson() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '质检管理_质量情况_查询数据_质检人员'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 组件查询
|
||||
export function searchgroup(num) {
|
||||
return request({
|
||||
@@ -35,7 +46,7 @@ export function searchgroup(num) {
|
||||
})
|
||||
}
|
||||
// 质检管理_质量情况_查询数据
|
||||
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, pageCurrent, pageSize) {
|
||||
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, pageCurrent, pageSize) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
@@ -43,7 +54,7 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec
|
||||
type: '1',
|
||||
name: '质检管理_质量情况_查询数据',
|
||||
param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 +
|
||||
'&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7,
|
||||
'&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8,
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
})
|
||||
|
||||
@@ -107,7 +107,7 @@ export function importPurcharse(establishment, proofread, review, date, projectN
|
||||
data: {
|
||||
type: '2',
|
||||
name: '零件明细表_外购件和标准件_导入数据gj',
|
||||
param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}`
|
||||
param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}&导入类型=0=int=output`
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
|
||||
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
|
||||
export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
|
||||
const service = axios.create({
|
||||
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
|
||||
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
|
||||
timeout: 1500000 // 请求超时时间
|
||||
})
|
||||
|
||||
|
||||
@@ -57,6 +57,14 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span>质检人员:</span>
|
||||
<el-select v-model="personNum" filterable placeholder="质检人员" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in person"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
@@ -107,6 +115,11 @@
|
||||
{{ scope.row.质检类型 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="质检人员" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="检验数量" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.数量 }}
|
||||
@@ -431,7 +444,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus } from '@/api/Assembly/QualityInspectionInformationInquiry'
|
||||
import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus, initPerson } from '@/api/Assembly/QualityInspectionInformationInquiry'
|
||||
import { readFile } from '@/utils/request'
|
||||
// import { mapGetters } from 'vuex'
|
||||
export default {
|
||||
@@ -466,6 +479,8 @@ export default {
|
||||
SpareParts: '',
|
||||
SparePartsNumber: '',
|
||||
SparePartsName: '',
|
||||
personNum: '',
|
||||
person: [],
|
||||
dialogFormVisible: false,
|
||||
dialogFormVisible4: false,
|
||||
loading: false,
|
||||
@@ -510,6 +525,14 @@ export default {
|
||||
})
|
||||
}
|
||||
})
|
||||
initPerson().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.person.push({
|
||||
label: response.data[i].姓名,
|
||||
value: response.data[i].人员编号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
fetchData() {
|
||||
searchData(this.pageSize1, this.pageCurrent1).then(response => {
|
||||
@@ -551,7 +574,8 @@ export default {
|
||||
if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 }
|
||||
if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
|
||||
if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
|
||||
selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.pageCurrent, this.pageSize).then(response => {
|
||||
if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
|
||||
selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum, this.pageCurrent, this.pageSize).then(response => {
|
||||
this.tableData1 = response.data.rows
|
||||
this.loading = false
|
||||
this.total = response.data.total
|
||||
|
||||
@@ -130,6 +130,7 @@ export default {
|
||||
name: 'BZ'
|
||||
}],
|
||||
group: '',
|
||||
ceshi: '',
|
||||
machineNames: [],
|
||||
err: 0,
|
||||
disabled: false
|
||||
@@ -322,9 +323,6 @@ export default {
|
||||
} else {
|
||||
if (machineNum && groupNum) {
|
||||
await sleep(50)
|
||||
if (classificationCode) {
|
||||
drawingNum += '-' + classificationCode
|
||||
}
|
||||
await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
|
||||
} else {
|
||||
this.loading = false
|
||||
@@ -379,9 +377,6 @@ export default {
|
||||
} else {
|
||||
if (machineNum && groupNum) {
|
||||
await sleep(50)
|
||||
if (classificationCode) {
|
||||
drawingNum += '-' + classificationCode
|
||||
}
|
||||
await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
|
||||
} else {
|
||||
this.loading = false
|
||||
@@ -418,19 +413,24 @@ export default {
|
||||
if (groupNum.indexOf('MX') > -1) {
|
||||
const response = await importBasics(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, this.group, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
|
||||
const res = response.data
|
||||
if (res[0].result === '0') {
|
||||
console.log(res)
|
||||
if (res.result[0].result === '0') {
|
||||
this.$notify.error(`${drawingNum}导入失败`)
|
||||
}
|
||||
if (res[0].result === '2') {
|
||||
this.$notify.error(`${drawingNum}导入重复`)
|
||||
if (res.output[0].导入类型 === '2') {
|
||||
this.$notify.warning(`存在重复数据`)
|
||||
}
|
||||
} else {
|
||||
console.log(drawingNum, 1111111111)
|
||||
const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, this.group, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
|
||||
const res = response.data
|
||||
console.log(res)
|
||||
if (res[0].result === '0') {
|
||||
console.log(res, 222222)
|
||||
if (res.result[0].result === '0') {
|
||||
this.$notify.error(`${drawingNum}导入失败`)
|
||||
}
|
||||
if (res.output[0].导入类型 === '2') {
|
||||
this.$notify.warning(`存在重复数据`)
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
this.err++
|
||||
|
||||
Reference in New Issue
Block a user