Merge remote-tracking branch 'origin/master'

src/views/bpm/handleTask/components/purchaseOrder/outSourceSendCk/boxTabPage.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script>
-  import { getPurchaseOutSourceSendDetailAPI } from '@/api/bpm/components/purchasingManage/outSourceSend';
+  import { applyOutsource } from '@/api/bpm/components/purchasingManage/outSourceSendCk';
   export default {
     name: 'boxTabPage',
     components: {
@@ -83,7 +83,7 @@
       }
     },
     async created() {
-      this.form = await getPurchaseOutSourceSendDetailAPI(this.businessId);
+      this.form = await applyOutsource(this.businessId);
     },
     methods: {
       isValidComponent(componentName) {

src/views/bpm/outgoingManagement/outbound.vue

@@ -886,7 +886,7 @@
 
         // 物品类型
         this.formData.extInfo.assetType = Array.from(
-          new Set(this.form.categoryLevelTopId.split(','))
+          new Set(this.form.categoryLevelId?.split(','))
         );
         // 出库类型
         this.formData.bizType = this.bizType;