hurx 2 дней назад
Родитель
Сommit
b617a57ade

+ 1 - 1
src/views/customer/customerFile/customerInfo/overview/erpSaleInfo.vue

@@ -219,7 +219,7 @@ const salesForm = reactive<SalesInfoForm>({
   creditManagementId: undefined,
   creditAmount: undefined,
   remainingQuota: undefined,
-  orderAudit: undefined,
+  orderAudit: '0',
   creditPaymentPassword: '',
   accountPeriod: '',
   payDays: undefined,

+ 0 - 5
src/views/order/orderMain/index.vue

@@ -665,11 +665,6 @@ const submitForm = () => {
           status: '0' // 状态(0正常)
         }));
 
-        if (form.value.payType == '0') {
-          //如果选项信用支付  则订单状态为待发货
-          form.value.orderStatus = '2';
-        }
-
         // 组装提交数据
         const submitData = {
           ...form.value,

+ 3 - 13
src/views/order/saleOrder/index.vue

@@ -109,16 +109,6 @@
             <dict-tag :options="order_source" :value="scope.row.orderSource" />
           </template>
         </el-table-column>
-        <el-table-column label="所属项目" align="center" prop="dataSource">
-          <template #default="scope">
-            {{ scope.row.dataSource == 'zhongche' ? '中车' : '--' }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="审核状态" align="center" prop="checkStatus">
-          <template #default="scope">
-            <dict-tag :options="order_check_status" :value="scope.row.checkStatus" />
-          </template>
-        </el-table-column> -->
         <el-table-column label="订单状态" align="center" prop="orderStatus">
           <template #default="scope">
             <dict-tag :options="order_status" :value="scope.row.orderStatus" />
@@ -342,7 +332,7 @@ const data = reactive<PageData<OrderMainForm, OrderMainQuery>>({
     status: undefined,
     platformCode: undefined,
     assigneeType: 'mkt',
-    // currentLevelStr: '1,2',
+    currentLevelStr: '1',
     params: {}
   },
   rules: {
@@ -632,12 +622,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 });
   }
 
   // 待审核:显示审核按钮