添加路由

src/api/contractApi.js

@@ -3,10 +3,13 @@ import axios from 'axios'
 // 创建axios实例
 const service = axios.create({
   baseURL: '/api',
-  timeout: 10000
+  timeout: 1000000
 })
 
-// 导入采购合同Excel
+// ===================== 原有接口（保留） =====================
+/**
+ * 导入采购合同Excel
+ */
 export const importContractExcel = (file) => {
   const formData = new FormData()
   formData.append('file', file)
@@ -19,7 +22,10 @@ export const importContractExcel = (file) => {
     }
   })
 }
-// 导入销售合同Excel
+
+/**
+ * 导入销售合同Excel
+ */
 export const importSalesContractExcel = (file) => {
   const formData = new FormData()
   formData.append('file', file)
@@ -33,12 +39,15 @@ export const importSalesContractExcel = (file) => {
   })
 }
 
-// 导入采、销执行表Excel
+// ===================== 采销执行表&业务库导入（新增/改造） =====================
+/**
+ * 1. 导入采销执行表（单独，替换原有importPsExeExcel的路径）
+ */
 export const importPsExeExcel = (file) => {
   const formData = new FormData()
   formData.append('file', file)
   return service({
-    url: '/pAndSExe/import',
+    url: '/pAndSExe/importPsExe', // 对应后端新接口路径
     method: 'post',
     data: formData,
     headers: {
@@ -47,11 +56,30 @@ export const importPsExeExcel = (file) => {
   })
 }
 
+/**
+ * 2. 导入所有业务库（批量）
+ */
+export const importAllExcel = (file) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return service({
+    url: '/pAndSExe/importAll', // 后端批量导入接口
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+/**
+ * 3. 导入库存业务（单独，保留原有方法但路径与后端新接口对齐）
+ */
 export const importStockExcel = (file) => {
   const formData = new FormData()
-  formData.append('file', file) // 参数名保持和后端一致（后端用的@RequestParam("file")）
+  formData.append('file', file)
   return service({
-    url: '/pAndSExe/importStock', // 对应后端PsExeController中的/importStock路径
+    url: '/pAndSExe/importStock',
     method: 'post',
     data: formData,
     headers: {
@@ -60,8 +88,149 @@ export const importStockExcel = (file) => {
   })
 }
 
+/**
+ * 4. 导入付款业务（单独）
+ */
+export const importPayExcel = (file) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return service({
+    url: '/pAndSExe/importPay',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
 
+/**
+ * 5. 导入费用付款业务（单独）
+ */
+export const importFeePayExcel = (file) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return service({
+    url: '/pAndSExe/importFeePay',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+/**
+ * 6. 导入费用发票结算业务（单独）
+ */
+export const importFeeInvoiceExcel = (file) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return service({
+    url: '/pAndSExe/importFeeInvoice',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+/**
+ * 7. 导入进项发票结算业务（单独）
+ */
+export const importJinxiangInvoiceExcel = (file) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return service({
+    url: '/pAndSExe/importJinxiangInvoice',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+/**
+ * 8. 导入到货登记结算业务（单独）
+ */
+export const importDaodandengjiExcel = (file) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return service({
+    url: '/pAndSExe/importDaodandengji',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+/**
+ * 9. 导入收款认领结算业务（单独）
+ */
+export const importShoukuanrenlingExcel = (file) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return service({
+    url: '/pAndSExe/importShoukuanrenling',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+/**
+ * 10. 导入销售结算开票业务（单独）
+ */
+export const importXiaoshoujiesuanExcel = (file) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return service({
+    url: '/pAndSExe/importXiaoshoujiesuan',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+/**
+ * 11. 导入代理结算业务（单独）
+ */
+export const importDailijiesuanExcel = (file) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return service({
+    url: '/pAndSExe/importDailijiesuan',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+// 导出所有方法（原有+新增），便于按需导入或批量导入
 export default {
+  // 原有合同导入
   importContractExcel,
-  importSalesContractExcel
-}
+  importSalesContractExcel,
+  // 采销执行表&业务库导入
+  importPsExeExcel,
+  importAllExcel,
+  importStockExcel,
+  importPayExcel,
+  importFeePayExcel,
+  importFeeInvoiceExcel,
+  importJinxiangInvoiceExcel,
+  importDaodandengjiExcel,
+  importShoukuanrenlingExcel,
+  importXiaoshoujiesuanExcel,
+  importDailijiesuanExcel
+}

src/views/psExe.vue

@@ -3,7 +3,7 @@
     <el-card class="import-card">
       <template #header>
         <div class="card-header">
-          <span class="title">采、销执行表及库存业务Excel导入</span>
+          <span class="title">采、销执行表及各类业务Excel导入</span>
         </div>
       </template>
 
@@ -27,35 +27,145 @@
           </div>
           <template #tip>
             <div class="el-upload__tip">
-              只能上传 .xlsx 或 .xls 格式的Excel文件
+              只能上传 .xlsx 或 .xls 格式的Excel文件，大小不超过50MB
             </div>
           </template>
         </el-upload>
       </div>
 
-      <!-- 导入按钮 -->
-      <div class="action-buttons">
+      <!-- 导入按钮区域 -->
+      <!-- 第一排：批量导入按钮 -->
+      <div class="action-buttons batch-buttons">
         <el-button
             type="primary"
-            :loading="loading"
+            :loading="psExeLoading"
             :disabled="!fileList.length"
-            @click="handleImport"
+            @click="handlePsExeImport"
         >
-          {{ loading ? '采销导入中...' : '开始导入采销执行表' }}
+          {{ psExeLoading ? '采销导入中...' : '导入采销执行表' }}
         </el-button>
         <el-button
             type="primary"
-            :loading="stockLoading"
+            :loading="allLoading"
             :disabled="!fileList.length"
-            @click="handleStockImport"
+            @click="handleImportAll"
             style="margin-left: 10px"
         >
-          {{ stockLoading ? '库存导入中...' : '导入库存业务' }}
+          {{ allLoading ? '所有业务导入中...' : '导入所有业务库' }}
         </el-button>
-        <el-button @click="handleReset">重置</el-button>
       </div>
 
-      <!-- 错误信息显示 -->
+      <!-- 第二排：单独模块导入按钮（分组排版） -->
+      <div class="action-buttons single-buttons">
+        <div class="single-buttons-group">
+          <span class="group-title">基础业务：</span>
+          <el-button
+              type="primary"
+              :loading="stockLoading"
+              :disabled="!fileList.length"
+              @click="handleStockImport"
+              size="small"
+          >
+            {{ stockLoading ? '导入中...' : '库存业务' }}
+          </el-button>
+          <el-button
+              type="primary"
+              :loading="payLoading"
+              :disabled="!fileList.length"
+              @click="handlePayImport"
+              size="small"
+              style="margin-left: 5px"
+          >
+            {{ payLoading ? '导入中...' : '付款业务' }}
+          </el-button>
+          <el-button
+              type="primary"
+              :loading="feePayLoading"
+              :disabled="!fileList.length"
+              @click="handleFeePayImport"
+              size="small"
+              style="margin-left: 5px"
+          >
+            {{ feePayLoading ? '导入中...' : '费用付款' }}
+          </el-button>
+        </div>
+
+        <div class="single-buttons-group" style="margin-top: 10px">
+          <span class="group-title">发票结算：</span>
+          <el-button
+              type="primary"
+              :loading="feeInvoiceLoading"
+              :disabled="!fileList.length"
+              @click="handleFeeInvoiceImport"
+              size="small"
+          >
+            {{ feeInvoiceLoading ? '导入中...' : '费用发票结算' }}
+          </el-button>
+          <el-button
+              type="primary"
+              :loading="jinxiangInvoiceLoading"
+              :disabled="!fileList.length"
+              @click="handleJinxiangInvoiceImport"
+              size="small"
+              style="margin-left: 5px"
+          >
+            {{ jinxiangInvoiceLoading ? '导入中...' : '进项发票结算' }}
+          </el-button>
+        </div>
+
+        <div class="single-buttons-group" style="margin-top: 10px">
+          <span class="group-title">其他结算：</span>
+          <el-button
+              type="primary"
+              :loading="daodandengjiLoading"
+              :disabled="!fileList.length"
+              @click="handleDaodandengjiImport"
+              size="small"
+          >
+            {{ daodandengjiLoading ? '导入中...' : '到货登记结算' }}
+          </el-button>
+          <el-button
+              type="primary"
+              :loading="shoukuanrenlingLoading"
+              :disabled="!fileList.length"
+              @click="handleShoukuanrenlingImport"
+              size="small"
+              style="margin-left: 5px"
+          >
+            {{ shoukuanrenlingLoading ? '导入中...' : '收款认领结算' }}
+          </el-button>
+          <el-button
+              type="primary"
+              :loading="xiaoshoujiesuanLoading"
+              :disabled="!fileList.length"
+              @click="handleXiaoshoujiesuanImport"
+              size="small"
+              style="margin-left: 5px"
+          >
+            {{ xiaoshoujiesuanLoading ? '导入中...' : '销售结算开票' }}
+          </el-button>
+          <el-button
+              type="primary"
+              :loading="dailijiesuanLoading"
+              :disabled="!fileList.length"
+              @click="handleDailijiesuanImport"
+              size="small"
+              style="margin-left: 5px"
+          >
+            {{ dailijiesuanLoading ? '导入中...' : '代理结算' }}
+          </el-button>
+        </div>
+
+        <el-button
+            @click="handleReset"
+            size="small"
+            style="margin-top: 10px; margin-left: 0"
+        >
+          重置
+        </el-button>
+      </div>
+
+      <!-- 错误/成功信息显示 -->
       <div v-if="errorMessage" class="error-message-area">
         <el-alert
             title="导入错误"
@@ -65,8 +175,6 @@
             :closable="false"
         />
       </div>
-
-      <!-- 成功信息显示 -->
       <div v-if="successMessage" class="success-message-area">
         <el-alert
             title="导入成功"
@@ -86,9 +194,11 @@
         >
           <template #default>
             <div class="tips-content">
-              <p>1. 请确保Excel文件包含所有需要的Sheet页，每个Sheet页对应一张表</p>
-              <p>2. 系统会自动处理合并字段，按照逗号分隔存储</p>
-              <p>3. 导入过程中如有错误，会在上方错误信息区域显示</p>
+              <p>1. 「导入所有业务库」会批量执行库存、付款、各类结算等所有业务导入；</p>
+              <p>2. 「单独模块导入」可针对性导入某类业务，适合单业务调试；</p>
+              <p>3. 请确保Excel文件包含对应业务的Sheet页，每个Sheet页对应一张表；</p>
+              <p>4. 系统会自动处理合并字段，按照逗号分隔存储；</p>
+              <p>5. 导入过程中如有错误，会在上方错误信息区域显示。</p>
             </div>
           </template>
         </el-alert>
@@ -101,150 +211,186 @@
 import { ref } from 'vue'
 import { ElMessage } from 'element-plus'
 import { UploadFilled } from '@element-plus/icons-vue'
-import { importPsExeExcel, importStockExcel } from '../api/contractApi'  // 新增导入库存的API
-
-// 响应式数据
+// 导入所有API方法
+import {
+  importPsExeExcel,
+  importAllExcel,
+  importStockExcel,
+  importPayExcel,
+  importFeePayExcel,
+  importFeeInvoiceExcel,
+  importJinxiangInvoiceExcel,
+  importDaodandengjiExcel,
+  importShoukuanrenlingExcel,
+  importXiaoshoujiesuanExcel,
+  importDailijiesuanExcel
+} from '../api/contractApi'
+
+// 响应式数据：文件+各业务加载状态
 const uploadRef = ref()
 const fileList = ref([])
-const loading = ref(false)
-const stockLoading = ref(false)  // 库存导入的加载状态
 const errorMessage = ref('')
 const successMessage = ref('')
 
-// 处理文件选择
+// 加载状态：批量导入
+const psExeLoading = ref(false)
+const allLoading = ref(false)
+
+// 加载状态：单独模块
+const stockLoading = ref(false)
+const payLoading = ref(false)
+const feePayLoading = ref(false)
+const feeInvoiceLoading = ref(false)
+const jinxiangInvoiceLoading = ref(false)
+const daodandengjiLoading = ref(false)
+const shoukuanrenlingLoading = ref(false)
+const xiaoshoujiesuanLoading = ref(false)
+const dailijiesuanLoading = ref(false)
+
+// 处理文件选择（复用原有逻辑）
 const handleFileChange = (file) => {
   const isExcel = file.name.endsWith('.xlsx') || file.name.endsWith('.xls')
-
   if (!isExcel) {
     ElMessage.error('只能上传Excel文件!')
     uploadRef.value.handleRemove(file)
     return false
   }
-
   const isLt50M = file.size / 1024 / 1024 < 50
   if (!isLt50M) {
     ElMessage.error('Excel文件大小不能超过50MB!')
     uploadRef.value.handleRemove(file)
     return false
   }
-
   fileList.value = [file]
   errorMessage.value = ''
   successMessage.value = ''
 }
 
-// 处理文件移除
+// 处理文件移除（复用原有逻辑）
 const handleFileRemove = () => {
   fileList.value = []
   errorMessage.value = ''
   successMessage.value = ''
 }
 
-// 执行采销导入
-const handleImport = async () => {
+// 重置（重置所有加载状态）
+const handleReset = () => {
+  fileList.value = []
+  errorMessage.value = ''
+  successMessage.value = ''
+  uploadRef.value?.clearFiles()
+  // 重置批量加载状态
+  psExeLoading.value = false
+  allLoading.value = false
+  // 重置单独模块加载状态
+  stockLoading.value = false
+  payLoading.value = false
+  feePayLoading.value = false
+  feeInvoiceLoading.value = false
+  jinxiangInvoiceLoading.value = false
+  daodandengjiLoading.value = false
+  shoukuanrenlingLoading.value = false
+  xiaoshoujiesuanLoading.value = false
+  dailijiesuanLoading.value = false
+}
+
+// 通用导入方法（抽离重复逻辑）
+const commonImport = async (apiMethod, loadingRef, businessName) => {
   if (!fileList.value.length) {
     ElMessage.warning('请先选择Excel文件')
     return
   }
-
   const file = fileList.value[0].raw
-  loading.value = true
+  loadingRef.value = true
   errorMessage.value = ''
   successMessage.value = ''
-
   try {
-    console.log('开始上传采销文件:', file.name)
-
-    // 调用后端API
-    const response = await importPsExeExcel(file)
-
-    console.log('API响应成功:', response.status)
-    console.log('响应数据:', response.data)
-
-    // 处理响应数据
+    console.log(`开始上传${businessName}文件:`, file.name)
+    const response = await apiMethod(file)
     if (response.status === 200) {
       const resultData = response.data
-
       if (resultData.code === 200 || resultData.success === true) {
-        successMessage.value = resultData.message || '采销执行表导入成功'
-        ElMessage.success('采销执行表导入成功')
+        successMessage.value = resultData.message || `${businessName}导入成功`
+        ElMessage.success(`${businessName}导入成功`)
       } else {
-        errorMessage.value = resultData.message || '采销执行表导入失败'
-        ElMessage.error('采销执行表导入失败')
+        errorMessage.value = resultData.message || `${businessName}导入失败`
+        ElMessage.error(`${businessName}导入失败`)
       }
     }
-
   } catch (error) {
-    console.error('详细错误信息:', error)
+    console.error(`${businessName}导入错误:`, error)
     errorMessage.value = error.message || '网络请求失败'
-    ElMessage.error('采销执行表导入失败')
+    ElMessage.error(`${businessName}导入失败`)
   } finally {
-    loading.value = false
+    loadingRef.value = false
   }
 }
 
-// 新增：执行库存业务导入
-const handleStockImport = async () => {
-  if (!fileList.value.length) {
-    ElMessage.warning('请先选择Excel文件')
-    return
-  }
+// 1. 采销执行表导入（单独）
+const handlePsExeImport = () => {
+  commonImport(importPsExeExcel, psExeLoading, '采销执行表')
+}
 
-  const file = fileList.value[0].raw
-  stockLoading.value = true
-  errorMessage.value = ''
-  successMessage.value = ''
+// 2. 导入所有业务（批量）
+const handleImportAll = () => {
+  commonImport(importAllExcel, allLoading, '所有业务')
+}
 
-  try {
-    console.log('开始上传库存文件:', file.name)
+// 3. 库存业务导入（单独）
+const handleStockImport = () => {
+  commonImport(importStockExcel, stockLoading, '库存业务')
+}
 
-    // 调用库存导入API
-    const response = await importStockExcel(file)
+// 4. 付款业务导入（单独）
+const handlePayImport = () => {
+  commonImport(importPayExcel, payLoading, '货款付款')
+}
 
-    console.log('库存API响应成功:', response.status)
-    console.log('响应数据:', response.data)
+// 5. 费用付款业务导入（单独）
+const handleFeePayImport = () => {
+  commonImport(importFeePayExcel, feePayLoading, '费用付款')
+}
 
-    // 处理响应数据
-    if (response.status === 200) {
-      const resultData = response.data
+// 6. 费用发票结算导入（单独）
+const handleFeeInvoiceImport = () => {
+  commonImport(importFeeInvoiceExcel, feeInvoiceLoading, '费用发票结算业务')
+}
 
-      if (resultData.code === 200 || resultData.success === true) {
-        successMessage.value = resultData.data || '库存业务导入成功'
-        ElMessage.success('库存业务导入成功')
-      } else {
-        errorMessage.value = resultData.data || '库存业务导入失败'
-        ElMessage.error('库存业务导入失败')
-      }
-    }
+// 7. 进项发票结算导入（单独）
+const handleJinxiangInvoiceImport = () => {
+  commonImport(importJinxiangInvoiceExcel, jinxiangInvoiceLoading, '进项发票结算业务')
+}
 
-  } catch (error) {
-    console.error('库存导入错误信息:', error)
-    errorMessage.value = error.message || '网络请求失败'
-    ElMessage.error('库存业务导入失败')
-  } finally {
-    stockLoading.value = false
-  }
+// 8. 到货登记结算导入（单独）
+const handleDaodandengjiImport = () => {
+  commonImport(importDaodandengjiExcel, daodandengjiLoading, '到货登记结算业务')
 }
 
-// 重置
-const handleReset = () => {
-  fileList.value = []
-  errorMessage.value = ''
-  successMessage.value = ''
-  uploadRef.value?.clearFiles()
+// 9. 收款认领结算导入（单独）
+const handleShoukuanrenlingImport = () => {
+  commonImport(importShoukuanrenlingExcel, shoukuanrenlingLoading, '收款认领结算业务')
+}
+
+// 10. 销售结算开票导入（单独）
+const handleXiaoshoujiesuanImport = () => {
+  commonImport(importXiaoshoujiesuanExcel, xiaoshoujiesuanLoading, '销售结算开票业务')
+}
+
+// 11. 代理结算业务导入（单独）
+const handleDailijiesuanImport = () => {
+  commonImport(importDailijiesuanExcel, dailijiesuanLoading, '代理结算业务')
 }
 </script>
 
 <style scoped>
-/* 样式保持不变 */
 .excel-import-simple {
   padding: 20px;
-  max-width: 900px;
+  max-width: 1200px;
   margin: 0 auto;
 }
 
 .import-card {
-  min-height: 500px;
+  min-height: 600px;
 }
 
 .card-header {
@@ -262,16 +408,34 @@ const handleReset = () => {
   margin: 20px 0;
 }
 
-.action-buttons {
+/* 批量按钮样式 */
+.action-buttons.batch-buttons {
   text-align: center;
   margin: 20px 0;
 }
 
-.error-message-area {
-  margin-top: 20px;
+/* 单独模块按钮样式 */
+.action-buttons.single-buttons {
+  text-align: left;
+  margin: 0 20px 20px;
+  border-top: 1px dashed #e6e6e6;
+  padding-top: 20px;
+}
+
+.single-buttons-group {
+  display: flex;
+  align-items: center;
+}
+
+.group-title {
+  font-size: 14px;
+  color: #666;
+  width: 80px;
+  text-align: right;
+  margin-right: 10px;
 }
 
-.success-message-area {
+.error-message-area, .success-message-area {
   margin-top: 20px;
 }