From fb969128dfe95c4ab9beda5afec6f713287cb05d Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 21 Apr 2026 16:22:12 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E7=94=9F=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92-=E6=A3=80=E9=AA=8C=E6=98=8E=E7=BB=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/plan/index.vue                  | 18 ++----------
 .../zjproduct/components/ZjProductPreList.vue | 28 ++++++++++++++-----
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index 80b569e7..089ebe89 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -73,33 +73,19 @@
       <!-- 投料进度子表的列表 -->
       <el-table-column type="expand">
         <template #default="scope">
-          <el-tabs v-if="scope.row.status <= 1 && scope.row.status != 6" model-value="itemRequisitionDetail">
-            <el-tab-pane :label="t('ProductionPlan.Plan.detailItemRequisitionTabLabel')" name="itemRequisitionDetail">
-              <ItemRequisitionDetailList :item-requisition-id="scope.row.requisitionId" />
-            </el-tab-pane>
-            <!-- <el-tab-pane label="派工记录" name="paigongRecord">
-              <PaigongRecordList :plan-id="scope.row.id"/>
-            </el-tab-pane> -->
-          </el-tabs>
           <!-- <el-tabs  v-if="scope.row.status == 0" model-value="paigongRecord">
             <el-tab-pane label="派工记录" name="paigongRecord">
               <PaigongRecordList :plan-id="scope.row.id"/>
             </el-tab-pane>
           </el-tabs> -->
-          <el-tabs v-if="scope.row.status == 6" model-value="zj">
-            <el-tab-pane :label="t('ProductionPlan.Plan.detailInspectTabLabel')" name="zj">
-              <ZjProductPreList :key="`${scope.row.id}-zj-${zjProductPreListRefreshKey}`" :ticket="scope.row.id"
-                @inspectable-change="(hasPending) => setInspectable(scope.row.id, hasPending)" />
-            </el-tab-pane>
-          </el-tabs>
-          <el-tabs v-if="scope.row.status >= 2 && scope.row.status != 6" model-value="itemRequisitionDetail">
+          <el-tabs  model-value="itemRequisitionDetail">
             <el-tab-pane :label="t('ProductionPlan.Plan.detailItemRequisitionTabLabel')" name="itemRequisitionDetail">
               <ItemRequisitionDetailList :item-requisition-id="scope.row.requisitionId" />
             </el-tab-pane>
             <el-tab-pane :label="t('ProductionPlan.Plan.detailBaogongRecordTabLabel')" name="baogongRecord">
               <BaogongRecordList :key="`${scope.row.id}-${baogongRecordRefreshKey}`" :plan-id="scope.row.id" />
             </el-tab-pane>
-            <el-tab-pane :label="t('ProductionPlan.Plan.detailInspectTabLabel')" name="zj" v-if="scope.row.status == 8">
+            <el-tab-pane :label="t('ProductionPlan.Plan.detailInspectTabLabel')" name="zj" >
               <ZjProductPreList :key="`${scope.row.id}-zj-${zjProductPreListRefreshKey}`" :ticket="scope.row.id"
                 @inspectable-change="(hasPending) => setInspectable(scope.row.id, hasPending)" />
             </el-tab-pane>
diff --git a/src/views/mes/zjproduct/components/ZjProductPreList.vue b/src/views/mes/zjproduct/components/ZjProductPreList.vue
index a3411664..1f42718a 100644
--- a/src/views/mes/zjproduct/components/ZjProductPreList.vue
+++ b/src/views/mes/zjproduct/components/ZjProductPreList.vue
@@ -48,6 +48,12 @@
         </template>
       </el-table-column>
     </el-table>
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
   </ContentWrap>
 
   <ZjTaskResultDialog ref="resultDialogRef" @success="getList" />
@@ -60,13 +66,12 @@ import { DictTag } from '@/components/DictTag'
 import { DICT_TYPE } from '@/utils/dict'
 import ZjTaskResultDialog from '@/views/mes/zjTask/components/ZjTaskResultDialog.vue'
 
-/** 质量管理-质检参数 列表 */
 defineOptions({ name: 'ZjProductPreList' })
 
 type ZjTaskListRow = ZjTaskVO & { ticketCode?: string; executeTime?: string }
 
 const props = defineProps<{
-  ticket?: number | string // 工单（父列表的 id 字段）
+  ticket?: number | string
 }>()
 
 const emit = defineEmits<{
@@ -75,22 +80,30 @@ const emit = defineEmits<{
 
 const { t } = useI18n()
 
-const loading = ref(false) // 列表的加载中
-const list = ref<ZjTaskListRow[]>([]) // 列表的数据
+const loading = ref(false)
+const list = ref<ZjTaskListRow[]>([])
+const total = ref(0)
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  ticket: undefined as string | undefined
+})
 const resultDialogRef = ref()
 
-/** 查询列表 */
 const getList = async () => {
   const ticket = props.ticket === undefined || props.ticket === null ? '' : String(props.ticket)
   if (!ticket) {
     list.value = []
+    total.value = 0
     emit('inspectableChange', false)
     return
   }
   loading.value = true
   try {
-    const data = await ZjTaskApi.getZjTaskList({ ticket })
-    list.value = Array.isArray(data) ? data : data?.list ?? data?.data ?? []
+    queryParams.ticket = ticket
+    const data = await ZjTaskApi.getZjTaskPage(queryParams)
+    list.value = data.list ?? []
+    total.value = data.total ?? 0
     const hasPending = list.value.some((item) => String(item?.status) === '0')
     emit('inspectableChange', hasPending)
   } finally {
@@ -118,6 +131,7 @@ const handleRowClick = (row: ZjTaskListRow) => {
 watch(
   () => props.ticket,
   () => {
+    queryParams.pageNo = 1
     getList()
   },
   { immediate: true }