From 664f42918d5a812d0bcdd9fd21b6de1080c4e347 Mon Sep 17 00:00:00 2001
From: zhouhaibin <zhouhaibin@qq.com>
Date: Tue, 29 Apr 2025 14:06:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contractReview/ContractualInfo/index.ts   |  10 +-
 .../ContractualProductInfo/index.ts           |  10 +-
 .../ContractualTasks/ContractualShowModal.vue | 167 ++++++++-
 .../jyjcontractualtaskbatch/index.vue         |  11 +-
 .../ContractualInfo/ContractualInfoEdit.vue   |  95 +++--
 .../contractualInfo/ContractualInfo/index.vue |   4 +-
 .../ContractualProductInfoEdit.vue            | 353 +++++++++++-------
 .../ContractualProductInfo/index.vue          |  52 +--
 8 files changed, 489 insertions(+), 213 deletions(-)

diff --git a/src/api/contractReview/ContractualInfo/index.ts b/src/api/contractReview/ContractualInfo/index.ts
index 4aa5431..7f0483c 100644
--- a/src/api/contractReview/ContractualInfo/index.ts
+++ b/src/api/contractReview/ContractualInfo/index.ts
@@ -35,7 +35,15 @@ export const getContractualInfo = (id: ID): AxiosPromise<ContractualInfoVO> => {
     method: 'get'
   });
 };
-
+/**
+ * 查询合同信息详细
+ */
+export const getContractualInfoByTaskid = (id: ID): AxiosPromise<ContractualInfoVO> => {
+  return request({
+    url: '/productManagement/ContractualInfo/getInfoByTaskid/' + id,
+    method: 'get'
+  });
+};
 /**
  * 新增合同信息
  */
diff --git a/src/api/contractReview/ContractualProductInfo/index.ts b/src/api/contractReview/ContractualProductInfo/index.ts
index 9ef928c..7c5f32a 100644
--- a/src/api/contractReview/ContractualProductInfo/index.ts
+++ b/src/api/contractReview/ContractualProductInfo/index.ts
@@ -35,7 +35,15 @@ export const getContractualProductInfo = (id: ID): AxiosPromise<ContractualProdu
     method: 'get'
   });
 };
-
+/**
+ * 查询合同产品信息详细
+ */
+export const getContractualProductInfoByTaskid = (id: ID): AxiosPromise<ContractualProductInfoVO> => {
+  return request({
+    url: '/productManagement/ContractualProductInfo/getInfoByTaskid/' + id,
+    method: 'get'
+  });
+};
 /**
  * 新增合同产品信息
  */
diff --git a/src/views/contractreview/ContractualTasks/ContractualShowModal.vue b/src/views/contractreview/ContractualTasks/ContractualShowModal.vue
index b512143..cd2673d 100644
--- a/src/views/contractreview/ContractualTasks/ContractualShowModal.vue
+++ b/src/views/contractreview/ContractualTasks/ContractualShowModal.vue
@@ -4,6 +4,8 @@
         <h2 class="modal-title">合同审查详情</h2>
         <div class="modal-actions">
           <el-button type="primary" @click="showTextDialog">查看识别内容</el-button>
+          <el-button type="primary" @click="showContractInfoEdit">编辑合同信息</el-button>
+          <el-button type="primary" @click="showProductInfoEdit">编辑产品信息</el-button>
           <el-button type="primary" @click="submit">提交</el-button>
           <el-button @click="handleClose">关闭</el-button>
         </div>
@@ -20,6 +22,8 @@
         </div>
       </div>
     </div>
+    
+    <!-- 文本对话框 -->
     <el-dialog
       v-model="textDialogVisible"
       title="合同文本内容"
@@ -36,6 +40,48 @@
         </span>
       </template>
     </el-dialog>
+    
+    <!-- 合同信息编辑对话框 -->
+    <el-drawer
+      v-model="contractInfoDialogVisible"
+      title="编辑合同信息"
+      size="100%"
+      :destroy-on-close="true"
+      :show-close="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="true"
+      :with-header="false"
+      direction="rtl"
+      class="edit-dialog"
+    >
+      <ContractualInfoEdit 
+        v-if="contractInfoDialogVisible" 
+        :record="contractInfoData" 
+        @close="contractInfoDialogVisible = false"
+        @success="handleContractInfoSuccess"
+      />
+    </el-drawer>
+    
+    <!-- 产品信息编辑对话框 -->
+    <el-drawer
+      v-model="productInfoDialogVisible"
+      title="编辑产品信息"
+      size="100%"
+      :destroy-on-close="true"
+      :show-close="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="true"
+      :with-header="false"
+      direction="rtl"
+      class="edit-dialog"
+    >
+      <ContractualProductInfoEdit 
+        v-if="productInfoDialogVisible" 
+        :record="productInfoData" 
+        @close="productInfoDialogVisible = false"
+        @success="handleProductInfoSuccess"
+      />
+    </el-drawer>
 </template>
 <script lang="ts" setup>
   import { ref, onMounted, nextTick, computed } from 'vue';
@@ -45,6 +91,11 @@
   import { getPdfFile } from '@/api/contractReview/JyjcontractualTaskBatch';
   import showResultCard from './showResultCard.vue';
   import { cloneDeep } from 'lodash-es';
+  // 导入编辑组件
+  import ContractualInfoEdit from '@/views/contractualInfo/ContractualInfo/ContractualInfoEdit.vue';
+  import ContractualProductInfoEdit from '@/views/contractualInfo/ContractualProductInfo/ContractualProductInfoEdit.vue';
+  import { getContractualProductInfoByTaskid } from '@/api/contractReview/ContractualProductInfo';
+  import { getContractualInfoByTaskid } from '@/api/contractReview/ContractualInfo';
 
   // 定义Props
   const props = defineProps({
@@ -69,6 +120,13 @@
   const contractText = ref<string>('');
   const textDialogVisible = ref(false);
   const historycardList = ref<any[]>([]);
+  
+  // 编辑相关数据
+  const contractInfoDialogVisible = ref(false);
+  const productInfoDialogVisible = ref(false);
+  const contractInfoData = ref<any>({});
+  const productInfoData = ref<any>({});
+  
   // 计算属性：获取文件类型
   const fileType = computed(() => {
     const fileName = props.record.documentName?.toLowerCase() || '';
@@ -85,13 +143,15 @@
     // 获取文件
     try {
       const response = await getPdfFile(props.record.id);
-      if (response) {
+      if (response instanceof Blob) {
         pdfUrl.value = URL.createObjectURL(response);
         
         // 文件加载完成后自动适应宽度
         nextTick(() => {
           setTimeout(fitToWidth, 500);
         });
+      } else {
+        console.error('获取PDF文件失败：返回的不是Blob对象');
       }
     } catch (error) {
       console.error('获取PDF文件失败:', error);
@@ -155,7 +215,7 @@
     if (!contractText.value) {
       try {
         const contentRes = await getContractulContent(props.record.id);
-        contractText.value = contentRes || '无法获取合同文本内容';
+        contractText.value = contentRes.data || '无法获取合同文本内容';
       } catch (error) {
         console.error('获取合同文本内容失败:', error);
         contractText.value = '获取合同文本内容失败';
@@ -168,6 +228,97 @@
   const closeTextDialog = () => {
     textDialogVisible.value = false;
   };
+  
+  // 显示合同信息编辑对话框
+  const showContractInfoEdit = async () => {
+    try {
+      // 显示加载中提示
+      loading.value = true;
+      
+      // 从API获取合同信息数据
+      const res = await getContractualInfoByTaskid(props.record.id);
+      
+      if (res.code === 200 && res.data) {
+        // 如果获取成功，使用获取到的数据
+        contractInfoData.value = {
+          ...res.data,
+          taskId: props.record.id
+        };
+      } else {
+        // 如果获取失败，使用默认值
+        contractInfoData.value = {
+          id: '',
+          taskId: props.record.id,
+          fileName: props.record.documentName,
+          purchaserName: '',
+          supplierName: '',
+          signDate: '',
+          contractAmount: ''
+        };
+      }
+      
+      // 显示编辑对话框
+      contractInfoDialogVisible.value = true;
+    } catch (error) {
+      console.error('获取合同信息失败:', error);
+      ElMessage.error('获取合同信息失败，请重试');
+    } finally {
+      loading.value = false;
+    }
+  };
+  
+  // 显示产品信息编辑对话框
+  const showProductInfoEdit = async () => {
+    try {
+      // 显示加载中提示
+      loading.value = true;
+      
+      // 从API获取产品信息数据
+      const res = await getContractualProductInfoByTaskid(props.record.id);
+      
+      if (res.code === 200 && res.data) {
+        // 如果获取成功，使用获取到的数据
+        productInfoData.value =res.data;
+      } else {
+        // 如果获取失败，使用默认值
+        productInfoData.value = {
+          id: '',
+          taskId: props.record.id,
+          fileName: props.record.documentName,
+          unitName: '',
+          brand: '',
+          versionStr: '',
+          cpuModel: '',
+          type: '',
+          unitPrice: 0,
+          quantity: 0,
+          totalPrice: 0
+        };
+      }
+      
+      // 显示编辑对话框
+      productInfoDialogVisible.value = true;
+    } catch (error) {
+      console.error('获取产品信息失败:', error);
+      ElMessage.error('获取产品信息失败，请重试');
+    } finally {
+      loading.value = false;
+    }
+  };
+  
+  // 处理合同信息编辑成功
+  const handleContractInfoSuccess = (data) => {
+    ElMessage.success('合同信息更新成功');
+    // 可以在这里更新本地数据或重新加载数据
+    emit('reload');
+  };
+  
+  // 处理产品信息编辑成功
+  const handleProductInfoSuccess = (data) => {
+    ElMessage.success('产品信息更新成功');
+    // 可以在这里更新本地数据或重新加载数据
+    emit('reload');
+  };
 
   // 适应宽度
   const fitToWidth = () => {
@@ -438,4 +589,16 @@
     height: 100%;
     overflow-y: auto;
   }
+  
+  /* 编辑对话框样式 */
+  :deep(.edit-dialog .el-dialog) {
+    height: 80vh !important;
+    max-width: 1600px;
+  }
+  
+  :deep(.edit-dialog .el-dialog__body) {
+    height: calc(100% - 120px);
+    padding: 0;
+    overflow: hidden;
+  }
 </style>
diff --git a/src/views/contractreview/jyjcontractualtaskbatch/index.vue b/src/views/contractreview/jyjcontractualtaskbatch/index.vue
index dd9a8d5..eb468ec 100644
--- a/src/views/contractreview/jyjcontractualtaskbatch/index.vue
+++ b/src/views/contractreview/jyjcontractualtaskbatch/index.vue
@@ -92,7 +92,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <!-- <el-table-column prop="irrelevantCount" label="非审查范围数量" width="130">
+              <el-table-column prop="irrelevantCount" label="非审查范围数量" width="130">
                 <template #default="scope">
                   <div class="count-cell">
                     <div>{{ scope.row.irrelevantCount }}</div>
@@ -108,7 +108,7 @@
                     </div>
                   </div>
                 </template>
-              </el-table-column> -->
+              </el-table-column>
               <el-table-column prop="progress" label="进度" >
                 <template #default="scope">
                   <div class="progress-column">
@@ -196,7 +196,7 @@
       </el-table-column>
       
       <!-- 非审查范围数量 -->
-      <!-- <el-table-column prop="irrelevantCount" label="非审查范围数量" width="130">
+      <el-table-column prop="irrelevantCount" label="非审查范围数量" width="130">
         <template #default="scope">
           <div class="count-cell">
             <div>{{ scope.row.irrelevantCount }}</div>
@@ -212,7 +212,7 @@
             </div>
           </div>
         </template>
-      </el-table-column> -->
+      </el-table-column>
       
       <!-- 审核失败数量 -->
       <!-- <el-table-column prop="failCount" label="审核失败数量" width="100">
@@ -453,6 +453,7 @@ function calculateParentTotals(parentItem: any) {
   let approvedCount = 0;
   let passCount = 0;
   let rejectCount = 0;
+  let irrelevantCount=0;
   
   // 计算子项的和
   parentItem.children.forEach(child => {
@@ -460,6 +461,7 @@ function calculateParentTotals(parentItem: any) {
     approvedCount += Number(child.approvedCount || 0);
     passCount += Number(child.passCount || 0);
     rejectCount += Number(child.rejectCount || 0);
+    irrelevantCount+=Number(child.irrelevantCount || 0);
   });
   
   // 更新父项的数据
@@ -467,6 +469,7 @@ function calculateParentTotals(parentItem: any) {
   parentItem.approvedCount = approvedCount;
   parentItem.passCount = passCount;
   parentItem.rejectCount = rejectCount;
+  parentItem.irrelevantCount=irrelevantCount;
   
   // 计算进度
   if (totalContracts > 0) {
diff --git a/src/views/contractualInfo/ContractualInfo/ContractualInfoEdit.vue b/src/views/contractualInfo/ContractualInfo/ContractualInfoEdit.vue
index e8843ed..c5486f6 100644
--- a/src/views/contractualInfo/ContractualInfo/ContractualInfoEdit.vue
+++ b/src/views/contractualInfo/ContractualInfo/ContractualInfoEdit.vue
@@ -1,21 +1,21 @@
 <template>
-  <div class="h-full">
-    <div class="modal-header">
-      <h2 class="modal-title">编辑合同信息</h2>
-      <div class="modal-actions">
+  <div class="container">
+    <div class="header">
+      <h2 class="title">编辑合同信息</h2>
+      <div class="actions">
         <el-button type="primary" @click="handleSubmit">保存</el-button>
         <el-button @click="handleClose">关闭</el-button>
       </div>
     </div>
     
-    <div class="grid grid-cols-2 gap-2 h-full">
+    <div class="content">
       <!-- 左侧PDF显示区域 -->
-      <div class="col-span-1 h-full overflow-auto">
-        <embed :src="pdfUrl" type="application/pdf" width="100%" height="100%" class="pdf-embed" />
+      <div class="pdf-area">
+        <embed :src="pdfUrl" type="application/pdf" width="100%" height="100%" />
       </div>
       
       <!-- 右侧编辑表单区域 -->
-      <div class="h-full overflow-auto">
+      <div class="form-area">
         <el-form
           ref="formRef"
           :model="formData"
@@ -55,7 +55,7 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, nextTick } from 'vue';
 import { ElMessage } from 'element-plus';
-import { updateContractualInfo } from '@/api/contractReview/ContractualInfo';
+import { updateContractualInfo,addContractualInfo } from '@/api/contractReview/ContractualInfo';
 import { getPdfFile } from '@/api/contractReview/JyjcontractualTaskBatch';
 
 defineOptions({ name: 'ContractualInfoEdit' });
@@ -76,6 +76,7 @@ const emit = defineEmits(['close', 'success']);
 const formRef = ref();
 const formData = reactive({
   id: '',
+  taskId: props.record.length > 0 ? props.record[0].taskId : '',
   fileName: '',
   purchaserName: '',
   supplierName: '',
@@ -136,11 +137,22 @@ const handleSubmit = async () => {
     
     loading.value = true;
     
-    // 调用API保存数据
-    const res = await updateContractualInfo(formData);
+    // 根据是否有id决定调用新增还是更新接口
+    let res;
+    if (formData.id) {
+      // 已存在的合同，调用更新接口
+      res = await updateContractualInfo(formData);
+    } else {
+      // 新增合同，调用新增接口
+      res = await addContractualInfo(formData);
+    }
     
     if (res.code === 200) {
-      ElMessage.success('保存成功');
+      ElMessage.success(formData.id ? '更新成功' : '新增成功');
+      // 如果是新增且返回了id，更新当前id
+      if (!formData.id && res.data && res.data.id) {
+        formData.id = res.data.id;
+      }
       emit('success', formData);
       handleClose();
     } else {
@@ -161,56 +173,59 @@ const handleClose = () => {
 </script>
 
 <style scoped>
-/* 头部样式 */
-.modal-header {
-  overflow: hidden;
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
   padding: 16px 24px;
   background-color: #f5f7fa;
   border-bottom: 1px solid #e4e7ed;
 }
 
-.modal-title {
-  float: left;
+.title {
   margin: 0;
   font-size: 18px;
   color: #303133;
 }
 
-.modal-actions {
-  float: right;
+.actions {
+  display: flex;
+  gap: 12px;
 }
 
-.modal-actions .el-button {
-  margin-left: 12px;
+.content {
+  display: flex;
+  flex: 1;
+  overflow: hidden;
 }
 
-/* 确保embed标签占满整个容器 */
-.pdf-embed {
-  display: block;
-  height: calc(100vh - 70px) !important; /* 减去头部的高度 */
-  border: none;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+.pdf-area {
+  width: 50%;
+  height: 100%;
+  border-right: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 
-/* 使网格容器填充整个可用空间 */
-.grid {
-  height: calc(100vh - 70px); /* 减去头部的高度 */
-  overflow: hidden;
+.pdf-area embed {
+  width: 100%;
+  height: 100%;
+  border: none;
 }
 
-/* 确保两列都有适当的滚动行为 */
-.col-span-1 {
+.form-area {
+  width: 50%;
   height: 100%;
   overflow-y: auto;
+  padding: 16px;
 }
 
-/* 表单样式 */
 .edit-form {
-  padding: 20px;
-}
-
-/* 全局高度 */
-.h-full {
-  height: 100%;
+  padding: 16px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/contractualInfo/ContractualInfo/index.vue b/src/views/contractualInfo/ContractualInfo/index.vue
index 512afd1..d429edb 100644
--- a/src/views/contractualInfo/ContractualInfo/index.vue
+++ b/src/views/contractualInfo/ContractualInfo/index.vue
@@ -47,7 +47,7 @@
     >
       <el-table-column type="selection" width="55" />
       <el-table-column v-for="col in tableColumns" :key="col.prop" :label="col.label" :prop="col.prop" />
-      <el-table-column label="操作" fixed="right" width="200">
+      <!-- <el-table-column label="操作" fixed="right" width="200">
         <template #default="{ row }">
           <el-button
             link
@@ -66,7 +66,7 @@
             </template>
           </el-popconfirm>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     
     <!-- 分页区域 -->
diff --git a/src/views/contractualInfo/ContractualProductInfo/ContractualProductInfoEdit.vue b/src/views/contractualInfo/ContractualProductInfo/ContractualProductInfoEdit.vue
index 303cc60..a4f48fa 100644
--- a/src/views/contractualInfo/ContractualProductInfo/ContractualProductInfoEdit.vue
+++ b/src/views/contractualInfo/ContractualProductInfo/ContractualProductInfoEdit.vue
@@ -1,140 +1,179 @@
 <template>
-    <div class="h-full">
-      <div class="modal-header">
-        <h2 class="modal-title">编辑合同产品信息</h2>
-        <div class="modal-actions">
-          <el-button type="primary" @click="handleSubmit">保存</el-button>
+    <div class="container">
+      <div class="header">
+        <h2 class="title">编辑合同产品信息</h2>
+        <div class="actions">
+          <el-button type="primary" @click="handleAddProduct">新增产品</el-button>
           <el-button @click="handleClose">关闭</el-button>
         </div>
       </div>
       
-      <div class="grid grid-cols-2 gap-2 h-full">
+      <div class="content">
         <!-- 左侧PDF显示区域 -->
-        <div class="col-span-1 h-full overflow-auto">
-          <embed :src="pdfUrl" type="application/pdf" width="100%" height="100%" class="pdf-embed" />
+        <div class="pdf-area">
+          <embed :src="pdfUrl" type="application/pdf" width="100%" height="100%" />
         </div>
         
         <!-- 右侧编辑表单区域 -->
-        <div class="h-full overflow-auto">
-          <el-form
-            ref="formRef"
-            :model="formData"
-            :rules="rules"
-            label-width="100px"
-            class="edit-form"
-          >
-            <el-form-item label="品牌" prop="brand">
-              <el-input v-model="formData.brand" placeholder="请输入品牌" />
-            </el-form-item>
-            <el-form-item label="型号(版本号)" prop="versionStr">
-              <el-input v-model="formData.versionStr" placeholder="请输入型号" />
-            </el-form-item>
-            <el-form-item label="CPU型号" prop="cpuModel">
-              <el-input v-model="formData.cpuModel" placeholder="请输入CPU型号" />
-            </el-form-item>
-            <el-form-item label="类型" prop="type">
-              <el-input v-model="formData.type" placeholder="请输入类型" />
-            </el-form-item>
-            <el-form-item label="单价" prop="unitPrice">
-              <el-input-number 
-                v-model="formData.unitPrice" 
-                :precision="0" 
-                :step="1" 
-                :min="0"
-                placeholder="请输入单价"
-              />
-            </el-form-item>
-            <el-form-item label="数量" prop="quantity">
-              <el-input-number 
-                v-model="formData.quantity" 
-                :min="0"
-                placeholder="请输入数量"
-              />
-            </el-form-item>
-            <el-form-item label="总价" prop="totalPrice">
-              <el-input-number 
-                v-model="formData.totalPrice" 
-                :precision="0" 
-                :step="1" 
-                :min="0"
-                placeholder="总价"
-                disabled
-              />
-            </el-form-item>
-          </el-form>
+        <div class="form-area">
+          <!-- 产品列表 -->
+          <div v-for="(product, index) in productList" :key="product.id || index" class="product-item">
+            <div class="product-header">
+              <h3>产品 #{{ index + 1 }}</h3>
+              <div class="product-actions">
+                <el-button type="primary" size="small" @click="handleSubmitSingle(index)">保存</el-button>
+                <el-button type="danger" size="small" @click="handleRemoveProduct(index)" v-if="productList.length > 1">
+                  删除
+                </el-button>
+              </div>
+            </div>
+            
+            <el-form
+              :ref="el => (formRefs[index] = el)"
+              :model="product"
+              label-width="100px"
+              class="edit-form"
+            >
+              <el-form-item label="品牌" prop="brand">
+                <el-input v-model="product.brand" placeholder="请输入品牌" />
+              </el-form-item>
+              <el-form-item label="型号(版本号)" prop="versionStr">
+                <el-input v-model="product.versionStr" placeholder="请输入型号" />
+              </el-form-item>
+              <el-form-item label="CPU型号" prop="cpuModel">
+                <el-input v-model="product.cpuModel" placeholder="请输入CPU型号" />
+              </el-form-item>
+              <el-form-item label="类型" prop="type">
+                <el-input v-model="product.type" placeholder="请输入类型" />
+              </el-form-item>
+              <el-form-item label="单价" prop="unitPrice">
+                <el-input-number 
+                  v-model="product.unitPrice" 
+                  :precision="0" 
+                  :step="1" 
+                  :min="0"
+                  placeholder="请输入单价"
+                />
+              </el-form-item>
+              <el-form-item label="数量" prop="quantity">
+                <el-input-number 
+                  v-model="product.quantity" 
+                  :min="0"
+                  placeholder="请输入数量"
+                />
+              </el-form-item>
+              <el-form-item label="总价" prop="totalPrice">
+                <el-input-number 
+                  v-model="product.totalPrice" 
+                  :precision="0" 
+                  :step="1" 
+                  :min="0"
+                  placeholder="总价"
+                  disabled
+                />
+              </el-form-item>
+            </el-form>
+            <el-divider v-if="index < productList.length - 1" />
+          </div>
         </div>
       </div>
     </div>
   </template>
   
   <script setup lang="ts">
-  import { ref, reactive, onMounted, nextTick, watch } from 'vue';
+  import { ref, reactive, onMounted, nextTick, watch, computed } from 'vue';
   import { ElMessage } from 'element-plus';
-  import { updateContractualProductInfo } from '@/api/contractReview/ContractualProductInfo';
+  import { updateContractualProductInfo,addContractualProductInfo } from '@/api/contractReview/ContractualProductInfo';
   import { getPdfFile } from '@/api/contractReview/JyjcontractualTaskBatch';
   
   defineOptions({ name: 'ContractualProductInfoEdit' });
   
+  // 定义产品类型接口
+  interface ProductInfo {
+    id: string | number;
+    taskId: string | number;
+    fileName: string;
+    unitName: string;
+    brand: string;
+    versionStr: string;
+    cpuModel: string;
+    type: string;
+    unitPrice: number;
+    quantity: number;
+    totalPrice: number;
+  }
+  
   // 定义Props
   const props = defineProps({
     record: {
-      type: Object,
+      type: Array as () => ProductInfo[],
       required: true,
-      default: () => ({})
+      default: () => []
     }
   });
   
   // 定义Emits
   const emit = defineEmits(['close', 'success']);
   
-  // 表单数据和校验规则
-  const formRef = ref();
-  const formData = reactive({
-    id: '',
-    taskId: '',
-    fileName: '',
-    unitName: '',
-    brand: '',
-    versionStr: '',
-    cpuModel: '',
-    type: '',
-    unitPrice: 0,
-    quantity: 0,
-    totalPrice: 0
-  });
-  
-  // 校验规则
-  const rules = {
-    brand: [{ required: true, message: '请输入品牌', trigger: 'blur' }],
+  // 创建空白产品模板
+  const createEmptyProduct = (): ProductInfo => {
+    return {
+      id: '',
+      taskId: props.record.length > 0 ? props.record[0].taskId : '',
+      fileName: props.record.length > 0 ? props.record[0].fileName : '',
+      unitName: '',
+      brand: '',
+      versionStr: '',
+      cpuModel: '',
+      type: '',
+      unitPrice: 0,
+      quantity: 0,
+      totalPrice: 0
+    };
   };
   
+  // 产品列表
+  const productList = ref<ProductInfo[]>([]);
+  
+  // 表单引用数组
+  const formRefs = ref<any[]>([]);
+  
   // PDF文件URL
   const pdfUrl = ref<string>('');
   const loading = ref(false);
   
-  // 监听单价和数量的变化，计算总价
-  watch(
-    () => [formData.unitPrice, formData.quantity],
-    ([newUnitPrice, newQuantity]) => {
-      formData.totalPrice = newUnitPrice * newQuantity;
-    },
-    { immediate: true }
-  );
+  // 监听每个产品的单价和数量变化，计算总价
+  watch(productList, () => {
+    productList.value.forEach(product => {
+      product.totalPrice = product.unitPrice * product.quantity;
+    });
+  }, { deep: true });
   
   // 初始化数据
   onMounted(async () => {
-    if (props.record) {
-      // 填充表单数据
-      Object.keys(formData).forEach(key => {
-        if (props.record[key] !== undefined) {
-          formData[key] = props.record[key];
-        }
+    if (props.record && props.record.length) {
+      // 填充产品列表数据
+      productList.value = props.record.map((item: ProductInfo) => {
+        const product = createEmptyProduct();
+        Object.keys(product).forEach(key => {
+          if (item[key as keyof ProductInfo] !== undefined) {
+            // @ts-ignore
+            product[key as keyof ProductInfo] = item[key as keyof ProductInfo];
+          }
+        });
+        return product;
       });
   
+      // 如果没有产品，添加一个空白产品
+      if (productList.value.length === 0) {
+        productList.value.push(createEmptyProduct());
+      }
+  
       // 尝试加载PDF文件
       try {
-        if (props.record.id) {
-          const response = await getPdfFile(props.record.taskId);
+        if (props.record.length > 0 && props.record[0].taskId) {
+          // @ts-ignore
+          const response = await getPdfFile(props.record[0].taskId);
           if (response instanceof Blob) {
             pdfUrl.value = URL.createObjectURL(response);
             
@@ -151,23 +190,51 @@
       } catch (error) {
         console.error('加载PDF文件失败:', error);
       }
+    } else {
+      // 如果没有记录，添加一个空白产品
+      productList.value.push(createEmptyProduct());
     }
   });
   
-  // 提交表单
-  const handleSubmit = async () => {
+  // 添加产品
+  const handleAddProduct = () => {
+    productList.value.push(createEmptyProduct());
+  };
+  
+  // 删除产品
+  const handleRemoveProduct = (index: number) => {
+    productList.value.splice(index, 1);
+  };
+  
+  // 提交单个产品
+  const handleSubmitSingle = async (index: number) => {
     try {
-      await formRef.value.validate();
+      if (formRefs.value[index]) {
+        await formRefs.value[index].validate();
+      }
       
       loading.value = true;
       
-      // 调用API保存数据
-      const res = await updateContractualProductInfo(formData);
+      // 获取当前产品
+      const currentProduct = productList.value[index];
+      
+      // 根据产品是否有id决定调用哪个API
+      let res;
+      if (currentProduct.id) {
+        // 已有产品，调用更新接口
+        res = await updateContractualProductInfo(currentProduct);
+      } else {
+        // 新增产品，调用新增接口
+        res = await addContractualProductInfo(currentProduct);
+        // 如果新增成功，更新产品id
+        if (res.code === 200 && res.data) {
+          currentProduct.id = res.data.id;
+        }
+      }
       
       if (res.code === 200) {
-        ElMessage.success('保存成功');
-        emit('success', formData);
-        handleClose();
+        ElMessage.success(`产品 #${index + 1} ${currentProduct.id ? '更新' : '新增'}成功`);
+        emit('success', currentProduct);
       } else {
         ElMessage.error(res.msg || '保存失败');
       }
@@ -186,56 +253,84 @@
   </script>
   
   <style scoped>
-  /* 头部样式 */
-  .modal-header {
-    overflow: hidden;
+  .container {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+  
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     padding: 16px 24px;
     background-color: #f5f7fa;
     border-bottom: 1px solid #e4e7ed;
   }
   
-  .modal-title {
-    float: left;
+  .title {
     margin: 0;
     font-size: 18px;
     color: #303133;
   }
   
-  .modal-actions {
-    float: right;
+  .actions {
+    display: flex;
+    gap: 12px;
   }
   
-  .modal-actions .el-button {
-    margin-left: 12px;
+  .content {
+    display: flex;
+    flex: 1;
+    overflow: hidden;
   }
   
-  /* 确保embed标签占满整个容器 */
-  .pdf-embed {
-    display: block;
-    height: calc(100vh - 70px) !important; /* 减去头部的高度 */
-    border: none;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+  .pdf-area {
+    width: 50%;
+    height: 100%;
+    border-right: 1px solid #e4e7ed;
+    overflow: hidden;
   }
   
-  /* 使网格容器填充整个可用空间 */
-  .grid {
-    height: calc(100vh - 70px); /* 减去头部的高度 */
-    overflow: hidden;
+  .pdf-area embed {
+    width: 100%;
+    height: 100%;
+    border: none;
   }
   
-  /* 确保两列都有适当的滚动行为 */
-  .col-span-1 {
+  .form-area {
+    width: 50%;
     height: 100%;
     overflow-y: auto;
+    padding: 16px;
   }
   
-  /* 表单样式 */
-  .edit-form {
-    padding: 20px;
+  .product-item {
+    margin-bottom: 20px;
+    background-color: #f9fafc;
+    border-radius: 4px;
+    padding: 16px;
   }
   
-  /* 全局高度 */
-  .h-full {
-    height: 100%;
+  .product-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 16px;
+  }
+  
+  .product-header h3 {
+    margin: 0;
+    font-size: 16px;
+    font-weight: 500;
+  }
+  
+  .product-actions {
+    display: flex;
+    gap: 8px;
+  }
+  
+  .edit-form {
+    padding: 8px 0;
   }
   </style>
\ No newline at end of file
diff --git a/src/views/contractualInfo/ContractualProductInfo/index.vue b/src/views/contractualInfo/ContractualProductInfo/index.vue
index 2a71a44..fab20ed 100644
--- a/src/views/contractualInfo/ContractualProductInfo/index.vue
+++ b/src/views/contractualInfo/ContractualProductInfo/index.vue
@@ -2,30 +2,18 @@
   <div class="page-container">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryFormRef" :inline="true" class="searchbar">
-      <!-- <el-form-item label="单位名称" prop="unitName">
-        <el-input v-model="queryParams.unitName" placeholder="请输入单位名称" clearable />
+      <el-form-item label="合同名称" prop="fileName">
+        <el-input v-model="queryParams.fileName" placeholder="请输入合同名称" clearable />
       </el-form-item>
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input v-model="queryParams.fileName" placeholder="请输入文件名称" clearable />
+      <el-form-item label="采购人(甲方)" prop="purchaserName">
+        <el-input v-model="queryParams.purchaserName" placeholder="请输入采购人名称" clearable />
       </el-form-item>
-      <el-form-item label="品牌" prop="brand">
-        <el-input v-model="queryParams.brand" placeholder="请输入品牌" clearable />
-      </el-form-item>
-      <el-form-item label="产品类型" prop="type">
-        <el-input v-model="queryParams.type" placeholder="请输入产品类型" clearable />
-      </el-form-item>
-      <el-form-item label="型号" prop="versionStr">
-        <el-input v-model="queryParams.versionStr" placeholder="请输入型号" clearable />
-      </el-form-item>
-      <el-form-item label="CPU型号" prop="cpuModel">
-        <el-input v-model="queryParams.cpuModel" placeholder="请输入CPU型号" clearable />
-      </el-form-item>
-      <el-form-item label="单价" prop="unitPrice">
-        <el-input v-model="queryParams.unitPrice" placeholder="请输入单价" clearable />
+      <!-- <el-form-item label="供应商(乙方)" prop="supplierName">
+        <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable />
       </el-form-item> -->
       <el-form-item>
-        <!-- <el-button type="primary" @click="handleQuery">搜索</el-button>
-        <el-button @click="resetQuery">重置</el-button> -->
+        <el-button type="primary" @click="handleQuery">搜索</el-button>
+        <el-button @click="resetQuery">重置</el-button>
         <el-button type="info" @click="showStatisticsDialog">查看统计</el-button>
       </el-form-item>
     </el-form>
@@ -70,7 +58,7 @@
                 </template>
               </el-table-column>
               <el-table-column v-for="col in tableColumns.filter(col => col.prop !== 'unitName')" :key="col.prop" :label="col.label" :prop="col.prop" />
-              <el-table-column label="操作" fixed="right" width="200">
+              <!-- <el-table-column label="操作" fixed="right" width="200">
                 <template #default="{ row }">
                   <el-button
                     link
@@ -89,7 +77,7 @@
                     </template>
                   </el-popconfirm>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
             </el-table>
             
             <!-- 子表分页 -->
@@ -244,13 +232,8 @@ const tableColumns = [
 const queryFormRef = ref();
 const queryParams = reactive({
   fileName: '',
-  unitName: '',
-  brand: '',
-  versionStr: '',
-  cpuModel: '',
-  unitPrice: 0,
-  quantity: 0,
-  totalPrice: 0,
+  purchaserName: '',
+  supplierName: '',
   type: ''
 });
 
@@ -339,9 +322,9 @@ const loadChildData = async (countyName: string, page = 1, pageSize = 10) => {
       pageNum: page,
       pageSize: pageSize,
       unitName: countyName, // 使用countyName作为查询参数
-      type:activeTab.value,
-      // ...queryParams
+      ...queryParams
     };
+    params.type = activeTab.value;
     const res = await listContractualProductInfo(params);
     if (res.code === 200) {
       // 按unitName对数据进行排序，确保相同单位的数据连续排列
@@ -393,9 +376,10 @@ const handleQuery = () => {
 // 重置查询条件
 const resetQuery = () => {
   // 清空所有查询条件
-  Object.keys(queryParams).forEach(key => {
-    queryParams[key] = '';
-  });
+  queryParams.fileName = '';
+  queryParams.purchaserName = '';
+  queryParams.supplierName = '';
+  queryParams.type = activeTab.value;
   
   // 重置表单并查询
   queryFormRef.value?.resetFields();