Merge branch 'hurx'

src/views/order/orderMain/index.vue

@@ -680,8 +680,8 @@ const submitForm = () => {
         }));
 
         if (form.value.payType == '0') {
-          //如果选项信用支付  则订单状态为待待确认
-          form.value.orderStatus = '1';
+          //如果选项信用支付  则订单状态为待发货
+          form.value.orderStatus = '2';
         }
 
         // 组装提交数据

src/views/order/saleOrder/index.vue

@@ -592,12 +592,12 @@ const getButtonsByStatus = (orderStatus: string, checkStatus: string): ActionBut
   // 待支付状态：显示查看按钮
   if (orderStatus === OrderStatus.PENDING_PAYMENT) {
     buttons.push({ label: '查看', handler: handleReview });
-    buttons.push({ label: '确认订单', handler: handleAffirm });
+    // buttons.push({ label: '确认订单', handler: handleAffirm });
   }
   // 待确认状态：显示确认订单按钮
   if (orderStatus === OrderStatus.PENDING_CONFIRM) {
     buttons.push({ label: '查看', handler: handleReview });
-    buttons.push({ label: '确认订单', handler: handleAffirm });
+    // buttons.push({ label: '确认订单', handler: handleAffirm });
   }
 
   // 待审核：显示审核按钮

src/views/order/saleOrder/sendDetail.vue

@@ -75,8 +75,8 @@
         </el-col>
         <el-col :span="8">
           <div class="detail-item">
-            <span class="label">所属项目</span>
-            <span>{{ '--' }}</span>
+            <span class="label">所属项目：</span>
+            <span>{{ orderDetail.dataSource == 'zhongche' ? '中车' : '--' }}</span>
           </div>
           <div class="detail-item">
             <span class="label">业务部门：</span>
@@ -113,10 +113,12 @@
       </template>
       <el-descriptions :column="3" border class="custom-descriptions">
         <el-descriptions-item label="收货人">{{ crrcExtInfo.receiverName || '--' }}</el-descriptions-item>
-        <el-descriptions-item label="收货人手机号":span="2">{{ crrcExtInfo.mobile || '--' }}</el-descriptions-item>
-        <el-descriptions-item label="收货人邮箱" >{{ crrcExtInfo.email || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="收货人手机号" :span="2">{{ crrcExtInfo.mobile || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="收货人邮箱">{{ crrcExtInfo.email || '--' }}</el-descriptions-item>
         <el-descriptions-item label="收货地址" :span="2">
-          {{ crrcExtInfo.provinceName || '' }}-{{ crrcExtInfo.cityName || '' }}-{{ crrcExtInfo.countyName || '' }}-{{ crrcExtInfo.townName || '' }}-{{ crrcExtInfo.detailAddress || '' }}
+          {{ crrcExtInfo.provinceName || '' }}-{{ crrcExtInfo.cityName || '' }}-{{ crrcExtInfo.countyName || '' }}-{{ crrcExtInfo.townName || '' }}-{{
+            crrcExtInfo.detailAddress || ''
+          }}
         </el-descriptions-item>
         <el-descriptions-item label="下单人姓名">{{ crrcExtInfo.buyerName || '--' }}</el-descriptions-item>
         <el-descriptions-item label="下单人手机号" :span="2">{{ crrcExtInfo.buyerMobile || '--' }}</el-descriptions-item>