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-07-18 11:29:45 +08:00
parent 0d6a460248
commit 99a20c8d7e
2 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/views/TechnologyCenter/ImportChangeParts/index.vue
View File

@@ -250,17 +250,32 @@ export default {
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 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 const res = response.data
console.log(res) console.log(res)
if (res[0].result === '0') { if (res.hasOwnProperty('output') === false) {
this.$notify.error(`${drawingNum}导入失败`) if (res[0].result === '0') {
} this.$notify.error(`${drawingNum}导入失败`)
if (res[0].result === '2') { }
this.$notify.error(`${drawingNum}导入重复`) } else {
if (res.result[0].result === '0') {
this.$notify.error(`${drawingNum}导入失败`)
}
if (res.output[0].导入类型 === '2') {
this.$notify.warning(`存在重复数据`)
}
} }
} else { } else {
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 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 const res = response.data
if (res[0].result === '0') { if (res.hasOwnProperty('output') === false) {
this.$notify.error(`${drawingNum}导入失败`) if (res[0].result === '0') {
this.$notify.error(`${drawingNum}导入失败`)
}
} else {
if (res.result[0].result === '0') {
this.$notify.error(`${drawingNum}导入失败`)
}
if (res.output[0].导入类型 === '2') {
this.$notify.warning(`存在重复数据`)
}
} }
} }
} catch (e) { } catch (e) {

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

@@ -414,22 +414,34 @@ export default {
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 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 const res = response.data
console.log(res, 11111111) console.log(res, 11111111)
if (res.result[0].result === '0') { if (res.hasOwnProperty('output') === false) {
this.$notify.error(`${drawingNum}导入失败`) if (res[0].result === '0') {
} this.$notify.error(`${drawingNum}导入失败`)
if (res.output[0].导入类型 === '2') { }
this.$notify.warning(`存在重复数据`) } else {
if (res.result[0].result === '0') {
this.$notify.error(`${drawingNum}导入失败`)
}
if (res.output[0].导入类型 === '2') {
this.$notify.warning(`存在重复数据`)
}
} }
} else { } else {
console.log(drawingNum, 1111111111) 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 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 const res = response.data
console.log(res, 222222) console.log(res, 222222)
if (res.result[0].result === '0') { if (res.hasOwnProperty('output') === false) {
this.$notify.error(`${drawingNum}导入失败`) if (res[0].result === '0') {
} this.$notify.error(`${drawingNum}导入失败`)
if (res.output[0].导入类型 === '2') { }
this.$notify.warning(`存在重复数据`) } else {
if (res.result[0].result === '0') {
this.$notify.error(`${drawingNum}导入失败`)
}
if (res.output[0].导入类型 === '2') {
this.$notify.warning(`存在重复数据`)
}
} }
} }
} catch (e) { } catch (e) {