From ca73a173f008c8d7a9d700bad897ca24fe2d2203 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 十月 2023 09:29:57 +0800
Subject: [PATCH] 111
---
minipro_standard/pages_inspect/pages/InOperation/InOperation.vue | 88 +++++++++++++++++++++++++++++---------------
1 files changed, 58 insertions(+), 30 deletions(-)
diff --git a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue b/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
index e6c7247..11c4c17 100644
--- a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
+++ b/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
@@ -25,14 +25,11 @@
<span>{{item.outActnum}}{{item.unitName}}</span>
</div>
<div class="page_content_title_bottom">
- <span class="green" v-if="item.qualityType === 0">鍚堟牸 <span
- class="black">/</span> </span>
- <span class="warning" v-else-if="item.qualityType === 1">涓嶈壇 <span
- class="black">/</span> </span>
- <span class="error" v-else-if="item.qualityType === 2">鎶ュ簾 <span
- class="black">/</span> </span>
- <span v-else>- / </span>
- <span>{{item.procedureName ? item.procedureName : '-'}} / </span>
+ <span class="green" v-if="item.qualityType === 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
+ <span class="warning" v-else-if="item.qualityType === 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
+ <span class="error" v-else-if="item.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
+ <span v-else>-<text class="c6" decode>{{ split}}</text></span>
+ <span>{{item.procedureName ? item.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
<span>{{item.batch ? item.batch : '-'}}</span>
</div>
</div>
@@ -72,10 +69,10 @@
</div>
</div>
<div class="page_yxwl_list_item_sx">
- <span class="green" v-if="item.qualityType === 0">鍚堟牸 <span>/</span> </span>
- <span class="warning" v-else-if="item.qualityType === 1">涓嶈壇 <span>/</span> </span>
- <span class="red" v-else-if="item.qualityType === 2">鎶ュ簾 <span>/</span> </span>
- <span>{{item.procedureName ? item.procedureName : '-'}} <span>/</span> </span>
+ <span class="green" v-if="item.qualityType === 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
+ <span class="warning" v-else-if="item.qualityType === 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
+ <span class="red" v-else-if="item.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
+ <span>{{item.procedureName ? item.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
<span>{{item.batch ? item.batch : '-'}}</span>
</div>
<div class="page_yxwl_list_item_num">
@@ -86,7 +83,7 @@
<span>{{item.locationName ? item.locationName : '-'}}</span>
</div>
</div>
- <div class="items">
+ <div class="items f24">
<div class="label">鏁伴噺锛�</div>
<div class="nr">
<input type="text" v-model="item.scanNum" placeholder="璇疯緭鍏�" />
@@ -97,8 +94,8 @@
<div class="itemy" v-for="(item1, idx) in item.woutboundRedisCodeBeanList" :key="idx">
<div class="label">宸ヨ{{item1.scanCode}}锛�</div>
<div class="nr">{{item1.num}}{{item1.unitName}}</div>
- <div class="dele" @click="dele(item1)">
- <image src="../../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
+ <div class="dele" @click="woScanMaterialBeanList.splice(index, 1)">
+ <image src="../../../static/chuku_ic_delete@2x.png" class="img48" mode=""></image>
</div>
</div>
</div>
@@ -115,10 +112,10 @@
</div>
</div>
<div class="page_yxwl_list_item_sx">
- <span class="green" v-if="item1.qualityType === 0">鍚堟牸 <span>/</span> </span>
- <span class="yellow" v-else-if="item1.qualityType === 1">涓嶈壇 <span>/</span> </span>
- <span class="red" v-else-if="item1.qualityType === 2">鎶ュ簾 <span>/</span> </span>
- <span>{{item1.procedureName ? item1.procedureName : '-'}} <span>/</span> </span>
+ <span class="green" v-if="item1.qualityType === 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
+ <span class="yellow" v-else-if="item1.qualityType === 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
+ <span class="red" v-else-if="item1.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
+ <span>{{item1.procedureName ? item1.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
<span>{{item1.batch ? item1.batch : '-'}}</span>
</div>
<div class="page_yxwl_list_item_num">
@@ -129,7 +126,7 @@
<span>{{item1.locationName}}</span>
</div>
</div>
- <div class="itemy_item">
+ <div class="itemy_item f24">
<div class="label">鏁伴噺锛�</div>
<div class="nr">
<!-- @input="inputNum(item1)" -->
@@ -137,9 +134,11 @@
<span>{{item1.unitName}}</span>
</div>
</div>
- <!-- @click="dele()" -->
- <div class="dele" @click="dele(idx)">
- <image src="../../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
+ <!-- @click="dele()" dele(index) {
+ this.outboundList.splice(index, 1)
+ }, -->
+ <div class="dele" @click="seleMateriaList.splice(index, 1)">
+ <image src="../../../static/chuku_ic_delete@2x.png" class="img48" mode=""></image>
</div>
</div>
</div>
@@ -198,6 +197,7 @@
},
data() {
return {
+ split: ' / ',
type: '',
id: '',
wareHouseId: '',
@@ -299,17 +299,42 @@
},
selectMaterial(val) {
let material = JSON.parse(JSON.stringify(val))
- let tempMaterial = this.seleMateriaList.find(item => item.locationId == this.location)
- if (tempMaterial) {
- if (tempMaterial.qualityType == material.qualityType && tempMaterial.procedureId == material
- .procedureId &&
- tempMaterial.batch == material.batch && tempMaterial.materialId == material.materialId) {
- uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
- return
+ let repetition = false
+ this.seleMateriaList.forEach(item => {
+ if (item.locationId == this.location) {
+ if (item.id == material.id) {
+ repetition = true
+ return
+ }
}
+ })
+ if (repetition) {
+ uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
+ return
}
+ // let tempMaterial = this.seleMateriaList.find(item => item.locationId == this.location)
+ // debugger
+ // if (tempMaterial) {
+ // /*
+ // tempMaterial.qualityType == material.qualityType
+ // && tempMaterial.procedureId == material.procedureId
+ // &&tempMaterial.batch == material.batch
+ // &&tempMaterial.oldLocationId == material.locationId
+ // && tempMaterial.materialId == material.materialId
+ // */
+ // if (tempMaterial.id == material.id) {
+ // uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
+ // return
+ // }
+ // }
+ // if (tempMaterial && tempMaterial.id == material.id) {
+ // uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
+ // return
+ // }
let materialNum = 0
let num = 0
+ // let selectedM = this.seleMateriaList.find(item => item.id == material.id)
+ // let waitMaterial = this.MateriaList.find(item => item.id === material.id)
this.seleMateriaList.forEach(item => {
if (item.id === material.id) {
materialNum += Number(item.outActnum)
@@ -320,9 +345,11 @@
num = item.outActnum - materialNum
}
})
+
material.outActnum = num
this.seleMateriaList.push({
...material,
+ oldLocationId: material.locationId,
locationId: this.location,
locationName: this.locationName
})
@@ -737,6 +764,7 @@
display: flex;
align-items: center;
margin-top: 15rpx;
+ font-size: 24rpx;
}
.page_yxwl_list_item_num {
--
Gitblit v1.9.3