修改列表

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

@@ -334,7 +334,7 @@ const columns = [
   { label: '下单时间', prop: 'orderTime', align: 'center', width: 170, parseTime: true },
   { label: '销售员', prop: 'belongSaler', minWidth: 100, showOverflowTooltip: true },
   { label: '结算员', prop: 'settlementMan', minWidth: 100, showOverflowTooltip: true },
-  // { label: '客服员', prop: 'serviceMan', minWidth: 100, showOverflowTooltip: true },
+  { label: '客服员', prop: 'serviceMan', minWidth: 100, showOverflowTooltip: true },
   { label: '操作', prop: 'action', align: 'center', width: 240, fixed: 'right', slot: 'action', showInToolbar: false }
 ]
 

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

@@ -79,16 +79,6 @@
       <template #col-billingFailStatus="{ row }">
         <el-tag size="small" :type="billingFailTagType(row.billingFailStatus)">{{ billingFailLabel(row.billingFailStatus) }}</el-tag>
       </template>
-      <template #col-action="{ row }">
-        <el-button
-          link
-          type="warning"
-          icon="Refresh"
-          :loading="rebillingKey === row.billId"
-          v-hasPermi="['price:orderBill:rebill']"
-          @click="handleRebillOne(row)"
-        >重新计费</el-button>
-      </template>
     </basic-table>
     <order-source-sync-dialog ref="syncDialogRef" @success="onRebillSuccess" />
     <order-source-sync-log-drawer ref="logDrawerRef" />
@@ -106,7 +96,6 @@ const tableRef = ref()
 const syncDialogRef = ref()
 const logDrawerRef = ref()
 const batchLoading = ref(false)
-const rebillingKey = ref(null)
 const tableHeight = ref(480)
 let tableResizeObserver = null
 
@@ -130,7 +119,7 @@ const columns = [
   { label: '提货时间', prop: 'pickupDate', align: 'center', width: 170, parseTime: true },
   { label: '销售员', prop: 'belongSaler', minWidth: 100, showOverflowTooltip: true },
   { label: '结算员', prop: 'settlementMan', minWidth: 100, showOverflowTooltip: true },
-  { label: '操作', prop: 'action', align: 'center', width: 120, fixed: 'right', slot: 'action', showInToolbar: false }
+  { label: '客服员', prop: 'serviceMan', minWidth: 100, showOverflowTooltip: true }
 ]
 
 const orderStatusMap = {
@@ -256,27 +245,6 @@ function toSyncRow(row) {
   }
 }
 
-function handleRebillOne(row) {
-  if (!toSyncRow(row).pickupDate) {
-    ElMessage.warning('该订单没有计费时间，无法重新计费')
-    return
-  }
-  ElMessageBox.confirm('确认重新计费该订单？', '二次确认', { type: 'warning' }).then(() => {
-    rebillingKey.value = row.billId
-    return syncOrderSourceSelected([toSyncRow(row)])
-  }).then(res => {
-    const data = (res && res.data) || {}
-    if ((data.ok || 0) > 0 && !(data.fail || 0)) {
-      ElMessage.success('重新计费成功')
-    } else {
-      const detail = data.details && data.details[0]
-      ElMessage.error((detail && detail.errorMessage) || '重新计费失败')
-    }
-    tableRef.value?.refresh?.()
-  }).catch(() => {}).finally(() => {
-    rebillingKey.value = null
-  })
-}
 
 function handleBatchRebill(selection) {
   const rows = selection || []