From f67a24d8b3e1ad0c3133590516959ec9412af003 Mon Sep 17 00:00:00 2001
From: shaoleiliu-netizen123 <480188199@qq.com>
Date: Sat, 6 Jun 2026 16:44:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A9=E6=AD=A5=E6=8E=A5=E6=94=B6=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E5=AE=A1=E6=89=B9=E6=8E=A8=E9=80=81=E9=92=89=E9=92=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

让步接收申请单前端页面
---
 mes-ui/src/api/concessionApply.ts             |  82 +++
 .../src/views/biz/concessionApply/index.vue   | 427 ++++++++++++
 src/api/ConcessionApply.ts                    |  93 +++
 src/api/production.ts                         |   2 +-
 src/api/qcResultDetail.ts                     |   2 +
 src/views/biz/concessionApply/index.vue       | 609 ++++++++++++++++++
 src/views/biz/qualityTesting/index.vue        | 135 ++--
 src/views/production/dispatchwork/index.vue   |  10 +-
 src/views/production/myassigtask/index.vue    |  10 +-
 9 files changed, 1313 insertions(+), 57 deletions(-)
 create mode 100644 mes-ui/src/api/concessionApply.ts
 create mode 100644 mes-ui/src/views/biz/concessionApply/index.vue
 create mode 100644 src/api/ConcessionApply.ts
 create mode 100644 src/views/biz/concessionApply/index.vue

diff --git a/mes-ui/src/api/concessionApply.ts b/mes-ui/src/api/concessionApply.ts
new file mode 100644
index 0000000..042db53
--- /dev/null
+++ b/mes-ui/src/api/concessionApply.ts
@@ -0,0 +1,82 @@
+import { request } from '@/utils/request'
+
+// 让步接收申请表 类型定义
+export interface ConcessionApply {
+  id?: number
+
+  qcId?: number
+
+  concessionQty?: number
+
+  applyRemark?:  string
+
+  applyContent?:  string
+
+  applyFile?:  string
+
+  applyUserId?: number
+
+  deptId?: number
+
+  instanceId?:  string
+
+  approveStatus?: number
+
+  createTime?:  string
+
+  updateTime?:  string
+
+}
+
+// 让步接收申请表 API
+export const concessionApplyApi = {
+  // 分页查询
+  page(params: { page: number; pageSize: number; id?: number }) {
+    return request({ url: '/biz/concessionApply/page', method: 'get', params })
+  },
+
+  // 获取详情
+  detail(id:  string) {
+    return request({ url: `/biz/concessionApply/${id}`, method: 'get' })
+  },
+
+  // 新增
+  create(data: ConcessionApply) {
+    return request({ url: '/biz/concessionApply', method: 'post', data })
+  },
+
+  // 修改
+  update(data: ConcessionApply) {
+    return request({ url: '/biz/concessionApply', method: 'put', data })
+  },
+
+  // 删除
+  delete(ids:  string[]) {
+    return request({ url: `/biz/concessionApply/${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/concessionApply/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/concessionApply/import`,
+      method: 'post',
+      data: formData,
+      headers: { 'Content-Type': 'multipart/form-data' }
+    })
+  },
+
+  // 下载导入模板
+  downloadTemplate() {
+    return request({ url: `/biz/concessionApply/template`, method: 'get', responseType: 'blob' })
+  }
+}
diff --git a/mes-ui/src/views/biz/concessionApply/index.vue b/mes-ui/src/views/biz/concessionApply/index.vue
new file mode 100644
index 0000000..f6415ae
--- /dev/null
+++ b/mes-ui/src/views/biz/concessionApply/index.vue
@@ -0,0 +1,427 @@
+<template>
+  <div class="page-container">
+    <n-card>
+      <!-- 搜索表单 -->
+      <div class="search-form">
+        <n-form inline :model="searchForm" label-placement="left">
+          <n-form-item label="主键id">
+            <n-input v-model:value="searchForm.id" placeholder="请输入主键id" clearable />
+          </n-form-item>
+          <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-form>
+      </div>
+
+      <!-- 工具栏 -->
+      <div class="table-toolbar">
+        <n-space>
+          <n-button type="primary" @click="handleAdd">
+            <template #icon><n-icon><AddOutline /></n-icon></template>
+            新增
+          </n-button>
+          <n-button @click="importModalVisible = true">
+            <template #icon><n-icon><CloudUploadOutline /></n-icon></template>
+            导入
+          </n-button>
+          <n-button @click="handleExport">
+            <template #icon><n-icon><DownloadOutline /></n-icon></template>
+            导出{{ selectedIds.length > 0 ? `(${selectedIds.length})` : '' }}
+          </n-button>
+          <n-button type="error" :disabled="selectedIds.length === 0" @click="handleBatchDelete">
+            <template #icon><n-icon><TrashOutline /></n-icon></template>
+            删除
+          </n-button>
+        </n-space>
+      </div>
+
+      <!-- 表格 -->
+      <n-data-table
+        :columns="columns"
+        :data="tableData"
+        :loading="loading"
+        :pagination="pagination"
+        :row-key="(row) => row.id"
+        :scroll-x="1200"
+        @update:page="handlePageChange"
+        @update:page-size="handlePageSizeChange"
+        @update:checked-row-keys="handleCheck"
+      />
+    </n-card>
+
+    <!-- 新增/编辑弹窗 -->
+    <n-modal v-model:show="modalVisible" preset="card" :title="modalTitle" style="width: 600px">
+      <n-form ref="formRef" :model="formData" :rules="formRules" label-placement="left" label-width="100px">
+        <n-form-item label="质检编号" path="qcId">
+          <n-input v-model:value="formData.qcId" placeholder="请输入质检编号" />
+        </n-form-item>
+        <n-form-item label="让步接收数量" path="concessionQty">
+          <n-input v-model:value="formData.concessionQty" placeholder="请输入让步接收数量" />
+        </n-form-item>
+        <n-form-item label="申请原因" path="applyRemark">
+          <n-input v-model:value="formData.applyRemark" type="textarea" placeholder="请输入申请原因" />
+        </n-form-item>
+        <n-form-item label="申请内容" path="applyContent">
+          <n-input v-model:value="formData.applyContent" type="textarea" placeholder="请输入申请内容" />
+        </n-form-item>
+        <n-form-item label="申请人id(发去人id)" path="applyUserId">
+          <n-input v-model:value="formData.applyUserId" placeholder="请输入申请人id(发去人id)" />
+        </n-form-item>
+        <n-form-item label="部门id" path="deptId">
+          <n-input v-model:value="formData.deptId" placeholder="请输入部门id" />
+        </n-form-item>
+        <n-form-item label="钉钉单据id" path="instanceId">
+          <n-input v-model:value="formData.instanceId" placeholder="请输入钉钉单据id" />
+        </n-form-item>
+        <n-form-item label="审批状态	1待审批 2审批通过 3 审批驳回" path="approveStatus">
+          <n-select v-model:value="formData.approveStatus" placeholder="请选择审批状态	1待审批 2审批通过 3 审批驳回" :options="approveStatusOptions" />
+        </n-form-item>
+      </n-form>
+      <template #footer>
+        <n-space justify="end">
+          <n-button @click="modalVisible = false">取消</n-button>
+          <n-button type="primary" @click="handleSubmit">确定</n-button>
+        </n-space>
+      </template>
+    </n-modal>
+
+    <!-- 导入弹窗 -->
+    <n-modal v-model:show="importModalVisible" preset="card" title="导入让步接收申请表" style="width: 500px">
+      <n-space vertical>
+        <n-alert type="info">
+          <template #header>导入说明</template>
+          <ul style="margin: 0; padding-left: 16px; line-height: 1.8">
+            <li>请先下载导入模板，按模板格式填写数据</li>
+            <li>支持 .xlsx 或 .xls 格式</li>
+          </ul>
+        </n-alert>
+        <n-space>
+          <n-button type="primary" @click="handleDownloadTemplate">
+            <template #icon><n-icon><DownloadOutline /></n-icon></template>
+            下载模板
+          </n-button>
+        </n-space>
+        <n-upload :max="1" accept=".xlsx,.xls" :show-file-list="true" :custom-request="handleImportUpload">
+          <n-upload-dragger>
+            <div style="margin-bottom: 12px">
+              <n-icon size="48" :depth="3"><CloudUploadOutline /></n-icon>
+            </div>
+            <n-text style="font-size: 16px">点击或拖拽文件到此处上传</n-text>
+            <n-p depth="3" style="margin: 8px 0 0 0">支持 .xlsx 或 .xls 格式</n-p>
+          </n-upload-dragger>
+        </n-upload>
+      </n-space>
+      <template #footer>
+        <n-button @click="importModalVisible = false">关闭</n-button>
+      </template>
+    </n-modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, h, onMounted } from 'vue'
+import { NButton, NSpace, NIcon, NUpload, useMessage, useDialog, type DataTableColumns, type UploadCustomRequestOptions } from 'naive-ui'
+import { SearchOutline, RefreshOutline, AddOutline, TrashOutline, CreateOutline, CloudUploadOutline, DownloadOutline } from '@vicons/ionicons5'
+import { concessionApplyApi, type ConcessionApply } from '@/api/concessionApply'
+import { dictDataApi } from '@/api/org'
+
+const message = useMessage()
+const dialog = useDialog()
+
+// 搜索表单
+const searchForm = reactive({
+  id:  null as number | null,
+})
+
+// 表格数据
+const tableData = ref<ConcessionApply[]>([])
+const loading = ref(false)
+const selectedIds = ref<number[]>([])
+const pagination = reactive({
+  page: 1,
+  pageSize: 10,
+  itemCount: 0,
+  showSizePicker: true,
+  pageSizes: [10, 20, 50]
+})
+
+// 弹窗
+const modalVisible = ref(false)
+const modalTitle = ref('')
+const importModalVisible = ref(false)
+const formRef = ref()
+const defaultFormData: ConcessionApply = {
+  qcId: undefined,
+  concessionQty: undefined,
+  applyRemark: '',
+  applyContent: '',
+  applyFile: '',
+  applyUserId: undefined,
+  deptId: undefined,
+  instanceId: '',
+  approveStatus: undefined,
+}
+const formData = reactive<ConcessionApply>({ ...defaultFormData })
+
+// 字典选项（下拉框/单选框/复选框关联字典时使用）
+const approveStatusOptions = ref<{ label: string; value: any }[]>([])
+
+// 表单校验规则
+const formRules = {
+}
+
+// 表格列
+const columns: DataTableColumns<ConcessionApply> = [
+  { type: 'selection' },
+  { title: '主键id', key: 'id' },
+  { title: '质检编号', key: 'qcId' },
+  { title: '让步接收数量', key: 'concessionQty' },
+  { title: '申请原因', key: 'applyRemark' },
+  { title: '申请内容', key: 'applyContent' },
+  { title: '申请附件', key: 'applyFile' },
+  { title: '申请人id(发去人id)', key: 'applyUserId' },
+  { title: '部门id', key: 'deptId' },
+  { title: '钉钉单据id', key: 'instanceId' },
+  { title: '审批状态	1待审批 2审批通过 3 审批驳回', key: 'approveStatus',
+    render(row) {
+      const val = row.approveStatus
+      const opt = approveStatusOptions.value.find(o => o.value === val || String(o.value) === String(val))
+      return opt ? opt.label : (val ?? '-')
+    }
+  },
+  { title: '创建时间', key: 'createTime', width: 180 },
+  { title: '更新时间', key: 'updateTime', width: 180 },
+  {
+    title: '操作',
+    key: 'actions',
+    width: 140,
+    fixed: 'right',
+    render(row) {
+      return h('div', { style: { display: 'flex', alignItems: 'center', gap: '8px', flexWrap: 'nowrap' } }, [
+        h(NButton, { size: 'small', quaternary: true, onClick: () => handleEdit(row) }, {
+          default: () => [h(NIcon, null, { default: () => h(CreateOutline) }), ' 编辑']
+        }),
+        h(NButton, { size: 'small', quaternary: true, type: 'error', onClick: () => handleDelete(row) }, {
+          default: () => [h(NIcon, null, { default: () => h(TrashOutline) }), ' 删除']
+        })
+      ])
+    }
+  }
+]
+
+// 加载数据
+async function loadData() {
+  loading.value = true
+  try {
+    const res = await concessionApplyApi.page({
+      page: pagination.page,
+      pageSize: pagination.pageSize,
+      id: searchForm.id || undefined,
+    })
+    tableData.value = res.list
+    pagination.itemCount = res.total
+  } finally {
+    loading.value = false
+  }
+}
+
+// 搜索
+function handleSearch() {
+  pagination.page = 1
+  loadData()
+}
+
+// 重置
+function handleReset() {
+  searchForm.id =  null
+
+  handleSearch()
+}
+
+// 分页
+function handlePageChange(page: number) {
+  pagination.page = page
+  loadData()
+}
+
+function handlePageSizeChange(pageSize: number) {
+  pagination.pageSize = pageSize
+  pagination.page = 1
+  loadData()
+}
+
+// 选择
+function handleCheck(keys: Array<string | number>) {
+  selectedIds.value = keys as number[]
+}
+
+// 新增
+function handleAdd() {
+  modalTitle.value = '新增让步接收申请表'
+  Object.assign(formData, defaultFormData)
+  modalVisible.value = true
+}
+
+// 编辑
+function handleEdit(row: ConcessionApply) {
+  modalTitle.value = '编辑让步接收申请表'
+  Object.assign(formData, row)
+  if (formData.createTime && typeof formData.createTime === 'string') {
+    formData.createTime = new Date(formData.createTime.replace(' ', 'T')).getTime()
+  }
+  if (formData.updateTime && typeof formData.updateTime === 'string') {
+    formData.updateTime = new Date(formData.updateTime.replace(' ', 'T')).getTime()
+  }
+  modalVisible.value = true
+}
+
+// 提交
+async function handleSubmit() {
+  await formRef.value?.validate()
+  try {
+    const submitData = { ...formData } as ConcessionApply
+    if (typeof submitData.createTime === 'number') {
+      submitData.createTime = new Date(submitData.createTime).toISOString().slice(0, 19).replace('T', ' ')
+    }
+    if (typeof submitData.updateTime === 'number') {
+      submitData.updateTime = new Date(submitData.updateTime).toISOString().slice(0, 19).replace('T', ' ')
+    }
+    if (submitData.id) {
+      await concessionApplyApi.update(submitData)
+      message.success('修改成功')
+    } else {
+      await concessionApplyApi.create(submitData)
+      message.success('新增成功')
+    }
+    modalVisible.value = false
+    loadData()
+  } catch (error) {
+    // 错误已在拦截器处理
+  }
+}
+
+// 删除
+function handleDelete(row: ConcessionApply) {
+  dialog.warning({
+    title: '提示',
+    content: '确定要删除该记录吗？',
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: async () => {
+      try {
+        await concessionApplyApi.delete([row.id!])
+        message.success('删除成功')
+        loadData()
+      } catch (error) {
+        // 错误已在拦截器处理
+      }
+    }
+  })
+}
+
+// 批量删除
+function handleBatchDelete() {
+  dialog.warning({
+    title: '提示',
+    content: `确定要删除选中的 ${selectedIds.value.length} 条记录吗？`,
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: async () => {
+      try {
+        await concessionApplyApi.delete(selectedIds.value)
+        message.success('删除成功')
+        selectedIds.value = []
+        loadData()
+      } catch (error) {
+        // 错误已在拦截器处理
+      }
+    }
+  })
+}
+
+// 导出
+async function handleExport() {
+  try {
+    const params: Record<string, any> = {}
+    if (selectedIds.value.length > 0) params.ids = selectedIds.value
+    if (searchForm.id != null) params.id = searchForm.id
+    const blob = await concessionApplyApi.export(params)
+    const url = window.URL.createObjectURL(blob)
+    const link = document.createElement('a')
+    link.href = url
+    link.download = '让步接收申请表数据.xlsx'
+    link.click()
+    window.URL.revokeObjectURL(url)
+  } catch (error) {
+    // 错误已在拦截器处理
+  }
+}
+
+// 下载导入模板
+async function handleDownloadTemplate() {
+  try {
+    const blob = await concessionApplyApi.downloadTemplate()
+    const url = window.URL.createObjectURL(blob)
+    const link = document.createElement('a')
+    link.href = url
+    link.download = '让步接收申请表导入模板.xlsx'
+    link.click()
+    window.URL.revokeObjectURL(url)
+  } catch (error) {
+    // 错误已在拦截器处理
+  }
+}
+
+// 导入上传
+async function handleImportUpload({ file }: UploadCustomRequestOptions) {
+  if (!file.file) return
+  try {
+    const result = await concessionApplyApi.importData(file.file)
+    if (result.fail > 0) {
+      dialog.warning({
+        title: '导入结果',
+        content: `成功: ${result.success} 条，失败: ${result.fail} 条\n错误信息: ${(result.errors || []).join('\n') || '无'}`,
+        positiveText: '确定'
+      })
+    } else {
+      message.success(`导入成功，共 ${result.success} 条数据`)
+      importModalVisible.value = false
+    }
+    loadData()
+  } catch (error) {
+    // 错误已在拦截器处理
+  }
+}
+
+// 加载字典选项
+async function loadDictOptions() {
+  try {
+    const data = await dictDataApi.listByType('sys_status')
+    approveStatusOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue) }))
+  } catch {}
+}
+
+onMounted(() => {
+  loadData()
+  loadDictOptions()
+})
+</script>
+
+<style scoped>
+.search-form {
+  margin-bottom: 16px;
+}
+
+.table-toolbar {
+  margin-bottom: 16px;
+}
+</style>
diff --git a/src/api/ConcessionApply.ts b/src/api/ConcessionApply.ts
new file mode 100644
index 0000000..14857d4
--- /dev/null
+++ b/src/api/ConcessionApply.ts
@@ -0,0 +1,93 @@
+import { request } from '@/utils/request'
+
+// 让步接收申请表 类型定义
+export interface ConcessionApply {
+  id?: number
+
+  qcId?: number
+
+  concessionQty?: number
+
+  applyRemark?:  string
+
+  applyContent?:  string
+
+  applyFile?:  string
+
+  applyUserId?: number
+
+  deptId?: number
+
+  instanceId?:  string
+
+  approveStatus?: number
+
+  createTime?:  string
+
+  updateTime?:  string
+
+}
+
+
+export interface DetailModel {
+
+  businessId:string,
+  title:string,
+  deptName:string,
+  approveResult:string,
+  approveRecord:[]
+}
+
+// 让步接收申请表 API
+export const concessionApplyApi = {
+  // 分页查询
+  page(params: { page: number; pageSize: number; id?: number }) {
+    return request({ url: '/biz/concessionApply/page', method: 'get', params })
+  },
+
+  // 获取详情
+  detail(id:  string) {
+    return request({ url: `/biz/concessionApply/${id}`, method: 'get' })
+  },
+
+  // 新增
+  create(data: ConcessionApply) {
+    return request({ url: '/biz/concessionApply', method: 'post', data })
+  },
+
+  // 修改
+  update(data: ConcessionApply) {
+    return request({ url: '/biz/concessionApply', method: 'put', data })
+  },
+
+  // 删除
+  delete(ids:  string[]) {
+    return request({ url: `/biz/concessionApply/${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/concessionApply/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/concessionApply/import`,
+      method: 'post',
+      data: formData,
+      headers: { 'Content-Type': 'multipart/form-data' }
+    })
+  },
+
+  // 下载导入模板
+  downloadTemplate() {
+    return request({ url: `/biz/concessionApply/template`, method: 'get', responseType: 'blob' })
+  },
+
+}
\ No newline at end of file
diff --git a/src/api/production.ts b/src/api/production.ts
index 3709567..0374a9c 100644
--- a/src/api/production.ts
+++ b/src/api/production.ts
@@ -59,7 +59,7 @@ export function workload(params?:any) {
 export function inspectio(data:any) {
     return request({ 
         url: `/mes/dispatch/qc`, 
-        method: 'put',
+        method: 'post',
         data 
     })
 }
\ No newline at end of file
diff --git a/src/api/qcResultDetail.ts b/src/api/qcResultDetail.ts
index 713b2f1..515c4b9 100644
--- a/src/api/qcResultDetail.ts
+++ b/src/api/qcResultDetail.ts
@@ -24,6 +24,8 @@ export interface QcResultDetail {
 
     updateTime?:  string
 
+    files?:any[]
+
 }
 
 // 质检结果明细表 API
diff --git a/src/views/biz/concessionApply/index.vue b/src/views/biz/concessionApply/index.vue
new file mode 100644
index 0000000..78c5cda
--- /dev/null
+++ b/src/views/biz/concessionApply/index.vue
@@ -0,0 +1,609 @@
+<template>
+  <div class="page-container">
+    <n-card>
+      <!-- 搜索表单 -->
+      <div class="search-form">
+        <n-form inline :model="searchForm" label-placement="left">
+          <n-form-item label="主键id">
+            <n-input v-model:value="searchForm.id" placeholder="请输入主键id" clearable />
+          </n-form-item>
+          <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-form>
+      </div>
+
+      <!-- 工具栏 -->
+      <div class="table-toolbar">
+        <n-space>
+          <n-button type="primary" @click="handleAdd">
+            <template #icon><n-icon><AddOutline /></n-icon></template>
+            新增
+          </n-button>
+          <n-button @click="importModalVisible = true">
+            <template #icon><n-icon><CloudUploadOutline /></n-icon></template>
+            导入
+          </n-button>
+          <n-button @click="handleExport">
+            <template #icon><n-icon><DownloadOutline /></n-icon></template>
+            导出{{ selectedIds.length > 0 ? `(${selectedIds.length})` : '' }}
+          </n-button>
+          <n-button type="error" :disabled="selectedIds.length === 0" @click="handleBatchDelete">
+            <template #icon><n-icon><TrashOutline /></n-icon></template>
+            删除
+          </n-button>
+        </n-space>
+      </div>
+
+      <!-- 表格 -->
+      <n-data-table
+        :columns="columns"
+        :data="tableData"
+        :loading="loading"
+        :pagination="pagination"
+        :row-key="(row) => row.id"
+        :scroll-x="1200"
+        @update:page="handlePageChange"
+        @update:page-size="handlePageSizeChange"
+        @update:checked-row-keys="handleCheck"
+      />
+    </n-card>
+
+    <!-- 新增/编辑弹窗 -->
+    <n-modal v-model:show="modalVisible" preset="card" :title="modalTitle" style="width: 600px">
+      <n-form ref="formRef" :model="formData" :rules="formRules" label-placement="left" label-width="100px">
+        <n-form-item label="质检编号" path="qcId">
+          <n-input v-model:value="formData.qcId" placeholder="请输入质检编号" />
+        </n-form-item>
+        <n-form-item label="让步接收数量" path="concessionQty">
+          <n-input v-model:value="formData.concessionQty" placeholder="请输入让步接收数量" />
+        </n-form-item>
+        <n-form-item label="申请原因" path="applyRemark">
+          <n-input v-model:value="formData.applyRemark" type="textarea" placeholder="请输入申请原因" />
+        </n-form-item>
+        <n-form-item label="申请内容" path="applyContent">
+          <n-input v-model:value="formData.applyContent" type="textarea" placeholder="请输入申请内容" />
+        </n-form-item>
+        <n-form-item label="申请人id(发去人id)" path="applyUserId">
+          <n-input v-model:value="formData.applyUserId" placeholder="请输入申请人id(发去人id)" />
+        </n-form-item>
+        <n-form-item label="部门id" path="deptId">
+          <n-input v-model:value="formData.deptId" placeholder="请输入部门id" />
+        </n-form-item>
+        <n-form-item label="钉钉单据id" path="instanceId">
+          <n-input v-model:value="formData.instanceId" placeholder="请输入钉钉单据id" />
+        </n-form-item>
+        <n-form-item label="审批状态	1待审批 2审批通过 3 审批驳回" path="approveStatus">
+          <n-select v-model:value="formData.approveStatus" placeholder="请选择审批状态	1待审批 2审批通过 3 审批驳回" :options="approveStatusOptions" />
+        </n-form-item>
+      </n-form>
+      <template #footer>
+        <n-space justify="end">
+          <n-button @click="modalVisible = false">取消</n-button>
+          <n-button type="primary" @click="handleSubmit">确定</n-button>
+        </n-space>
+      </template>
+    </n-modal>
+
+    <!-- 导入弹窗 -->
+    <n-modal v-model:show="importModalVisible" preset="card" title="导入让步接收申请表" style="width: 500px">
+      <n-space vertical>
+        <n-alert type="info">
+          <template #header>导入说明</template>
+          <ul style="margin: 0; padding-left: 16px; line-height: 1.8">
+            <li>请先下载导入模板，按模板格式填写数据</li>
+            <li>支持 .xlsx 或 .xls 格式</li>
+          </ul>
+        </n-alert>
+        <n-space>
+          <n-button type="primary" @click="handleDownloadTemplate">
+            <template #icon><n-icon><DownloadOutline /></n-icon></template>
+            下载模板
+          </n-button>
+        </n-space>
+        <n-upload :max="1" accept=".xlsx,.xls" :show-file-list="true" :custom-request="handleImportUpload">
+          <n-upload-dragger>
+            <div style="margin-bottom: 12px">
+              <n-icon size="48" :depth="3"><CloudUploadOutline /></n-icon>
+            </div>
+            <n-text style="font-size: 16px">点击或拖拽文件到此处上传</n-text>
+            <n-p depth="3" style="margin: 8px 0 0 0">支持 .xlsx 或 .xls 格式</n-p>
+          </n-upload-dragger>
+        </n-upload>
+      </n-space>
+      <template #footer>
+        <n-button @click="importModalVisible = false">关闭</n-button>
+      </template>
+    </n-modal>
+
+    <!-- 审批纪律弹窗 -->
+    <n-modal v-model:show="recordModalVisible" preset="card" title="审批记录" style="width: 800px">
+        <n-card bordered style="width:100%;max-width:800px;padding:24px;position:relative;">
+            <div class="header-bar" style="display:flex;justify-content:space-between;align-items:center;margin-bottom:16px;">
+              <span style="font-size:20sp;color:#666">审批编号: {{ detailModel?.businessId }}</span>
+              <div>
+                <n-icon style="font-size:22px;margin:0 6px;cursor:pointer" ><DownloadOutline /></n-icon>
+              </div>
+            </div>
+            <div style="padding:10px 0;">
+                <div style="font-size:30px;font-weight:500;margin-bottom:12px;">{{ detailModel?.title }}</div>
+                <div style="font-size:36sp;color:#777;margin-bottom:12px;">{{ detailModel?.deptName }}</div>
+                <div  :style="{fontSize:'30sp', color:getApproveResultColor(detailModel?.approveResult)}">{{ detailModel?.approveResult }}</div>
+            </div>
+            <div class="seal-wrap" style="position:absolute;right:40px;top:50%;transform:translateY(-50%);">
+              <div v-if="detailModel?.approveResult==='已通过'" class="seal" :class="{'pass-seal':detailModel?.approveResult==='已通过'}">已通过</div>
+              <div v-if="detailModel?.approveResult==='已驳回'" class="seal" :class="{'pass-seal_reject':detailModel?.approveResult==='已驳回'}">已驳回</div>
+              <div v-if="detailModel?.approveResult==='已撤销'" class="seal" :class="{'pass-seal_cancel':detailModel?.approveResult==='已撤销'}">已撤销</div>
+            </div>   
+        </n-card>
+        <n-card bordered style="width:100%;max-width:800px;padding:24px;margin-top: 10px;position:relative;">
+               <div style="padding:10px;">
+              <!-- 循环审批记录 -->
+              <div
+                v-for="(item,index) in detailModel?.approveRecord"
+                :key="index"
+                style="display:flex;gap:12px;position:relative;padding-bottom:24px;"
+              >
+                <!-- 左侧：圆点 + 竖连接线 -->
+                <div style="display:flex;flex-direction:column;align-items:center;">
+                  <!-- 圆点图标 -->
+                  <div style="width:20px;height:20px;border-radius:50%;background:#36d399;display:flex;align-items:center;justify-content:center;">
+                    <!-- 可替换CashIcon图标 -->
+                    <span style="color:#fff;font-size:12px;">$</span>
+                  </div>
+                  <!-- 中间竖线：最后一条去掉竖线 -->
+                  <div v-if="index !== detailModel.approveRecord.length -1" style="width:2px;flex:1;background:#d0d5dd;margin-top:4px;"></div>
+                </div>
+
+                <!-- 右侧：标题 + 时间 + 备注 -->
+                <div style="flex:1;">
+                  <!-- 用户名+操作结果 -->
+                  <div style="font-size:18px;margin-bottom:4px;">
+                    {{ item.username ?? '未知人员' }}
+                    <span :style="{
+                      color: item.operationResult === '已同意' ? '#00b42a' : item.operationResult === '已拒绝' ? '#f53f3f' : item.operationResult === '已撤销' ? '#ff7d00' : '#666',
+                      marginLeft:'8px'
+                    }">
+                      {{ item.operationResult }}
+                    </span>
+                  </div>
+                  <!-- 时间 -->
+                  <div style="color:#888;font-size:14px;margin-bottom:6px;">{{ item.date }}</div>
+                  <!-- 审批备注 -->
+                  <div v-if="item.remark" style="padding:6px 10px;background:#f7f8fa;border-radius:6px;color:#333;">
+                    {{ item.remark }}
+                  </div>
+                  <div v-if="item.attachments && item.attachments.length" style="display:flex;gap:8px;flex-wrap:wrap;margin-bottom:8px;">
+                      <!-- 图片类附件：png/jpg/jpeg/gif -->
+                    <div style="display:flex;gap:8px;flex-wrap:wrap;margin-bottom:8px;">
+                      <div
+                        v-for="file in item.attachments.filter(f=>['png','jpg','jpeg','gif'].includes(f.file_type.toLowerCase()))"
+                        :key="file.file_id"
+                        @click="previewImg(file)"
+                        style="width:80px;height:80px;border-radius:6px;overflow:hidden;border:1px solid #eee;cursor:pointer;"
+                      >
+                       
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              </div>
+        </n-card>
+    
+    </n-modal>
+
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, h, onMounted } from 'vue'
+import { NButton, NSpace, NIcon, NUpload, useMessage,NTag, useDialog, type DataTableColumns, type UploadCustomRequestOptions } from 'naive-ui'
+import { SearchOutline, RefreshOutline, AddOutline, TrashOutline, CreateOutline, CloudUploadOutline, DownloadOutline,DocumentTextOutline,
+    CashOutline as CashIcon 
+  } from '@vicons/ionicons5'
+import { concessionApplyApi, DetailModel, type ConcessionApply } from '@/api/concessionApply'
+import { dictDataApi } from '@/api/org'
+
+
+const message = useMessage()
+const dialog = useDialog()
+
+// 搜索表单
+const searchForm = reactive({
+  id:  null as number | null,
+})
+
+// 表格数据
+const tableData = ref<ConcessionApply[]>([])
+const loading = ref(false)
+const selectedIds = ref<number[]>([])
+const pagination = reactive({
+  page: 1,
+  pageSize: 10,
+  itemCount: 0,
+  showSizePicker: true,
+  pageSizes: [10, 20, 50]
+})
+
+// 弹窗
+const modalVisible = ref(false)
+const modalTitle = ref('')
+const importModalVisible = ref(false)
+const formRef = ref()
+const defaultFormData: ConcessionApply = {
+  qcId: undefined,
+  concessionQty: undefined,
+  applyRemark: '',
+  applyContent: '',
+  applyFile: '',
+  applyUserId: undefined,
+  deptId: undefined,
+  instanceId: '',
+  approveStatus: undefined,
+}
+const formData = reactive<ConcessionApply>({ ...defaultFormData })
+
+//审批记录弹窗
+const recordModalVisible = ref(false)
+
+const detailModel = ref<DetailModel>()
+
+// 字典选项（下拉框/单选框/复选框关联字典时使用）
+const approveStatusOptions = ref<{ label: string; value: any }[]>([])
+
+
+// 表单校验规则
+const formRules = {
+}
+
+// 表格列
+const columns: DataTableColumns<ConcessionApply> = [
+  { type: 'selection' },
+  { title: '物料编号', key: 'materialCode',align:"center",minWidth:"150"},
+  { title: '物料名称', key: 'materialName',align:"center",minWidth:"150"},
+  { title: '让步接收数量', key: 'concessionQty',align:"center",minWidth:"150" },
+  { title: '申请原因', key: 'applyRemark',align:"center",minWidth:"150" },
+  { title: '申请内容', key: 'applyContent',align:"center",minWidth:"200" },
+  { title: '申请附件', key: 'applyFile',align:"center",minWidth:"150" },
+  { title: '申请人', key: 'applyUserName',align:"center",minWidth:"150" },
+  { title: '部门名称', key: 'deptName',align:"center",minWidth:"150" },
+  // { title: '钉钉单据编号', key: 'instanceId',align:"center",minWidth:"150" },
+  { title: '审批完成时间', key: 'approveTime',align:"center",minWidth:"250" },
+  { title: '审批状态', key: 'approveStatus',align:"center",minWidth:"150" },
+  { title: '审批结果', key: 'approveResult',align:"center",minWidth:"150",
+    render(row:any){
+      console.log(row.approveResult);
+      
+      if(row.approveResult == '待审批') return h(NTag, { type: 'default', size: 'small' }, { default: () => row.approveResult })
+      if(row.approveResult == '已驳回') return h(NTag, { type: 'error', size: 'small' }, { default: () => row.approveResult })
+      if(row.approveResult == '已通过') return h(NTag, { type: 'success', size: 'small' }, { default: () => row.approveResult })
+      return row.approveResult
+    }
+   },
+  { title: '审批人', key: 'approveUserName',align:"center",minWidth:"150" }, 
+  { title: '创建时间', key: 'createTime', width: 180 },
+  { title: '更新时间', key: 'updateTime', width: 180 },
+  {
+    title: '操作',
+    key: 'actions',
+    width: 140,
+    fixed: 'right',
+    render(row) {
+      return h('div', { style: { display: 'flex', alignItems: 'center', gap: '8px', flexWrap: 'nowrap' } }, [
+        h(NButton, { size: 'small', quaternary: true, onClick: () => handleEdit(row) }, {
+          default: () => [h(NIcon, null, { default: () => h(CreateOutline) }), ' 编辑']
+        }),
+        h(NButton, { size: 'small', quaternary: true, type: 'error', onClick: () => handleDelete(row) }, {
+          default: () => [h(NIcon, null, { default: () => h(TrashOutline) }), ' 删除']
+        }),
+        h(NButton, { size: 'small', quaternary: true, type: 'warring', onClick: () => handleViewApproveRecord(row) }, {
+          default: () => [h(NIcon, null, { default: () => h(DocumentTextOutline) }), ' 审批记录']
+        })
+      ])
+    }
+  }
+]
+
+// 加载数据
+async function loadData() {
+  loading.value = true
+  try {
+    const res = await concessionApplyApi.page({
+      page: pagination.page,
+      pageSize: pagination.pageSize,
+      id: searchForm.id || undefined,
+    })
+    tableData.value = res.list
+    pagination.itemCount = res.total
+  } finally {
+    loading.value = false
+  }
+}
+
+// 搜索
+function handleSearch() {
+  pagination.page = 1
+  loadData()
+}
+
+// 重置
+function handleReset() {
+  searchForm.id =  null
+
+  handleSearch()
+}
+
+// 分页
+function handlePageChange(page: number) {
+  pagination.page = page
+  loadData()
+}
+
+function handlePageSizeChange(pageSize: number) {
+  pagination.pageSize = pageSize
+  pagination.page = 1
+  loadData()
+}
+
+// 选择
+function handleCheck(keys: Array<string | number>) {
+  selectedIds.value = keys as number[]
+}
+
+// 新增
+function handleAdd() {
+  modalTitle.value = '新增让步接收申请表'
+  Object.assign(formData, defaultFormData)
+  modalVisible.value = true
+}
+
+// 编辑
+function handleEdit(row: ConcessionApply) {
+  modalTitle.value = '编辑让步接收申请表'
+  Object.assign(formData, row)
+  if (formData.createTime && typeof formData.createTime === 'string') {
+    formData.createTime = new Date(formData.createTime.replace(' ', 'T')).getTime()
+  }
+  if (formData.updateTime && typeof formData.updateTime === 'string') {
+    formData.updateTime = new Date(formData.updateTime.replace(' ', 'T')).getTime()
+  }
+  modalVisible.value = true
+}
+
+// 提交
+async function handleSubmit() {
+  await formRef.value?.validate()
+  try {
+    const submitData = { ...formData } as ConcessionApply
+    if (typeof submitData.createTime === 'number') {
+      submitData.createTime = new Date(submitData.createTime).toISOString().slice(0, 19).replace('T', ' ')
+    }
+    if (typeof submitData.updateTime === 'number') {
+      submitData.updateTime = new Date(submitData.updateTime).toISOString().slice(0, 19).replace('T', ' ')
+    }
+    if (submitData.id) {
+      await concessionApplyApi.update(submitData)
+      message.success('修改成功')
+    } else {
+      await concessionApplyApi.create(submitData)
+      message.success('新增成功')
+    }
+    modalVisible.value = false
+    loadData()
+  } catch (error) {
+    // 错误已在拦截器处理
+  }
+}
+
+// 删除
+function handleDelete(row: ConcessionApply) {
+  dialog.warning({
+    title: '提示',
+    content: '确定要删除该记录吗？',
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: async () => {
+      try {
+        await concessionApplyApi.delete([row.id!])
+        message.success('删除成功')
+        loadData()
+      } catch (error) {
+        // 错误已在拦截器处理
+      }
+    }
+  })
+}
+
+//查看审批记录
+function handleViewApproveRecord(row:any) {
+
+  recordModalVisible.value = true
+
+  detailModel.value = {...row}
+  console.log(detailModel.value);
+  
+ 
+}
+
+// 批量删除
+function handleBatchDelete() {
+  dialog.warning({
+    title: '提示',
+    content: `确定要删除选中的 ${selectedIds.value.length} 条记录吗？`,
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: async () => {
+      try {
+        await concessionApplyApi.delete(selectedIds.value)
+        message.success('删除成功')
+        selectedIds.value = []
+        loadData()
+      } catch (error) {
+        // 错误已在拦截器处理
+      }
+    }
+  })
+}
+
+// 导出
+async function handleExport() {
+  try {
+    const params: Record<string, any> = {}
+    if (selectedIds.value.length > 0) params.ids = selectedIds.value
+    if (searchForm.id != null) params.id = searchForm.id
+    const blob = await concessionApplyApi.export(params)
+    const url = window.URL.createObjectURL(blob)
+    const link = document.createElement('a')
+    link.href = url
+    link.download = '让步接收申请表数据.xlsx'
+    link.click()
+    window.URL.revokeObjectURL(url)
+  } catch (error) {
+    // 错误已在拦截器处理
+  }
+}
+
+// 下载导入模板
+async function handleDownloadTemplate() {
+  try {
+    const blob = await concessionApplyApi.downloadTemplate()
+    const url = window.URL.createObjectURL(blob)
+    const link = document.createElement('a')
+    link.href = url
+    link.download = '让步接收申请表导入模板.xlsx'
+    link.click()
+    window.URL.revokeObjectURL(url)
+  } catch (error) {
+    // 错误已在拦截器处理
+  }
+}
+
+// 导入上传
+async function handleImportUpload({ file }: UploadCustomRequestOptions) {
+  if (!file.file) return
+  try {
+    const result = await concessionApplyApi.importData(file.file)
+    if (result.fail > 0) {
+      dialog.warning({
+        title: '导入结果',
+        content: `成功: ${result.success} 条，失败: ${result.fail} 条\n错误信息: ${(result.errors || []).join('\n') || '无'}`,
+        positiveText: '确定'
+      })
+    } else {
+      message.success(`导入成功，共 ${result.success} 条数据`)
+      importModalVisible.value = false
+    }
+    loadData()
+  } catch (error) {
+    // 错误已在拦截器处理
+  }
+}
+
+// 加载字典选项
+async function loadDictOptions() {
+  try {
+    const data = await dictDataApi.listByType('assets_state')
+    approveStatusOptions.value = data.map(d => ({ label: d.dictLabel, value: (Number(d.dictValue) || d.dictValue),class: d.listClass }))
+  } catch {}
+}
+
+const getTimelineType = (type) => {
+  console.log(type);
+  
+  const map = {
+    'START_PROCESS_INSTANCE': 'info', //发起-蓝色
+    'AGREE': 'success',//通过-绿色
+    'REFUSE': 'error',//驳回-红色
+    'TERMINATE_PROCESS_INSTANCE':'warning',//撤回-橙黄
+    'grey':'default', //兼容grey
+    'info':'default'
+  }
+  return map[type] || 'default'
+}
+const getTitleAttribute = (item) =>{
+    return item.username +"    "+item.operationResult
+}
+  
+
+function getApproveResultColor(status) {
+  switch(status){
+    case '已通过':
+      return "green"
+    case '已驳回':
+      return "red"  
+    case '已撤销':
+      return "gray"   
+  }
+}
+
+const getRemark=(item) =>{
+    console.log(item.remark);
+    
+}
+
+onMounted(() => {
+  loadData()
+  loadDictOptions()
+})
+</script>
+
+<style scoped>
+.search-form {
+  margin-bottom: 16px;
+}
+
+.table-toolbar {
+  margin-bottom: 16px;
+}
+.pass-seal{
+  width:150px;
+  height:150px;
+  border:4px solid #36c972;
+  border-radius:50%;
+  color:#36c972;
+  font-size:40px;
+  font-weight:bold;
+  display:flex;
+  align-items:center;
+  justify-content:center;
+  transform:rotate(25deg);
+}
+
+.pass-seal_reject{
+  width:150px;
+  height:150px;
+  border:4px solid #da0d0d;
+  border-radius:50%;
+  color: #da0d0d;
+  font-size:40px;
+  font-weight:bold;
+  display:flex;
+  align-items:center;
+  justify-content:center;
+  transform:rotate(25deg);
+}
+
+.pass-seal_cancel{
+  width:150px;
+  height:150px;
+  border:4px solid #3a3a3a;
+  border-radius:50%;
+  color:#3a3a3a;
+  font-size:40px;
+  font-weight:bold;
+  display:flex;
+  align-items:center;
+  justify-content:center;
+  transform:rotate(25deg);
+}
+</style>
\ No newline at end of file
diff --git a/src/views/biz/qualityTesting/index.vue b/src/views/biz/qualityTesting/index.vue
index 29a26ea..efb0b86 100644
--- a/src/views/biz/qualityTesting/index.vue
+++ b/src/views/biz/qualityTesting/index.vue
@@ -317,31 +317,34 @@
                       type="textarea"
                       placeholder="输入备注原因"
                   />
-              </n-form-item> 
-            <n-upload
-              multiple
-              directory-dnd
-              :max="5"
-              action=""
-              @change="handleUploadChange"
-              :file-list="fileList"
-              accept=".pdf,.doc,.docx"
-              :max-size="10*1024*1024"
-            >
-              <n-upload-dragger>
-                <div style="margin-bottom: 12px">
-                  <n-icon size="48" :depth="3">
-                    <ArchiveIcon />
-                  </n-icon>
-                </div>
-                <n-text style="font-size: 16px">
-                  点击或者拖动文件到该区域来上传
-                </n-text>
-                <n-p depth="3" style="margin: 8px 0 0 0">
-                  仅支持 PDF、DOC、DOCX，单文件最大10MB
-                </n-p>
-              </n-upload-dragger>
-            </n-upload>
+            </n-form-item> 
+            <n-form-item label="附件">
+                <n-upload
+                  multiple
+                  directory-dnd
+                  :max="5"
+                  :action="null"
+                  :custom-request="()=>{}" 
+                  @change="handleUploadChange"
+                  :file-list="fileList"
+                  accept=".pdf,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.bmp"
+                  :max-size="10*1024*1024"
+                >
+                    <n-upload-dragger>
+                      <div style="margin-bottom: 12px">
+                        <n-icon size="48" :depth="3">
+                          <ArchiveIcon />
+                        </n-icon>
+                      </div>
+                      <n-text style="font-size: 16px">
+                        点击或者拖动文件到该区域来上传
+                      </n-text>
+                      <n-p depth="3" style="margin: 8px 0 0 0">
+                       仅支持 PDF、DOC、DOCX、XLS、XLSX、JPG、PNG、GIF，单文件最大10MB
+                      </n-p>
+                    </n-upload-dragger>
+                  </n-upload>
+            </n-form-item>
 
            
           </n-form>
@@ -368,7 +371,7 @@ import {
 
 import {
   SearchOutline, RefreshOutline, AddOutline, TrashOutline, CreateOutline, CloudUploadOutline, DownloadOutline,
-  EllipsisHorizontalOutline, ArrowDownOutline, ArrowUpOutline
+  EllipsisHorizontalOutline, ArrowDownOutline, ArrowUpOutline,ArchiveOutline as ArchiveIcon
 } from '@vicons/ionicons5'
 import { qualityTestingApi, type QualityTesting } from '@/api/qualityTesting'
 import {assingReworkApi} from '@/api/assingRework'
@@ -376,6 +379,8 @@ import { dictDataApi } from '@/api/org'
 
 import {Language} from "@xterm/xterm/src/vs/base/common/platform.ts";
 
+import {fileApi} from '@/api/system1'
+
 import value = Language.value;
 import {QcResultDetail} from "@/api/qcResultDetail.ts";
 import router from "@/router";
@@ -986,8 +991,19 @@ function submitResultDetail(row) {
   formDetailConcessionData.qcId = row.id
 }
 
+
+
 async function handleSubmitResultDetail() {
-  const submitParam = [formDetailOKData,formDetailScrapData,formDetailReworkData,formDetailConcessionData]
+
+  formDetailConcessionData.files = uploadFiles.value
+
+  const submitParam = [
+      formDetailOKData,
+      formDetailScrapData,
+      formDetailReworkData,
+    formDetailConcessionData]
+  console.log(submitParam);
+  
   submitFlag.value? await qualityTestingApi.submit(submitParam) : await qualityTestingApi.submitBF(submitParam)
   
   message.success('提交成功')
@@ -1043,21 +1059,60 @@ function handleCancelQuality(row) {
 
 
 //上传附件
-const handleUploadChange = ({ file, fileList: list }: any) => {
-  uploadFiles.value = list.map(item => item.file)
+async function handleUploadChange  ({ file, fileList: list }: any)  {
+  // 允许的后缀白名单
+  const allowExt = ['pdf','doc','docx','xls','xlsx','jpg','jpeg','png','gif','bmp']
+  const invalidFiles:any[] = []
+
+  list.forEach(item=>{
+    const name = item.file.name.toLowerCase()
+    const ext = name.split('.').pop()
+    if(!allowExt.includes(ext)){
+      invalidFiles.push(item.file.name)
+      item.status = 'error'
+    }
+  })
+  if(invalidFiles.length){
+    window.$message.error(`【${invalidFiles.join('、')}】文件格式不支持`)
+  }
+
+
+
+  fileList.value = list
+  console.log('选中的文件列表', fileList.value)
+
+  // ✅关键：只筛选【pending等待上传】的文件，success/error/removed全部跳过，不再重复上传
+  const validList = list.filter(item => 
+    item.status === 'pending' && item.file && item.status !== 'error'
+  )
+
+  const successIds = list.filter(x=>x.status==='success' && x.file).map(x=>x.id)
+  // 只保留页面还存在的附件信息
+  uploadFiles.value = uploadFiles.value.filter(item=> successIds.includes(item.uid))
+
+  // 只上传pending新文件
+  const pendingList = list.filter(item => item.status === 'pending' && item.file && item.status !== 'error')
+  if(pendingList.length === 0) return
+
+  const uploadPromises = validList.map(async (item: any) => {
+    try {
+      const res = await fileApi.upload(item.file, null, null)
+      uploadFiles.value.push(res)
+      const targetFile = fileList.value.find(f => f.id === item.id)
+      if (targetFile) {
+        targetFile.status = 'success'
+        targetFile.percentage = 100
+      }
+    } catch (error) {
+      console.error('文件上传失败', error)
+      const targetFile = fileList.value.find(f => f.id === item.id)
+      if (targetFile) targetFile.status = 'error'
+    }
+  })
+  await Promise.all(uploadPromises)
 }
 
-// 表单保存时调用
-const submitUpload = async (billId: number) => {
-  if (!uploadFiles.value.length) return
-  const formData = new FormData()
-  formData.append('billId', String(billId))
-  uploadFiles.value.forEach(file => {
-    formData.append('files', file)
-  })
-  console.log(uploadFiles);
-  
-}
+
 
 onMounted(() => {
   loadData()
diff --git a/src/views/production/dispatchwork/index.vue b/src/views/production/dispatchwork/index.vue
index c922db7..21ba027 100644
--- a/src/views/production/dispatchwork/index.vue
+++ b/src/views/production/dispatchwork/index.vue
@@ -9,9 +9,9 @@
           label-placement="left"
         >
         <n-grid :cols="24" :x-gap="24">
-          <n-form-item-gi :span="6" label="工序编码">
+          <!-- <n-form-item-gi :span="6" label="工序编码">
             <n-input v-model:value="searchForm.processId" placeholder="请输入工序编号" clearable />
-          </n-form-item-gi>
+          </n-form-item-gi> -->
           <n-form-item-gi :span="6" label="工序名称">
             <n-input v-model:value="searchForm.processName" placeholder="请输入工序名称" clearable />
           </n-form-item-gi>
@@ -490,12 +490,6 @@ const columns = [
     key:"assingCode",
     minWidth:150
   },
-  {
-    align:'center', 
-    title: '工序编号', 
-    key: 'processId', 
-    minWidth: 150 
-  },
   { 
     align:'center',
     title: '工序名称', 
diff --git a/src/views/production/myassigtask/index.vue b/src/views/production/myassigtask/index.vue
index 15aa868..7d8985a 100644
--- a/src/views/production/myassigtask/index.vue
+++ b/src/views/production/myassigtask/index.vue
@@ -9,9 +9,9 @@
           label-placement="left"
         >
         <n-grid :cols="24" :x-gap="24">
-          <n-form-item-gi :span="6" label="工序编码">
+          <!-- <n-form-item-gi :span="6" label="工序编码">
             <n-input v-model:value="searchForm.processId" placeholder="请输入工序编号" clearable />
-          </n-form-item-gi>
+          </n-form-item-gi> -->
           <n-form-item-gi :span="6" label="工序名称">
             <n-input v-model:value="searchForm.processName" placeholder="请输入工序名称" clearable />
           </n-form-item-gi>
@@ -255,12 +255,6 @@ const columns = [
     key:"assingCode",
     minWidth:150
   },
-  {
-    align:'center', 
-    title: '工序编号', 
-    key: 'processId', 
-    minWidth: 150 
-  },
   { 
     align:'center',
     title: '工序名称',