From a8c1a388f66585d83097b698f307b45bfabf24a7 Mon Sep 17 00:00:00 2001
From: shaoleiliu-netizen123 <480188199@qq.com>
Date: Mon, 27 Jul 2026 17:53:59 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device.ts                           |  11 +-
 src/api/deviceOperationLog.ts               |  72 +++++++
 src/api/issuerecord.ts                      | 102 +++++++++
 src/api/nccode.ts                           |   9 +
 src/components/DetailPage.vue               |   9 +
 src/views/biz/basicProcessPlan/index.vue    |   1 +
 src/views/biz/device/DeviceOperationLog.vue | 221 ++++++++++++++++++++
 src/views/biz/device/index.vue              |  46 +++-
 src/views/biz/orderProcessPlan/board.vue    |   4 +-
 src/views/biz/orderProcessPlan/pgitem.vue   |   4 +-
 src/views/biz/qualityItem/index.vue         |   1 +
 src/views/biz/station/index.vue             |   2 +
 src/views/lllustrated/index.vue             |   9 +-
 13 files changed, 473 insertions(+), 18 deletions(-)
 create mode 100644 src/api/deviceOperationLog.ts
 create mode 100644 src/api/issuerecord.ts
 create mode 100644 src/components/DetailPage.vue
 create mode 100644 src/views/biz/device/DeviceOperationLog.vue

diff --git a/src/api/device.ts b/src/api/device.ts
index ad1776b..0439cee 100644
--- a/src/api/device.ts
+++ b/src/api/device.ts
@@ -103,11 +103,14 @@ export const deviceApi = {
     export(
         params?:{
             ids?:string[],
-            deviceCode:any
+            deviceCode:any,
+            deviceFlag?:string
         }){
             const p:Record<string,any> = {}
+        console.log( params)
         if(params?.ids?.length) p.ids = params.ids.join(',')
         if(params?.deviceCode != undefined && params?.deviceCode !== null) p.sectionCode = params.deviceCode
+        if(params?.deviceFlag != undefined && params?.deviceFlag !== null) p.deviceFlag = params.deviceFlag
         return request({
             url:`/biz/device/report`,
             method:"get",
@@ -122,5 +125,11 @@ export const deviceApi = {
             method:"get",
             params
         })
+    },
+    deviceList() {
+        return request({
+            url:"/biz/device/list",
+            method:"get"
+        })
     }
 }
\ No newline at end of file
diff --git a/src/api/deviceOperationLog.ts b/src/api/deviceOperationLog.ts
new file mode 100644
index 0000000..592389c
--- /dev/null
+++ b/src/api/deviceOperationLog.ts
@@ -0,0 +1,72 @@
+import { request } from '@/utils/request'
+
+// 设备操作日志 类型定义
+export interface DeviceOperationLog {
+    id?: number
+
+    assingWorkId?: number
+
+    userId?: number
+
+    deviceId?: number
+
+    source?: number
+
+    operationType?: number
+
+    createTime?:  string
+
+}
+
+// 设备操作日志 API
+export const deviceOperationLogApi = {
+    // 分页查询
+    page(params: { page: number; pageSize: number; deviceId?: number; operationType?: number;userId?: number }) {
+        return request({ url: '/terminal/operation/page', method: 'get', params })
+    },
+
+    // 获取详情
+    detail(id:  string) {
+        return request({ url: `/biz/deviceOperationLog/${id}`, method: 'get' })
+    },
+
+    // 新增
+    create(data: DeviceOperationLog) {
+        return request({ url: '/biz/deviceOperationLog', method: 'post', data })
+    },
+
+    // 修改
+    update(data: DeviceOperationLog) {
+        return request({ url: '/biz/deviceOperationLog', method: 'put', data })
+    },
+
+    // 删除
+    delete(ids:  string[]) {
+        return request({ url: `/biz/deviceOperationLog/${ids.join(',')}`, method: 'delete' })
+    },
+
+    // 导出
+    export(params?: { ids?:  string[]; id?: number }) {
+        const p: Record<string, any> = {}
+        if (params?.ids?.length) p.ids = params.ids.join(',')
+        if (params?.id !== undefined && params?.id !== null) p.id = params.id
+        return request({ url: `/biz/deviceOperationLog/export`, method: 'get', params: p, responseType: 'blob' })
+    },
+
+    // 导入
+    importData(file: File) {
+        const formData = new FormData()
+        formData.append('file', file)
+        return request<{ success: number; fail: number; errors: string[] }>({
+            url: `/biz/deviceOperationLog/import`,
+            method: 'post',
+            data: formData,
+            headers: { 'Content-Type': 'multipart/form-data' }
+        })
+    },
+
+    // 下载导入模板
+    downloadTemplate() {
+        return request({ url: `/biz/deviceOperationLog/template`, method: 'get', responseType: 'blob' })
+    }
+}
\ No newline at end of file
diff --git a/src/api/issuerecord.ts b/src/api/issuerecord.ts
new file mode 100644
index 0000000..f45ed9c
--- /dev/null
+++ b/src/api/issuerecord.ts
@@ -0,0 +1,102 @@
+import { request } from '@/utils/request'
+
+// 下发记录表 类型定义
+export interface IssueRecord {
+    id?: number
+
+    issueCode?:  string
+
+    issueType?:  string
+
+    issueTypeName?:  string
+
+    sourceId?: number
+
+    sourceCode?:  string
+
+    sourceName?:  string
+
+    deviceId?: number
+
+    status?: number
+
+    statusName?:  string
+
+    issueTime?:  string
+
+    issueBy?: number
+
+    completeTime?:  string
+
+    result?:  string
+
+    remark?:  string
+
+    createTime?:  string
+
+    createBy?: number
+
+    assingId?: number
+
+    processId?: number
+
+}
+
+// 下发记录表 API
+export const issueRecordApi = {
+    // 分页查询
+    page(params: { page: number; pageSize: number; id?: number; status?: number }) {
+        return request({ url: '/biz/issueRecord/page', method: 'get', params })
+    },
+
+    // 获取详情
+    detail(id: number) {
+        return request({ url: `/biz/issueRecord/${id}`, method: 'get' })
+    },
+
+    // 新增
+    create(data: IssueRecord) {
+        return request({ url: '/biz/issueRecord', method: 'post', data })
+    },
+
+    // 修改
+    update(data: IssueRecord) {
+        return request({ url: '/biz/issueRecord', method: 'put', data })
+    },
+
+    // 删除
+    delete(ids: number[]) {
+        return request({ url: `/biz/issueRecord/${ids.join(',')}`, method: 'delete' })
+    },
+
+    // 导出
+    export(params?: { ids?: number[]; id?: number; status?: number }) {
+        const p: Record<string, any> = {}
+        if (params?.ids?.length) p.ids = params.ids.join(',')
+        if (params?.id !== undefined && params?.id !== null) p.id = params.id
+        if (params?.status !== undefined && params?.status !== null) p.status = params.status
+        return request({ url: `/biz/issueRecord/export`, method: 'get', params: p, responseType: 'blob' })
+    },
+
+    // 导入
+    importData(file: File) {
+        const formData = new FormData()
+        formData.append('file', file)
+        return request<{ success: number; fail: number; errors: string[] }>({
+            url: `/biz/issueRecord/import`,
+            method: 'post',
+            data: formData,
+            headers: { 'Content-Type': 'multipart/form-data' }
+        })
+    },
+
+    // 下载导入模板
+    downloadTemplate() {
+        return request({ url: `/biz/issueRecord/template`, method: 'get', responseType: 'blob' })
+    },
+
+    //设备下发记录
+    getDeviceDispatchLogList(deviceId: number) {
+        return request({ url: `/biz/issueRecord/deviceIssueRecords/${deviceId}`, method: 'get' })
+    }
+}
\ No newline at end of file
diff --git a/src/api/nccode.ts b/src/api/nccode.ts
index 1de4ba7..a13d29e 100644
--- a/src/api/nccode.ts
+++ b/src/api/nccode.ts
@@ -67,6 +67,15 @@ export function issuecopy(data:any) {
     })
 }
 
+// 导出
+export function exportIssue(params?: { ids?: number[]; id?: number; status?: number }) {
+    const p: Record<string, any> = {}
+    if (params?.ids?.length) p.ids = params.ids.join(',')
+    if (params?.id !== undefined && params?.id !== null) p.id = params.id
+    if (params?.status !== undefined && params?.status !== null) p.status = params.status
+    return request({ url: `/biz/ncCode/export`, method: 'get', params: p, responseType: 'blob' })
+}
+
 //任务树
 export function opertree() {
     return request({ 
diff --git a/src/components/DetailPage.vue b/src/components/DetailPage.vue
new file mode 100644
index 0000000..a403c98
--- /dev/null
+++ b/src/components/DetailPage.vue
@@ -0,0 +1,9 @@
+<template>
+
+
+
+</template>
+
+<script>
+
+</script>
\ No newline at end of file
diff --git a/src/views/biz/basicProcessPlan/index.vue b/src/views/biz/basicProcessPlan/index.vue
index eaac2a1..21c984b 100644
--- a/src/views/biz/basicProcessPlan/index.vue
+++ b/src/views/biz/basicProcessPlan/index.vue
@@ -47,6 +47,7 @@
         :loading="loading"
         :row-key="(row) => row.id"
         :scroll-x="1200"
+        v-model:checked-row-keys="selectedIds"
       />
 
       <div class="pagination-container" style="display: flex; justify-content: flex-end; margin-top: 12px">
diff --git a/src/views/biz/device/DeviceOperationLog.vue b/src/views/biz/device/DeviceOperationLog.vue
new file mode 100644
index 0000000..262cf66
--- /dev/null
+++ b/src/views/biz/device/DeviceOperationLog.vue
@@ -0,0 +1,221 @@
+<script setup lang="ts">
+
+import {NButton, NIcon, NSpace} from "naive-ui";
+import {ArrowDown, ArrowUp, RefreshOutline, SearchOutline} from "@vicons/ionicons5";
+import {onMounted, reactive, ref} from "vue";
+import { deviceApi, Device} from '@/api/device.ts'
+import {dictDataApi} from "@/api/org.ts";
+import {userApi,SysUser} from "@/api/system.ts";
+import { deviceOperationLogApi,type DeviceOperationLog } from '@/api/deviceOperationLog.ts'
+
+const pagination = reactive({
+  page: 1,
+  pageSize: 10,
+  itemCount: 0,
+  showSizePicker: true,
+  pageSizes: [10, 20, 50]
+})
+
+const props =  defineProps({
+        deviceId:Number
+      })
+const showSearchInput = ref<Boolean>(false)
+
+const searchForm = ref({
+  createTime: undefined,
+  operationType: undefined,
+  userId: undefined
+})
+
+
+const doShowInner = () => {
+  if (showSearchInput.value) {
+    showSearchInput.value = false
+  }else {
+    showSearchInput.value = true
+  }
+}
+
+
+
+//设备集合
+const deviceList = ref<Device[]>([])
+
+const getDeviceList = async () => {
+  try {
+    const res = await deviceApi.deviceList()
+    deviceList.value = res.map((n:any)=>{
+      return {
+        label:n.deviceName,
+        value:n.id
+      }
+    })
+  } catch (error) {
+    // 错误已在拦截器处理
+  }
+}
+
+//操作类型
+const optionTypeList = ref([])
+const loadDictOptions = async ()=>{
+  try {
+    const data = await dictDataApi.listByType("option_type")
+    optionTypeList.value = data.map(d => ({
+      label: d.dictLabel,
+      value: (Number(d.dictValue) || d.dictValue),
+      class: d.listClass
+    }))
+  } catch {
+  }
+}
+
+
+//人员集合
+const optionUserList = ref<SysUser[]>([])
+const loadUserList = async ()=>{
+  try {
+    const data = await userApi.getPathList()
+    optionUserList.value = data.map(d => ({
+      label: d.nickname,
+      value: d.id
+    }))
+  } catch {
+  }
+}
+
+
+//查询操作日志
+const data = ref([])
+const load = async()=>{
+  const res =  await deviceOperationLogApi.page({
+    page: pagination.page,
+    pageSize: pagination.pageSize,
+    deviceId: props.deviceId,
+    createTime: searchForm.value.createTime,
+    operationType: searchForm.value.operationType,
+    userId: searchForm.value.userId
+  });
+  data.value = res.list
+  pagination.itemCount = res.total
+
+}
+
+//表格
+const columns = [
+    {
+      title: '设备名称',
+      key: 'deviceName'
+    },
+    {
+      title: '操作类型',
+      key: 'operationType'
+    },
+    {
+      title: '操作人员',
+      key: 'nickname'
+    },
+    {
+      title: '操作时间',
+      key: 'createTime'
+    }
+]
+
+
+onMounted(()=>{
+  getDeviceList()
+  loadDictOptions()
+  loadUserList()
+  load()
+})
+
+
+</script>
+
+<template>
+  <div>
+    <n-button @click="doShowInner" v-if="showSearchInput">
+      <n-icon size="20" :depth="3">
+        <ArrowDown/>
+      </n-icon>
+      展开
+    </n-button>
+    <n-card v-if="!showSearchInput">
+        <n-form inline :model="searchForm" label-placement="left">
+          <n-grid :x-gap="8" :cols="4">
+            <n-gi>
+              <n-form-item label="日期">
+                <n-date-picker
+                    v-model:value="searchForm.createTime"
+                    type="date" />
+              </n-form-item>
+            </n-gi>
+            <n-gi>
+              <n-form-item label="操作类型">
+                <n-select
+                    v-model:value="searchForm.operationType"
+                    :options="optionTypeList"
+                    placeholder="请选择设备类型"
+                    clearable
+                    style="width: 200px"
+                />
+              </n-form-item>
+            </n-gi>
+            <n-gi>
+              <n-form-item label="操作人员">
+                <n-select
+                    v-model:value="searchForm.userId"
+                    :options="optionUserList"
+                    placeholder="请选择设备类型"
+                    clearable
+                    style="width: 200px"
+                />
+              </n-form-item>
+            </n-gi>
+            <n-gi>
+              <n-form-item>
+                <n-space>
+                  <n-button type="primary" @click="handleSearch">
+                    <template #icon>
+                      <n-icon>
+                        <SearchOutline/>
+                      </n-icon>
+                    </template>
+                    搜索
+                  </n-button>
+                  <n-button @click="handleReset">
+                    <template #icon>
+                      <n-icon>
+                        <RefreshOutline/>
+                      </n-icon>
+                    </template>
+                    重置
+                  </n-button>
+                </n-space>
+              </n-form-item>
+            </n-gi>
+          </n-grid>
+
+
+        </n-form>
+        <n-button @click="doShowInner" v-if="!showSearchInput" style="float: right;margin: 10px">
+          <n-icon size="20" :depth="3">
+            <ArrowUp/>
+          </n-icon>
+          闭合
+        </n-button>
+    </n-card>
+    <n-card style="margin: 20px 0">
+      <n-data-table
+          :columns="columns"
+          :data="data"
+          :pagination="pagination"
+          :bordered="false"
+      />
+    </n-card>
+  </div>
+
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/biz/device/index.vue b/src/views/biz/device/index.vue
index dd4cf32..1d4dda1 100644
--- a/src/views/biz/device/index.vue
+++ b/src/views/biz/device/index.vue
@@ -74,6 +74,7 @@
           :loading="loading"
           :row-key="(row) => row.id"
           :scroll-x="1200"
+          v-model:checked-row-keys="selectedIds"
       />
       <div class="pagination-container" style="display: flex; justify-content: flex-end; margin-top: 12px">
         <n-pagination
@@ -213,6 +214,21 @@
         </template>
       </n-drawer-content>
     </n-drawer>
+
+    <!--操作日志抽屉-->
+    <n-drawer v-model:show="deviceOperationLogDrawerVisible" width="1800">
+      <n-drawer-content :title="title">
+        <DeviceOperationLogPage
+            :deviceId = deviceId
+        />
+
+        <template #footer>
+          <n-button @click="doShowInner">
+            取消
+          </n-button>
+        </template>
+      </n-drawer-content>
+    </n-drawer>
   </div>
 </template>
 
@@ -239,10 +255,15 @@ import {sectionApi} from '@/api/section'
 import {SysUser, userApi} from '@/api/system'
 import {DeviceAbnormalRecord, deviceAbnormalRecordApi} from "@/api/deviceAbnormalRecord.ts";
 import DeviceAbnormalRecordPage from '@/views/biz/device/DeviceAbnomarlRecord.vue'
+import DeviceOperationLogPage from "@/views/biz/device/DeviceOperationLog.vue";
+import { issueRecordApi } from '@/api/issuerecord'
 const message = useMessage()
 const dialog = useDialog()
 const router = useRouter()
 
+//设备Id
+const deviceId = ref<number>(undefined)
+
 //设备负责人列表
 const deviceManagerList = ref<{ label: string, value: any }[]>([])
 
@@ -256,8 +277,8 @@ const title = ref('')
 //设备下发记录
 const deviceIssueRecordList = ref<[]>([])
 
-
-
+//操作日志抽屉
+const deviceOperationLogDrawerVisible = ref<Boolean>(false)
 
 // 搜索表单
 const searchForm = reactive({
@@ -365,12 +386,14 @@ const columns: DataTableColumns<Device> = [
             {
               label: '设备异常记录',
               key: 'deviceErrorLog',
-
             },
             {
               label: '设备下发记录',
               key: 'deviceDispatchLog',
-
+            },
+            {
+              label: '设备操作日志',
+              key: 'deviceOperationLog',
             }
           ], onSelect: (key: string) => {
             switch (key) {
@@ -380,6 +403,9 @@ const columns: DataTableColumns<Device> = [
               case "deviceDispatchLog":
                 handleDeviceDispatchLog(row)
                 break
+              case "deviceOperationLog":
+                deviceOperationLog(row)
+                break
             }
           }
         }, {
@@ -531,6 +557,7 @@ async function handleExport() {
     const params: Record<string, any> = {}
     if (selectedIds.value.length > 0) params.ids = selectedIds.value
     if (searchForm.deviceCode != null) params.deviceCode = searchForm.deviceCode
+    params.deviceFlag = "mes_equipment"
     const blob = await deviceApi.export(params)
     const url = window.URL.createObjectURL(blob)
     const link = document.createElement('a')
@@ -633,13 +660,22 @@ async function handleDeviceErrorLog(row: Device) {
   deviceErrorLogList.value = row.abnormalRecordList
 }
 
+
 async function handleDeviceDispatchLog(row: Device) {
   const deviceId = row.id
-  //deviceIssueRecordList.value = await deviceIssueRecordApi.getDeviceDispatchLogList(deviceId)
+  deviceIssueRecordList.value = await issueRecordApi.getDeviceDispatchLogList(deviceId)
+}
+
+async function deviceOperationLog(row: Device) {
+  deviceId.value = row.id
+  deviceOperationLogDrawerVisible.value = true
+  title.value = row.deviceName + "操作记录";
+
 }
 
 function doShowInner() {
   deviceAbnormalRecordDrawerVisible.value = false
+  deviceOperationLogDrawerVisible.value = false
 }
 
 onMounted(() => {
diff --git a/src/views/biz/orderProcessPlan/board.vue b/src/views/biz/orderProcessPlan/board.vue
index a2728f5..5f5c832 100644
--- a/src/views/biz/orderProcessPlan/board.vue
+++ b/src/views/biz/orderProcessPlan/board.vue
@@ -664,8 +664,8 @@ const submitLogModalVisible = ref<Boolean>(false)
 //汇报详情
 function openDetailModel(order:ProcessPlanItemVO,procces?:OrderProcessPlanVO) {
  
-  submitLogModalVisible.value = true
-  const processId = procces.planId
+  // submitLogModalVisible.value = true
+  // const processId = procces.planId
 
 }
 
diff --git a/src/views/biz/orderProcessPlan/pgitem.vue b/src/views/biz/orderProcessPlan/pgitem.vue
index 10287b8..115f17b 100644
--- a/src/views/biz/orderProcessPlan/pgitem.vue
+++ b/src/views/biz/orderProcessPlan/pgitem.vue
@@ -82,15 +82,13 @@
     
 </template>
 <script setup lang="ts">
-    import { ref,reactive, watch } from 'vue'
+    import { ref,reactive } from 'vue'
     import { userApi } from '@/api/system'
-    import {deviceApi} from '@/api/device'
     import {sectionApi, type Section} from '@/api/section'
     import {  
         AddOutline, 
         TrashOutline, 
     } from '@vicons/ionicons5'
-import { label } from 'three/tsl'
 
     const props = withDefaults(defineProps<{
         listname:any
diff --git a/src/views/biz/qualityItem/index.vue b/src/views/biz/qualityItem/index.vue
index ee0f631..7d22e58 100644
--- a/src/views/biz/qualityItem/index.vue
+++ b/src/views/biz/qualityItem/index.vue
@@ -51,6 +51,7 @@
         :loading="loading"
         :row-key="(row) => row.id"
         :scroll-x="1200"
+        v-model:checked-row-keys="selectedIds"
       />
 
       <div class="pagination-container" style="display: flex; justify-content: flex-end; margin-top: 12px">
diff --git a/src/views/biz/station/index.vue b/src/views/biz/station/index.vue
index dc3f298..ea2ec22 100644
--- a/src/views/biz/station/index.vue
+++ b/src/views/biz/station/index.vue
@@ -51,6 +51,7 @@
         :loading="loading"
         :row-key="(row) => row.id"
         :scroll-x="1200"
+        v-model:checked-row-keys="selectedIds"
       />
             <div class="pagination-container" style="display: flex; justify-content: flex-end; margin-top: 12px">
         <n-pagination
@@ -361,6 +362,7 @@ async function handleExport() {
     const params: Record<string, any> = {}
     if (selectedIds.value.length > 0) params.ids = selectedIds.value
     if (searchForm.deviceCode != null) params.deviceCode = searchForm.deviceCode
+    params.deviceFlag = "mes_station"
     const blob = await deviceApi.export(params)
     const url = window.URL.createObjectURL(blob)
     const link = document.createElement('a')
diff --git a/src/views/lllustrated/index.vue b/src/views/lllustrated/index.vue
index 6d08291..541b586 100644
--- a/src/views/lllustrated/index.vue
+++ b/src/views/lllustrated/index.vue
@@ -248,7 +248,6 @@ import {
   reactive, 
   h, 
   onMounted,
-  watch, 
 } from 'vue'
 
 
@@ -258,12 +257,9 @@ import {
   NSpace, 
   NImage,
   NPagination, 
-  NGrid, 
-  // NGi, 
-  NTag,
+  NGrid,
   useMessage,
   useDialog,
-  //type FormInst, 
 } from 'naive-ui'
 
 import { 
@@ -278,8 +274,7 @@ import { useUserStore } from '@/stores/user'
 import {
   addDrawing, 
   editDrawing, 
-  drawinglist, 
-  drawingIssue, 
+  drawinglist,
   deleteDrawing
 } from '@/api/illustrated'
 

From 27eee1eff572097dec395f3205ebc7af1e380bad Mon Sep 17 00:00:00 2001
From: shaoleiliu-netizen123 <480188199@qq.com>
Date: Tue, 28 Jul 2026 09:00:22 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E8=AE=B0=E5=BD=95=20=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device.ts                             |   4 +-
 src/api/deviceAbnormalRecord.ts               |   4 +-
 src/api/issuerecord.ts                        |   2 +-
 src/api/system.ts                             |   7 -
 src/api/test01.ts                             |   0
 src/views/biz/device/DeviceAbnomarlRecord.vue | 229 ++++++++++++++++--
 src/views/biz/device/DeviceDispatchLog.vue    | 219 +++++++++++++++++
 src/views/biz/device/DeviceOperationLog.vue   |  80 ++++--
 src/views/biz/device/index.vue                |  61 +++--
 9 files changed, 549 insertions(+), 57 deletions(-)
 create mode 100644 src/api/test01.ts
 create mode 100644 src/views/biz/device/DeviceDispatchLog.vue

diff --git a/src/api/device.ts b/src/api/device.ts
index 0439cee..7324e36 100644
--- a/src/api/device.ts
+++ b/src/api/device.ts
@@ -20,7 +20,9 @@ export interface Device{
     synEquipId?: number | null,
     createTime:string,
     updateTime:string
-    abnormalRecordList:[]
+    abnormalRecordList:[],
+    deviceManagers:[]
+    deviceManager:string
 }
 
 export interface DeviceRealtimeVO {
diff --git a/src/api/deviceAbnormalRecord.ts b/src/api/deviceAbnormalRecord.ts
index f0b1aef..1b545f8 100644
--- a/src/api/deviceAbnormalRecord.ts
+++ b/src/api/deviceAbnormalRecord.ts
@@ -16,7 +16,7 @@ export interface DeviceAbnormalRecord {
 
   stationName?:  string
 
-  abnormalType?:  string
+  abnormalType?:  number
 
   abnormalTypeName?:  string
 
@@ -53,7 +53,7 @@ export interface DeviceAbnormalRecord {
 // 设备异常记录表 API
 export const deviceAbnormalRecordApi = {
   // 分页查询
-  page(params: { page: number; pageSize: number; id?: number; status?:  string }) {
+  page(params: { page: number; pageSize: number; deviceId?: number; abnormalCode?:  string,abnormalType?:number }) {
     return request({ url: '/biz/deviceAbnormalRecord/page', method: 'get', params })
   },
 
diff --git a/src/api/issuerecord.ts b/src/api/issuerecord.ts
index f45ed9c..ec6e12d 100644
--- a/src/api/issuerecord.ts
+++ b/src/api/issuerecord.ts
@@ -45,7 +45,7 @@ export interface IssueRecord {
 // 下发记录表 API
 export const issueRecordApi = {
     // 分页查询
-    page(params: { page: number; pageSize: number; id?: number; status?: number }) {
+    page(params: { page: number; pageSize: number; issueCode?: string; status?: number;deviceId?:number }) {
         return request({ url: '/biz/issueRecord/page', method: 'get', params })
     },
 
diff --git a/src/api/system.ts b/src/api/system.ts
index be64535..b193d3b 100644
--- a/src/api/system.ts
+++ b/src/api/system.ts
@@ -136,13 +136,6 @@ export const userApi = {
     })
   },
 
-  //获取设备负责人
-  getEquipmentManager() {
-    return request({
-        url:"/sys/user/getEquipmentManager",
-        method:"get"
-    })
-  }
 
 
 }
diff --git a/src/api/test01.ts b/src/api/test01.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/biz/device/DeviceAbnomarlRecord.vue b/src/views/biz/device/DeviceAbnomarlRecord.vue
index 895ef06..206b6c0 100644
--- a/src/views/biz/device/DeviceAbnomarlRecord.vue
+++ b/src/views/biz/device/DeviceAbnomarlRecord.vue
@@ -1,21 +1,78 @@
 <script setup lang="ts">
   import {DeviceAbnormalRecord} from "@/api/deviceAbnormalRecord.ts";
-  import {DataTableColumns, NDataTable, NTag} from "naive-ui";
-  import {h, onMounted, ref} from "vue";
+  import {DataTableColumns, NButton, NDataTable, NIcon, NSpace, NTag} from "naive-ui";
+  import {h, onMounted, reactive, ref} from "vue";
   import {dictDataApi} from "@/api/org.ts";
+  import {ArrowDown, ArrowUp, RefreshOutline, SearchOutline} from "@vicons/ionicons5";
+  import {deviceAbnormalRecordApi} from "@/api/deviceAbnormalRecord.ts";
+
 
   const deviceNormalRecordOptions =  ref<{ label: string; value: any;class:any }[]>([])
 
-  const props = defineProps<{
-    deviceAbnormalRecordList: DeviceAbnormalRecord[]
-  }>()
+  const props =  defineProps({
+    deviceId:Number
+  })
+
+  const showSearchInput = ref<Boolean>(false)
+
+
+  const searchForm = ref({
+    abnormalCode: undefined,
+    abnormalType: undefined
+  })
+
+  const abnormalTypes = [
+      {
+        label: '机械异常',
+        value: '0'
+      },
+      {
+        label: '电气异常',
+        value: '1'
+      },
+      {
+        label: '软件异常',
+        value: '2'
+      },
+      {
+        label: '其他异常',
+        value: '3'
+      }
+  ]
+
+  const pagination = reactive({
+    page: 1,
+    pageSize: 10,
+    itemCount: 0,
+    showSizePicker: true,
+    pageSizes: [10, 20, 50]
+  })
+
+  //报警异常字典
+  const deviceAbnormalTypeOptions = ref<{ label: string; value: any;class:any }[]>( [])
+
+  //异常级别字典
+  const deviceAbnormalLevelOptions = ref<{ label: string; value: any;class:any }[]>( [])
 
   //汇报信息表格
-  const deviceAbnormalRecordColums:DataTableColumns<DeviceAbnormalRecord> = [
+  const columns:DataTableColumns<DeviceAbnormalRecord> = [
 
-    { title: '异常编号', key: 'abnormalCode',align: 'center' },
-    { title: '异常类型', key: 'abnormalType',align: 'center' },
-    { title: '异常级别', key: 'abnormalLevel',align: 'center'},
+    { title: '报警异常', key: 'abnormalType',align: 'center',
+      render(row) {
+        const val = row.abnormalType
+        const opt = deviceAbnormalTypeOptions.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: 'abnormalLevel',align: 'center',
+      render(row) {
+        const val = row.abnormalLevel
+        const opt = deviceAbnormalLevelOptions.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: 'abnormalDesc',align: 'center' },
     { title: '异常时间', key: 'abnormalTime',align: 'center' },
     { title: '处理状态', key: 'status',align: 'center',
@@ -34,23 +91,159 @@
       const data = await dictDataApi.listByType('device_abnormal_status')
       deviceNormalRecordOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class: d.listClass }))
     }catch {}
+
+    try {
+      const data = await dictDataApi.listByType('abnormal_type')
+      deviceAbnormalTypeOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class: d.listClass }))
+    }catch {}
+    try {
+      const data = await dictDataApi.listByType('abnormal_level')
+      deviceAbnormalLevelOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class: d.listClass }))
+    }catch {}
   }
 
+
+  const data = ref([])
+  const load = async() => {
+    try {
+      const res = await deviceAbnormalRecordApi.page({
+        page: pagination.page,
+        pageSize: pagination.pageSize,
+        deviceId: props.deviceId,
+        abnormalCode: searchForm.value.abnormalCode,
+        abnormalType: searchForm.value.abnormalType,
+      })
+      data.value = res.list
+      pagination.itemCount = res.total
+    } catch (e) {}
+  }
+
+  const doShowInner = () => {
+    if (showSearchInput.value) {
+      showSearchInput.value = false
+    }else {
+      showSearchInput.value = true
+    }
+  }
+
+  const handleSearch =  () => {
+    load()
+  }
+
+  const handleReset = () => {
+    searchForm.value.abnormalType = null
+    searchForm.value.abnormalCode = null
+    pagination.page = 1
+    pagination.pageSize = 10
+    load()
+  }
+
+
+  // 分页
+  function handlePageChange(page: number) {
+    pagination.page = page
+    load()
+  }
+
+  function handlePageSizeChange(pageSize: number) {
+    pagination.pageSize = pageSize
+    pagination.page = 1
+    load()
+  }
+
+
   onMounted(()=>{
+    load()
     loadDictOptions()
   })
 </script>
 
 <template>
-  <n-card>
-    <n-data-table
-        :columns="deviceAbnormalRecordColums"
-        size="small"
-        :data="props.deviceAbnormalRecordList"
-        remote
-        :scroll-x="600"
-    />
-  </n-card>
+  <div>
+    <n-button @click="doShowInner" v-if="showSearchInput">
+      <n-icon size="20" :depth="3">
+        <ArrowDown/>
+      </n-icon>
+      展开
+    </n-button>
+    <n-card v-if="!showSearchInput">
+      <n-form inline :model="searchForm" label-placement="left">
+        <n-grid :x-gap="8" :cols="4">
+          <n-gi>
+            <n-form-item label="异常编号">
+              <n-input v-model:value="searchForm.abnormalCode" placeholder="请输入异常编号" clearable style="width: 200px"/>
+            </n-form-item>
+          </n-gi>
+          <n-gi>
+            <n-form-item label="操作人员">
+              <n-select
+                  v-model:value="searchForm.abnormalType"
+                  :options="abnormalTypes"
+                  placeholder="请选择异常类型"
+                  clearable
+                  style="width: 200px"
+              />
+            </n-form-item>
+          </n-gi>
+          <n-gi>
+            <n-form-item>
+              <n-space>
+                <n-button type="primary" @click="handleSearch">
+                  <template #icon>
+                    <n-icon>
+                      <SearchOutline/>
+                    </n-icon>
+                  </template>
+                  搜索
+                </n-button>
+                <n-button @click="handleReset">
+                  <template #icon>
+                    <n-icon>
+                      <RefreshOutline/>
+                    </n-icon>
+                  </template>
+                  重置
+                </n-button>
+              </n-space>
+            </n-form-item>
+          </n-gi>
+        </n-grid>
+
+
+      </n-form>
+      <n-button @click="doShowInner" v-if="!showSearchInput" style="float: right;margin: 10px">
+        <n-icon size="20" :depth="3">
+          <ArrowUp/>
+        </n-icon>
+        闭合
+      </n-button>
+    </n-card>
+    <n-card style="margin: 20px 0">
+      <n-data-table
+          :columns="columns"
+          :data="data"
+          :bordered="false"
+      />
+
+      <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="[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>
+  </div>
+
 </template>
 
 <style scoped>
diff --git a/src/views/biz/device/DeviceDispatchLog.vue b/src/views/biz/device/DeviceDispatchLog.vue
new file mode 100644
index 0000000..eb2992d
--- /dev/null
+++ b/src/views/biz/device/DeviceDispatchLog.vue
@@ -0,0 +1,219 @@
+<script setup lang="ts">
+
+import {ArrowDown, ArrowUp, RefreshOutline, SearchOutline} from "@vicons/ionicons5";
+import {NButton, NIcon, NSpace} from "naive-ui";
+import {onMounted, reactive, ref} from "vue";
+import { issueRecordApi,IssueRecord } from '@/api/issuerecord.ts'
+
+const props =  defineProps({
+  deviceId:Number
+})
+
+const showSearchInput = ref<Boolean>(false)
+
+const searchForm = ref({
+  issueCode: undefined,
+  status: undefined,
+})
+
+
+const pagination = reactive({
+  page: 1,
+  pageSize: 2,
+  itemCount: 0,
+  showSizePicker: true,
+  pageSizes: [10, 20, 50]
+})
+
+const doShowInner = () => {
+  if (showSearchInput.value) {
+    showSearchInput.value = false
+  }else {
+    showSearchInput.value = true
+  }
+}
+
+//状态
+const statusList = [
+    {
+      label: '下发失败',
+      value: 0
+    },
+    {
+      label: '下发成功',
+      value: 1
+    }
+]
+
+//查询下发日志
+const data = ref([])
+const load = async()=>{
+  const res =  await issueRecordApi.page({
+    pageSize: pagination.pageSize,
+    page: pagination.page,
+    deviceId: props.deviceId,
+    issueCode: searchForm.value.issueCode,
+    status: searchForm.value.status
+  });
+  data.value = res.list
+  pagination.itemCount = res.total
+}
+
+
+const columns = [
+  {
+    title: '下发编号',
+    key: 'issueCode'
+  },
+  {
+    title: '下发类型',
+    key: 'issueType',
+    render(row) {
+      var opt = row.issueType
+      if(opt == 0) return '图纸'
+      if(opt == 1) return '文件'
+      if(opt == 2) return '代码'
+      return '-'
+    }
+  },
+  {
+    title: '下发状态',
+    key: 'status',
+    render(row) {
+      var opt = row.status
+      if(opt == 0) return '下发失败'
+      if(opt == 1) return '下发成功'
+    }
+  },
+  {
+    title: '下发时间',
+    key: 'issueTime'
+  },
+  {
+    title: '备注',
+    key: 'remark'
+  }
+]
+
+const handleSearch =  () => {
+  load()
+}
+
+const handleReset = () => {
+  searchForm.value.issueCode = null
+  searchForm.value.status = null
+  pagination.page = 1
+  pagination.pageSize = 10
+  handleSearch()
+}
+
+// 分页
+function handlePageChange(page: number) {
+  pagination.page = page
+  load()
+}
+
+function handlePageSizeChange(pageSize: number) {
+  pagination.pageSize = pageSize
+  pagination.page = 1
+  load()
+}
+
+
+onMounted(()=>{
+  load()
+})
+
+
+</script>
+
+<template>
+  <div>
+    <n-button @click="doShowInner" v-if="showSearchInput">
+      <n-icon size="20" :depth="3">
+        <ArrowDown/>
+      </n-icon>
+      展开
+    </n-button>
+    <n-card v-if="!showSearchInput">
+      <n-form inline :model="searchForm" label-placement="left">
+        <n-grid :x-gap="8" :cols="4">
+          <n-gi>
+            <n-form-item label="下发编号">
+                <n-input v-model:value="searchForm.issueCode" placeholder="请输入设备下发编号" clearable style="width: 200px"/>
+            </n-form-item>
+          </n-gi>
+          <n-gi>
+            <n-form-item label="下发状态">
+              <n-select
+                  v-model:value="searchForm.status"
+                  :options="statusList"
+                  placeholder="请选择设备类型"
+                  clearable
+                  style="width: 200px"
+              />
+            </n-form-item>
+          </n-gi>
+          <n-gi>
+            <n-form-item>
+              <n-space>
+                <n-button type="primary" @click="handleSearch">
+                  <template #icon>
+                    <n-icon>
+                      <SearchOutline/>
+                    </n-icon>
+                  </template>
+                  搜索
+                </n-button>
+                <n-button @click="handleReset">
+                  <template #icon>
+                    <n-icon>
+                      <RefreshOutline/>
+                    </n-icon>
+                  </template>
+                  重置
+                </n-button>
+              </n-space>
+            </n-form-item>
+          </n-gi>
+        </n-grid>
+
+
+      </n-form>
+      <n-button @click="doShowInner" v-if="!showSearchInput" style="float: right;margin: 10px">
+        <n-icon size="20" :depth="3">
+          <ArrowUp/>
+        </n-icon>
+        闭合
+      </n-button>
+    </n-card>
+    <n-card style="margin: 20px 0">
+      <n-data-table
+          :columns="columns"
+          :data="data"
+          :bordered="false"
+      />
+
+      <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="[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>
+  </div>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/biz/device/DeviceOperationLog.vue b/src/views/biz/device/DeviceOperationLog.vue
index 262cf66..0f05717 100644
--- a/src/views/biz/device/DeviceOperationLog.vue
+++ b/src/views/biz/device/DeviceOperationLog.vue
@@ -108,18 +108,54 @@ const columns = [
     },
     {
       title: '操作类型',
-      key: 'operationType'
+      key: 'operationTypeName'
     },
     {
       title: '操作人员',
-      key: 'nickname'
+      key: 'userName'
     },
     {
       title: '操作时间',
       key: 'createTime'
+    },
+    {
+      title: '数据来源',
+      key: 'source',
+      render(row) {
+        var opt = row.source
+        if(opt == 1) return '终端'
+        if(opt == 2) return '后台'
+        return '-'
+      }
     }
 ]
 
+const handleSearch =  () => {
+  load()
+}
+
+const handleReset = () => {
+  searchForm.value.createTime = null
+  searchForm.value.operationType = null
+  searchForm.value.userId = null
+  pagination.page = 1
+  pagination.pageSize = 10
+  load()
+}
+
+
+// 分页
+function handlePageChange(page: number) {
+  pagination.page = page
+  load()
+}
+
+function handlePageSizeChange(pageSize: number) {
+  pagination.pageSize = pageSize
+  pagination.page = 1
+  load()
+}
+
 
 onMounted(()=>{
   getDeviceList()
@@ -149,17 +185,17 @@ onMounted(()=>{
                     type="date" />
               </n-form-item>
             </n-gi>
-            <n-gi>
-              <n-form-item label="操作类型">
-                <n-select
-                    v-model:value="searchForm.operationType"
-                    :options="optionTypeList"
-                    placeholder="请选择设备类型"
-                    clearable
-                    style="width: 200px"
-                />
-              </n-form-item>
-            </n-gi>
+<!--            <n-gi>-->
+<!--              <n-form-item label="操作类型">-->
+<!--                <n-select-->
+<!--                    v-model:value="searchForm.operationType"-->
+<!--                    :options="optionTypeList"-->
+<!--                    placeholder="请选择设备类型"-->
+<!--                    clearable-->
+<!--                    style="width: 200px"-->
+<!--                />-->
+<!--              </n-form-item>-->
+<!--            </n-gi>-->
             <n-gi>
               <n-form-item label="操作人员">
                 <n-select
@@ -208,9 +244,25 @@ onMounted(()=>{
       <n-data-table
           :columns="columns"
           :data="data"
-          :pagination="pagination"
           :bordered="false"
       />
+
+      <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="[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>
   </div>
 
diff --git a/src/views/biz/device/index.vue b/src/views/biz/device/index.vue
index 1d4dda1..99bf58c 100644
--- a/src/views/biz/device/index.vue
+++ b/src/views/biz/device/index.vue
@@ -131,10 +131,10 @@
         </n-form-item>
         <n-form-item label="设备负责人" path="deviceManager">
           <n-select
-              v-model:value="formData.deviceManagerList"
+              v-model:value="formData.deviceManagers"
               :options="deviceManagerList"
               multiple
-              placeholder="请选择设备类型"
+              placeholder="请选择设备负责人"
               clearable
               style="width: 200px"
           />
@@ -202,10 +202,10 @@
     </n-modal>
 
     <!--异常记录抽屉-->
-    <n-drawer v-model:show="deviceAbnormalRecordDrawerVisible" :title="title" width="800">
+    <n-drawer v-model:show="deviceAbnormalRecordDrawerVisible" :title="title" width="1800">
       <n-drawer-content :title="title">
         <DeviceAbnormalRecordPage
-            :deviceAbnormalRecordList="deviceAbnormalRecordList"
+            :deviceId="deviceId"
         />
         <template #footer>
           <n-button @click="doShowInner">
@@ -229,6 +229,21 @@
         </template>
       </n-drawer-content>
     </n-drawer>
+
+    <!--下发记录抽屉-->
+    <n-drawer v-model:show="deviceDispatchLogDrawerVisible" width="1800">
+      <n-drawer-content :title="title">
+        <DeviceDispatchLogPage
+            :deviceId = deviceId
+        />
+
+        <template #footer>
+          <n-button @click="doShowInner">
+            取消
+          </n-button>
+        </template>
+      </n-drawer-content>
+    </n-drawer>
   </div>
 </template>
 
@@ -256,7 +271,8 @@ import {SysUser, userApi} from '@/api/system'
 import {DeviceAbnormalRecord, deviceAbnormalRecordApi} from "@/api/deviceAbnormalRecord.ts";
 import DeviceAbnormalRecordPage from '@/views/biz/device/DeviceAbnomarlRecord.vue'
 import DeviceOperationLogPage from "@/views/biz/device/DeviceOperationLog.vue";
-import { issueRecordApi } from '@/api/issuerecord'
+
+import DeviceDispatchLogPage from "@/views/biz/device/DeviceDispatchLog.vue";
 const message = useMessage()
 const dialog = useDialog()
 const router = useRouter()
@@ -276,6 +292,7 @@ const title = ref('')
 
 //设备下发记录
 const deviceIssueRecordList = ref<[]>([])
+const deviceDispatchLogDrawerVisible = ref<Boolean>(false)
 
 //操作日志抽屉
 const deviceOperationLogDrawerVisible = ref<Boolean>(false)
@@ -318,7 +335,9 @@ const defaultFormData: Device = {
   status: 0,
   deviceFlag: 'mes_equipment',
   synEquipId: null as number | null,
-  deviceManagerList: null as any | null
+  deviceManagerList: null as any | null,
+  deviceManagers: null as [string] | null,
+  deviceManager: null as String | null
 }
 const formData = reactive<Device>({...defaultFormData})
 
@@ -481,16 +500,23 @@ function goRealtimeBoard() {
 
 // 编辑
 function handleEdit(row: Device) {
-
+  Object.assign(formData, defaultFormData)
   modalTitle.value = '编辑设备表'
   Object.assign(formData, row)
-  console.log(formData);
-
+  const userIdList = []
+  if (row.deviceManager) {
+    let manager = row.deviceManager.split(',');
+    manager.forEach(item => {
+      userIdList.push(Number(item))
+    })
+  }
+  formData.deviceManagers = userIdList
   modalVisible.value = true
 }
 
 // 提交
 async function handleSubmit() {
+
   await formRef.value?.validate()
   try {
     const submitData = {...formData} as Device
@@ -647,23 +673,29 @@ async function loadSection() {
 
 //加载人员
 async function handleUser() {
-  const res = await userApi.getEquipmentManager()
-  deviceManagerList.value = res
+  const res = await userApi.getPathList()
+  deviceManagerList.value = res.map((n:any)=>{
+    return {
+        label:n.username,
+        value:n.id
+    }
+   })
 }
 
 
 //查看设备异常记录
 async function handleDeviceErrorLog(row: Device) {
+  deviceId.value = row.id
   deviceAbnormalRecordDrawerVisible.value = true
   title.value  = row.deviceName+"异常记录"
 
-  deviceErrorLogList.value = row.abnormalRecordList
 }
 
 
 async function handleDeviceDispatchLog(row: Device) {
-  const deviceId = row.id
-  deviceIssueRecordList.value = await issueRecordApi.getDeviceDispatchLogList(deviceId)
+  deviceId.value = row.id
+  deviceDispatchLogDrawerVisible.value = true
+  title.value = row.deviceName+"设备下发记录"
 }
 
 async function deviceOperationLog(row: Device) {
@@ -676,6 +708,7 @@ async function deviceOperationLog(row: Device) {
 function doShowInner() {
   deviceAbnormalRecordDrawerVisible.value = false
   deviceOperationLogDrawerVisible.value = false
+  deviceDispatchLogDrawerVisible.value = false
 }
 
 onMounted(() => {

From 147b802daf4f2f51cfd5e5061fa7dd6befa4004e Mon Sep 17 00:00:00 2001
From: wzt <3847407356@qq.com>
Date: Tue, 28 Jul 2026 09:54:38 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=80=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pnpm-workspace.yaml | 10 +++---
 src/api/tool.ts     | 77 +++++++++++++++++++++++++++++++++++++++++++++
 src/router/index.ts | 16 +++++-----
 3 files changed, 90 insertions(+), 13 deletions(-)
 create mode 100644 src/api/tool.ts

diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 4e9e4a2..17490f2 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,6 +1,6 @@
 allowBuilds:
-  '@parcel/watcher': set this to true or false
-  core-js: set this to true or false
-  electron-winstaller: set this to true or false
-  esbuild: set this to true or false
-  vue-demi: set this to true or false
+  '@parcel/watcher': true
+  core-js: true
+  electron-winstaller: true
+  esbuild: true
+  vue-demi: true
diff --git a/src/api/tool.ts b/src/api/tool.ts
new file mode 100644
index 0000000..a731824
--- /dev/null
+++ b/src/api/tool.ts
@@ -0,0 +1,77 @@
+import { request } from '@/utils/request'
+
+export interface Tool {
+  id?: number
+  toolCode: string
+  toolName: string
+  toolType: string
+  toolTypeId?: number
+  specModel: string
+  material: string
+  manufacturer: string
+  purchaseDate?: string | number
+  lifeCycle: number
+  usedCount?: number
+  status: number
+  remark: string
+  createTime?: string
+  updateTime?: string
+}
+
+export const toolApi = {
+  page(params: {
+    page: number
+    pageSize: number
+    toolCode?: string
+    toolName?: string
+    status?: number
+  }) {
+    return request({
+      url: '/biz/tool/page',
+      method: 'get',
+      params
+    })
+  },
+
+  create(data: Tool) {
+    return request({
+      url: '/biz/tool',
+      method: 'post',
+      data
+    })
+  },
+
+  update(data: Tool) {
+    return request({
+      url: '/biz/tool',
+      method: 'put',
+      data
+    })
+  },
+
+  delete(ids: number[]) {
+    return request({
+      url: `/biz/tool/${ids.join(',')}`,
+      method: 'delete'
+    })
+  },
+
+  export(params?: {
+    ids?: number[]
+    toolCode?: string
+    toolName?: string
+    status?: number
+  }) {
+    const p: Record<string, any> = {}
+    if (params?.ids?.length) p.ids = params.ids.join(',')
+    if (params?.toolCode) p.toolCode = params.toolCode
+    if (params?.toolName) p.toolName = params.toolName
+    if (params?.status != null) p.status = params.status
+    return request({
+      url: '/biz/tool/report',
+      method: 'get',
+      params: p,
+      responseType: 'blob'
+    })
+  }
+}
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index b2c625a..f190e34 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -290,16 +290,16 @@ const routes: RouteRecordRaw[] = [
         meta: { title: '工序委外', icon: 'ListOutline' }
       },
       {
-        path: 'biz/deviceGather',
-        name: 'deviceGather',
-        component: () => import('@/views/biz/deviceGather/index.vue'),
-        meta: { title: '设备采集', icon: 'ListOutline' }
+        path: 'biz/tool',
+        name: 'tool',
+        component: () => import('@/views/biz/tool/index.vue'),
+        meta: { title: '刀具管理', icon: 'ToolOutline' }
       },
       {
-        path: 'biz/callingMaterials',
-        name: 'callingMaterials',
-        component: () => import('@/views/biz/callingMaterials/index.vue'),
-        meta: { title: '叫料记录', icon: 'ListOutline' }
+        path: 'biz/tool/usage',
+        name: 'toolUsage',
+        component: () => import('@/views/biz/tool/usage.vue'),
+        meta: { title: '刀具使用记录', icon: 'ToolOutline', activeMenu: '/biz/tool' }
       },
       {
         // 开发工具

From 69e5e45478739967a0b348dcc8760809ca888efa Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Tue, 28 Jul 2026 11:25:45 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=AE=A2=E9=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue               | 4 ++--
 src/views/message/notice/index.vue | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 880415d..a91bac8 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -246,8 +246,8 @@
                   <template v-if="messageTab === 'notice'">
                     <div v-for="item in recentNotices" :key="item.id" class="message-item" @click="handleNoticeClick(item)">
                       <div class="message-item-header">
-                        <n-tag :type="item.noticeType === 1 ? 'info' : 'warning'" size="small">
-                          {{ item.noticeType === 1 ? '通知' : '公告' }}
+                        <n-tag :type="item.noticeType === 1 ? 'info' : item.noticeType === 2 ? 'warning' : 'error' " size="small">
+                          {{ item.noticeType === 1 ? '通知' : item.noticeType === 2 ? '公告' : '异常通知' }}
                         </n-tag>
                         <span class="message-time">{{ formatMessageTime(item.createTime) }}</span>
                       </div>
diff --git a/src/views/message/notice/index.vue b/src/views/message/notice/index.vue
index 658df77..6e4a787 100644
--- a/src/views/message/notice/index.vue
+++ b/src/views/message/notice/index.vue
@@ -301,7 +301,8 @@ const columns: DataTableColumns<SysNotice> = [
     render(row) {
       const typeMap: Record<number, { text: string; type: 'info' | 'warning' }> = {
         1: { text: '通知', type: 'info' },
-        2: { text: '公告', type: 'warning' }
+        2: { text: '公告', type: 'warning' },
+        3: { text: '异常通知', type: 'error' }
       }
       const config = typeMap[row.noticeType] || { text: '未知', type: 'info' as const }
       return h(NTag, { type: config.type, size: 'small' }, { default: () => config.text })

From c0832186b1262154ce64c70ff22691cb34962949 Mon Sep 17 00:00:00 2001
From: shaoleiliu-netizen123 <480188199@qq.com>
Date: Tue, 28 Jul 2026 14:19:55 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BE=E5=B7=A5?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=B1=87=E6=8A=A5=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E8=B4=A8=E6=A3=80=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/orderProcessPlan.ts                   |   8 +-
 src/api/qualityTesting.ts                     |   5 +
 src/api/section.ts                            |   2 +-
 src/api/submitLog.ts                          |  10 +
 src/router/index.ts                           |  24 +-
 src/views/biz/orderProcessPlan/board.vue      |  60 +++-
 .../components/ProcessCard.vue                |   2 +-
 .../components/ReportDetail.vue               | 295 ++++++++++++++++++
 src/views/biz/orderProcessPlan/pgitem.vue     |  13 +-
 .../componets/AssingWorkTreeTable.vue         |  35 ++-
 .../production/componets/QualityInfoPage.vue  |  12 +-
 .../componets/SubmitLogInfoPage.vue           |  17 +-
 src/views/production/myassigtask/index.vue    |  17 +-
 13 files changed, 428 insertions(+), 72 deletions(-)
 create mode 100644 src/views/biz/orderProcessPlan/components/ReportDetail.vue

diff --git a/src/api/orderProcessPlan.ts b/src/api/orderProcessPlan.ts
index c53c3e1..a2491df 100644
--- a/src/api/orderProcessPlan.ts
+++ b/src/api/orderProcessPlan.ts
@@ -126,6 +126,8 @@ export interface ProcessPlanItemVO {
 
   assignWorkList?: AssignWorkItem[]
 
+  proWorkshop?: string
+
 }
 
 
@@ -224,6 +226,8 @@ export function processItemToEntity(
 
   orderItemId?: number,
 
+  proWorkshop?:string
+
 ): OrderProcessPlan {
 
   return {
@@ -256,7 +260,9 @@ export function processItemToEntity(
 
     storageEntry: item.storageEntry,
     
-    workCenterName:item.workCenterName
+    workCenterName:item.workCenterName,
+
+    proWorkshop
 
   }
 
diff --git a/src/api/qualityTesting.ts b/src/api/qualityTesting.ts
index e038d50..54df286 100644
--- a/src/api/qualityTesting.ts
+++ b/src/api/qualityTesting.ts
@@ -103,5 +103,10 @@ export const qualityTestingApi = {
     // 下载导入模板
     downloadTemplate() {
         return request({ url: `/biz/qualityTesting/template`, method: 'get', responseType: 'blob' })
+    },
+
+    //加载质检单
+    loadQualityTestingList(assingId:number) {
+        return request({url:`/mes/qc/loadQualityTestingList/${assingId}`,method:'get'})
     }
 }
\ No newline at end of file
diff --git a/src/api/section.ts b/src/api/section.ts
index 97c2110..a145595 100644
--- a/src/api/section.ts
+++ b/src/api/section.ts
@@ -68,7 +68,7 @@ export const sectionApi = {
         })    
     },
 
-    list(params:{sectionName:string}) {
+    list(params:{sectionName:string,workShop:string}) {
         return request({
             url:"/biz/section/listBySectionName",
             method:"get",
diff --git a/src/api/submitLog.ts b/src/api/submitLog.ts
index 7d8c5c6..47a271b 100644
--- a/src/api/submitLog.ts
+++ b/src/api/submitLog.ts
@@ -87,5 +87,15 @@ export const submitLogApi = {
   //按派工单id查询汇报
   getByDispatch(dispatchId:number){
     return request({url:`/mes/report/bydispatch/${dispatchId}`,method:"get"})
+  },
+
+  //根据工序Id查询汇报
+  getProcessReportDetail(processId:number){
+    return request({url:`/mes/report/submitLogToProcess/${processId}`,method:"get"})
+  },
+
+  //加载汇报列表
+  loadSumbitLog(assingId?:number){
+    return request({url:`/mes/report/loadSumbitLog/${assingId}`,method:'get'})
   }
 }
diff --git a/src/router/index.ts b/src/router/index.ts
index c0e6301..0036c26 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -289,18 +289,18 @@ const routes: RouteRecordRaw[] = [
         component: () => import('@/views/biz/outsourcing/index.vue'),
         meta: { title: '工序委外', icon: 'ListOutline' }
       },
-      {
-        path: 'biz/tool',
-        name: 'tool',
-        component: () => import('@/views/biz/tool/index.vue'),
-        meta: { title: '刀具管理', icon: 'ToolOutline' }
-      },
-      {
-        path: 'biz/tool/usage',
-        name: 'toolUsage',
-        component: () => import('@/views/biz/tool/usage.vue'),
-        meta: { title: '刀具使用记录', icon: 'ToolOutline', activeMenu: '/biz/tool' }
-      },
+      // {
+      //   path: 'biz/tool',
+      //   name: 'tool',
+      //   component: () => import('@/views/biz/tool/index.vue'),
+      //   meta: { title: '刀具管理', icon: 'ToolOutline' }
+      // },
+      // {
+      //   path: 'biz/tool/usage',
+      //   name: 'toolUsage',
+      //   component: () => import('@/views/biz/tool/usage.vue'),
+      //   meta: { title: '刀具使用记录', icon: 'ToolOutline', activeMenu: '/biz/tool' }
+      // },
       {
         path: 'biz/errorNotification',
         name: 'errorNotification',
diff --git a/src/views/biz/orderProcessPlan/board.vue b/src/views/biz/orderProcessPlan/board.vue
index 5f5c832..c764e8f 100644
--- a/src/views/biz/orderProcessPlan/board.vue
+++ b/src/views/biz/orderProcessPlan/board.vue
@@ -353,6 +353,7 @@
               :obj="n"
               :index="i"
               :section="dispatchform.workCenterName"
+              :workShop="dispatchform.workShop"
               listname="list"
               @addhand="addpgnum"
               @delehand="deletenum(i)"
@@ -531,10 +532,28 @@
 
 
     <!-- 汇报详情弹窗 -->
-    <n-modal v-model:show="submitLogModalVisible" preset="card" title="导入工序计划" style="width: 500px">
-
+    <n-modal v-model:show="submitLogModalVisible" preset="card" title="工序汇报详情" style="width: 2000px">
+      <ReportDetailPage
+        :planId="processId"
+      />
+      <template #footer>
+        <n-space justify="end">
+          <n-button size="small" @click="submitLogModalVisible = false">取消</n-button>
+        </n-space>
+      </template>
     </n-modal>
 
+
+    <n-modal v-model:show="submitModalVisible" preset="card" title="工单汇报详情" style="width: 500px">
+      <OrderReportDetailPage
+        :orderId="orderId"
+      />
+      <template #footer>
+        <n-space justify="end">
+          <n-button size="small" @click="submitLogModalVisible = false">取消</n-button>
+        </n-space>
+      </template>
+    </n-modal>
   </div>
 </template>
 
@@ -550,7 +569,7 @@ import {
   AddOutline, RemoveOutline, SearchOutline, RefreshOutline, CloudUploadOutline,
   DownloadOutline, ChevronDownOutline, CheckmarkCircleOutline, CheckmarkCircle,
   EllipseOutline, TimeOutline, PrintOutline, SyncOutline, PeopleOutline,
-  GitBranchOutline, CloseCircleOutline, LockClosedOutline, TrashOutline,
+  GitBranchOutline, CloseCircleOutline, LockClosedOutline, TrashOutline, EyeSharp,
 } from '@vicons/ionicons5'
 import {
   orderProcessPlanApi,
@@ -568,8 +587,8 @@ import ProcessCard from './components/ProcessCard.vue'
 import PlmModelDrawer from '@/components/PlmModelDrawer.vue'
 import type { PlmModelOpenContext } from '@/api/plmModel'
 import Pgitem from './pgitem.vue'
-import { submitLogApi } from '@/api/submitLog.ts'
-
+import ReportDetailPage from "@/views/biz/orderProcessPlan/components/ReportDetail.vue";
+import OrderReportDetailPage from "@/views/biz/orderProcessPlan/components/OrderReportDetail.vue";
 
 
 const message = useMessage()
@@ -609,7 +628,7 @@ const dispatchmodal = ref(false)
 const dispatchLoading = ref(false)
 const dispatchformRef = ref()
 const dispatchform = reactive<any>({
-  id: '', name: '', beginTime: '', endTime: '', quantity: '',workCenterName:'',
+  id: '', name: '', beginTime: '', endTime: '', quantity: '',workCenterName:'',proWorkshop:'',
   list: [{ sectionId:'',deviceId:'', quantity: '' }],
 })
 const dispatchrules = {}
@@ -617,6 +636,7 @@ const dispatchrules = {}
 const importModalVisible = ref(false)
 const plmModelDrawerRef = ref<InstanceType<typeof PlmModelDrawer> | null>(null)
 
+const submitModalVisible = ref<Boolean>(false)
 
 const outsourceModalVisible = ref(false)
 const outsourceOptionsLoading = ref(false)
@@ -659,13 +679,14 @@ function openPlmModel(order: OrderProcessPlanVO, process?: ProcessPlanItemVO) {
 
 //汇报记录详情
 const submitLogModalVisible = ref<Boolean>(false)
-
+const processId = ref<number | null>(null)
 
 //汇报详情
-function openDetailModel(order:ProcessPlanItemVO,procces?:OrderProcessPlanVO) {
+function openDetailModel(order:ProcessPlanItemVO,process?:OrderProcessPlanVO) {
  
-  // submitLogModalVisible.value = true
-  // const processId = procces.planId
+  submitLogModalVisible.value = true
+  console.log(process.planId)
+  processId.value = process.planId
 
 }
 
@@ -704,6 +725,7 @@ const moreOptions = [
       { label: '创建返工单', key: 'createRework', icon: dropdownIcon(SyncOutline) },
       { label: '创建工序委外', key: 'createOutsource', icon: dropdownIcon(PeopleOutline) },
       { label: '拆分工单', key: 'splitWorkOrder', icon: dropdownIcon(GitBranchOutline) },
+      { label: '汇报详情', key: 'reportDetailView', icon: dropdownIcon(EyeSharp) },
     ],
   },
   {
@@ -858,6 +880,11 @@ function onMoreSelect(key: string, order: OrderProcessPlanVO) {
     openOutsource(order)
     return
   }
+  if (key === 'reportDetailView') {
+    openReportDetail(order)
+    return;
+  }
+
   const labels: Record<string, string> = {
     print: '打印',
     createRework: '创建返工单',
@@ -1034,7 +1061,7 @@ async function handleSubmit() {
 }
 
 function disphand(process: ProcessPlanItemVO, order?: OrderProcessPlanVO) {
-  const entity = processItemToEntity(process, order?.orderItemId)
+  const entity = processItemToEntity(process, order?.orderItemId,order?.proWorkshop)
 
   dispatchmodal.value = true
   dispatchformRef.value?.restoreValidation()
@@ -1046,8 +1073,11 @@ function disphand(process: ProcessPlanItemVO, order?: OrderProcessPlanVO) {
   dispatchform.orderItemId = entity.orderItemId
   dispatchform.sort = entity.sort
   dispatchform.workCenterName = entity.workCenterName
+  dispatchform.workShop = entity.proWorkshop
   dispatchform.list = [{ sectionId:'',deviceId:'', quantity: '' }]
 
+  console.log(dispatchform)
+
   
 }
 
@@ -1120,6 +1150,14 @@ async function handleImportUpload({ file }: UploadCustomRequestOptions) {
   loadData()
 }
 
+
+const orderId = ref<number>(null)
+
+function  openReportDetail(order) {
+  submitModalVisible.value = true
+  orderId.value = order.id
+}
+
 onMounted(loadData)
 </script>
 
diff --git a/src/views/biz/orderProcessPlan/components/ProcessCard.vue b/src/views/biz/orderProcessPlan/components/ProcessCard.vue
index d4d0094..6afd37d 100644
--- a/src/views/biz/orderProcessPlan/components/ProcessCard.vue
+++ b/src/views/biz/orderProcessPlan/components/ProcessCard.vue
@@ -84,7 +84,7 @@
         >委外</n-button>
         <n-button
                   size="tiny"
-                  quaternary
+                  type="info"
                   ghost
                   @click="emit('submitDetail', process)"
         >汇报</n-button>
diff --git a/src/views/biz/orderProcessPlan/components/ReportDetail.vue b/src/views/biz/orderProcessPlan/components/ReportDetail.vue
new file mode 100644
index 0000000..acabd19
--- /dev/null
+++ b/src/views/biz/orderProcessPlan/components/ReportDetail.vue
@@ -0,0 +1,295 @@
+<script setup lang="ts">
+import { submitLogApi } from '@/api/submitLog'
+import {h, onMounted, ref} from "vue";
+import {DataTableColumns, NButton, NDataTable, NSpace, NTag} from "naive-ui";
+import type {AssingWork} from "@/api/production.ts";
+import { dictDataApi } from "@/api/org";
+import {AssingWorkDetail} from "@/api/AssingWorkDetail.ts";
+const props = defineProps<{
+  planId: number
+}>()
+
+const tableLoading = ref<Boolean>(false)
+const AssingWorkTableData = ref<AssingWork[]>([])
+//根据工序Id加载汇报详情
+async function loadReportDetail() {
+  try {
+    const res = await submitLogApi.getProcessReportDetail(props.planId)
+    AssingWorkTableData.value = res
+  } catch (error) {
+    console.error('加载汇报详情失败', error)
+  }
+}
+
+const qcAssingStatusOptions = ref<{ label: string; value: any;class:any }[]>([])
+const submitStatusOptions = ref<{ label: string; value: any;class:any }[]>([])
+
+
+const AssingWorkExpandedKeys = ref<Array<string |number>>([])
+
+const AssingWorkColumns :DataTableColumns<AssingWork> = [
+
+  {
+    type:"expand",
+    expandable:()=>true,
+    renderExpand:(row) => renderAssingWorkExpand(row)
+  },
+
+  {
+    align:"center",
+    title:"物料名称",
+    key:"materialName",
+    minWidth:150,
+    render(row:any) {
+      var opt = row.materialName
+      if(opt) return opt
+      return '-'
+    }
+  },
+  {
+    align:"center",
+    title:"物料编码",
+    key:"materialCode",
+    minWidth:150,
+    render(row:any) {
+      var opt = row.materialCode
+      if(opt) return opt
+      return '-'
+    }
+  },
+  {
+    align:"center",
+    title:"派工编号",
+    key:"assingCode",
+    minWidth:150
+  },
+  {
+    align:'center',
+    title: '工序名称',
+    key: 'processName',
+    minWidth: 200
+  },
+  {
+    align:'center',
+    title: '工序编号',
+    key: 'processCode',
+    minWidth: 200
+  },
+  {
+    align:'center',
+    title: '派工状态',
+    key: 'assingStatus',
+    minWidth: 150,
+    render(row:any) {
+      const val = row.assingStatus
+      const opt = qcAssingStatusOptions.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 })
+
+    }
+    //派工状态0待执行 1执行中 2质检中+3已汇报一4已关闭
+  },
+  {
+    align:'center',
+    title: '工段名称',
+    key: 'sectionName',
+    minWidth: 200
+  },
+  {
+    align:'center',
+    title: '工位名称',
+    key: 'deviceName',
+    minWidth: 200
+  },
+  {
+    align:'center',
+    title: '数量',
+    minWidth: 100,
+    key: 'quantity'
+  },
+  {
+    align:'center',
+    title: '是否返工',
+    key: 'rework',
+    minWidth: 100,
+    render(row:any) {
+      const quit = row.rework === 1
+      return h(NTag, {type: quit ? 'error' : 'success', size: 'small'}, {default: () => (quit ? '是' : '否')})
+    }
+  },
+  {
+    align:'center',
+    title: '返工次数',
+    key: 'reworkNum',
+    minWidth: 150
+  },
+  {
+    align:'center',
+    title: '完成数量',
+    key: 'completedQuantity',
+    minWidth: 150
+  },
+  {
+    align:'center',
+    title: '完成时间',
+    key: 'completedTime',
+    minWidth: 180
+  },
+  {
+    align:'center',
+    title: '工序状态',
+    key: 'status',
+    minWidth: 100,
+    render(row:any) {
+      if(row.status == 0){
+        return h(NTag, {
+              type:'success',
+              size: 'small'
+            },
+            {
+              default: () => '启用'
+            }
+        )
+      }
+      if(row.status == 1){
+        return h(NTag, {
+              type:'warning',
+              size: 'small'
+            },
+            {
+              default: () => '已暂停'
+            }
+        )
+      }
+      if(row.status == 2){
+        return h(NTag, {
+              type:'warning',
+              size: 'small'
+            },
+            {
+              default: () => '已改派'
+            }
+        )
+      }
+      return '-'
+    }
+  }
+]
+
+
+function RowKey(row:AssingWork) {
+  return row.id
+}
+
+const expandDataMap = new Map<number, any[]>()
+const loadingRowIds = ref<Set<number>>(new Set())
+
+function renderAssingWorkExpand(row: AssingWork) {
+  // 1. 首次展开，发起请求
+  if (!expandDataMap.has(row.id)) {
+    expandDataMap.set(row.id, [])
+    loadingRowIds.value.add(row.id)
+
+    // 异步请求，不阻塞当前渲染
+    expandDataMap.set(row.id, row.submitLogList)
+    loadingRowIds.value.delete(row.id)
+  }
+
+  // 2. 根据缓存状态渲染
+  if (loadingRowIds.value.has(row.id)) {
+    return h('div', { style: 'padding:12px' }, '加载中...')
+  }
+
+  const tableData = expandDataMap.get(row.id)!
+  return h('div', { style: 'padding: 0 16px 12px' }, [
+    h(NDataTable, {
+      columns: AssingWorkDetailColums,
+      data: tableData,
+      rowKey: DetailRowKey,
+      size: 'small',
+      bordered: true,
+      striped: true,
+      scrollX: 600
+    })
+  ])
+}
+function DetailRowKey(row:any) {
+  return row.id
+}
+const AssingWorkDetailColums:DataTableColumns<AssingWorkDetail> = [
+  {
+    align:"center",
+    title:"数量",
+    key:"quantity",
+    width:150
+  },
+  {
+    align:"center",
+    title:"汇报状态",
+    key:"submitStatus",
+    render: (row) => {
+      const val = row.submitStatus
+      const opt = submitStatusOptions.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: 'remark',align: 'center' },
+  {
+    align:"center",
+    title:"操作人",
+    key:"userName",
+    width:150
+  },
+  {
+    align:"center",
+    title:"创建时间",
+    key:"createTime",
+    width:150
+  },
+]
+
+// 加载字典选项
+async function loadDictOptions() {
+  try {
+    const data = await dictDataApi.listByType('assing_status')
+    qcAssingStatusOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class:d.listClass }))
+  }catch {}
+  try {
+    const data = await dictDataApi.listByType('submit_status')
+    submitStatusOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class:d.listClass }))
+  }catch {}
+}
+
+onMounted(async () => {
+  loadReportDetail()
+  loadDictOptions()
+})
+</script>
+
+<template>
+  <div>
+    <n-card>
+      <n-scrollbar x-scrollable>
+        <n-data-table
+            v-model:expanded-row-keys="AssingWorkExpandedKeys"
+            :columns="AssingWorkColumns"
+            :data="AssingWorkTableData"
+            :loading="tableLoading"
+            :scroll-x="600"
+            :max-height="1000"
+            size="small"
+            style="margin-bottom:15px"
+            :row-key="RowKey"
+        />
+      </n-scrollbar>
+
+    </n-card>
+  </div>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/biz/orderProcessPlan/pgitem.vue b/src/views/biz/orderProcessPlan/pgitem.vue
index 115f17b..6d736dc 100644
--- a/src/views/biz/orderProcessPlan/pgitem.vue
+++ b/src/views/biz/orderProcessPlan/pgitem.vue
@@ -95,6 +95,7 @@
         obj:any,
         index:any
         section:string
+        workShop: string
     }>(), {
         obj:{}
     })
@@ -155,23 +156,23 @@
         //加载工段
         async function loadSection() {
             //根据section 进行匹配
-            const res = await sectionApi.list({sectionName:props.section})
+            const res = await sectionApi.list({sectionName:props.section,workShop:props.workShop})
             const mesSection  = res.MesSection;
             const mesDevice = res.MesDevice
             console.log(mesSection);
-            
+
             sectionList.push({
                 label:mesSection.sectionName,
                 value:mesSection.id
-            })  
-            props.obj.sectionId = mesSection.id   
-            
+            })
+            props.obj.sectionId = mesSection.id
+
             deviceList.value = mesDevice.map((n:any)=>{
                     return {
                         label:n.deviceName,
                         value:n.id+''
                     }
-                 })         
+                 })
         }
 
         // function searchSection(sectionId?:number){
diff --git a/src/views/production/componets/AssingWorkTreeTable.vue b/src/views/production/componets/AssingWorkTreeTable.vue
index 4d9660d..afce329 100644
--- a/src/views/production/componets/AssingWorkTreeTable.vue
+++ b/src/views/production/componets/AssingWorkTreeTable.vue
@@ -11,17 +11,20 @@
                     </n-button>
                 </n-space>  
         </div>
-        <n-data-table
-            v-model:expanded-row-keys="AssingWorkExpandedKeys"
-            :columns="AssingWorkColumns"
-            :data="AssingWorkTableData"
-            :loading="tableLoading"
-            :row-key="RowKey"
-            :scroll-x="600"
-            :max-height="1000"
-            size="small"
-            style="margin-bottom:15px"
-        />
+        <n-scrollbar x-scrollable>
+          <n-data-table
+              v-model:expanded-row-keys="AssingWorkExpandedKeys"
+              :columns="AssingWorkColumns"
+              :data="AssingWorkTableData"
+              :loading="tableLoading"
+              :row-key="RowKey"
+              :scroll-x="600"
+              :max-height="1000"
+              size="small"
+              style="margin-bottom:15px"
+          />
+        </n-scrollbar>
+
         <div class="pagination-container" style="display: flex; justify-content: flex-end; margin-top: 12px">
         <n-pagination
           v-model:page="pagination.page"
@@ -43,12 +46,12 @@
         <div>
           <SubmitLogInfoPage
               v-if="baseInfo.logOrQuality === 'log'"
-              :submitLogList="submitLogList"
+              :assingId="assingId"
               :baseInfo="baseInfo"
           />
           <QualityInfoPage
               v-if="baseInfo.logOrQuality === 'Quality'"
-              :qualityTestingList="qualityList"
+              :assingId="assingId"
               :baseInfo="baseInfo"
           />
         </div>
@@ -506,10 +509,11 @@ async function loadDictOptions() {
 }
 
 //汇报信息弹窗
+const assingId = ref<number>(null)
 function handleReportRecords(row:any) {
   showQcReport.value = true
   reportTitle.value = "汇报信息"
-  submitLogList.value = row.submitLogList
+  assingId.value = row.id
   baseInfo.value = {...row}
   baseInfo.value.logOrQuality = "log"
 }
@@ -520,8 +524,7 @@ function handleReportRecords(row:any) {
 function handleQualityRecords(row:any) {
   showQcReport.value = true
   reportTitle.value = "质检信息"
-  qualityList.value = row.qualityTestingList
-  console.log(qualityList.value)
+  assingId.value = row.id
   baseInfo.value = {...row}
   baseInfo.value.logOrQuality = "Quality"
 }
diff --git a/src/views/production/componets/QualityInfoPage.vue b/src/views/production/componets/QualityInfoPage.vue
index 6feee68..9db9414 100644
--- a/src/views/production/componets/QualityInfoPage.vue
+++ b/src/views/production/componets/QualityInfoPage.vue
@@ -27,7 +27,7 @@
     <n-data-table
         :columns="reportRecordsColums"
         size="small"
-        :data="props.qualityTestingList"
+        :data="qualityTestingList"
         remote
         :scroll-x="600"
     />
@@ -39,11 +39,11 @@ import { NCard, NDataTable, NGi,NTag, NGrid,DataTableColumns} from "naive-ui";
 import {onMounted, ref,h} from "vue";
 import { dictDataApi } from '@/api/org'
 
-import {QualityTesting} from "@/api/qualityTesting.ts";
+import {QualityTesting,qualityTestingApi} from "@/api/qualityTesting.ts";
 
 const props =defineProps(
     {
-      qualityTestingList:Object,
+      assingId:Object,
       baseInfo:Object
     }
 )
@@ -91,9 +91,15 @@ async function loadDictOptions() {
 }
 
 
+const  qualityTestingList = ref<QualityTesting[]>([])
+async function loadQualityTestingList() {
+   const res = await qualityTestingApi.loadQualityTestingList(props.assingId)
+   qualityTestingList.value = res
+}
 
 onMounted(()=>{
   loadDictOptions()
+  loadQualityTestingList()
 })
 </script>
 <style scoped>
diff --git a/src/views/production/componets/SubmitLogInfoPage.vue b/src/views/production/componets/SubmitLogInfoPage.vue
index 5aa497b..dd84f47 100644
--- a/src/views/production/componets/SubmitLogInfoPage.vue
+++ b/src/views/production/componets/SubmitLogInfoPage.vue
@@ -27,7 +27,7 @@
     <n-data-table
         :columns="reportRecordsColums"
         size="small"
-        :data="props.submitLogList"
+        :data="submitLogList"
         remote
         :scroll-x="600"
     />
@@ -38,11 +38,11 @@
 import { NCard, NDataTable, NGi,NTag, NGrid,DataTableColumns} from "naive-ui";
 import {onMounted, ref,h} from "vue";
 import { dictDataApi } from '@/api/org'
-import { SubmitLog } from '@/api/submitLog'
+import { SubmitLog,submitLogApi} from '@/api/submitLog'
 
 const props =defineProps(
     {
-      submitLogList:Object,
+      assingId:Number,
       baseInfo:Object
     }
 )
@@ -64,7 +64,8 @@ const reportRecordsColums:DataTableColumns<SubmitLog> = [
 
       return h(NTag, { type: opt.class, size: 'small' }, { default: () => opt.label })
     }
-  }
+  },
+  { title: '汇报时间', key: 'createTime',align: 'center' },
 ]
 
 // 加载字典选项
@@ -75,10 +76,16 @@ async function loadDictOptions() {
   }catch {}
 }
 
-
+//加载汇报信息
+const submitLogList = ref<SubmitLog[]>([])
+async function load() {
+  const res = await submitLogApi.loadSumbitLog(props.assingId)
+  submitLogList.value = res
+}
 
 onMounted(()=>{
   loadDictOptions()
+  load()
 })
 </script>
 <style scoped>
diff --git a/src/views/production/myassigtask/index.vue b/src/views/production/myassigtask/index.vue
index cb92ff5..28d0354 100644
--- a/src/views/production/myassigtask/index.vue
+++ b/src/views/production/myassigtask/index.vue
@@ -280,19 +280,6 @@ const pagination = reactive({
 
 const plmModelDrawerRef = ref<InstanceType<typeof PlmModelDrawer> | null>(null)
 
-function openPlmModel(row: Record<string, unknown>) {
-  console.log(row);
-  
-  const ctx: PlmModelOpenContext = {
-    orderItemId: row.orderItemId as string | number,
-    dispatchId: row.id as number | string,
-    materialCode: row.materialCode as string | undefined,
-    materialName: row.materialName as string | undefined,
-    drawingNo: (row.drawingNo as string | undefined) || (row.materialCode as string | undefined),
-    title: `三维模型 · ${row.processName || row.materialName || ''}`,
-  }
-  plmModelDrawerRef.value?.open(ctx)
-}
 
 const columns = [
   // { 
@@ -541,9 +528,7 @@ const columns = [
 ]
 
 
-function dropdownIcon(icon: Component) {
-  return () => h(NIcon, null, { default: () => h(icon) })
-}
+
 
 
 //搜索数据

From cb0b868ac3e8fe5c716c501cceb3a4ec0e45e965 Mon Sep 17 00:00:00 2001
From: shaoleiliu-netizen123 <480188199@qq.com>
Date: Tue, 28 Jul 2026 14:20:25 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderProcessPlan/components/OrderReportDetail.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/views/biz/orderProcessPlan/components/OrderReportDetail.vue

diff --git a/src/views/biz/orderProcessPlan/components/OrderReportDetail.vue b/src/views/biz/orderProcessPlan/components/OrderReportDetail.vue
new file mode 100644
index 0000000..96c0baf
--- /dev/null
+++ b/src/views/biz/orderProcessPlan/components/OrderReportDetail.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file

From 23edd93c97426e858ed1660a6710b7fda2d11802 Mon Sep 17 00:00:00 2001
From: shaoleiliu-netizen123 <480188199@qq.com>
Date: Tue, 28 Jul 2026 17:36:07 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=B1=87=E6=8A=A5=E5=92=8C=E8=AE=A2=E5=8D=95=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=B1=87=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/nccode.ts                             |   3 +-
 src/api/submitLog.ts                          |   8 +-
 src/views/biz/orderProcessPlan/board.vue      |   9 +-
 .../components/OrderReportDetail.vue          | 200 +++++++++
 .../components/ReportDetail.vue               | 416 +++++++-----------
 5 files changed, 378 insertions(+), 258 deletions(-)

diff --git a/src/api/nccode.ts b/src/api/nccode.ts
index a13d29e..d940394 100644
--- a/src/api/nccode.ts
+++ b/src/api/nccode.ts
@@ -97,6 +97,7 @@ export function exportNccode(params:any) {
     return request({ 
         url: `biz/ncCode/export`, 
         method: 'get',
-        params
+        params,
+        responseType: 'blob'
     })
 }
diff --git a/src/api/submitLog.ts b/src/api/submitLog.ts
index 47a271b..97f7962 100644
--- a/src/api/submitLog.ts
+++ b/src/api/submitLog.ts
@@ -90,8 +90,12 @@ export const submitLogApi = {
   },
 
   //根据工序Id查询汇报
-  getProcessReportDetail(processId:number){
-    return request({url:`/mes/report/submitLogToProcess/${processId}`,method:"get"})
+  getProcessReportDetail(params?:{page?:number;pageSize?:number;submitStatus?:number;processId?:number;}){
+    return request({url:`/mes/report/submitLogToProcess`,method:"get",params})
+  },
+  //根据订单Id查询汇报
+  getOrderItemReportDetail(params?:{page?:number;pageSize?:number;submitStatus?:number;orderItemId?:number;}){
+    return request({url:`/mes/report/allSubmitLogByorderItemId`,method:"get",params})
   },
 
   //加载汇报列表
diff --git a/src/views/biz/orderProcessPlan/board.vue b/src/views/biz/orderProcessPlan/board.vue
index c764e8f..f61c1af 100644
--- a/src/views/biz/orderProcessPlan/board.vue
+++ b/src/views/biz/orderProcessPlan/board.vue
@@ -544,9 +544,9 @@
     </n-modal>
 
 
-    <n-modal v-model:show="submitModalVisible" preset="card" title="工单汇报详情" style="width: 500px">
+    <n-modal v-model:show="submitModalVisible" preset="card" title="工单汇报详情" style="width: 2000px">
       <OrderReportDetailPage
-        :orderId="orderId"
+        :orderItemId="orderItemId"
       />
       <template #footer>
         <n-space justify="end">
@@ -1151,11 +1151,12 @@ async function handleImportUpload({ file }: UploadCustomRequestOptions) {
 }
 
 
-const orderId = ref<number>(null)
+const orderItemId = ref<number>(null)
 
 function  openReportDetail(order) {
   submitModalVisible.value = true
-  orderId.value = order.id
+  orderItemId.value = order.orderItemId
+
 }
 
 onMounted(loadData)
diff --git a/src/views/biz/orderProcessPlan/components/OrderReportDetail.vue b/src/views/biz/orderProcessPlan/components/OrderReportDetail.vue
index 96c0baf..e89e2ed 100644
--- a/src/views/biz/orderProcessPlan/components/OrderReportDetail.vue
+++ b/src/views/biz/orderProcessPlan/components/OrderReportDetail.vue
@@ -1,9 +1,209 @@
 <script setup lang="ts">
+import {SubmitLog, submitLogApi} from '@/api/submitLog'
+import {h, onMounted, reactive, ref} from "vue";
+import {NButton, NDataTable, NIcon, NSpace, NTag} from "naive-ui";
+import { dictDataApi } from "@/api/org";
+import {ArrowDown, ArrowUp, RefreshOutline, SearchOutline} from "@vicons/ionicons5";
+const props = defineProps<{
+  orderItemId: number
+}>()
 
+const searchForm = ref({
+  submitStatus: undefined
+})
+
+const submitList = ref<SubmitLog[]>([])
+//根据工序Id加载汇报详情
+async function loadReportDetail() {
+  try {
+
+    console.log(props.orderItemId)
+    const res = await submitLogApi.getOrderItemReportDetail({
+      page: pagination.page,
+      pageSize: pagination.pageSize,
+      submitStatus: searchForm.value.submitStatus,
+      orderItemId:props.orderItemId
+    })
+    submitList.value = res.list
+    pagination.itemCount = res.total
+  } catch (error) {
+    console.error('加载汇报详情失败', error)
+  }
+}
+
+const columns = [
+  {
+    title: '提交数量',
+    key: 'quantity',
+    width: 120
+  },
+  {
+    title: '提交人',
+    key: 'userName',
+    width: 120
+  },
+  {
+    title: '提交时间',
+    key: 'createTime',
+    width: 120
+  },
+  {
+    title: '汇报状态',
+    key: 'submitStatus',
+    width: 120,
+    render(row) {
+      const option = submitStatusOptions.value.find(o => o.value === row.submitStatus)
+      return h(NTag, { type: option.class, size: 'small' }, { default: () => option.label })
+    }
+  }
+]
+
+const submitStatusOptions = ref<{ label: string; value: any;class:any }[]>([])
+
+// 加载字典选项
+async function loadDictOptions() {
+  try {
+    const data = await dictDataApi.listByType('submit_status')
+    submitStatusOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class:d.listClass }))
+  }catch {}
+}
+
+const doShowInner = () => {
+  if (showSearchInput.value) {
+    showSearchInput.value = false
+  }else {
+    showSearchInput.value = true
+  }
+}
+
+
+const showSearchInput = ref<Boolean>(false)
+
+
+const pagination = reactive({
+  page: 1,
+  pageSize: 10,
+  itemCount: 0,
+  showSizePicker: true,
+  pageSizes: [10, 20, 50]
+})
+
+
+const handleSearch =  () => {
+  loadReportDetail()
+}
+
+
+const handleReset = () => {
+  searchForm.value.submitStatus = null
+  pagination.page = 1
+  pagination.pageSize = 10
+  loadReportDetail()
+}
+
+
+// 分页
+function handlePageChange(page: number) {
+  pagination.page = page
+  loadReportDetail()
+}
+
+function handlePageSizeChange(pageSize: number) {
+  pagination.pageSize = pageSize
+  pagination.page = 1
+  loadReportDetail()
+}
+
+onMounted(async () => {
+  loadReportDetail()
+  loadDictOptions()
+})
 </script>
 
 <template>
+  <div>
+    <n-button @click="doShowInner" v-if="showSearchInput">
+      <n-icon size="20" :depth="3">
+        <ArrowDown/>
+      </n-icon>
+      展开
+    </n-button>
+    <n-card v-if="!showSearchInput">
+      <n-form inline :model="searchForm" label-placement="left">
+        <n-grid :x-gap="8" :cols="4">
+          <n-gi>
+            <n-form-item label="汇报状态">
+              <n-select
+                  v-model:value="searchForm.submitStatus"
+                  :options="submitStatusOptions"
+                  placeholder="请选择异常类型"
+                  clearable
+                  style="width: 200px"
+              />
+            </n-form-item>
+          </n-gi>
+          <n-gi>
+            <n-form-item>
+              <n-space>
+                <n-button type="primary" @click="handleSearch">
+                  <template #icon>
+                    <n-icon>
+                      <SearchOutline/>
+                    </n-icon>
+                  </template>
+                  搜索
+                </n-button>
+                <n-button @click="handleReset">
+                  <template #icon>
+                    <n-icon>
+                      <RefreshOutline/>
+                    </n-icon>
+                  </template>
+                  重置
+                </n-button>
+              </n-space>
+            </n-form-item>
+          </n-gi>
+        </n-grid>
 
+
+      </n-form>
+      <n-button @click="doShowInner" v-if="!showSearchInput" style="float: right;margin: 10px">
+        <n-icon size="20" :depth="3">
+          <ArrowUp/>
+        </n-icon>
+        闭合
+      </n-button>
+    </n-card>
+
+    <n-card style="margin: 10px 0">
+      <n-scrollbar x-scrollable>
+        <n-data-table
+            :columns="columns"
+            :data="submitList"
+            :bordered="false"
+        />
+
+        <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="[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-scrollbar>
+
+    </n-card>
+  </div>
 </template>
 
 <style scoped>
diff --git a/src/views/biz/orderProcessPlan/components/ReportDetail.vue b/src/views/biz/orderProcessPlan/components/ReportDetail.vue
index acabd19..ea77693 100644
--- a/src/views/biz/orderProcessPlan/components/ReportDetail.vue
+++ b/src/views/biz/orderProcessPlan/components/ReportDetail.vue
@@ -1,268 +1,117 @@
 <script setup lang="ts">
-import { submitLogApi } from '@/api/submitLog'
-import {h, onMounted, ref} from "vue";
-import {DataTableColumns, NButton, NDataTable, NSpace, NTag} from "naive-ui";
-import type {AssingWork} from "@/api/production.ts";
+import {SubmitLog, submitLogApi} from '@/api/submitLog'
+import {h, onMounted, reactive, ref} from "vue";
+import {NButton, NDataTable, NIcon, NSpace, NTag} from "naive-ui";
 import { dictDataApi } from "@/api/org";
-import {AssingWorkDetail} from "@/api/AssingWorkDetail.ts";
+import {ArrowDown, ArrowUp, RefreshOutline, SearchOutline} from "@vicons/ionicons5";
 const props = defineProps<{
   planId: number
 }>()
 
-const tableLoading = ref<Boolean>(false)
-const AssingWorkTableData = ref<AssingWork[]>([])
+const searchForm = ref({
+  submitStatus: undefined
+})
+
+const submitList = ref<SubmitLog[]>([])
 //根据工序Id加载汇报详情
 async function loadReportDetail() {
   try {
-    const res = await submitLogApi.getProcessReportDetail(props.planId)
-    AssingWorkTableData.value = res
+    const res = await submitLogApi.getProcessReportDetail({
+      page: pagination.page,
+      pageSize: pagination.pageSize,
+      submitStatus: searchForm.value.submitStatus,
+      processId:props.planId
+    })
+    submitList.value = res.list
+    pagination.itemCount = res.total
   } catch (error) {
     console.error('加载汇报详情失败', error)
   }
 }
 
-const qcAssingStatusOptions = ref<{ label: string; value: any;class:any }[]>([])
+const columns = [
+  {
+    title: '提交数量',
+    key: 'quantity',
+    width: 120
+  },
+  {
+    title: '提交人',
+    key: 'userName',
+    width: 120
+  },
+  {
+    title: '提交时间',
+    key: 'createTime',
+    width: 120
+  },
+  {
+    title: '汇报状态',
+    key: 'submitStatus',
+    width: 120,
+    render(row) {
+      const option = submitStatusOptions.value.find(o => o.value === row.submitStatus)
+      return h(NTag, { type: option.class, size: 'small' }, { default: () => option.label })
+    }
+  }
+]
+
 const submitStatusOptions = ref<{ label: string; value: any;class:any }[]>([])
 
-
-const AssingWorkExpandedKeys = ref<Array<string |number>>([])
-
-const AssingWorkColumns :DataTableColumns<AssingWork> = [
-
-  {
-    type:"expand",
-    expandable:()=>true,
-    renderExpand:(row) => renderAssingWorkExpand(row)
-  },
-
-  {
-    align:"center",
-    title:"物料名称",
-    key:"materialName",
-    minWidth:150,
-    render(row:any) {
-      var opt = row.materialName
-      if(opt) return opt
-      return '-'
-    }
-  },
-  {
-    align:"center",
-    title:"物料编码",
-    key:"materialCode",
-    minWidth:150,
-    render(row:any) {
-      var opt = row.materialCode
-      if(opt) return opt
-      return '-'
-    }
-  },
-  {
-    align:"center",
-    title:"派工编号",
-    key:"assingCode",
-    minWidth:150
-  },
-  {
-    align:'center',
-    title: '工序名称',
-    key: 'processName',
-    minWidth: 200
-  },
-  {
-    align:'center',
-    title: '工序编号',
-    key: 'processCode',
-    minWidth: 200
-  },
-  {
-    align:'center',
-    title: '派工状态',
-    key: 'assingStatus',
-    minWidth: 150,
-    render(row:any) {
-      const val = row.assingStatus
-      const opt = qcAssingStatusOptions.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 })
-
-    }
-    //派工状态0待执行 1执行中 2质检中+3已汇报一4已关闭
-  },
-  {
-    align:'center',
-    title: '工段名称',
-    key: 'sectionName',
-    minWidth: 200
-  },
-  {
-    align:'center',
-    title: '工位名称',
-    key: 'deviceName',
-    minWidth: 200
-  },
-  {
-    align:'center',
-    title: '数量',
-    minWidth: 100,
-    key: 'quantity'
-  },
-  {
-    align:'center',
-    title: '是否返工',
-    key: 'rework',
-    minWidth: 100,
-    render(row:any) {
-      const quit = row.rework === 1
-      return h(NTag, {type: quit ? 'error' : 'success', size: 'small'}, {default: () => (quit ? '是' : '否')})
-    }
-  },
-  {
-    align:'center',
-    title: '返工次数',
-    key: 'reworkNum',
-    minWidth: 150
-  },
-  {
-    align:'center',
-    title: '完成数量',
-    key: 'completedQuantity',
-    minWidth: 150
-  },
-  {
-    align:'center',
-    title: '完成时间',
-    key: 'completedTime',
-    minWidth: 180
-  },
-  {
-    align:'center',
-    title: '工序状态',
-    key: 'status',
-    minWidth: 100,
-    render(row:any) {
-      if(row.status == 0){
-        return h(NTag, {
-              type:'success',
-              size: 'small'
-            },
-            {
-              default: () => '启用'
-            }
-        )
-      }
-      if(row.status == 1){
-        return h(NTag, {
-              type:'warning',
-              size: 'small'
-            },
-            {
-              default: () => '已暂停'
-            }
-        )
-      }
-      if(row.status == 2){
-        return h(NTag, {
-              type:'warning',
-              size: 'small'
-            },
-            {
-              default: () => '已改派'
-            }
-        )
-      }
-      return '-'
-    }
-  }
-]
-
-
-function RowKey(row:AssingWork) {
-  return row.id
-}
-
-const expandDataMap = new Map<number, any[]>()
-const loadingRowIds = ref<Set<number>>(new Set())
-
-function renderAssingWorkExpand(row: AssingWork) {
-  // 1. 首次展开，发起请求
-  if (!expandDataMap.has(row.id)) {
-    expandDataMap.set(row.id, [])
-    loadingRowIds.value.add(row.id)
-
-    // 异步请求，不阻塞当前渲染
-    expandDataMap.set(row.id, row.submitLogList)
-    loadingRowIds.value.delete(row.id)
-  }
-
-  // 2. 根据缓存状态渲染
-  if (loadingRowIds.value.has(row.id)) {
-    return h('div', { style: 'padding:12px' }, '加载中...')
-  }
-
-  const tableData = expandDataMap.get(row.id)!
-  return h('div', { style: 'padding: 0 16px 12px' }, [
-    h(NDataTable, {
-      columns: AssingWorkDetailColums,
-      data: tableData,
-      rowKey: DetailRowKey,
-      size: 'small',
-      bordered: true,
-      striped: true,
-      scrollX: 600
-    })
-  ])
-}
-function DetailRowKey(row:any) {
-  return row.id
-}
-const AssingWorkDetailColums:DataTableColumns<AssingWorkDetail> = [
-  {
-    align:"center",
-    title:"数量",
-    key:"quantity",
-    width:150
-  },
-  {
-    align:"center",
-    title:"汇报状态",
-    key:"submitStatus",
-    render: (row) => {
-      const val = row.submitStatus
-      const opt = submitStatusOptions.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: 'remark',align: 'center' },
-  {
-    align:"center",
-    title:"操作人",
-    key:"userName",
-    width:150
-  },
-  {
-    align:"center",
-    title:"创建时间",
-    key:"createTime",
-    width:150
-  },
-]
-
 // 加载字典选项
 async function loadDictOptions() {
-  try {
-    const data = await dictDataApi.listByType('assing_status')
-    qcAssingStatusOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class:d.listClass }))
-  }catch {}
   try {
     const data = await dictDataApi.listByType('submit_status')
     submitStatusOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class:d.listClass }))
   }catch {}
 }
 
+const doShowInner = () => {
+  if (showSearchInput.value) {
+    showSearchInput.value = false
+  }else {
+    showSearchInput.value = true
+  }
+}
+
+
+const showSearchInput = ref<Boolean>(false)
+
+
+const pagination = reactive({
+  page: 1,
+  pageSize: 10,
+  itemCount: 0,
+  showSizePicker: true,
+  pageSizes: [10, 20, 50]
+})
+
+
+const handleSearch =  () => {
+  loadReportDetail()
+}
+
+
+const handleReset = () => {
+  searchForm.value.submitStatus = null
+  pagination.page = 1
+  pagination.pageSize = 10
+  loadReportDetail()
+}
+
+
+// 分页
+function handlePageChange(page: number) {
+  pagination.page = page
+  loadReportDetail()
+}
+
+function handlePageSizeChange(pageSize: number) {
+  pagination.pageSize = pageSize
+  pagination.page = 1
+  loadReportDetail()
+}
+
 onMounted(async () => {
   loadReportDetail()
   loadDictOptions()
@@ -271,19 +120,84 @@ onMounted(async () => {
 
 <template>
   <div>
-    <n-card>
+    <n-button @click="doShowInner" v-if="showSearchInput">
+      <n-icon size="20" :depth="3">
+        <ArrowDown/>
+      </n-icon>
+      展开
+    </n-button>
+    <n-card v-if="!showSearchInput">
+      <n-form inline :model="searchForm" label-placement="left">
+        <n-grid :x-gap="8" :cols="4">
+          <n-gi>
+            <n-form-item label="汇报状态">
+              <n-select
+                  v-model:value="searchForm.submitStatus"
+                  :options="submitStatusOptions"
+                  placeholder="请选择异常类型"
+                  clearable
+                  style="width: 200px"
+              />
+            </n-form-item>
+          </n-gi>
+          <n-gi>
+            <n-form-item>
+              <n-space>
+                <n-button type="primary" @click="handleSearch">
+                  <template #icon>
+                    <n-icon>
+                      <SearchOutline/>
+                    </n-icon>
+                  </template>
+                  搜索
+                </n-button>
+                <n-button @click="handleReset">
+                  <template #icon>
+                    <n-icon>
+                      <RefreshOutline/>
+                    </n-icon>
+                  </template>
+                  重置
+                </n-button>
+              </n-space>
+            </n-form-item>
+          </n-gi>
+        </n-grid>
+
+
+      </n-form>
+      <n-button @click="doShowInner" v-if="!showSearchInput" style="float: right;margin: 10px">
+        <n-icon size="20" :depth="3">
+          <ArrowUp/>
+        </n-icon>
+        闭合
+      </n-button>
+    </n-card>
+
+    <n-card style="margin: 10px 0">
       <n-scrollbar x-scrollable>
         <n-data-table
-            v-model:expanded-row-keys="AssingWorkExpandedKeys"
-            :columns="AssingWorkColumns"
-            :data="AssingWorkTableData"
-            :loading="tableLoading"
-            :scroll-x="600"
-            :max-height="1000"
-            size="small"
-            style="margin-bottom:15px"
-            :row-key="RowKey"
+            :columns="columns"
+            :data="submitList"
+            :bordered="false"
         />
+
+        <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="[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-scrollbar>
 
     </n-card>

From 4c7d5b56aefcc6e526266975086cde4c2b35f297 Mon Sep 17 00:00:00 2001
From: shaoleiliu-netizen123 <480188199@qq.com>
Date: Wed, 29 Jul 2026 13:54:42 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/errorNotification.ts        | 110 +++++++-------
 src/api/message.ts                  |   7 +-
 src/components/ErrorReportModal.vue | 218 ++++++++++++++++++++++++++++
 src/layout/index.vue                |  54 +++++--
 4 files changed, 322 insertions(+), 67 deletions(-)
 create mode 100644 src/components/ErrorReportModal.vue

diff --git a/src/api/errorNotification.ts b/src/api/errorNotification.ts
index 5a81a83..526afaf 100644
--- a/src/api/errorNotification.ts
+++ b/src/api/errorNotification.ts
@@ -2,82 +2,82 @@ import { request } from '@/utils/request'
 
 // ErrorNotification 类型定义
 export interface ErrorNotification {
-  id?: number
+    id?: number
 
-  subscriptionKey?:  string
+    subscriptionKey?:  string
 
-  title?:  string
+    title?:  string
 
-  subscriptionDeviceIds?:  string
+    subscriptionDeviceIds?:  string
 
-  subscriptionDiscoverField?:  string
+    subscriptionDiscoverField?:  string
 
-  sendingMethod?:  string
+    sendingMethod?:  string
 
-  discoverValue?:  string
+    discoverValue?:  string
 
-  detectionMethod?:  string
+    detectionMethod?:  string
 
-  notifier?:  string
+    notifier?:  string
 
-  createBy?: number
+    createBy?: number
 
-  crateTime?:  string
+    crateTime?:  string
 
-  notifierContent?:  string
+    notifierContent?:  string
 
-  abnormalReporting?: number
+    abnormalReporting?: number
 
 }
 
 // ErrorNotification API
 export const errorNotificationApi = {
-  // 分页查询
-  page(params: { page: number; pageSize: number }) {
-    return request({ url: '/biz/errorNotification/page', method: 'get', params })
-  },
+    // 分页查询
+    page(params: { page: number; pageSize: number }) {
+        return request({ url: '/biz/errorNotification/page', method: 'get', params })
+    },
 
-  // 获取详情
-  detail(id:  string) {
-    return request({ url: `/biz/errorNotification/${id}`, method: 'get' })
-  },
+    // 获取详情
+    detail(id:  number) {
+        return request({ url: `/biz/errorNotification/${id}`, method: 'get' })
+    },
 
-  // 新增
-  create(data: ErrorNotification) {
-    return request({ url: '/biz/errorNotification', method: 'post', data })
-  },
+    // 新增
+    create(data: ErrorNotification) {
+        return request({ url: '/biz/errorNotification', method: 'post', data })
+    },
 
-  // 修改
-  update(data: ErrorNotification) {
-    return request({ url: '/biz/errorNotification', method: 'put', data })
-  },
+    // 修改
+    update(data: ErrorNotification) {
+        return request({ url: '/biz/errorNotification', method: 'put', data })
+    },
 
-  // 删除
-  delete(ids:  string[]) {
-    return request({ url: `/biz/errorNotification/${ids.join(',')}`, method: 'delete' })
-  },
+    // 删除
+    delete(ids:  string[]) {
+        return request({ url: `/biz/errorNotification/${ids.join(',')}`, method: 'delete' })
+    },
 
-  // 导出
-  export(params?: { ids?:  string[] }) {
-    const p: Record<string, any> = {}
-    if (params?.ids?.length) p.ids = params.ids.join(',')
-    return request({ url: `/biz/errorNotification/export`, method: 'get', params: p, responseType: 'blob' })
-  },
+    // 导出
+    export(params?: { ids?:  string[] }) {
+        const p: Record<string, any> = {}
+        if (params?.ids?.length) p.ids = params.ids.join(',')
+        return request({ url: `/biz/errorNotification/export`, method: 'get', params: p, responseType: 'blob' })
+    },
 
-  // 导入
-  importData(file: File) {
-    const formData = new FormData()
-    formData.append('file', file)
-    return request<{ success: number; fail: number; errors: string[] }>({
-      url: `/biz/errorNotification/import`,
-      method: 'post',
-      data: formData,
-      headers: { 'Content-Type': 'multipart/form-data' }
-    })
-  },
+    // 导入
+    importData(file: File) {
+        const formData = new FormData()
+        formData.append('file', file)
+        return request<{ success: number; fail: number; errors: string[] }>({
+            url: `/biz/errorNotification/import`,
+            method: 'post',
+            data: formData,
+            headers: { 'Content-Type': 'multipart/form-data' }
+        })
+    },
 
-  // 下载导入模板
-  downloadTemplate() {
-    return request({ url: `/biz/errorNotification/template`, method: 'get', responseType: 'blob' })
-  }
-}
+    // 下载导入模板
+    downloadTemplate() {
+        return request({ url: `/biz/errorNotification/template`, method: 'get', responseType: 'blob' })
+    }
+}
\ No newline at end of file
diff --git a/src/api/message.ts b/src/api/message.ts
index 00b66ad..1584360 100644
--- a/src/api/message.ts
+++ b/src/api/message.ts
@@ -13,7 +13,12 @@ export interface SysNotice {
   status: number
   createBy?: number
   createName?: string
-  createTime?: string
+  createTime?: string,
+  abnormalReporting?:number,
+  reportReason?:string,
+  errorNotificationId?:number,
+  filler?:number,
+  filingStatus?:number,
 }
 
 export interface NoticeChannelOption {
diff --git a/src/components/ErrorReportModal.vue b/src/components/ErrorReportModal.vue
new file mode 100644
index 0000000..35d2b19
--- /dev/null
+++ b/src/components/ErrorReportModal.vue
@@ -0,0 +1,218 @@
+<script setup lang="ts">
+
+import {onMounted, ref, watch} from "vue";
+import { Notifications } from '@vicons/ionicons5'
+import  { ErrorNotification } from '@/api/errorNotification.ts'
+import {} from '@/api/system.ts'
+import {noticeApi, SysNotice} from '@/api/message'
+import type {FormInst} from "naive-ui";
+const emit = defineEmits<{
+  (e: 'update:show', value: boolean): void
+}>()
+
+const props = defineProps<{
+  show: boolean
+  errorNotifiaction:ErrorNotification,
+  notice:SysNotice,
+}>()
+
+const showModal = ref(false)
+
+const formRef = ref<FormInst | null>(null)
+
+const isFili = ref<Boolean>(false)
+const isShow = ref<Boolean>(true)
+const disabled = ref<Boolean>(false)
+const rules = {
+  fillingPerson:[{required: true, message: '请填写填报原因'}]
+}
+
+const formData = ref<SysNotice>({
+    id:undefined,
+    reportReason:undefined,
+    filingStatus:undefined
+})
+
+watch(()=>props.show, (val) => {
+  showModal.value = val
+  //关闭弹框重置
+  if (!val) {
+    isFili.value = false
+    formData.value = {
+      id:undefined,
+      reportReason:undefined,
+      filingStatus:undefined,
+    }
+    isShow.value = true
+    disabled.value = false
+  }
+
+  if (props.notice.abnormalReporting) {//需要填报
+      isFili.value = true
+      formData.value = {...props.notice}
+      //已经填报禁用填报栏  隐藏提交按钮
+      if (formData.value.filingStatus == 1) {
+        isShow.value = false
+        disabled.value = true
+      }else {
+        isShow.value = true
+        disabled.value = false
+      }
+  }else {
+    isFili.value = false
+    isShow.value = true
+    disabled.value = false
+  }
+},{immediate:true})
+
+watch(showModal, (val) => {
+  emit("update:show",val)
+})
+
+async function handleSubmit() {
+  try {
+    await formRef.value?.validate()
+    formData.value.id = props.errorNotifiaction.noticeId
+    formData.value.filingStatus = 1
+    //修改通知表
+    noticeApi.update({
+      id:formData.value.id,
+      reportReason:formData.value.reportReason,
+      filingStatus:formData.value.filingStatus
+    })
+    window.$message?.success('填报成功')
+    showModal.value= false
+  }catch ( error:any) {
+    if (error?.message) {
+      window.$message?.error(error.message)
+    }
+  }
+}
+
+
+</script>
+
+<template>
+  <n-modal
+      v-model:show="showModal"
+      preset="card"
+      :style="{ width: '1200px', height: '600px'}"
+      :mask-closable="false"
+  >
+    <template #header >
+      <div  style="text-align: center;">
+        <h2>
+          <n-icon>
+            <Notifications />
+          </n-icon>
+          异常填报
+        </h2>
+      </div>
+    </template>
+
+    <n-split direction="horizontal" :max="0.75" :min="0.25" v-if="isFili">
+      <template #1>
+        <n-grid x-gap="12" :cols="1">
+          <n-gi>
+            <h2>异常内容</h2>
+          </n-gi>
+        </n-grid>
+        <n-form
+            label-placement="left"
+            label-width="100"
+            style="margin: 10px"
+        >
+          <n-form-item label="异常名称" path="title">
+            <n-input
+                v-model:value="props.errorNotifiaction.title"
+                disabled
+            />
+          </n-form-item>
+          <n-form-item label="异常设备" path="devices">
+            <n-input
+                v-model:value="props.errorNotifiaction.devices"
+                disabled
+            />
+          </n-form-item>
+          <n-form-item label="通知内容" path="notifierContent">
+            <n-input
+                v-model:value="errorNotifiaction.notifierContent"
+                type="textarea"
+                disabled
+            />
+          </n-form-item>
+        </n-form>
+      </template>
+      <template #2>
+        <n-grid x-gap="12" :cols="1">
+          <n-gi>
+            <h2>异常填报</h2>
+          </n-gi>
+        </n-grid>
+        <n-form
+            ref="formRef"
+            :model="formData"
+            label-placement="left"
+            label-width="100"
+            style="margin: 10px"
+            :rules="rules"
+        >
+          <n-form-item ref="reason" label="填报原因" path="reportReason">
+            <n-input
+                v-model:value="formData.reportReason"
+                type="textarea"
+                placeholder="请填写填报原因"
+                :disabled="disabled"
+            />
+          </n-form-item>
+        </n-form>
+      </template>
+    </n-split>
+
+      <div v-if="!isFili">
+        <n-grid x-gap="12" :cols="1">
+          <n-gi>
+            <h2>异常内容</h2>
+          </n-gi>
+        </n-grid>
+        <n-form
+            label-placement="left"
+            label-width="100"
+            style="margin: 10px"
+        >
+          <n-form-item label="异常名称" path="title">
+            <n-input
+                v-model:value="props.errorNotifiaction.title"
+                disabled
+            />
+          </n-form-item>
+          <n-form-item label="异常设备" path="devices">
+            <n-input
+                v-model:value="props.errorNotifiaction.devices"
+                disabled
+            />
+          </n-form-item>
+          <n-form-item label="通知内容" path="notifierContent">
+            <n-input
+                v-model:value="errorNotifiaction.notifierContent"
+                type="textarea"
+                disabled
+            />
+          </n-form-item>
+        </n-form>
+      </div>
+
+
+    <!-- 底部操作按钮 -->
+    <template #action>
+      <n-space justify="end">
+        <n-button @click="showModal = false">关闭</n-button>
+        <n-button  v-if="isFili && isShow" type="primary" @click="handleSubmit">提交</n-button>
+      </n-space>
+    </template>
+  </n-modal>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/layout/index.vue b/src/layout/index.vue
index a91bac8..1857970 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -331,6 +331,13 @@
 
     <!-- 消息通知弹窗 -->
     <MessageNotification />
+
+    <!--异常填报弹窗-->
+    <ErrorReportModal
+        v-model:show="showErrorReportModal"
+        :errorNotifiaction ="errorNotifiaction"
+        :notice = "notice"
+    />
   </n-layout>
 </template>
 
@@ -382,6 +389,8 @@ import TabBar from '@/components/TabBar.vue'
 import SiteLogoMark from '@/components/SiteLogoMark.vue'
 import { noticeApi, chatApi, type SysNotice, type ChatMessage } from '@/api/message'
 import { iconMap as externalIconMap } from '@/utils/icons'
+import ErrorReportModal from "@/components/ErrorReportModal.vue";
+import {errorNotificationApi} from "@/api/errorNotification.ts";
 
 const route = useRoute()
 const router = useRouter()
@@ -405,6 +414,7 @@ window.$message = message
 const collapsed = ref(false)
 const showProfileModal = ref(false)
 const showPasswordModal = ref(false)
+const showErrorReportModal = ref(false)
 const messageTab = ref('notice')
 
 // 消息相关
@@ -599,18 +609,40 @@ function stripHtml(html: string | undefined): string {
 }
 
 // 点击通知
+//异常订阅内容
+const errorNotifiaction = ref({
+  title: '',
+  devices: '',
+  sendingMethodName: '',
+  notifierName: '',
+  notifierContent: ''
+})
+//是否需要填报
+const notice = ref<SysNotice>( {})
 async function handleNoticeClick(item: SysNotice) {
-  // 标记已读
-  if (item.id) {
-    try {
-      await noticeApi.markAsRead(item.id)
-      // 刷新未读数量
-      loadUnreadCount()
-    } catch (error) {
-      // 忽略
-    }
-  }
-  router.push({ path: '/message/notice', query: { id: item.id?.toString() } })
+
+
+  const res = await errorNotificationApi.detail(item.errorNotificationId);
+  errorNotifiaction.value = {...res}
+  errorNotifiaction.value.noticeId = item.id
+  notice.value = item
+  //异常填报直接弹窗
+  showErrorReportModal.value = true
+  // if (item.abnormalReporting) {
+  //
+  // }else {
+  //   // 标记已读
+  //   if (item.id) {
+  //     try {
+  //       await noticeApi.markAsRead(item.id)
+  //       // 刷新未读数量
+  //       loadUnreadCount()
+  //     } catch (error) {
+  //       // 忽略
+  //     }
+  //   }
+  //   router.push({ path: '/message/notice', query: { id: item.id?.toString() } })
+  // }
 }
 
 // 点击聊天

From 7bdda83d459d5862a31226912d9fbc437eacba3d Mon Sep 17 00:00:00 2001
From: shaoleiliu-netizen123 <480188199@qq.com>
Date: Wed, 29 Jul 2026 15:51:44 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/NCcode/index.vue                 | 828 ---------------------
 src/views/biz/device/DeviceDispatchLog.vue |  21 +-
 src/views/biz/device/index.vue             |   2 +-
 3 files changed, 14 insertions(+), 837 deletions(-)
 delete mode 100644 src/views/NCcode/index.vue

diff --git a/src/views/NCcode/index.vue b/src/views/NCcode/index.vue
deleted file mode 100644
index 972f49e..0000000
--- a/src/views/NCcode/index.vue
+++ /dev/null
@@ -1,828 +0,0 @@
-<template>
-  <div class="page-container">
-    <!-- 用户列表 -->
-    <n-card class="user-list-card" size="small">
-      <!-- 搜索表单 -->
-      <div class="search-form">
-        <n-form 
-          inline 
-          :model="searchForm" 
-          label-placement="left"
-        >
-
-        <n-form-item label="NC代码编号">
-          <n-input v-model:value="searchForm.ncCode" placeholder="请输入NC代码编号" />
-        </n-form-item>
-
-        <n-form-item label="NC代码名称">
-          <n-input v-model:value="searchForm.ncName" placeholder="请输入NC代码名称" />
-        </n-form-item>
-
-      
-          <n-space> 
-              <n-button type="primary" @click="search">
-                <template #icon><n-icon><SearchOutline /></n-icon></template>
-                搜索
-              </n-button>
-              <n-button @click="reset"> 
-                <template #icon><n-icon><RefreshOutline /></n-icon></template>
-                重置
-              </n-button>
-            </n-space>
-        
-          
-        </n-form>
-      </div>
-
-      <n-space style="margin-bottom: 15px;">
-          <n-button v-if="hasPermission('biz:ncCode:add')" type="primary" @click="addhand(1)" size="small">
-            <template #icon>
-              <n-icon>
-                <AddOutline />
-              </n-icon>
-            </template>
-            新增
-          </n-button>
-          <!-- <n-button type="error" @click="delhand" size="small">
-            <template #icon>
-              <n-icon>
-                <ArrowDownCircleOutline />
-              </n-icon>
-            </template>
-            删除
-          </n-button> -->
-          <n-button v-if="hasPermission('biz:ncCode:export')"  type="success" @click="handleExport" size="small">
-            <template #icon>
-              <n-icon>
-                <ArrowDownCircleOutline />
-              </n-icon>
-            </template>
-            导出
-          </n-button>
-        </n-space>
-
-      <!-- 表格 -->
-      <n-data-table
-        :columns="columns"
-        size="small"
-        striped
-        :data="datalist" 
-        :bordere="false"
-        :single-line="false"
-        :loading="loading"
-        remote
-        :row-key="rowKey"
-        @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="[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>
-
-    <n-modal
-      v-model:show="addModel"
-      :title="cztype[isstype]"
-      preset="card"
-      style="width: 600px"
-      :mask-closable="false"
-    >
-    
-    <n-form
-      ref="addformRef"
-      :model="formData"
-      :rules="addrules"
-      label-placement="left"
-      label-width="100"
-    >
-      <n-grid :cols="1" :x-gap="24">
-        <n-gi>
-          <n-form-item path="ncCode" label="NC代码编号">
-            <n-input v-model:value="formData.ncCode" placeholder="自动生成" disabled />
-          </n-form-item>
-        </n-gi>
-        <n-gi>
-          <n-form-item path="ncName" label="NC代码名称">
-            <n-input v-model:value="formData.ncName" placeholder="请输入NC代码名称" />
-          </n-form-item>
-        </n-gi>
-        <n-gi>
-          <n-form-item label="状态">
-            <n-radio-group v-model:value="formData.status" :default-value="1" name="radiogroup">
-              <n-space>
-                <n-radio :value="1">
-                  启用
-                </n-radio>
-                <n-radio :value="0">
-                  禁用
-                </n-radio>
-              </n-space>
-            </n-radio-group>
-          </n-form-item>    
-        </n-gi>
-        <n-gi>
-          <!--type="textarea"-->
-          <n-form-item path="ncContent" label="NC代码内容">
-            <n-input type="textarea" v-model:value="formData.ncContent" placeholder="请输入NC代码内容" />
-          </n-form-item>    
-        </n-gi>
-        <n-gi>
-          <n-form-item label="备注">
-            <n-input type="textarea" v-model:value="formData.remark" placeholder="请输入备注" />
-          </n-form-item>    
-        </n-gi>
-        <!-- <n-gi>
-          <n-form-item label="工作中心">
-            <n-input v-model:value="formData.workCenter" placeholder="请输入工作中心" />
-          </n-form-item>    
-        </n-gi>
-        <n-gi>
-          <n-form-item label="设备ID">
-            <n-input v-model:value="formData.deviceId" placeholder="请输入设备ID" />
-          </n-form-item>    
-        </n-gi>
-        <n-gi>
-          <n-form-item label="设备名称">
-            <n-input v-model:value="formData.deviceName" placeholder="请输入设备名称" />
-          </n-form-item>  
-        </n-gi> -->
-        
-        <!-- <n-gi>
-          <n-form-item label="下发状态">
-            <n-radio-group v-model:value="formData.isIssued" name="radiogroup">
-              <n-space>
-                <n-radio :value="1">
-                  已下发
-                </n-radio>
-                <n-radio :value="0">
-                  未下发
-                </n-radio>
-              </n-space>
-            </n-radio-group>
-          </n-form-item>    
-        </n-gi> -->
-        <!-- <template v-if="formData.isIssued == 1">
-          <n-gi>
-            <n-form-item label="下发时间">
-              <n-date-picker 
-                v-model:formatted-value="formData.issueTime" 
-                type="datetime" 
-                style="width: 100%;" 
-                clearable
-                value-format="yyyy-MM-dd HH:mm:ss" 
-              />
-            </n-form-item>    
-          </n-gi>
-          <n-gi>
-            <n-form-item label="下发人">
-              <n-input v-model:value="formData.issueBy" placeholder="请选择下发人" />
-            </n-form-item>    
-          </n-gi>
-        </template> -->
-        
-        
-      </n-grid>
-    </n-form>
-      <template #footer>
-        <n-space justify="end">
-          <n-button @click="addModel = false">取消</n-button>
-          <n-button 
-            type="primary" 
-          
-            @click="savehand"
-          >确认</n-button>
-        </n-space>
-
-      </template>
-  </n-modal>
-
-    <!--下发-->
-    <n-modal
-      v-model:show="issueModel"
-      title="下发"
-      preset="card"
-      style="width: 600px"
-      :mask-closable="false"
-    >
-      <n-transfer
-        v-model:value="value"
-        style="height:500px;"
-        :options="options"
-        :render-source-list="renderSourceList"
-        source-filterable
-        @update:value="tranupdate"
-    />
-      <template #footer>
-        <n-space justify="end">
-          <n-button @click="issueModel = false">取消</n-button>
-          <n-button 
-            type="primary" 
-            @click="isssavehand"
-          >确认</n-button>
-        </n-space>
-
-      </template>
-  </n-modal>
-</div>
-
-  
-</template>
-
-<script setup lang="ts">
-import { 
-  ref, 
-  reactive, 
-  h, 
-  onMounted,
-} from 'vue'
-
-
-import { 
-  NTree,
-  NButton, 
-  NIcon, 
-  NSpace, 
-  NPagination, 
-  NGrid,
-  useMessage,
-  useDialog,
-  NDropdown,
-} from 'naive-ui'
-
-import { 
-  SearchOutline, 
-  RefreshOutline,
-  AddOutline,
-  ArrowDownCircleOutline,
-  EllipsisHorizontalOutline
-} from '@vicons/ionicons5'
-
-import { useUserStore } from '@/stores/user'
-
-import { 
-  addnccode,
-  nccodelist,
-  batchIssue,
-  editccode,
-  issuecopy,
-  generateNccode,
-  opertree,
-  exportNccode
-} from '@/api/nccode'
-
-const dialog = useDialog()
-
-const message = useMessage()
-
-const userStore = useUserStore()
-
-// 权限检查
-const hasPermission = (permission: string) => userStore.hasPermission(permission)
-
-//const ncDispatchRecords = ref<ncCode[]>([])
-
-//派工状态字典
-//const qcAssingStatusOptions = ref<{ label: string; value: any;class:any }[]>([])
-
-// ==================== 搜索表单 ====================
-const searchForm = reactive({
-  page: 1,
-  pageSize: 20,
-  ncCode:'',
-  ncName:'',
-  status:1
-})
-
-
-
-// ==================== 表格 ====================
-const datalist = ref<any>([])
-const loading = ref(false)
-
-//分页
-const pagination = reactive({
-  page: 1,
-  pageSize: 20,
-  itemCount: 0
-})
-
-
-const columns = [
-    // { 
-    //   type: 'selection',
-    //   minWidth:60
-    // },
-    {
-    align:"center",
-    title:"NC代码编号",
-    key:"ncCode",
-    minWidth:150
-  },
-  {
-    align:"center",
-    title:"NC代码名称",
-    key:"ncName",
-    minWidth:150
-  },
-
-
-  {
-    align:"center",
-    title:"NC代码内容",
-    key:"ncContent",
-    minWidth:150
-  },
-
-  // {
-  //   align:"center",
-  //   title:"工作中心",
-  //   key:"workCenter",
-  //   minWidth:150
-  // },
-  
-  // {
-  //   align:"center",
-  //   title:"设备ID",
-  //   key:"deviceId",
-  //   minWidth:150
-  // },
-
-  // {
-  //   align:"center",
-  //   title:"设备名称",
-  //   key:"deviceName",
-  //   minWidth:150
-  // },
-
-  {
-    align:"center",
-    title:"状态",
-    key:"status",
-    minWidth:150,
-    render(row:any) {
-      if(row.status == 1){
-        return '启用'
-      }
-      return '禁用'
-    }
-  },
-  {
-    align:"center",
-    title:"是否下发",
-    key:"isIssued",
-    minWidth:150,
-    render(row:any) {
-      if(row.isIssued == 1){
-        return '已下发'
-      }
-      return '未下发'
-    }
-  },
-  {
-    align:"center",
-    title:"下发时间",
-    key:"issueTime",
-    minWidth:150
-  },
-
-  {
-    align:"center",
-    title:"下发人",
-    key:"issueBy",
-    minWidth:150
-  },
-  {
-    align:"center",
-    title:"备注",
-    key:"remark",
-    minWidth:150
-  },
-
-  {
-    align:'center',
-    title: '操作',
-    key: 'actions',
-    width: 260,
-    fixed: 'right',
-    render(row:any) {
-      const buttons:any = []
-          
-          if(hasPermission('biz:ncCode:issue')){
-              buttons.push(h(NButton, { 
-              size: 'small',
-              type:'info',  
-              ghost:true,
-              onClick: () => { 
-                issuehand()
-               } }, 
-              { default:  () =>  '下发'}
-            ))
-          }
-          if(hasPermission('biz:nccode:add')){
-              buttons.push(h(NButton, { 
-              size: 'small',
-              type:'warning',  
-              ghost:true,
-              onClick: () => { 
-                addhand(3,row)
-               }}, 
-              { default:  () =>  '复制'}
-            ))
-          }
-
-          if(hasPermission('biz:ncCode:edit')){
-              buttons.push(h(NButton, { 
-              size: 'small',
-              type:'primary',  
-              ghost:true,
-              onClick: () => { 
-                addhand(2,row)
-               } }, 
-              { default:  () =>  '编辑'}
-            ))
-          }
-          if(hasPermission('biz:ncCode:remove')){
-              buttons.push(h(NButton, { 
-              size: 'small',
-              type:'error',  
-              ghost:true,
-              onClick: () => {
-                dialog.warning({
-                  title: '警告',
-                  content: `你确定删除NC代码编号为:${row.ncCode}的数据`,
-                  positiveText: '确定',
-                  negativeText: '取消',
-                  //draggable: true,
-                  onPositiveClick: () => {
-                    deleteIssue(row.id).then(() => {
-                      message.success('操作成功')
-                      setTimeout(() => {
-                        search()
-                      },1000)
-                    })
-                    
-                  },
-                  onNegativeClick: () => {
-                    
-                  }
-                })
-                
-               } }, 
-              { default:  () =>  '删除'}
-            ))
-          }
-         
-
-      return buttons.length > 0 ? h(NSpace, {justify:'center'}, { default: () => buttons }) : '-'
-    }
-  }
-]
-
-
-
-
-
-//搜索数据
-function search() {
-  pagination.page = 1
-  searchForm.page = 1
-  searchForm.pageSize = 20
-  getlist()
-}
-
-//重置
-function reset() {
- 
-}
-
-//获取列表数据
-function getlist() {
-  nccodelist(searchForm).then((rps:any) => {
-    datalist.value = rps.list
-    pagination.itemCount = rps.total
-  })
-}
-
-
-
-function handlePageChange(page: number) {
-  pagination.page = page
-  searchForm.page = page
-  getlist()
-}
-
-function handlePageSizeChange(pageSize: number) {
-  pagination.pageSize = pageSize
-  pagination.page = 1
-  searchForm.page = 1
-  searchForm.pageSize = pageSize
-  getlist()
-}
-
-
-
-// // 加载字典选项
-// async function loadDictOptions() {
-//   //qcCancelLoading = true
-//   try {
-//     const data = await dictDataApi.listByType('assing_status')
-//     qcAssingStatusOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class:d.listClass }))
-//   }catch {}
-// }
-
-
-//新增
-let addModel = ref(false)
-
-const addformRef = ref()
-
-let formData = reactive<any>({
-  id:'',
-  ncCode:'',	          //NC代码编号
-  ncName:'',	          //NC代码名称
-  ncContent:'',	        //NC代码内容
-  workCenter:'',	      //工作中心
-  deviceId:'',	        //设备ID
-  deviceName:'',	      //设备名称
-  status:1,	            //状态：1-启用 0-禁用
-  // isIssued:1,          //是否已下发：1-已下发 0-未下发
-  // issueTime:null,       //下发时间
-  // issueBy:'',	          //下发人
-  remark:''	            //备注
-}) 
-const addrules = {
-   ncCode: [
-    { required: true, message: '请输入NC代码编号', trigger: 'blur' },
-    // {
-    //   validator(rule:any,value: any) {
-    //     if(value > pauseform.qcNum){
-    //       return new Error(`报检数量最大为${pauseform.qcNum}`)
-    //     }
-    //     return true
-    //   },
-    //   trigger: ['blur']
-    // }
-  ],
-  ncName:[
-    { required: true, message: '请输入NC代码名称', trigger: 'blur' }
-  ],
-  ncContent:[
-    { required: true, message: '请输入NC代码内容', trigger: 'blur' }
-  ]
-}
-
-let isstype = ref<any>(1)
-
-const cztype = reactive<any>({
-  1:'新增',
-  2:'编辑',
-  3:'复制'
-})
-
-function addhand(type:any,row?:any) {
-  addModel.value = true
-  formData.value?.restoreValidation()
-  isstype.value = type
-  if(type == 1 || type == 3){
-    generateNccode().then(rps => {
-      formData.ncCode = rps  
-    })
-  }
-  
-  if(row){
-    formData.id = row.id	          
-    formData.ncName = row.ncName	          
-    formData.ncContent = 	row.ncContent        
-    formData.workCenter = row.workCenter	      
-    formData.deviceId = 	row.deviceId        
-    formData.deviceName = row.deviceName	      
-    formData.status = row.status	          
-    // formData.isIssued = row.isIssued          
-    // formData.issueTime = row.issueTime       
-    // formData.issueBy = row.issueBy	        
-    formData.remark = row.remark
-    if(type == 2){
-      formData.ncCode = row.ncCode
-    }else{
-      formData.ncCode = ''
-    }	        
-  }else{
-    formData.id = ''
-    formData.ncCode = ''	          
-    formData.ncName = ''	          
-    formData.ncContent = 	''        
-    formData.workCenter = ''	      
-    formData.deviceId = 	''        
-    formData.deviceName = ''	      
-    formData.status = 1	          
-    // formData.isIssued = ''          
-    // formData.issueTime = ''       
-    // formData.issueBy = ''	        
-    formData.remark = ''
-  }
-}
-
-function addEdi(){
-  if(isstype.value == 1){
-    return addnccode(formData)
-  }
-  if(isstype.value == 2){
-    return  editccode(formData)
-  }
-  formData.id = ''
-  return issuecopy(formData)
-  
-}
-
-function savehand() {
-  addformRef.value?.validate((e:any) => {
-    if (!e) {
-
-      addEdi().then(() => {
-        message.success(`${cztype[isstype.value]}成功`)
-        setTimeout(() => {
-          getlist()
-          addModel.value = false
-        },1500)
-        
-      })
-    }
-  })
-}
-
-//表格选中
-
-function rowKey(row:any) {
-  return row.id
-}
-
-let chearr = ref<any>([])
-function handleCheck(v:any) {
-  chearr.value = v
-  console.log(v)
-}
-
-//删除
-function delhand() {
-  if(chearr.value.length > 0){
-    batchIssue(chearr.value).then(() => {
-      message.success('操作成功')
-    })
-  }else{
-    message.error('请勾选设备')
-  }
-  
-}
-
-//下发任务列表
-//let isstasklist = ref<any>([])
-
-//下发设备列表
-//let issequiplist = ref<any>([])
-
-let treeData:any = []
-let value = ref<Array<string | number>>([])
-let renderSourceList:any = ''
-
-let options = ref<any>([])    //flattenTree(createData())
-
-function flattenTree(list: undefined | any[]) {
-  const result: any[] = []
-  function flatten(_list: any[] = []) {
-    _list.forEach((item) => {
-      //result.push(item)
-      if(item.childList){
-        flatten(item.childList)
-      }else{
-        result.push(item)
-      }
-    })
-  }
-  flatten(list)
-  return result
-}
-
-
-function tranupdate(v:any) {
-    console.log(v)
-}
-
-//下发
-let issueModel = ref(false)
-// let issformData = reactive<any>({
-//   taskid:'',
-//   equis:''
-// }) 
-// const issaddrules = {
-//   taskid:[
-//     { required: true, message: '请选择下发任务', trigger: 'blur' }
-//   ],
-//   equis:[
-//     { required: true, message: '请选择下发设备', trigger: 'blur' }
-//   ]
-  
-// }  
-
-
-
-
-function renderlabe() {}
-
-function issuehand() {
-  
-  issueModel.value = true
-
-  
-}
-
-const issformRef = ref()
-
-function isssavehand() {
-  issformRef.value?.validate((e:any) => {
-    if (!e) {
-      batchIssue('').then(() => {
-        message.success('操作成功')
-        setTimeout(() => {
-          getlist()
-          issueModel.value = false
-        },1500)
-      })
-      
-    }
-  })
-}
-//导出
-//let selectedIds = ref<any>([])
-function handleExport() {
-
-
-  exportNccode({}).then(rps => {
-     const url = window.URL.createObjectURL(rps)
-    const link = document.createElement('a')
-    link.href = url
-    link.download = 'NC代码数据.xlsx'
-    link.click()
-    window.URL.revokeObjectURL(url)
-  })
-}
-
-
-getlist()
-
-//查看下发记录
-async function handleDispatchRecord(row:ncCode){
-    const ncId = row.id
-    // ncDispatchRecords.value = await
-}
-
-
-onMounted(() => {
- 
-  //加载任务树
-  opertree().then(rps => {
-      treeData = rps
-      options.value = flattenTree(treeData)
-      console.log(rps,'112')
-      renderSourceList = function (obj:any) {
-          return h(NTree, {
-              style: 'margin: 0 4px;',
-              keyField: 'value',
-              checkable: true,
-              selectable: false,
-              blockLine: true,
-              checkOnClick: true,
-              childrenField:'childList',
-              data: treeData,
-              cascade:true,
-              defaultExpandAll:true,
-              pattern:obj.pattern,
-              checkedKeys: value.value,
-              onUpdateCheckedKeys: (checkedKeys: Array<string | number>) => {
-                  obj.onCheck(checkedKeys)
-                  console.log(value.value,'tree')
-              }
-          })
-      }
-  })
-
- //loadDictOptions()
-
-})
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/biz/device/DeviceDispatchLog.vue b/src/views/biz/device/DeviceDispatchLog.vue
index eb2992d..7f5bafd 100644
--- a/src/views/biz/device/DeviceDispatchLog.vue
+++ b/src/views/biz/device/DeviceDispatchLog.vue
@@ -19,7 +19,7 @@ const searchForm = ref({
 
 const pagination = reactive({
   page: 1,
-  pageSize: 2,
+  pageSize: 10,
   itemCount: 0,
   showSizePicker: true,
   pageSizes: [10, 20, 50]
@@ -62,8 +62,12 @@ const load = async()=>{
 
 const columns = [
   {
-    title: '下发编号',
-    key: 'issueCode'
+    title: '工序名称',
+    key: 'processName'
+  },
+  {
+    title: '工序名称',
+    key: 'assingCode'
   },
   {
     title: '下发类型',
@@ -89,6 +93,12 @@ const columns = [
     title: '下发时间',
     key: 'issueTime'
   },
+  // {
+  //   title: '下发文件',
+  //   render(row) {
+  //     return row.
+  //   }
+  // },
   {
     title: '备注',
     key: 'remark'
@@ -138,11 +148,6 @@ onMounted(()=>{
     <n-card v-if="!showSearchInput">
       <n-form inline :model="searchForm" label-placement="left">
         <n-grid :x-gap="8" :cols="4">
-          <n-gi>
-            <n-form-item label="下发编号">
-                <n-input v-model:value="searchForm.issueCode" placeholder="请输入设备下发编号" clearable style="width: 200px"/>
-            </n-form-item>
-          </n-gi>
           <n-gi>
             <n-form-item label="下发状态">
               <n-select
diff --git a/src/views/biz/device/index.vue b/src/views/biz/device/index.vue
index 99bf58c..67f8f5c 100644
--- a/src/views/biz/device/index.vue
+++ b/src/views/biz/device/index.vue
@@ -4,7 +4,7 @@
       <!-- 搜索表单 -->
       <div class="search-form">
         <n-form inline :model="searchForm" label-placement="left">
-          <n-form-item label="主键ID">
+          <n-form-item label="设备编码">
             <n-input v-model:value="searchForm.deviceCode" placeholder="请输入设备编码" clearable/>
           </n-form-item>
           <n-form-item>