From df99da0fd674750aed7e3b17de86ee25ac9f8c30 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Tue, 9 Apr 2024 17:39:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C=E7=B1=BB=E5=9E=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/basicDataManage/inspectionScheme/addForm.vue | 12 ++++++------
 .../qms/basicDataManage/inspectionScheme/index.vue   |  8 ++++----
 .../inspectionScheme/inspectionScheme.data.ts        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue b/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
index 076329a63..7f94f4f3f 100644
--- a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
@@ -52,7 +52,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="检验类型" prop="testTypeCode">
+              <el-form-item label="检验类型" prop="inspectionType">
                 <!-- <div style="display: flex; width: 100%">
                   <el-input v-model="data.testTypeName" disabled placeholder="请选择检验类型" />
                   <el-button
@@ -75,7 +75,7 @@
                     ><Icon icon="ep:search" />
                   </el-button>
                 </div> -->
-                <el-select v-model="data.testTypeCode" placeholder="请选择检验类型">
+                <el-select v-model="data.inspectionType" placeholder="请选择检验类型">
                   <el-option
                     v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_TYPE)"
                     :key="dict.value"
@@ -691,7 +691,7 @@ const data = ref({
   code: '',
   itemCode: '',
   version: '',
-  testTypeCode: '',
+  inspectionType:'',
   programmeTemplateCode: '',
   splitRule: '',
   aql: '',
@@ -717,7 +717,7 @@ if (props.basicFormWidth) {
 const rules = ref({
   itemCode: [{ required: true, message: '请选择物料', trigger: 'blur' }],
   version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
-  testTypeCode: [{ required: true, message: '请选择检验类型', trigger: ['blur', 'change'] }],
+  inspectionType: [{ required: true, message: '请选择检验类型', trigger: ['blur', 'change'] }],
   programmeTemplateCode: [
     { required: true, message: '请选择检验模板', trigger: ['blur', 'change'] }
   ],
@@ -811,7 +811,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       code: '',
       itemCode: '',
       version: '',
-      testTypeCode: '',
+      inspectionType: '',
       programmeTemplateCode: '',
       splitRule: '',
       aql: '',
@@ -1081,7 +1081,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
     data.value[formField] = val[0].code
     if (formField == 'itemCode') {
       data.value.itemName = val[0].name
-    } else if (formField == 'testTypeCode') {
+    } else if (formField == 'inspectionType') {
       data.value.testTypeName = val[0].description
     } else if (formField == 'programmeTemplateCode') {
       data.value.programmeTemplateName = val[0].description
diff --git a/src/views/qms/basicDataManage/inspectionScheme/index.vue b/src/views/qms/basicDataManage/inspectionScheme/index.vue
index 787d11d4f..13e7a84a7 100644
--- a/src/views/qms/basicDataManage/inspectionScheme/index.vue
+++ b/src/views/qms/basicDataManage/inspectionScheme/index.vue
@@ -159,7 +159,7 @@ const submitForm = async (formType,data) => {
     description: data.description,
     itemCode: data.itemCode,
     version: data.version,
-    testTypeCode: data.testTypeCode,
+    inspectionType: data.inspectionType,
     programmeTemplateCode: data.programmeTemplateCode,
     splitRule: data.splitRule,
     aql: data.aql,
@@ -170,10 +170,10 @@ const submitForm = async (formType,data) => {
     content:JSON.stringify(data.process)
   }
   if (formType === 'create') {
-    await InspectionSchemeApi.inspectionSchemeCreat(data1)
+    await InspectionSchemeApi.InspectionSchemeCreat(data1)
     message.success(t('common.createSuccess'))
   } else {
-    await InspectionSchemeApi.inspectionSchemeUpdate(data1)
+    await InspectionSchemeApi.InspectionSchemeUpdate(data1)
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
@@ -192,7 +192,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await InspectionSchemeApi.inspectionSchemeDelete(id)
+    await InspectionSchemeApi.InspectionSchemeDelete(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
diff --git a/src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts
index fff1c0e44..baed2b3a3 100644
--- a/src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts
+++ b/src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts
@@ -115,7 +115,7 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },{
     label: '检验类型编码',
-    field: 'testTypeCode',
+    field: 'inspectionType',
     dictType: DICT_TYPE.INSPECTION_TYPE,
     dictClass: 'string',
     sort: 'custom',

From 1f5e393d8bc804a44df137e75175bd5b93d0b8dd Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Apr 2024 17:49:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/inspection/inspectionJob/addForm.vue  |  11 +-
 .../qms/inspection/inspectionJob/index.vue    |  18 +-
 .../inspection/inspectionRecord/addForm.vue   | 309 ++++++++++++++++++
 .../qms/inspection/inspectionRecord/index.vue |  62 +++-
 .../inspectionRecordMain.data.ts              | 139 +++++++-
 5 files changed, 487 insertions(+), 52 deletions(-)
 create mode 100644 src/views/qms/inspection/inspectionRecord/addForm.vue

diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue
index d1217fd2b..fdef80d4c 100644
--- a/src/views/qms/inspection/inspectionJob/addForm.vue
+++ b/src/views/qms/inspection/inspectionJob/addForm.vue
@@ -26,7 +26,7 @@
             :maxHeight = "490"
             :tableFields="tableAllSchemas.tableFormColumns"
             :tableFormRules="tableFormRules"
-            :tableData="data.packageVOList"
+            :tableData="data.packageList"
             :isShowButton="false"
             :isShowReduceButton="false"
           />
@@ -312,7 +312,6 @@
                         </el-select>
                       </el-form-item>
                     </el-col>
-
                     <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1" >
                       <el-form-item label="缺陷级别" required>
                         <el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>
@@ -359,7 +358,6 @@
     <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
   </div>
 </template>
-
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getCurrentInstance } from 'vue'
@@ -538,7 +536,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     console.log(data.value)
     let list = []
     list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
-    data.value.packageVOList = await InspectionJobMainApi.getInspectionJobPackageList(row.id)
+    data.value.packageList = await InspectionJobMainApi.getInspectionJobPackageList(row.id)
     list.forEach((item, index) => {
       editableTabsValue.value = index + 1
       item.name = index + 1
@@ -617,7 +615,6 @@ import type { TabPaneName } from 'element-plus'
 
 const editableTabsValue = ref('1')
 // const editableTabs = ref([])
-
 const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => {
   if (action === 'add') {
     nameForm.value.name = ''
@@ -724,7 +721,7 @@ const submitForm = async () => {
     const validateForm1 = await tableFormRef.value.validateForm()
     if (!validateForm1) return
     let number = 0
-    data.value.packageVOList.forEach(cur=>{
+    data.value.packageList.forEach(cur=>{
       number += parseFloat(cur.sampleAmount)
     })
     if(number > data.value.sampleTotalAmount){
@@ -998,4 +995,4 @@ const changeQualitativeCode = (e, item, cur) => {
 .el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
   min-width: 120px !important;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue
index 509ad4f14..1bbaa59be 100644
--- a/src/views/qms/inspection/inspectionJob/index.vue
+++ b/src/views/qms/inspection/inspectionJob/index.vue
@@ -28,7 +28,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
     <AddForm
-    ref="basicFormRef"
+    ref="formRef"
     basicFormWidth="80"
     :formAllSchemasFeatures="InspectionTemplateFeatures.allSchemas"
     :formAllSchemasProcess="InspectionTemplateProcess.allSchemas"
@@ -165,7 +165,7 @@
       defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
     // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
       defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
-      defaultButtons.mainListPackageBtn({hide:isShowMainButton(row,['2'])}), // 包装
+      defaultButtons.mainListPackageBtn(null), // 包装
     ]
   }
 const listTableRef = ref()
@@ -183,11 +183,11 @@ const listTableRef = ref()
   }
 
   /** 添加/修改操作 */
-  const formRef = ref()
-  const openForm = async (type : string, row ?: number) => {
-    tableData.value = [] // 重置明细数据
-    formRef.value.open(type, row)
-  }
+  // const formRef = ref()
+  // const openForm = async (type : string, row ?: number) => {
+  //   tableData.value = [] // 重置明细数据
+  //   formRef.value.open(type, row)
+  // }
 
   /** 详情操作 */
   const detailRef = ref()
@@ -196,9 +196,9 @@ const listTableRef = ref()
   }
   //执行
   
-  const basicFormRef = ref()
+  const formRef = ref()
   const execute = async (type : string, row ?: number) => {
-    basicFormRef.value.open(type, row)
+    formRef.value.open(type, row)
   }
   /** 删除按钮操作 */
   const handleDelete = async (id : number) => {
diff --git a/src/views/qms/inspection/inspectionRecord/addForm.vue b/src/views/qms/inspection/inspectionRecord/addForm.vue
new file mode 100644
index 000000000..3a30687dd
--- /dev/null
+++ b/src/views/qms/inspection/inspectionRecord/addForm.vue
@@ -0,0 +1,309 @@
+<template>
+  <div>
+    <Dialog
+      :title="dialogTitle"
+      v-model="dialogVisible"
+      :width="dialogWidth"
+      :close-on-click-modal="false"
+      :vLoading="formLoading"
+    >
+      <div style="max-height: 80vh; overflow-y: auto; padding: 0px 20px">
+        <Form
+          ref="formMainRef"
+          :rules="rules"
+          :schema="formSchema"
+          :is-col="true"
+          @onChange="onChange"
+        />
+        <div class="small-title">包装列表</div>
+        <div style="border:1px solid #dedede;margin-bottom:20px;display: flex;">
+          <TableForm
+            ref="tableFormRef"
+            style="width:100%;"
+            :maxHeight = "490"
+            :tableFields="tableSchemas.tableFormColumns"
+            :tableFormRules="tableFormRules"
+            :tableData="data.packageList"
+            :isShowButton="false"
+            :isShowReduceButton="false"
+          />
+        </div>
+      </div>
+      <template #footer>
+        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+      </template>
+    </Dialog>
+    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getCurrentInstance } from 'vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
+import { SearchTable } from '@/components/SearchTable'
+import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
+// import { InspectionTemplateMain } from '@/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data'
+// import * as InspectionTemplateApi from '@/api/qms/inspectionTemplate'
+// import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+// import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程
+import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法
+import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法
+import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
+import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则
+import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
+import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集
+import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
+
+const { proxy } = getCurrentInstance()
+
+const message = useMessage() // 消息弹窗
+
+const props = defineProps({
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
+  // 底部按钮集合
+  footButttondata: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 表单，列表 相关信息
+  formAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 校验rules
+  rules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 包装 列表 相关信息
+  tableAllSchemas: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  tableFormRules: {
+    type: Array,
+    required: true,
+    default: null
+  },
+})
+const { t } = useI18n() // 国际化
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const dialogWidth = ref()
+const formSchema = ref(props.formAllSchemas?.formSchema)
+const tableSchemas = ref(props.tableAllSchemas)
+const tableFormRules = ref(props.tableFormRules)
+const formMainRef = ref()
+
+const data = ref({
+  code: '',
+  itemCode: '',
+  version: '',
+  testTypeCode: '',
+  programmeTemplateCode: '',
+  splitRule: '',
+  aql: '',
+  inspectionLevel: '',
+  effectiveDate: '',
+  expirationDate: '',
+  available: 'TRUE',
+  subList: []
+})
+
+const dialogVisibleName = ref(false)
+const nameForm = ref({
+  name: ''
+})
+const nameRef = ref()
+if (props.basicFormWidth) {
+  dialogWidth.value = props.basicFormWidth + '%'
+} else {
+  dialogWidth.value = props.isBusiness ? '60%' : '40%'
+}
+
+/** 打开弹窗 */
+const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
+  if (titleName) {
+    dialogTitle.value = t('action.' + titleName)
+  } else {
+    dialogTitle.value = t('action.' + type)
+  }
+  formType.value = type
+  if (row) {
+    data.value = JSON.parse(JSON.stringify(row))
+    data.value.packageList = await InspectionJobMainApi.getInspectionJobPackageList(row.id)
+    data.value.packageList.forEach(item=>{
+      item.qualifiedAmount =0
+      item.noQualifiedAmount =0
+      item.destroyAmount =0
+      item.frozenAmount =0
+    })
+    dialogVisible.value = true
+    tableSchemas.value.tableFormColumns.map(item=>{
+      item.tableForm.disabled = true
+    })
+    // 全部合格时合格数量==数量
+    if(row.useDecision == 1){
+      data.value.packageList.forEach(item=>{
+        item.qualifiedAmount = item.amount
+      })
+    }
+    // 全不合格只能输入不合格数量
+    else if(row.useDecision  == 2 || row.useDecision  == 6){
+      tableSchemas.value.tableFormColumns.map(item=>{
+        if(item.field == 'qualifiedAmount' ||item.field == 'noQualifiedAmount'){
+          item.tableForm.disabled = false
+        }else{
+          item.tableForm.disabled = true
+        }
+      })
+    }
+    // 全不合格只能输入不合格数量
+    else if(row.useDecision  == 3){
+      data.value.packageList.forEach(item=>{
+        item.noQualifiedAmount = item.amount
+      })
+    }
+    else if(row.useDecision  == 4){
+      data.value.packageList.forEach(item=>{
+        item.frozenAmount = item.amount
+      })
+    }
+    nextTick(() => {
+      formMainRef.value.setValues(row)
+    })
+  } 
+  dialogVisible.value = true
+}
+defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
+
+// console.log(11,tableAllSchemas.value.tableFormColumns)
+// 传递给父类
+const emit = defineEmits([
+  'onChange',
+  'submitForm'
+])
+/** 弹窗按钮 */
+let Butttondata: any = []
+if (props.footButttondata) {
+  Butttondata = props.footButttondata
+} else {
+  Butttondata = [
+    defaultButtons.formSaveBtn(null), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+}
+const onChange = (field, cur)=>{
+  if(field=='useDecision'){
+    tableSchemas.value.tableFormColumns.map(item=>{
+      item.tableForm.disabled = true
+    })
+    data.value.packageList.forEach(item=>{
+        item.qualifiedAmount =0
+        item.noQualifiedAmount =0
+        item.destroyAmount =0
+        item.frozenAmount =0
+      })
+    // 全部合格时合格数量==数量
+    if(cur == 1){
+      data.value.packageList.forEach(item=>{
+        item.qualifiedAmount = item.amount
+      })
+    }
+    // 全不合格只能输入不合格数量
+    else if(cur == 2 || cur == 6){
+      tableSchemas.value.tableFormColumns.map(item=>{
+        if(item.field == 'qualifiedAmount' ||item.field == 'noQualifiedAmount'){
+          item.tableForm.disabled = false
+        }else{
+          item.tableForm.disabled = true
+        }
+      })
+    }
+    // 全不合格只能输入不合格数量
+    else if(cur == 3){
+      data.value.packageList.forEach(item=>{
+        item.noQualifiedAmount = item.amount
+      })
+    }
+    else if(cur == 4){
+      data.value.packageList.forEach(item=>{
+        item.frozenAmount = item.amount
+      })
+    }
+  }
+}
+const buttonBaseClick = (val) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+const tableFormRef = ref()
+const submitForm = async () => {
+  try {
+    const elForm = unref(formMainRef)?.getElFormRef()
+    // 校验表单
+    if (!elForm) return
+    const valid = await elForm.validate()
+    if (!valid) return
+    // 校验包装列表
+    const validateForm1 = await tableFormRef.value.validateForm()
+    if (!validateForm1) return
+      const data1 = unref(formMainRef)?.formModel
+      console.log(33,data1)
+    if(data1.useDecision == 2 || data1.useDecision == 6){
+      let isBol = data.value.packageList.filter(cur=>parseFloat(cur.qualifiedAmount)+parseFloat(cur.noQualifiedAmount)>parseFloat(cur.amount))
+      console.log(isBol)
+    if(isBol&&isBol.length>0){
+      message.error(`合格数量和不合格数量总和不可以大于数量`)
+      return
+    }
+    }
+    if (formType.value == 'create') {
+      // 主子表——提交请求
+      emit('submitForm', formType.value, data.value)
+    } else {
+      // 编辑/执行
+      emit('submitForm', formType.value, data.value)
+    }
+  } catch {
+    console.log(111)
+  }
+}
+</script>
+<style scoped>
+.small-title {
+  font-weight: bold;
+  padding: 0px 10px 10px;
+  color: #1a8bfc;
+  font-size: 16px;
+}
+</style>
+<style>
+.el-tabs--left .el-tabs__header.is-left {
+  min-height: 700px !important;
+  min-width: 150px !important;
+}
+.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
+  min-width: 120px !important;
+}
+</style>
diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspection/inspectionRecord/index.vue
index 7d7cacf9c..3bf88f430 100644
--- a/src/views/qms/inspection/inspectionRecord/index.vue
+++ b/src/views/qms/inspection/inspectionRecord/index.vue
@@ -27,21 +27,30 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="InspectionRecordMainRules"
-    :formAllSchemas="InspectionRecordMain.allSchemas" :tableAllSchemas="InspectionRecordDetail.allSchemas"
-    :tableFormRules="InspectionRecordDetailRules" :tableData="tableData"
+  <!-- <BasicForm ref="formRef" 
+    @success="getList" 
+    :rules="InspectionRecordMainRules"
+    :formAllSchemas="InspectionRecordMain.allSchemas"
+    :tableData="tableData"
+    :tableAllSchemas="InspectionJobPackage.allSchemas"
+    :tableFormRules="InspectionJobPackageRules"
     :apiUpdate="InspectionRecordMainApi.updateInspectionRecordMain"
-    :apiCreate="InspectionRecordMainApi.createInspectionRecordMain" :isBusiness="true" @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
+    :apiCreate="InspectionRecordMainApi.createInspectionRecordMain"
 
-  <!-- 详情 -->
-  <!-- <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectionRecordMain.allSchemas"
-    :detailAllSchemas="InspectionRecordDetail.allSchemas" :detailAllSchemasRules="InspectionRecordDetailRules"
-    :apiCreate="InspectionRecordDetailApi.createInspectionRecordDetail"
-    :apiUpdate="InspectionRecordDetailApi.updateInspectionRecordDetail"
-    :apiPage="InspectionRecordDetailApi.getInspectionRecordDetailPage"
-    :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail" :isShowAddBtn="false" :detailButtonIsShow="true" /> -->
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm" /> -->
+    <AddForm
+    ref="formRef"
+    basicFormWidth="80"
+    :tableAllSchemas="InspectionRecordPackage.allSchemas"
+    :tableFormRules="InspectionRecordPackageRules"
+    :rules="InspectionRecordMainRules"
+    :formAllSchemas="InspectionRecordMain.allSchemas"
+    @submitForm="submitForm"
+    @onChange='onChange'
+  />
    <Detail
     ref="detailRef" :isBasic="false" :allSchemas="InspectionRecordMain.allSchemas"
     :detailAllSchemas="InspectionRecordDetail.allSchemas" :detailAllSchemasRules="InspectionRecordDetailRules"
@@ -57,13 +66,14 @@
 
 <script setup lang="ts">
   import download from '@/utils/download'
-  import { InspectionRecordMain, InspectionRecordMainRules, InspectionRecordDetail, InspectionRecordDetailRules } from './inspectionRecordMain.data'
-  import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
+  import { InspectionRecordMain, InspectionRecordMainRules, InspectionRecordDetail, InspectionRecordDetailRules,InspectionRecordPackage, InspectionRecordPackageRules} from './inspectionRecordMain.data'
+  // import { InspectionJobPackage,InspectionJobPackageRules} from '../inspectionJob/inspectionJobMain.data'
   import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
   import * as InspectionRecordDetailApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import listTable from '@/components/listTable/src/listTable.vue'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import AddForm from './addForm.vue'
   import Detail from './detail.vue'
 
   // 采购订单
@@ -173,6 +183,7 @@
       defaultButtons.mainListEditBtn(null), // 编辑
       // defaultButtons.mainListDeleteBtn(null), // 删除
       defaultButtons.mainListOrderPubBtn(null), // 发布
+      defaultButtons.mainListPackageBtn(null), // 包装
     ]
   }
 
@@ -197,7 +208,7 @@
       openForm('update', row)
     }else if (val == 'mainPackage') { // 包装
       const list = await InspectionRecordMainApi.getInspectionRecordPackageList(row.id)
-      listTableRef.value.openPackage(row,'包装信息',InspectionJobPackage.allSchemas.tableColumns,list)
+      listTableRef.value.openPackage(row,'包装信息',InspectionRecordPackage.allSchemas.tableColumns,list)
     }else if (val == 'delete') { // 删除
       handleDelete(row.id)
     }else if (val == 'mainOrderPub') { //发布
@@ -278,8 +289,23 @@
   const handleDeleteTable = (item, index) => {
     tableData.value.splice(index, 1)
   }
-
-  // 主子数据 提交
+  const count = ref(0)
+  const onChange = (field, cur)=>{
+    console.log(field, cur)
+  // if(field=='useDecision'){
+  //   if(cur == 1){
+  //    InspectionRecordPackage.allSchemas.tableFormColumns.forEach(item=>{
+  //       if(item.field == 'qualifiedAmount'){
+  // console.log(item.disabled)
+  //         item.disabled = true
+  // console.log(item.disabled)
+  //       }
+  //     })
+  //   }
+  // }
+    console.log(InspectionRecordPackage.allSchemas.tableFormColumns)
+}
+//   // 主子数据 提交
   const submitForm = async (formType, data) => {
     data.subList = tableData.value // 拼接子表数据参数
     try {
diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
index 0264c6085..c927a4210 100644
--- a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
@@ -2,6 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter2 } from '@/utils/formatTime'
 import { validateHanset, validateEmail } from '@/utils/validator'
 import { dateFormatter } from '@/utils/formatTime'
+import {validateTwoNum } from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
 /**
@@ -398,25 +399,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const InspectionRecordMainRules = reactive({
-  number: [required],
-  applicationCode: [required],
-  taskCode: [required],
-  supplierCode: [required],
-  materialCode: [required],
-  batch: [required],
-  inspectionSchemeCode: [required],
-  inspectionBatch: [required],
-  inspectionBatchAmount: [required],
-  sampleTatalAmount: [required],
-  inspectionType: [required],
-  inspectionBatchSource: [required],
-  orderCode: [required],
-  orderRow: [required],
-  inspectionStage: [required],
-  inspectionStringency: [required],
   useDecision: [required],
-  inspectionLevel: [required],
-  available: [required],
 
 })
 
@@ -569,3 +552,123 @@ export const InspectionRecordDetailRules = reactive({
   isDestroyInspection: [required],
   available: [required],
 })
+
+/**
+ * @returns {Array} 检验记录包装
+ */
+export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '编码',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packageCode',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packageSpecificationCode',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '数量',
+    field: 'amount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'measuringUnit',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '采样数量',
+    field: 'sampleAmount',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '合格数量',
+    field: 'qualifiedAmount',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '不合格数量',
+    field: 'noQualifiedAmount',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '破坏数量',
+    field: 'destroyAmount',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '冻结数量',
+    field: 'frozenAmount',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      disabled:true
+    }
+  }
+]))
+
+//表单校验
+export const InspectionRecordPackageRules = reactive({
+  qualifiedAmount: [
+    required,
+    { validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}
+  ],
+  frozenAmount: [
+    required,
+    { validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}
+  ],
+  destroyAmount: [
+    required,
+    { validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}
+  ],
+  noQualifiedAmount: [
+    required,
+    { validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}
+  ],
+})
\ No newline at end of file