diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index 020e080a..ad974f86 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -271,7 +271,7 @@
         <el-divider style="margin: 15px"></el-divider>
 
         <el-row :gutter="24">
-          <el-col v-for="(info, index)  in list" :key="index" :xs="12" :sm="8" :md="8" :lg="6">
+          <el-col v-for="(info, index)  in list" :key="index" :xs="12" :sm="8" :md="8" :lg="8">
             <el-card :body-style="{margin:'20px'}"
                      style="margin:10px 10px 5px 5px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;"
             >
@@ -341,7 +341,7 @@
           :total="total"
           :limit.sync="filterQuery.limit"
           :page.sync="filterQuery.page"
-          :page-sizes="[12, 24, 48]"
+          :page-sizes="[9, 18, 36]"
           @pagination="handleCurrentChange"
         ></pagination>
       </div>
diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index 6d0302b4..61825ca6 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -6,54 +6,19 @@
       </el-col>
 
       <div>
-        <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" style="margin-top: 5px">
-          <el-col :span="6">
-            <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">
-              <el-select
-                v-model="formData.workPlaceCode"
-                placeholder="当前工位"
-                style="width: 90%"
-                disabled
-              >
-                <el-option
-                  v-for="item in curWorkPlaces"
-                  :key="item.workplaceId"
-                  :label="item.workplaceName"
-                  :value="item.workplaceId"
-                >
-                  <span style="float: left">{{ item.workplaceName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                      item.workplaceId
-                    }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
+        <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" >
+          <el-col :span="6" align="center">
+              <h5 style="color: #1c84c6">当前工位:&nbsp&nbsp&nbsp&nbsp<span style="font-size: 20px;color: #000000">{{this.formData.workplaceName}}</span></h5>
           </el-col>
 
-          <el-col :span="6">
-            <el-form-item prop="busType" class="query-form-item" label="当前业务类型:">
-              <el-select v-model="formData.busType"
-                         filterable
-                         remote
-                         reserve-keyword
-                         disabled
-                         placeholder="请选择业务类型" clearable style="width: 55%">
-                <el-option
-                  v-for="item in busTypeList"
-                  :key="item.documentTypeCode"
-                  :label="item.busName"
-                  :value="item.documentTypeCode"
-                >
-                  <span style="float: left">{{ item.busName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span>
-                </el-option>
-              </el-select>
-
-              <el-button type="primary" @click="toggleBusType" style="margin-left: 5px">切换业务</el-button>
-            </el-form-item>
+          <el-col :span="8" align="center">
+            <h5 style="color: #1c84c6">当前业务类型:&nbsp&nbsp&nbsp&nbsp<span style="font-size: 20px;color: #000000">{{this.formData.busName}}</span>
+              &nbsp&nbsp&nbsp&nbsp <el-button type="primary" @click="toggleBusType" style="margin-left: 10px;" >切换业务</el-button>
+            </h5>
+
           </el-col>
 
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item>
 
             </el-form-item>
@@ -97,7 +62,7 @@
             <span slot="title">已完成单</span>
           </el-menu-item>
           <el-menu-item :index=6 @click="clickMenuItem(6)">
-            <i class="el-icon-s-claim"></i>
+            <i class="el-icon-upload"></i>
             <span slot="title">单据上传</span>
           </el-menu-item>
           <el-menu-item :index=1 @click="clickMenuItem(1)">
@@ -110,10 +75,10 @@
           </el-menu-item>
           <el-menu-item :index=3 @click="clickMenuItem(3)">
             <i class="el-icon-s-platform"></i>
-            <span slot="title">工位存量</span>
+            <span slot="title">工位库存</span>
           </el-menu-item>
           <el-menu-item :index=7 @click="clickMenuItem(7)">
-            <i class="el-icon-s-claim"></i>
+            <i class="el-icon-s-release"></i>
             <span slot="title">损耗出库</span>
           </el-menu-item>
         </el-menu>
@@ -128,23 +93,15 @@
             :label="item.title"
             :name="item.name"
             @contextmenu.stop.prevent="handleTabContextMenu($event, item)"
+            style="background-color: white"
           >
             <ul v-if="showContextMenu" class="context-menu" :style="contextMenuPosition">
-              <li @click="closeCurrentTab(contextMenuIndex)">关闭当前</li>
-              <li @click="closeOtherTabs">关闭其他</li>
               <li @click="closeAllTabs">关闭所有</li>
             </ul>
             <div >
               <component v-if="showChild" :is="item.component" v-bind="item.componentProps" :reset-key="resetKeys[item.name]" @parent-method="parentMethod" />
             </div>
           </el-tab-pane>
-
-          <!-- 自定义的上下文菜单（这里只是一个占位符，你需要实现它） -->
-          <div v-if="showContextMenu" class="context-menu" :style="contextMenuStyle">
-            <button @click="closeCurrentTab">关闭当前</button>
-            <button @click="closeOtherTabs">关闭其他</button>
-            <button @click="closeAllTabs">关闭所有</button>
-          </div>
         </el-tabs>
 
       </el-col>
@@ -172,7 +129,7 @@
 
             <div
               style="display: flex; justify-content: space-between; align-items: center; height: 46px; /* 约为 200px 的 1/3 */"
-              @click="selectBusType(info.documentTypeCode)">
+              @click="selectBusType(info)">
               <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.busName }}</p>
               <!-- 假设你的信息对象中包含一个title属性 -->
               <!--            <div style="width: 60px; height: 60px;  display: flex; justify-content: center; align-items: center;">-->
@@ -185,10 +142,10 @@
             <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)">
+              <p style="font-size: 14px;background-color: #e1f3fb" @click="selectBusType(info)">
                 {{ info.remark }}</p>
               <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
-                         @click="selectBusType(info.documentTypeCode)">开始作业
+                         @click="selectBusType(info)">开始作业
               </el-button>
 
             </div>
@@ -239,7 +196,10 @@ export default {
         page: 1,
         limit: 100
       },
-      formData: {},
+      formData: {
+        busName: null,
+        workplaceName: null
+      },
       curWorkPlaces: [],
       busTypeList: [],
       logo: logoImg,
@@ -261,7 +221,7 @@ export default {
           component: DealOrder,
           // 假设你需要传递的参数
           componentProps: {
-            title: '这是单据的标题',
+            // title: '这是单据的标题',
           }
         },
         {
@@ -286,7 +246,7 @@ export default {
         },
         {
           number: 3,
-          title: '工位存量',
+          title: '工位库存',
           name: 'ioSplitFifoCode',
           component: ioSplitFifoCode,
           // 假设你需要传递的参数
@@ -331,7 +291,7 @@ export default {
         component: DealOrder,
         // 假设你需要传递的参数
         componentProps: {
-          title: '这是单据的标题'
+          // title: '这是单据的标题'
         }
       }
       ],
@@ -346,12 +306,14 @@ export default {
       // this.$refs.selectHeadEmpId.blur();
       this.selectBusTypeDisabled = true
     },
-    selectBusType(val) {
+    selectBusType(info) {
+      let val = info.documentTypeCode
       this.formData.busType = val
       let newQuery = {...this.$route.query};
       delete newQuery.billNo;
       newQuery.busType = val
       this.$router.push({query: newQuery, path: this.$route.path});
+      this.formData.busName = info.busName;
       this.editableTabs = []
       this.clickMenuItem(0)
       this.showChild = false;
@@ -439,6 +401,10 @@ export default {
       }
       listPage(query).then((res) => {
         this.curWorkPlaces = res.data.list || [];
+       if (this.$route.query.workplaceId != null){
+         let item = this.curWorkPlaces.find(item => item.workplaceId == this.$route.query.workplaceId);
+         this.formData.workplaceName = item.workplaceName
+       }
       })
     },
     getWorkBindBusTypes(workplaceId) {
@@ -450,10 +416,12 @@ export default {
 
           if (this.$route.query.busType != null) {
             this.formData.busType = this.$route.query.busType
+            this.formData.busName = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType).busName;
           }else  if (this.busTypeList.length == 1) {
               this.formData.busType = this.busTypeList[0].documentTypeCode
              this.$router.push({query: {...this.$route.query, busType: this.formData.busType}, path: this.$route.path})
               this.selectBusTypeDisabled = false
+            this.formData.busName = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType).busName;
             } else {
               this.selectBusTypeDisabled = true
               this.formData.busType = null
@@ -526,7 +494,7 @@ export default {
   margin-left: 25px;
 }
 .context-menu {
-  zIndex: 1000;
+  zIndex: 100000;
   position: fixed ;
   list-style-type: none;
   padding: 0;
diff --git a/src/views/collect/PanelOrderUpload.vue b/src/views/collect/PanelOrderUpload.vue
index b183f1a0..941a6276 100644
--- a/src/views/collect/PanelOrderUpload.vue
+++ b/src/views/collect/PanelOrderUpload.vue
@@ -327,6 +327,7 @@ export default {
 
       curRow: null,
       panelALive: false,
+      isLinkDisabled: false,
       options: {
         findWorkPlace: []
       },
@@ -426,6 +427,7 @@ export default {
   created() {
     this.filterQuery.tagStatus = this.tagStatus
     if (this.$route.query.workplaceId != null) {
+      this.isLinkDisabled=true
       this.filterQuery.workPlaceCode = this.$route.query.workplaceId
       this.showType = 2
     }