From 295fcf98fde32ab9af01fe825aa52357b0837064 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 6 Dec 2023 09:19:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/detail/comRequestDetailCard.vue  |  54 +++----
 .../issue/coms/comIssueRequestDetailCard.vue  | 148 ++++++++++++++++++
 pages/issue/request/issueRequestDetail.vue    |   8 +-
 3 files changed, 178 insertions(+), 32 deletions(-)
 create mode 100644 pages/issue/coms/comIssueRequestDetailCard.vue

diff --git a/mycomponents/detail/comRequestDetailCard.vue b/mycomponents/detail/comRequestDetailCard.vue
index 2e1dc2c3..8cb916fa 100644
--- a/mycomponents/detail/comRequestDetailCard.vue
+++ b/mycomponents/detail/comRequestDetailCard.vue
@@ -1,19 +1,28 @@
 <template>
 	<view class="" style="background-color: #fff;">
-		<view class="uni-flex uni-column">
-			<com-issue-request-info :workShopCode="dataContent.workshopCode" :dataContent="requestItem">
-			</com-issue-request-info>
-			<uni-swipe-action ref="swipeAction">
-				<view v-for="(item, index) in dataContent.subList" :key="index">
-					<uni-swipe-action-item @click="swipeClick($event,item)" :right-options="detailOptions">
-						<item-qty :dataContent="item" :isShowStdPack="false">
-						</item-qty>
-						<u-line />
-					</uni-swipe-action-item>
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-compare-qty 
+					:dataContent="dataContent" 
+					:handleQty="Number(dataContent.handleQty)"
+					:isShowStdPack="false">
+					</item-compare-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" :record="item.record" :isShowPack="isShowPack"
+								:isShowBatch="isShowBatch" :isShowFromLocation="isShowLocation"></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<u-line />
 				</view>
-			</uni-swipe-action>
-		</view>
-		<request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
 		<com-message ref="message"></com-message>
 	</view>
 </template>
@@ -23,10 +32,6 @@
 	import recommend from '@/mycomponents/recommend/recommend.vue'
 	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
-	import itemQty from '@/mycomponents/item/itemQty.vue'
-	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
-	import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
-
 	import {
 		getDetailOption,
 		getDetailEditRemoveOption,
@@ -40,9 +45,6 @@
 			recommend,
 			balanceQtyEdit,
 			comMessage,
-			itemQty,
-			comIssueRequestInfo,
-			requestDetailInfoPopup
 		},
 		props: {
 			dataContent: {
@@ -67,9 +69,7 @@
 			},
 		},
 		watch: {
-			dataContent(newVal) {
-				this.requestItem = newVal.subList[0];
-			},
+
 		},
 
 		data() {
@@ -81,7 +81,6 @@
 
 					}
 				},
-				requestItem: {},
 				detailOptions: [],
 				scanOptions: []
 			}
@@ -117,10 +116,9 @@
 			},
 
 			detail(item) {
-				this.$refs.jobDetailPopup.openPopup(item)
-				// this.$emit('openDetail', item);
-				// // this.showItem = item;
-				// // this.$refs.jobDetailPopup.openPopup(item)
+				this.$emit('openDetail', item);
+				// this.showItem = item;
+				// this.$refs.jobDetailPopup.openPopup(item)
 			},
 			remove(item) {
 				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
diff --git a/pages/issue/coms/comIssueRequestDetailCard.vue b/pages/issue/coms/comIssueRequestDetailCard.vue
new file mode 100644
index 00000000..2e1dc2c3
--- /dev/null
+++ b/pages/issue/coms/comIssueRequestDetailCard.vue
@@ -0,0 +1,148 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<view class="uni-flex uni-column">
+			<com-issue-request-info :workShopCode="dataContent.workshopCode" :dataContent="requestItem">
+			</com-issue-request-info>
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in dataContent.subList" :key="index">
+					<uni-swipe-action-item @click="swipeClick($event,item)" :right-options="detailOptions">
+						<item-qty :dataContent="item" :isShowStdPack="false">
+						</item-qty>
+						<u-line />
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+		</view>
+		<request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
+		<com-message ref="message"></com-message>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import requestDetailInfoPopup from '@/pages/issue/coms/requestDetailInfoPopup.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getDetailRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['openDetail'],
+		components: {
+			itemCompareQty,
+			recommend,
+			balanceQtyEdit,
+			comMessage,
+			itemQty,
+			comIssueRequestInfo,
+			requestDetailInfoPopup
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+			dataContent(newVal) {
+				this.requestItem = newVal.subList[0];
+			},
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				requestItem: {},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getDetailEditRemoveOption();
+				// if (this.dataContent.allowModifyQty == 1) {
+				// 	this.scanOptions = getDetailEditRemoveOption();
+				// } else {
+				// 	this.scanOptions = getDetailRemoveOption();
+				// }
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.record.qty);
+			},
+
+			detail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+				// this.$emit('openDetail', item);
+				// // this.showItem = item;
+				// // this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.record = {}
+							item.balance = {}
+							item.inventoryStatus = item.RecommendInventoryStatus
+							// item.record.qty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue/request/issueRequestDetail.vue b/pages/issue/request/issueRequestDetail.vue
index eaf62e57..3c5dc224 100644
--- a/pages/issue/request/issueRequestDetail.vue
+++ b/pages/issue/request/issueRequestDetail.vue
@@ -4,8 +4,8 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list">
 					<view class="">
-						<com-request-detail-card :dataContent="requestContent">
-						</com-request-detail-card>
+						<comIssueRequestDetailCard :dataContent="requestContent">
+						</comIssueRequestDetailCard>
 					</view>
 				</view>
 			</scroll-view>
@@ -29,13 +29,13 @@
 	} from '@/common/detail.js';
 
 
-	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
+	import comIssueRequestDetailCard from "@/pages/issue/coms/comIssueRequestDetailCard.vue"
 
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	
 	export default {
 		components: {
-			comRequestDetailCard,
+			comIssueRequestDetailCard,
 			comMessage,
 		},
 		data() {