应付配置文件导入保存该文件

bms-front/src/views/price/basic/pay/components/PayConfigDetail.vue

@@ -78,7 +78,7 @@
 
         <el-tab-pane :label="`附加费（${(pane.item.surcharges || []).length}）`" name="fee">
           <div class="pay-edit-bar">
-            <el-input v-model="pane.feeKeyword" clearable placeholder="筛选附加费用、地区、收费标准或费用解释" class="pay-filter" @input="pane.feePageNo = 1" />
+            <el-input v-model="pane.feeKeyword" clearable placeholder="筛选附加费用、地区、价格、货币或费用解释" class="pay-filter" @input="pane.feePageNo = 1" />
             <el-button v-if="editable" size="small" type="primary" plain @click="addFee(pane)">添加附加费</el-button>
           </div>
           <el-table :data="pageFees(pane)" border size="small" max-height="360" empty-text="没有附加费">
@@ -88,8 +88,23 @@
             <el-table-column prop="zoneName" label="地区" min-width="160" show-overflow-tooltip>
               <template #default="{ row }"><cell-text v-model="row.zoneName" :edit="editable" /></template>
             </el-table-column>
-            <el-table-column prop="chargeText" label="收费标准" min-width="180" show-overflow-tooltip>
-              <template #default="{ row }"><cell-text v-model="row.chargeText" :edit="editable" /></template>
+            <el-table-column label="价格" width="110" align="right">
+              <template #default="{ row }">
+                <el-input v-if="editable" v-model="row.amount" size="small" />
+                <span v-else>{{ money(row.amount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="货币" width="120" show-overflow-tooltip>
+              <template #default="{ row }">
+                <cell-text v-if="editable" v-model="row.priceUnit" :edit="true" />
+                <span v-else>{{ row.priceUnit || row.currency || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="收费标准" min-width="180" show-overflow-tooltip>
+              <template #default="{ row }">
+                <cell-text v-if="editable && (!row.chargeText || feeNote(row))" v-model="row.chargeText" :edit="true" />
+                <span v-else>{{ feeNote(row) || '-' }}</span>
+              </template>
             </el-table-column>
             <el-table-column prop="feeDesc" label="费用解释" min-width="240" show-overflow-tooltip>
               <template #default="{ row }"><cell-text v-model="row.feeDesc" :edit="editable" /></template>
@@ -214,7 +229,7 @@ function filteredBands(pane) {
 }
 
 function filteredFees(pane) {
-  return filterRows(pane.item.surcharges || [], pane.feeKeyword, ['feeName', 'zoneName', 'chargeText', 'feeDesc', 'calcRule', 'calcParam'])
+  return filterRows(pane.item.surcharges || [], pane.feeKeyword, ['feeName', 'zoneName', 'chargeText', 'amount', 'currency', 'priceUnit', 'feeDesc', 'calcRule', 'calcParam'])
 }
 
 function addBand(pane) {
@@ -225,7 +240,7 @@ function addBand(pane) {
 
 function addFee(pane) {
   if (!pane.item.surcharges) pane.item.surcharges = []
-  pane.item.surcharges.push({ feeName: '', zoneName: '', chargeText: '', feeDesc: '', calcRule: 'MANUAL', calcParam: '' })
+  pane.item.surcharges.push({ feeName: '', zoneName: '', chargeText: '', amount: '', priceUnit: '', currency: '', feeDesc: '', calcRule: 'MANUAL', calcParam: '' })
   pane.feePageNo = Math.ceil(pane.item.surcharges.length / pageSize) || 1
 }
 
@@ -290,6 +305,19 @@ function money(value) {
   return Number.isNaN(num) ? value : String(num)
 }
 
+/** 价格和货币已经拆开时，收费标准只留说明，不再重复「0.19 EUR/ITEM」。 */
+function feeNote(row) {
+  const text = (row.chargeText || '').trim()
+  if (!text || row.amount === null || row.amount === undefined || row.amount === '') return text
+  const amount = Number(row.amount)
+  if (!Number.isFinite(amount)) return text
+  const match = text.match(/^\s*(\d+(?:\.\d+)?)\s*(?:EUR|GBP|USD|RMB|CNY|欧元|英镑|人民币|美元)?\s*(?:\/\s*[A-Za-z\u4e00-\u9fa5]+)?\s*([\s\S]*)$/i)
+  if (!match || Number(match[1]) !== amount) return text
+  const rest = (match[2] || '').trim()
+  if (!rest || rest === '%' || rest === (row.priceUnit || '') || /^[。．.、,，]+$/.test(rest)) return ''
+  return rest
+}
+
 function periodLabel(row) {
   if (row.effectiveStart || row.effectiveEnd) {
     return `${row.effectiveStart || '…'} 至 ${row.effectiveEnd || '…'}`

bms-front/src/views/price/basic/pay/index.vue

@@ -24,6 +24,11 @@
         </el-col>
       </template>
 
+      <template #col-sourceFile="{ row }">
+        <el-button v-if="row.filePath" link type="primary" @click="downloadSource(row)">{{ row.sourceFile }}</el-button>
+        <span v-else>{{ row.sourceFile || '-' }}</span>
+      </template>
+
       <template #col-parseStatus="{ row }">
         <el-tag :type="statusType(row.parseStatus)" size="small">{{ statusText(row.parseStatus) }}</el-tag>
       </template>
@@ -56,7 +61,7 @@
 
     <pay-import-dialog ref="importRef" @saved="tableRef.refresh()" />
 
-    <el-drawer v-model="historyVisible" :title="historyTitle" size="860px" destroy-on-close>
+    <el-drawer v-model="historyVisible" :title="historyTitle" size="980px" destroy-on-close>
       <div class="history-bar">
         <el-button type="primary" plain :disabled="historyPicked.length !== 2" @click="openCompare">比对所选版本</el-button>
         <span>勾选两个版本后比对。历史订单按生效时间取价，不看当前开关。</span>
@@ -64,7 +69,12 @@
       <el-table v-loading="historyLoading" :data="historyRows" border size="small" empty-text="还没有价格版本" @selection-change="onHistoryPick">
         <el-table-column type="selection" width="42" align="center" />
         <el-table-column prop="versionNo" label="版本" width="70" align="center" />
-        <el-table-column prop="sourceFile" label="来源文件" min-width="160" show-overflow-tooltip />
+        <el-table-column label="来源文件" min-width="160" show-overflow-tooltip>
+          <template #default="{ row }">
+            <el-button v-if="row.filePath" link type="primary" @click="downloadSource(row)">{{ row.sourceFile || '下载源文件' }}</el-button>
+            <span v-else>{{ row.sourceFile || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="weightCount" label="重量段" width="80" align="center" />
         <el-table-column prop="surchargeCount" label="附加费" width="80" align="center" />
         <el-table-column label="生效开始" width="110" align="center">
@@ -88,8 +98,9 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="150" align="center">
+        <el-table-column label="操作" width="210" align="center">
           <template #default="{ row }">
+            <el-button link type="primary" @click="downloadSource(row)" v-hasPermi="['price:pay:query']">下载</el-button>
             <el-button link type="primary" @click="openTermDialog(row)" v-hasPermi="['price:pay:edit']">修改有效期</el-button>
             <el-button link type="primary" @click="openDetail(row)" v-hasPermi="['price:pay:query']">查看</el-button>
           </template>
@@ -126,6 +137,7 @@
     <el-drawer v-model="detailVisible" :title="detailTitle" size="78%" destroy-on-close>
       <pay-config-detail v-loading="detailLoading" :product="detail" :editable="editing" />
       <template #footer>
+        <el-button v-if="detail" @click="downloadSource(detail)" v-hasPermi="['price:pay:query']">下载源文件</el-button>
         <el-button v-if="!editing" type="primary" @click="editing = true" v-hasPermi="['price:pay:import']">编辑</el-button>
         <el-button v-else type="primary" :loading="saving" @click="saveDetail">保存</el-button>
         <el-button @click="detailVisible = false">关闭</el-button>
@@ -229,6 +241,18 @@ function currentQuery() {
   return query
 }
 
+function downloadSource(row) {
+  const id = row.versionProductId || row.productId
+  if (!id || !row.filePath) {
+    proxy.$modal.msgWarning('这一版导入时没有保存源文件，请重新导入后再下载')
+    return
+  }
+  proxy.download('/price/pay/' + id + '/source', {}, row.sourceFile || '价卡.xlsx', {
+    timeout: 120000,
+    headers: { repeatSubmit: false }
+  })
+}
+
 function handleExport() {
   proxy.download('/price/pay/export', currentQuery(), `应付配置_${Date.now()}.xlsx`)
 }