From efb95a3434deb9201d95117b5363961ae5c17f7c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 24 Nov 2025 11:14:08 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-24=20IPQC=E6=A3=80=E9=AA=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/IPQCResultEntry.vue | 183 +++++++++++++++++------
 src/views/modules/qc/IQCResultEntry.vue  |  82 ++++++----
 2 files changed, 185 insertions(+), 80 deletions(-)

diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 1c3573b..38a4dce 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -533,7 +533,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" style="display: flex; align-items: flex-start;">
+      <el-form :inline="true" label-position="top" style="display: flex; align-items: flex-start;margin-right: 11px">
         <el-form-item :label="'检验结论'">
           <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
             <el-option label="合格" value="合格"></el-option>
@@ -570,9 +570,15 @@
           <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 293px"></el-input>
           <el-input v-else v-model="detailData.disposalRemark" style="width: 293px"></el-input>
         </el-form-item>
-        <el-form-item :label="' '" style="margin-left: auto;">
-          <el-button type="primary" @click="openItemOperationDialog">项目操作</el-button>
-          <el-button type="success" @click="openTemplateImportDialog">模板导入</el-button>
+        <el-form-item :label="' '" style="margin-left: auto;margin-top: -10px">
+          <el-button class="operation-btn item-operation-btn" @click="openItemOperationDialog">
+            <i class="el-icon-setting"></i>
+            <span>项目导入</span>
+          </el-button>
+          <el-button class="operation-btn template-import-btn" @click="openTemplateImportDialog">
+            <i class="el-icon-download"></i>
+            <span>模板导入</span>
+          </el-button>
         </el-form-item>
       </el-form>
       <!-- 展示列表 -->
@@ -589,7 +595,11 @@
           min-width="90"
           label="操作">
           <template slot-scope="scope">
-            <el-button icon="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
+            <el-button
+              icon="el-icon-picture"
+              :type="hasImage(scope.row) ? 'success' : 'primary'"
+              @click="uploadImageModal(scope.row)">
+            </el-button>
             <el-button style="margin-left: 2px" icon="el-icon-s-platform" type="primary" :loading="loadFlag" @click="dataAcquisitionByItem(scope.row)"></el-button>
           </template>
         </el-table-column>
@@ -1047,31 +1057,31 @@
     </el-dialog>
 
     <!-- 项目操作对话框 -->
-    <el-dialog 
-      title="检验项目操作" 
-      @close="refreshInspectionDetailList" 
-      :close-on-click-modal="false" 
-      v-drag 
-      :visible.sync="itemOperationDialogFlag" 
+    <el-dialog
+      title="检验项目操作"
+      @close="refreshInspectionDetailList"
+      :close-on-click-modal="false"
+      v-drag
+      :visible.sync="itemOperationDialogFlag"
       width="1200px"
       custom-class="item-operation-dialog">
       <!-- 查询区域 -->
       <div class="search-container">
         <el-form :inline="true" size="small">
           <el-form-item label="项目编码">
-            <el-input 
-              v-model="itemOperationQuery.itemNo" 
+            <el-input
+              v-model="itemOperationQuery.itemNo"
               placeholder="请输入项目编码"
-              clearable 
+              clearable
               prefix-icon="el-icon-search"
               style="width: 160px">
             </el-input>
           </el-form-item>
           <el-form-item label="项目名称">
-            <el-input 
-              v-model="itemOperationQuery.itemDesc" 
+            <el-input
+              v-model="itemOperationQuery.itemDesc"
               placeholder="请输入项目名称"
-              clearable 
+              clearable
               prefix-icon="el-icon-search"
               style="width: 200px">
             </el-input>
@@ -1142,18 +1152,18 @@
         <!-- 操作按钮 -->
         <div class="operation-buttons">
           <el-tooltip content="添加选中项目" placement="left">
-            <el-button 
-              type="primary" 
-              icon="el-icon-d-arrow-right" 
+            <el-button
+              type="primary"
+              icon="el-icon-d-arrow-right"
               circle
               @click="addInspectionItems"
               :disabled="!availableItemSelections || availableItemSelections.length === 0">
             </el-button>
           </el-tooltip>
           <el-tooltip content="移除选中项目" placement="right">
-            <el-button 
-              type="danger" 
-              icon="el-icon-d-arrow-left" 
+            <el-button
+              type="danger"
+              icon="el-icon-d-arrow-left"
               circle
               @click="deleteInspectionItems"
               :disabled="!selectedItemSelections || selectedItemSelections.length === 0">
@@ -1206,30 +1216,30 @@
     </el-dialog>
 
     <!-- 模板导入对话框 -->
-    <el-dialog 
-      title="模板导入" 
-      :close-on-click-modal="false" 
-      v-drag 
-      :visible.sync="templateImportDialogFlag" 
+    <el-dialog
+      title="模板导入"
+      :close-on-click-modal="false"
+      v-drag
+      :visible.sync="templateImportDialogFlag"
       width="900px"
       custom-class="template-import-dialog">
       <!-- 查询区域 -->
       <div class="search-container">
         <el-form :inline="true" size="small">
           <el-form-item label="模板编码">
-            <el-input 
-              v-model="templateQuery.templateId" 
+            <el-input
+              v-model="templateQuery.templateId"
               placeholder="请输入模板编码"
-              clearable 
+              clearable
               prefix-icon="el-icon-search"
               style="width: 160px">
             </el-input>
           </el-form-item>
           <el-form-item label="模板名称">
-            <el-input 
-              v-model="templateQuery.templateDesc" 
+            <el-input
+              v-model="templateQuery.templateDesc"
               placeholder="请输入模板名称"
-              clearable 
+              clearable
               prefix-icon="el-icon-search"
               style="width: 200px">
             </el-input>
@@ -1296,9 +1306,9 @@
 
       <!-- 底部按钮 -->
       <div slot="footer" class="dialog-footer">
-        <el-button 
-          type="primary" 
-          icon="el-icon-download" 
+        <el-button
+          type="primary"
+          icon="el-icon-download"
           @click="confirmImportTemplate"
           :disabled="!templateSelections || templateSelections.length === 0"
           :loading="importLoading"
@@ -3417,6 +3427,26 @@
         })
       },
 
+      // 判断检验项目是否已上传图片
+      hasImage(row) {
+        // 检查常见的图片字段：itemImageUrl, imgUrl, imagePath, itemImg, img_url等
+        const imageFields = ['itemImageUrl', 'imgUrl', 'imagePath', 'itemImg', 'img_url', 'image_url', 'imageUrl']
+
+        // 遍历检查是否有任何图片字段且有值
+        for (const field of imageFields) {
+          if (row[field] && row[field].trim() !== '') {
+            return true
+          }
+        }
+
+        // 也检查动态列配置中的图片列
+        const hasImageColumn = this.detailColumnList.some(col => {
+          return col.columnImage && row[col.columnProp] && row[col.columnProp].trim() !== ''
+        })
+
+        return hasImageColumn
+      },
+
       // 上传项目图片
       uploadImageModal (row) {
         let currentData = {
@@ -5004,7 +5034,7 @@
 }
 
 /deep/ .item-operation-dialog .el-dialog__header {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
   padding: 20px 24px;
   border-radius: 8px 8px 0 0;
 }
@@ -5081,8 +5111,8 @@
 /* 面板头部 */
 .panel-header {
   padding: 14px 16px;
-  background: linear-gradient(135deg, #f5f7fa 0%, #e8eaf0 100%);
-  border-bottom: 2px solid #dcdfe6;
+  background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
+  border-bottom: 2px solid #9ac3d0;
   display: flex;
   align-items: center;
   gap: 8px;
@@ -5090,21 +5120,21 @@
 
 .panel-header i {
   font-size: 18px;
-  color: #606266;
+  color: #ffffff;
 }
 
 .panel-title {
   font-size: 14px;
   font-weight: 600;
-  color: #303133;
+  color: #ffffff;
   letter-spacing: 0.5px;
 }
 
 .item-count {
   margin-left: auto;
   font-size: 12px;
-  color: #909399;
-  background: #ffffff;
+  color: #ffffff;
+  background: rgba(255, 255, 255, 0.25);
   padding: 2px 10px;
   border-radius: 12px;
   font-weight: 500;
@@ -5185,7 +5215,7 @@
   .item-operation-content {
     gap: 12px;
   }
-  
+
   .operation-buttons .el-button {
     width: 42px;
     height: 42px;
@@ -5200,7 +5230,7 @@
 }
 
 /deep/ .template-import-dialog .el-dialog__header {
-  background: linear-gradient(135deg, #11998e 0%, #38ef7d 100%);
+  background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
   padding: 20px 24px;
   border-radius: 8px 8px 0 0;
 }
@@ -5246,11 +5276,11 @@
 }
 
 .template-table /deep/ .el-table__body tr:hover > td {
-  background-color: #f0fff4 !important;
+  background-color: #f0f7ff !important;
 }
 
 .template-table /deep/ .el-table__row.current-row > td {
-  background-color: #e6ffed !important;
+  background-color: #e6f2ff !important;
 }
 
 .template-table /deep/ td {
@@ -5260,4 +5290,61 @@
 .template-table /deep/ .el-table__body {
   font-size: 13px;
 }
+
+/* ==================== 按钮样式优化 ==================== */
+.operation-btn {
+  position: relative;
+  padding: 8px 16px;
+  border: none;
+  border-radius: 4px;
+  font-size: 13px;
+  font-weight: 500;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  overflow: hidden;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+}
+
+.operation-btn:hover {
+  transform: translateY(-1px);
+  box-shadow: 0 3px 10px rgba(0, 0, 0, 0.15);
+}
+
+.operation-btn:active {
+  transform: translateY(0);
+}
+
+.operation-btn i {
+  margin-right: 4px;
+  font-size: 13px;
+}
+
+.operation-btn span {
+  position: relative;
+  z-index: 1;
+}
+
+/* 项目操作按钮 */
+.item-operation-btn {
+  background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
+  color: #ffffff;
+}
+
+.item-operation-btn:hover {
+  background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
+  color: #ffffff;
+}
+
+/* 模板导入按钮 */
+.template-import-btn {
+  background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
+  color: #ffffff;
+  margin-left: 10px;
+}
+
+.template-import-btn:hover {
+  background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
+  color: #ffffff;
+}
+
 </style>
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 8ef6bd2..0214ad4 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -1021,6 +1021,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1DisposalMeasures',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'disposalMeasures',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '处置措施',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
@@ -1258,67 +1276,67 @@
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
-            serialNumber: '301006Table1PoOrderNo',
+            serialNumber: '301006Table1DocumentNo',
             tableId: "301006Table1",
             tableName: "IQC检验记录表",
-            columnProp: 'poOrderNo',
+            columnProp: 'documentNo',
             headerAlign: "center",
-            align: "center",
-            columnLabel: '单据号',
+            align: "left",
+            columnLabel: '通知单号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 130,
+            columnWidth: 150,
           },
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
-            serialNumber: '301006Table1OrderType',
+            serialNumber: '301006Table1PoOrderNo',
             tableId: "301006Table1",
             tableName: "IQC检验记录表",
-            columnProp: 'orderType',
+            columnProp: 'poOrderNo',
             headerAlign: "center",
-            align: "center",
-            columnLabel: '采购类型',
+            align: "left",
+            columnLabel: '单据号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100,
+            columnWidth: 180,
           },
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
-            serialNumber: '301006Table1SubmissionType',
+            serialNumber: '301006Table1PoItemNo',
             tableId: "301006Table1",
             tableName: "IQC检验记录表",
-            columnProp: 'submissionType',
+            columnProp: 'poItemNo',
             headerAlign: "center",
-            align: "center",
-            columnLabel: '送检类型',
+            align: "right",
+            columnLabel: '单据行号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100,
+            columnWidth: 160,
           },
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
-            serialNumber: '301006Table1PoItemNo',
+            serialNumber: '301006Table1OrderType',
             tableId: "301006Table1",
             tableName: "IQC检验记录表",
-            columnProp: 'poItemNo',
+            columnProp: 'orderType',
             headerAlign: "center",
-            align: "right",
-            columnLabel: '单据行号',
+            align: "left",
+            columnLabel: '采购类型',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1330,31 +1348,31 @@
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
-            serialNumber: '301006Table1SupplierDesc',
+            serialNumber: '301006Table1SubmissionType',
             tableId: "301006Table1",
             tableName: "IQC检验记录表",
-            columnProp: 'supplierDesc',
+            columnProp: 'submissionType',
             headerAlign: "center",
-            align: "left",
-            columnLabel: '供应商',
+            align: "center",
+            columnLabel: '送检类型',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 200,
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
-            serialNumber: '301006Table1InspectionRemark',
+            serialNumber: '301006Table1SupplierDesc',
             tableId: "301006Table1",
             tableName: "IQC检验记录表",
-            columnProp: 'inspectionRemark',
+            columnProp: 'supplierDesc',
             headerAlign: "center",
             align: "left",
-            columnLabel: '质检备注',
+            columnLabel: '供应商',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1366,20 +1384,20 @@
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
-            serialNumber: '301006Table1DisposalMeasures',
+            serialNumber: '301006Table1InspectionRemark',
             tableId: "301006Table1",
             tableName: "IQC检验记录表",
-            columnProp: 'disposalMeasures',
+            columnProp: 'inspectionRemark',
             headerAlign: "center",
-            align: "center",
-            columnLabel: '处置措施',
+            align: "left",
+            columnLabel: '质检备注',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 200,
           },
           {
             userId: this.$store.state.user.name,