From d5caee05b6d191e05729966b677fcd2d39b4a0e7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 十二月 2023 17:31:21 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/workbench/batchproductout-form-new.vue | 31 +++++++++------
src/views/product/workbench/feed-pane.vue | 16 ++++----
src/views/product/workbench/workReportCard.vue | 12 +++---
src/views/warehouse/pallettransports/index.vue | 25 +++++++++++-
src/views/product/workbench/productInDialog.vue | 6 ++
5 files changed, 60 insertions(+), 30 deletions(-)
diff --git a/src/views/product/workbench/batchproductout-form-new.vue b/src/views/product/workbench/batchproductout-form-new.vue
index d9868e6..11f7e1a 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>
@@ -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
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 0b41376..78fb19e 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -250,9 +250,9 @@
<span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center">
+ <el-table-column label="鎵规鍙�" prop="ifsBatchNo" align="center">
<template slot="header">
- <div style="line-height: 14px;">IFS鎵规鍙�</div>
+ <div style="line-height: 14px;">鎵规鍙�</div>
<div class="th" @click.stop>
<el-input
type="text"
@@ -268,7 +268,7 @@
<span>{{ scope.row.ifsBatchNo }}</span>
</template>
</el-table-column>
- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
+ <!-- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
<template slot="header">
<div style="line-height: 14px;">WDR鍙�</div>
<div class="th" @click.stop>
@@ -285,7 +285,7 @@
<template slot-scope="scope">
<span>{{ scope.row.ifsWdr }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="SN鍙�" prop="partBatchNo" align="center">
<template slot="header">
<div style="line-height: 14px;">SN鍙�</div>
@@ -1242,9 +1242,9 @@
<span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center">
+ <el-table-column label="鎵规鍙�" prop="ifsBatchNo" align="center">
<template slot="header" slot-scope="scope">
- <div style="line-height: 14px;">IFS鎵规鍙�</div>
+ <div style="line-height: 14px;">鎵规鍙�</div>
<div class="th" @click.stop>
<el-input
type="text"
@@ -1260,7 +1260,7 @@
<span>{{ scope.row.ifsBatchNo }}</span>
</template>
</el-table-column>
- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
+ <!-- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;">WDR鍙�</div>
<div class="th" @click.stop>
@@ -1277,7 +1277,7 @@
<template slot-scope="scope">
<span>{{ scope.row.ifsWdr }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="SN鍙�" prop="partBatchNo" align="center">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;">SN鍙�</div>
diff --git a/src/views/product/workbench/productInDialog.vue b/src/views/product/workbench/productInDialog.vue
index ab22650..15c4b15 100644
--- a/src/views/product/workbench/productInDialog.vue
+++ b/src/views/product/workbench/productInDialog.vue
@@ -25,7 +25,7 @@
>
</el-table-column>
<el-table-column
- label="IFS鎵规鍙�"
+ label="鎵规鍙�"
prop="ifsBatchNo"
align="center"
:show-overflow-tooltip="true"
@@ -46,6 +46,10 @@
<el-table-column label="鍗曚綅" prop="unit" align="center">
</el-table-column>
<el-table-column label="鏄惁宸ュ簭搴撳瓨" prop="operationStockStatus" align="center">
+ <template slot-scope="scope">
+ <span v-if="scope.row.operationStockStatus">鏄�</span>
+ <span v-else>鍚�</span>
+ </template>
</el-table-column>
<el-table-column label="鎵�灞炲伐搴�" prop="name" align="center">
</el-table-column>
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index 25a2921..d6c3704 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -256,7 +256,7 @@
}}</template>
</template>
</el-table-column>
- <el-table-column label="WDR鍙�" prop="wdr" align="center" width="100">
+ <!-- <el-table-column label="WDR鍙�" prop="wdr" align="center" width="100">
<template slot-scope="scope">
<el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit"
v-model="scope.row.wdr" placeholder="WDR鍙�"></el-input>
@@ -264,7 +264,7 @@
scope.row.wdr
}}</template>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="鍒嗘鎻忚堪" prop="segmentDesc" align="center">
<template slot-scope="scope">
<el-input
@@ -288,8 +288,8 @@
}}</template>
</template>
</el-table-column>
- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center" width="120">
- <!-- <template slot="header" slot-scope="scope">
+ <!-- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center" width="120">
+ <template slot="header" slot-scope="scope">
<div style="line-height: 14px;">IFS鎵规鍙�</div>
<div class="th" @click.stop>
<template>
@@ -305,8 +305,8 @@
<template v-if="!scope.row.isIfsBatchNoEdit">{{
scope.row.ifsBatchNo
}}</template>
- </template> -->
- </el-table-column>
+ </template>
+ </el-table-column> -->
<el-table-column label="澶囨敞" prop="remark" align="center">
<template slot-scope="scope">
<el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit"
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 0cd60ad..2559b96 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -52,10 +52,15 @@
</div>
</div>
<div>
- <el-table class="pallet-transports-material-table" :data="palletTransportsMaterialData" style="width: 100%;"
+ <el-table class="pallet-transports-material-table" :data="palletTransportsMaterialData" @current-change="handleCurrentChange" style="width: 100%;"
height="350px" border @selection-change="palletTransportsMaterialSelectionChange" stripe
ref="palletTransportsMaterialTable">
- <el-table-column type="selection" width="55"> </el-table-column>
+ <!--鍗曢�夋-->
+ <el-table-column align="center" label="鍗曢��">
+ <template slot-scope="scope">
+ <el-checkbox class="table-single-checkbox" v-model="scope.row.commonChecked"></el-checkbox>
+ </template>
+ </el-table-column>
<el-table-column prop="partNo" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="partDesc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
@@ -360,6 +365,19 @@
},
created() { },
methods: {
+ // 鍗曡閫変腑
+ handleCurrentChange(row) {
+ if (row != null) {
+ this.palletTransportsMaterialData.forEach((item) => {
+ // 鎺掍粬,姣忔閫夋嫨鏃舵妸鍏朵粬閫夐」閮芥竻闄�
+ if (item.id !== row.id) {
+ item.commonChecked = false
+ } else {
+ item.commonChecked = true
+ }
+ })
+ }
+ },
// 宸ヨ壓绫诲瀷涓枃鏍煎紡鍖�
formatStateType(row, column, cellValue) {
this.stateOptions.forEach((obj) => {
@@ -408,7 +426,8 @@
unit: item.unit,
transportsId: item.transportsId,
detailExistState: item.detailExistState,
- canEdit: false
+ canEdit: false,
+ commonChecked: false
}
this.palletTransportsMaterialData.push(palletTransportsMaterial)
})
--
Gitblit v1.9.3