From 9f03940cb0970a03bef0f8612f7a400961313df6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Apr 2024 13:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E9=AA=8C=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=8C=85=E8=A3=85=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/inspectionRequest/index.vue    |  6 +-
 .../inspectionRequest/inspectionMain.data.ts  | 89 ++++++++++++++++++-
 2 files changed, 91 insertions(+), 4 deletions(-)

diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspection/inspectionRequest/index.vue
index 81fd47181..8ddd8ba77 100644
--- a/src/views/qms/inspection/inspectionRequest/index.vue
+++ b/src/views/qms/inspection/inspectionRequest/index.vue
@@ -43,14 +43,14 @@
 
 <script setup lang="ts">
   import download from '@/utils/download'
-  import { InspectionMain, InspectionMainRules } from './inspectionMain.data'
+  import { InspectionMain, InspectionMainRules,InspectionRequestPackage } from './inspectionMain.data'
   import * as InspectionMainApi from '@/api/qms/inspectionRequest'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import listTable from '@/components/listTable/src/listTable.vue'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
   import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
   import Detail from '@/components/Detail/src/Detail.vue'
-  import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
+  // import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
 
   defineOptions({ name: 'InspectionMain' })
 
@@ -157,7 +157,7 @@ const listTableRef = ref()
       openForm('update', row)
     }else if (val == 'mainPackage') { // 包装
       const list = await InspectionMainApi.getInspectionRequestPackageList(row.id)
-      listTableRef.value.openPackage(row,'包装信息',InspectionJobPackage.allSchemas.tableColumns,list)
+      listTableRef.value.openPackage(row,'包装信息',InspectionRequestPackage.allSchemas.tableColumns,list)
     }
   }
 
diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
index c41ff6906..97c80ce99 100644
--- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
+++ b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
@@ -163,9 +163,27 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
   {
     label: '物料编码',
-    field: 'materialCode',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     isSearch: false,
     table: {
@@ -337,3 +355,72 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+/**
+ * @returns {Array} 检验申请包装
+ */
+export const InspectionRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '编码',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    },
+    table:{
+      width:150
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packageCode',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    },
+    table:{
+      width:150
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packageSpecificationCode',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    },
+    table:{
+      width:150
+    }
+  },
+  {
+    label: '数量',
+    field: 'amount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    tableForm:{
+      disabled:true
+    },
+    table:{
+      width:150
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'measuringUnit',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    },
+    table:{
+      width:150
+    }
+  },
+]))
\ No newline at end of file