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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
chenjianan
2019-03-29 19:46:49 +08:00
parent 48a9d49376 b314703e23
commit 7c61b37ea7
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/api/Inventory/PartOut.js
View File

@@ -26,17 +26,17 @@ export function searchListDetail(listNumber) {
})
}
// 领料单明细出库
export function ListDetailOut(listNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间装配管理_领料单_领料单明细出库',
param: '领料单明细流水号=' + listNumber
}
})
}
// export function ListDetailOut(listNumber) {
// return request({
// url: '',
// method: 'post',
// data: {
// type: '1',
// name: '车间装配管理_领料单_领料单明细出库',
// param: '领料单明细流水号=' + listNumber
// }
// })
// }
// 交换件查询
export function ExchangeOut(listNumber) {
return request({
@@ -51,38 +51,38 @@ export function ExchangeOut(listNumber) {
}
// 外购件零件出库
export function PurchasePart(data1, data2, data3, data4, data5, data6) {
export function PurchasePart(listNumber, data1, data2, data3, data4, data5, data6) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_外购件出库_修改数据',
param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6
param: '领料单明细流水号=' + listNumber + '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6
}
})
}
// 基本件零件出库
export function BasicPart(data1, data2, data3, data4, data5) {
export function BasicPart(listNumber, data1, data2, data3, data4, data5) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'MES_机加工MES_库存管理_出库模块_出库零件信息_零件出库',
param: '工艺计划流水号=' + data1 + '&本次出库数量=' + data2 + '&收件信息ID=' + data3 + '&领用人编号=' + data4 + '&出库备注=' + data5
param: '领料单明细流水号=' + listNumber + '工艺计划流水号=' + data1 + '&本次出库数量=' + data2 + '&收件信息ID=' + data3 + '&领用人编号=' + data4 + '&出库备注=' + data5
}
})
}
// 车间采购件零件出库
export function WorkShopPart(data1, data2, data3, data4, data5, data6) {
export function WorkShopPart(listNumber, data1, data2, data3, data4, data5, data6) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_车间采购出库_修改数据',
param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6
param: '领料单明细流水号=' + listNumber + '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6
}
})
}

11
src/views/Inventory/PartOut/index.vue
View File

@@ -200,7 +200,7 @@
</template>
<script>
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ListDetailOut, ErrorOut, ExchangeOut, ExchangePartOut } from '@/api/Inventory/PartOut'
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ErrorOut, ExchangeOut, ExchangePartOut } from '@/api/Inventory/PartOut'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -331,26 +331,23 @@ export default {
type: 'warning'
}).then(() => {
if (row.出库类型 === 3) {
WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
WorkShopPart(row.领料单明细流水号, row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else if (row.出库类型 === 2) {
PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
PurchasePart(row.领料单明细流水号, row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else {
BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, this.getpicikingPeople, row.备注).then(response => {
BasicPart(row.领料单明细流水号, row.工艺计划流水号, row.出库数量, row.收件信息ID, this.getpicikingPeople, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
ListDetailOut(row.领料单明细流水号)
this.searchListDetailt()
} else { this.$message.error('增加失败') }
})

2
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -378,7 +378,7 @@
<el-input v-model="form1.设备名称" size="small" placeholder="请输入设备名称" style="width:200px"/>
</el-form-item>
<el-form-item label="机床数量" prop="机床数量">
<el-input-number v-model="form1.机床数量" controls-position="right" :min="1" style="width:200px" size="small"></el-input-number>
<el-input-number :min="1" v-model="form1.机床数量" controls-position="right" style="width:200px" size="small"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

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

@@ -224,6 +224,7 @@ export default {
} catch (e) {
console.log(e)
this.err++
this.loading = false
this.$notify.error(`导入数据错误,请检查导入文件是否正确`)
console.log(`导入数据错误${e}`)
}