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
2020-04-28 18:34:12 +08:00
parent af5fe2e9c6
commit a69eb1ca0e
5 changed files with 65 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ export function searchtable(check1, value1, check3, value3, check5, value5, valu
}
})
}
export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people) {
export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people, operaPeople, procedureGroup) {
return request({
url: '',
method: 'post',
@@ -51,7 +51,7 @@ export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people)
ModularID: router.currentRoute.path,
type: '2',
name: '报废补投_提交报废_循环执行',
param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id + '&不合格原因组=' + Unqualified + '&备注组=' + remarkGroup + '&质检人组=' + people
param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id + '&不合格原因组=' + Unqualified + '&备注组=' + remarkGroup + '&质检人组=' + people + '&操作人员组=' + operaPeople + '&工序组=' + procedureGroup
}
})
}

2
src/utils/request.js
View File

@@ -2,7 +2,7 @@ import axios from 'axios'
// import Cookies from 'js-cookie'
// import store from '@/store'
export const wsuri = `ws://123.56.95.229:61101//WebMoudule//websocket`
export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
export const name = `OP8888`
export const name1 = `OP1000`
export const name3 = `OP2000`

52
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -33,7 +33,7 @@
</div>
<el-tabs v-model="PartType" type="card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table v-loading="loading0" ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px;width: 867px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading0" ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px;width: 1117px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="43"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120" show-overflow-tooltip>
<template slot-scope="scope">
@@ -70,6 +70,21 @@
{{ scope.row.备件总数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="已领数" width="70px">
<template slot-scope="scope">
{{ scope.row.已领数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="领用数" width="120px">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="scope.row.货位存量1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column align="center" label="库存数" width="70px">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
@@ -89,7 +104,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="外购件" name="外购件">
<el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px;width: 867px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px;width: 1117px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="43"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
@@ -126,6 +141,21 @@
{{ scope.row.备件总数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="已领数" width="70px">
<template slot-scope="scope">
{{ scope.row.已领数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="领用数" width="120px">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="scope.row.货位存量1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column align="center" label="库存数" width="70px">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
@@ -145,7 +175,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-table v-loading="loading2" ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px;width: 976px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading2" ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px;width: 1226px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="42"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
@@ -187,6 +217,21 @@
{{ scope.row.备件总数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="已领数" width="70px">
<template slot-scope="scope">
{{ scope.row.已领数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="领用数" width="120px">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="scope.row.货位存量1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column align="center" label="库存数" width="70px">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
@@ -700,6 +745,7 @@ export default {
if (this.PickingValue === false) {
this.loading0 = true
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent0, this.pageSize0, 1).then(response => {
console.log(response.data.rows, 1111)
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.loading0 = false

5
src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
View File

@@ -89,6 +89,11 @@
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工序" width="85px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.报废原因 }}

10
src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
View File

@@ -204,7 +204,9 @@ export default {
pageSize: 30, // 每页显示条数
pageCurrent: 1, // 后台获取页
outTime: '',
order: ''
order: '',
operaPeople: [],
procedureGroup1: []
}
},
computed: {
@@ -294,15 +296,19 @@ export default {
this.Unqualified = []
this.remarkGroup = []
this.people = []
this.operaPeople = []
this.procedureGroup1 = []
for (let i = 0; i < this.procedureGroup.length; i++) {
this.ScrapQuantity.push(this.procedureGroup[i].不合格数量)
this.ProcessPlanNumber.push(this.procedureGroup[i].工艺计划流水号)
this.Unqualified.push(this.procedureGroup[i].不合格原因文本)
this.remarkGroup.push(this.procedureGroup[i].备注)
this.people.push(this.procedureGroup[i].人员编号)
this.operaPeople.push(this.procedureGroup[i].操作人员编号)
this.procedureGroup1.push(this.procedureGroup[i].工序流水号)
}
this.handleEdit_disable = true
editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id, this.Unqualified, this.remarkGroup, this.people).then(response => {
editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id, this.Unqualified, this.remarkGroup, this.people, this.operaPeople, this.procedureGroup1).then(response => {
if (response.data[0].result === '1') {
this.$message.success('报废成功')
this.searchTable()