From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/product/workbench/batchproductout-form-new.vue | 52 ++++++++++++++++++++--------------------------------
1 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/src/views/product/workbench/batchproductout-form-new.vue b/src/views/product/workbench/batchproductout-form-new.vue
index 56aeb54..3ec06c5 100644
--- a/src/views/product/workbench/batchproductout-form-new.vue
+++ b/src/views/product/workbench/batchproductout-form-new.vue
@@ -57,9 +57,9 @@
><el-col :span="2" class="batch-product-out-form-header-col"
><span>闆朵欢鍚嶇О</span></el-col
>
- <el-col :span="4" class="batch-product-out-form-header-col"
+ <!-- <el-col :span="4" class="batch-product-out-form-header-col"
><span>搴忓垪鍙�</span></el-col
- >
+ > -->
<!-- <el-col :span="2" class="batch-product-out-form-header-col"
><span>杞藉叿缂栧彿</span></el-col
>
@@ -78,9 +78,9 @@
<el-col :span="1" class="batch-product-out-form-header-col"
><span>鍗曚綅</span></el-col
>
- <el-col :span="2" class="batch-product-out-form-header-col"
+ <!-- <el-col :span="2" class="batch-product-out-form-header-col"
><span>WDR鍙�</span></el-col
- >
+ > -->
<!-- <el-col :span="1" class="batch-product-out-form-header-col"
><span>鍒嗘鎻忚堪</span></el-col
> -->
@@ -133,11 +133,11 @@
<span class="inline-el-hidden">{{ item.partName }}</span>
</el-tooltip>
</el-col>
- <el-col :span="4" class="batch-product-out-form-body-col l-mes">
+ <!-- <el-col :span="4" class="batch-product-out-form-body-col l-mes"> -->
<!-- <span>{{ item.outBatchNo }}</span> -->
- <el-input v-model="item.outBatchNo">
+ <!-- <el-input v-model="item.outBatchNo">
</el-input>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="2" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.reelNumber"></el-input>
</el-col>
@@ -156,17 +156,22 @@
<el-col :span="1" class="batch-product-out-form-body-col">
<span>{{ item.unit }}</span>
</el-col>
- <el-col :span="2" class="batch-product-out-form-body-col l-mes">
+ <!-- <el-col :span="2" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.wdr"></el-input>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.segmentDesc"></el-input>
</el-col> -->
<el-col :span="2" class="batch-product-out-form-body-col l-mes">
- <el-input v-model="item.outNum"></el-input>
+ <span v-text="item.outNum"></span>
</el-col>
<el-col :span="2" class="batch-product-out-form-body-col l-mes">
- <el-input v-model="item.scrapQty"></el-input>
+ <el-select v-model="item.scrapQty">
+ <el-option label="0" value="0">
+ </el-option>
+ <el-option label="1" value="1">
+ </el-option>
+ </el-select>
</el-col>
<!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.reelWeight"></el-input>
@@ -191,7 +196,7 @@
<el-input v-model="item.remark"></el-input>
</el-col>-->
<el-col :span="2" class="batch-product-out-form-body-col l-mes">
- <el-input v-model="item.mainRemark"></el-input>
+ <el-input v-model="item.remark"></el-input>
</el-col>
<el-col :span="1" class="batch-product-out-form-body-col">
<span
@@ -392,6 +397,7 @@
this.products = this.productList
this.products.forEach(item=>{
item.staffName = staffName
+ item.outNum=1
})
}else{
this.products = []
@@ -478,7 +484,8 @@
newProduct.partNo = this.parentInfo.partNo
newProduct.partName = this.parentInfo.partName
newProduct.outBatchNo = oriOutBatchNo
- newProduct.productQty = 0
+ newProduct.productQty = 1
+ newProduct.outNum = 1
newProduct.unit = this.parentInfo.unit
newProduct.productStaffs = productStaffs
newProduct.productStaffIds = productStaffIds
@@ -735,7 +742,6 @@
// this.saveDisabled = false
// })
// .catch((error) => {
- // console.log('澶辫触' + new Date().getTime())
// this.saveDisabled = false
// })
} else {
@@ -780,7 +786,6 @@
// this.saveDisabled = false
// })
// .catch((error) => {
- // console.log('澶辫触' + new Date().getTime())
// this.saveDisabled = false
// })
})
@@ -798,7 +803,6 @@
}
})
.catch((error) => {
- console.log('澶辫触' + new Date().getTime())
this.saveDisabled = false
})
} else {
@@ -814,7 +818,6 @@
}
})
.catch((error) => {
- console.log('澶辫触' + new Date().getTime())
this.saveDisabled = false
})
}
@@ -853,9 +856,6 @@
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
- // console.log('==========')
- // console.log(nowListIndex)
- // console.log(oriList[nowListIndex])
const list = []
list.push(oriList[nowListIndex])
// 灏嗘暟鎹殑鐩樻暟 鍒嗘垚娈靛悗 鏇存柊姝ゆ鐩樻暟
@@ -868,10 +868,6 @@
}
}
- // console.log(idx)
- // console.log(submitCount)
- // console.log(list)
- // console.log(listDisNumber)
//
// setTimeout(() => {
// loading.close()
@@ -896,9 +892,6 @@
if (data.code == 0) {
// 杩斿洖鎶ュ伐涓昏〃id锛岀敤浜庡埛鏂伴〉闈�
var productMainId = data.data
- // console.log(idx)
- // console.log(submitCount)
- // console.log(listDisNumber)
loading.close()
// 宸插畬鎴愭暟鎹� 娑堟伅璁板綍
this.messageMap['' + nowListIndex] =
@@ -917,7 +910,6 @@
} else {
// 鎵归噺鎻愪氦瀹屾垚锛屽埛鏂版姤宸ラ〉闈㈡暟鎹�
this.$emit('refreshProductOutputList', productMainId)
- console.log(this.messageMap)
this.$message.success('鏂板鎴愬姛')
this.innerVisible = false
}
@@ -929,7 +921,6 @@
})
.catch((error) => {
loading.close()
- console.log('澶辫触' + new Date().getTime())
this.saveDisabled = false
this.showError()
})
@@ -974,7 +965,6 @@
// this.saveDisabled = false
// })
// .catch((error) => {
- // console.log('澶辫触' + new Date().getTime())
// this.saveDisabled = false
// })
} else {
@@ -1015,7 +1005,6 @@
// this.saveDisabled = false
// })
// .catch((error) => {
- // console.log('澶辫触' + new Date().getTime())
// this.saveDisabled = false
// })
})
@@ -1033,7 +1022,6 @@
}
})
.catch((error) => {
- console.log('澶辫触' + new Date().getTime())
this.saveDisabled = false
})
}
--
Gitblit v1.9.3