Commit 3e7b7117 authored by tanjunxin's avatar tanjunxin

fix: 1.上机明细增加查询字段; 2.生产工单补单计算函数修改

parent 5b638eb2
...@@ -538,7 +538,7 @@ export default { ...@@ -538,7 +538,7 @@ export default {
this.processList = [] this.processList = []
const bomList = this.currentData.bomList.map((item,index) => { const bomList = this.currentData.bomList.map((item,index) => {
// console.log(item.quantity, 'items') // console.log(item.quantity, 'items')
let quantity = parseInt(this.form.quantity*item.quantity*100/this.currentData.quantity) let quantity = parseFloat(this.form.quantity*item.quantity*100/this.currentData.quantity)
// console.log(quantity, 'quantity') // console.log(quantity, 'quantity')
return { return {
...item, ...item,
...@@ -550,7 +550,7 @@ export default { ...@@ -550,7 +550,7 @@ export default {
...ele, ...ele,
processItemList: ele.processItemList.map((item) => { processItemList: ele.processItemList.map((item) => {
// console.log(item.quantity, 'items2') // console.log(item.quantity, 'items2')
let quantity = parseInt(this.form.quantity*item.quantity*100/this.currentData.quantity) let quantity = parseFloat(this.form.quantity*item.quantity*100/this.currentData.quantity)
return { return {
...item, ...item,
quantity: quantity/100 quantity: quantity/100
......
...@@ -17,6 +17,22 @@ ...@@ -17,6 +17,22 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="刀模SN" prop="toolCode">
<el-input
v-model="queryParams.toolCode"
placeholder="请输入刀模SN"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-input
v-model="queryParams.arrangeCode"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
...@@ -105,7 +121,9 @@ export default { ...@@ -105,7 +121,9 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
workunitCode: null, workunitCode: null,
workunitName: null workunitName: null,
toolCode: null,
arrangeCode: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment