From 5bd837cf26998f0132ce30d90074662b225b9207 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 26 Aug 2024 18:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderAllotBlank.vue  | 28 +++++++++----------
 .../CollectOrderAllotCardComponents.vue       |  4 +--
 .../collect/CollectOrderAllotComponents.vue   |  2 +-
 src/views/collect/CollectOrderAllotFront.vue  |  2 +-
 src/views/collect/IoCreateOrder.vue           |  6 ++--
 src/views/collect/IoCreateOrderBlank.vue      |  2 +-
 src/views/collect/PanelOrderDeal.vue          |  2 +-
 src/views/collect/fieldOperation.vue          |  2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/views/collect/CollectOrderAllotBlank.vue b/src/views/collect/CollectOrderAllotBlank.vue
index f504f5b6..57e47b05 100644
--- a/src/views/collect/CollectOrderAllotBlank.vue
+++ b/src/views/collect/CollectOrderAllotBlank.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
 
-    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">
+    <el-row :gutter="0" v-if="isLinkDisabled" style="margin-top: 15px">
       <el-col :span="24" align="right">
         <div class="inv-hos-title">
             <span
@@ -9,9 +9,9 @@
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
 
           <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
-<!--            {{-->
-<!--              this.userInfo.companyName-->
-<!--            }}-->
+            <!--            {{-->
+            <!--              this.userInfo.companyName-->
+            <!--            }}-->
           </span>
           <span
             style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
@@ -23,20 +23,19 @@
     </el-row>
 
 
-
-
     <el-tabs type="border-card" style="margin: 15px">
 
+      <el-tab-pane label="待处理单据">
+        <CollectOrderAllotCardComponents style="margin: -15px"
+                                         :tagStatus="'1'"
+        ></CollectOrderAllotCardComponents>
+      </el-tab-pane>
+
       <el-tab-pane label="未分配工位单据">
         <CollectOrderAllotComponents
           style="margin: -15px"
           :tagStatus="'0'"
-        ></CollectOrderAllotComponents>
-      </el-tab-pane>
-
-      <el-tab-pane label="已分配工位单据">
-        <CollectOrderAllotComponents style="margin: -15px"
-                                     :tagStatus="'1'"
+          :viewType="1"
         ></CollectOrderAllotComponents>
       </el-tab-pane>
 
@@ -48,6 +47,7 @@
 <script>
 
 import CollectOrderAllotComponents from "./CollectOrderAllotComponents.vue";
+import CollectOrderAllotCardComponents from "./CollectOrderAllotCardComponents.vue";
 
 
 /**
@@ -56,7 +56,7 @@ import CollectOrderAllotComponents from "./CollectOrderAllotComponents.vue";
 export default {
   name: "PrescribeTagCode",
   components: {
-    CollectOrderAllotComponents
+    CollectOrderAllotComponents, CollectOrderAllotCardComponents
   },
   data() {
     return {
@@ -70,7 +70,7 @@ export default {
     }
   },
   created() {
-    if (this.$route.query.workplaceId != null){
+    if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
     }
   }
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index 1a2195a3..a284245b 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -470,13 +470,13 @@ export default {
       this.changeViewDisabled = !this.changeViewDisabled
     },
     handleClick(index) {
-      let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + this.list[index].workPlaceCode + "&billNo=" + this.list[index].billNo
+      let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.list[index].workPlaceCode + "&billNo=" + this.list[index].billNo
       // this.$router.push( workplaceId)
       window.open(url, '_blank');
     },
     linkPage(_this, row) {
 
-      let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo
+      let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo
       window.open(url, '_blank');
     },
     //界面配置相关------------
diff --git a/src/views/collect/CollectOrderAllotComponents.vue b/src/views/collect/CollectOrderAllotComponents.vue
index 1857bed1..c08b6657 100644
--- a/src/views/collect/CollectOrderAllotComponents.vue
+++ b/src/views/collect/CollectOrderAllotComponents.vue
@@ -347,7 +347,7 @@ export default {
   methods: {
     linkPage(_this, row) {
 
-      let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + row.workPlaceCode+"&billNo="+row.billNo
+      let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode+"&billNo="+row.billNo
       window.open(url, '_blank');
     },
     //界面配置相关------------
diff --git a/src/views/collect/CollectOrderAllotFront.vue b/src/views/collect/CollectOrderAllotFront.vue
index 8ac17dc3..167dccfc 100644
--- a/src/views/collect/CollectOrderAllotFront.vue
+++ b/src/views/collect/CollectOrderAllotFront.vue
@@ -106,7 +106,7 @@ export default {
   },
   methods: {
     handleClick(index) {
-      let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId
+      let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId
       // this.$router.push( workplaceId)
       window.open(url, '_blank');
     },
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 466893a6..d21949b8 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -16,9 +16,9 @@
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
 
               <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
-<!--                {{-->
-<!--                  this.userInfo.companyName-->
-<!--                }}-->
+                <!--                {{-->
+                <!--                  this.userInfo.companyName-->
+                <!--                }}-->
               </span>
               <span
                 style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue
index d21949b8..92b6ec19 100644
--- a/src/views/collect/IoCreateOrderBlank.vue
+++ b/src/views/collect/IoCreateOrderBlank.vue
@@ -610,7 +610,7 @@ export default {
             this.orderFormData.invWarehouseCode == null
           ) {
             //this.orderFormData.invCode = this.curInvOptions[0].code;
-            this.getBusTypeByInv();
+            // this.getBusTypeByInv();
             this.findCurSpaceList(this.orderFormData.invCode);
             this.findCurWorkPlaces();
           }
diff --git a/src/views/collect/PanelOrderDeal.vue b/src/views/collect/PanelOrderDeal.vue
index 3808dbb4..e8756cc1 100644
--- a/src/views/collect/PanelOrderDeal.vue
+++ b/src/views/collect/PanelOrderDeal.vue
@@ -334,7 +334,7 @@ export default {
       // clearInterval(this.timer)
     },
     linkPage(_this, row) {
-      let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + row.workPlaceCode
+      let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode
       window.open(url, '_blank');
     },
     //界面配置相关------------
diff --git a/src/views/collect/fieldOperation.vue b/src/views/collect/fieldOperation.vue
index ae8ecedb..b96ac383 100644
--- a/src/views/collect/fieldOperation.vue
+++ b/src/views/collect/fieldOperation.vue
@@ -89,7 +89,7 @@ export default {
       });
     },
     handleClick(index) {
-      let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId
+      let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId
       // this.$router.push( workplaceId)
       window.open(url, '_blank');
     },