Merge branch 'test'

bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java

@@ -767,7 +767,6 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
         {
             throw new ServiceException(MessageUtils.message("price.bill.bizDateRequired"));
         }
-        assertOrderBillNotRefunded(bill);
         TmsPriceBillRequest req = buildBillRequestFromBill(bill);
         return billLocalWithDbRetry(billId.trim(), req);
     }
@@ -1653,7 +1652,6 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
         String billKey = Md5Utils.hash(orderNo);
         PrcOrderBill existed = orderBillMapper.selectPrcOrderBillByOrderNo(orderNo);
         assertOrderBillEditable(existed);
-        assertOrderBillNotRefunded(existed);
         BigDecimal previousIncome = existed == null ? BigDecimal.ZERO : nz(existed.getIncomeTotal());
         PrcOrderBill bill = existed == null ? new PrcOrderBill() : existed;
         if (existed == null)
@@ -2110,14 +2108,6 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
         }
     }
 
-    /** Block rebill when refundStatus=REFUNDED (order_status=9 alone is logistics return, not fee refund). */
-    private void assertOrderBillNotRefunded(PrcOrderBill bill)
-    {
-        if (bill != null && BillRefundStatus.REFUNDED.getCode().equalsIgnoreCase(bill.getRefundStatus()))
-        {
-            throw new ServiceException("\u8ba2\u5355\u5df2\u9000\u8d39\uff0c\u4e0d\u53ef\u91cd\u65b0\u8ba1\u8d39");
-        }
-    }
 
     private static BigDecimal nz(BigDecimal v)
     {

bms-front/src/views/ar/bill/components/BillDetail.vue

@@ -59,7 +59,7 @@
           @size-change="handleDetailSizeChange"
         />
 
-        <div class="section-title export-title"><span>导出历史</span><el-button size="small" type="primary" plain icon="Download" :loading="exporting" :disabled="exporting" @click="$emit('export')">{{ exporting ? '生成中' : '导出账单明细' }}</el-button></div>
+        <div class="section-title export-title"><span>导出历史</span><el-button size="small" type="primary" plain icon="Download" v-hasPermi="['ar:bill:export']" :loading="exporting" :disabled="exporting" @click="$emit('export')">{{ exporting ? '生成中' : '导出账单明细' }}</el-button></div>
         <el-table :data="detail.exports || []" border size="small">
           <el-table-column prop="fileName" label="文件名" min-width="250" show-overflow-tooltip />
           <el-table-column prop="templateVersion" label="模板版本" width="100" />