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:
zhangdingyu
2019-04-01 11:07:33 +08:00
parent 6bf8b8db0a b8f5e48f7f
commit f6043520fe
9 changed files with 71 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,18 @@ export function ExchangeOut(listNumber) {
}
})
}
// 滞货件出库
export function backlogPart(...params) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_滞货件出库_修改数据',
param: `领料单明细流水号=${params[0]}&出库数量=${params[1]}&滞货物料与货位对照流水号=${params[2]}`
}
})
}
// 外购件零件出库
export function PurchasePart(listNumber, data1, data2, data3, data4, data5, data6) {
return request({

2
src/api/Inventory/PickingList.js
View File

@@ -132,7 +132,7 @@ export function dropListDetail(DetailNumberx, isBacklog) {
data: {
type: '2',
name: '车间装配管理_领料单_领料单明细删除',
param: '领料单明细流水号=' + DetailNumberx + '&是否滞货=' + isBacklog
param: '领料单明细流水号=' + DetailNumberx + '&是否是滞货=' + isBacklog
}
})
}

4
src/api/ManufacturingCenter/PartAssignment.js
View File

@@ -188,14 +188,14 @@ export function PurchasingDepartment(num, num1, time, MaterialNum, NumberOfParts
}
})
}
export function Production(num, MaterialNum, projectFloatValue, machineFloatValue) {
export function Production(num, MaterialNum, Number, projectFloatValue, machineFloatValue) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间管理_车间采购_基本件_传递数据',
param: `组件流水号=${num}&基本件流水号组=${MaterialNum}&项目流水号=${projectFloatValue}&机床流水号=${machineFloatValue}`
param: `组件流水号=${num}&基本件流水号组=${MaterialNum}&零件数量组=${Number}&项目流水号=${projectFloatValue}&机床流水号=${machineFloatValue}`
}
})
}

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

@@ -200,7 +200,8 @@
</template>
<script>
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ErrorOut, ExchangeOut, ExchangePartOut } from '@/api/Inventory/PartOut'
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ErrorOut, ExchangeOut, ExchangePartOut,
backlogPart } from '@/api/Inventory/PartOut'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -295,6 +296,7 @@ export default {
},
// 选择领料单
chooseListinfor(row) {
console.log(row, 99)
this.pickingListNumberx = row.领料单流水号
this.getpicikingPeople = row.领料人流水号
this.searchListDetailt()
@@ -325,26 +327,34 @@ export default {
},
// 出库
partOut(row) {
console.log(row.领料单明细流水号, row.出库数量, row.滞货物料与货位对照流水号)
this.$confirm('确认出库?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (row.出库类型 === 3) {
if (row.出库类型 === 4) { // 滞货件
backlogPart(row.领料单明细流水号, row.出库数量, row.滞货物料与货位对照流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else if (row.出库类型 === 3) { // 车间采购件
WorkShopPart(row.领料单明细流水号, row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else if (row.出库类型 === 2) {
} else if (row.出库类型 === 2) { // 采购件
PurchasePart(row.领料单明细流水号, row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else {
} else { // 自制件
BasicPart(row.领料单明细流水号, row.工艺计划流水号, row.出库数量, row.收件信息ID, this.getpicikingPeople, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')

8
src/views/Inventory/PickingList/index.vue
View File

@@ -93,7 +93,7 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column v-if="false" label="操作" align="center" width="100">
<el-table-column v-if="true" label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button :disabled="!!scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropListdetail(scope.row)">删除</el-button>
</template>
@@ -335,7 +335,7 @@
</el-table-column>
<el-table-column label="可出库数量" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.可出库数量 = scope.row.关联数量 - scope.row.待出库数量 }}
{{ scope.row.可出库数量 = scope.row.货位余量 - scope.row.待出库数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
@@ -693,7 +693,7 @@ export default {
// 删除领料单明细
dropListdetail(row) {
let isBacklog
console.log(row)
Number(row.出库类型) === 4 ? isBacklog = 1 : isBacklog = 0
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -738,7 +738,7 @@ export default {
searchTeam(this.MachineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.GroupNum.push({
label: response.data[i].组件名称,
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}

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

@@ -89,26 +89,16 @@
{{ 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.零件备注 }}
</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.需求数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120px" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">使用</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="外购件">
@@ -139,26 +129,16 @@
{{ 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.备注 }}
</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.需求数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120px" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit2(scope.row)">使用</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="标准件">
@@ -189,26 +169,16 @@
{{ 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.备注 }}
</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.需求数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120px" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit2(scope.row)">使用</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
@@ -1103,6 +1073,7 @@ export default {
this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].零件备注
}
console.log(this.NumberOfParts, 1111)
} else if (this.PartType === '外购件') {
this.MaterialNum = []
this.MaterialCode = []
@@ -1118,7 +1089,7 @@ export default {
this.MaterialName[i] = val[i].物料名称
this.MaterialSpecification[i] = val[i].物料规格
this.MaterialModel[i] = val[i].物料型号
this.NumberOfParts[i] = val[i].需求数量
this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].备注
}
} else if (this.PartType === '标准件') {
@@ -1136,7 +1107,7 @@ export default {
this.MaterialName[i] = val[i].物料名称
this.MaterialSpecification[i] = val[i].物料规格
this.MaterialModel[i] = val[i].物料型号
this.NumberOfParts[i] = val[i].需求数量
this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].备注
}
}
@@ -1259,7 +1230,7 @@ export default {
},
Production() {
if (this.PartType === '基本件' && this.BasicPartsNumber.length !== 0) {
Production(this.groupFloatValue, this.BasicPartsNumber, this.projectFloatValue, this.machineFloatValue).then(response => {
Production(this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
if (response.data[0].result !== '0') {
this.$message.success('投产成功')
searchPart(this.groupFloatValue).then(response => {

1
src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
View File

@@ -298,6 +298,7 @@ export default {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
},
searchMachine() {
this.machineValue = ''
this.machine = []
initMachine(this.projectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {

12
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -20,8 +20,8 @@
:data="tableData11"
:row-class-name="tableRowClassName"
border
style="width: 100%;max-height: 600px;"
height="600px"
style="width: 100%;max-height: 500px;"
height="500px"
size="mini"
@selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" width="35" type="selection"/>
@@ -107,7 +107,7 @@
<!--</el-tooltip>-->
</template>
</el-table-column>
<el-table-column label="滞货数量" align="center" min-width="80">
<el-table-column label="可用滞货数量" align="center" min-width="100">
<template slot-scope="scope">
{{ Number(scope.row.滞货数量) }}
</template>
@@ -351,12 +351,12 @@
</el-table-column>
<el-table-column label="机床图号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
{{ scope.row.机床图号 || scope.row.基本件机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.组号 }}
{{ scope.row.组号 || scope.row.基本件组号 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
@@ -775,6 +775,7 @@ export default {
let check1
this.materialName ? check1 = 1 : check1 = 0
searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, this.id).then(response => {
console.log(response.data.rows)
this.tableData11 = response.data.rows
this.total11 = response.data.total
})
@@ -1123,6 +1124,7 @@ export default {
this.supplierExport = row.供应商名称
this.orderExport = row.询价单编号
searchSheetDetail(row.询价单流水号).then(response => {
console.log(response.data)
this.tableData3 = response.data
})
},

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

@@ -69,10 +69,15 @@
<template slot-scope="scope">{{ scope.row.组号 }}</template>
</el-table-column>
<el-table-column
label="需求数量"
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.机床数量 }}
</template>
</el-table-column>
<el-table-column
label="材料"
align="center">
@@ -159,6 +164,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 align="center" label="零件类型">
<template slot-scope="scope">
{{ scope.row.零件类型 }}