hurx 1 месяц назад
Родитель
Сommit
3b44b73b55

+ 1 - 1
src/views/bill/statementInvoice/index.vue

@@ -312,7 +312,7 @@ const buttonConfigMap: Record<number, ActionButton[]> = {
   [InvoiceStatus.DRAFT]: [
   [InvoiceStatus.DRAFT]: [
     { action: 'detail', label: '查看', handler: handleDetail, permission: 'bill:statementInvoice:edit' },
     { action: 'detail', label: '查看', handler: handleDetail, permission: 'bill:statementInvoice:edit' },
     { action: 'edit', label: '编辑', handler: handleUpdate, permission: 'bill:statementInvoice:edit' },
     { action: 'edit', label: '编辑', handler: handleUpdate, permission: 'bill:statementInvoice:edit' },
-    { action: 'send', label: '发送对账单', handler: handleSend, permission: 'bill:statementInvoice:edit' },
+    { action: 'send', label: '发送开票信息', handler: handleSend, permission: 'bill:statementInvoice:edit' },
     { action: 'withdraw', label: '撤回', handler: handleWithdraw, permission: 'bill:statementInvoice:edit' },
     { action: 'withdraw', label: '撤回', handler: handleWithdraw, permission: 'bill:statementInvoice:edit' },
     { action: 'obsolete', label: '作废', handler: handleObsolete, permission: 'bill:statementInvoice:remove' }
     { action: 'obsolete', label: '作废', handler: handleObsolete, permission: 'bill:statementInvoice:remove' }
   ],
   ],

+ 1 - 3
src/views/order/orderReturn/index.vue

@@ -66,9 +66,7 @@
         <el-table-column label="退货原因" align="center" prop="returnReason" />
         <el-table-column label="退货原因" align="center" prop="returnReason" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
           <template #default="scope">
-            <el-button link type="primary" icon="Edit" @click="handleReview(scope.row)" v-hasPermi="['order:orderReturn:edit']"
-              >查看退货信息</el-button
-            >
+            <el-button link type="primary" icon="Edit" @click="handleReview(scope.row)">查看退货信息</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>

+ 6 - 5
src/views/order/saleOrder/index.vue

@@ -105,11 +105,11 @@
             <dict-tag :options="order_source" :value="scope.row.orderSource" />
             <dict-tag :options="order_source" :value="scope.row.orderSource" />
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column label="审核状态" align="center" prop="checkStatus">
+        <!-- <el-table-column label="审核状态" align="center" prop="checkStatus">
           <template #default="scope">
           <template #default="scope">
             <dict-tag :options="order_check_status" :value="scope.row.checkStatus" />
             <dict-tag :options="order_check_status" :value="scope.row.checkStatus" />
           </template>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="订单状态" align="center" prop="orderStatus">
         <el-table-column label="订单状态" align="center" prop="orderStatus">
           <template #default="scope">
           <template #default="scope">
             <dict-tag :options="order_status" :value="scope.row.orderStatus" />
             <dict-tag :options="order_status" :value="scope.row.orderStatus" />
@@ -294,6 +294,7 @@ const data = reactive<PageData<OrderMainForm, OrderMainQuery>>({
     cancelReason: undefined,
     cancelReason: undefined,
     expenseType: undefined,
     expenseType: undefined,
     status: undefined,
     status: undefined,
+    checkStatus: '1',
     platformCode: undefined,
     platformCode: undefined,
     params: {}
     params: {}
   },
   },
@@ -596,9 +597,9 @@ const getButtonsByStatus = (orderStatus: string, checkStatus: string): ActionBut
   }
   }
 
 
   // 待审核:显示审核按钮
   // 待审核:显示审核按钮
-  if (checkStatus === CheckStatus.PENDING) {
-    buttons.push({ label: '审核', handler: handleCheck });
-  }
+  // if (checkStatus === CheckStatus.PENDING) {
+  //   buttons.push({ label: '审核', handler: handleCheck });
+  // }
 
 
   // 待发货或部分发货:显示发货按钮
   // 待发货或部分发货:显示发货按钮
   if (orderStatus === OrderStatus.PENDING_SHIPMENT || orderStatus === OrderStatus.PARTIAL_SHIPMENT) {
   if (orderStatus === OrderStatus.PENDING_SHIPMENT || orderStatus === OrderStatus.PARTIAL_SHIPMENT) {