From bbc67e3d70e1492dd5c4a2f4664f3d94d9914878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Tue, 5 Nov 2024 19:28:47 +0800
Subject: [PATCH] =?UTF-8?q?mycomponents/receive=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BBVue2=E5=8D=87=E7=BA=A7Vue3=208/2-10/25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/receive/receiveBottom.vue    |  34 ++----
 src/mycomponents/receive/receiveNumber.vue    |  28 ++---
 src/mycomponents/receive/receiveStatus.vue    |  50 +++------
 src/mycomponents/receive/receiveTop.vue       |  40 +++----
 .../receive/recordComDetailCard.vue           | 101 +++++++-----------
 .../receive/recordComMainCard.vue             |  32 ++----
 6 files changed, 95 insertions(+), 190 deletions(-)

diff --git a/src/mycomponents/receive/receiveBottom.vue b/src/mycomponents/receive/receiveBottom.vue
index 5559629b..690e333f 100644
--- a/src/mycomponents/receive/receiveBottom.vue
+++ b/src/mycomponents/receive/receiveBottom.vue
@@ -14,35 +14,17 @@
 	</view>
 </template>
 
-<script>
+<script setup>
 	import {
 		dateFormat
 	} from '@/common/basic.js';
-
-	export default {
-		components: {
-
-		},
-		data() {
-			return {
-
-			};
-		},
-		watch: {},
-
-		props: {
-			dataContent: {
-				type: Object,
-				default: {}
-			}
-		},
-
-		methods: {
-			formatDate: function(val) {
-				return dateFormat(val)
-			}
-		}
-	}
+  const props = defineProps({
+    dataContent: {
+      type: Object,
+      default: {}
+    }
+  })
+  const formatDate = date => dateFormat(date)
 </script>
 
 <style lang="scss">
diff --git a/src/mycomponents/receive/receiveNumber.vue b/src/mycomponents/receive/receiveNumber.vue
index 94a38499..79a7dd43 100644
--- a/src/mycomponents/receive/receiveNumber.vue
+++ b/src/mycomponents/receive/receiveNumber.vue
@@ -5,27 +5,13 @@
 	</view>
 </template>
 
-<script>
-	export default {
-		components: {},
-		data() {
-			return {
-
-			};
-		},
-		watch: {
-
-		},
-
-		props: {
-			number: {
-				type: String,
-				default: ''
-			},
-		},
-
-		methods: {}
-	}
+<script setup>
+const props = defineProps({
+  number: {
+    type: String,
+    default: ''
+  },
+})
 </script>
 
 <style lang="scss">
diff --git a/src/mycomponents/receive/receiveStatus.vue b/src/mycomponents/receive/receiveStatus.vue
index 9694538c..fe7a7cf7 100644
--- a/src/mycomponents/receive/receiveStatus.vue
+++ b/src/mycomponents/receive/receiveStatus.vue
@@ -6,39 +6,23 @@
 	</view>
 </template>
 
-<script>
-	import {
-		getReceiveStateInfo,
-		getJobStateInfo
-	} from '@/common/directory.js';
-
-	export default {
-		components: {
-
-		},
-		data() {
-			return {
-				receiveStatusInfo: {}
-			};
-		},
-		watch: {},
-
-		props: {
-			receiveStatus: {
-				type: String,
-				default: ""
-			}
-		},
-
-		mounted() {},
-
-		methods: {
-			statusStyle(value) {
-				this.receiveStatusInfo = getReceiveStateInfo(value);
-				return getReceiveStateInfo(value).remark
-			}
-		}
-	}
+<script setup>
+import {
+  getReceiveStateInfo,
+} from '@/common/directory.js';
+import { ref } from 'vue'
+const props = defineProps({
+  receiveStatus: {
+    type: String,
+    default: ""
+  }
+})
+const receiveStatusInfo = ref({})
+
+const statusStyle = (value) => {
+  receiveStatusInfo.value = getReceiveStateInfo(value);
+  return getReceiveStateInfo(value).remark
+}
 </script>
 
 
diff --git a/src/mycomponents/receive/receiveTop.vue b/src/mycomponents/receive/receiveTop.vue
index 4fc902fe..78eae379 100644
--- a/src/mycomponents/receive/receiveTop.vue
+++ b/src/mycomponents/receive/receiveTop.vue
@@ -7,34 +7,20 @@
 	</view>
 </template>
 
-<script>
-	import receiveNumber from '@/mycomponents/receive/receiveNumber.vue'
-	import receiveStatus from '@/mycomponents/receive/receiveStatus.vue'
-	export default {
-		components: {
-			receiveNumber,
-			receiveStatus
-		},
-		data() {
-			return {
+<script setup>
+import receiveNumber from '@/mycomponents/receive/receiveNumber.vue'
+import receiveStatus from '@/mycomponents/receive/receiveStatus.vue'
 
-			};
-		},
-		watch: {},
-
-		props: {
-			dataContent: {
-				type: Object,
-				default: {}
-			},
-		},
-
-		methods: {
-			openDetail(item) {
-				this.$emit("openDetail", this.dataContent);
-			},
-		}
-	}
+const props = defineProps({
+  dataContent: {
+    type: Object,
+    default: {}
+  },
+})
+const openDetail = (item)=>{
+  emit("openDetail", dataContent.value);
+}
+const emit = defineEmits(['openDetail'])
 </script>
 
 <style lang="scss">
diff --git a/src/mycomponents/receive/recordComDetailCard.vue b/src/mycomponents/receive/recordComDetailCard.vue
index 0a0fe46e..ada8ad74 100644
--- a/src/mycomponents/receive/recordComDetailCard.vue
+++ b/src/mycomponents/receive/recordComDetailCard.vue
@@ -23,67 +23,48 @@
 	</view>
 </template>
 
-<script>
-	import pack from '@/mycomponents/balance/pack.vue'
-	import location from '@/mycomponents/balance/location.vue'
-	import toLocation from '@/mycomponents/balance/toLocation.vue'
-	import batch from '@/mycomponents/balance/batch.vue'
-	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
-	import level from '@/mycomponents/balance/level.vue'
+<script setup>
+import pack from '@/mycomponents/balance/pack.vue'
+import location from '@/mycomponents/balance/location.vue'
+import toLocation from '@/mycomponents/balance/toLocation.vue'
+import batch from '@/mycomponents/balance/batch.vue'
+import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+import level from '@/mycomponents/balance/level.vue'
 
-	export default {
-		components: {
-			pack,
-			location,
-			toLocation,
-			batch,
-			itemCompareQty,
-			level
-		},
-		data() {
-			return {};
-		},
-
-		props: {
-			dataContent: {
-				type: Object,
-				default: {}
-			},
-			isShowContainer: {
-				type: Boolean,
-				default: true
-			},
-			isShowPack: {
-				type: Boolean,
-				default: true
-			},
-			isShowBatch: {
-				type: Boolean,
-				default: true
-			},
-			isShowFromLocation: {
-				type: Boolean,
-				default: true
-			},
-			isShowToLocation: {
-				type: Boolean,
-				default: true
-			},
-			isShowDeliverType: {
-				type: Boolean,
-				default: false
-			},
-			isShowPackCount: {
-				type: Boolean,
-				default: false
-			}
-		},
-
-
-		methods: {
-
-		}
-	}
+const props = defineProps({
+  dataContent: {
+    type: Object,
+    default: {}
+  },
+  isShowContainer: {
+    type: Boolean,
+    default: true
+  },
+  isShowPack: {
+    type: Boolean,
+    default: true
+  },
+  isShowBatch: {
+    type: Boolean,
+    default: true
+  },
+  isShowFromLocation: {
+    type: Boolean,
+    default: true
+  },
+  isShowToLocation: {
+    type: Boolean,
+    default: true
+  },
+  isShowDeliverType: {
+    type: Boolean,
+    default: false
+  },
+  isShowPackCount: {
+    type: Boolean,
+    default: false
+  }
+})
 </script>
 
 <style lang="scss">
diff --git a/src/mycomponents/receive/recordComMainCard.vue b/src/mycomponents/receive/recordComMainCard.vue
index 34f3c6e0..ae9d070f 100644
--- a/src/mycomponents/receive/recordComMainCard.vue
+++ b/src/mycomponents/receive/recordComMainCard.vue
@@ -10,30 +10,16 @@
 	</view>
 </template>
 
-<script>
-	import receiveTop from '@/mycomponents/receive/receiveTop.vue'
-	import receiveBottom from '@/mycomponents/receive/receiveBottom.vue'
+<script setup>
+import receiveTop from '@/mycomponents/receive/receiveTop.vue'
+import receiveBottom from '@/mycomponents/receive/receiveBottom.vue'
 
-	export default {
-		components: {
-			receiveTop,
-			receiveBottom,
-		},
-		data() {
-			return {};
-		},
-
-		props: {
-			dataContent: {
-				type: Object,
-				default: {}
-			},
-		},
-
-		methods: {
-
-		}
-	}
+const props = defineProps({
+  dataContent: {
+    type: Object,
+    default: {}
+  }
+})
 </script>
 
 <style lang="scss">