From 60083984f9d337040f087fde93cd56616e1bbf3d Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 29 Aug 2024 18:41:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderTabs.vue | 16 +++++++-
 src/views/collect/IoDestroyOrder.vue   | 54 ++++++++++++++++++++++++--
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index b2f464fb..2b58241a 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -59,6 +59,10 @@
           <i class="el-icon-s-claim"></i>
           <span slot="title">单据上传</span>
         </el-menu-item>
+        <el-menu-item :index=7 @click="clickMenuItem(7)">
+          <i class="el-icon-s-claim"></i>
+          <span slot="title">损耗出库</span>
+        </el-menu-item>
       </el-menu>
     </el-col>
 
@@ -91,6 +95,7 @@ import IoCreateOrderReturn from '@/views/collect/IoCreateOrder.vue'
 import IoCreateOrderOut from '@/views/collect/IoCreateOrder.vue'
 import ioSplitFifoCode from '@/views/collect/ioSplitFifoCode.vue'
 import CollectOrderUpload from '@/views/collect/CollectOrderUpload.vue'
+import IoDestroyOrder from '@/views/collect/IoDestroyOrder.vue'
 
 export default {
   components: {
@@ -100,7 +105,8 @@ export default {
     ioSplitFifoCode,
     CollectOrderAllot,
     CollectOrderEnd,
-    CollectOrderUpload
+    CollectOrderUpload,
+    IoDestroyOrder
   },
   name: 'CollectOrderTabs',
   data() {
@@ -178,6 +184,14 @@ export default {
           component: CollectOrderUpload,
           // 假设你需要传递的参数
           componentProps: {}
+        },
+        {
+          number: 7,
+          title: '损耗出库',
+          name: 'IoDestroyOrder',
+          component: IoDestroyOrder,
+          // 假设你需要传递的参数
+          componentProps: {}
         }],
       editableTabs: [{
         number: 0,
diff --git a/src/views/collect/IoDestroyOrder.vue b/src/views/collect/IoDestroyOrder.vue
index 5f0513b5..3190b10b 100644
--- a/src/views/collect/IoDestroyOrder.vue
+++ b/src/views/collect/IoDestroyOrder.vue
@@ -343,7 +343,7 @@ export default {
     findCurWorkPlaces(val) {
       let query = {
         workplaceCode: val,
-        userId: this.userInfo.userId,
+        userId: this.$store.getters.userId,
         page: 1,
         limit: 100,
       }
@@ -423,10 +423,59 @@ export default {
       });
     },
 
+    getDMHotskeyValue(str) {
+      if (str.includes("DMHotskey")) {
+        try {
+          const jsonObj = JSON.parse(str);
+          if (jsonObj.hasOwnProperty("DMHotskey")) {
+            const dmhotskey = jsonObj.DMHotskey;
+            if (dmhotskey.hasOwnProperty("workPlace")) {
+              this.scanCode = ""
+              this.orderFormData.workPlaceCode = dmhotskey.workPlace
+              return true
+            } else if (dmhotskey.hasOwnProperty("fifoSplit")) {
+              this.scanCode = ""
+              this.orderFormData.fifoSplit = dmhotskey.fifoSplit;
+              return true;
+
+            }
+          }
+        } catch (error) {
+          console.log("字符串不是有效的 JSON 格式");
+        }
+      }
+      return false;
+    },
+    printCodeResult(data, isSuccess) {
+      const resultParts = ["扫码解析结果：" + data.code];
 
+      if (data.udi) {
+        resultParts.push("层级标识: " + data.udi);
+      }
+      if (data.batchNo) {
+        resultParts.push("批次号: " + data.batchNo);
+      }
+      if (data.produceDate) {
+        resultParts.push("生产日期: " + data.produceDate);
+      }
+      if (data.expireDate) {
+        resultParts.push("失效日期: " + data.expireDate);
+      }
+      if (data.serialNo) {
+        resultParts.push("序列号: " + data.serialNo);
+      }
+      this.result = resultParts.join(" , ");
+    },
     getInputFocus(event) {
       event.currentTarget.select();
     },
+    selectProductFunction() {
+      if (this.$isBlank(this.orderFormData.workPlaceCode)) {
+        this.$message.error("作业工位不能为空！")
+        return;
+      }
+      this.selectInvProductVisible = true;
+    },
   },
   filters: {},
   mounted() {
@@ -457,7 +506,7 @@ export default {
     this.$refs.inputRef.focus();
   },
   created() {
-
+    this.findCurWorkPlaces();
     if (this.$route.query.billNo != null) {
       this.orderFormData.billNo = this.$route.query.billNo
     }
@@ -465,7 +514,6 @@ export default {
       this.corpOrderIdDisabled = true
       this.workplaceId = Number(this.$route.query.workplaceId);
       this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId);
-      this.findCurWorkPlaces(this.formData.workPlaceCode);
     }
 
   },