Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

# Conflicts:
#	src/views/collect/CollectOrderTabs.vue

src/views/basic/collectPoint/userWorkplace.vue

@@ -122,7 +122,7 @@
               <span>{{ workplaceTypes[scope.row.workplaceType] }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>
+<!--          <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>-->
           <el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
           <!--<el-table-column label="往来单位标题" prop="unitTittle" width="100"></el-table-column>-->
           <!--<el-table-column label="往来单位类型" prop="corpType" width="100">-->

src/views/collect/CollectOrderAllot.vue

@@ -22,7 +22,6 @@
       </el-tab-pane>
 
 
-
     </el-tabs>
 
   </div>

src/views/collect/CollectOrderTabs.vue

@@ -138,18 +138,12 @@
             </div>
           </el-tab-pane>
 
-
+          <!-- 自定义的上下文菜单（这里只是一个占位符，你需要实现它） -->
-          <!-- 上下文菜单 -->
+          <div v-if="showContextMenu" class="context-menu" :style="contextMenuStyle">
-
+            <button @click="closeCurrentTab">关闭当前</button>
-<!--          <ul v-show="showContextMenu" :style="{left:left+'px',top:top+'px'}" class="contextmenu">-->
+            <button @click="closeOtherTabs">关闭其他</button>
-<!--            <li> <i class="el-icon-refresh-right"></i> 刷新页面</li>-->
+            <button @click="closeAllTabs">关闭所有</button>
-<!--            <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>-->
+          </div>
-<!--            <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前</li>-->
-<!--            <li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li>-->
-<!--            <li v-if="!isFirstView()" @click="closeLeftTags"><i class="el-icon-back"></i> 关闭左侧</li>-->
-<!--            <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>-->
-<!--            <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>-->
-<!--          </ul>-->
         </el-tabs>
 
       </el-col>
@@ -190,7 +184,8 @@
             <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.remark }}</p>
               <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
                          @click="selectBusType(info.documentTypeCode)">开始作业
               </el-button>
@@ -275,7 +270,7 @@ export default {
           component: IoCreateOrderOut,
           // 假设你需要传递的参数
           componentProps: {
-            fromSplitType: 'out'
+            fromSplitType: 'out',
           }
         },
         {

src/views/collect/DealOrder.vue

@@ -272,7 +272,8 @@
               <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.remark }}</p>
                 <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
                            @click="selectBusType(info.documentTypeCode)">开始作业
                 </el-button>
@@ -442,8 +443,7 @@ export default {
           if (this.formData.billNo != null) {
             this.getBillNo(this.formData.billNo)
             this.startDeal();
-          }
+          } else {
-          else {
             if (this.busTypeList.length == 1 && this.$route.query.busType == null) {
               let busType = this.busTypeList[0]
               this.formData.busType = this.busTypeList[0].documentTypeCode
@@ -925,9 +925,6 @@ export default {
     }
 
 
-
-
-
   }
 
 }

src/views/collect/IoCreateOrder.vue

@@ -407,6 +407,7 @@ export default {
         sickerAdNum: null,
         workPlaceCode: null,
         fifoSplit: 1,
+        splitBusType: null,
       },
 
       detailList: [],
@@ -1081,7 +1082,7 @@ export default {
           parseTime(date, "{y}{m}{d}{h}{i}{s}") +
           Math.ceil(Math.random() * 89 + 10);
       }
-
+      debugger
       this.loading = true;
       let tQuery = Object.assign(
         JSON.parse(JSON.stringify(this.orderFormData))
@@ -1751,6 +1752,7 @@ export default {
         preCurSpaceCode: null,  //单据
         sickerAdNum: null,
         workPlaceCode: null,
+        splitBusType: null,
         fifoSplit: 1,
       }
       this.scanCode = "";
@@ -1847,7 +1849,8 @@ export default {
       this.corpOrderIdDisabled = true
       this.isLinkDisabled = true
       this.workplaceId = this.$route.query.workplaceId
-      this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId)
+      this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId);
+      this.orderFormData.splitBusType = "YPCF002"
     }
 
   },