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

src/api/order/orderMain/types.ts

@@ -279,6 +279,8 @@ export interface OrderMainVO {
 
   assigneeName: string;
 
+  dataSourceStr: string;
+
   orderProductList: any[];
 
   deliverProductList: any[];
@@ -546,6 +548,8 @@ export interface OrderMainForm extends BaseEntity {
 
   assignmentStatus?: string;
 
+  dataSourceStr?: string;
+
   /**
    * 订单商品明细列表
    */

src/views/order/checkOrder/sendDetail.vue

@@ -76,7 +76,7 @@
         <el-col :span="8">
           <div class="detail-item">
             <span class="label">所属项目</span>
-            <span>{{ '--' }}</span>
+            <span>{{ orderDetail.dataSourceStr }}</span>
           </div>
           <div class="detail-item">
             <span class="label">业务部门：</span>