From 1996e3def997efb5b9d63550ef501cf33b399bde Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 27 Aug 2024 12:14:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9D=A2=E5=8C=85=E5=B1=91+tabs?=
 =?UTF-8?q?=E9=A1=B5=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderAllot.vue       | 12 +++
 src/views/collect/CollectOrderAllotBlank.vue  | 39 ++------
 .../CollectOrderAllotCardComponents.vue       | 14 ++-
 .../collect/CollectOrderAllotComponents.vue   | 11 ++-
 src/views/collect/CollectOrderEnd.vue         | 15 +---
 src/views/collect/CollectOrderEndBlank.vue    | 39 ++------
 src/views/collect/CollectOrderTabs.vue        | 88 +++++++++++++------
 src/views/collect/DealOrder.vue               | 15 ----
 src/views/collect/DealOrderBlank.vue          | 17 +---
 src/views/collect/IoCreateOrder.vue           | 40 ++++-----
 src/views/collect/IoCreateOrderBlank.vue      | 40 ++++-----
 src/views/collect/IoSplitFifoCodePanel.vue    |  8 +-
 src/views/collect/PanelOrderEndSearch.vue     | 10 ++-
 src/views/collect/ioSplitFifoCode.vue         | 42 +++++----
 src/views/collect/ioSplitFifoCodeBlank.vue    | 42 +++++----
 15 files changed, 209 insertions(+), 223 deletions(-)

diff --git a/src/views/collect/CollectOrderAllot.vue b/src/views/collect/CollectOrderAllot.vue
index 17099ca7..86965771 100644
--- a/src/views/collect/CollectOrderAllot.vue
+++ b/src/views/collect/CollectOrderAllot.vue
@@ -7,6 +7,7 @@
       <el-tab-pane label="待处理单据">
         <CollectOrderAllotCardComponents style="margin: -15px"
                                          :tagStatus="'1'"
+                                         :workPlaceCode="workPlaceCode"
         ></CollectOrderAllotCardComponents>
       </el-tab-pane>
 
@@ -15,6 +16,7 @@
           style="margin: -15px"
           :tagStatus="'0'"
           :viewType="1"
+          :workPlaceCode="workPlaceCode"
         ></CollectOrderAllotComponents>
       </el-tab-pane>
 
@@ -38,6 +40,16 @@ export default {
   name: "PrescribeTagCode",
   components: {
     CollectOrderAllotComponents,CollectOrderAllotCardComponents
+  },
+  data() {
+    return {
+      workPlaceCode: null,
+    }
+  },
+  created() {
+    if (this.$route.query.workplaceId != null){
+      this.workPlaceCode = Number(this.$route.query.workplaceId);
+    }
   }
 }
 </script>
diff --git a/src/views/collect/CollectOrderAllotBlank.vue b/src/views/collect/CollectOrderAllotBlank.vue
index 57e47b05..86965771 100644
--- a/src/views/collect/CollectOrderAllotBlank.vue
+++ b/src/views/collect/CollectOrderAllotBlank.vue
@@ -1,33 +1,13 @@
 <template>
   <div>
 
-    <el-row :gutter="0" v-if="isLinkDisabled" style="margin-top: 15px">
-      <el-col :span="24" align="right">
-        <div class="inv-hos-title">
-            <span
-              style="margin: 10px;color: #2d8cf0;font-size: 14px;"
-            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
-            <!--            {{-->
-            <!--              this.userInfo.companyName-->
-            <!--            }}-->
-          </span>
-          <span
-            style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-          >({{
-              this.userInfo.userName
-            }})</span>
-        </div>
-      </el-col>
-    </el-row>
-
 
     <el-tabs type="border-card" style="margin: 15px">
 
       <el-tab-pane label="待处理单据">
         <CollectOrderAllotCardComponents style="margin: -15px"
                                          :tagStatus="'1'"
+                                         :workPlaceCode="workPlaceCode"
         ></CollectOrderAllotCardComponents>
       </el-tab-pane>
 
@@ -36,9 +16,12 @@
           style="margin: -15px"
           :tagStatus="'0'"
           :viewType="1"
+          :workPlaceCode="workPlaceCode"
         ></CollectOrderAllotComponents>
       </el-tab-pane>
 
+
+
     </el-tabs>
 
   </div>
@@ -56,22 +39,16 @@ import CollectOrderAllotCardComponents from "./CollectOrderAllotCardComponents.v
 export default {
   name: "PrescribeTagCode",
   components: {
-    CollectOrderAllotComponents, CollectOrderAllotCardComponents
+    CollectOrderAllotComponents,CollectOrderAllotCardComponents
   },
   data() {
     return {
-      isLinkDisabled: false,
-      userInfo: {
-        inv: this.$store.getters.locInvName,
-        deptName: this.$store.getters.locDeptName,
-        userName: this.$store.getters.name,
-        companyName: this.$store.getters.companyName,
-      },
+      workPlaceCode: null,
     }
   },
   created() {
-    if (this.$route.query.workplaceId != null) {
-      this.isLinkDisabled = true
+    if (this.$route.query.workplaceId != null){
+      this.workPlaceCode = Number(this.$route.query.workplaceId);
     }
   }
 }
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index a284245b..07faa9b2 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -215,7 +215,7 @@
 
 
     <el-card v-if="changeViewDisabled">
-      <div>
+      <div style="min-height: 400px;">
         <!-- 分割线 -->
         <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" :inline="true"
                  style="margin-top: 15px">
@@ -389,6 +389,11 @@ export default {
       type: Number,
       required: true
     },
+    workPlaceCode: {
+      type: String,
+      default: null,
+      required: true
+    },
 
   },
   data() {
@@ -423,6 +428,7 @@ export default {
       showSearch: true,
       filterQuery: {
         billNo: null,
+        workPlaceCode: null,
         tagStatus: null,
         page: 1,
         limit: 12,
@@ -600,7 +606,7 @@ export default {
 
     findWorkPlace(_this, val) {
       let query = {
-        chargeUser: _this.$store.getters.adminId,
+        chargeUser: _this.$store.getters.userId,
         key: val,
         page: 1,
         limit: 10,
@@ -624,6 +630,7 @@ export default {
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
     }
+    this.findWorkPlace(this,"");
     getHead("prescribeAllot", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
@@ -631,10 +638,9 @@ export default {
       this.queryList = re.data.queryList;
       this.fromList = re.data.fromList;
       this.getList();
-      this.findWorkPlace(this,"");
     });
     this.filterQuery.tagStatus = this.tagStatus
-
+    this.filterQuery.workPlaceCode = this.workPlaceCode +''
   }
 
 }
diff --git a/src/views/collect/CollectOrderAllotComponents.vue b/src/views/collect/CollectOrderAllotComponents.vue
index c08b6657..cfd8e268 100644
--- a/src/views/collect/CollectOrderAllotComponents.vue
+++ b/src/views/collect/CollectOrderAllotComponents.vue
@@ -269,7 +269,11 @@ export default {
       type: Number,
       required: true
     },
-
+    workPlaceCode: {
+      type: String,
+      default: null,
+      required: true
+    },
   },
   data() {
     return {
@@ -302,6 +306,7 @@ export default {
       showSearch: true,
       filterQuery: {
         billNo: null,
+        workPlaceCode: null,
         tagStatus: null,
         page: 1,
         limit: 10,
@@ -466,7 +471,7 @@ export default {
 
     findWorkPlace(_this, val) {
       let query = {
-        invCode: _this.$store.getters.locInvCode,
+        chargeUser: _this.$store.getters.userId,
         key: val,
         page: 1,
         limit: 10,
@@ -507,6 +512,7 @@ export default {
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
     }
+    this.findWorkPlace(this,"");
     getHead("prescribeAllot", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
@@ -516,6 +522,7 @@ export default {
       this.getList();
     });
     this.filterQuery.tagStatus = this.tagStatus
+    this.filterQuery.workPlaceCode = this.workPlaceCode +''
 
   }
 
diff --git a/src/views/collect/CollectOrderEnd.vue b/src/views/collect/CollectOrderEnd.vue
index 6d0fb022..46643b92 100644
--- a/src/views/collect/CollectOrderEnd.vue
+++ b/src/views/collect/CollectOrderEnd.vue
@@ -6,20 +6,7 @@
       :RowType="type"
 
     ></prescribePanel>
-<!--    <el-tabs type="border-card" style="margin: 15px">-->
 
-    <!--      <el-tab-pane label="已完成赋码单据">-->
-    <!--        <prescribePanel-->
-    <!--          style="margin: -15px"-->
-    <!--        ></prescribePanel>-->
-    <!--      </el-tab-pane>-->
-
-    <!--      <el-tab-pane label="扫码查询">-->
-    <!--        <codePanel style="margin: -15px"-->
-    <!--        ></codePanel>-->
-    <!--      </el-tab-pane>-->
-
-    <!--    </el-tabs>-->
 
 
   </div>
@@ -38,7 +25,7 @@ export default {
   components: {
     prescribePanel, codePanel
   },
-  data(){
+  data() {
     return {
       type: 1
     }
diff --git a/src/views/collect/CollectOrderEndBlank.vue b/src/views/collect/CollectOrderEndBlank.vue
index 46e02f90..7c5e52ea 100644
--- a/src/views/collect/CollectOrderEndBlank.vue
+++ b/src/views/collect/CollectOrderEndBlank.vue
@@ -1,41 +1,18 @@
 <template>
   <div>
 
-    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">
-      <el-col :span="24" align="right">
-        <div class="inv-hos-title">
-            <span
-              style="margin: 10px;color: #2d8cf0;font-size: 14px;"
-            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
-<!--            {{-->
-<!--              this.userInfo.companyName-->
-<!--            }}-->
-          </span>
-          <span
-            style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-          >({{
-              this.userInfo.userName
-            }})</span>
-        </div>
-      </el-col>
-    </el-row>
-
-
 
     <el-tabs type="border-card" style="margin: 15px">
 
       <el-tab-pane label="已完成单据">
         <prescribePanel
           style="margin: -15px"
+          :RowType="type"
+          :workPlaceCode="workPlaceCode"
         ></prescribePanel>
       </el-tab-pane>
 
-<!--      <el-tab-pane label="扫码查询">-->
-<!--        <codePanel style="margin: -15px"-->
-<!--        ></codePanel>-->
-<!--      </el-tab-pane>-->
+
 
     </el-tabs>
 
@@ -59,18 +36,12 @@ export default {
   data() {
     return {
       type: 1,
-      isLinkDisabled: false,
-      userInfo: {
-        inv: this.$store.getters.locInvName,
-        deptName: this.$store.getters.locDeptName,
-        userName: this.$store.getters.name,
-        companyName: this.$store.getters.companyName,
-      },
+      workPlaceCode: null,
     }
   },
   created() {
     if (this.$route.query.workplaceId != null){
-      this.isLinkDisabled = true
+      this.workPlaceCode = Number(this.$route.query.workplaceId);
     }
   }
 }
diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index a9e0a4c4..39582ca6 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -1,11 +1,34 @@
 <template>
+<div>
+  <el-row :gutter="0" v-if="isLinkDisabled" style="margin-top: 15px">
+    <el-col :span="24" align="right">
+      <div class="inv-hos-title">
+            <span
+              style="margin: 10px;color: #2d8cf0;font-size: 14px;"
+            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
+
+        <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
+          <!--            {{-->
+          <!--              this.userInfo.companyName-->
+          <!--            }}-->
+          </span>
+        <span
+          style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
+        >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
+            this.userInfo.userName
+          }})</span>
+      </div>
+    </el-col>
+  </el-row>
+
   <el-row class="tac">
     <el-col :span="2">
       <!--      <h5>默认颜色</h5>-->
       <el-menu
         :default-active="menuActive"
         class="el-menu-vertical-demo"
-        @open="handleOpen">
+        @open="handleOpen"
+      >
         <el-menu-item :index=0 @click="clickMenuItem(0)">
           <i class="el-icon-menu"></i>
           <span slot="title">处理单据</span>
@@ -86,17 +109,16 @@
     </el-col>
   </el-row>
 
-
+</div>
 </template>
 
 <script>
-import DealOrderBlank from "@/views/collect/DealOrderBlank.vue";
-import CollectOrderAllotBlank from "@/views/collect/CollectOrderAllotBlank.vue";
-import CollectOrderEndBlank from "@/views/collect/CollectOrderEndBlank.vue";
-import IoCreateOrderBlankReturn from "@/views/collect/IoCreateOrderBlank.vue";
-import IoCreateOrderBlankOut from "@/views/collect/IoCreateOrderBlank.vue";
-import ioSplitFifoCodeBlank from "@/views/collect/ioSplitFifoCodeBlank.vue";
-
+import DealOrderBlank from '@/views/collect/DealOrderBlank.vue'
+import CollectOrderAllotBlank from '@/views/collect/CollectOrderAllotBlank.vue'
+import CollectOrderEndBlank from '@/views/collect/CollectOrderEndBlank.vue'
+import IoCreateOrderBlankReturn from '@/views/collect/IoCreateOrderBlank.vue'
+import IoCreateOrderBlankOut from '@/views/collect/IoCreateOrderBlank.vue'
+import ioSplitFifoCodeBlank from '@/views/collect/ioSplitFifoCodeBlank.vue'
 
 export default {
   components: {
@@ -110,6 +132,13 @@ export default {
   name: 'CollectOrderTabs',
   data() {
     return {
+      isLinkDisabled: false,
+      userInfo: {
+        inv: this.$store.getters.locInvName,
+        deptName: this.$store.getters.locDeptName,
+        userName: this.$store.getters.name,
+        companyName: this.$store.getters.companyName
+      },
       tabPosition: 'left',
       editableTabsValue: 'DealOrderBlank',
       componentTables: [
@@ -176,7 +205,7 @@ export default {
         componentProps: {
           title: '这是单据的标题'
         }
-      },
+      }
       ],
       tabIndex: 0,
       menuActive: 0
@@ -184,20 +213,20 @@ export default {
   },
   methods: {
     upodateMenuActive(tab, event) {
-      const foundTab = this.findTabByName(tab.name);
+      const foundTab = this.findTabByName(tab.name)
       if (foundTab) {
         // 如果找到了，执行一些操作
-        this.menuActive = foundTab.number;
+        this.menuActive = foundTab.number
       }
     },
     clickMenuItem(val) {
       //分两种 一种已存在 一种未存在
       let item = this.componentTables[(val)]
 
-      const foundTab = this.findTabByName(item.name);
+      const foundTab = this.findTabByName(item.name)
       if (foundTab) {
         // 如果找到了，执行一些操作
-        this.editableTabsValue = foundTab.name;
+        this.editableTabsValue = foundTab.name
       } else {
         // 如果没有找到，执行其他操作
         this.addTab(item)
@@ -206,33 +235,38 @@ export default {
     },
     findTabByName(name) {
       // 使用find方法找到ID等于tabId的对象
-      const tab = this.editableTabs.find(tab => tab.name === name);
+      const tab = this.editableTabs.find(tab => tab.name === name)
       // 如果找到了，返回该对象；否则返回undefined
-      return tab;
+      return tab
     },
     addTab(item) {
-      ++this.tabIndex;
-      this.editableTabs.push(item);
-      this.editableTabsValue = item.name;
+      ++this.tabIndex
+      this.editableTabs.push(item)
+      this.editableTabsValue = item.name
     },
     removeTab(targetName) {
-      let tabs = this.editableTabs;
-      let activeName = this.editableTabsValue;
+      let tabs = this.editableTabs
+      let activeName = this.editableTabsValue
 
       if (activeName === targetName) {
         tabs.forEach((tab, index) => {
           if (tab.name === targetName) {
-            let nextTab = tabs[index + 1] || tabs[index - 1];
+            let nextTab = tabs[index + 1] || tabs[index - 1]
             if (nextTab) {
-              activeName = nextTab.name;
-              this.menuActive = nextTab.number;
+              activeName = nextTab.name
+              this.menuActive = nextTab.number
             }
           }
-        });
+        })
       }
 
-      this.editableTabsValue = activeName;
-      this.editableTabs = tabs.filter(tab => tab.name !== targetName);
+      this.editableTabsValue = activeName
+      this.editableTabs = tabs.filter(tab => tab.name !== targetName)
+    }
+  },
+  created() {
+    if (this.$route.query.workplaceId != null) {
+      this.isLinkDisabled = true
     }
   }
 }
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 7ce89709..27a5745d 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -3,21 +3,6 @@
     <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px">
       <el-card>
 
-        <el-row :gutter="0" v-if="isLinkDisabled">
-          <el-col :span="24" align="right">
-            <div class="inv-hos-title">
-            <span
-              style="margin: 10px;color: #2d8cf0;font-size: 14px;"
-            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-              <span
-                style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-              >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
-                  this.userInfo.userName
-                }})</span>
-            </div>
-          </el-col>
-        </el-row>
-
         <!--  <el-alert-->
         <!--  style="margin-top: 15px"-->
         <!--  :title="msgTip"-->
diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index 7ce89709..fcf5f839 100644
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@@ -3,21 +3,6 @@
     <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px">
       <el-card>
 
-        <el-row :gutter="0" v-if="isLinkDisabled">
-          <el-col :span="24" align="right">
-            <div class="inv-hos-title">
-            <span
-              style="margin: 10px;color: #2d8cf0;font-size: 14px;"
-            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-              <span
-                style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-              >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
-                  this.userInfo.userName
-                }})</span>
-            </div>
-          </el-col>
-        </el-row>
-
         <!--  <el-alert-->
         <!--  style="margin-top: 15px"-->
         <!--  :title="msgTip"-->
@@ -285,7 +270,7 @@
               <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
               >
                 <!-- 假设这里有一些信息内容 -->
-                <p style="font-size: 14px;background-color: #e1f3fb"  @click="selectBusType(info.documentTypeCode)">{{ info.remark }}</p>
+                <p style="font-size: 14px;background-color: #e1f3fb"  @click="selectBusType(info.documentTypeCode)">{{ info.documentTypeCode }}</p>
                 <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
                            @click="selectBusType(info.documentTypeCode)">开始作业
                 </el-button>
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index d00b12f0..72bdc26a 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -8,26 +8,26 @@
     >
       <el-card style="margin: 5px;">
 
-        <el-row :gutter="0" v-if="isLinkDisabled">
-          <el-col :span="24" align="right">
-            <div class="inv-hos-title">
-            <span
-              style="margin: 10px;color: #2d8cf0;font-size: 14px;"
-            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-
-              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
-                <!--                {{-->
-                <!--                  this.userInfo.companyName-->
-                <!--                }}-->
-              </span>
-              <span
-                style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-              >({{
-                  this.userInfo.userName
-                }})</span>
-            </div>
-          </el-col>
-        </el-row>
+<!--        <el-row :gutter="0" v-if="isLinkDisabled">-->
+<!--          <el-col :span="24" align="right">-->
+<!--            <div class="inv-hos-title">-->
+<!--            <span-->
+<!--              style="margin: 10px;color: #2d8cf0;font-size: 14px;"-->
+<!--            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>-->
+
+<!--              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp-->
+<!--                &lt;!&ndash;                {{&ndash;&gt;-->
+<!--                &lt;!&ndash;                  this.userInfo.companyName&ndash;&gt;-->
+<!--                &lt;!&ndash;                }}&ndash;&gt;-->
+<!--              </span>-->
+<!--              <span-->
+<!--                style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"-->
+<!--              >({{-->
+<!--                  this.userInfo.userName-->
+<!--                }})</span>-->
+<!--            </div>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
 
         <el-alert
           style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue
index d00b12f0..72bdc26a 100644
--- a/src/views/collect/IoCreateOrderBlank.vue
+++ b/src/views/collect/IoCreateOrderBlank.vue
@@ -8,26 +8,26 @@
     >
       <el-card style="margin: 5px;">
 
-        <el-row :gutter="0" v-if="isLinkDisabled">
-          <el-col :span="24" align="right">
-            <div class="inv-hos-title">
-            <span
-              style="margin: 10px;color: #2d8cf0;font-size: 14px;"
-            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-
-              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
-                <!--                {{-->
-                <!--                  this.userInfo.companyName-->
-                <!--                }}-->
-              </span>
-              <span
-                style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-              >({{
-                  this.userInfo.userName
-                }})</span>
-            </div>
-          </el-col>
-        </el-row>
+<!--        <el-row :gutter="0" v-if="isLinkDisabled">-->
+<!--          <el-col :span="24" align="right">-->
+<!--            <div class="inv-hos-title">-->
+<!--            <span-->
+<!--              style="margin: 10px;color: #2d8cf0;font-size: 14px;"-->
+<!--            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>-->
+
+<!--              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp-->
+<!--                &lt;!&ndash;                {{&ndash;&gt;-->
+<!--                &lt;!&ndash;                  this.userInfo.companyName&ndash;&gt;-->
+<!--                &lt;!&ndash;                }}&ndash;&gt;-->
+<!--              </span>-->
+<!--              <span-->
+<!--                style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"-->
+<!--              >({{-->
+<!--                  this.userInfo.userName-->
+<!--                }})</span>-->
+<!--            </div>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
 
         <el-alert
           style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue
index 6cb5dbd2..b7c57ea7 100644
--- a/src/views/collect/IoSplitFifoCodePanel.vue
+++ b/src/views/collect/IoSplitFifoCodePanel.vue
@@ -449,6 +449,11 @@ export default {
       default: 1,
       required: true
     },
+    workPlaceCode: {
+      type: Number,
+      default: null,
+      required: true
+    },
   },
   data() {
     return {
@@ -475,6 +480,7 @@ export default {
       showSearch: true,
       filterQuery: {
         fifoSplit: null,
+        workPlaceCode: null,
         code: null,
         billNo: null,
         page: 1,
@@ -643,7 +649,7 @@ export default {
       this.queryList4 = re.data.queryList;
       this.fromList4 = re.data.fromList;
     });
-
+    this.filterQuery.workPlaceCode = this.workPlaceCode
   }
 
 }
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index c1839b36..721bb85d 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -263,6 +263,11 @@ export default {
       default: null,
       required: false
     },
+    workPlaceCode: {
+      type: String,
+      default: null,
+      required: true
+    },
   },
   data() {
     return {
@@ -286,6 +291,7 @@ export default {
       filterQuery: {
         tagStatus: 3,
         billNo: null,
+        workPlaceCode: null,
         page: 1,
         limit: 10,
       },
@@ -403,6 +409,8 @@ export default {
 
   },
   created() {
+    this.findWorkPlace(this,"");
+    this.filterQuery.workPlaceCode = this.workPlaceCode +''
     getHead("prescribePanel", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
@@ -410,7 +418,7 @@ export default {
       this.queryList = re.data.queryList;
       this.fromList = re.data.fromList;
       this.getList();
-      this.findWorkPlace(this,"");
+
     });
 
   }
diff --git a/src/views/collect/ioSplitFifoCode.vue b/src/views/collect/ioSplitFifoCode.vue
index 53c8cac7..797fe139 100644
--- a/src/views/collect/ioSplitFifoCode.vue
+++ b/src/views/collect/ioSplitFifoCode.vue
@@ -2,26 +2,26 @@
   <div>
 
 
-    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">
-      <el-col :span="24" align="right">
-        <div class="inv-hos-title">
-            <span
-              style="margin: 10px;color: #2d8cf0;font-size: 14px;"
-            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
+<!--    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">-->
+<!--      <el-col :span="24" align="right">-->
+<!--        <div class="inv-hos-title">-->
+<!--            <span-->
+<!--              style="margin: 10px;color: #2d8cf0;font-size: 14px;"-->
+<!--            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>-->
 
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
-<!--            {{-->
-<!--              this.userInfo.companyName-->
-<!--            }}-->
-          </span>
-          <span
-            style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-          >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
-              this.userInfo.userName
-            }})</span>
-        </div>
-      </el-col>
-    </el-row>
+<!--          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp-->
+<!--&lt;!&ndash;            {{&ndash;&gt;-->
+<!--&lt;!&ndash;              this.userInfo.companyName&ndash;&gt;-->
+<!--&lt;!&ndash;            }}&ndash;&gt;-->
+<!--          </span>-->
+<!--          <span-->
+<!--            style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"-->
+<!--          >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{-->
+<!--              this.userInfo.userName-->
+<!--            }})</span>-->
+<!--        </div>-->
+<!--      </el-col>-->
+<!--    </el-row>-->
 
     <el-tabs type="border-card" style="margin: 15px">
 
@@ -29,6 +29,7 @@
         <fifoPanel
           style="margin: -15px"
           :panelType="1"
+          :workPlaceCode="workPlaceCode"
         ></fifoPanel>
       </el-tab-pane>
 
@@ -36,6 +37,7 @@
         <fifoPanel
           style="margin: -15px"
           :panelType="2"
+          :workPlaceCode="workPlaceCode"
         ></fifoPanel>
       </el-tab-pane>
 
@@ -57,6 +59,7 @@ export default {
   data() {
     return {
       isLinkDisabled: false,
+      workPlaceCode: null,
       userInfo: {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
@@ -68,6 +71,7 @@ export default {
   created() {
     if (this.$route.query.workplaceId != null){
       this.isLinkDisabled = true
+      this.workPlaceCode = Number(this.$route.query.workplaceId);
     }
   }
 }
diff --git a/src/views/collect/ioSplitFifoCodeBlank.vue b/src/views/collect/ioSplitFifoCodeBlank.vue
index 154cf19c..ddf6fa96 100644
--- a/src/views/collect/ioSplitFifoCodeBlank.vue
+++ b/src/views/collect/ioSplitFifoCodeBlank.vue
@@ -2,26 +2,26 @@
   <div>
 
 
-    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">
-      <el-col :span="24" align="right">
-        <div class="inv-hos-title">
-            <span
-              style="margin: 10px;color: #2d8cf0;font-size: 14px;"
-            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
+    <!--    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">-->
+    <!--      <el-col :span="24" align="right">-->
+    <!--        <div class="inv-hos-title">-->
+    <!--            <span-->
+    <!--              style="margin: 10px;color: #2d8cf0;font-size: 14px;"-->
+    <!--            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>-->
 
-<!--          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp-->
-            <!--            {{-->
-            <!--              this.userInfo.companyName-->
-            <!--            }}-->
-<!--          </span>-->
-          <span
-            style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-          >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
-              this.userInfo.userName
-            }})</span>
-        </div>
-      </el-col>
-    </el-row>
+    <!--          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp-->
+    <!--&lt;!&ndash;            {{&ndash;&gt;-->
+  <!--&lt;!&ndash;              this.userInfo.companyName&ndash;&gt;-->
+  <!--&lt;!&ndash;            }}&ndash;&gt;-->
+    <!--          </span>-->
+    <!--          <span-->
+    <!--            style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"-->
+    <!--          >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{-->
+    <!--              this.userInfo.userName-->
+    <!--            }})</span>-->
+    <!--        </div>-->
+    <!--      </el-col>-->
+    <!--    </el-row>-->
 
     <el-tabs type="border-card" style="margin: 15px">
 
@@ -29,6 +29,7 @@
         <fifoPanel
           style="margin: -15px"
           :panelType="1"
+          :workPlaceCode="workPlaceCode"
         ></fifoPanel>
       </el-tab-pane>
 
@@ -36,6 +37,7 @@
         <fifoPanel
           style="margin: -15px"
           :panelType="2"
+          :workPlaceCode="workPlaceCode"
         ></fifoPanel>
       </el-tab-pane>
 
@@ -57,6 +59,7 @@ export default {
   data() {
     return {
       isLinkDisabled: false,
+      workPlaceCode: null,
       userInfo: {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
@@ -68,6 +71,7 @@ export default {
   created() {
     if (this.$route.query.workplaceId != null){
       this.isLinkDisabled = true
+      this.workPlaceCode = Number(this.$route.query.workplaceId);
     }
   }
 }