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

fix bug

Browse Source
This commit is contained in:
chenjianan
2019-03-20 19:10:02 +08:00
parent fe0793665e
commit ab1fb142ee
1 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,8 +95,8 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="200"> <el-table-column label="操作" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="scope.row.是否出库" size="mini" type="primary" icon="el-icon-edit" @click="editListDetailx(scope.row)">编辑</el-button> <el-button :disabled="!!scope.row.是否出库" size="mini" type="primary" icon="el-icon-edit" @click="editListDetailx(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropListdetail(scope.row)">删除</el-button> <el-button :disabled="!!scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropListdetail(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -211,24 +211,14 @@
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料规格" align="center" min-width="120"> <el-table-column label="规格" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料型号" align="center" min-width="120"> <el-table-column label="图号或型号" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 || scope.row.零件图号 || '' }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床图号" align="center" min-width="80"> <el-table-column label="机床图号" align="center" min-width="80">
@@ -241,12 +231,22 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合同数量" align="center" width="80"> <el-table-column label="采购数量" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.数量 }} {{ scope.row.数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件数量" align="center" width="80"> <el-table-column label="仓库名称" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column label="货位名称" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.货位名称 }}
</template>
</el-table-column>
<el-table-column label="货位存量" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.货位存量 }} {{ scope.row.货位存量 }}
</template> </template>
@@ -256,11 +256,6 @@
{{ scope.row.待出库数量 }} {{ scope.row.待出库数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" width="80"> <el-table-column label="零件类型" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.类型名称 }} {{ scope.row.类型名称 }}
@@ -369,6 +364,9 @@
<!--外购件领料对话框--> <!--外购件领料对话框-->
<el-dialog :visible.sync="dialogFormVisible" title="外购件标准件领料" center width="380px"> <el-dialog :visible.sync="dialogFormVisible" title="外购件标准件领料" center width="380px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm"> <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
<el-form-item label="领料单号" label-width="100px" size="small">
<el-input v-model="pickingListNumber" size="small" placeholder="空" readonly style="width: 200px"/>
</el-form-item>
<el-form-item label="出库数量" prop="OutNumber" label-width="100px" size="small"> <el-form-item label="出库数量" prop="OutNumber" label-width="100px" size="small">
<el-input v-model="form2.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/> <el-input v-model="form2.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
</el-form-item> </el-form-item>
@@ -487,8 +485,8 @@ export default {
outNote: '' // 出库备注 outNote: '' // 出库备注
}, },
rules2: { // 表单验证规则 rules2: { // 表单验证规则
OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }], OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }]
outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }] // outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
}, },
form3: { // 车间采购出库 form3: { // 车间采购出库
OutNumber: '', // 出库数量 OutNumber: '', // 出库数量
@@ -517,19 +515,19 @@ export default {
listLoading3: false, listLoading3: false,
PageCurrent: 1, PageCurrent: 1,
PageSize: 10, PageSize: 10,
total: null, total: 0,
PageCurrent1: 1, PageCurrent1: 1,
PageSize1: 10, PageSize1: 10,
total1: null, total1: 0,
PageCurrent2: 1, PageCurrent2: 1,
PageSize2: 10, PageSize2: 10,
total2: null, total2: 0,
PageCurrent3: 1, PageCurrent3: 1,
PageSize3: 10, PageSize3: 10,
total3: null, total3: 0,
PageCurrentx: 1, PageCurrentx: 1,
PageSizex: 10, PageSizex: 10,
totalx: null, totalx: 0,
materialName: '', materialName: '',
materialNumber: '', materialNumber: '',
materialType: '', materialType: '',
@@ -571,7 +569,8 @@ export default {
getpeopleid() { getpeopleid() {
this.picikingPeople = this.id this.picikingPeople = this.id
}, },
searchMachine() { // 查询机床 // 查询机床
searchMachine() {
this.MachineValue = '' this.MachineValue = ''
this.Machine = [] this.Machine = []
this.GroupNumValue = '' this.GroupNumValue = ''
@@ -590,7 +589,8 @@ export default {
} }
}) })
}, },
searchGroupList() { // 查询组号 // 查询组号
searchGroupList() {
this.GroupNumValue = '' this.GroupNumValue = ''
this.GroupNum = [] this.GroupNum = []
searchTeam(this.MachineValue).then(response => { searchTeam(this.MachineValue).then(response => {
@@ -602,18 +602,13 @@ export default {
} }
}) })
}, },
// 根据项目机床分组查零件/物料
searchPartinfo() { searchPartinfo() {
this.tableDataPurchase = [] this.tableDataPurchase = []
this.tableDataBasic = [] this.tableDataBasic = []
if (this.ProjectValue !== null && this.ProjectValue !== '') { this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
this.ProjectValue_check = 1 this.MachineValue ? this.MachineValue_check = 1 : this.MachineValue_check = 0
} this.GroupNumValue ? this.GroupNumValue_check = 1 : this.GroupNumValue_check = 0
if (this.MachineValue !== null && this.MachineValue !== '') {
this.MachineValue_check = 1
}
if (this.GroupNumValue !== null && this.GroupNumValue !== '') {
this.GroupNumValue_check = 1
}
this.listLoading = true this.listLoading = true
this.listLoading1 = true this.listLoading1 = true
this.listLoadingx = true this.listLoadingx = true
@@ -647,13 +642,11 @@ export default {
this.tableDataBasic = response.data.rows this.tableDataBasic = response.data.rows
this.listLoading1 = false this.listLoading1 = false
this.total = response.data.total this.total = response.data.total
console.log(response)
}) })
searchHoursePart(this.PageCurrentx, this.PageSizex, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => { searchHoursePart(this.PageCurrentx, this.PageSizex, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataHouse = response.data.rows this.tableDataHouse = response.data.rows
this.listLoadingx = false this.listLoadingx = false
this.totalx = response.data.total this.totalx = response.data.total
console.log(response)
}) })
}, },
handleSizeChange(val) { handleSizeChange(val) {
@@ -696,7 +689,6 @@ export default {
this.tableData1 = response.data.rows this.tableData1 = response.data.rows
this.listLoading2 = false this.listLoading2 = false
this.total2 = response.data.total this.total2 = response.data.total
console.log(response)
}) })
}, },
handleSizeChange2(val) { handleSizeChange2(val) {
@@ -788,6 +780,7 @@ export default {
// 选择领料单 // 选择领料单
chooseListinfor(row) { chooseListinfor(row) {
this.pickingListNumberx = row.领料单流水号 this.pickingListNumberx = row.领料单流水号
this.pickingListNumber = row.领料单编号
this.searchListDetailt() this.searchListDetailt()
}, },
// 增加基本件领料单明细 // 增加基本件领料单明细
@@ -836,7 +829,7 @@ export default {
}, },
// 增加外购件领料单明细 // 增加外购件领料单明细
addListDetailinfor(row) { addListDetailinfor(row) {
this.form2 = [] this.form2 = {}
this.outType = 2 this.outType = 2
this.partProjectNumber = row.项目流水号 this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称 this.partProjectName = row.项目名称
@@ -863,7 +856,6 @@ export default {
if (this.pickingListNumberx === '') { if (this.pickingListNumberx === '') {
this.$message.error('请选择领料单') this.$message.error('请选择领料单')
} else if (this.form2.OutNumber === '' || this.form2.OutNumber > this.enableOut) { } else if (this.form2.OutNumber === '' || this.form2.OutNumber > this.enableOut) {
console.log(this.enableOut)
this.$message.error('请正确输入领用数量') this.$message.error('请正确输入领用数量')
} else { } else {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
@@ -887,7 +879,6 @@ export default {
addWorkshopDetailinfor(row) { addWorkshopDetailinfor(row) {
this.form3 = [] this.form3 = []
this.outType = 3 this.outType = 3
console.log(row)
this.partProjectNumber = row.项目流水号 this.partProjectNumber = row.项目流水号
this.partMachineNumber = row.机床流水号 this.partMachineNumber = row.机床流水号
this.partGroupNumber = row.组件流水号 this.partGroupNumber = row.组件流水号