From 4652431ce329b4dec6c4dcc0758d5c4ff97e0666 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期六, 11 十一月 2023 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/product/workbench/batchproductout-form-new.vue | 224 +++++++++++++++++++++++++++++++------------------------
1 files changed, 127 insertions(+), 97 deletions(-)
diff --git a/src/views/product/workbench/batchproductout-form-new.vue b/src/views/product/workbench/batchproductout-form-new.vue
index eae3304..66bd976 100644
--- a/src/views/product/workbench/batchproductout-form-new.vue
+++ b/src/views/product/workbench/batchproductout-form-new.vue
@@ -8,8 +8,8 @@
-->
<template>
<el-dialog
- width="95%"
- title="鎵归噺浜у嚭"
+ width="90%"
+ title="姹囨姤浜у嚭"
:visible.sync="innerVisible"
append-to-body
@close="$emit('update:currshowlist', false)"
@@ -18,7 +18,7 @@
class="batch-product-out-form"
>
<div
- style="float: left;width: 15%;box-sizing: border-box;padding-right: 34px;position: relative"
+ style="float: left;width: 20%;box-sizing: border-box;padding-right: 34px;position: relative"
>
<el-table
stripe
@@ -48,7 +48,7 @@
style="position: absolute;top:0px;right: 0px;height: 100%;width: 34px;border-left: 1px solid #f4f2ea;border-right: 1px solid #f4f2ea;"
></div>
</div>
- <div style="float: left;width: 85%">
+ <div style="float: left;width: 80%">
<el-row style="">
<el-col :span="1" class="batch-product-out-form-header-col"
><span>搴忓彿</span></el-col
@@ -58,9 +58,9 @@
><span>闆朵欢鍚嶇О</span></el-col
>
<el-col :span="4" class="batch-product-out-form-header-col"
- ><span>SN鍙�</span></el-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>杞藉叿缂栧彿</span></el-col
>
<el-col :span="1" class="batch-product-out-form-header-col"
@@ -68,34 +68,40 @@
>
<el-col :span="1" class="batch-product-out-form-header-col"
><span>姣忕洏浜ч噺</span></el-col
- >
- <el-col :span="1" class="batch-product-out-form-header-col"
+ > -->
+ <!-- <el-col :span="1" class="batch-product-out-form-header-col"
><span>璧峰绫虫爣</span></el-col
>
<el-col :span="1" class="batch-product-out-form-header-col"
><span>鎴绫虫爣</span></el-col
- >
+ > -->
<el-col :span="1" class="batch-product-out-form-header-col"
><span>鍗曚綅</span></el-col
>
- <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"
+ ><span>WDR鍙�</span></el-col
>
- <el-col :span="1" class="batch-product-out-form-header-col"
+ <!-- <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"
+ ><span>鐢熶骇鏁伴噺</span></el-col
+ >
+ <el-col :span="2" class="batch-product-out-form-header-col"
><span>鎶ュ簾鏁伴噺</span></el-col
>
- <el-col :span="1" class="batch-product-out-form-header-col"
+ <!-- <el-col :span="1" class="batch-product-out-form-header-col"
><span>鐩樺叿閲嶉噺</span></el-col
- >
- <el-col :span="1" class="batch-product-out-form-header-col"
+ > -->
+ <!-- <el-col :span="1" class="batch-product-out-form-header-col"
><span>姣涢噸</span></el-col
- >
+ > -->
<!--<el-col :span="1" class="batch-product-out-form-header-col"
><span>IFS鎵规鍙�</span></el-col
>-->
- <el-col :span="2" class="batch-product-out-form-header-col"
+ <el-col :span="3" class="batch-product-out-form-header-col"
><span>鐢熶骇浜哄憳</span></el-col
- ><el-col :span="1" class="batch-product-out-form-header-col"
+ ><el-col :span="2" class="batch-product-out-form-header-col"
><span>澶囨敞</span></el-col
>
<el-col :span="1" class="batch-product-out-form-header-col"
@@ -127,24 +133,12 @@
<span class="inline-el-hidden">{{ item.partName }}</span>
</el-tooltip>
</el-col>
- <el-col :span="4" class="batch-product-out-form-body-col">
- <span v-show="!item.batchNoEdit">{{ item.outBatchNo }}</span>
- <!--<el-input v-show="item.batchNoEdit" v-model="item.outBatchNo">
- <i
- slot="prefix"
- class="el-input__icon el-icon-search"
- style="cursor:pointer"
- @click="openOutPutBatch(item)"
- ></i>
- <i
- slot="suffix"
- class="el-input__icon el-icon-circle-close"
- style="cursor:pointer"
- @click="cleanOutBatchNo(item)"
- ></i>
- </el-input>-->
+ <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>
</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.reelNumber"></el-input>
</el-col>
<el-col :span="1" class="batch-product-out-form-body-col l-mes">
@@ -152,32 +146,38 @@
</el-col>
<el-col :span="1" class="batch-product-out-form-body-col l-mes">
<span>{{ item.productQty }}</span>
- </el-col>
- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
+ </el-col> -->
+ <!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.startMeterMark"></el-input>
</el-col>
<el-col :span="1" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.endMeterMark"></el-input>
- </el-col>
+ </el-col> -->
<el-col :span="1" class="batch-product-out-form-body-col">
<span>{{ item.unit }}</span>
</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 :span="2" class="batch-product-out-form-body-col l-mes">
+ <el-input v-model="item.wdr"></el-input>
</el-col>
- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
+ <!-- <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>
+ </el-col>
+ <el-col :span="2" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.scrapQty"></el-input>
</el-col>
- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
+ <!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.reelWeight"></el-input>
- </el-col>
- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
+ </el-col> -->
+ <!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.grossWeight"></el-input>
- </el-col>
+ </el-col> -->
<!--<el-col :span="1" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.ifsBatchNo"></el-input>
</el-col>-->
- <el-col :span="2" class="batch-product-out-form-body-col">
+ <el-col :span="3" class="batch-product-out-form-body-col">
<el-tooltip
class="item"
effect="dark"
@@ -190,7 +190,7 @@
<!--<el-col :span="1" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.remark"></el-input>
</el-col>-->
- <el-col :span="1" 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.mainRemark"></el-input>
</el-col>
<el-col :span="1" class="batch-product-out-form-body-col">
@@ -205,19 +205,19 @@
</div>
</div>
<div slot="footer" class="dialog-footer">
- <div style="display: inline-block;width: 25%;float: left">
+ <!-- <div style="display: inline-block;width: 25%;float: left">
<el-button
style="margin-right: 34px"
type="primary"
@click="addProductOutForPerson"
>娣诲姞</el-button
>
- </div>
+ </div> -->
<el-button @click="innerVisible = false">鍙� 娑�</el-button>
<el-button
type="primary"
:disabled="saveDisabled"
- @click="saveProductOuts"
+ @click="saveProductOuts2"
>纭� 瀹�</el-button
>
</div>
@@ -314,7 +314,8 @@
batchSaveProductMain,
getShiftProductOutByOpIdAndWsId,
validateOverProduction,
- validateOverFeed
+ validateOverFeed,
+ submitProductMain
} from '@/api/product/personboard'
import ElButton from '../../../../node_modules/element-ui/packages/button/src/button.vue'
import OutPutBatch from './outputbatch.vue'
@@ -498,10 +499,39 @@
// row.outBatchNo = null
}
},
+ saveProductOuts2() {
+ this.clickDateArr.push(new Date().getTime())
+ var productOutputList = []
+ this.productList.forEach(a=>{
+ productOutputList.push({
+ partId: a.partId,
+ productQty: a.outNum,
+ outBatchNo: a.outBatchNo,
+ scrapQty: a.scrapQty,
+ remark: a.remark,
+ wdr: a.wdr,
+ staffNo: a.staffNo,
+ staffName: a.staffName,
+ status: a.status,
+ dutyRecordId: a.dutyRecordId,
+ productStaffIds: a.productStaffIds,
+ productStaffs: a.productStaffs
+ })
+ })
+ var productMains = {
+ productOutputList: productOutputList,
+ workstationId: this.parentInfo.workstationId,
+ operationTaskId: this.parentInfo.operationTaskId,
+ }
+ submitProductMain(productMains).then(res=>{
+ this.$emit('refreshProductOutputList', res.data.data)
+ this.innerVisible = false
+ })
+ },
saveProductOuts() {
var canClickFlag = true
this.clickDateArr.push(new Date().getTime())
- if (this.clickDateArr.length > 1) {
+ /* if (this.clickDateArr.length > 1) {
if (
this.clickDateArr[this.clickDateArr.length - 1] -
this.clickDateArr[this.clickDateArr.length - 2] <
@@ -510,7 +540,7 @@
// 灏忎簬2绉掑垯璁や负閲嶅鎻愪氦
canClickFlag = false
}
- }
+ } */
if (canClickFlag) {
this.saveDisabled = true
@@ -538,56 +568,56 @@
s_list = JSON.parse(JSON.stringify(p_list))
}
- if (s_list.length <= 0) {
+ /* if (s_list.length <= 0) {
this.$message.error('鎶ュ伐锛岃濉啓鐩樻暟锛�')
this.saveDisabled = false
return
- }
- let totalDisNumber = 0
- for (let i = 0; i < s_list.length; i++) {
- // 鐩樻暟鏍￠獙
- if (!this.isPositiveIntegerNumber(s_list[i].disNumber)) {
- validateFlag = false
- if (this.groupStatus) {
- validateMsg =
- '浜哄憳锛�' +
- s_list[i].staffName +
- '锛屾墍鍦ㄨ锛屻�愮洏鏁般�戣杈撳叆姝ｆ暣鏁帮紒'
- } else {
- validateMsg = '绗�' + (i + 1) + '琛岋紝銆愮洏鏁般�戣杈撳叆姝ｆ暣鏁帮紒'
- }
- break
- }
- totalDisNumber += s_list[i].disNumber - 0
- // 璧峰绫虫爣鏍￠獙
- if (!this.isNumber(s_list[i].startMeterMark)) {
- validateFlag = false
- validateMsg =
- '绗�' + (i + 1) + '琛岋紝銆愯捣濮嬬背鏍囥�戣杈撳叆闈炶礋鏁帮紝灏忔暟浣嶆渶澶�4浣嶏紒'
- break
- }
- // 鎴绫虫爣鏍￠獙
- if (!this.isNumber(s_list[i].endMeterMark)) {
- validateFlag = false
- validateMsg =
- '绗�' + (i + 1) + '琛岋紝銆愭埅姝㈢背鏍囥�戣杈撳叆闈炶礋鏁帮紝灏忔暟浣嶆渶澶�4浣嶏紒'
- break
- }
- // 鎴绫虫爣闇�澶т簬寮�濮嬬背鏍�
- if (
- Number(s_list[i].endMeterMark) < Number(s_list[i].startMeterMark)
- ) {
- validateFlag = false
- validateMsg =
- '绗�' + (i + 1) + '琛岋紝銆愭埅姝㈢背鏍囥�戦渶澶т簬銆愯捣濮嬬背鏍囥��'
- break
- }
- }
- const maxDisNumber = 2000 // 鏈�澶х洏鏁�
+ } */
+ // let totalDisNumber = 0
+ // for (let i = 0; i < s_list.length; i++) {
+ // // 鐩樻暟鏍￠獙
+ // /* if (!this.isPositiveIntegerNumber(s_list[i].disNumber)) {
+ // validateFlag = false
+ // if (this.groupStatus) {
+ // validateMsg =
+ // '浜哄憳锛�' +
+ // s_list[i].staffName +
+ // '锛屾墍鍦ㄨ锛屻�愮洏鏁般�戣杈撳叆姝ｆ暣鏁帮紒'
+ // } else {
+ // validateMsg = '绗�' + (i + 1) + '琛岋紝銆愮洏鏁般�戣杈撳叆姝ｆ暣鏁帮紒'
+ // }
+ // break
+ // } */
+ // totalDisNumber += s_list[i].disNumber - 0
+ // // 璧峰绫虫爣鏍￠獙
+ // if (!this.isNumber(s_list[i].startMeterMark)) {
+ // validateFlag = false
+ // validateMsg =
+ // '绗�' + (i + 1) + '琛岋紝銆愯捣濮嬬背鏍囥�戣杈撳叆闈炶礋鏁帮紝灏忔暟浣嶆渶澶�4浣嶏紒'
+ // break
+ // }
+ // // 鎴绫虫爣鏍￠獙
+ // if (!this.isNumber(s_list[i].endMeterMark)) {
+ // validateFlag = false
+ // validateMsg =
+ // '绗�' + (i + 1) + '琛岋紝銆愭埅姝㈢背鏍囥�戣杈撳叆闈炶礋鏁帮紝灏忔暟浣嶆渶澶�4浣嶏紒'
+ // break
+ // }
+ // // 鎴绫虫爣闇�澶т簬寮�濮嬬背鏍�
+ // if (
+ // Number(s_list[i].endMeterMark) < Number(s_list[i].startMeterMark)
+ // ) {
+ // validateFlag = false
+ // validateMsg =
+ // '绗�' + (i + 1) + '琛岋紝銆愭埅姝㈢背鏍囥�戦渶澶т簬銆愯捣濮嬬背鏍囥��'
+ // break
+ // }
+ // }
+ /* const maxDisNumber = 2000 // 鏈�澶х洏鏁�
if (totalDisNumber > maxDisNumber) {
validateMsg = '鎬荤洏鏁颁笉鑳藉ぇ浜�' + maxDisNumber + '锛�'
validateFlag = false
- }
+ } */
if (validateFlag) {
if (this.parentInfo.productOutId == null) {
// 褰撳墠鏄骇鍑虹殑鏂板
--
Gitblit v1.9.3