增加导出功能

bms-front/src/views/price/billing/bill.vue

@@ -117,6 +117,15 @@
             @click="openRecalcDialog"
           >重计费</el-button>
         </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="Download"
+            v-hasPermi="['price:billing:export']"
+            @click="handleExport"
+          >导出</el-button>
+        </el-col>
       </template>
       <template #col-action="{ row }">
         <el-button link type="primary" icon="View" @click="handleView(row)">查看</el-button>
@@ -225,6 +234,7 @@
 
 <script setup name="BillingBill">
 import { listBill, getBill, refundBill, listOrderNoOptions, listTrackingNoOptions, listTransferNoOptions, updateCreditArrears, importChargeWeightAsync, downloadChargeWeightTemplate, recalcBillPriceAsync } from '@/api/price/billing'
+import { exportAsyncFromTable } from '@/utils/excelExport'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useProducts } from '@/components/ProductSelect/useProducts'
 import BillDetail from './components/BillDetail.vue'
@@ -390,8 +400,8 @@ const searchColumns = [
   }
 ]
 
-function queryList(params) {
-  const { bizDateRange, ...rest } = params
+function buildBillQuery(params) {
+  const { bizDateRange, ...rest } = params || {}
   const query = { ...rest }
   if (Array.isArray(bizDateRange) && (bizDateRange[0] || bizDateRange[1])) {
     query.params = {
@@ -400,9 +410,24 @@ function queryList(params) {
       endBizDate: bizDateRange[1] || null
     }
   }
+  return query
+}
+
+function queryList(params) {
+  const query = buildBillQuery(params)
   return listBill(query)
 }
 
+function handleExport() {
+  return exportAsyncFromTable({
+    baseUrl: '/price/billing/bill/export',
+    tableRef: tableRef.value,
+    normalize: buildBillQuery,
+    filePrefix: 'billing_bill',
+    requireFilter: true
+  })
+}
+
 function handleUpdateArrears(ids, selection) {
   const billIds = (ids && ids.length)
     ? ids

bms-front/src/views/price/orderBill/index.vue

@@ -38,6 +38,15 @@
         <el-col :span="1.5">
           <el-button type="info" plain icon="Document" @click="logDrawerRef.open()">操作记录</el-button>
         </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="Download"
+            v-hasPermi="['price:orderBill:export']"
+            @click="handleExport"
+          >导出</el-button>
+        </el-col>
         <el-col :span="1.5">
           <el-button
             type="warning"
@@ -129,6 +138,7 @@
 <script setup name="OrderBillQuery">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { listOrderBill, listOrderNoOptions, listTrackingNoOptions, listTransferNoOptions, localRebillAsync } from '@/api/price/billing'
+import { exportAsyncFromTable } from '@/utils/excelExport'
 import OrderSourceSyncLogDrawer from '../../monitor/orderSource/components/OrderSourceSyncLogDrawer.vue'
 import OrderBillProductCheckDrawer from './components/OrderBillProductCheckDrawer.vue'
 
@@ -284,6 +294,15 @@ function queryList(params) {
   return listOrderBill(applySearchRanges(params))
 }
 
+function handleExport() {
+  return exportAsyncFromTable({
+    baseUrl: '/price/billing/orderBill/export',
+    tableRef: tableRef.value,
+    normalize: applySearchRanges,
+    filePrefix: 'order_bill',
+    requireFilter: true
+  })
+}
 
 const MAX_REBILL = 10000
 

bms-front/src/views/price/set/create.vue

@@ -27,7 +27,6 @@
 
     <div class="wizard-actions">
       <el-button @click="goBack">取消</el-button>
-      <el-button v-if="showBasic" type="info" :loading="saving" @click="saveDraft">保存</el-button>
       <el-button type="primary" :loading="creating" @click="finishEdit">完成</el-button>
     </div>
 
@@ -67,7 +66,6 @@ const route = useRoute()
 
 const refData = usePriceSetRefData()
 
-const saving = ref(false)
 const creating = ref(false)
 const progressVisible = ref(false)
 const progressPercent = ref(0)
@@ -248,23 +246,6 @@ async function finishEdit() {
   }
 }
 
-/** Persist basic draft (no detail wipe). */
-async function saveDraft() {
-  const validBasic = await basicRef.value.validate()
-  if (!validBasic) return
-  saving.value = true
-  try {
-    const priceSetId = await runSaveWithProgress(buildPayload())
-    form.priceSetId = priceSetId
-    proxy.$modal.msgSuccess('已保存（待启用），套餐ID=' + priceSetId)
-    goBack()
-  } catch (e) {
-    // surfaced
-  } finally {
-    saving.value = false
-  }
-}
-
 function buildPayload(opts = {}) {
   const { basic, version } = form
   const detailRows = form.details.filter(d => d && d.productCode)