From 535d89ae1ce81bf99baf627583339cf90fa7bcce Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Thu, 11 Jun 2026 11:40:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(attachment):=20=E6=B7=BB=E5=8A=A0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=87=E6=B3=A8=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=B8=8A=E4=BC=A0=E5=BC=B9=E7=AA=97=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在附件表格中新增备注列显示功能
- 为三个模块的附件上传功能添加备注输入字段
- 优化上传弹窗的布局结构和样式设计
- 添加拖拽功能支持提升用户体验
- 统一上传弹窗的表单验证和数据处理逻辑
- 修复日期选择器图标的样式问题
- 重构附件上传的数据传输参数结构
---
 .../com_inspectionRequestAttachmentTab.vue    | 114 ++++++++++++++----
 .../com_inspectionRequestDetail.vue           |  23 ++++
 .../npcIqc/com_logisticsAttachmentTab.vue     |  97 ++++++++++++---
 src/views/modules/npcIqc/com_npcIqcDetail.vue |  80 ++++++------
 .../quality/com_qualityIssueAttachment.vue    |  95 ++++++++++++---
 .../modules/quality/qualityIssueList.vue      |  23 ++++
 6 files changed, 324 insertions(+), 108 deletions(-)

diff --git a/src/views/modules/inspection/com_inspectionRequestAttachmentTab.vue b/src/views/modules/inspection/com_inspectionRequestAttachmentTab.vue
index 15132e5..fa7c629 100644
--- a/src/views/modules/inspection/com_inspectionRequestAttachmentTab.vue
+++ b/src/views/modules/inspection/com_inspectionRequestAttachmentTab.vue
@@ -27,6 +27,11 @@
         label="创建人"
         width="120"
         align="center" />
+      <el-table-column
+        prop="cadditionalInfo"
+        label="备注"
+        min-width="150"
+        show-overflow-tooltip />
       <el-table-column
         prop="createDate"
         label="创建时间"
@@ -44,35 +49,54 @@
       </el-table-column>
     </el-table>
 
-    <!-- 上传附件弹窗 -->
-    <el-dialog title="上传附件" :visible.sync="ossVisible" width="450px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      title="上传附件"
+      :visible.sync="ossVisible"
+      v-drag
+      width="450px"
+      append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="ossForm" label-width="80px" label-position="top">
-        <el-form-item label=" " class="auto">
-          <el-upload
-            drag
-            :file-list="uploadFileList"
-            action="#"
-            ref="upload"
-            :on-remove="onRemoveFile"
-            :on-change="onChangeFile"
-            multiple
-            :auto-upload="false">
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-          </el-upload>
-        </el-form-item>
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label=" " class="auto">
+              <el-upload
+                drag
+                :file-list="uploadFileList"
+                action="#"
+                ref="upload"
+                :on-remove="onRemoveFile"
+                :on-change="onChangeFile"
+                multiple
+                :auto-upload="false">
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="auto">
+              <el-input
+                type="textarea"
+                v-model="ossForm.cadditionalInfo"
+                resize="none"
+                :autosize="{minRows: 3, maxRows: 3}"
+                placeholder="请输入备注">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" :loading="uploadLoading" @click="submitData">确定</el-button>
-        <el-button @click="ossVisible = false">取消</el-button>
-      </span>
+    <el-button type="primary" :loading="uploadLoading" @click="submitData">确定</el-button>
+    <el-button @click="ossVisible = false">取消</el-button>
+  </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { queryOssFilePlus, removeOss, previewOssFileById } from '@/api/oss/oss'
-import { ossUploadNoSaveOSSForYJY } from '@/api/oss/oss'
+import { queryOssFilePlus, removeOss, previewOssFileById,ossUploadNoSaveOSSForYJY} from '@/api/oss/oss'
 
 export default {
   name: 'InspectionRequestAttachmentTab',
@@ -100,7 +124,7 @@ export default {
       uploadLoading: false,
       uploadFileList: [],
       ossForm: {
-        remark: ''
+        cadditionalInfo: ''
       }
     }
   },
@@ -163,7 +187,7 @@ export default {
         }
       })
       this.uploadFileList = []
-      this.ossForm.remark = ''
+      this.ossForm.cadditionalInfo = ''  // 清空备注
       this.ossVisible = true
     },
 
@@ -177,6 +201,7 @@ export default {
       this.uploadFileList = fileList
     },
 
+    // 提交上传
     // 提交上传
     submitData() {
       if (this.uploadFileList.length === 0) {
@@ -194,8 +219,8 @@ export default {
       formData.append('orderRef2', this.searchData.requestNo)
       formData.append('orderRef3', '')
       formData.append('createdBy', this.$store.state.user.name)
-      formData.append('fileRemark', this.ossForm.remark || '')
       formData.append('orderReftype', 'InspectionRequestAttachment')
+      formData.append('CAdditionalInfo', this.ossForm.cadditionalInfo || '')  // 关键：使用 CAdditionalInfo
 
       ossUploadNoSaveOSSForYJY(formData).then(({ data }) => {
         if (data && data.code === 0) {
@@ -255,12 +280,49 @@ export default {
 <style scoped lang="scss">
 .customer-css {
   padding: 0;
-  margin: 0;
-  background: #fff;
 }
 
+// 上传弹窗样式（模仿参考页面）
 .auto /deep/ .el-form-item__content {
   height: auto;
   line-height: 1.5;
 }
+
+// 移除表单默认间距，确保顶格显示
+/deep/ .el-dialog__body {
+  padding: 10px 20px 5px;
+}
+
+/deep/ .el-form-item {
+  margin-bottom: 8px;
+}
+
+/deep/ .el-dialog__header {
+  padding: 10px 20px 5px;
+  margin: 0;
+}
+
+/deep/ .el-form-item__label {
+  font-weight: 500;
+  color: #606266;
+  padding-bottom: 4px;
+}
+
+// 上传组件高度调整
+/deep/ .el-upload-dragger {
+  width: 100%;
+  height: 120px;
+}
+
+// 弹窗固定高度（可选）
+/deep/ .el-dialog {
+  max-height: 450px;
+  display: flex;
+  flex-direction: column;
+
+  .el-dialog__body {
+    flex: 1;
+    overflow-y: auto;
+  }
+}
 </style>
diff --git a/src/views/modules/inspection/com_inspectionRequestDetail.vue b/src/views/modules/inspection/com_inspectionRequestDetail.vue
index d554ac8..99deb37 100644
--- a/src/views/modules/inspection/com_inspectionRequestDetail.vue
+++ b/src/views/modules/inspection/com_inspectionRequestDetail.vue
@@ -287,6 +287,29 @@ export default {
   outline: none;
 }
 
+/* 日期选择器图标样式修复 */
+/deep/ .el-date-editor.el-input {
+  width: 100%;
+}
+
+/deep/ .el-date-editor .el-input__inner {
+  padding-left: 35px !important;
+}
+
+/deep/ .el-date-editor .el-input__prefix {
+  left: 8px;
+  top: 50%;
+  transform: translateY(-50%);
+  display: flex;
+  align-items: center;
+}
+
+/deep/ .el-date-editor .el-input__icon {
+  line-height: 32px;
+  height: 32px;
+  font-size: 14px;
+}
+
 /* 按钮样式：字体13px，高度32px */
 .form-item + .el-row .el-button,
 .el-button--small,
diff --git a/src/views/modules/npcIqc/com_logisticsAttachmentTab.vue b/src/views/modules/npcIqc/com_logisticsAttachmentTab.vue
index a74e08a..23db885 100644
--- a/src/views/modules/npcIqc/com_logisticsAttachmentTab.vue
+++ b/src/views/modules/npcIqc/com_logisticsAttachmentTab.vue
@@ -27,6 +27,11 @@
         label="创建人"
         width="120"
         align="center" />
+      <el-table-column
+        prop="cadditionalInfo"
+        label="备注"
+        min-width="150"
+        show-overflow-tooltip />
       <el-table-column
         prop="createDate"
         label="创建时间"
@@ -45,22 +50,43 @@
     </el-table>
 
     <!-- 上传附件弹窗 -->
-    <el-dialog title="上传附件" :visible.sync="ossVisible" width="450px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      title="上传附件"
+      :visible.sync="ossVisible"
+      v-drag
+      width="450px"
+      append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="ossForm" label-width="80px" label-position="top">
-        <el-form-item label=" " class="auto">
-          <el-upload
-            drag
-            :file-list="uploadFileList"
-            action="#"
-            ref="upload"
-            :on-remove="onRemoveFile"
-            :on-change="onChangeFile"
-            multiple
-            :auto-upload="false">
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-          </el-upload>
-        </el-form-item>
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label=" " class="auto">
+              <el-upload
+                drag
+                :file-list="uploadFileList"
+                action="#"
+                ref="upload"
+                :on-remove="onRemoveFile"
+                :on-change="onChangeFile"
+                multiple
+                :auto-upload="false">
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="auto">
+              <el-input
+                type="textarea"
+                v-model="ossForm.cAdditionalInfo"
+                resize="none"
+                :autosize="{minRows: 3, maxRows: 3}"
+                placeholder="请输入备注">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" :loading="uploadLoading" @click="submitData">确定</el-button>
@@ -100,7 +126,7 @@ export default {
       uploadLoading: false,
       uploadFileList: [],
       ossForm: {
-        remark: ''
+        cAdditionalInfo: ''
       }
     }
   },
@@ -163,7 +189,7 @@ export default {
         }
       })
       this.uploadFileList = []
-      this.ossForm.remark = ''
+      this.ossForm.cAdditionalInfo = ''
       this.ossVisible = true
     },
 
@@ -194,9 +220,15 @@ export default {
       formData.append('orderRef2', this.searchData.flexId)
       formData.append('orderRef3', '')
       formData.append('createdBy', this.$store.state.user.name)
-      formData.append('fileRemark', this.ossForm.remark || '')
+      formData.append('CAdditionalInfo', this.ossForm.cAdditionalInfo || '')
       formData.append('orderReftype', 'LogisticsAttachment')
 
+      // 调试日志
+      console.log('上传参数:')
+      for (let pair of formData.entries()) {
+        console.log(pair[0] + ': ' + pair[1])
+      }
+
       ossUploadNoSaveOSSForYJY(formData).then(({ data }) => {
         if (data && data.code === 0) {
           this.$message.success('上传成功')
@@ -207,6 +239,7 @@ export default {
         }
         this.uploadLoading = false
       }).catch((error) => {
+        console.error('上传失败:', error)
         this.$message.error('上传失败')
         this.uploadLoading = false
       })
@@ -263,4 +296,30 @@ export default {
   height: auto;
   line-height: 1.5;
 }
-</style>
\ No newline at end of file
+
+// 上传弹窗样式
+/deep/ .el-dialog__body {
+  padding: 10px 20px 5px;
+}
+
+/deep/ .el-form-item {
+  margin-bottom: 8px;
+}
+
+/deep/ .el-dialog__header {
+  padding: 10px 20px 5px;
+  margin: 0;
+}
+
+/deep/ .el-form-item__label {
+  font-weight: 500;
+  color: #606266;
+  padding-bottom: 4px;
+}
+
+// 上传组件高度调整
+/deep/ .el-upload-dragger {
+  width: 100%;
+  height: 120px;
+}
+</style>
diff --git a/src/views/modules/npcIqc/com_npcIqcDetail.vue b/src/views/modules/npcIqc/com_npcIqcDetail.vue
index 56fc8f6..af9c165 100644
--- a/src/views/modules/npcIqc/com_npcIqcDetail.vue
+++ b/src/views/modules/npcIqc/com_npcIqcDetail.vue
@@ -34,40 +34,57 @@
 
       <!-- 第二行：供应商名称、供应商编码 -->
       <el-row :gutter="20">
-        <el-col :span="12">
+        <el-col :span="6">
           <div class="form-item">
             <div class="label">供应商名称：</div>
             <div class="value">{{ detailData.supplierName }}</div>
           </div>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <div class="form-item">
             <div class="label">供应商编码：</div>
             <div class="value">{{ detailData.supplierNo }}</div>
           </div>
         </el-col>
-      </el-row>
-
-      <!-- 第三行：物料名称、数量、抽样数量 -->
-      <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <div class="form-item">
             <div class="label">物料名称：</div>
             <div class="value">{{ detailData.itemName }}</div>
           </div>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <div class="form-item">
             <div class="label">数量：</div>
             <div class="value">{{ detailData.quantity }}</div>
           </div>
         </el-col>
-        <el-col :span="8">
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="6">
           <div class="form-item">
             <div class="label">抽样数量：</div>
             <div class="value">{{ detailData.sampleSize }}</div>
           </div>
         </el-col>
+        <el-col :span="6">
+          <div class="form-item">
+            <div class="label">检验结果总计：</div>
+            <div class="value">{{ detailData.inspectionTotal }}</div>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="form-item">
+            <div class="label">检验员姓名：</div>
+            <div class="value">{{ detailData.inspectorName }}</div>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="form-item">
+            <div class="label">录入日期：</div>
+            <div class="value">{{ formatDate(detailData.entryDate) }}</div>
+          </div>
+        </el-col>
       </el-row>
 
       <!-- 第四行：尺寸A-E -->
@@ -104,48 +121,32 @@
         </el-col>
       </el-row>
 
-      <!-- 第五行：检验结果总计、检验员姓名、录入日期 -->
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <div class="form-item">
-            <div class="label">检验结果总计：</div>
-            <div class="value">{{ detailData.inspectionTotal }}</div>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="form-item">
-            <div class="label">检验员姓名：</div>
-            <div class="value">{{ detailData.inspectorName }}</div>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="form-item">
-            <div class="label">录入日期：</div>
-            <div class="value">{{ formatDate(detailData.entryDate) }}</div>
-          </div>
-        </el-col>
-      </el-row>
-
       <!-- 第六行：供应商邮箱、纠正措施请求、收集/批次号 -->
       <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="6">
           <div class="form-item">
             <div class="label">供应商邮箱：</div>
             <div class="value">{{ detailData.supplierEmail }}</div>
           </div>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <div class="form-item">
             <div class="label">纠正措施请求：</div>
             <div class="value">{{ formatCaRequest(detailData.caRequest) }}</div>
           </div>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <div class="form-item">
             <div class="label">收集/批次号：</div>
             <div class="value">{{ detailData.collectionBatch }}</div>
           </div>
         </el-col>
+        <el-col :span="6">
+          <div class="form-item">
+            <div class="label">Created By：</div>
+            <div class="value">{{ detailData.createdBy }}</div>
+          </div>
+        </el-col>
       </el-row>
 
       <!-- 第七行：问题描述（全宽） -->
@@ -195,17 +196,6 @@
           </div>
         </el-col>
       </el-row>
-
-      <!-- 第十行：Created By、Update By、Update Date（可选） -->
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <div class="form-item">
-            <div class="label">Created By：</div>
-            <div class="value">{{ detailData.createdBy }}</div>
-          </div>
-        </el-col>
-        <!-- 如需显示 Update By / Update Date，取消注释并调整列宽 -->
-      </el-row>
     </div>
   </div>
 </template>
diff --git a/src/views/modules/quality/com_qualityIssueAttachment.vue b/src/views/modules/quality/com_qualityIssueAttachment.vue
index f1ad86e..3cc2f90 100644
--- a/src/views/modules/quality/com_qualityIssueAttachment.vue
+++ b/src/views/modules/quality/com_qualityIssueAttachment.vue
@@ -27,6 +27,11 @@
         label="创建人"
         width="120"
         align="center" />
+      <el-table-column
+        prop="cadditionalInfo"
+        label="备注"
+        min-width="150"
+        show-overflow-tooltip />
       <el-table-column
         prop="createDate"
         label="创建时间"
@@ -45,22 +50,43 @@
     </el-table>
 
     <!-- 上传附件弹窗 -->
-    <el-dialog title="上传附件" :visible.sync="ossVisible" width="380px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      title="上传附件"
+      :visible.sync="ossVisible"
+      v-drag
+      width="450px"
+      append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="ossForm" label-width="80px" label-position="top">
-        <el-form-item label=" " class="auto">
-          <el-upload
-            drag
-            :file-list="uploadFileList"
-            action="#"
-            ref="upload"
-            :on-remove="onRemoveFile"
-            :on-change="onChangeFile"
-            multiple
-            :auto-upload="false">
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-          </el-upload>
-        </el-form-item>
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label=" " class="auto">
+              <el-upload
+                drag
+                :file-list="uploadFileList"
+                action="#"
+                ref="upload"
+                :on-remove="onRemoveFile"
+                :on-change="onChangeFile"
+                multiple
+                :auto-upload="false">
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="auto">
+              <el-input
+                type="textarea"
+                v-model="ossForm.cAdditionalInfo"
+                resize="none"
+                :autosize="{minRows: 3, maxRows: 3}"
+                placeholder="请输入备注">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" :loading="uploadLoading" @click="submitData">确定</el-button>
@@ -100,7 +126,7 @@ export default {
       uploadLoading: false,
       uploadFileList: [],
       ossForm: {
-        remark: ''
+        cAdditionalInfo: ''
       }
     }
   },
@@ -163,7 +189,7 @@ export default {
         }
       })
       this.uploadFileList = []
-      this.ossForm.remark = ''
+      this.ossForm.cAdditionalInfo = ''
       this.ossVisible = true
     },
 
@@ -194,9 +220,15 @@ export default {
       formData.append('orderRef2', this.searchData.issueNo)
       formData.append('orderRef3', '')
       formData.append('createdBy', this.$store.state.user.name)
-      formData.append('fileRemark', this.ossForm.remark || '')
+      formData.append('CAdditionalInfo', this.ossForm.cAdditionalInfo || '')
       formData.append('orderReftype', 'QualityIssueAttachment')
 
+      // 调试日志
+      console.log('上传参数:')
+      for (let pair of formData.entries()) {
+        console.log(pair[0] + ': ' + pair[1])
+      }
+
       ossUploadNoSaveOSSForYJY(formData).then(({ data }) => {
         if (data && data.code === 0) {
           this.$message.success('上传成功')
@@ -207,6 +239,7 @@ export default {
         }
         this.uploadLoading = false
       }).catch((error) => {
+        console.error('上传失败:', error)
         this.$message.error('上传失败')
         this.uploadLoading = false
       })
@@ -263,4 +296,30 @@ export default {
   height: auto;
   line-height: 1.5;
 }
+
+// 上传弹窗样式
+/deep/ .el-dialog__body {
+  padding: 10px 20px 5px;
+}
+
+/deep/ .el-form-item {
+  margin-bottom: 8px;
+}
+
+/deep/ .el-dialog__header {
+  padding: 10px 20px 5px;
+  margin: 0;
+}
+
+/deep/ .el-form-item__label {
+  font-weight: 500;
+  color: #606266;
+  padding-bottom: 4px;
+}
+
+// 上传组件高度调整
+/deep/ .el-upload-dragger {
+  width: 100%;
+  height: 120px;
+}
 </style>
diff --git a/src/views/modules/quality/qualityIssueList.vue b/src/views/modules/quality/qualityIssueList.vue
index f3535db..5432a3b 100644
--- a/src/views/modules/quality/qualityIssueList.vue
+++ b/src/views/modules/quality/qualityIssueList.vue
@@ -1953,4 +1953,27 @@ export default {
 .choose-label:hover {
   text-decoration: underline;
 }
+
+/* 新增和编辑弹窗中的日期选择器图标样式修复 */
+.add-dialog-form /deep/ .el-date-editor.el-input {
+  width: 100%;
+}
+
+.add-dialog-form /deep/ .el-date-editor .el-input__inner {
+  padding-left: 35px !important;
+}
+
+.add-dialog-form /deep/ .el-date-editor .el-input__prefix {
+  left: 8px;
+  top: 50%;
+  transform: translateY(-50%);
+  display: flex;
+  align-items: center;
+}
+
+.add-dialog-form /deep/ .el-date-editor .el-input__icon {
+  line-height: 28px;
+  height: 28px;
+  font-size: 14px;
+}
 </style>