diff --git a/src/api/qms/inspectionQ3/index.ts b/src/api/qms/inspectionQ3/index.ts
deleted file mode 100644
index a8e1d81b2..000000000
--- a/src/api/qms/inspectionQ3/index.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import request from '@/config/axios'
-
-export interface Q3VO {
-  id: number
-  number: string
-  q1Number: string
-  itemCode: string
-  qty: number
-  code: string
-  uom: string
-  desc: string
-  defectLocation: string
-  defectType: string
-  problemReason: string
-  priority: number
-  responUser: string
-  amount: number
-  costCode: string
-  handleTime: Date
-  status: string
-  available: string
-  deletionTime: Date
-  deleterId: string
-  extraProperties: string
-  concurrencyStamp: number
-  siteId: string
-}
-
-// 查询Q3通知单列表
-export const getQ3Page = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = { ...params }
-    return await request.post({ url: '/qms/inspectionQ3/senior', data })
-  } else {
-    return await request.get({ url: `/qms/inspectionQ3/page`, params })
-  }
-}
-
-// 查询Q3通知单详情
-export const getQ3 = async (id: number) => {
-  return await request.get({ url: `/qms/inspectionQ3/get?id=` + id })
-}
-
-// 新增Q3通知单
-export const createQ3 = async (data: Q3VO) => {
-  return await request.post({ url: `/qms/inspectionQ3/create`, data })
-}
-
-// 修改Q3通知单
-export const updateQ3 = async (data: Q3VO) => {
-  return await request.put({ url: `/qms/inspectionQ3/update`, data })
-}
-
-// 删除Q3通知单
-export const deleteQ3 = async (id: number) => {
-  return await request.delete({ url: `/qms/inspectionQ3/delete?id=` + id })
-}
-
-// 导出Q3通知单 Excel
-export const exportQ3 = async (params) => {
-  return await request.download({ url: `/qms/inspectionQ3/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/qms/inspectionQ3/get-import-template' })
-}
-
-// 完成
-export const finishQ3 = async (id: number) => {
-  return await request.get({ url: `/qms/inspectionQ3/finish?id=` + id })
-}
diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue
index abd156ce2..d49ba7e99 100644
--- a/src/views/qms/inspectionQ3/index.vue
+++ b/src/views/qms/inspectionQ3/index.vue
@@ -1,26 +1,23 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search
-      :schema="Q3.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
+    <Search :schema="[...InspectionQ3Main.allSchemas.searchSchema,...InspectionQ3Detail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="Q3.allSchemas"
-  />
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InspectionQ3Main.allSchemas"
+      :detailAllSchemas="InspectionQ3Detail.allSchemas"
+    />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -31,61 +28,80 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #number="{ row }">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase
-          :Butttondata="butttondata(row)"
-          @button-base-click="buttonTableClick($event, row)"
-        />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
-    :rules="Q3Rules"
-    :formAllSchemas="Q3.allSchemas"
-    :apiUpdate="Q3Api.updateQ3"
-    :apiCreate="Q3Api.createQ3"
+    ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
+    @success="getList"
+    :rules="InspectionQ3MainRules"
+    :formAllSchemas="InspectionQ3Main.allSchemas"
+    :tableAllSchemas="InspectionQ3Detail.allSchemas"
+    :tableFormRules="InspectionQ3DetailRules"
+    :tableData="tableData"
+    :apiUpdate="InspectionQ3MainApi.updateInspectionQ3Main"
+    :apiCreate="InspectionQ3MainApi.createInspectionQ3Main"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
+    @submitForm="submitForm"
     @onChange="onChange"
-  />
+    @clearSearchInput="onChange"
+    :sumFormDataByTableCustom ="(formRef,formModel,tableData)=>{
+      tableData.forEach(item=>{
+        item.qty = item.countQty*item.packQty
+      })
+    }"
+  >
+  <!-- <template #default="{row}">
+    <el-input-number disabled v-model="row.qty"></el-input-number>
+  </template> -->
+  </BasicForm>
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Q3.allSchemas" />
-
-  <!-- 导入 -->
-  <ImportForm
-    ref="importFormRef"
-    url="/basic/Q3/import"
-    :importTemplateData="importTemplateData"
-    @success="importSuccess"
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InspectionQ3Main.allSchemas"
+    :detailAllSchemas="InspectionQ3Detail.allSchemas"
+    :detailAllSchemasRules="InspectionQ3DetailRules"
+    :apiCreate="InspectionQ3DetailApi.createInspectionQ3Detail"
+    :apiUpdate="InspectionQ3DetailApi.updateInspectionQ3Detail"
+    :apiPage="InspectionQ3DetailApi.getInspectionQ3DetailPage"
+    :apiDelete="InspectionQ3DetailApi.deleteInspectionQ3Detail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate"
   />
+
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Q3, Q3Rules } from './inspectionQ3.data'
-import * as Q3Api from '@/api/qms/inspectionQ3'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { InspectionQ3Main,InspectionQ3MainRules,InspectionQ3Detail,InspectionQ3DetailRules } from './inspectionQ3.data'
+import * as InspectionQ3MainApi from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import * as InspectionQ3DetailApi from '@/api/qms/inspectionQ3/inspectionQ3Detail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-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 * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import { formatDate } from '@/utils/formatTime'
 
-import { useUserStore } from '@/store/modules/user'
-const userStore = useUserStore()
-
-defineOptions({ name: 'InspectionQ3' })
+// 发料申请
+defineOptions({ name: 'InspectionQ3Main' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -93,48 +109,70 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(Q3.allSchemas.tableColumns)
+const tableColumns = ref([...InspectionQ3Main.allSchemas.tableColumns,...InspectionQ3Detail.allSchemas.tableMainColumns])
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
 
 // 查询页面返回
 const priceObj = ref()
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(async () => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async() => {
     const setV = {}
-    if (formField == 'itemCode') {
-      console.log(val)
-      setV['uom'] = val[0]['uom']
-      console.log(formRef.formModel.qty)
-      // let res = await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code)
-      ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code).then((res) => {
-        console.log(res)
-        if (res?.length > 0) {
-          formRef.formModel.defectLocation = res[0].productionLineCode
-          Q3.allSchemas.formSchema.forEach(item=>{
-            if (item.field == 'defectLocation') {
-              item.componentProps.options = res
-            }
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if (formField == 'itemCode') {
+          val.forEach(item=>{
+          let tableForm = JSON.parse(JSON.stringify(tableFormKeys))
+          if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
+          const newRow = JSON.parse(JSON.stringify({...tableForm,...item}))
+          newRow['itemCode'] = item['code']
+          newRow['uom'] = item['uom']
+          tableData.value.push(newRow)
           })
-        }
-      })
-      const params = {
-        by: "ASC",
-        filters: [{column: "itemCode", action: "==", value: val[0].code}],
-        pageNo: 1,
-        pageSize: 500,
-        sort: ""
+
+        
+
+
+      // row['uom'] = val[0]['uom']
+      // console.log(formRef.formModel.qty)
+      // // let res = await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code)
+      //   ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code).then((res) => {
+      //   console.log(res)
+      //   if (res?.length > 0) {
+      //     formRef.formModel.defectLocation = res[0].productionLineCode
+      //      InspectionQ3Detail.allSchemas.formSchema.forEach(item=>{
+      //       if (item.field == 'defectLocation') {
+      //         item.componentProps.options = res
+      //       }
+      //     })
+      //   }
+      // })
+      // const params = {
+      //   by: "ASC",
+      //   filters: [{column: "itemCode", action: "==", value: val[0].code}],
+      //   pageNo: 1,
+      //   pageSize: 500,
+      //   sort: ""
+      // }
+      // params.isSearch = true
+      // StdcostpriceApi.getStdcostpricePage(params).then((res) => {
+      //   if (res.list?.length > 0) {
+      //     priceObj.value = res.list[0]
+      //     formRef.setValues({
+      //       amount: (parseFloat(formRef.formModel.qty) * parseFloat(priceObj.value.price)).toFixed(6)
+      //     })
+      //   }
+        
+      // })
       }
-      params.isSearch = true
-      StdcostpriceApi.getStdcostpricePage(params).then((res) => {
-        if (res.list?.length > 0) {
-          priceObj.value = res.list[0]
-          formRef.setValues({
-            amount: (parseFloat(formRef.formModel.qty) * parseFloat(priceObj.value.price)).toFixed(6)
-          })
+    if (formField == 'costCode') {
+          console.log(11111)
+          row['costCode'] = val[0]['costcentreCode']
         }
-        
-      })
-    }
-    if (formField == 'q1Number') {
+       if (formField == 'q1Number') {
       //Q1通知单号
       let list = []
       val.forEach((item) => {
@@ -142,7 +180,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
       })
       setV[formField] = list.join(',')
       formRef.setValues(setV)
+    }
     } else {
+      const setV = {}
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
@@ -150,17 +190,25 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
 }
 const onChange =(field,e)=>{
   if (field == 'qty') {
-          basicFormRef.value.formRef.formModel.amount = (parseFloat( basicFormRef.value.formRef.formModel.qty) * parseFloat( priceObj.value.price)).toFixed(6)
+          formRef.value.formRef.formModel.amount = (parseFloat( formRef.value.formRef.formModel.qty) * parseFloat( priceObj.value.price)).toFixed(6)
 }
 }
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if (formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: Q3Api.getQ3Page // 分页接口
+  getListApi: InspectionQ3DetailApi.getInspectionQ3DetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -168,44 +216,28 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({ hasPermi: 'qms:Q3:create' }), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi: 'qms:Q3:import' }), // 导入
-  defaultButtons.defaultExportBtn({ hasPermi: 'qms:Q3:export' }), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:inspection-Q3-main:create'}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:'qms:inspection-Q3-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null) // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
+  defaultButtons.defaultSetBtn(null), // 设置
 ]
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') {
-    // 新增
+  if (val == 'add') { // 新增
     openForm('create')
-  } else if (val == 'import') {
-    // 导入
-    handleImport()
-  } else if (val == 'export') {
-    // 导出
+  } else if (val == 'export') { // 导出
     handleExport()
-  } else if (val == 'refresh') {
-    // 刷新
-    getList()
-  } else if (val == 'filtrate') {
-    // 筛选
-  } else {
-    // 其他按钮
+  } else if (val == 'refresh') { // 刷新
+      getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
+// 根据状态返回该按钮是否显示
 const isShowMainButton = (row, val) => {
   if (val.indexOf(row.status) > -1) {
     return false
@@ -215,40 +247,46 @@ const isShowMainButton = (row, val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
-  return [
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
     defaultButtons.mainListEditBtn({
       hide: isShowMainButton(row, ['0']),
-      hasPermi: 'qms:Q3:update'
+      hasPermi: 'qms:inspection-Q3-main:update'
     }), // 编辑
     defaultButtons.mainListDeleteBtn({
       hide: isShowMainButton(row, ['0']),
-      hasPermi: 'qms:Q3:delete'
+      hasPermi: 'qms:inspection-Q3-main:delete'
     }), // 删除
     defaultButtons.mainListFinishBtn({
       hide: isShowMainButton(row, ['0']),
-      hasPermi: 'qms:Q3:finish'
+      hasPermi: 'qms:inspection-Q3-main:finish'
     }) // 完成
   ]
 }
 
+
+
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
+   if (val == 'edit') {
     // 编辑
     openForm('update', row)
   } else if (val == 'delete') {
     // 删除
     handleDelete(row.id)
   } else if (val == 'finish') {
-    // 删除
+    // 完成
     handleFinish(row.id)
   }
 }
 
 const handleFinish = async (id: number) => {
   try {
-    await Q3Api.finishQ3(id)
+    await InspectionQ3MainApi.finishInspectionQ3Main(id)
     message.success(t('common.updateSuccess'))
     // 刷新列表
     await getList()
@@ -256,63 +294,38 @@ const handleFinish = async (id: number) => {
 }
 
 /** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-  if (type == 'create') {
-    nextTick(() => {
-      basicFormRef.value.formRef.setValues({
-        handleTime: new Date().getTime(),
-        priority: '3'
-      })
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    InspectionQ3Main.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    InspectionQ3Main.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
     })
   }
+  formRef.value.open(type, row)
 }
 
-// form表单提交
-const formsSuccess = async (formType, data) => {
-  data.responUser = userStore.getUser.id
-  var isHave = Q3.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime'
-  })
-  if (isHave) {
-    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
-      message.error('失效时间要大于生效时间')
-      return
-    }
-  }
-  if (data.qty == 0) {
-    message.error('数量不能为0')
-    return
-  }
-  if (data.amount == 0) {
-    message.error('金额不能为0')
-    return
-  }
-  if (data.activeTime == 0) data.activeTime = null
-  if (data.expireTime == 0) data.expireTime = null
-
-  try {
-    basicFormRef.value.formLoading = true
-    if (formType === 'create') {
-      await Q3Api.createQ3(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await Q3Api.updateQ3(data)
-      message.success(t('common.updateSuccess'))
-    }
-    basicFormRef.value.dialogVisible = false
-    basicFormRef.value.formLoading = false
-    getList()
-  } finally {
-    basicFormRef.value.formLoading = false
-  }
-}
-
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicQ3')
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"requestIssueMain")
 }
 
 /** 删除按钮操作 */
@@ -320,11 +333,13 @@ const handleDelete = async (id: number) => {
   try {
     // 删除的二次确认
     await message.delConfirm()
+    tableObject.loading = true
     // 发起删除
-    await Q3Api.deleteQ3(id)
+    await InspectionQ3MainApi.deleteInspectionQ3Main(id)
+    tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -336,25 +351,112 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const excelTitle = ref(route.meta.title)
-    const data = await Q3Api.exportQ3(tableObject.params)
-    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    const data = await InspectionQ3MainApi.exportInspectionQ3Main(tableObject.params)
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
   }
 }
 
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+InspectionQ3Detail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  // 添加明细 已有数据 添加的明细 生产线 工位按照之前数据进行添加
+  let tableForm = JSON.parse(JSON.stringify(tableFormKeys))
+  if (tableData.value.length > 0) {
+    // tableForm.productionLineCode = tableData.value[0].productionLineCode
+    // tableForm.workStationCode = tableData.value[0].workStationCode
+  }
+  tableData.value.push(tableForm)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
+}
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  data.subList = tableData.value // 拼接子表数据参数
+  if(tableData.value.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  // 判断子表中，是否有不同的生产线和工位
+  // if (tableData.value.length > 0) {
+  //   let productionLineCode = tableData.value[0].productionLineCode
+  //   let workStationCode = tableData.value[0].workStationCode
+  //   for(var i=0;i<tableData.value.length;i++) {
+  //     if(productionLineCode !== tableData.value[i].productionLineCode){
+  //       message.warning('子表数据：生产线存在不同数据，请修改成统一数据！')
+  //       formRef.value.formLoading = false
+  //       return;
+  //     }
+  //     if(workStationCode !== tableData.value[i].workStationCode){
+  //       message.warning('子表数据：工位存在不同数据，请修改成统一数据！')
+  //       formRef.value.formLoading = false
+  //       return;
+  //     }
+  //   }
+  // }
+  formRef.value.formLoading = true
+  try {
+    if (formType === 'create') {
+      await InspectionQ3MainApi.createInspectionQ3Main(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InspectionQ3MainApi.updateInspectionQ3Main(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = async (data) => {
+    // let rs = false
+    // TODO: 单一新编/编辑，校验是否与其他子数据存在生产线工位有不同数据情况
+    return true
+  }
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {
   importFormRef.value.open()
 }
+
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
   templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
+
 // 导入成功之后
 const importSuccess = () => {
   getList()
@@ -372,6 +474,5 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await Q3Api.importTemplate()
 })
 </script>
diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index 142deb01f..921958451 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -4,39 +4,35 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
 import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
 
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
 import * as QadCostcentreApi from '@/api/wms/qadCostcentre'
 import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
 
-import * as ItembasicApi from '@/api/wms/itembasic'
-import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize: 10,
+  pageNo: 1,
+  code: 'IssueRequest'
+}
 
+// 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+import { fa } from 'element-plus/es/locale'
 const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 
-// 表单校验
-export const Q3Rules = reactive({
-  number: [required],
-  itemCode: [required],
-  qty: [required],
-  code: [required],
-  defectLocation: [required],
-  defectType: [
-    { required: true, message: '缺陷类型不能为空', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  problemReason: [
-    { required: true, message: '问题原因不能为空', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  priority: [required],
-  amount: [required],
-  costCode: [required],
-  handleTime: [required],
-  available: [required],
-  concurrencyStamp: [required]
-})
-
-export const Q3 = useCrudSchemas(
+/**
+ * @returns {Array} 发料申请主表
+ */
+export const InspectionQ3Main = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
       label: '通知单号',
@@ -53,6 +49,7 @@ export const Q3 = useCrudSchemas(
       label: 'Q1通知单号',
       field: 'q1Number',
       sort: 'custom',
+      isSearch: true,
       table: {
         width: 150
       },
@@ -90,96 +87,60 @@ export const Q3 = useCrudSchemas(
             }
           ] // 失去焦点校验参数
         }
-      },
-      isSearch: true
+      }
     },
     {
-      label: '状态',
-      field: 'status',
+      label: '负责用户',
+      field: 'responUser',
       sort: 'custom',
-      dictType: DICT_TYPE.PUBLISHE_STATUS,
-      dictClass: 'string',
-      isForm: false,
       isSearch: false,
-      tableForm: {
-        type: 'Select',
-        disabled: true
+      table: {
+        width: 120
       },
       form: {
         componentProps: {
+          value: userStore.getUser.nickname,
           disabled: true
         }
       }
     },
     {
-      label: '物料代码',
-      field: 'itemCode',
+      label: '优先级',
+      field: 'priority',
       sort: 'custom',
-      isSearch: true,
+      dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: false,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '处理时间',
+      field: 'handleTime',
+      isSearch: false,
       table: {
-        width: 150
+        width: 180
       },
-      tableForm: {
-        enterSearch: true,
-        isInpuFocusShow: true,
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '物料基础信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ],
-        verificationParams: [
-          {
-            key: 'code',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true
-          }
-        ] // 失去焦点校验参数
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
       },
       form: {
-        // labelMessage: '信息提示说明！！！',
+        component: 'DatePicker',
         componentProps: {
-          enterSearch: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-          searchField: 'code', // 查询弹窗赋值字段
-          searchTitle: '物料基础信息', // 查询弹窗标题
-          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-          searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'code',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
         }
       }
     },
     {
-      label: '数量',
-      field: 'qty',
+      label: '汇总金额',
+      field: 'summaryAmount',
       sort: 'custom',
-      isTable: true,
       isSearch: false,
       table: {
         width: 150
@@ -193,113 +154,39 @@ export const Q3 = useCrudSchemas(
       }
     },
     {
-      label: '单位',
-      field: 'uom',
-      sort: 'custom',
-      dictType: DICT_TYPE.UOM,
-      dictClass: 'string',
-      isSearch: false,
-      isTable: true,
-      tableForm: {
-        type: 'Select',
-        disabled: true
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '编码',
-      field: 'code',
+      label: '物料代码',
+      field: 'itemCode',
       sort: 'custom',
-      dictType: DICT_TYPE.QMS_Q3_CODE,
-      dictClass: 'string',
       isSearch: true,
-      isTable: true,
-      tableForm: {
-        type: 'Select'
-      }
-    },
-    {
-      label: '缺陷位置',
-      field: 'defectLocation',
-      sort: 'custom',
-      dictClass: 'string',
-      isSearch: false,
-      isTable: false,
-      form: {
-        component: 'Select',
-        componentProps: {
-          options: [],
-          optionsAlias: {
-            labelField: 'productionLineName',
-            valueField: 'productionLineCode'
-          },
-          filterable: true,
-        }
-      }
+      isForm: false
     },
     {
-      label: '缺陷类型',
-      field: 'defectType',
+      label: '数量',
+      field: 'qty',
       sort: 'custom',
       isSearch: false,
-      isTable: false,
-      table: {
-        width: '150'
-      },
-      form: {
-        component: 'Input'
-      }
+      isForm: false
     },
     {
-      label: '问题原因',
-      field: 'problemReason',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      table: {
-        width: '150'
-      },
-      form: {
-        component: 'Input'
-      }
-    },
-    {
-      label: '优先级',
-      field: 'priority',
+      label: '计量单位',
+      field: 'uom',
       sort: 'custom',
-      dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY,
-      dictClass: 'string',
       isSearch: false,
-      isTable: false,
-      tableForm: {
-        type: 'Select'
-      }
+      isForm: false
     },
     {
-      label: '负责用户',
-      field: 'responUser',
+      label: '单价',
+      field: 'price',
       sort: 'custom',
       isSearch: false,
-      isForm: true,
-      table: {
-        width: 120
-      },
-      form: {
-        componentProps: {
-          value: userStore.getUser.nickname,
-          disabled: true
-        }
-      }
+      isForm: false
     },
     {
       label: '金额',
       field: 'amount',
       sort: 'custom',
-      isTable: false,
+      isTable: true,
+      isForm: false,
       isSearch: false,
       table: {
         width: 150
@@ -318,7 +205,7 @@ export const Q3 = useCrudSchemas(
       sort: 'custom',
       isSearch: false,
       isTable: false,
-      isForm: true,
+      isForm: false,
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
@@ -349,28 +236,38 @@ export const Q3 = useCrudSchemas(
         }
       }
     },
+
     {
-      label: '处理时间',
-      field: 'handleTime',
+      label: '缺陷编码',
+      field: 'defectCode',
+      sort: 'custom',
       isSearch: false,
-      isTable: false,
-      table: {
-        width: 180
-      },
-      formatter: dateFormatter,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
+      isForm: false
+    },
+    {
+      label: '缺陷位置',
+      field: 'defectLocation',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '缺陷类型',
+      field: 'defectType',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
       form: {
-        component: 'DatePicker',
-        componentProps: {
-          style: { width: '100%' },
-          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
-        }
+        component: 'Select'
       }
     },
+    {
+      label: '问题原因',
+      field: 'problemReason',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
     {
       label: '描述',
       field: 'desc',
@@ -386,6 +283,24 @@ export const Q3 = useCrudSchemas(
         }
       }
     },
+    {
+      label: '状态',
+      field: 'status',
+      sort: 'custom',
+      dictType: DICT_TYPE.PUBLISHE_STATUS,
+      dictClass: 'string',
+      isSearch: false,
+      isForm: false,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: '是否可用',
       field: 'available',
@@ -423,18 +338,281 @@ export const Q3 = useCrudSchemas(
           valueFormat: 'YYYY-MM-DD HH:mm:ss',
           type: 'daterange',
           defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        },
-      },
+        }
+      }
     },
+
     {
       label: '操作',
       field: 'action',
-      isForm: false,
       isDetail: false,
+      isForm: false,
       table: {
-        width: 150,
+        width: 230,
         fixed: 'right'
       }
     }
   ])
 )
+
+export const InspectionQ3MainRules = reactive({
+  workshopCode: [{ required: true, message: '请选择车间代码', trigger: 'change' }],
+  productionLineCode: [{ required: true, message: '请选择生产线代码', trigger: 'change' }],
+  // fromWarehouseCode: [
+  //   { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  // ],
+  // dueTime: [
+  //   { required: true, message: '请选择截止时间', trigger: 'change' }
+  // ],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
+})
+
+/**
+ * @returns {Array} 发料申请子表
+ */
+export const InspectionQ3Detail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '通知单号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isTableForm: false
+    },
+    {
+      label: '物料号',
+      field: 'itemCode',
+      sort: 'custom',
+      isTable: false,
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        isInpuFocusShow: false,
+        disabled:true,
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ],
+        isShowTableFormSearch: true, //tableForm下方是否出现输入框
+        isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
+        verificationParams: [
+          {
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '物料基础信息', // 查询弹窗标题
+          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+          searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      
+      tableForm: {
+        type: 'InputNumber',
+        min: 0,
+        precision: 2
+      }
+    },
+    {
+      label: '单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: false,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '单价',
+      field: 'price',
+      sort: 'custom',
+      isTable: false,
+      isSearch: false,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '金额',
+      field: 'amount',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '成本中心代码',
+      field: 'costCode',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      isForm: true,
+      tableForm: {
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择成本中心', // 输入框占位文本
+        searchField: 'costcentreCode', // 查询弹窗赋值字段
+        searchTitle: '成本中心信息', // 查询弹窗标题
+        searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+        searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ],
+        verificationParams: [
+          {
+            key: 'costcentreCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
+      }
+    },
+    {
+      label: '缺陷编码',
+      field: 'defectCode',
+      sort: 'custom',
+      dictType: DICT_TYPE.QMS_Q3_CODE,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '缺陷位置',
+      field: 'defectLocation',
+      sort: 'custom',
+      dictClass: 'string',
+      isSearch: false,
+      isTable: false,
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: [],
+          optionsAlias: {
+            labelField: 'productionLineName',
+            valueField: 'productionLineCode'
+          },
+          filterable: true
+        }
+      }
+    },
+    {
+      label: '缺陷类型',
+      field: 'defectType',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      form: {
+        component: 'Select'
+      }
+    },
+    {
+      label: '问题原因',
+      field: 'problemReason',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      form: {
+        component: 'Select'
+      }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      hiddenInMain: true,
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 200,
+        fixed: 'right'
+      },
+      isTableForm: false
+    }
+  ])
+)
+
+//表单校验
+export const InspectionQ3DetailRules = reactive({
+  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
+  packingNumber: [{ required: true, message: '请输入包装号', trigger: 'blur' }],
+  batch: [{ required: true, message: '请输入批次', trigger: 'blur' }],
+  inventoryStatus: [{ required: true, message: '请选择库存状态', trigger: 'change' }],
+  toLocationCode: [{ required: true, message: '请输入到库位代码', trigger: 'blur' }]
+})
diff --git a/src/views/qms/inspectionQThree/index.vue b/src/views/qms/inspectionQThree/index.vue
deleted file mode 100644
index d49ba7e99..000000000
--- a/src/views/qms/inspectionQThree/index.vue
+++ /dev/null
@@ -1,478 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search :schema="[...InspectionQ3Main.allSchemas.searchSchema,...InspectionQ3Detail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap>
-
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="InspectionQ3Main.allSchemas"
-      :detailAllSchemas="InspectionQ3Detail.allSchemas"
-    />
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <Table v-clientTable
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
-        total: tableObject.total
-      }"
-      v-model:pageSize="tableObject.pageSize"
-      v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort"
-    >
-      <template #number="{row}">
-        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
-          <span>{{ row.number }}</span>
-        </el-button>
-      </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
-      </template>
-    </Table>
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="formRef"
-    :isOpenSearchTable="true"
-    fieldTableColumn="itemCode"
-    @success="getList"
-    :rules="InspectionQ3MainRules"
-    :formAllSchemas="InspectionQ3Main.allSchemas"
-    :tableAllSchemas="InspectionQ3Detail.allSchemas"
-    :tableFormRules="InspectionQ3DetailRules"
-    :tableData="tableData"
-    :apiUpdate="InspectionQ3MainApi.updateInspectionQ3Main"
-    :apiCreate="InspectionQ3MainApi.createInspectionQ3Main"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    :isShowReduceButtonSelection="true"
-    @tableSelectionDelete="tableSelectionDelete"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-    @onChange="onChange"
-    @clearSearchInput="onChange"
-    :sumFormDataByTableCustom ="(formRef,formModel,tableData)=>{
-      tableData.forEach(item=>{
-        item.qty = item.countQty*item.packQty
-      })
-    }"
-  >
-  <!-- <template #default="{row}">
-    <el-input-number disabled v-model="row.qty"></el-input-number>
-  </template> -->
-  </BasicForm>
-
-  <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="InspectionQ3Main.allSchemas"
-    :detailAllSchemas="InspectionQ3Detail.allSchemas"
-    :detailAllSchemasRules="InspectionQ3DetailRules"
-    :apiCreate="InspectionQ3DetailApi.createInspectionQ3Detail"
-    :apiUpdate="InspectionQ3DetailApi.updateInspectionQ3Detail"
-    :apiPage="InspectionQ3DetailApi.getInspectionQ3DetailPage"
-    :apiDelete="InspectionQ3DetailApi.deleteInspectionQ3Detail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :detailValidate="detailValidate"
-  />
-
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { InspectionQ3Main,InspectionQ3MainRules,InspectionQ3Detail,InspectionQ3DetailRules } from './inspectionQ3.data'
-import * as InspectionQ3MainApi from '@/api/qms/inspectionQ3/inspectionQ3Main'
-import * as InspectionQ3DetailApi from '@/api/qms/inspectionQ3/inspectionQ3Detail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
-import * as StdcostpriceApi from '@/api/wms/stdcostprice'
-import { formatDate } from '@/utils/formatTime'
-
-// 发料申请
-defineOptions({ name: 'InspectionQ3Main' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref([...InspectionQ3Main.allSchemas.tableColumns,...InspectionQ3Detail.allSchemas.tableMainColumns])
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-// 查询页面返回
-const priceObj = ref()
-const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
-  nextTick(async() => {
-    const setV = {}
-    if (type == 'tableForm') {
-      // 明细查询页赋值
-      if (formField == 'itemCode') {
-          val.forEach(item=>{
-          let tableForm = JSON.parse(JSON.stringify(tableFormKeys))
-          if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
-          const newRow = JSON.parse(JSON.stringify({...tableForm,...item}))
-          newRow['itemCode'] = item['code']
-          newRow['uom'] = item['uom']
-          tableData.value.push(newRow)
-          })
-
-        
-
-
-      // row['uom'] = val[0]['uom']
-      // console.log(formRef.formModel.qty)
-      // // let res = await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code)
-      //   ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code).then((res) => {
-      //   console.log(res)
-      //   if (res?.length > 0) {
-      //     formRef.formModel.defectLocation = res[0].productionLineCode
-      //      InspectionQ3Detail.allSchemas.formSchema.forEach(item=>{
-      //       if (item.field == 'defectLocation') {
-      //         item.componentProps.options = res
-      //       }
-      //     })
-      //   }
-      // })
-      // const params = {
-      //   by: "ASC",
-      //   filters: [{column: "itemCode", action: "==", value: val[0].code}],
-      //   pageNo: 1,
-      //   pageSize: 500,
-      //   sort: ""
-      // }
-      // params.isSearch = true
-      // StdcostpriceApi.getStdcostpricePage(params).then((res) => {
-      //   if (res.list?.length > 0) {
-      //     priceObj.value = res.list[0]
-      //     formRef.setValues({
-      //       amount: (parseFloat(formRef.formModel.qty) * parseFloat(priceObj.value.price)).toFixed(6)
-      //     })
-      //   }
-        
-      // })
-      }
-    if (formField == 'costCode') {
-          console.log(11111)
-          row['costCode'] = val[0]['costcentreCode']
-        }
-       if (formField == 'q1Number') {
-      //Q1通知单号
-      let list = []
-      val.forEach((item) => {
-        list.push(item[searchField])
-      })
-      setV[formField] = list.join(',')
-      formRef.setValues(setV)
-    }
-    } else {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      formRef.setValues(setV)
-    }
-  })
-}
-const onChange =(field,e)=>{
-  if (field == 'qty') {
-          formRef.value.formRef.formModel.amount = (parseFloat( formRef.value.formRef.formModel.qty) * parseFloat( priceObj.value.price)).toFixed(6)
-}
-}
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
-  nextTick(() => {
-    const setV = {}
-    if (formField == 'itemCode') {
-      setV['itemCode'] = val[0]['code']
-      setV['uom'] = val[0]['uom']
-    } else {
-      setV[formField] = val[0][searchField]
-    }
-    formRef.setValues(setV)
-  })
-}
-
-const { tableObject, tableMethods } = useTable({
-  getListApi: InspectionQ3DetailApi.getInspectionQ3DetailPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:inspection-Q3-main:create'}), // 新增
-  defaultButtons.defaultExportBtn({hasPermi:'qms:inspection-Q3-main:export'}), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'export') { // 导出
-    handleExport()
-  } else if (val == 'refresh') { // 刷新
-      getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
-    console.log('其他按钮', item)
-  }
-}
-
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row, val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 列表-操作按钮
-const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-    defaultButtons.mainListEditBtn({
-      hide: isShowMainButton(row, ['0']),
-      hasPermi: 'qms:inspection-Q3-main:update'
-    }), // 编辑
-    defaultButtons.mainListDeleteBtn({
-      hide: isShowMainButton(row, ['0']),
-      hasPermi: 'qms:inspection-Q3-main:delete'
-    }), // 删除
-    defaultButtons.mainListFinishBtn({
-      hide: isShowMainButton(row, ['0']),
-      hasPermi: 'qms:inspection-Q3-main:finish'
-    }) // 完成
-  ]
-}
-
-
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-   if (val == 'edit') {
-    // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') {
-    // 删除
-    handleDelete(row.id)
-  } else if (val == 'finish') {
-    // 完成
-    handleFinish(row.id)
-  }
-}
-
-const handleFinish = async (id: number) => {
-  try {
-    await InspectionQ3MainApi.finishInspectionQ3Main(id)
-    message.success(t('common.updateSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm =async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  // 编辑时 车间代码不可修改
-  if (type == 'update') {
-    // 修改 tableform 属性
-    InspectionQ3Main.allSchemas.formSchema.map(itemColumns => {
-      if(itemColumns.field == 'workshopCode') {
-        itemColumns.componentProps.isSearchList = false
-        itemColumns.componentProps.disabled = true
-      }
-    })
-  } else {
-    // 修改 tableform 属性
-    InspectionQ3Main.allSchemas.formSchema.map(itemColumns => {
-      if(itemColumns.field == 'workshopCode') {
-        itemColumns.componentProps.isSearchList = true
-        itemColumns.componentProps.disabled = false
-      }
-    })
-  }
-  formRef.value.open(type, row)
-}
-
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-  detailRef.value.openDetail(row, titleName, titleValue,"requestIssueMain")
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    tableObject.loading = true
-    // 发起删除
-    await InspectionQ3MainApi.deleteInspectionQ3Main(id)
-    tableObject.loading = false
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    buttonBaseClick('refresh',null)
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await InspectionQ3MainApi.exportInspectionQ3Main(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/**
-  * tableForm方法
-*/
-const tableFormKeys = {}
-InspectionQ3Detail.allSchemas.tableFormColumns.forEach(item => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
-
-// 添加明细
-const handleAddTable = () => {
-  // 添加明细 已有数据 添加的明细 生产线 工位按照之前数据进行添加
-  let tableForm = JSON.parse(JSON.stringify(tableFormKeys))
-  if (tableData.value.length > 0) {
-    // tableForm.productionLineCode = tableData.value[0].productionLineCode
-    // tableForm.workStationCode = tableData.value[0].workStationCode
-  }
-  tableData.value.push(tableForm)
-}
-// 删除明细
-const handleDeleteTable = (item, index) => {
-  let itemIndex = tableData.value.indexOf(item)
-  if(itemIndex>-1){
-    tableData.value.splice(itemIndex, 1)
-  }
-}
-const tableSelectionDelete = (selection) => {
-  tableData.value = tableData.value.filter(item => !selection.includes(item))
-}
-// 主子数据 提交
-const submitForm = async (formType, submitData) => {
-  let data = {...submitData}
-  if(data.masterId){
-    data.id = data.masterId
-  }
-  data.subList = tableData.value // 拼接子表数据参数
-  if(tableData.value.find(item => (item.qty <= 0))) {
-    message.warning('数量必须大于0')
-    formRef.value.formLoading = false
-    return
-  }
-  // 判断子表中，是否有不同的生产线和工位
-  // if (tableData.value.length > 0) {
-  //   let productionLineCode = tableData.value[0].productionLineCode
-  //   let workStationCode = tableData.value[0].workStationCode
-  //   for(var i=0;i<tableData.value.length;i++) {
-  //     if(productionLineCode !== tableData.value[i].productionLineCode){
-  //       message.warning('子表数据：生产线存在不同数据，请修改成统一数据！')
-  //       formRef.value.formLoading = false
-  //       return;
-  //     }
-  //     if(workStationCode !== tableData.value[i].workStationCode){
-  //       message.warning('子表数据：工位存在不同数据，请修改成统一数据！')
-  //       formRef.value.formLoading = false
-  //       return;
-  //     }
-  //   }
-  // }
-  formRef.value.formLoading = true
-  try {
-    if (formType === 'create') {
-      await InspectionQ3MainApi.createInspectionQ3Main(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await InspectionQ3MainApi.updateInspectionQ3Main(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    if (formType === 'create') {
-      getList()
-    }else{
-      buttonBaseClick('refresh',null)
-    }
-  } finally {
-    formRef.value.formLoading = false
-  }
-}
-
-// 子表新增/编辑校验
-const detailValidate = async (data) => {
-    // let rs = false
-    // TODO: 单一新编/编辑，校验是否与其他子数据存在生产线工位有不同数据情况
-    return true
-  }
-
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: `【${route.meta.title}】导入模版.xlsx`
-})
-
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
-// 筛选提交
-const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
-  }
-  getList() // 刷新当前列表
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-})
-</script>
diff --git a/src/views/qms/inspectionQThree/inspectionQ3.data.ts b/src/views/qms/inspectionQThree/inspectionQ3.data.ts
deleted file mode 100644
index 921958451..000000000
--- a/src/views/qms/inspectionQThree/inspectionQ3.data.ts
+++ /dev/null
@@ -1,618 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-
-import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
-import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
-
-import * as ItembasicApi from '@/api/wms/itembasic'
-import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
-
-import * as QadCostcentreApi from '@/api/wms/qadCostcentre'
-import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
-
-const { t } = useI18n() // 国际化
-
-// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
-const queryParams = {
-  pageSize: 10,
-  pageNo: 1,
-  code: 'IssueRequest'
-}
-
-// 获取当前操作人的部门
-import { useUserStore } from '@/store/modules/user'
-import { TableColumn } from '@/types/table'
-import { fa } from 'element-plus/es/locale'
-const userStore = useUserStore()
-const userDept = userStore.userSelfInfo.dept
-// id 转str 否则form回显匹配不到
-userDept.id = userDept.id.toString()
-const userDeptArray: any = [userDept]
-
-/**
- * @returns {Array} 发料申请主表
- */
-export const InspectionQ3Main = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '通知单号',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true,
-      isForm: false,
-      table: {
-        width: 150,
-        fixed: 'left'
-      }
-    },
-    {
-      label: 'Q1通知单号',
-      field: 'q1Number',
-      sort: 'custom',
-      isSearch: true,
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          multiple: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
-          searchField: 'number', // 查询弹窗赋值字段
-          searchTitle: 'Q1通知单', // 查询弹窗标题
-          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'status',
-              value: '0',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'number',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
-    {
-      label: '负责用户',
-      field: 'responUser',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 120
-      },
-      form: {
-        componentProps: {
-          value: userStore.getUser.nickname,
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '优先级',
-      field: 'priority',
-      sort: 'custom',
-      dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY,
-      dictClass: 'string',
-      isSearch: false,
-      isTable: false,
-      tableForm: {
-        type: 'Select'
-      }
-    },
-    {
-      label: '处理时间',
-      field: 'handleTime',
-      isSearch: false,
-      table: {
-        width: 180
-      },
-      formatter: dateFormatter,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          style: { width: '100%' },
-          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
-        }
-      }
-    },
-    {
-      label: '汇总金额',
-      field: 'summaryAmount',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        component: 'InputNumber',
-        componentProps: {
-          min: 0,
-          precision: 2
-        }
-      }
-    },
-    {
-      label: '物料代码',
-      field: 'itemCode',
-      sort: 'custom',
-      isSearch: true,
-      isForm: false
-    },
-    {
-      label: '数量',
-      field: 'qty',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false
-    },
-    {
-      label: '计量单位',
-      field: 'uom',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false
-    },
-    {
-      label: '单价',
-      field: 'price',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false
-    },
-    {
-      label: '金额',
-      field: 'amount',
-      sort: 'custom',
-      isTable: true,
-      isForm: false,
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        component: 'InputNumber',
-        componentProps: {
-          min: 0,
-          precision: 2
-        }
-      }
-    },
-    {
-      label: '成本中心代码',
-      field: 'costCode',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false,
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择成本中心', // 输入框占位文本
-          searchField: 'costcentreCode', // 查询弹窗赋值字段
-          searchTitle: '成本中心信息', // 查询弹窗标题
-          searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
-          searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'costcentreCode',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
-
-    {
-      label: '缺陷编码',
-      field: 'defectCode',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false
-    },
-    {
-      label: '缺陷位置',
-      field: 'defectLocation',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false
-    },
-    {
-      label: '缺陷类型',
-      field: 'defectType',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false,
-      form: {
-        component: 'Select'
-      }
-    },
-    {
-      label: '问题原因',
-      field: 'problemReason',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false
-    },
-    {
-      label: '描述',
-      field: 'desc',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: '150'
-      },
-      form: {
-        component: 'Input',
-        componentProps: {
-          type: 'textarea'
-        }
-      }
-    },
-    {
-      label: '状态',
-      field: 'status',
-      sort: 'custom',
-      dictType: DICT_TYPE.PUBLISHE_STATUS,
-      dictClass: 'string',
-      isSearch: false,
-      isForm: false,
-      tableForm: {
-        type: 'Select',
-        disabled: true
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '是否可用',
-      field: 'available',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false,
-      isTable: false,
-      isDetail: false
-    },
-    {
-      label: '创建时间',
-      field: 'createTime',
-      isTable: true,
-      isForm: false,
-      table: {
-        width: 180
-      },
-      formatter: dateFormatter,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          style: { width: '100%' },
-          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
-        }
-      },
-      isSearch: true,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      }
-    },
-
-    {
-      label: '操作',
-      field: 'action',
-      isDetail: false,
-      isForm: false,
-      table: {
-        width: 230,
-        fixed: 'right'
-      }
-    }
-  ])
-)
-
-export const InspectionQ3MainRules = reactive({
-  workshopCode: [{ required: true, message: '请选择车间代码', trigger: 'change' }],
-  productionLineCode: [{ required: true, message: '请选择生产线代码', trigger: 'change' }],
-  // fromWarehouseCode: [
-  //   { required: true, message: '请选择从仓库代码', trigger: 'change' }
-  // ],
-  // dueTime: [
-  //   { required: true, message: '请选择截止时间', trigger: 'change' }
-  // ],
-  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
-})
-
-/**
- * @returns {Array} 发料申请子表
- */
-export const InspectionQ3Detail = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '通知单号',
-      field: 'number',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isTableForm: false
-    },
-    {
-      label: '物料号',
-      field: 'itemCode',
-      sort: 'custom',
-      isTable: false,
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      tableForm: {
-        isInpuFocusShow: false,
-        disabled:true,
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '物料基础信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ],
-        isShowTableFormSearch: true, //tableForm下方是否出现输入框
-        isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
-        verificationParams: [
-          {
-            key: 'code',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true
-          }
-        ] // 失去焦点校验参数
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-          searchField: 'code', // 查询弹窗赋值字段
-          searchTitle: '物料基础信息', // 查询弹窗标题
-          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-          searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'code',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
-    {
-      label: '数量',
-      field: 'qty',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      
-      tableForm: {
-        type: 'InputNumber',
-        min: 0,
-        precision: 2
-      }
-    },
-    {
-      label: '单位',
-      field: 'uom',
-      sort: 'custom',
-      dictType: DICT_TYPE.UOM,
-      dictClass: 'string',
-      isSearch: false,
-      isTable: false,
-      tableForm: {
-        type: 'Select',
-        disabled: true
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '单价',
-      field: 'price',
-      sort: 'custom',
-      isTable: false,
-      isSearch: false,
-      tableForm: {
-        disabled: true
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '金额',
-      field: 'amount',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false,
-      tableForm: {
-        disabled: true
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '成本中心代码',
-      field: 'costCode',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: true,
-      tableForm: {
-        isInpuFocusShow: true,
-        searchListPlaceholder: '请选择成本中心', // 输入框占位文本
-        searchField: 'costcentreCode', // 查询弹窗赋值字段
-        searchTitle: '成本中心信息', // 查询弹窗标题
-        searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
-        searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ],
-        verificationParams: [
-          {
-            key: 'costcentreCode',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true
-          }
-        ] // 失去焦点校验参数
-      }
-    },
-    {
-      label: '缺陷编码',
-      field: 'defectCode',
-      sort: 'custom',
-      dictType: DICT_TYPE.QMS_Q3_CODE,
-      dictClass: 'string',
-      isSearch: true,
-      isTable: true,
-      tableForm: {
-        type: 'Select'
-      }
-    },
-    {
-      label: '缺陷位置',
-      field: 'defectLocation',
-      sort: 'custom',
-      dictClass: 'string',
-      isSearch: false,
-      isTable: false,
-      form: {
-        component: 'Select',
-        componentProps: {
-          options: [],
-          optionsAlias: {
-            labelField: 'productionLineName',
-            valueField: 'productionLineCode'
-          },
-          filterable: true
-        }
-      }
-    },
-    {
-      label: '缺陷类型',
-      field: 'defectType',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      form: {
-        component: 'Select'
-      }
-    },
-    {
-      label: '问题原因',
-      field: 'problemReason',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      form: {
-        component: 'Select'
-      }
-    },
-    {
-      label: '操作',
-      field: 'action',
-      hiddenInMain: true,
-      isDetail: false,
-      isForm: false,
-      table: {
-        width: 200,
-        fixed: 'right'
-      },
-      isTableForm: false
-    }
-  ])
-)
-
-//表单校验
-export const InspectionQ3DetailRules = reactive({
-  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
-  packingNumber: [{ required: true, message: '请输入包装号', trigger: 'blur' }],
-  batch: [{ required: true, message: '请输入批次', trigger: 'blur' }],
-  inventoryStatus: [{ required: true, message: '请选择库存状态', trigger: 'change' }],
-  toLocationCode: [{ required: true, message: '请输入到库位代码', trigger: 'blur' }]
-})
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 8938c82a8..e38c1ea26 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -8,8 +8,14 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
 import * as WarehouseApi from '@/api/wms/warehouse'
 
-import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
-import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
+import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
+
+import * as InspectionQ2Api from '@/api/qms/inspectionQ2'
+import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
+
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 const { t } = useI18n() // 国际化
 
@@ -47,6 +53,96 @@ export const ScrapRequestMain = useCrudSchemas(
       isForm: false,
       isSearch: true
     },
+    {
+      label: 'Q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q1通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q1通知单号', // 查询弹窗标题
+          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: 'Q2通知单号',
+      field: 'q2Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q2通知单号', // 查询弹窗标题
+          searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: 'Q3通知单号',
       field: 'q3Number',
@@ -65,8 +161,8 @@ export const ScrapRequestMain = useCrudSchemas(
           searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
           searchTitle: 'Q3通知单号', // 查询弹窗标题
-          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
           searchCondition: [
             {
               key: 'available',
@@ -403,7 +499,7 @@ export const ScrapRequestMain = useCrudSchemas(
           type: 'daterange',
           defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
         }
-      },
+      }
     },
     {
       label: '创建者',