From 62011a1463fd806eff8f6deb23a2c2d36ba0af96 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 26 Aug 2025 09:30:53 +0800
Subject: [PATCH] v1.9 修复合同上传附件bug 修复

---
 src/api/contract/contractDetailFileApi.js      |  15 +++++++++++----
 src/components/contract/contractDetailFile.vue |  37 ++++++++++++++++++++++---------------
 src/components/contract/editContract.vue       | 135 +++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------
 src/views/contract/addContractList.vue         |   6 ++++--
 src/views/contract/newContractManageList.vue   |   2 +-
 5 files changed, 77 insertions(+), 118 deletions(-)

diff --git a/src/api/contract/contractDetailFileApi.js b/src/api/contract/contractDetailFileApi.js
index 2fc5692..6a120a0 100644
--- a/src/api/contract/contractDetailFileApi.js
+++ b/src/api/contract/contractDetailFileApi.js
@@ -1,9 +1,16 @@
 import request from '@/utils/request'
 
 export function queryContractFile(params) {
-  return request({
-    url: '/contractFile/queryContractFile',
-    method: 'get',
-    params
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/contractFile/queryContractFile',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
   })
 }
\ No newline at end of file
diff --git a/src/components/contract/contractDetailFile.vue b/src/components/contract/contractDetailFile.vue
index c0298cc..3fac9f9 100644
--- a/src/components/contract/contractDetailFile.vue
+++ b/src/components/contract/contractDetailFile.vue
@@ -2,17 +2,19 @@
   <div class="margin-top">
     <el-row class="margin-top-lg"></el-row>
     <div class="margin-top">
-      <el-row>
-        <el-col :span="10">
-          <el-form-item :label="$t('contractDetailFile.relatedFiles')">
-            <div v-for="(file,index) in contractDetailFileInfo.files" :key="index" style="margin-left: 50px;">
-              <el-link type="primary" @click="_viewFile(file)">
-                {{ file.fileRealName }}
-              </el-link>
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form :model="contractDetailFileInfo" label-width="120px" class="text-left">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item :label="$t('contractDetailFile.relatedFiles')">
+              <div v-for="(file, index) in contractDetailFileInfo.files" :key="index" style="margin-left: 50px;">
+                <el-link type="primary" @click="_viewFile(file)">
+                  {{ file.fileRealName }}
+                </el-link>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
   </div>
 </template>
@@ -30,21 +32,25 @@ export default {
         contractId: '',
         roomNum: '',
         allOweFeeAmount: '0'
-      }
+      },
+      pagination: {
+        page: 1,
+        row: 100
+      },
     }
   },
   methods: {
     open(data) {
       this.contractDetailFileInfo.contractId = data.contractId
-      this._loadContractDetailFileData(1, this.pagination.pageSize)
+      this._loadContractDetailFileData(1, this.pagination.row)
     },
     _loadContractDetailFileData(page, row) {
       const params = {
         contractId: this.contractDetailFileInfo.contractId,
         page: page || 1,
-        row: row || 100
+        row: row || this.pagination.row
       }
-      
+
       queryContractFile(params).then(response => {
         this.contractDetailFileInfo.files = response.data
       }).catch(error => {
@@ -65,6 +71,7 @@ export default {
 .margin-top {
   margin-top: 20px;
 }
+
 .margin-top-lg {
   margin-top: 30px;
 }
diff --git a/src/components/contract/editContract.vue b/src/components/contract/editContract.vue
index 290b26b..cd10d5e 100644
--- a/src/components/contract/editContract.vue
+++ b/src/components/contract/editContract.vue
@@ -1,42 +1,25 @@
 <template>
-  <el-dialog
-    :title="$t('contractManage.edit.title')"
-    :visible.sync="visible"
-    width="70%"
-    :before-close="handleClose"
-  >
+  <el-dialog :title="$t('contractManage.edit.title')" :visible.sync="visible" width="70%" :before-close="handleClose">
     <el-form :model="editContractInfo" label-width="120px" class="text-left" ref="editForm">
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.contractName')" prop="contractName" required>
-            <el-input
-              v-model="editContractInfo.contractName"
-              :placeholder="$t('contractManage.edit.contractNamePlaceholder')"
-            />
+            <el-input v-model="editContractInfo.contractName"
+              :placeholder="$t('contractManage.edit.contractNamePlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.contractCode')" prop="contractCode" required>
-            <el-input
-              v-model="editContractInfo.contractCode"
-              :placeholder="$t('contractManage.edit.contractCodePlaceholder')"
-            />
+            <el-input v-model="editContractInfo.contractCode"
+              :placeholder="$t('contractManage.edit.contractCodePlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.contractType')" prop="contractType" required>
-            <el-select 
-              v-model="editContractInfo.contractType" 
-              :placeholder="$t('contractManage.edit.contractTypePlaceholder')"
-              style="width:100%"
-              disabled
-            >
-              <el-option
-                v-for="item in editContractInfo.contractTypes"
-                :key="item.contractTypeId"
-                :label="item.typeName"
-                :value="item.contractTypeId"
-              />
+            <el-select v-model="editContractInfo.contractType"
+              :placeholder="$t('contractManage.edit.contractTypePlaceholder')" style="width:100%" disabled>
+              <el-option v-for="item in editContractInfo.contractTypes" :key="item.contractTypeId"
+                :label="item.typeName" :value="item.contractTypeId" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -45,26 +28,18 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.partyA')" prop="partyA" required>
-            <el-input
-              v-model="editContractInfo.partyA"
-              :placeholder="$t('contractManage.edit.partyAPlaceholder')"
-            />
+            <el-input v-model="editContractInfo.partyA" :placeholder="$t('contractManage.edit.partyAPlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.aContacts')" prop="aContacts" required>
-            <el-input
-              v-model="editContractInfo.aContacts"
-              :placeholder="$t('contractManage.edit.aContactsPlaceholder')"
-            />
+            <el-input v-model="editContractInfo.aContacts"
+              :placeholder="$t('contractManage.edit.aContactsPlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.aLink')" prop="aLink" required>
-            <el-input
-              v-model="editContractInfo.aLink"
-              :placeholder="$t('contractManage.edit.aLinkPlaceholder')"
-            />
+            <el-input v-model="editContractInfo.aLink" :placeholder="$t('contractManage.edit.aLinkPlaceholder')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -72,26 +47,18 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.partyB')" prop="partyB" required>
-            <el-input
-              v-model="editContractInfo.partyB"
-              :placeholder="$t('contractManage.edit.partyBPlaceholder')"
-            />
+            <el-input v-model="editContractInfo.partyB" :placeholder="$t('contractManage.edit.partyBPlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.bContacts')" prop="bContacts" required>
-            <el-input
-              v-model="editContractInfo.bContacts"
-              :placeholder="$t('contractManage.edit.bContactsPlaceholder')"
-            />
+            <el-input v-model="editContractInfo.bContacts"
+              :placeholder="$t('contractManage.edit.bContactsPlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.bLink')" prop="bLink" required>
-            <el-input
-              v-model="editContractInfo.bLink"
-              :placeholder="$t('contractManage.edit.bLinkPlaceholder')"
-            />
+            <el-input v-model="editContractInfo.bLink" :placeholder="$t('contractManage.edit.bLinkPlaceholder')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -99,26 +66,19 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.operator')" prop="operator" required>
-            <el-input
-              v-model="editContractInfo.operator"
-              :placeholder="$t('contractManage.edit.operatorPlaceholder')"
-            />
+            <el-input v-model="editContractInfo.operator"
+              :placeholder="$t('contractManage.edit.operatorPlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.operatorLink')" prop="operatorLink" required>
-            <el-input
-              v-model="editContractInfo.operatorLink"
-              :placeholder="$t('contractManage.edit.operatorLinkPlaceholder')"
-            />
+            <el-input v-model="editContractInfo.operatorLink"
+              :placeholder="$t('contractManage.edit.operatorLinkPlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.amount')" prop="amount">
-            <el-input
-              v-model="editContractInfo.amount"
-              :placeholder="$t('contractManage.edit.amountPlaceholder')"
-            />
+            <el-input v-model="editContractInfo.amount" :placeholder="$t('contractManage.edit.amountPlaceholder')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -126,46 +86,32 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.startTime')" prop="startTime" required>
-            <el-date-picker
-              v-model="editContractInfo.startTime"
-              type="datetime"
-              :placeholder="$t('contractManage.edit.startTimePlaceholder')"
-              style="width:100%"
-            />
+            <el-date-picker v-model="editContractInfo.startTime" type="datetime"
+              :placeholder="$t('contractManage.edit.startTimePlaceholder')" style="width:100%" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.endTime')" prop="endTime" required>
-            <el-date-picker
-              v-model="editContractInfo.endTime"
-              type="datetime"
-              :placeholder="$t('contractManage.edit.endTimePlaceholder')"
-              style="width:100%"
-            />
+            <el-date-picker v-model="editContractInfo.endTime" type="datetime"
+              :placeholder="$t('contractManage.edit.endTimePlaceholder')" style="width:100%" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.signingTime')" prop="signingTime" required>
-            <el-date-picker
-              v-model="editContractInfo.signingTime"
-              type="datetime"
-              :placeholder="$t('contractManage.edit.signingTimePlaceholder')"
-              style="width:100%"
-            />
+            <el-date-picker v-model="editContractInfo.signingTime" type="datetime"
+              :placeholder="$t('contractManage.edit.signingTimePlaceholder')" style="width:100%" />
           </el-form-item>
         </el-col>
       </el-row>
 
       <!-- 合同类型规格 -->
-      <div v-for="(item,index) in editContractInfo.contractTypeSpecs" :key="index">
+      <div v-for="(item, index) in editContractInfo.contractTypeSpecs" :key="index">
         <el-row :gutter="20" v-if="index % 3 === 0">
           <el-col :span="8" v-for="i in 3" :key="i">
             <div v-if="editContractInfo.contractTypeSpecs[index + i - 1]">
               <el-form-item :label="editContractInfo.contractTypeSpecs[index + i - 1].specName">
-                <el-input
-                  v-model="editContractInfo.contractTypeSpecs[index + i - 1].value"
-                  :placeholder="editContractInfo.contractTypeSpecs[index + i - 1].specHoldplace"
-                />
+                <el-input v-model="editContractInfo.contractTypeSpecs[index + i - 1].value"
+                  :placeholder="editContractInfo.contractTypeSpecs[index + i - 1].specHoldplace" />
               </el-form-item>
             </div>
           </el-col>
@@ -177,18 +123,14 @@
         <el-button type="primary" @click="addFileStep">
           {{ $t('contractManage.edit.addFile') }}
         </el-button>
-        <div v-for="(item,index) in editContractInfo.contractFilePo" :key="index" style="margin-top:10px">
+        <div v-for="(item, index) in editContractInfo.contractFilePo" :key="index" style="margin-top:10px">
           <el-row :gutter="10">
             <el-col :span="2">
-              <span>{{ $t('contractManage.edit.fileIndex', {index: index+1}) }}</span>
+              <span>{{ $t('contractManage.edit.fileIndex', { index: index + 1 }) }}</span>
             </el-col>
             <el-col :span="10">
-              <input
-                type="file"
-                style="display:inline-block;width:100%"
-                @change="getFile($event,index)"
-                accept=".png,.pdf,.jpg"
-              />
+              <input type="file" style="display:inline-block;width:100%" @change="getFile($event, index)"
+                accept=".png,.pdf,.jpg" />
             </el-col>
             <el-col :span="6">
               <span>{{ item.fileRealName }}</span>
@@ -211,7 +153,8 @@
 </template>
 
 <script>
-import { updateContract, queryContractTypeSpec, queryContractFile, uploadContactFile } from '@/api/contract/contractManageApi'
+import { updateContract, queryContractTypeSpec, queryContractFile } from '@/api/contract/contractManageApi'
+import { uploadFile } from '@/api/system/paymentPoolApi'
 
 export default {
   name: 'EditContract',
@@ -352,8 +295,8 @@ export default {
         const formData = new FormData()
         formData.append('uploadFile', this.editContractInfo.tempfile)
 
-        const fileSaveName = await uploadContactFile(formData)
-        this.editContractInfo.contractFilePo[index].fileSaveName = fileSaveName
+        const data = await uploadFile(formData,{})
+        this.editContractInfo.contractFilePo[index].fileSaveName = data.realFileName
         this.$message.success(this.$t('contractManage.edit.uploadSuccess'))
       } catch (error) {
         console.error('上传文件失败:', error)
diff --git a/src/views/contract/addContractList.vue b/src/views/contract/addContractList.vue
index 8803a2f..dab4ba7 100644
--- a/src/views/contract/addContractList.vue
+++ b/src/views/contract/addContractList.vue
@@ -235,6 +235,7 @@ import { saveContract, queryContractType, queryContractPartya, queryContractType
 import PurchaseApprovers from '@/components/contract/purchaseApprovers'
 import SearchRoom from '@/components/room/searchRoom'
 import SearchOwner from '@/components/owner/SearchOwner'
+import { uploadFile } from '@/api/system/paymentPoolApi'
 
 export default {
   name: 'AddContractList',
@@ -385,7 +386,7 @@ export default {
       this.addContractInfo.contractFilePo[index].fileRealName = this.addContractInfo.tempfile.name
       this._importData(index)
     },
-    _importData(index) {
+   async _importData(index) {
       console.log(index)
       const _fileName = this.addContractInfo.tempfile.name
       const _suffix = _fileName.substring(_fileName.lastIndexOf('.') + 1)
@@ -396,7 +397,8 @@ export default {
 
       const formData = new FormData()
       formData.append("uploadFile", this.addContractInfo.tempfile)
-
+      const  data  = await uploadFile(formData, {})
+      this.addContractInfo.contractFilePo[index].fileSaveName = data.realFileName
       // 这里需要实现文件上传逻辑
       // uploadContactFile(formData).then(response => {
       //   this.addContractInfo.contractFilePo[index].fileSaveName = response.data
diff --git a/src/views/contract/newContractManageList.vue b/src/views/contract/newContractManageList.vue
index b074f86..1d2fa1a 100644
--- a/src/views/contract/newContractManageList.vue
+++ b/src/views/contract/newContractManageList.vue
@@ -38,7 +38,7 @@
     <el-card class="table-card">
       <div slot="header" class="flex justify-between">
         <span>{{ $t('newContractManage.list.title') }}</span>
-        <el-button type="primary" size="small"  @click="handleAdd">
+        <el-button type="primary" size="small" @click="handleAdd">
           <i class="el-icon-plus"></i>
           {{ $t('newContractManage.list.draft') }}
         </el-button>
--
libgit2 0.21.4