2025-11-24

IQC、FQC、OQC检验增加项目操作

src/views/modules/qc/FQCResultEntry.vue

@@ -1045,6 +1045,7 @@
             <el-input v-model="itemOperationQuery.itemDesc" placeholder="请输入项目名称" clearable prefix-icon="el-icon-search" style="width: 200px"></el-input>
           </el-form-item>
           <el-button type="primary" icon="el-icon-search" size="small" @click="searchFQCItems">查询</el-button>
+          <el-button icon="el-icon-refresh" size="small" @click="resetItemQuery">重置</el-button>
         </el-form>
       </div>
       <div class="item-operation-content">
@@ -1082,7 +1083,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="itemOperationDialogFlag = false" size="small">关闭</el-button>
+        <el-button @click="itemOperationDialogFlag = false" size="small" style="width: 80px;">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -1107,17 +1108,21 @@
         </el-form>
       </div>
       <div class="template-list-container">
-        <el-table ref="templateTable" :data="templateList" @row-click="templateClickRow" @selection-change="templateSelectionChange" highlight-current-row class="template-table" height="450" border>
-          <el-table-column type="selection" width="45" align="center"></el-table-column>
-          <el-table-column prop="templateId" label="模板编码" min-width="120"></el-table-column>
-          <el-table-column prop="templateName" label="模板名称" min-width="180" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="remark" label="备注" min-width="200" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="itemCount" label="项目数量" width="100" align="center"></el-table-column>
+        <div class="panel-header">
+          <i class="el-icon-s-grid"></i>
+          <span class="panel-title">FQC检验模板</span>
+          <span class="item-count">({{ templateList.length }})</span>
+        </div>
+        <el-table ref="templateTable" :data="templateList" @row-click="templateClickRow" @selection-change="templateSelectionChange" highlight-current-row class="template-table" height="450" :header-cell-style="{background: '#f5f7fa', color: '#606266', fontWeight: '500'}">
+          <el-table-column type="selection" width="50" align="center"></el-table-column>
+          <el-table-column prop="templateId" label="模板编码" align="center" width="120"></el-table-column>
+          <el-table-column prop="templateName" label="模板名称" align="left" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="itemCount" label="项目数量" align="center" width="100"></el-table-column>
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" icon="el-icon-download" @click="confirmImportTemplate" :disabled="!templateSelections || templateSelections.length === 0" :loading="importLoading" size="small">导入选中模板</el-button>
-        <el-button @click="templateImportDialogFlag = false" size="small">关闭</el-button>
+        <el-button @click="templateImportDialogFlag = false" size="small" style="width: 80px;">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -2037,7 +2042,7 @@
             tableName: "检验单明细表",
             columnProp: 'defaultValue',
             headerAlign: "center",
-            align: "right",
+            align: "center",
             columnLabel: '标准值',
             columnHidden: false,
             columnImage: false,
@@ -4432,6 +4437,10 @@
           this.$message.info('已取消导入')
         })
       },
+      resetItemQuery() {
+        this.itemOperationQuery = { itemNo: '', itemDesc: '' }
+        this.searchFQCItems()
+      },
       resetTemplateQuery() {
         this.templateQuery = { templateId: '', templateDesc: '' }
         this.searchFQCTemplates()
@@ -4737,7 +4746,7 @@
   flex: 1;
 }
 .panel-header {
-  padding: 14px 16px;
+  padding: 8px 16px;
   background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
   border-bottom: 2px solid #9ac3d0;
   display: flex;

src/views/modules/qc/IPQCResultEntry.vue

@@ -1211,7 +1211,7 @@
 
       <!-- 底部按钮 -->
       <div slot="footer" class="dialog-footer">
-        <el-button @click="itemOperationDialogFlag = false" size="small">关闭</el-button>
+        <el-button @click="itemOperationDialogFlag = false" size="small" style="width: 80px;">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -1315,7 +1315,7 @@
           size="small">
           导入选中模板
         </el-button>
-        <el-button @click="templateImportDialogFlag = false" size="small">关闭</el-button>
+        <el-button @click="templateImportDialogFlag = false" size="small" style="width: 80px;">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -2272,7 +2272,7 @@
             tableName: "检验单明细表",
             columnProp: 'defaultValue',
             headerAlign: "center",
-            align: "right",
+            align: "center",
             columnLabel: '标准值',
             columnHidden: false,
             columnImage: false,
@@ -5110,7 +5110,7 @@
 
 /* 面板头部 */
 .panel-header {
-  padding: 14px 16px;
+  padding: 8px 16px;
   background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
   border-bottom: 2px solid #9ac3d0;
   display: flex;

src/views/modules/qc/IQCResultEntry.vue

@@ -407,7 +407,7 @@
         <el-form-item :label="'批次合格数'">
           <el-input-number :controls="false" :step="0" min="0" disabled v-model="detailData.batchQualifiedQty"  style="width: 81px"></el-input-number>
         </el-form-item>
-        <el-form-item style="margin-top: 13px;margin-left: 230px">
+        <el-form-item style="margin-top: 13px;margin-left: 235px">
           <el-button v-if="detailData.submitFlag !== 'Y'" :loading="loadFlag" @click="dataAcquisition">
             <svg t="1739002700745" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="38076" width="22" height="22"><path d="M922.000696 762.746435V465.363478l55.652174-0.111304v299.542261c0 131.695304-106.562783 239.571478-236.922435 239.571478H285.42887C155.158261 1004.365913 48.484174 896.623304 48.484174 764.794435V465.252174h59.258435v299.542261c0 101.843478 77.022609 179.712 177.775304 179.712H740.841739c100.61913 0 181.158957-79.916522 181.158957-181.76z" fill="#1D293F" p-id="38077"></path><path d="M290.148174 192.556522c20.301913-20.925217 30.47513-48.617739 30.47513-83.099826 0-72.548174-36.285217-108.833391-108.722087-108.833392H141.401043v223.365566h70.255305c32.055652-0.111304 58.167652-10.529391 78.491826-31.432348z m-105.227131-7.635479V39.446261h23.596522c19.70087 0 35.661913 6.166261 47.994435 18.632348 12.354783 12.466087 18.387478 29.740522 18.387478 52.001391 0 22.973217-5.921391 41.22713-17.652869 54.650435s-27.937391 20.190609-48.617739 20.190608H184.921043zM634.434783 595.366957h-84.057044V498.866087a102.511304 102.511304 0 0 0 74.262261-98.54887c0-56.230957-45.478957-102.310957-101.10887-102.310956-55.629913 0-101.086609 46.08-101.086608 102.310956 0 46.08 30.586435 85.25913 72.192 97.947826v96.990609h-81.252174c-16.829217-43.78713-50.688-99.283478-81.65287-143.070609a101.331478 101.331478 0 0 0 14.269218-52.001391c0-56.230957-45.946435-102.310957-102.177392-102.310956s-102.177391 46.08-102.177391 102.310956c0 56.230957 45.946435 102.310957 102.177391 102.310957 15.716174 0 30.72-3.628522 44.009739-10.017392 21.170087 34.326261 42.829913 74.351304 57.811479 102.778435h-73.906087l128.333913 130.493218 94.675478-108.966957v145.853217h-111.616l148.034783 148.858435 130.715826-148.858435h-111.504696v-129.402434l91.180522 92.516174 113.307826-130.248348h-53.203478c14.758957-28.42713 36.173913-68.452174 57.210434-102.800696 13.178435 6.41113 27.937391 10.039652 43.542261 10.039652 55.629913 0 101.086609-46.08 101.086609-102.310956 0-56.230957-45.456696-102.310957-101.086609-102.310957-55.652174 0-101.220174 46.08-101.220174 102.310957a102.4 102.4 0 0 0 14.135653 52.001391c-30.72 43.653565-64.200348 99.283478-80.896 142.937044z m-390.611479-148.48a46.614261 46.614261 0 0 1-46.436174-46.458435c0-25.510957 20.925217-46.436174 46.436174-46.436174s46.436174 20.925217 46.436174 46.436174-20.925217 46.436174-46.436174 46.436174z m279.819131 0c-25.266087 0-45.946435-20.925217-45.946435-46.458435 0-25.510957 20.702609-46.436174 45.968696-46.436174 25.266087 0 45.946435 20.925217 45.946434 46.436174s-20.680348 46.436174-45.946434 46.436174z m278.639304-93.005914c25.288348 0 45.968696 20.925217 45.968696 46.436174s-20.702609 46.436174-45.968696 46.436174c-25.266087 0-45.946435-20.925217-45.946435-46.436174s20.680348-46.436174 45.946435-46.436174zM395.130435 172.722087h74.128695l15.248696 51.155478h47.415652L458.707478 0.623304h-51.155478L332.8 223.98887h47.170783l15.11513-51.266783z m32.768-114.777044c1.825391-6.032696 3.027478-12.332522 3.517217-18.854956h1.202087c0.601043 8.102957 1.691826 14.514087 3.138783 19.456l23.218087 77.401043h-54.405566l23.329392-78.002087z m168.96 165.932522h43.631304V39.446261h58.189913V0.623304h-159.877565v38.956522h58.056348v184.297739z m169.894956-51.155478h74.128696l15.248696 51.155478h47.415652L830.330435 0.623304h-51.155478l-74.752 223.365566h47.193043l15.09287-51.266783z m32.768-114.777044c1.825391-6.032696 3.027478-12.332522 3.517218-18.854956h1.202087c0.601043 8.102957 1.691826 14.514087 3.161043 19.456l23.218087 77.401043h-54.427826l23.329391-78.002087z" fill="#FD9F01" p-id="38078"></path></svg>
           </el-button>
@@ -419,7 +419,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>
@@ -830,6 +830,7 @@
             </el-input>
           </el-form-item>
           <el-button type="primary" icon="el-icon-search" size="small" @click="searchIQCItems">查询</el-button>
+          <el-button icon="el-icon-refresh" size="small" @click="resetItemQuery">重置</el-button>
         </el-form>
       </div>
 
@@ -904,7 +905,7 @@
 
       <!-- 底部按钮 -->
       <div slot="footer" class="dialog-footer">
-        <el-button @click="itemOperationDialogFlag = false" size="small">关闭</el-button>
+        <el-button @click="itemOperationDialogFlag = false" size="small" style="width: 80px;">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -944,6 +945,11 @@
 
       <!-- 模板列表 -->
       <div class="template-list-container">
+        <div class="panel-header">
+          <i class="el-icon-s-grid"></i>
+          <span class="panel-title">IQC检验模板</span>
+          <span class="item-count">({{ templateList.length }})</span>
+        </div>
         <el-table
           ref="templateTable"
           :data="templateList"
@@ -952,12 +958,11 @@
           highlight-current-row
           class="template-table"
           height="450"
-          border>
-          <el-table-column type="selection" width="45" align="center"></el-table-column>
-          <el-table-column prop="templateId" label="模板编码" min-width="120"></el-table-column>
-          <el-table-column prop="templateName" label="模板名称" min-width="180" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="remark" label="备注" min-width="200" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="itemCount" label="项目数量" width="100" align="center"></el-table-column>
+          :header-cell-style="{background: '#f5f7fa', color: '#606266', fontWeight: '500'}">
+          <el-table-column type="selection" width="50" align="center"></el-table-column>
+          <el-table-column prop="templateId" label="模板编码" align="center" width="120"></el-table-column>
+          <el-table-column prop="templateName" label="模板名称" align="left" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="itemCount" label="项目数量" align="center" width="100"></el-table-column>
         </el-table>
       </div>
 
@@ -972,7 +977,7 @@
           size="small">
           导入选中模板
         </el-button>
-        <el-button @click="templateImportDialogFlag = false" size="small">关闭</el-button>
+        <el-button @click="templateImportDialogFlag = false" size="small" style="width: 80px;">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -1870,7 +1875,7 @@
             tableName: "检验单明细表",
             columnProp: 'defaultValue',
             headerAlign: "center",
-            align: "right",
+            align: "center",
             columnLabel: '标准值',
             columnHidden: false,
             columnImage: false,
@@ -3642,6 +3647,15 @@
         })
       },
 
+      // 重置项目查询条件
+      resetItemQuery() {
+        this.itemOperationQuery = {
+          itemNo: '',
+          itemDesc: '',
+        }
+        this.searchIQCItems()
+      },
+
       // 重置模板查询条件
       resetTemplateQuery() {
         this.templateQuery = {
@@ -3969,7 +3983,7 @@
 
 /* 面板头部 */
 .panel-header {
-  padding: 14px 16px;
+  padding: 8px 16px;
   background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
   border-bottom: 2px solid #9ac3d0;
   display: flex;

src/views/modules/qc/OQCResultEntry.vue

@@ -808,6 +808,7 @@
             <el-input v-model="itemOperationQuery.itemDesc" placeholder="请输入项目名称" clearable prefix-icon="el-icon-search" style="width: 200px"></el-input>
           </el-form-item>
           <el-button type="primary" icon="el-icon-search" size="small" @click="searchOQCItems">查询</el-button>
+          <el-button icon="el-icon-refresh" size="small" @click="resetItemQuery">重置</el-button>
         </el-form>
       </div>
       <div class="item-operation-content">
@@ -845,7 +846,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="itemOperationDialogFlag = false" size="small">关闭</el-button>
+        <el-button @click="itemOperationDialogFlag = false" size="small" style="width: 80px;">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -864,17 +865,21 @@
         </el-form>
       </div>
       <div class="template-list-container">
-        <el-table ref="templateTable" :data="templateList" @row-click="templateClickRow" @selection-change="templateSelectionChange" highlight-current-row class="template-table" height="450" border>
-          <el-table-column type="selection" width="45" align="center"></el-table-column>
-          <el-table-column prop="templateId" label="模板编码" min-width="120"></el-table-column>
-          <el-table-column prop="templateName" label="模板名称" min-width="180" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="remark" label="备注" min-width="200" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="itemCount" label="项目数量" width="100" align="center"></el-table-column>
+        <div class="panel-header">
+          <i class="el-icon-s-grid"></i>
+          <span class="panel-title">OQC检验模板</span>
+          <span class="item-count">({{ templateList.length }})</span>
+        </div>
+        <el-table ref="templateTable" :data="templateList" @row-click="templateClickRow" @selection-change="templateSelectionChange" highlight-current-row class="template-table" height="450" :header-cell-style="{background: '#f5f7fa', color: '#606266', fontWeight: '500'}">
+          <el-table-column type="selection" width="50" align="center"></el-table-column>
+          <el-table-column prop="templateId" label="模板编码" align="center" width="120"></el-table-column>
+          <el-table-column prop="templateName" label="模板名称" align="left" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="itemCount" label="项目数量" align="center" width="100"></el-table-column>
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" icon="el-icon-download" @click="confirmImportTemplate" :disabled="!templateSelections || templateSelections.length === 0" :loading="importLoading" size="small">导入选中模板</el-button>
-        <el-button @click="templateImportDialogFlag = false" size="small">关闭</el-button>
+        <el-button @click="templateImportDialogFlag = false" size="small" style="width: 80px;">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -1636,7 +1641,7 @@
             tableName: "检验单明细表",
             columnProp: 'defaultValue',
             headerAlign: "center",
-            align: "right",
+            align: "center",
             columnLabel: '标准值',
             columnHidden: false,
             columnImage: false,
@@ -3476,6 +3481,10 @@
           this.$message.info('已取消导入')
         })
       },
+      resetItemQuery() {
+        this.itemOperationQuery = { itemNo: '', itemDesc: '' }
+        this.searchOQCItems()
+      },
       resetTemplateQuery() {
         this.templateQuery = { templateId: '', templateDesc: '' }
         this.searchOQCTemplates()
@@ -3793,7 +3802,7 @@
   flex: 1;
 }
 .panel-header {
-  padding: 14px 16px;
+  padding: 8px 16px;
   background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
   border-bottom: 2px solid #9ac3d0;
   display: flex;