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

导入总图

Browse Source
This commit is contained in:
liushuai
2019-04-13 14:47:13 +08:00
parent 1125c5add9
commit 5b5dc6d614
8 changed files with 315 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/api/TechnologyCenter/ImportParts.js
View File

@@ -23,6 +23,17 @@ export function isExit(projectNum, machineNum) {
} }
}) })
} }
export function isExit1(projectNum, machineNum, groupNum) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '组件明细表_基本件_导入数据_校验组件',
param: `项目流水号=${projectNum}&机床图号=${machineNum}&组号=${groupNum}`
}
})
}
export function isDrawingNum(projectName, machineNum, groupNum, drawingNum) { export function isDrawingNum(projectName, machineNum, groupNum, drawingNum) {
return request({ return request({
url: '', url: '',
@@ -67,7 +78,17 @@ export function importBasics(establishment, proofread, review, date, projectName
} }
}) })
} }
export function importTotal(establishment, projectName, machineNum, machineName, componentNum, drawingNum, name, type, material, useNum, manufacturer, remarks) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '组件明细表_总图_导入数据gj',
param: `编制=${establishment}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件数量=${componentNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}`
}
})
}
export function importPurcharse(establishment, proofread, review, date, projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) { export function importPurcharse(establishment, proofread, review, date, projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) {
return request({ return request({
url: '', url: '',
@@ -279,14 +300,14 @@ export function allDelete(project, machine, group) {
}) })
} }
// 传递零件 // 传递零件
export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, Num, Num1) { export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, Num) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: 'PDM_零件明细表_基本件_大量导入', name: 'PDM_零件明细表_基本件_大量导入',
param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num + '&部件数量=' + Num1 param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num
} }
}) })
} }
@@ -302,14 +323,14 @@ export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, nu
} }
}) })
} }
export function transferWG(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id, Num, Num1) { export function transferWG(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id, Num) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: 'PDM_零件明细表_标准件和外购件_大量导入', name: 'PDM_零件明细表_标准件和外购件_大量导入',
param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}&部件数量=${Num1}` param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}`
} }
}) })
} }

4
src/api/TechnologyCenter/QueryParts.js
View File

@@ -47,14 +47,14 @@ export function basicPartsData(project_check, project, machine_check, machine, g
} }
}) })
} }
export function purchasePartsData(num, type, pageCurrent, pageSize) { export function purchasePartsData(num, pageCurrent, pageSize) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: 'PDM_零件明细表_标准件和外购件_查询数据', name: 'PDM_零件明细表_标准件和外购件_查询数据',
param: `组件流水号=${num}&标准件类型=${type}`, param: `组件流水号=${num}`,
pagination: pageCurrent + '&' + pageSize pagination: pageCurrent + '&' + pageSize
} }
}) })

2
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -788,7 +788,6 @@ export default {
}, },
// 投产 // 投产
production() { production() {
this.listLoading3 = true
this.result = 0 this.result = 0
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) { if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
this.$message.error('请输入加工结束时间') this.$message.error('请输入加工结束时间')
@@ -802,6 +801,7 @@ export default {
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error('请至少选择一个零件') this.$message.error('请至少选择一个零件')
} else { } else {
this.listLoading3 = true
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].checked_waixie === false) { if (this.multipleSelection[i].checked_waixie === false) {
this.multipleSelection[i].checked_waixie = 1 this.multipleSelection[i].checked_waixie = 1

83
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -14,7 +14,7 @@
</el-option> </el-option>
</el-select> </el-select>
<span>组号:</span> <span>组号:</span>
<el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable> <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
<el-option <el-option
v-for="item in groupNumber" v-for="item in groupNumber"
:key="item.value" :key="item.value"
@@ -899,6 +899,7 @@ export default {
this.$message.success('增加成功') this.$message.success('增加成功')
this.dialogFormVisible = false this.dialogFormVisible = false
this.tableData5 = [] this.tableData5 = []
this.tableData6 = []
this.searchTable1() this.searchTable1()
} else { this.$message.error('增加失败') } } else { this.$message.error('增加失败') }
}) })
@@ -926,6 +927,7 @@ export default {
this.$message.success('编辑成功') this.$message.success('编辑成功')
this.dialogFormVisible = false this.dialogFormVisible = false
this.tableData5 = [] this.tableData5 = []
this.tableData6 = []
this.searchTable1() this.searchTable1()
} else { this.$message.error('编辑失败') } } else { this.$message.error('编辑失败') }
}) })
@@ -945,6 +947,7 @@ export default {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('删除成功') this.$message.success('删除成功')
this.tableData5 = [] this.tableData5 = []
this.tableData6 = []
this.searchTable1() this.searchTable1()
} else { this.$message.error('删除失败') } } else { this.$message.error('删除失败') }
}) })
@@ -981,7 +984,15 @@ export default {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0] response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
} }
} }
this.tableData5 = response.data const res = response.data
this.tableData5 = res.map(item => {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
}
return item
})
}) })
searchDetailed1(this.RequisitionList).then(response => { searchDetailed1(this.RequisitionList).then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
@@ -989,7 +1000,13 @@ export default {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0] response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
} }
} }
this.tableData6 = response.data const res = response.data
this.tableData6 = res.map(item => {
if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
})
}) })
} else { this.$message.error('编辑失败') } } else { this.$message.error('编辑失败') }
}) })
@@ -1045,7 +1062,15 @@ export default {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0] response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
} }
} }
this.tableData5 = response.data const res = response.data
this.tableData5 = res.map(item => {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
}
return item
})
}) })
searchDetailed1(row.请购单流水号).then(response => { searchDetailed1(row.请购单流水号).then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
@@ -1053,7 +1078,13 @@ export default {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0] response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
} }
} }
this.tableData6 = response.data const res = response.data
this.tableData6 = res.map(item => {
if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
})
}) })
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
@@ -1132,7 +1163,13 @@ export default {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0] response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
} }
} }
this.tableData6 = response.data const res = response.data
this.tableData6 = res.map(item => {
if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
})
}) })
} }
}) })
@@ -1152,7 +1189,15 @@ export default {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0] response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
} }
} }
this.tableData5 = response.data const res = response.data
this.tableData5 = res.map(item => {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
}
return item
})
}) })
} }
}) })
@@ -1172,7 +1217,15 @@ export default {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0] response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
} }
} }
this.tableData5 = response.data const res = response.data
this.tableData5 = res.map(item => {
if (item.零件类型 === '2') {
item.零件类型 = '外购件'
} else if (item.零件类型 === '1') {
item.零件类型 = '标准件'
}
return item
})
}) })
} }
}) })
@@ -1250,7 +1303,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
if (row.零件类型 === '3') { if (row.零件类型 === '基本件') {
MoveOut(row.请购单明细流水号, row.基本件流水号).then(response => { MoveOut(row.请购单明细流水号, row.基本件流水号).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('移出成功') this.$message.success('移出成功')
@@ -1263,11 +1316,17 @@ export default {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0] response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
} }
} }
this.tableData6 = response.data const res = response.data
this.tableData6 = res.map(item => {
if (item.零件类型 === '3') {
item.零件类型 = '基本件'
}
return item
})
}) })
} else { this.$message.error('移出失败') } } else { this.$message.error('移出失败') }
}) })
} else if (row.零件类型 === '2') { } else if (row.零件类型 === '外购件') {
MoveOut1(row.请购单明细流水号, row.标准件和外购件流水号).then(response => { MoveOut1(row.请购单明细流水号, row.标准件和外购件流水号).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('移出成功') this.$message.success('移出成功')
@@ -1284,7 +1343,7 @@ export default {
}) })
} else { this.$message.error('移出失败') } } else { this.$message.error('移出失败') }
}) })
} else if (row.零件类型 === '1') { } else if (row.零件类型 === '标准件') {
MoveOut1(row.请购单明细流水号, row.标准件和外购件流水号).then(response => { MoveOut1(row.请购单明细流水号, row.标准件和外购件流水号).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('移出成功') this.$message.success('移出成功')

163
src/views/TechnologyCenter/ImportParts/index.vue
View File

@@ -12,6 +12,14 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span style="margin-left: 10px">类型：</span>
<el-select v-model="groupName" filterable size="small" placeholder="类型">
<el-option
v-for="item in Group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</div> </div>
<upload-excel-component @on-selected-file="selected"/> <upload-excel-component @on-selected-file="selected"/>
</div> </div>
@@ -26,7 +34,7 @@
</div> </div>
</div> </div>
</el-card> </el-card>
<specification-data ref="specificationData" :groups-names="groupsNames" :machine-names="machineNames" :project-name="projectName" @machineChange="machineChange"/> <specification-data ref="specificationData" :groups-names="groupsNames" :machine-names="machineNames" :project-name="projectName" :group-name="groupName" @machineChange="machineChange"/>
<!--<el-upload--> <!--<el-upload-->
<!--class="upload-demo"--> <!--class="upload-demo"-->
<!--drag--> <!--drag-->
@@ -43,7 +51,7 @@
import UploadExcelComponent from './UploadExcel/index.vue' import UploadExcelComponent from './UploadExcel/index.vue'
import specificationData from './specificationData' import specificationData from './specificationData'
import { sleep } from '../../../utils/tool' import { sleep } from '../../../utils/tool'
import { initProject, isExit, importBasics, importPurcharse, searchMachine, searchGroupNum } from '../../../api/TechnologyCenter/ImportParts' import { initProject, isExit, isExit1, importBasics, importPurcharse, searchMachine, searchGroupNum } from '../../../api/TechnologyCenter/ImportParts'
export default { export default {
name: 'UploadExcel', name: 'UploadExcel',
@@ -56,6 +64,18 @@ export default {
itemFile: [], itemFile: [],
loading: false, loading: false,
groupsNames: [], groupsNames: [],
groupName: '',
Group: [{
value: 'MX',
name: 'MX'
}, {
value: 'WG',
name: 'WG'
}, {
value: 'BZ',
name: 'BZ'
}],
group: '',
machineNames: [], machineNames: [],
err: 0, err: 0,
disabled: false disabled: false
@@ -168,51 +188,110 @@ export default {
this.disabled = false this.disabled = false
return return
} else { } else {
console.log(this.worksheet[j], 111111111) if (this.worksheet[j].M2.v === '00-MX') {
if (this.worksheet[j].M2.v.substring(0, 1) !== '9') { if (this.worksheet[j].M2.v.substring(0, 1) !== '9') {
this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = '' this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = '' this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''
this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = '' this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = ''
this.worksheet[j].P1 ? date = this.worksheet[j].P1.v : date = '' this.worksheet[j].P1 ? date = this.worksheet[j].P1.v : date = ''
this.worksheet[j].Q1 ? pageNum = parseInt(this.worksheet[j].Q1.v.replace(/[^0-9]/ig, '')) : pageNum = '' this.worksheet[j].Q1 ? pageNum = parseInt(this.worksheet[j].Q1.v.replace(/[^0-9]/ig, '')) : pageNum = ''
this.worksheet[j].C2 ? machineName = this.worksheet[j].C2.v : machineName = '' this.worksheet[j].C2 ? machineName = this.worksheet[j].C2.v : machineName = ''
this.worksheet[j].F2 ? machineNum = this.worksheet[j].F2.v : machineNum = '' this.worksheet[j].F2 ? machineNum = this.worksheet[j].F2.v : machineNum = ''
this.worksheet[j].J2 ? componentName = this.worksheet[j].J2.v : componentName = '' this.worksheet[j].J2 ? componentName = this.worksheet[j].J2.v : componentName = ''
this.worksheet[j].P2 ? componentNum = this.worksheet[j].P2.v : componentNum = '' this.worksheet[j].P2 ? componentNum = this.worksheet[j].P2.v : componentNum = ''
this.worksheet[j].Q2 ? totalNum = parseInt(this.worksheet[j].Q2.v.replace(/[^0-9]/ig, '')) : totalNum = '' this.worksheet[j].Q2 ? totalNum = parseInt(this.worksheet[j].Q2.v.replace(/[^0-9]/ig, '')) : totalNum = ''
this.worksheet[j].R2 ? contractNum = this.worksheet[j].R2.v : contractNum = '' this.worksheet[j].R2 ? contractNum = this.worksheet[j].R2.v : contractNum = ''
this.worksheet[j].M2 ? groupNum = this.worksheet[j].M2.v : groupNum = '' this.worksheet[j].M2 ? groupNum = this.worksheet[j].M2.v : groupNum = ''
for (let i = 0; i < 999; i++) { for (let i = 0; i < 999; i++) {
const attr = i + 4 const attr = i + 4
drawingNum = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : '' drawingNum = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
name = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : '' name = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
type = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : '' type = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : ''
material = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : '' material = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : ''
spareNum = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : '' spareNum = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : ''
useNum = this.worksheet[j][`M${attr}`] ? this.worksheet[j][`M${attr}`].v : '' useNum = this.worksheet[j][`M${attr}`] ? this.worksheet[j][`M${attr}`].v : ''
manufacturer = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : '' manufacturer = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : ''
remarks = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : '' remarks = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : ''
classificationCode = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : '' classificationCode = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : ''
if (!drawingNum && !name && !type && !material && !spareNum && !useNum && !manufacturer && !remarks && !classificationCode) { // 当图号、名称、规格、材料、备件数量、装机数量、制造商、备注、分类码都为空时，循环终止，防止向数据库中插入多余且无用的数据 if (!drawingNum && !name && !type && !material && !spareNum && !useNum && !manufacturer && !remarks && !classificationCode) { // 当图号、名称、规格、材料、备件数量、装机数量、制造商、备注、分类码都为空时，循环终止，防止向数据库中插入多余且无用的数据
break break
} 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 { } else {
this.loading = false if (machineNum && groupNum) {
this.disabled = false await sleep(50)
this.$notify.error(`请确认导入文件是否正确`) if (classificationCode) {
return 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
this.disabled = false
this.$notify.error(`请确认导入文件是否正确`)
return
}
} }
} }
} else {
this.$notify.error('禁止导入整改组')
break
} }
} else { } else {
this.$notify.error('禁止导入整改组') this.group = this.worksheet[j].M2.v.substring(0, this.worksheet[j].M2.v.indexOf('-')) + '组'
break const response = await isExit1(this.projectValue, this.worksheet[j].F2.v, this.group)
const res = response.data
console.log(res, 1111)
if (res[0].Column1 === 0) {
this.$notify.error(`${this.group}组件不存在，请确认文件是否正确`)
this.loading = false
this.disabled = false
return
} else {
console.log(this.worksheet[j], 111111111)
if (this.worksheet[j].M2.v.substring(0, 1) !== '9') {
this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''
this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = ''
this.worksheet[j].P1 ? date = this.worksheet[j].P1.v : date = ''
this.worksheet[j].Q1 ? pageNum = parseInt(this.worksheet[j].Q1.v.replace(/[^0-9]/ig, '')) : pageNum = ''
this.worksheet[j].C2 ? machineName = this.worksheet[j].C2.v : machineName = ''
this.worksheet[j].F2 ? machineNum = this.worksheet[j].F2.v : machineNum = ''
this.worksheet[j].J2 ? componentName = this.worksheet[j].J2.v : componentName = ''
this.worksheet[j].P2 ? componentNum = this.worksheet[j].P2.v : componentNum = ''
this.worksheet[j].Q2 ? totalNum = parseInt(this.worksheet[j].Q2.v.replace(/[^0-9]/ig, '')) : totalNum = ''
this.worksheet[j].R2 ? contractNum = this.worksheet[j].R2.v : contractNum = ''
this.worksheet[j].M2 ? groupNum = this.worksheet[j].M2.v : groupNum = ''
for (let i = 0; i < 999; i++) {
const attr = i + 4
drawingNum = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
name = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
type = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : ''
material = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : ''
spareNum = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : ''
useNum = this.worksheet[j][`M${attr}`] ? this.worksheet[j][`M${attr}`].v : ''
manufacturer = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : ''
remarks = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : ''
classificationCode = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : ''
if (!drawingNum && !name && !type && !material && !spareNum && !useNum && !manufacturer && !remarks && !classificationCode) { // 当图号、名称、规格、材料、备件数量、装机数量、制造商、备注、分类码都为空时，循环终止，防止向数据库中插入多余且无用的数据
break
} else {
if (machineNum && groupNum) {
await sleep(50)
if (classificationCode) {
drawingNum += '-' + classificationCode
}
await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, this.group, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
} else {
this.loading = false
this.disabled = false
this.$notify.error(`请确认导入文件是否正确`)
return
}
}
}
} else {
this.$notify.error('禁止导入整改组')
break
}
}
} }
} }
this.itemFile.splice(j, 1) this.itemFile.splice(j, 1)

41
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -274,6 +274,10 @@ export default {
projectName: { projectName: {
type: String, type: String,
default: '' default: ''
},
groupName: {
type: String,
default: ''
} }
}, },
data() { data() {
@@ -352,6 +356,9 @@ export default {
}, },
groupValue(val) { groupValue(val) {
val ? this.fetchData() : this.tableData = [] val ? this.fetchData() : this.tableData = []
},
groupName(val) {
val ? this.fetchData() : this.tableData = []
} }
}, },
mounted() { mounted() {
@@ -397,7 +404,8 @@ export default {
const projectCheck = this.projectName ? 1 : 0 const projectCheck = this.projectName ? 1 : 0
const machineCheck = this.machineValue ? 1 : 0 const machineCheck = this.machineValue ? 1 : 0
const groupCheck = this.groupValue ? 1 : 0 const groupCheck = this.groupValue ? 1 : 0
if (this.groupValue.indexOf('MX') > -1) { // 当分组为基本件时，查询基本件规范和不规范数据，否则查询外购件或标准件规范和不规范数据 console.log(this.groupName, 123)
if (this.groupName.indexOf('MX') > -1) { // 当分组为基本件时，查询基本件规范和不规范数据，否则查询外购件或标准件规范和不规范数据
// 分别查出规范和不规范数据，将规范数据放前面在一个总数组中 // 分别查出规范和不规范数据，将规范数据放前面在一个总数组中
this.type = 1 this.type = 1
this.unSpecification = await unSpecificationQuery(projectCheck, this.projectName, machineCheck, this.machineValue, groupCheck, this.groupValue) this.unSpecification = await unSpecificationQuery(projectCheck, this.projectName, machineCheck, this.machineValue, groupCheck, this.groupValue)
@@ -537,15 +545,30 @@ export default {
this.err = 0 this.err = 0
if (this.groupValue) { if (this.groupValue) {
this.listLoading = true this.listLoading = true
if (this.groupValue.indexOf('MX') > -1) { console.log(this.groupName, 123)
if (this.groupName.indexOf('MX') > -1) {
for (let i = 0; i < this.tableDataAll.length; i++) { for (let i = 0; i < this.tableDataAll.length; i++) {
const data = this.tableDataAll[i] const data = this.tableDataAll[i]
console.log(data) console.log(data)
const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量) if (this.groupValue.indexOf('00') > -1) {
const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量, data.部件数量) const index = data.图号或者型号.lastIndexOf('-')
await sleep(10) data.图号或者型号 = data.图号或者型号.substring(index + 1)
if (resp.data[0].result === '0') { if (data.图号或者型号.indexOf('组') > -1) {
this.err++ const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量, data.部件数量)
await sleep(10)
if (resp.data[0].result === '0') {
this.err++
}
}
} else {
console.log(222222222)
const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量)
await sleep(10)
if (resp.data[0].result === '0') {
this.err++
}
} }
} }
} else { } else {
@@ -553,12 +576,12 @@ export default {
let dataType let dataType
const data = this.tableDataAll[i] const data = this.tableDataAll[i]
const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量) const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
if (this.groupValue.indexOf('WG') > -1) { if (this.groupName.indexOf('WG') > -1) {
dataType = 2 dataType = 2
} else { } else {
dataType = 1 dataType = 1
} }
const resp = await transferWG(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id, data.备件数量, data.部件数量) const resp = await transferWG(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id, data.备件数量)
await sleep(10) await sleep(10)
if (resp.data[0].result === '0') { if (resp.data[0].result === '0') {
this.err++ this.err++

66
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -30,7 +30,7 @@
<el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button> <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
</el-card> </el-card>
<el-card v-if="groupName && groupName.indexOf('MX') > -1"> <el-card>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="tableData" :data="tableData"
@@ -135,7 +135,7 @@
@current-change="handleCurrentChanges"/> @current-change="handleCurrentChanges"/>
</div> </div>
</el-card> </el-card>
<el-card v-else> <el-card>
<el-table <el-table
v-loading="loadingWB" v-loading="loadingWB"
:data="tableDataWB" :data="tableDataWB"
@@ -314,41 +314,37 @@ export default {
this.getSelect(groupSelect, ['组号', '组件流水号'], 'group', val) this.getSelect(groupSelect, ['组号', '组件流水号'], 'group', val)
}, },
getTableData() { getTableData() {
if (this.groupName.indexOf('MX') > -1) { const project_check = this.projectValue ? 1 : 0
const project_check = this.projectValue ? 1 : 0 const machine_check = this.machineValue ? 1 : 0
const machine_check = this.machineValue ? 1 : 0 const group_check = this.groupValue ? 1 : 0
const group_check = this.groupValue ? 1 : 0 this.loading = true
this.loading = true basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => { this.loading = false
this.loading = false const res = response.data
const res = response.data this.total = res.total
this.total = res.total
this.tableData = res.rows.map(item => {
if (item.整改类型 === '1') {
item.整改类型 = '新增'
} else if (item.整改类型 === '2') {
item.整改类型 = '替换'
} else if (item.整改类型 === '3') {
item.整改类型 = '补充加工'
}
return item
})
})
console.log(this.tableData) console.log(this.tableData)
} else { this.tableData = res.rows.map(item => {
const type = this.groupName.indexOf('WG') > -1 ? 2 : 1 if (item.整改类型 === '1') {
this.loadingWB = true item.整改类型 = '新增'
purchasePartsData(this.groupValue, type, this.pageCurrentWB, this.pageSizeWB).then(response => { } else if (item.整改类型 === '2') {
this.loadingWB = false item.整改类型 = '替换'
const data = response.data } else if (item.整改类型 === '3') {
this.totalWB = data.total item.整改类型 = '补充加工'
this.tableDataWB = data.rows.map(item => { }
console.log(item) return item
item.零件类型 = item.零件类型 === '2' ? '外购件' : '标准件'
return item
})
}) })
} })
this.loadingWB = true
purchasePartsData(this.groupValue, this.pageCurrentWB, this.pageSizeWB).then(response => {
this.loadingWB = false
const data = response.data
this.totalWB = data.total
this.tableDataWB = data.rows.map(item => {
console.log(item)
item.零件类型 = item.零件类型 === '2' ? '外购件' : '标准件'
return item
})
})
}, },
handleDelete(row) { handleDelete(row) {
if (row.基本件流水号) { if (row.基本件流水号) {

62
src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
View File

@@ -146,19 +146,19 @@
<td colspan="1" align="center">总价</td> <td colspan="1" align="center">总价</td>
</tr> </tr>
<!--</tbody>--> <!--</tbody>-->
<!--</table>--> <!--</table>-->
<!--<hr>--> <!--<hr>-->
<!--<table id="2" cellspacing="0px" align="center" border width="100%" style="">--> <!--<table id="2" cellspacing="0px" align="center" border width="100%" style="">-->
<!--&lt;!&ndash;<tbody id="4">&ndash;&gt;--> <!--&lt;!&ndash;<tbody id="4">&ndash;&gt;-->
<!--&lt;!&ndash;<tr id="tableHead" style="height: 40px">&ndash;&gt;--> <!--&lt;!&ndash;<tr id="tableHead" style="height: 40px">&ndash;&gt;-->
<!--&lt;!&ndash;<td colspan="1" align="center">物料名称</td>&ndash;&gt;--> <!--&lt;!&ndash;<td colspan="1" align="center">物料名称</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td colspan="1" align="center">物料规格</td>&ndash;&gt;--> <!--&lt;!&ndash;<td colspan="1" align="center">物料规格</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td colspan="1" align="center">物料型号</td>&ndash;&gt;--> <!--&lt;!&ndash;<td colspan="1" align="center">物料型号</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td colspan="1" align="center">交货期</td>&ndash;&gt;--> <!--&lt;!&ndash;<td colspan="1" align="center">交货期</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td colspan="1" align="center">备注</td>&ndash;&gt;--> <!--&lt;!&ndash;<td colspan="1" align="center">备注</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td colspan="1" align="center">数量</td>&ndash;&gt;--> <!--&lt;!&ndash;<td colspan="1" align="center">数量</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td colspan="1" align="center">单价</td>&ndash;&gt;--> <!--&lt;!&ndash;<td colspan="1" align="center">单价</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td colspan="1" align="center">总价</td>&ndash;&gt;--> <!--&lt;!&ndash;<td colspan="1" align="center">总价</td>&ndash;&gt;-->
<!--&lt;!&ndash;</tr>&ndash;&gt;--> <!--&lt;!&ndash;</tr>&ndash;&gt;-->
</tbody> </tbody>
<tfoot> <tfoot>
@@ -205,34 +205,34 @@
<td style="width: 35%" colspan="3" align="center"/> <td style="width: 35%" colspan="3" align="center"/>
</tr> </tr>
<!--<tr style="height: 35px">--> <!--<tr style="height: 35px">-->
<!--<th style="width: 15%">传真</th>--> <!--<th style="width: 15%">传真</th>-->
<!--<td style="width: 35%" colspan="3" align="center"/>--> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<!--<th style="width: 15%">传真</th>--> <!--<th style="width: 15%">传真</th>-->
<!--<td style="width: 35%" colspan="3" align="center"/>--> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<!--</tr>--> <!--</tr>-->
<!--<tr style="height: 35px">--> <!--<tr style="height: 35px">-->
<!--<th style="width: 15%">开户银行</th>--> <!--<th style="width: 15%">开户银行</th>-->
<!--<td style="width: 35%" colspan="3" align="center"/>--> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<!--<th style="width: 15%">开户银行</th>--> <!--<th style="width: 15%">开户银行</th>-->
<!--<td style="width: 35%" colspan="3" align="center"/>--> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<!--</tr>--> <!--</tr>-->
<!--<tr style="height: 35px">--> <!--<tr style="height: 35px">-->
<!--<th style="width: 15%">账号</th>--> <!--<th style="width: 15%">账号</th>-->
<!--<td style="width: 35%" colspan="3" align="center"/>--> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<!--<th style="width: 15%">账号</th>--> <!--<th style="width: 15%">账号</th>-->
<!--<td style="width: 35%" colspan="3" align="center"/>--> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<!--</tr>--> <!--</tr>-->
<!--<tr style="height: 35px">--> <!--<tr style="height: 35px">-->
<!--<th style="width: 15%">税号</th>--> <!--<th style="width: 15%">税号</th>-->
<!--<td style="width: 35%" colspan="3" align="center"/>--> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<!--<th style="width: 15%">税号</th>--> <!--<th style="width: 15%">税号</th>-->
<!--<td style="width: 35%" colspan="3" align="center"/>--> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<!--</tr>--> <!--</tr>-->
<!--<tr style="height: 35px">--> <!--<tr style="height: 35px">-->
<!--<th style="width: 15%">邮政编码</th>--> <!--<th style="width: 15%">邮政编码</th>-->
<!--<td style="width: 35%" colspan="3" align="center"/>--> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<!--<th style="width: 15%">邮政编码</th>--> <!--<th style="width: 15%">邮政编码</th>-->
<!--<td style="width: 35%" colspan="3" align="center"/>--> <!--<td style="width: 35%" colspan="3" align="center"/>-->
<!--</tr>--> <!--</tr>-->
</tbody> </tbody>
</table> </table>