From 06cd922bd895cd6a8e8492ca17b3406bbd225e39 Mon Sep 17 00:00:00 2001
From: shaoleiliu-netizen123 <480188199@qq.com>
Date: Thu, 13 Aug 2026 15:54:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biz/flowingAround/index.vue         |  21 ++-
 .../production/componets/QualityInfoPage.vue  | 134 +++++++++++++++++-
 2 files changed, 149 insertions(+), 6 deletions(-)

diff --git a/src/views/biz/flowingAround/index.vue b/src/views/biz/flowingAround/index.vue
index 3bc4dc7..b5aefac 100644
--- a/src/views/biz/flowingAround/index.vue
+++ b/src/views/biz/flowingAround/index.vue
@@ -46,13 +46,26 @@
         :columns="columns"
         :data="tableData"
         :loading="loading"
-        :pagination="pagination"
         :row-key="(row) => row.id"
         :scroll-x="1200"
-        @update:page="handlePageChange"
-        @update:page-size="handlePageSizeChange"
-        @update:checked-row-keys="handleCheck"
       />
+
+      <div class="pagination-container" style="display: flex; justify-content: flex-end; margin-top: 12px">
+        <n-pagination
+            v-model:page="pagination.page"
+            v-model:page-size="pagination.pageSize"
+            :item-count="pagination.itemCount"
+            :page-sizes="[2,10, 20, 50, 100]"
+            show-size-picker
+            show-quick-jumper
+            @update:page="handlePageChange"
+            @update:page-size="handlePageSizeChange"
+        >
+          <template #prefix>
+            共 {{ pagination.itemCount }} 条
+          </template>
+        </n-pagination>
+      </div>
     </n-card>
 
     <!-- 新增/编辑弹窗 -->
diff --git a/src/views/production/componets/QualityInfoPage.vue b/src/views/production/componets/QualityInfoPage.vue
index 2222e83..8406c25 100644
--- a/src/views/production/componets/QualityInfoPage.vue
+++ b/src/views/production/componets/QualityInfoPage.vue
@@ -47,14 +47,42 @@
         </template>
       </n-pagination>
     </div>
+
+  <!--质检详情弹窗-->
+    <n-modal v-model:show="showAssingWorkDetail" title="派工详情" style="width: 1000px" >
+      <n-card hoverable>
+        <template #header>
+          <div style="display:flex;justify-content:space-between;align-items:center;width:100%">
+            <span>明细列表</span>
+            <n-button text @click="detailIsCollapse = !detailIsCollapse">
+              <n-icon :component="detailIsCollapse ? ArrowDownOutline : ArrowUpOutline" />
+            </n-button>
+          </div>
+        </template>
+        <n-data-table
+            v-show="!detailIsCollapse"
+            :columns="detailColumns"
+            :data="detailTableData"
+            :row-key="(row:any) => row.id"
+            :scroll-x="700"
+            max-height="320"
+            :pagination="{ pageSize:4 }"
+        />
+      </n-card>
+    </n-modal>
+
+
+
   </n-card>
 </template>
 <script setup lang="ts">
-import { NCard, NDataTable, NGi,NTag, NGrid,DataTableColumns} from "naive-ui";
+import {NCard, NDataTable, NGi, NTag, NGrid, DataTableColumns, NIcon, NButton} from "naive-ui";
 import {onMounted, ref, h, reactive} from "vue";
 import { dictDataApi } from '@/api/org'
 
 import {QualityTesting,qualityTestingApi} from "@/api/qualityTesting.ts";
+import {ArrowDownOutline, ArrowUpOutline} from "@vicons/ionicons5";
+import type {QcResultDetail} from "@/api/qcResultDetail.ts";
 
 const props =defineProps(
     {
@@ -76,7 +104,27 @@ const qcStatusOptions =  ref<{ label: string; value: any;class:any }[]>([])
 //汇报信息表格
 const reportRecordsColums:DataTableColumns<QualityTesting> = [
 
-  { title: '质检编号', key: 'qcNo',align: 'center' },
+  { title: '质检编号', key: 'qcNo',align: 'center',
+    render(row:any) {
+      return h(
+          'a',
+          {
+            class:"route-code-link",
+            href: 'javascript:;',
+            style:{
+              color: '#2080f0',
+              textDecoration: 'underline',
+              cursor: 'pointer',
+            },
+            onClick: (e: MouseEvent) => {
+              viewQualityResultDetail(row)
+            }
+          },
+          row.qcNo
+
+      )
+    }
+  },
   { title: '来源类型', key: 'sourceType',align: 'center',
     render(row) {
       const val = row.sourceType
@@ -109,6 +157,14 @@ async function loadDictOptions() {
     const data = await dictDataApi.listByType('qc_status')
     qcStatusOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class: d.listClass }))
   }catch {}
+  try {
+    const data = await dictDataApi.listByType('qc_result_type')
+    qcResultTypeOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class: d.listClass }))
+  }catch {}
+  try {
+    const data = await dictDataApi.listByType('qc_action_status')
+    qcActionStatusOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class: d.listClass }))
+  }catch {}
 }
 
 
@@ -134,6 +190,80 @@ function handlePageSizeChange(pageSize: number) {
   loadQualityTestingList()
 }
 
+const  showAssingWorkDetail = ref<Boolean>(false)
+const detailIsCollapse = ref(false)
+
+const detailColumns: DataTableColumns<QcResultDetail> = [
+  {
+    title: '判定类型',
+    key: 'resultType',
+    align: 'center',
+    width: 80,
+    render: (row) => {
+      const val = row.resultType
+      const opt = qcResultTypeOptions.value.find(o => o.value === val || String(o.value) === String(val))
+      if (!opt) return val ?? '-'
+
+      return h(NTag, { type: opt.class, size: 'small' }, { default: () => opt.label })
+    }
+  },
+  {
+    title: '判定数量',
+    key: 'qty',
+    align: 'center',
+    width: 80
+  },
+  {
+    title: '批次号',
+    key: 'traceCode',
+    width: 80,
+    align: 'center',
+    render: (row) => {
+      const val = row.traceCode
+      return val ?? '-'
+    }
+  },
+  {
+    title: '不良代码',
+    key: 'defectCode',
+    width: 80,
+    align: 'center',
+    render: (row) => {
+      const val = row.defectCode
+      return val ?? '-'
+    }
+  },
+  {
+    title: '后续动作',
+    key: 'handleAction',
+    width: 80,
+    align: 'center'
+  },
+  {
+    title: '动作执行状态',
+    key: 'actionStatus',
+    width: 80,
+    align: 'center',
+    render: (row) => {
+      const val = row.actionStatus
+      const opt = qcActionStatusOptions.value.find(o => o.value === val || String(o.value) === String(val))
+      if (!opt) return val ?? '-'
+
+      return h(NTag, { type: opt.class, size: 'small' }, { default: () => opt.label })
+    }
+  }
+]
+
+const detailTableData = ref<Object[]>([])
+const qcResultTypeOptions =  ref<{ label: string; value: any;class:any }[]>([])
+//动作执行状态
+const qcActionStatusOptions =  ref<{ label: string; value: any;class:any }[]>([])
+
+function viewQualityResultDetail(row) {
+    showAssingWorkDetail.value = true
+    detailTableData.value = row.qcResultDetailList
+}
+
 onMounted(()=>{
   loadDictOptions()
   loadQualityTestingList()