This commit is contained in:
liushuai
2019-04-27 08:15:26 +08:00
parent dfc962db07
commit 32559d82d4
8 changed files with 1378 additions and 76 deletions

View File

@@ -12,6 +12,14 @@
:label="item.label"
:value="item.value"/>
</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>
<upload-excel-component @on-selected-file="selected"/>
</div>
@@ -26,7 +34,7 @@
</div>
</div>
</el-card>
<specification-data1 ref="specificationData" :groups-names="groupsNames" :machine-names="machineNames" :project-name="projectName" @machineChange="machineChange"/>
<specification-data1 ref="specificationData" :groups-names="groupsNames" :machine-names="machineNames" :project-name="projectName" :group-name="groupName" @machineChange="machineChange"/>
<!--<el-upload-->
<!--class="upload-demo"-->
<!--drag-->
@@ -52,6 +60,18 @@ export default {
return {
project: [],
projectValue: '',
groupName: '',
Group: [{
value: 'MX',
name: 'MX'
}, {
value: 'WG',
name: 'WG'
}, {
value: 'BZ',
name: 'BZ'
}],
group: '',
worksheet: [],
itemFile: [],
loading: false,
@@ -160,6 +180,7 @@ export default {
remarks,
classificationCode
console.log(this.worksheet[j].M2.v.substring(0, 1))
this.group = this.worksheet[j].M2.v.substring(0, this.worksheet[j].M2.v.indexOf('-')) + '组'
if (this.worksheet[j].M2.v.substring(0, 1) === '9') {
const response = await isExit(this.projectValue, this.worksheet[j].F2.v)
const res = response.data
@@ -226,7 +247,7 @@ export default {
async insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) {
try {
if (groupNum.indexOf('MX') > -1) {
const response = await importBasics(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, 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
console.log(res)
if (res[0].result === '0') {
@@ -236,7 +257,7 @@ export default {
this.$notify.error(`${drawingNum}导入重复`)
}
} else {
const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, 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
if (res[0].result === '0') {
this.$notify.error(`${drawingNum}导入失败`)