From 93632ec0885da37e79fd11406aa915fac0bc3637 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 31 Jul 2024 11:20:45 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRecordMain.data.ts                         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
index 20f93af4f..f040a6da8 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@@ -552,6 +552,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain: true,
   },
   {
@@ -561,6 +562,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain: true,
   },
   {
@@ -570,6 +572,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain: true,
   },
   {
@@ -579,6 +582,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable:false,
     hiddenInMain: true,
   },
   {

From c720bdb095033885888c3cb42b99ebfd8772b763 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 31 Jul 2024 11:32:47 +0800
Subject: [PATCH 02/12] =?UTF-8?q?qms=E5=8A=A0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/aql/index.vue                   | 190 +++--
 src/views/qms/counter/index.vue               | 124 +--
 src/views/qms/dynamicRule/index.vue           | 211 +++--
 src/views/qms/inspectionJob/index.vue         |   2 +
 src/views/qms/inspectionMethod/index.vue      | 163 ++--
 src/views/qms/inspectionRecordFirst/index.vue |   2 +
 src/views/qms/inspectionRequest/index.vue     | 775 ++++++++++--------
 src/views/qms/inspectionScheme/index.vue      | 148 ++--
 src/views/qms/inspectionStage/index.vue       | 117 +--
 src/views/qms/inspectionTemplate/index.vue    | 132 +--
 src/views/qms/qualityNotice/index.vue         |   2 +
 src/views/qms/sampleCode/index.vue            | 155 ++--
 src/views/qms/samplingProcess/index.vue       | 239 +++---
 src/views/qms/samplingScheme/index.vue        | 134 +--
 src/views/qms/selectedProject/index.vue       | 114 +--
 src/views/qms/selectedSet/index.vue           | 231 +++---
 16 files changed, 1582 insertions(+), 1157 deletions(-)

diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue
index c74fe3459..3dc399dba 100644
--- a/src/views/qms/aql/index.vue
+++ b/src/views/qms/aql/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Aql.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Aql.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Aql.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Aql.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -55,12 +63,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Aql.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/qms/aql/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/qms/aql/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Aql,AqlRules } from './aql.data'
+import { Aql, AqlRules } from './aql.data'
 import * as AqlApi from '@/api/qms/aql'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -100,12 +113,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:aql:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:aql:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:aql:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:aql:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:aql:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:aql:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -118,21 +131,27 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.available) > -1) {
     return false
   } else {
@@ -142,23 +161,31 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:aql:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:aql:enable'}),
-    defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:aql:disable' }),
-    defaultButtons.mainListDeleteBtn({hasPermi:'qms:aql:delete'}), // 删除
+    defaultButtons.mainListEditBtn({ hasPermi: 'qms:aql:update' }),
+    defaultButtons.mainListEnableBtn({
+      hide: isShowMainButton(row, ['FALSE']),
+      hasPermi: 'qms:aql:enable'
+    }),
+    defaultButtons.mainListDisableBtn({
+      hide: isShowMainButton(row, ['TRUE']),
+      hasPermi: 'qms:aql:disable'
+    }),
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:aql:delete' }) // 删除
   ]
 }
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
   } else if (val == 'enable') {
     handleEnable(row.id)
-  }else if (val == 'disable') {
+  } else if (val == 'disable') {
     handleDisable(row.id)
-  }else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
 }
 
 /** 添加/修改操作 */
@@ -168,27 +195,33 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =Aql.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;
+const formsSuccess = async (formType, data) => {
+  try {
+    var isHave = Aql.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.activeTime == 0) data.activeTime = null
+    if (data.expireTime == 0) data.expireTime = null
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await AqlApi.createAql(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await AqlApi.updateAql(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await AqlApi.createAql(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await AqlApi.updateAql(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -268,51 +301,50 @@ const searchFormClick = (searchData) => {
 
 const onChange = async (field, value, formRef) => {
   // 检查字段是否以 "a" 开头
-  if (field.startsWith("a") || field.startsWith("r")) {
+  if (field.startsWith('a') || field.startsWith('r')) {
     // 从 "a" 字段名中获取其余部分
-    const suffix = field.slice(1);
+    const suffix = field.slice(1)
     // 构建对应的 "r" 字段名
-    const correspondingField = field.startsWith("a") ? "r" + suffix : "a" + suffix ;
+    const correspondingField = field.startsWith('a') ? 'r' + suffix : 'a' + suffix
     // 如果有值，则更新对应的 "r" 字段
     if (value) {
       // 查找并更新对应 "r" 字段的值和属性
-      Aql.allSchemas.formSchema.forEach(item => {
+      Aql.allSchemas.formSchema.forEach((item) => {
         if (item.field === correspondingField) {
-          const setV = {};
-          if(correspondingField.startsWith("r")){
-            setV[correspondingField] = parseInt(value) + 1;
-          }else {
-            setV[correspondingField] = parseInt(value) - 1;
+          const setV = {}
+          if (correspondingField.startsWith('r')) {
+            setV[correspondingField] = parseInt(value) + 1
+          } else {
+            setV[correspondingField] = parseInt(value) - 1
           }
-          item.componentProps.disabled = true;
+          item.componentProps.disabled = true
 
           // 使用 Vue 的 nextTick 来等待 DOM 更新
           nextTick(() => {
-            formRef.value.setValues(setV);
-          });
+            formRef.value.setValues(setV)
+          })
         }
-      });
-    }else{
-      Aql.allSchemas.formSchema.forEach(item => {
+      })
+    } else {
+      Aql.allSchemas.formSchema.forEach((item) => {
         if (item.field === correspondingField || item.field === field) {
-          item.componentProps.disabled = false;
-          const setV = {};
+          item.componentProps.disabled = false
+          const setV = {}
           setV[correspondingField] = ''
           nextTick(() => {
-            formRef.value.setValues(setV);
-          });
+            formRef.value.setValues(setV)
+          })
         }
-      });
+      })
     }
   }
-};
+}
 /** 初始化 **/
 onMounted(async () => {
-    tableObject.params = {
-    available: true
-  }
+  tableObject.params = {
+    available: true
+  }
   getList()
   importTemplateData.templateUrl = await AqlApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/counter/index.vue b/src/views/qms/counter/index.vue
index cd789a436..d57b19136 100644
--- a/src/views/qms/counter/index.vue
+++ b/src/views/qms/counter/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Counter.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Counter.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Counter.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Counter.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -54,12 +59,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Counter.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/qms/counter/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/qms/counter/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Counter,CounterRules } from './counter.data'
+import { Counter, CounterRules } from './counter.data'
 import * as CounterApi from '@/api/qms/counter'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -100,11 +110,11 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:'qms:counter:create'}), // 新增
-//   defaultButtons.defaultImportBtn({hasPermi:'qms:counter:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:counter:export'}), // 导出
+  //   defaultButtons.defaultImportBtn({hasPermi:'qms:counter:import'}), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:counter:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -114,35 +124,42 @@ const HeadButttondata = [
   //   color: ''
   // },
 ]
- 
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'qms:counter:update'}), // 编辑
+  defaultButtons.mainListEditBtn({ hasPermi: 'qms:counter:update' }) // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'qms:counter:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -162,27 +179,33 @@ const openForm = async (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =Counter.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;
+const formsSuccess = async (formType, data) => {
+  try {
+    var isHave = Counter.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.activeTime == 0) data.activeTime = null
+    if (data.expireTime == 0) data.expireTime = null
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await CounterApi.createCounter(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CounterApi.updateCounter(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await CounterApi.createCounter(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await CounterApi.updateCounter(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -246,11 +269,10 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-    tableObject.params = {
-    available: true
-  }
+  tableObject.params = {
+    available: true
+  }
   getList()
   importTemplateData.templateUrl = await CounterApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue
index 951326cc8..72b59a060 100644
--- a/src/views/qms/dynamicRule/index.vue
+++ b/src/views/qms/dynamicRule/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="DynamicRule.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="DynamicRule.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="DynamicRule.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="DynamicRule.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -60,15 +68,15 @@
 
   <!-- 详情 -->
   <DetailQmsCode
-    ref="detailRef" 
-    :isBasic="false" 
+    ref="detailRef"
+    :isBasic="false"
     :allSchemas="DynamicRule.allSchemas"
-    :detailAllSchemas="InspectionStage.allSchemas" 
+    :detailAllSchemas="InspectionStage.allSchemas"
     :detailAllSchemasRules="InspectionStageRules"
     :apiCreate="InspectionStageApi.createInspectionStage"
     :apiUpdate="InspectionStageApi.updateInspectionStage"
     :apiPage="InspectionStageApi.getInspectionStagePage"
-    :apiDelete="InspectionStageApi.deleteInspectionStage" 
+    :apiDelete="InspectionStageApi.deleteInspectionStage"
     :detailValidate="detailValidate"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailButtonIsShowEdit="checkPermi(['qms:inspection-stage:update'])"
@@ -92,15 +100,15 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { DynamicRule,DynamicRuleRules } from './dynamicRule.data'
-import { InspectionStage,InspectionStageRules } from '../inspectionStage/inspectionStage.data'
+import { DynamicRule, DynamicRuleRules } from './dynamicRule.data'
+import { InspectionStage, InspectionStageRules } from '../inspectionStage/inspectionStage.data'
 import * as DynamicRuleApi from '@/api/qms/dynamicRule'
 import * as InspectionStageApi from '@/api/qms/inspectionStage'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 import UploadFile from '@/components/UploadFile/src/UploadFile.vue'
 import { checkPermi } from '@/utils/permission'
-import ImportForm from "../../../components/ImportForm/src/ImportForm.vue";
+import ImportForm from '../../../components/ImportForm/src/ImportForm.vue'
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
 // import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 // import Detail from '@/components/Detail/src/Detail.vue'
@@ -141,12 +149,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:dynamic-rule:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:dynamic-rule:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:dynamic-rule:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:dynamic-rule:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:dynamic-rule:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:dynamic-rule:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -159,21 +167,27 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.available) > -1) {
     return false
   } else {
@@ -183,22 +197,30 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:dynamic-rule:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:dynamic-rule:enable'}),
-    defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:dynamic-rule:disable' }),
-    defaultButtons.mainListDeleteBtn({hasPermi:'qms:dynamic-rule:delete'}), // 删除
+    defaultButtons.mainListEditBtn({ hasPermi: 'qms:dynamic-rule:update' }),
+    defaultButtons.mainListEnableBtn({
+      hide: isShowMainButton(row, ['FALSE']),
+      hasPermi: 'qms:dynamic-rule:enable'
+    }),
+    defaultButtons.mainListDisableBtn({
+      hide: isShowMainButton(row, ['TRUE']),
+      hasPermi: 'qms:dynamic-rule:disable'
+    }),
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:dynamic-rule:delete' }) // 删除
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     editForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  }else if (val == 'enable') {
+  } else if (val == 'enable') {
     handleEnable(row.id)
-  }else if (val == 'disable') {
+  } else if (val == 'disable') {
     handleDisable(row.id)
   }
 }
@@ -212,33 +234,39 @@ const openForm = async (type: string, row?: any) => {
 const editForm = async (type: string, row?: any) => {
   tableData.value = []
   detailMasterId.value = row.id
-  InspectionStageApi.getInspectionStageNoPage({masterId:row.id}).then(res=>{
+  InspectionStageApi.getInspectionStageNoPage({ masterId: row.id }).then((res) => {
     tableData.value = res
   })
   basicFormRef.value.open(type, row)
 }
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =DynamicRule.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;
+const formsSuccess = async (formType, data) => {
+  try {
+    var isHave = DynamicRule.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.activeTime == 0) data.activeTime = null
+    if (data.expireTime == 0) data.expireTime = null
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await DynamicRuleApi.createDynamicRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DynamicRuleApi.updateDynamicRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } catch {
+    basicFormRef.value.formLoading = false
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await DynamicRuleApi.createDynamicRule(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await DynamicRuleApi.updateDynamicRule(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -331,23 +359,23 @@ const handleDeleteTable = (item, index) => {
   tableData.value.splice(index, 1)
 }
 
-
 // 主子数据 提交
 const submitForm = async (formType, data) => {
-  const flag = validateNotRepetition(tableData.value);
-  const emptyFlag = validateDetailEmpty(tableData.value);
-  if(!emptyFlag){
+  const flag = validateNotRepetition(tableData.value)
+  const emptyFlag = validateDetailEmpty(tableData.value)
+  if (!emptyFlag) {
     message.alertWarning('明细不能为空')
     basicFormRef.value.formLoading = false
     return
   }
-  if(!flag){
+  if (!flag) {
     message.alertWarning('动态规则阶段不能重复')
     basicFormRef.value.formLoading = false
     return
   }
-  data.inspectionStageDOList = tableData.value// 拼接子表数据参数
+  data.inspectionStageDOList = tableData.value // 拼接子表数据参数
   try {
+    basicFormRef.value.formLoading = true
     if (formType === 'create') {
       await DynamicRuleApi.createDynamicRule(data)
       message.success(t('common.createSuccess'))
@@ -356,6 +384,7 @@ const submitForm = async (formType, data) => {
       message.success(t('common.updateSuccess'))
     }
     basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
     // 刷新当前列表
     getList()
   } finally {
@@ -363,9 +392,9 @@ const submitForm = async (formType, data) => {
   }
 }
 
-const detailValidate = (type,data) => {
-  let tag = true;
-  if(!validateIfRepeat(type,data)){
+const detailValidate = (type, data) => {
+  let tag = true
+  if (!validateIfRepeat(type, data)) {
     tag = false
     message.alertWarning('动态规则阶段不能重复')
   }
@@ -374,49 +403,49 @@ const detailValidate = (type,data) => {
 
 const detailOpenForm = (type, row, masterParmas) => {
   detailMasterId.value = masterParmas.masterId
-  InspectionStageApi.getInspectionStageNoPage({masterId:masterParmas.masterId}).then(res=>{
+  InspectionStageApi.getInspectionStageNoPage({ masterId: masterParmas.masterId }).then((res) => {
     detailList.value = res
   })
 }
 
-const validateIfRepeat = (type,data) => {
-  let mergedArray: any[] = [];
-  if(type == 'create'){
-    mergedArray = [data, ...detailList.value];
-  }if(type == 'update'){
-    detailList.value = detailList.value.filter(item => item.id !== data.id);
-    mergedArray = [data, ...detailList.value];
+const validateIfRepeat = (type, data) => {
+  let mergedArray: any[] = []
+  if (type == 'create') {
+    mergedArray = [data, ...detailList.value]
+  }
+  if (type == 'update') {
+    detailList.value = detailList.value.filter((item) => item.id !== data.id)
+    mergedArray = [data, ...detailList.value]
   }
-  const stageSet = new Set(mergedArray.map(item => item.stage));
-  return stageSet.size === mergedArray.length;
+  const stageSet = new Set(mergedArray.map((item) => item.stage))
+  return stageSet.size === mergedArray.length
 }
 
 const validateDetailEmpty = (data) => {
-  const codes = data.map(item => item.stage);
-  if(codes.length == 0){
-    return false;
+  const codes = data.map((item) => item.stage)
+  if (codes.length == 0) {
+    return false
   }
-  return true;
+  return true
 }
 const validateNotRepetition = (data) => {
   // 提取所有的 dictionaryTypeAndCode 值
-  const codes = data.map(item => item.stage);
+  const codes = data.map((item) => item.stage)
   // 创建一个 Set 来存储唯一的 dictionaryTypeAndCode 值
-  const uniqueCodes = new Set(codes);
+  const uniqueCodes = new Set(codes)
   // 如果原始数组的长度大于 Set 集合的大小，则说明有重复
   if (codes.length > uniqueCodes.size) {
-    return false; // 发现重复，返回 false
+    return false // 发现重复，返回 false
   }
-  return true; // 未发现重复，返回 true
-};
+  return true // 未发现重复，返回 true
+}
 
 /** 初始化 **/
 onMounted(async () => {
-    tableObject.params = {
-    available: true
-  }
+  tableObject.params = {
+    available: true
+  }
   getList()
   importTemplateData.templateUrl = await DynamicRuleApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index 3c188f9dd..df041bc5b 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -389,6 +389,7 @@ const tableData = ref([])
 const submitForm = async (formType, data) => {
   // return
   try {
+    formRef.value.formLoading = true
     if (formType === 'create') {
       await InspectionJobMainApi.createInspectionJobMain(data)
       message.success(t('common.createSuccess'))
@@ -397,6 +398,7 @@ const submitForm = async (formType, data) => {
       message.success(t('common.updateSuccess'))
     }
     formRef.value.dialogVisible = false
+    formRef.value.formLoading = false
     // 刷新当前列表
     getList()
   } finally {
diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue
index 29a9a5cd0..0fd66b4a8 100644
--- a/src/views/qms/inspectionMethod/index.vue
+++ b/src/views/qms/inspectionMethod/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InspectionMethod.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="InspectionMethod.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="InspectionMethod.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="InspectionMethod.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -42,12 +50,14 @@
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
-    :sumFormDataByForm ="(formRef,formModel)=>{
-      const {videoAddress} = formModel
-      formRef.value.setValues({
-        installPackageUrl:videoAddress
-      })
-    }"
+    :sumFormDataByForm="
+      (formRef, formModel) => {
+        const { videoAddress } = formModel
+        formRef.value.setValues({
+          installPackageUrl: videoAddress
+        })
+      }
+    "
     :rules="InspectionMethodRules"
     :formAllSchemas="InspectionMethod.allSchemas"
     :apiUpdate="InspectionMethodApi.updateInspectionMethod"
@@ -73,7 +83,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { InspectionMethod,InspectionMethodRules } from './inspectionMethod.data'
+import { InspectionMethod, InspectionMethodRules } from './inspectionMethod.data'
 import * as InspectionMethodApi from '@/api/qms/inspectionMethod'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -113,12 +123,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:inspection-method:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:inspection-method:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:inspection-method:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:inspection-method:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:inspection-method:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-method:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -131,21 +141,27 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.available) > -1) {
     return false
   } else {
@@ -155,22 +171,30 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:inspection-method:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspection-method:enable'}),
-    defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:inspection-method:disable' }),
-    defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspection-method:delete'}), // 删除
+    defaultButtons.mainListEditBtn({ hasPermi: 'qms:inspection-method:update' }),
+    defaultButtons.mainListEnableBtn({
+      hide: isShowMainButton(row, ['FALSE']),
+      hasPermi: 'qms:inspection-method:enable'
+    }),
+    defaultButtons.mainListDisableBtn({
+      hide: isShowMainButton(row, ['TRUE']),
+      hasPermi: 'qms:inspection-method:disable'
+    }),
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:inspection-method:delete' }) // 删除
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  }else if (val == 'enable') {
+  } else if (val == 'enable') {
     handleEnable(row.id)
-  }else if (val == 'disable') {
+  } else if (val == 'disable') {
     handleDisable(row.id)
   }
 }
@@ -178,7 +202,7 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
-  if(row && row.videoAddress?.trim()){
+  if (row && row.videoAddress?.trim()) {
     row.filePathList = row.videoAddress.split(',')
   }
 
@@ -190,39 +214,47 @@ const openForm = (type: string, row?: any) => {
       }
     })
   }
-  if(type=='create'){
+  if (type == 'create') {
     const currentTime = new Date().getTime()
-    const fileId = InspectionMethod.allSchemas.formSchema.find(item=>item.field=='fileId')
-    const uploadFile = InspectionMethod.allSchemas.formSchema.find(item=>item.field=='videoAddress')
-    if(fileId){
+    const fileId = InspectionMethod.allSchemas.formSchema.find((item) => item.field == 'fileId')
+    const uploadFile = InspectionMethod.allSchemas.formSchema.find(
+      (item) => item.field == 'videoAddress'
+    )
+    if (fileId) {
       fileId['value'] = currentTime
     }
-    if(uploadFile){
+    if (uploadFile) {
       uploadFile['componentProps']['upData']['tableId'] = currentTime
-      uploadFile['componentProps']['modelValue']=  []
+      uploadFile['componentProps']['modelValue'] = []
     }
-  }else if(type=='update'){
-    const uploadFile = InspectionMethod.allSchemas.formSchema.find(item=>item.field=='videoAddress')
-    uploadFile['componentProps']['modelValue']=  row.filePathListView
-    
+  } else if (type == 'update') {
+    const uploadFile = InspectionMethod.allSchemas.formSchema.find(
+      (item) => item.field == 'videoAddress'
+    )
+    uploadFile['componentProps']['modelValue'] = row.filePathListView
   }
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  if (formType === 'create') {
-
-    delete data['uploadFile']
-    await InspectionMethodApi.createInspectionMethod(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    // debugger
-    await InspectionMethodApi.updateInspectionMethod(data)
-    message.success(t('common.updateSuccess'))
+const formsSuccess = async (formType, data) => {
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      delete data['uploadFile']
+      await InspectionMethodApi.createInspectionMethod(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      // debugger
+      await InspectionMethodApi.updateInspectionMethod(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -302,11 +334,10 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-    tableObject.params = {
-    available: true
-  }
+  tableObject.params = {
+    available: true
+  }
   getList()
   importTemplateData.templateUrl = await InspectionMethodApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue
index 84d0b942a..df2442aed 100644
--- a/src/views/qms/inspectionRecordFirst/index.vue
+++ b/src/views/qms/inspectionRecordFirst/index.vue
@@ -244,6 +244,7 @@ const handleMainExport = async (row: any) => {
   const submitForm = async (formType, data) => {
     // data.subList = tableData.value // 拼接子表数据参数
     try {
+      basicFormRef.value.formLoading = true
       if (formType === 'create') {
         await InspectionRecordMainApi.createInspectionRecordMain(data)
         message.success(t('common.createSuccess'))
@@ -252,6 +253,7 @@ const handleMainExport = async (row: any) => {
         message.success(t('common.updateSuccess'))
       }
       basicFormRef.value.dialogVisible = false
+      basicFormRef.value.formLoading = false
       // 刷新当前列表
       getList()
     } finally {
diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue
index 0d2adf9f3..6e1351e10 100644
--- a/src/views/qms/inspectionRequest/index.vue
+++ b/src/views/qms/inspectionRequest/index.vue
@@ -1,375 +1,456 @@
 <template>
   <div>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search :schema="InspectionMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-    :allSchemas="InspectionMain.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 }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
-      </template>
-    </Table>
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm 
-    ref="formRef"
-    @submitForm="submitForm"
-    basicFormWidth="60"
-    :rules="InspectionMainRules"
-    :formAllSchemas="InspectionMain.allSchemas"
-    :tableAllSchemas="InspectionRequestPackage.allSchemas"
-    :tableFormRules="InspectionRequestPackageRules"
-    :apiUpdate="InspectionMainApi.updateInspectionMain"
-    :apiCreate="InspectionMainApi.createInspectionMain"
-    :isBusiness="true"
-    :tableData="tableData"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-  />
-
-  <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="InspectionMain.allSchemas" />
-
-
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/request/inspection-main/import" :importTemplateData="importTemplateData"
-    @success="importSuccess" />
-  <!-- 包装信息 -->
-  <ListTable ref="listTableRef" titleName="包装信息" :allSchemas="InspectionMain.allSchemas"
-    :detailAllSchemas="InspectionRequestPackage.allSchemas" :detailAllSchemasRules="InspectionRequestPackageRules"
-    :list="list" @ListTableSubmit='ListTableSubmit'/>
+    <ContentWrap>
+      <!-- 搜索工作栏 -->
+      <Search
+        :schema="InspectionMain.allSchemas.searchSchema"
+        @search="setSearchParams"
+        @reset="setSearchParams"
+      />
+    </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InspectionMain.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 }">
+          <ButtonBase
+            :Butttondata="butttondata(row)"
+            @button-base-click="buttonTableClick($event, row)"
+          />
+        </template>
+      </Table>
+    </ContentWrap>
+
+    <!-- 表单弹窗：添加/修改 -->
+    <BasicForm
+      ref="formRef"
+      @submitForm="submitForm"
+      basicFormWidth="60"
+      :rules="InspectionMainRules"
+      :formAllSchemas="InspectionMain.allSchemas"
+      :tableAllSchemas="InspectionRequestPackage.allSchemas"
+      :tableFormRules="InspectionRequestPackageRules"
+      :apiUpdate="InspectionMainApi.updateInspectionMain"
+      :apiCreate="InspectionMainApi.createInspectionMain"
+      :isBusiness="true"
+      :tableData="tableData"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+    />
+
+    <!-- 详情 -->
+    <Detail ref="detailRef" :isBasic="true" :allSchemas="InspectionMain.allSchemas" />
+
+    <!-- 导入 -->
+    <ImportForm
+      ref="importFormRef"
+      url="/request/inspection-main/import"
+      :importTemplateData="importTemplateData"
+      @success="importSuccess"
+    />
+    <!-- 包装信息 -->
+    <ListTable
+      ref="listTableRef"
+      titleName="包装信息"
+      :allSchemas="InspectionMain.allSchemas"
+      :detailAllSchemas="InspectionRequestPackage.allSchemas"
+      :detailAllSchemasRules="InspectionRequestPackageRules"
+      :list="list"
+      @ListTableSubmit="ListTableSubmit"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { InspectionMain, InspectionMainRules,InspectionRequestPackage,InspectionRequestPackageRules } from './inspectionRequestMain.data'
-  import * as InspectionMainApi from '@/api/qms/inspectionRequest'
-  import * as InspectionRequestPackageApi from '@/api/qms/inspectionRequest/InspectionRequestPackage'
-  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-  import ListTable from '@/components/ListTable/src/ListTable.vue'
-  import TableHead from '@/components/TableHead/src/TableHead.vue'
-  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-  // import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
-
-  defineOptions({ name: 'InspectionMain' })
-
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  routeName.value = route.name
-  const tableColumns = ref(InspectionMain.allSchemas.tableColumns)
-
-  // 查询页面返回
-  const searchTableSuccess = (formField, searchField, val, formRef) => {
-    console.log(formField)
-    console.log(searchField)
-    console.log(val)
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      if(formField == 'itemCode'){
-        setV['itemName'] = val[0].name
-      }else  if(formField == 'supplierCode'){
-        setV['supplierName'] = val[0].name
-      }
-
-      formRef.setValues(setV)
-    })
-  }
-
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    tableColumns.value = val
-  }
+import download from '@/utils/download'
+import {
+  InspectionMain,
+  InspectionMainRules,
+  InspectionRequestPackage,
+  InspectionRequestPackageRules
+} from './inspectionRequestMain.data'
+import * as InspectionMainApi from '@/api/qms/inspectionRequest'
+import * as InspectionRequestPackageApi from '@/api/qms/inspectionRequest/InspectionRequestPackage'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import ListTable from '@/components/ListTable/src/ListTable.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+// import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
+
+defineOptions({ name: 'InspectionMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InspectionMain.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  console.log(formField)
+  console.log(searchField)
+  console.log(val)
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if (formField == 'itemCode') {
+      setV['itemName'] = val[0].name
+    } else if (formField == 'supplierCode') {
+      setV['supplierName'] = val[0].name
+    }
 
-  const { tableObject, tableMethods } = useTable({
-    getListApi: InspectionMainApi.getInspectionMainPage // 分页接口
+    formRef.setValues(setV)
   })
+}
 
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
 
-  // 列表头部按钮
-  const HeadButttondata = [
-    defaultButtons.defaultAddBtn({hasPermi: 'qms:inspection-request-main:create' }), // 新增
-    // defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionMain:import' }), // 导入
-    // defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspectionMain:export' }), // 导出
-    defaultButtons.defaultFreshBtn(null), // 刷新
-    defaultButtons.defaultFilterBtn(null), // 筛选
-    defaultButtons.defaultSetBtn(null), // 设置
-    // {
-    //   label: '自定义扩展按钮',
-    //   name: 'zdy',
-    //   hide: false,
-    //   type: 'primary',
-    //   icon: 'Select',
-    //   color: ''
-    // },
-  ]
+const { tableObject, tableMethods } = useTable({
+  getListApi: InspectionMainApi.getInspectionMainPage // 分页接口
+})
 
-  // 头部按钮事件
-  const buttonBaseClick = (val, item) => {
-    if (val == 'add') { // 新增
-      openForm('create')
-    } else if (val == 'import') { // 导入
-      handleImport()
-    } else if (val == 'export') { // 导出
-      handleExport()
-    } else if (val == 'refresh') { // 刷新
-      tableObject.params.isSearch = false
-      tableObject.params.filters = ''
-      getList()
-    } else if (val == 'filtrate') { // 筛选
-    } else { // 其他按钮
-      console.log('其他按钮', item)
-    }
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:inspection-request-main:create' }), // 新增
+  // defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionMain:import' }), // 导入
+  // defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspectionMain:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    tableObject.params.isSearch = false
+    tableObject.params.filters = ''
+    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) => {
-    return [
-      defaultButtons.mainListCloseBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4', '6']), hasPermi: 'qms:inspection-request-main:close' }), // 关闭
-      // defaultButtons.mainListReAddBtn({ hide: isShowMainButton(row, ['5']), hasPermi: 'qms:inspection-request-main:reAdd' }), //重新添加
-      defaultButtons.mainListSubmitBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'qms:inspection-request-main:submit' }), // 提交审批
-      defaultButtons.mainListTurnDownBtn({ hide: isShowMainButton(row, ['2']), hasPermi: 'qms:inspection-request-main:refused' }), // 驳回
-      defaultButtons.mainListApproveBtn({ hide: isShowMainButton(row, ['2']), hasPermi: 'qms:inspection-request-main:agree' }), // 审批通过
-      defaultButtons.mainListHandleBtn({ hide: isShowMainButton(row, ['3']), hasPermi:  'qms:inspection-request-main:handle' }), // 处理
-      defaultButtons.mainListPackageBtn(null), // 包装
-      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-request-main:edit'}), // 编辑
-    ]
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
   }
+}
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListCloseBtn({
+      hide: isShowMainButton(row, ['1', '2', '3', '4', '6']),
+      hasPermi: 'qms:inspection-request-main:close'
+    }), // 关闭
+    // defaultButtons.mainListReAddBtn({ hide: isShowMainButton(row, ['5']), hasPermi: 'qms:inspection-request-main:reAdd' }), //重新添加
+    defaultButtons.mainListSubmitBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'qms:inspection-request-main:submit'
+    }), // 提交审批
+    defaultButtons.mainListTurnDownBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'qms:inspection-request-main:refused'
+    }), // 驳回
+    defaultButtons.mainListApproveBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'qms:inspection-request-main:agree'
+    }), // 审批通过
+    defaultButtons.mainListHandleBtn({
+      hide: isShowMainButton(row, ['3']),
+      hasPermi: 'qms:inspection-request-main:handle'
+    }), // 处理
+    defaultButtons.mainListPackageBtn(null), // 包装
+    defaultButtons.mainListEditBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'qms:inspection-request-main:edit'
+    }) // 编辑
+  ]
+}
 const listTableRef = ref()
 const list = ref([])
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
-    if (val == 'mainClose') { // 关闭
-      handleClose(row.id)
-    } else if (val == 'mainReAdd') { // 重新添加
-      handleReAdd(row.id)
-    } else if (val == 'mainSubmit') { // 提交审批
-      handleSubmit(row.id)
-    } else if (val == 'mainTurnDown') { // 驳回
-      handleRefused(row.id)
-    } else if (val == 'mainApprove') { // 审批通过
-      handleAgree(row.id)
-    } else if (val == 'mainHandle') { // 处理
-      handleHandle(row.id)
-    } else if (val == 'edit') { // 编辑
-      openForm('update', row)
-    }else if (val == 'mainPackage') { // 包装
-      list.value = await InspectionRequestPackageApi.getInspectionRequestPackageList(row.id)
-      // row.status = '1'
-      listTableRef.value.openPackage(row,'包装信息',InspectionRequestPackage.allSchemas.tableColumns)
-    }
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') {
+    // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') {
+    // 重新添加
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') {
+    // 提交审批
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') {
+    // 驳回
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') {
+    // 审批通过
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') {
+    // 处理
+    handleHandle(row.id)
+  } else if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'mainPackage') {
+    // 包装
+    list.value = await InspectionRequestPackageApi.getInspectionRequestPackageList(row.id)
+    // row.status = '1'
+    listTableRef.value.openPackage(
+      row,
+      '包装信息',
+      InspectionRequestPackage.allSchemas.tableColumns
+    )
   }
+}
 
-  /** 关闭按钮操作 */
-  const handleClose = async (id : number) => {
-    try{
-      await message.confirm(t('common.confirmColse'))
-      tableObject.loading = true
-      await InspectionMainApi.closeInspectRequestMain(id)
-      message.success(t('common.closeSuccess'))
-      await getList()
-    }catch{}finally{
-      tableObject.loading = false
-    }
-      
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await InspectionMainApi.closeInspectRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {
+  } finally {
+    tableObject.loading = false
   }
+}
 
-  /** 重新添加按钮操作 */
-  const handleReAdd = async (id : number) => {
-    try{
-      await message.confirm(t('common.confirmReAdd'))
-      tableObject.loading = true
-      await InspectionMainApi.reAddInspectRequestMain(id)
-      message.success(t('common.reAddSuccess'))
-      await getList()
-    }catch{}finally{
-      tableObject.loading = false
-    }
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await InspectionMainApi.reAddInspectRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {
+  } finally {
+    tableObject.loading = false
   }
+}
 
-  /** 审批通过按钮操作 */
-  const handleAgree = async (id : number) => {
-    try{
-      await message.confirm(t('common.confirmAgree'))
-      tableObject.loading = true
-      await InspectionMainApi.agreeInspectRequestMain(id)
-      message.success(t('common.agreeSuccess'))
-      await getList()
-    }catch{}finally{
-      tableObject.loading = false
-    }
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await InspectionMainApi.agreeInspectRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {
+  } finally {
+    tableObject.loading = false
   }
+}
 
-  /** 审批驳回按钮操作 */
-  const handleRefused = async (id : number) => {
-    try{
-      await message.confirm(t('common.confirmRefused'))
-      tableObject.loading = true
-      await InspectionMainApi.refusedInspectRequestMain(id)
-      message.success(t('common.refusedSuccess'))
-      await getList()
-    }catch{}finally{
-      tableObject.loading = false
-    }
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await InspectionMainApi.refusedInspectRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {
+  } finally {
+    tableObject.loading = false
   }
+}
 
-  /** 处理按钮操作 */
-  const handleHandle = async (id : number) => {
-    try{
-      await message.confirm(t('common.confirmHandle'))
-      tableObject.loading = true
-      await InspectionMainApi.handleInspectRequestMain(id)
-      message.success(t('common.dealwithSuccess'))
-      await getList()
-    }catch{}finally{
-      tableObject.loading = false
-    }
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await InspectionMainApi.handleInspectRequestMain(id)
+    message.success(t('common.dealwithSuccess'))
+    await getList()
+  } catch {
+  } finally {
+    tableObject.loading = false
   }
+}
 
-  /** 提交按钮操作 */
-  const handleSubmit = async (id : number) => {
-    try{
-      await message.confirm(t('common.confirmSubmit'))
-      tableObject.loading = true
-      await InspectionMainApi.submitInspectRequestMain(id)
-      message.success(t('common.submitSuccess'))
-      await getList()
-    }catch{}finally{
-      tableObject.loading = false
-    }
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await InspectionMainApi.submitInspectRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {
+  } finally {
+    tableObject.loading = false
   }
+}
 
-  /** 添加/修改操作 */
-  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)
+}
 
-  // form表单提交
-  const submitForm = async (formType, data) => {
-    var isHave = InspectionMain.allSchemas.formSchema.some(function (item) {
-      return item.field === 'requestStartTime' || item.field === 'requestEndTime';
-    });
-    if (isHave){
-      if (data.requestStartTime && data.requestEndTime && data.requestStartTime >= data.requestEndTime) {
-        message.error('要求结束时间要大于要求开始时间')
-        return;
-      }
+// form表单提交
+const submitForm = async (formType, data) => {
+  var isHave = InspectionMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'requestStartTime' || item.field === 'requestEndTime'
+  })
+  if (isHave) {
+    if (
+      data.requestStartTime &&
+      data.requestEndTime &&
+      data.requestStartTime >= data.requestEndTime
+    ) {
+      message.error('要求结束时间要大于要求开始时间')
+      return
     }
-    if (data.requestStartTime == 0) data.requestStartTime = null;
-    if (data.requestEndTime == 0) data.requestEndTime = null;
-    data.inspectionRequestPackageCreateReqVO = tableData.value // 拼接子表数据参数
-    try{
-      if (formType === 'create') {
+  }
+  if (data.requestStartTime == 0) data.requestStartTime = null
+  if (data.requestEndTime == 0) data.requestEndTime = null
+  data.inspectionRequestPackageCreateReqVO = tableData.value // 拼接子表数据参数
+  try {
+    formRef.value.formLoading = true
+    if (formType === 'create') {
       await InspectionMainApi.createInspectionMain(data)
       message.success(t('common.createSuccess'))
-      } else {
-        await InspectionMainApi.updateInspectionMain(data)
-        message.success(t('common.updateSuccess'))
-      }
-      formRef.value.dialogVisible = false
-      getList()
-    }finally{
-      formRef.value.formLoading = false
+    } else {
+      await InspectionMainApi.updateInspectionMain(data)
+      message.success(t('common.updateSuccess'))
     }
+    formRef.value.dialogVisible = false
+    formRef.value.formLoading = false
+    getList()
+  } finally {
+    formRef.value.formLoading = false
   }
+}
 
-  /** 详情操作 */
-  const detailRef = ref()
-  const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionMain')
-  }
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionMain')
+}
 
-  /** 删除按钮操作 */
-  const handleDelete = async (id : number) => {
-    try {
-      // 删除的二次确认
-      await message.delConfirm()
-      // 发起删除
-      await InspectionMainApi.deleteInspectionMain(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await InspectionMainApi.deleteInspectionMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
 
-  /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await InspectionMainApi.exportInspectionMain(tableObject.params)
-      download.excel(data, '检验申请.xlsx')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InspectionMainApi.exportInspectionMain(tableObject.params)
+    download.excel(data, '检验申请.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
+}
 
-  /** 导入 */
-  const importFormRef = ref()
-  const handleImport = () => {
-    importFormRef.value.open()
-  }
-  // 导入附件弹窗所需的参数
-  const importTemplateData = reactive({
-    templateUrl: '',
-    templateTitle: '检验申请导入模版.xlsx'
-  })
-  // 导入成功之后
-  const importSuccess = () => {
-    getList()
-  }
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '检验申请导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
 
-  // 筛选提交
-  const searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
+  getList() // 刷新当前列表
+}
 /**
-  * tableForm方法
-*/
+ * tableForm方法
+ */
 const tableFormKeys = {}
-InspectionRequestPackage.allSchemas.tableFormColumns.forEach(item => {
+InspectionRequestPackage.allSchemas.tableFormColumns.forEach((item) => {
   tableFormKeys[item.field] = item.default ? item.default : ''
 })
 const tableData = ref([])
@@ -382,26 +463,26 @@ const handleAddTable = () => {
 const handleDeleteTable = (item, index) => {
   tableData.value.splice(index, 1)
 }
-const ListTableSubmit =async (formType,data)=>{
-console.log(formType,data)
- if (formType === 'create') {
-      await InspectionRequestPackageApi.createInspectionRequestPackage(data)
-      message.success(t('common.createSuccess'))
-    } else if(formType === 'updete') {
-      await InspectionRequestPackageApi.updateInspectionRequestPackage(data)
-      message.success(t('common.updateSuccess'))
-    }else {
-      await InspectionRequestPackageApi.deleteInspectionRequestPackage(data.id)
-      message.success(t('common.updateSuccess'))
-    }
-    list.value = await InspectionRequestPackageApi.getInspectionRequestPackageList(data.masterId)
+const ListTableSubmit = async (formType, data) => {
+  console.log(formType, data)
+  if (formType === 'create') {
+    await InspectionRequestPackageApi.createInspectionRequestPackage(data)
+    message.success(t('common.createSuccess'))
+  } else if (formType === 'updete') {
+    await InspectionRequestPackageApi.updateInspectionRequestPackage(data)
+    message.success(t('common.updateSuccess'))
+  } else {
+    await InspectionRequestPackageApi.deleteInspectionRequestPackage(data.id)
+    message.success(t('common.updateSuccess'))
+  }
+  list.value = await InspectionRequestPackageApi.getInspectionRequestPackageList(data.masterId)
 }
-  /** 初始化 **/
+/** 初始化 **/
 onMounted(async () => {
-      tableObject.params = {
-    available: true
-  }
-    getList()
-    importTemplateData.templateUrl = await InspectionMainApi.importTemplate()
-  })
+  tableObject.params = {
+    available: true
+  }
+  getList()
+  importTemplateData.templateUrl = await InspectionMainApi.importTemplate()
+})
 </script>
diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue
index e385e67c2..858856700 100644
--- a/src/views/qms/inspectionScheme/index.vue
+++ b/src/views/qms/inspectionScheme/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InspectionSchemeMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="InspectionSchemeMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="InspectionSchemeMain.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="InspectionSchemeMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #reqCode="{row}">
+      <template #reqCode="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.reqCode)">
           <span>{{ row.reqCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -60,16 +68,21 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import {InspectionSchemeMain } from './inspectionScheme.data'
-import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../inspectionTemplate/inspectionTemplate.data'
+import { InspectionSchemeMain } from './inspectionScheme.data'
+import {
+  InspectionTemplateMain,
+  InspectionTemplateProcess,
+  InspectionTemplateFeatures,
+  InspectionTemplateRules
+} from '../inspectionTemplate/inspectionTemplate.data'
 
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import AddForm from './addForm.vue'
 import * as InspectionSchemeApi from '@/api/qms/inspectionScheme'
-import ImportForm from "../../../components/ImportForm/src/ImportForm.vue";
-import * as SampleCodeApi from "@/api/qms/sampleCode";
+import ImportForm from '../../../components/ImportForm/src/ImportForm.vue'
+import * as SampleCodeApi from '@/api/qms/sampleCode'
 
 defineOptions({ name: 'InspectionScheme' })
 
@@ -95,12 +108,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:inspection-scheme:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:inspection-scheme:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:inspection-scheme:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:inspection-scheme:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:inspection-scheme:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-scheme:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -113,21 +126,27 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.available) > -1) {
     return false
   } else {
@@ -137,25 +156,33 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:inspection-scheme:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspection-scheme:enable'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspection-scheme:disable'}),
+    defaultButtons.mainListEditBtn({ hasPermi: 'qms:inspection-scheme:update' }),
+    defaultButtons.mainListEnableBtn({
+      hide: isShowMainButton(row, ['FALSE']),
+      hasPermi: 'qms:inspection-scheme:enable'
+    }),
+    defaultButtons.mainListDisableBtn({
+      hide: isShowMainButton(row, ['TRUE']),
+      hasPermi: 'qms:inspection-scheme:disable'
+    }),
     defaultButtons.mainCopyBtn({ hasPermi: 'qms:programme-template:copy' }),
-    defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspection-scheme:delete'}), // 删除
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:inspection-scheme:delete' }) // 删除
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  }else if (val == 'enable') {
+  } else if (val == 'enable') {
     handleEnable(row.id)
-  }else if (val == 'disable') {
+  } else if (val == 'disable') {
     handleDisable(row.id)
-  }else if (val == 'copy') {
+  } else if (val == 'copy') {
     openForm('create', row)
   }
 }
@@ -170,19 +197,19 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const submitForm = async (formType,data) => {
-  var isHave =InspectionSchemeMain.allSchemas.formSchema.some(function (item) {
-    return item.field === 'effectiveDate' || item.field === 'expirationDate';
-  });
-  if(isHave){
-    if(data.effectiveDate && data.expirationDate && data.effectiveDate >=data.expirationDate){
+const submitForm = async (formType, data) => {
+  var isHave = InspectionSchemeMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'effectiveDate' || item.field === 'expirationDate'
+  })
+  if (isHave) {
+    if (data.effectiveDate && data.expirationDate && data.effectiveDate >= data.expirationDate) {
       message.error('失效时间要大于生效时间')
-      return;
+      return
     }
   }
   const data1 = {
     id: data.id,
-    dynamicUpdateCode:data.dynamicUpdateCode,
+    dynamicUpdateCode: data.dynamicUpdateCode,
     code: data.code,
     description: data.description,
     itemCode: data.itemCode,
@@ -197,17 +224,23 @@ const submitForm = async (formType,data) => {
     samplePieceSize: data.samplePieceSize,
     uom: data.uom,
     available: data.available,
-    content:JSON.stringify(data.process)
+    content: JSON.stringify(data.process)
   }
-  if (formType === 'create') {
-    await InspectionSchemeApi.InspectionSchemeCreat(data1)
-    message.success(t('common.createSuccess'))
-  } else {
-    await InspectionSchemeApi.InspectionSchemeUpdate(data1)
-    message.success(t('common.updateSuccess'))
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await InspectionSchemeApi.InspectionSchemeCreat(data1)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InspectionSchemeApi.InspectionSchemeUpdate(data1)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -287,11 +320,10 @@ const importSuccess = () => {
 
 /** 初始化 **/
 onMounted(async () => {
-    tableObject.params = {
-    available: true
-  }
+  tableObject.params = {
+    available: true
+  }
   getList()
   importTemplateData.templateUrl = await InspectionSchemeApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/inspectionStage/index.vue b/src/views/qms/inspectionStage/index.vue
index dcbbb196a..ac7db008e 100644
--- a/src/views/qms/inspectionStage/index.vue
+++ b/src/views/qms/inspectionStage/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InspectionStage.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="InspectionStage.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="InspectionStage.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="InspectionStage.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -54,12 +59,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="InspectionStage.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/qms/inspection-stage/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/qms/inspection-stage/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { InspectionStage,InspectionStageRules } from './inspectionStage.data'
+import { InspectionStage, InspectionStageRules } from './inspectionStage.data'
 import * as InspectionStageApi from '@/api/qms/inspectionStage'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -99,12 +109,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:inspectionStage:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:inspectionStage:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:inspectionStage:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:inspectionStage:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionStage:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspectionStage:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -117,31 +127,39 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:inspectionStage:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:inspectionStage:delete'}), // 删除
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:inspectionStage:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:inspectionStage:delete' }) // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -153,27 +171,33 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =InspectionStage.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = InspectionStage.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;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await InspectionStageApi.createInspectionStage(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await InspectionStageApi.updateInspectionStage(data)
-    message.success(t('common.updateSuccess'))
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await InspectionStageApi.createInspectionStage(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InspectionStageApi.updateInspectionStage(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -240,5 +264,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await InspectionStageApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/inspectionTemplate/index.vue b/src/views/qms/inspectionTemplate/index.vue
index 2b4151705..3a506ec9c 100644
--- a/src/views/qms/inspectionTemplate/index.vue
+++ b/src/views/qms/inspectionTemplate/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InspectionTemplateMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="InspectionTemplateMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="InspectionTemplateMain.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="InspectionTemplateMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #reqCode="{row}">
+      <template #reqCode="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.reqCode)">
           <span>{{ row.reqCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -49,11 +57,7 @@
     @submitForm="submitForm"
   />
   <!-- 详情 -->
-  <Detail 
-    ref="detailRef" 
-    :isBasic="true" 
-    :allSchemas="InspectionTemplateMain.allSchemas" 
-    />
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="InspectionTemplateMain.allSchemas" />
 
   <!-- 导入 -->
   <ImportForm
@@ -69,7 +73,12 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from './inspectionTemplate.data'
+import {
+  InspectionTemplateMain,
+  InspectionTemplateProcess,
+  InspectionTemplateFeatures,
+  InspectionTemplateRules
+} from './inspectionTemplate.data'
 
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -101,12 +110,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:programme-template:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:programme-template:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:programme-template:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:programme-template:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:programme-template:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:programme-template:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -119,16 +128,22 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
@@ -149,7 +164,7 @@ const handleExport = async () => {
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.available) > -1) {
     return false
   } else {
@@ -159,25 +174,33 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:programme-template:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:programme-template:enable'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:programme-template:disable'}),
+    defaultButtons.mainListEditBtn({ hasPermi: 'qms:programme-template:update' }),
+    defaultButtons.mainListEnableBtn({
+      hide: isShowMainButton(row, ['FALSE']),
+      hasPermi: 'qms:programme-template:enable'
+    }),
+    defaultButtons.mainListDisableBtn({
+      hide: isShowMainButton(row, ['TRUE']),
+      hasPermi: 'qms:programme-template:disable'
+    }),
     defaultButtons.mainCopyBtn({ hasPermi: 'qms:programme-template:copy' }),
-    defaultButtons.mainListDeleteBtn({hasPermi:'qms:programme-template:delete'}), // 删除
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:programme-template:delete' }) // 删除
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  }else if (val == 'enable') {
+  } else if (val == 'enable') {
     handleEnable(row.id)
-  }else if (val == 'disable') {
+  } else if (val == 'disable') {
     handleDisable(row.id)
-  }else if (val == 'copy') {
+  } else if (val == 'copy') {
     openForm('create', row)
   }
 }
@@ -189,16 +212,22 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const submitForm = async (formType,data) => {
-  if (formType === 'create') {
-    await InspectionProcessPageApi.inspectionTemplateCreat(data.value)
-    message.success(t('common.createSuccess'))
-  } else {
-    await InspectionProcessPageApi.inspectionTemplateUpdate(data.value)
-    message.success(t('common.updateSuccess'))
+const submitForm = async (formType, data) => {
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await InspectionProcessPageApi.inspectionTemplateCreat(data.value)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InspectionProcessPageApi.inspectionTemplateUpdate(data.value)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -263,11 +292,10 @@ const importSuccess = () => {
 
 /** 初始化 **/
 onMounted(async () => {
-    tableObject.params = {
-    available: true
-  }
+  tableObject.params = {
+    available: true
+  }
   getList()
   importTemplateData.templateUrl = await InspectionProcessPageApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/qualityNotice/index.vue b/src/views/qms/qualityNotice/index.vue
index 064613a52..56a0ff62f 100644
--- a/src/views/qms/qualityNotice/index.vue
+++ b/src/views/qms/qualityNotice/index.vue
@@ -184,6 +184,7 @@
   // 主子数据 提交
   const submitForm = async (formType, data) => {
     try {
+      formRef.value.formLoading = true
       if (formType === 'create') {
         await qualityNoticeApi.qualityNoticeCreat(data)
         message.success(t('common.createSuccess'))
@@ -192,6 +193,7 @@
         message.success(t('common.updateSuccess'))
       }
       formRef.value.dialogVisible = false
+      formRef.value.formLoading = false
       // 刷新当前列表
       getList()
     } finally {
diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue
index 38ed151c0..9288e264f 100644
--- a/src/views/qms/sampleCode/index.vue
+++ b/src/views/qms/sampleCode/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SampleCode.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="SampleCode.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="SampleCode.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SampleCode.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -55,12 +63,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="SampleCode.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/qms/sample-code/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/qms/sample-code/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { SampleCode,SampleCodeRules } from './sampleCode.data'
+import { SampleCode, SampleCodeRules } from './sampleCode.data'
 import * as SampleCodeApi from '@/api/qms/sampleCode'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -100,12 +113,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:sample-code:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:sample-code:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:sample-code:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:sample-code:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:sample-code:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:sample-code:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -118,27 +131,33 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     tableObject.params.isSearch = false
     tableObject.params.filters = ''
-  //   tableObject.params = {
-  //   isSearch: true,
-  //   filters: searchData.filters
-  // }
+    //   tableObject.params = {
+    //   isSearch: true,
+    //   filters: searchData.filters
+    // }
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.available) > -1) {
     return false
   } else {
@@ -148,23 +167,30 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:sample-code:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sample-code:enable'}),
-    defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:sample-code:disable' }),
-    defaultButtons.mainListDeleteBtn({hasPermi:'qms:sample-code:delete'}), // 删除
+    defaultButtons.mainListEditBtn({ hasPermi: 'qms:sample-code:update' }),
+    defaultButtons.mainListEnableBtn({
+      hide: isShowMainButton(row, ['FALSE']),
+      hasPermi: 'qms:sample-code:enable'
+    }),
+    defaultButtons.mainListDisableBtn({
+      hide: isShowMainButton(row, ['TRUE']),
+      hasPermi: 'qms:sample-code:disable'
+    }),
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:sample-code:delete' }) // 删除
   ]
 }
 
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  }else if (val == 'enable') {
+  } else if (val == 'enable') {
     handleEnable(row.id)
-  }else if (val == 'disable') {
+  } else if (val == 'disable') {
     handleDisable(row.id)
   }
 }
@@ -176,32 +202,38 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  if(data.batchLowLimiting >= data.batchUpperLimiting){
+const formsSuccess = async (formType, data) => {
+  if (data.batchLowLimiting >= data.batchUpperLimiting) {
     message.alertWarning('批量上限须大于批量下限')
     basicFormRef.value.formLoading = false
     return
   }
-  var isHave =SampleCode.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+  var isHave = SampleCode.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;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await SampleCodeApi.createSampleCode(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await SampleCodeApi.updateSampleCode(data)
-    message.success(t('common.updateSuccess'))
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await SampleCodeApi.createSampleCode(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SampleCodeApi.updateSampleCode(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -279,21 +311,20 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 const onChange = async (field, value, formRef) => {
-  if(field == "batchLowLimiting" || field == "batchUpperLimiting"){
+  if (field == 'batchLowLimiting' || field == 'batchUpperLimiting') {
     var upperLimit = formRef.value.formModel.batchUpperLimiting
     var lowLimit = formRef.value.formModel.batchLowLimiting
-    if(parseInt(upperLimit) <= parseInt(lowLimit)){
-      message.warning("批量上限须大于批量下限")
+    if (parseInt(upperLimit) <= parseInt(lowLimit)) {
+      message.warning('批量上限须大于批量下限')
     }
   }
 }
 /** 初始化 **/
 onMounted(async () => {
-   tableObject.params = {
+  tableObject.params = {
     available: true
   }
   getList()
   importTemplateData.templateUrl = await SampleCodeApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue
index 7733e50c5..1d5254334 100644
--- a/src/views/qms/samplingProcess/index.vue
+++ b/src/views/qms/samplingProcess/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SamplingProcess.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="SamplingProcess.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="SamplingProcess.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SamplingProcess.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -68,13 +76,13 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { SamplingProcess,SamplingProcessRules } from './samplingProcess.data'
+import { SamplingProcess, SamplingProcessRules } from './samplingProcess.data'
 import * as SamplingProcessApi from '@/api/qms/samplingProcess'
 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 {validatePercent, validateInteger, validateTwoNum } from '@/utils/validator'
+import { validatePercent, validateInteger, validateTwoNum } from '@/utils/validator'
 
 defineOptions({ name: 'SamplingProcess' })
 
@@ -109,12 +117,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:sampling-process:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:sampling-process:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:sampling-process:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:sampling-process:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:sampling-process:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:sampling-process:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -127,21 +135,27 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.available) > -1) {
     return false
   } else {
@@ -151,22 +165,30 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:sampling-process:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampling-process:enable'}),
-    defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:sampling-process:disable' }),
-    defaultButtons.mainListDeleteBtn({hasPermi:'qms:sampling-process:delete'}), // 删除
+    defaultButtons.mainListEditBtn({ hasPermi: 'qms:sampling-process:update' }),
+    defaultButtons.mainListEnableBtn({
+      hide: isShowMainButton(row, ['FALSE']),
+      hasPermi: 'qms:sampling-process:enable'
+    }),
+    defaultButtons.mainListDisableBtn({
+      hide: isShowMainButton(row, ['TRUE']),
+      hasPermi: 'qms:sampling-process:disable'
+    }),
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:sampling-process:delete' }) // 删除
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  }else if (val == 'enable') {
+  } else if (val == 'enable') {
     handleEnable(row.id)
-  }else if (val == 'disable') {
+  } else if (val == 'disable') {
     handleDisable(row.id)
   }
 }
@@ -175,27 +197,34 @@ const buttonTableClick = async (val, row) => {
 const basicFormRef = ref()
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =SamplingProcess.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = SamplingProcess.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;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await SamplingProcessApi.createSamplingProcess(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await SamplingProcessApi.updateSamplingProcess(data)
-    message.success(t('common.updateSuccess'))
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await SamplingProcessApi.createSamplingProcess(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SamplingProcessApi.updateSamplingProcess(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -265,74 +294,85 @@ const importSuccess = () => {
 }
 
 const updateFormFields = (sampleType, formRef) => {
-  let sampleQtyLabel = '';
-  let sampleQtyDisabled = false;
-  let sampleProgCodeDisabled = true;
-  let sampleQtyRequired = false;
-  let sampleProgCodeRequired = false;
+  let sampleQtyLabel = ''
+  let sampleQtyDisabled = false
+  let sampleProgCodeDisabled = true
+  let sampleQtyRequired = false
+  let sampleProgCodeRequired = false
 
   switch (sampleType) {
     case '1':
-      sampleQtyLabel = '样品份数';
-      sampleQtyDisabled = true;
-      sampleQtyRequired = false;
-      SamplingProcessRules.sampleQty = [{ required: false, message: '该项为必填项', trigger: 'blur'}]
-      break;
+      sampleQtyLabel = '样品份数'
+      sampleQtyDisabled = true
+      sampleQtyRequired = false
+      SamplingProcessRules.sampleQty = [
+        { required: false, message: '该项为必填项', trigger: 'blur' }
+      ]
+      break
     case '2':
-      sampleQtyLabel = '样品份数(%)';
-      sampleQtyDisabled = false;
-      sampleQtyRequired = true;
-         SamplingProcessRules.sampleQty = [{ required: true, message: '该项为必填项', trigger: 'blur' },{validator:validatePercent, message: '百分比范围 0 ~ 100', trigger: 'blur'},{validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}]
-      
-      break;
+      sampleQtyLabel = '样品份数(%)'
+      sampleQtyDisabled = false
+      sampleQtyRequired = true
+      SamplingProcessRules.sampleQty = [
+        { required: true, message: '该项为必填项', trigger: 'blur' },
+        { validator: validatePercent, message: '百分比范围 0 ~ 100', trigger: 'blur' },
+        { validator: validateTwoNum, message: '小数点后最多2位', trigger: 'blur' }
+      ]
+
+      break
     case '3':
-      sampleQtyLabel = '样品份数';
-      sampleQtyDisabled = false;
-      sampleQtyRequired = true;
-        SamplingProcessRules.sampleQty = [{ required: true, message: '该项为必填项', trigger: 'blur' },{validator:validateInteger, message: '样品份数必须为正整数', trigger: 'blur'}]
-      
-      break;
+      sampleQtyLabel = '样品份数'
+      sampleQtyDisabled = false
+      sampleQtyRequired = true
+      SamplingProcessRules.sampleQty = [
+        { required: true, message: '该项为必填项', trigger: 'blur' },
+        { validator: validateInteger, message: '样品份数必须为正整数', trigger: 'blur' }
+      ]
+
+      break
     case '4':
-      sampleQtyLabel = '样品份数';
-      sampleQtyDisabled = true;
-      sampleQtyRequired = false;
-      sampleProgCodeDisabled = false;
-      sampleProgCodeRequired = true;
-      SamplingProcessRules.sampleQty = [{ required: false, message: '该项为必填项', trigger: 'blur'}]
-      break;
+      sampleQtyLabel = '样品份数'
+      sampleQtyDisabled = true
+      sampleQtyRequired = false
+      sampleProgCodeDisabled = false
+      sampleProgCodeRequired = true
+      SamplingProcessRules.sampleQty = [
+        { required: false, message: '该项为必填项', trigger: 'blur' }
+      ]
+      break
     default:
-      break;
+      break
   }
 
-  SamplingProcess.allSchemas.formSchema.forEach(item => {
+  SamplingProcess.allSchemas.formSchema.forEach((item) => {
     if (item.field === 'sampleQty') {
-      item.label = sampleQtyLabel;
-      item.componentProps.disabled = sampleQtyDisabled;
+      item.label = sampleQtyLabel
+      item.componentProps.disabled = sampleQtyDisabled
     }
     if (item.field === 'sampleProgCode') {
-      item.componentProps.disabled = sampleProgCodeDisabled;
+      item.componentProps.disabled = sampleProgCodeDisabled
     }
-  });
+  })
 
-  SamplingProcessRules.sampleQty[0].required = sampleQtyRequired;
-  SamplingProcessRules.sampleProgCode[0].required = sampleProgCodeRequired;
+  SamplingProcessRules.sampleQty[0].required = sampleQtyRequired
+  SamplingProcessRules.sampleProgCode[0].required = sampleProgCodeRequired
 
   formRef.value.setValues({
     sampleQty: '',
-    sampleProgCode: '',
-  });
-};
+    sampleProgCode: ''
+  })
+}
 
 const openForm = async (type, row) => {
-  basicFormRef.value.open(type, row);
-  updateFormFields(row.sampleType, basicFormRef);
-};
+  basicFormRef.value.open(type, row)
+  updateFormFields(row.sampleType, basicFormRef)
+}
 
 const onChange = async (field, value, formRef) => {
   if (field === 'sampleType') {
-    updateFormFields(value, formRef);
+    updateFormFields(value, formRef)
   }
-};
+}
 
 // 筛选提交
 const searchFormClick = (searchData) => {
@@ -345,11 +385,10 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-    tableObject.params = {
-    available: true
-  }
+  tableObject.params = {
+    available: true
+  }
   getList()
   importTemplateData.templateUrl = await SamplingProcessApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/samplingScheme/index.vue b/src/views/qms/samplingScheme/index.vue
index 01c52c11a..cddeb98d1 100644
--- a/src/views/qms/samplingScheme/index.vue
+++ b/src/views/qms/samplingScheme/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SamplingScheme.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="SamplingScheme.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="SamplingScheme.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SamplingScheme.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -54,12 +62,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="SamplingScheme.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/qms/sampling-scheme/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/qms/sampling-scheme/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { SamplingScheme,SamplingSchemeRules } from './samplingScheme.data'
+import { SamplingScheme, SamplingSchemeRules } from './samplingScheme.data'
 import * as SamplingSchemeApi from '@/api/qms/samplingScheme'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -99,12 +112,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:sampling-scheme:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:sampling-scheme:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:sampling-scheme:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:sampling-scheme:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:sampling-scheme:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:sampling-scheme:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -117,21 +130,27 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.available) > -1) {
     return false
   } else {
@@ -141,22 +160,30 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:sampling-scheme:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampling-scheme:enable'}),
-    defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:sampling-scheme:disable' }),
-    defaultButtons.mainListDeleteBtn({hasPermi:'qms:sampling-scheme:delete'}), // 删除
+    defaultButtons.mainListEditBtn({ hasPermi: 'qms:sampling-scheme:update' }),
+    defaultButtons.mainListEnableBtn({
+      hide: isShowMainButton(row, ['FALSE']),
+      hasPermi: 'qms:sampling-scheme:enable'
+    }),
+    defaultButtons.mainListDisableBtn({
+      hide: isShowMainButton(row, ['TRUE']),
+      hasPermi: 'qms:sampling-scheme:disable'
+    }),
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:sampling-scheme:delete' }) // 删除
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
   } else if (val == 'enable') {
     handleEnable(row.id)
-  }else if (val == 'disable') {
+  } else if (val == 'disable') {
     handleDisable(row.id)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -168,27 +195,33 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =SamplingScheme.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = SamplingScheme.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;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await SamplingSchemeApi.createSamplingScheme(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await SamplingSchemeApi.updateSamplingScheme(data)
-    message.success(t('common.updateSuccess'))
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await SamplingSchemeApi.createSamplingScheme(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SamplingSchemeApi.updateSamplingScheme(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -275,5 +308,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await SamplingSchemeApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/selectedProject/index.vue b/src/views/qms/selectedProject/index.vue
index 9ab2bce19..1e5442f4d 100644
--- a/src/views/qms/selectedProject/index.vue
+++ b/src/views/qms/selectedProject/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SelectedProject.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="SelectedProject.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="SelectedProject.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SelectedProject.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -54,12 +58,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="SelectedProject.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/qms/selected-project/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/qms/selected-project/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { SelectedProject,SelectedProjectRules } from './selectedProject.data'
+import { SelectedProject, SelectedProjectRules } from './selectedProject.data'
 import * as SelectedProjectApi from '@/api/qms/selectedProject'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -99,12 +108,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:selectedProject:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:selectedProject:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:selectedProject:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:selectedProject:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:selectedProject:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:selectedProject:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -117,31 +126,39 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'qms:selectedProject:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'qms:selectedProject:delete'}), // 删除
+  defaultButtons.mainListEditBtn({ hasPermi: 'qms:selectedProject:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:selectedProject:delete' }) // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -153,27 +170,33 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =SelectedProject.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = SelectedProject.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;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await SelectedProjectApi.createSelectedProject(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await SelectedProjectApi.updateSelectedProject(data)
-    message.success(t('common.updateSuccess'))
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await SelectedProjectApi.createSelectedProject(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SelectedProjectApi.updateSelectedProject(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -240,5 +263,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await SelectedProjectApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue
index c3e93a9b5..25f479d28 100644
--- a/src/views/qms/selectedSet/index.vue
+++ b/src/views/qms/selectedSet/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SelectedSet.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="SelectedSet.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="SelectedSet.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SelectedSet.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -60,24 +68,24 @@
   />
 
   <!-- 详情 -->
-  <DetailQmsCode 
-    ref="detailRef" 
-    :isBasic="false" 
-    :allSchemas="SelectedSet.allSchemas" 
-    :detailAllSchemas="SelectedProject.allSchemas" 
+  <DetailQmsCode
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="SelectedSet.allSchemas"
+    :detailAllSchemas="SelectedProject.allSchemas"
     :detailAllSchemasRules="SelectedProjectRules"
     :apiCreate="SelectedProjectApi.createSelectedProject"
     :apiUpdate="SelectedProjectApi.updateSelectedProject"
     :apiPage="SelectedProjectApi.getSelectedProjectPage"
-    :apiDelete="SelectedProjectApi.deleteSelectedProject" 
+    :apiDelete="SelectedProjectApi.deleteSelectedProject"
     :detailValidate="detailValidate"
-    @searchTableSuccessDetail="searchTableSuccessDetail" 
+    @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailButtonIsShowEdit="checkPermi(['qms:selected-project:update'])"
     :detailButtonIsShowAdd="checkPermi(['qms:selected-project:create'])"
     :detailButtonIsShowDelete="checkPermi(['qms:selected-project:delete'])"
     @detailOpenForm="detailOpenForm"
     @detailBasicFormOnChange="detailBasiFormOnChange"
-     :detailButtonIsShowFilter="false"
+    :detailButtonIsShowFilter="false"
   />
 
   <!-- 导入 -->
@@ -94,16 +102,16 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { SelectedSet,SelectedSetRules } from './selectedSet.data'
+import { SelectedSet, SelectedSetRules } from './selectedSet.data'
 import * as SelectedSetApi from '@/api/qms/selectedSet'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { SelectedProject,SelectedProjectRules } from '../selectedProject/selectedProject.data'
+import { SelectedProject, SelectedProjectRules } from '../selectedProject/selectedProject.data'
 import * as SelectedProjectApi from '@/api/qms/selectedProject'
-import * as DictDataApi from '@/api/system/dict/dict.data'  
+import * as DictDataApi from '@/api/system/dict/dict.data'
 import component from 'virtual:svg-icons-register'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
 import { checkPermi } from '@/utils/permission'
-import ImportForm from "../../../components/ImportForm/src/ImportForm.vue";
+import ImportForm from '../../../components/ImportForm/src/ImportForm.vue'
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
 // import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 // import Detail from '@/components/Detail/src/Detail.vue'
@@ -145,12 +153,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:selected-set:query'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:selected-set:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:selected-set:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:selected-set:query' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:selected-set:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:selected-set:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -163,21 +171,27 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.available) > -1) {
     return false
   } else {
@@ -187,22 +201,30 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:selected-set:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:selected-set:enable'}),
-    defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:selected-set:disable' }),
-    defaultButtons.mainListDeleteBtn({hasPermi:'qms:selected-set:delete'}), // 删除
+    defaultButtons.mainListEditBtn({ hasPermi: 'qms:selected-set:update' }),
+    defaultButtons.mainListEnableBtn({
+      hide: isShowMainButton(row, ['FALSE']),
+      hasPermi: 'qms:selected-set:enable'
+    }),
+    defaultButtons.mainListDisableBtn({
+      hide: isShowMainButton(row, ['TRUE']),
+      hasPermi: 'qms:selected-set:disable'
+    }),
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'qms:selected-set:delete' }) // 删除
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     editForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  }else if (val == 'enable') {
+  } else if (val == 'enable') {
     handleEnable(row.id)
-  }else if (val == 'disable') {
+  } else if (val == 'disable') {
     handleDisable(row.id)
   }
 }
@@ -215,34 +237,40 @@ const openForm = (type: string, row?: any) => {
 }
 const editForm = async (type: string, row?: any) => {
   tableData.value = []
-  SelectedProjectApi.getSelectedProjectNoPage({masterId:row.id}).then(res=>{
+  SelectedProjectApi.getSelectedProjectNoPage({ masterId: row.id }).then((res) => {
     tableData.value = res
   })
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =SelectedSet.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = SelectedSet.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;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await SelectedSetApi.createSelectedSet(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await SelectedSetApi.updateSelectedSet(data)
-    message.success(t('common.updateSuccess'))
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await SelectedSetApi.createSelectedSet(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SelectedSetApi.updateSelectedSet(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -320,7 +348,6 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-
 const tableFormKeys = {}
 SelectedProject.allSchemas.tableFormColumns.forEach((item) => {
   tableFormKeys[item.field] = item.default ? item.default : ''
@@ -335,21 +362,20 @@ const handleDeleteTable = (item, index) => {
   tableData.value.splice(index, 1)
 }
 
-
 // 主子数据 提交
 const submitForm = async (formType, data) => {
-  const emptyFlag = validateDetailEmpty(tableData.value);
-  if(!emptyFlag){
+  const emptyFlag = validateDetailEmpty(tableData.value)
+  if (!emptyFlag) {
     message.alertWarning('明细不能为空')
     basicFormRef.value.formLoading = false
     return
   }
-  if(!validateNotRepetition(tableData.value)){
+  if (!validateNotRepetition(tableData.value)) {
     message.alertWarning('选定集字典及字典项不能重复')
     basicFormRef.value.formLoading = false
     return
   }
-  data.selectedProjectDOList = tableData.value// 拼接子表数据参数
+  data.selectedProjectDOList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
       await SelectedSetApi.createSelectedSet(data)
@@ -366,35 +392,34 @@ const submitForm = async (formType, data) => {
   }
 }
 const validateDetailEmpty = (data) => {
-  const codes = data.map(item => item.stage);
-  if(codes.length == 0){
-    return false;
+  const codes = data.map((item) => item.stage)
+  if (codes.length == 0) {
+    return false
   }
-  return true;
+  return true
 }
 
 const validateNotRepetition = (data) => {
   // 提取所有的 dictionaryTypeAndCode 值
-  const codes = data.map(item => item.dictionaryValue);
-  
+  const codes = data.map((item) => item.dictionaryValue)
+
   // 创建一个 Set 来存储唯一的 dictionaryTypeAndCode 值
-  const uniqueCodes = new Set(codes);
-  
+  const uniqueCodes = new Set(codes)
+
   // 如果原始数组的长度大于 Set 集合的大小，则说明有重复
   if (codes.length > uniqueCodes.size) {
-    return false; // 发现重复，返回 false
+    return false // 发现重复，返回 false
   }
-  
-  return true; // 未发现重复，返回 true
-};
 
+  return true // 未发现重复，返回 true
+}
 
-const detailValidate = (formType,data) => {
-  let tag = true;
-  existValue.value.forEach(item=>{
-    if(data.dictionaryValue == item.dictionaryValue){
-      message.warning("选定集字典项不能重复！")
-      tag = false;
+const detailValidate = (formType, data) => {
+  let tag = true
+  existValue.value.forEach((item) => {
+    if (data.dictionaryValue == item.dictionaryValue) {
+      message.warning('选定集字典项不能重复！')
+      tag = false
     }
   })
   return tag
@@ -402,43 +427,35 @@ const detailValidate = (formType,data) => {
 
 const detailOpenForm = (type, row, masterParmas) => {
   let param = {
-    masterId : masterParmas.masterId
+    masterId: masterParmas.masterId
   }
-  if(type == 'create'){
-    SelectedProjectApi.getSelectedProjectNoPage(param).then(res => {
-      if(res.length > 0){
+  if (type == 'create') {
+    SelectedProjectApi.getSelectedProjectNoPage(param).then((res) => {
+      if (res.length > 0) {
         existValue.value = res
       }
     })
-  }else if('update'){
-    SelectedProjectApi.getSelectedProjectNoPage(param).then(res => {
-      if(res.length > 0){
-        existValue.value = res.filter(item=>{
+  } else if ('update') {
+    SelectedProjectApi.getSelectedProjectNoPage(param).then((res) => {
+      if (res.length > 0) {
+        existValue.value = res.filter((item) => {
           return item?.id != row.id
         })
       }
     })
-    
   }
 }
 
+const detailBasiFormOnChange = (field, val, detailFormRef) => {}
 
-
-const detailBasiFormOnChange = (field,val,detailFormRef) => {
-
-}
-
-const formSelectChange = (a,b,c,d) => {
-
-}
+const formSelectChange = (a, b, c, d) => {}
 
 /** 初始化 **/
 onMounted(async () => {
-    tableObject.params = {
-    available: true
-  }
+  tableObject.params = {
+    available: true
+  }
   getList()
   importTemplateData.templateUrl = await SelectedSetApi.importTemplate()
 })
-
 </script>

From 348072ad1efc735c303ab292f841ca9066bbb158 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 31 Jul 2024 11:35:23 +0800
Subject: [PATCH 03/12] Q1q2q3loading

---
 src/views/qms/inspectionQ1/index.vue | 174 +++++++++++++----------
 src/views/qms/inspectionQ2/index.vue | 198 ++++++++++++++++-----------
 src/views/qms/inspectionQ3/index.vue | 174 +++++++++++++----------
 3 files changed, 325 insertions(+), 221 deletions(-)

diff --git a/src/views/qms/inspectionQ1/index.vue b/src/views/qms/inspectionQ1/index.vue
index 7ff408a4c..71ee2fd82 100644
--- a/src/views/qms/inspectionQ1/index.vue
+++ b/src/views/qms/inspectionQ1/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Q1.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Q1.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Q1.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Q1.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #number="{row}">
+      <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)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -54,12 +61,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Q1.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/basic/Q1/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/basic/Q1/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Q1,Q1Rules } from './inspectionQ1.data'
+import { Q1, Q1Rules } from './inspectionQ1.data'
 import * as Q1Api from '@/api/qms/inspectionQ1'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -81,19 +93,17 @@ const tableColumns = ref(Q1.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-   nextTick(() => {
-     const setV = {}
-    if(formField == 'customerCode'){
-      setV['itemCode'] = '';
+  nextTick(() => {
+    const setV = {}
+    if (formField == 'customerCode') {
+      setV['itemCode'] = ''
     }
-    if(formField == 'itemCode'){
+    if (formField == 'itemCode') {
       setV['uom'] = val[0]['customerUom']
     }
     setV[formField] = val[0][searchField]
     formRef.setValues(setV)
-   })
-
-   
+  })
 }
 
 // 字段设置 更新主列表字段
@@ -110,12 +120,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:Q1:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:Q1:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:Q1:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:Q1:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:Q1:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:Q1:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -128,21 +138,27 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.status) > -1) {
     return false
   } else {
@@ -153,19 +169,31 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q1:update'}), // 编辑
-     defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q1:delete'}), // 删除
-     defaultButtons.mainListFinishBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q1:finish'}), // 完成
+    defaultButtons.mainListEditBtn({
+      hide: isShowMainButton(row, ['0']),
+      hasPermi: 'qms:Q1:update'
+    }), // 编辑
+    defaultButtons.mainListDeleteBtn({
+      hide: isShowMainButton(row, ['0']),
+      hasPermi: 'qms:Q1:delete'
+    }), // 删除
+    defaultButtons.mainListFinishBtn({
+      hide: isShowMainButton(row, ['0']),
+      hasPermi: 'qms:Q1:finish'
+    }) // 完成
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  }else if (val == 'finish') { // 删除
+  } else if (val == 'finish') {
+    // 删除
     handleFinish(row.id)
   }
 }
@@ -183,49 +211,54 @@ 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(),
-      claimTime: new Date().getTime(),
-      priority: '3',
-    })
-  })
+  if (type == 'create') {
+    nextTick(() => {
+      basicFormRef.value.formRef.setValues({
+        handleTime: new Date().getTime(),
+        claimTime: new Date().getTime(),
+        priority: '3'
+      })
+    })
   }
-  
 }
 
 // form表单提交
 const formsSuccess = async (formType, data) => {
   data.responUser = userStore.getUser.id
-  var isHave =Q1.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+  var isHave = Q1.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;
+      return
     }
   }
-  if (data.qty==0) { 
-      message.error('数量不能为0')
-      return;
+  if (data.qty == 0) {
+    message.error('数量不能为0')
+    return
   }
-   if (data.claimAmount==0) { 
-      message.error('索赔金额不能为0')
-      return;
+  if (data.claimAmount == 0) {
+    message.error('索赔金额不能为0')
+    return
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await Q1Api.createQ1(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await Q1Api.updateQ1(data)
-    message.success(t('common.updateSuccess'))
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await Q1Api.createQ1(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await Q1Api.updateQ1(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -292,5 +325,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await Q1Api.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index c77dc95e0..b82dd5bb1 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Q2.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Q2.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Q2.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Q2.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #number="{row}">
+      <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)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -54,12 +61,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Q2.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/basic/Q2/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/basic/Q2/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Q2,Q2Rules } from './inspectionQ2.data'
+import { Q2, Q2Rules } from './inspectionQ2.data'
 import * as Q2Api from '@/api/qms/inspectionQ2'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -81,34 +93,34 @@ const tableColumns = ref(Q2.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-    nextTick(() => {
-      const setV = {}
-     if(formField == 'supplierCode'){
-      setV['itemCode'] = '';
+  nextTick(() => {
+    const setV = {}
+    if (formField == 'supplierCode') {
+      setV['itemCode'] = ''
     }
-    if(formField == 'itemCode'){
+    if (formField == 'itemCode') {
       setV['uom'] = val[0]['supplierUom']
-      }
-      // if (formField == 'q1Number') {
-      //     console.log(123)
-      // setV['q1Number'] = val[0]['number']
-      // }
-if (formField == 'purchaseReceiptNumber') {
+    }
+    // if (formField == 'q1Number') {
+    //     console.log(123)
+    // setV['q1Number'] = val[0]['number']
+    // }
+    if (formField == 'purchaseReceiptNumber') {
       setV['wmsQty'] = val[0]['qty']
-      }
-    if(formField == 'q1Number'){
+    }
+    if (formField == 'q1Number') {
       //Q1通知单号
       let list = []
-      val.forEach(item=>{
+      val.forEach((item) => {
         list.push(item[searchField])
       })
       setV[formField] = list.join(',')
       formRef.setValues(setV)
-    }else{
+    } else {
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
-   })
+  })
 }
 
 // 字段设置 更新主列表字段
@@ -125,12 +137,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:Q2:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:Q2:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:Q2:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'qms:Q2:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:Q2:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:Q2:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -143,21 +155,27 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.status) > -1) {
     return false
   } else {
@@ -168,19 +186,31 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q2:update'}), // 编辑
-     defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q2:delete'}), // 删除
-     defaultButtons.mainListFinishBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q2:finish'}), // 完成
+    defaultButtons.mainListEditBtn({
+      hide: isShowMainButton(row, ['0']),
+      hasPermi: 'qms:Q2:update'
+    }), // 编辑
+    defaultButtons.mainListDeleteBtn({
+      hide: isShowMainButton(row, ['0']),
+      hasPermi: 'qms:Q2:delete'
+    }), // 删除
+    defaultButtons.mainListFinishBtn({
+      hide: isShowMainButton(row, ['0']),
+      hasPermi: 'qms:Q2:finish'
+    }) // 完成
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  }else if (val == 'finish') { // 删除
+  } else if (val == 'finish') {
+    // 删除
     handleFinish(row.id)
   }
 }
@@ -198,52 +228,59 @@ 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(),
-      claimTime: new Date().getTime(),
-      priority: '3',
-    })
-  })
+  if (type == 'create') {
+    nextTick(() => {
+      basicFormRef.value.formRef.setValues({
+        handleTime: new Date().getTime(),
+        claimTime: new Date().getTime(),
+        priority: '3'
+      })
+    })
   }
 }
 
 // form表单提交
 const formsSuccess = async (formType, data) => {
   data.responUser = userStore.getUser.id
-  var isHave =Q2.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+  var isHave = Q2.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;
+      return
     }
   }
-  if (data.qty>data.wmsQty) { 
-message.error('数量不能大于记录中的收货数量')
-      return;
+  if (data.qty > data.wmsQty) {
+    message.error('数量不能大于记录中的收货数量')
+    return
   }
-   if (data.qty==0) { 
-      message.error('数量不能为0')
-      return;
+  if (data.qty == 0) {
+    message.error('数量不能为0')
+    return
   }
-   if (data.claimAmount==0) { 
-      message.error('索赔金额不能为0')
-      return;
+  if (data.claimAmount == 0) {
+    message.error('索赔金额不能为0')
+    return
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await Q2Api.createQ2(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await Q2Api.updateQ2(data)
-    message.success(t('common.updateSuccess'))
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+
+  try {
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await Q2Api.createQ2(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await Q2Api.updateQ2(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -310,5 +347,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await Q2Api.importTemplate()
 })
-
 </script>
diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue
index e313d6371..3754cb665 100644
--- a/src/views/qms/inspectionQ3/index.vue
+++ b/src/views/qms/inspectionQ3/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Q3.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Q3.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="Q3.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #number="{row}">
+      <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)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -54,12 +61,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Q3.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/basic/Q3/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/basic/Q3/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Q3,Q3Rules } from './inspectionQ3.data'
+import { Q3, Q3Rules } from './inspectionQ3.data'
 import * as Q3Api from '@/api/qms/inspectionQ3'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -81,25 +93,25 @@ const tableColumns = ref(Q3.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-    nextTick(() => {
+  nextTick(() => {
     const setV = {}
-    if(formField == 'itemCode'){
-      console.log(val);
+    if (formField == 'itemCode') {
+      console.log(val)
       setV['uom'] = val[0]['uom']
-      }
-    if(formField == 'q1Number'){
+    }
+    if (formField == 'q1Number') {
       //Q1通知单号
       let list = []
-      val.forEach(item=>{
+      val.forEach((item) => {
         list.push(item[searchField])
       })
       setV[formField] = list.join(',')
       formRef.setValues(setV)
-    }else{
+    } else {
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
-   })
+  })
 }
 
 // 字段设置 更新主列表字段
@@ -116,12 +128,12 @@ 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:Q3:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'qms:Q3:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:Q3:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -134,21 +146,27 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.status) > -1) {
     return false
   } else {
@@ -159,19 +177,31 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q3:update'}), // 编辑
-     defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q3:delete'}), // 删除
-     defaultButtons.mainListFinishBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q3:finish'}), // 完成
+    defaultButtons.mainListEditBtn({
+      hide: isShowMainButton(row, ['0']),
+      hasPermi: 'qms:Q3:update'
+    }), // 编辑
+    defaultButtons.mainListDeleteBtn({
+      hide: isShowMainButton(row, ['0']),
+      hasPermi: 'qms:Q3:delete'
+    }), // 删除
+    defaultButtons.mainListFinishBtn({
+      hide: isShowMainButton(row, ['0']),
+      hasPermi: 'qms:Q3:finish'
+    }) // 完成
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
-  }else if (val == 'finish') { // 删除
+  } else if (val == 'finish') {
+    // 删除
     handleFinish(row.id)
   }
 }
@@ -189,47 +219,54 @@ 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',
-    })
-  })
+  if (type == 'create') {
+    nextTick(() => {
+      basicFormRef.value.formRef.setValues({
+        handleTime: new Date().getTime(),
+        priority: '3'
+      })
+    })
   }
 }
 
 // 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){
+  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;
+      return
     }
   }
-   if (data.qty==0) { 
-      message.error('数量不能为0')
-      return;
+  if (data.qty == 0) {
+    message.error('数量不能为0')
+    return
   }
-   if (data.amount==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;
-  if (formType === 'create') {
-    await Q3Api.createQ3(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await Q3Api.updateQ3(data)
-    message.success(t('common.updateSuccess'))
+  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
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -296,5 +333,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await Q3Api.importTemplate()
 })
-
 </script>

From 078dd83543c203d256ad75dbe3faa4103ab132f0 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 31 Jul 2024 12:02:03 +0800
Subject: [PATCH 04/12] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productredressJobMain/productredressJobMain.data.ts    | 7 +++++++
 .../productredressRecordMain.data.ts                       | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index e797d3192..e9b7dabd9 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -240,6 +240,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     isForm:false,
     isTable:false,
@@ -247,6 +249,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
     sort: 'custom',
     isForm:false,
     isTable:false,
@@ -358,6 +361,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '入库库存状态范围',
     field: 'inInventoryStatuses',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     isForm:false,
     isTable:false,
@@ -365,6 +370,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '出库库存状态范围',
     field: 'outInventoryStatuses',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     isForm:false,
     isTable:false,
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
index 43672b0b5..d1919b684 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -143,6 +143,8 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '是否可用',
     field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
     isForm:false,
     isTable:false
@@ -249,6 +251,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
     sort: 'custom',
     table: {
       width: 150

From 93b2772765e91fa998af5a8f594a46eb6e485705 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 31 Jul 2024 13:16:05 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain/index.vue      |   3 +
 .../supplierinvoiceRequestMain.data.ts        | 108 +++++++-----------
 2 files changed, 44 insertions(+), 67 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 42a030cd9..0eee88838 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -577,6 +577,9 @@ const handleImport = () => {
   /** 添加/修改操作 */
   const formRef = ref()
   const openForm = async (type : string, row ?: number) => {
+    // 合同金额 采购金额 总差额 :只在详情里展示
+    SupplierinvoiceRequestDetail.allSchemas.tableFormColumns = SupplierinvoiceRequestDetail.allSchemas.tableFormColumns.filter(item=>item.field!='contractAmountTotal'&&item.field!='purchaseAmontTotal'&&item.field!='differencePriceTotal')
+
     if(type=='update'){
       //编辑
       SupplierinvoiceRequestMain.allSchemas.formSchema.forEach((item) => {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index b2eb7c153..874fb4d99 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1240,8 +1240,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '',
-    field: '',
+    label: '系统采购价格',
+    field: 'purchaseAmountTotalMain',
+    formatter: accountantFormart,
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1271,8 +1272,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '',
-    field: '',
+    label: '总价差',
+    field: 'differencePriceTotalMain',
+    formatter: accountantFormart,
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1367,7 +1369,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '差额',
+    label: '差尾',
     field: '',
     sortTableDefault: 6,
     isForm: false,
@@ -1468,35 +1470,6 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isSearch: false,
     isDetail: true,
   },
-  // {
-  //   label: '总价差',
-  //   field: 'differencePriceTotal',
-  //   formatter: accountantFormart,
-  //   sortTableDefault: 6,
-  //   isForm: false,
-  //   isTable: false,
-  //   isSearch: false,
-  //   isDetail: true,
-  // },
-  // {
-  //   label: '采购金额',
-  //   field: 'purchaseAmontTotal',
-  //   formatter: accountantFormart,
-  //   sortTableDefault: 6,
-  //   isForm: false,
-  //   isTable: false,
-  //   isSearch: false,
-  //   isDetail: true,
-  // },
-  // {
-  //   label: '',
-  //   field: '',
-  //   sortTableDefault: 6,
-  //   isForm: false,
-  //   isTable: false,
-  //   isSearch: false,
-  //   isDetail: true,
-  // },
 
 ]))
 
@@ -1753,6 +1726,39 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       precision: 5,
     }
   },
+  {
+    label: '合同金额',
+    field: 'contractAmountTotal',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '采购金额',
+    field: 'purchaseAmontTotal',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '总差额',
+    field: 'differencePriceTotal',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '单价差额',
     field: 'differencePrice',
@@ -2047,39 +2053,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
   },
-  // {
-  //   label: '合同金额',
-  //   field: 'contractAmountTotal',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isForm:false,
-  //   tableForm:{
-  //     disabled: true
-  //   }
-  // },
-  // {
-  //   label: '采购金额',
-  //   field: 'purchaseAmontTotal',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isForm:false,
-  //   tableForm:{
-  //     disabled: true
-  //   }
-  // },
-  // {
-  //   label: '总差额',
-  //   field: 'differencePriceTotal',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isForm:false,
-  //   tableForm:{
-  //     disabled: true
-  //   }
-  // },
+  
   
   {
     label: '操作',

From b9b4b0482ebc83b84602fd8b1c68e5743a15294f Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Wed, 31 Jul 2024 13:29:33 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapRequestMain/index.vue                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 1b92ac602..cffbbc154 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -627,7 +627,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '制品收货申请主导入模版.xlsx'
+  templateTitle: '隔离报工申请导入模版.xlsx'
 })
 
 // 导入成功之后

From 3f4244b4b39d4ae4ecacb01a97618d0efee82e6f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 31 Jul 2024 13:40:27 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E9=A6=96=E4=BB=B6=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BC=BA=E9=99=B7=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRecordFirst/detail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/qms/inspectionRecordFirst/detail.vue b/src/views/qms/inspectionRecordFirst/detail.vue
index ac7889043..3204d6adc 100644
--- a/src/views/qms/inspectionRecordFirst/detail.vue
+++ b/src/views/qms/inspectionRecordFirst/detail.vue
@@ -290,13 +290,13 @@
                         </el-select>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == '1'" >
+                    <!-- <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == '1'" >
                       <el-form-item label="缺陷级别">
                         <el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>
                           <el-option v-for="dict in getStrDictOptions(DICT_TYPE.DEFECT_LEVEL)" :key="dict.value" :label="dict.label" :value="dict.value" />
                         </el-select>
                       </el-form-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="12">
                       <el-form-item label="备注">
                         <el-input v-model="cur.remark" placeholder="" type="number" disabled/>

From b36d743cf811c56cfea105c8c17fd9681a7652e8 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 31 Jul 2024 13:46:16 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E9=A6=96=E4=BB=B6=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=8A=8A=E5=8F=AF=E7=94=A8=E7=9A=84=E7=89=A9=E6=96=99=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRecordFirst/addForm.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index 7fc3ed700..d4fed9f00 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -1081,6 +1081,11 @@ const opensearchItemsTable = () => {
       column: 'type',
       action: 'in',
       value: 'BCP,CCP'
+    },
+    {
+      column: 'status',
+      action: 'in',
+      value: 'ENABLE'
     }
   )
   // 参数整理
@@ -1523,6 +1528,11 @@ const onItemBlur = async (field, pageApi) => {
         column: 'code',
         action: '==',
         value: data.value[field]?.trim()
+      },
+      {
+        column: 'status',
+        action: 'in',
+        value: 'ENABLE'
       }
     )
     // 参数整理

From 599d4d9ada76fa30e839845218464c79915199e2 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 31 Jul 2024 14:10:57 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapRequestMain/index.vue  |  4 +-
 .../productreceiptscrapRequestMain.data.ts    | 71 +++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index cffbbc154..a0398bac6 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -43,7 +43,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="productionLineCode"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductreceiptRequestMainRules"
     :formAllSchemas="ProductreceiptRequestMain.allSchemas"
@@ -220,7 +220,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
             row['bomVersion'] = res.list[0].version
           }
         })
-      }else if(formField == 'productionLineCode'){
+      }else if(formField == 'workStationCode'){
         //添加明细
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 1181e21ae..e7d36efa2 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -134,6 +134,73 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true,
+      multiple: true,
+      // isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码',
+      searchField: 'code',
+      searchTitle: '生产线信息',
+      searchAllSchemas: Productionline.allSchemas,
+      searchPage: ProductionlineApi.getProductionlinePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+        }],
+      verificationPage: ProductionlineApi.getProductionlineByCodes, // 校验数去焦点输入是否正确的方法
+    isShowTableFormSearch: true,
+    verificationParams: [{
+      key: 'code',
+      action: '==',
+      value: '',
+      isMainValue: false,
+      isSearch: true,
+      isFormModel: true,
+    }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线代码',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
   {
     label: '班组',
     field: 'team',
@@ -521,6 +588,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // shift: [
   //   { required: true, message: '请选择班次代码', trigger: 'change' }
   // ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
   dueTime: [
     { required: true, message: '请选择截止时间', trigger: 'blur' }
   ],
@@ -552,6 +622,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
     tableForm:{
       disabled:true,
       multiple: true,

From 5fb95836e427089be85cf347c5e1e78c86edfb73 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 31 Jul 2024 14:28:25 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchaseMain/index.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/purchaseMain/index.ts b/src/api/wms/purchaseMain/index.ts
index a833a5427..164cf53ff 100644
--- a/src/api/wms/purchaseMain/index.ts
+++ b/src/api/wms/purchaseMain/index.ts
@@ -72,7 +72,12 @@ export const witPurchaseMain = async (id: number) => {
 }
 // 导出采购订单主 Excel
 export const exportPurchaseMain = async (params) => {
-  return await request.download({ url: `/wms/purchase-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchase-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchase-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

From e2dc6877dffb6fcdb029e4781afb006e13ef8bb0 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 31 Jul 2024 14:35:29 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=BA=93=E5=8C=BA=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/login.vue                                    | 5 +++--
 .../documentSetting/businesstype/businesstype.data.ts        | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 13790d168..c13f2c718 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -9,7 +9,7 @@
       >
         <!-- 左上角的 logo + 系统标题 -->
         <div class="relative flex items-center ">
-          <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white_blue.png" />
+          <img alt="" class="mr-10px w-36px h-36px" src="@/assets/imgs/logo_white.png" />
           <span class="text-20px font-bold">{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}</span>
         </div>
         <!-- 左边的背景图 + 欢迎语 -->
@@ -33,7 +33,7 @@
           class="flex items-center justify-between at-2xl:justify-end at-xl:justify-end"
         >
           <div class="flex items-center at-2xl:hidden at-xl:hidden">
-            <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white_blue.png" />
+            <img alt="" class="mr-10px w-36px h-36px" src="@/assets/imgs/logo_white.png" />
             <span class="text-20px font-bold">{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}</span>
           </div>
           <div class="flex items-center justify-end space-x-10px">
@@ -94,6 +94,7 @@ $prefix-cls: #{$namespace}-login;
       z-index: -1;
       width: 100%;
       height: 100%;
+      background-size: cover;
       // background-image: url('@/assets/svgs/login-bg.svg');
       background-image: url('@/assets/imgs/login-bg.png');
       background-position: center;
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
index bdef4ffcb..52907c4d6 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
@@ -119,6 +119,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        multiple: true,
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库区代码', // 输入框占位文本
@@ -147,6 +148,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        multiple: true,
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库区代码', // 输入框占位文本

From 866910153da3f28b3336bd95721c87ea71cbcd16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Wed, 31 Jul 2024 14:56:57 +0800
Subject: [PATCH 12/12] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnJobMain.data.ts             |    5 +
 .../customerreturnRecordMain.data.ts          |    5 +
 .../customerreturnRequestMain.data.ts         |    5 +
 .../scrap/scrapJobMain/scrapJobMain.data.ts   |  960 ++++++-------
 .../scrapRecordMain/scrapRecordMain.data.ts   |  556 ++++----
 .../scrapRequestMain/scrapRequestMain.data.ts |  762 ++++++-----
 .../productionscrapRecordMain.data.ts         |  640 +++++----
 .../productionscrapRequestMain.data.ts        |  916 +++++++------
 .../productscrapJobMain.data.ts               |  944 +++++++------
 .../productscrapRecordMain.data.ts            |  681 +++++-----
 .../productscrapRequestMain.data.ts           | 1043 +++++++-------
 .../purchasereturnJobMain.data.ts             | 1157 ++++++++--------
 .../purchasereturnRecordMain.data.ts          |  780 ++++++-----
 .../purchasereturnRequestMain.data.ts         | 1207 +++++++++--------
 14 files changed, 5138 insertions(+), 4523 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
index ac7b49963..af95c27c6 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
@@ -88,6 +88,11 @@ export const CustomerreturnJobMain = useCrudSchemas(
               key: 'status',
               value: '0',
               isMainValue: false
+            },
+            {
+              key: 'customerCode',
+              value: 'customerCode',
+              isMainValue: true
             }
           ],
           verificationParams: [
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
index bab88c4a0..4f55dbf93 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -99,6 +99,11 @@ export const CustomerreturnRecordMain = useCrudSchemas(
               key: 'status',
               value: '0',
               isMainValue: false
+            },
+            {
+              key: 'customerCode',
+              value: 'customerCode',
+              isMainValue: true
             }
           ],
           verificationParams: [
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 627652801..93916bd81 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -226,6 +226,11 @@ export const CustomerreturnRequestMain = useCrudSchemas(
               key: 'status',
               value: '0',
               isMainValue: false
+            },
+            {
+              key: 'customerCode',
+              value: 'customerCode',
+              isMainValue: true
             }
           ],
           verificationParams: [
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 58ccebc3f..7afec161a 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -2,510 +2,560 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import { TableColumn } from '@/types/table'
 
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+
 /**
  * @returns {Array} 报废出库任务主表
  */
-export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isSearch: true,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true,
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const ScrapJobMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isSearch: true
+    },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.JOB_STATUS,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '要求截止时间',
-    field: 'requestDueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: 'expiredTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  // {
-  //   label: '状态',
-  //   field: 'jobStageStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  {
-    label: '优先级',
-    field: 'priority',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '优先级增量',
-    field: 'priorityIncrement',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '自动完成',
-    field: 'autoComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '要求截止时间',
+      field: 'requestDueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '允许修改库位',
-    field: 'allowModifyLocation',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '过期时间',
+      field: 'expiredTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '允许修改数量',
-    field: 'allowModifyQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '允许大于推荐数量',
-    field: 'allowBiggerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '允许小于推荐数量',
-    field: 'allowSmallerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '允许修改库存状态',
-    field: 'allowModifyInventoryStatus',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '允许连续扫描',
-    field: 'allowContinuousScanning',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    // {
+    //   label: '状态',
+    //   field: 'jobStageStatus',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '优先级',
+      field: 'priority',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
       }
     },
-  },
-  {
-    label: '允许部分完成',
-    field: 'allowPartialComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '优先级增量',
+      field: 'priorityIncrement',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
       }
     },
-  },
-  {
-    label: '允许修改批次',
-    field: 'allowModifyBatch',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '允许修改箱码',
-    field: 'allowModifyPackingNumber',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '承接时间',
-    field: 'acceptTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '自动完成',
+      field: 'autoComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '承接人',
-    field: 'acceptUserId',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '允许修改库位',
+      field: 'allowModifyLocation',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-  },
-  {
-    label: '完成时间',
-    field: 'completeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '允许修改数量',
+      field: 'allowModifyQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '允许大于推荐数量',
+      field: 'allowBiggerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '允许小于推荐数量',
+      field: 'allowSmallerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '完成人',
-    field: 'completeUserId',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '允许修改库存状态',
+      field: 'allowModifyInventoryStatus',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '允许连续扫描',
+      field: 'allowContinuousScanning',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '允许部分完成',
+      field: 'allowPartialComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '允许修改批次',
+      field: 'allowModifyBatch',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-    isTable: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '允许修改箱码',
+      field: 'allowModifyPackingNumber',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    isTable: false
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '承接时间',
+      field: 'acceptTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '承接人',
+      field: 'acceptUserId',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '完成时间',
+      field: 'completeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '完成人',
+      field: 'completeUserId',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    isTable: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 120,
-      fixed: 'right'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTable: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-  }
-]))
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 120,
+        fixed: 'right'
+      }
+    }
+  ])
+)
 
 //表单校验
 export const ScrapJobMainRules = reactive({
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 2de4f4010..b2901d1a2 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -1,288 +1,338 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import { TableColumn } from '@/types/table'
 
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+
 /**
  * @returns {Array} 报废出库记录主表
  */
-export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isSearch: true
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true
-  },
-  {
-    label: '任务单号',
-    field: 'jobNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const ScrapRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isSearch: true
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true
+    },
+    {
+      label: '任务单号',
+      field: 'jobNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '执行时间',
-    field: 'executeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '生效日期',
-    field: 'activeDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '执行时间',
+      field: 'executeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '生效日期',
+      field: 'activeDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      }
     },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '出库事务类型',
+      field: 'outTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '入库事务类型',
+      field: 'inTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '接口类型',
+      field: 'interfaceType',
+      dictType: DICT_TYPE.INTERFACE_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    isTable: false,
-    table: {
-      width: 150
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      }
     },
-  },
 
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      sort: 'custom',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    table: {
-      width: 180
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    // {
+    //   label: '代码',
+    //   field: 'code',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '是否可用',
+      field: 'available',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
     }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    table: {
-      width: 150
-    }
-  },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: true,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
-  },
-]))
+  ])
+)
 
 //表单校验
 export const ScrapRecordMainRules = reactive({
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 94793b6c1..8225d5bca 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -1,398 +1,456 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
-import * as BalanceApi  from '@/api/wms/balance'
+import * as BalanceApi from '@/api/wms/balance'
 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 { 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'
 
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'ScrapRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'ScrapRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
- // 获取当前操作人的部门
+// 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
-const userDeptArray:any = [userDept]
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 
 /**
  * @returns {Array} 报废出库申请主表
  */
-export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isForm: false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
+export const ScrapRequestMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isForm: false,
+      isSearch: true
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isSearch: true,
+      isForm: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
       }
     },
-    isForm: false,
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    tableForm: {
-      enterSearch: true,
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择仓库代码',
-      searchField: 'code',
-      searchTitle: '仓库信息',
-      searchAllSchemas: Warehouse.allSchemas,
-      searchPage: WarehouseApi.getWarehousePage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }],
-      verificationParams: [{
-        key: 'code',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      tableForm: {
         enterSearch: true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '仓库信息', // 查询弹窗标题
-        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
-        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
-      }
-    }
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'Scrap',
-      componentProps: {
-        disabled: true
+        isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码',
+        searchField: 'code',
+        searchTitle: '仓库信息',
+        searchAllSchemas: Warehouse.allSchemas,
+        searchPage: WarehouseApi.getWarehousePage,
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ],
+        verificationParams: [
+          {
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '仓库信息', // 查询弹窗标题
+          searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+          searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
     },
-    isForm: false,
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isForm: false,
-    isTable:false,
-    table: {
-      width: 150
-    },
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
-    form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      isForm: false
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        value: 'Scrap',
+        componentProps: {
+          disabled: true
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
+      },
+      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+        return userDeptArray.find((account) => account.id == cellValue)?.name
+      },
+      form: {
+        value: userDept.id,
+        component: 'Select',
+        api: () => userDeptArray,
+        componentProps: {
+          disabled: true,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'id'
+          }
         }
       }
-    }
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disable: true
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disable: true
+    {
+      label: '自动提交',
+      field: 'autoCommit',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoCommit,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disable: true
+        }
       }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disable: true
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoAgree,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disable: true
+        }
       }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm:false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disable: true
+    {
+      label: '自动执行',
+      field: 'autoExecute',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoExecute,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disable: true
+        }
       }
-    }
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.directCreateRecord,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disable: true
+        }
       }
     },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 300,
+        fixed: 'right'
       }
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 300,
-      fixed: 'right'
-    },
-  }
-]))
+    }
+  ])
+)
 
 //表单校验
 export const ScrapRequestMainRules = reactive({
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
index f040a6da8..e95a4ca67 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@@ -1,321 +1,371 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 /**
  * @returns {Array} 生产退料记录主表
  */
-export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isSearch: true
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true
-  },
-  {
-    label: '车间代码',
-    field: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '执行时间',
-    field: 'executeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const ProductionscrapRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isSearch: true
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: 'activeDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '车间代码',
+      field: 'workshopCode',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '出库事务类型',
+      field: 'outTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '入库事务类型',
+      field: 'inTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '执行时间',
+      field: 'executeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '生效日期',
+      field: 'activeDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  // {
-  //   label: '创建者',
-  //   field: 'creator',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: true,
-  // },
-  // {
-  //   label: '创建时间',
-  //   field: 'createTime',
-  //   formatter: dateFormatter,
-  //   detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   isTable: true,
-  //   form: {
-  //     component: 'DatePicker',
-  //     componentProps: {
-  //       type: 'datetime',
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //       valueFormat: 'x',
-  //     }
-  //   },
-  // },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    isTable: false,
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '接口类型',
+      field: 'interfaceType',
+      dictType: DICT_TYPE.INTERFACE_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    isTable: false,
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    // {
+    //   label: '创建者',
+    //   field: 'creator',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: true,
+    // },
+    // {
+    //   label: '创建时间',
+    //   field: 'createTime',
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   isTable: true,
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       type: 'datetime',
+    //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       valueFormat: 'x',
+    //     }
+    //   },
+    // },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      sort: 'custom',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    isTable: false,
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    isTable: false,
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
     }
-  },
-]))
+  ])
+)
 
 //表单校验
 export const ProductionscrapRecordMainRules = reactive({
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 3bfbb2932..62e507ab1 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -1,486 +1,548 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
-import * as WorkshopApi  from '@/api/wms/workshop'
+import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 
-import * as ProductionlineApi  from '@/api/wms/productionline'
+import * as ProductionlineApi from '@/api/wms/productionline'
 import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
 
-import * as WorkstationApi  from '@/api/wms/workstation'
+import * as WorkstationApi from '@/api/wms/workstation'
 import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
 
-import * as BalanceApi  from '@/api/wms/balance'
+import * as BalanceApi from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
 import * as ItempackagingApi from '@/api/wms/itempackage'
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 
-import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
 
 import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
 
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'MaterialReturnRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'MaterialReturnRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
- //console.log(34, requestsettingData)
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+//console.log(34, requestsettingData)
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 
 /**
  * @returns {Array} 生产退料申请主表
  */
-export const ProductionscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
+export const ProductionscrapRequestMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isForm: false,
+      isSearch: true
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: true,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
       }
     },
-  },
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '车间',
+      field: 'workshopCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '车间信息', // 查询弹窗标题
+          searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+          searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true, // 开启查询弹窗
+    {
+      label: '生产线代码',
+      field: 'productionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '生产线信息', // 查询弹窗标题
+          searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+          searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'workshopCode',
+              value: 'workshopCode',
+              message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      },
+      tableForm: {
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '生产线信息', // 查询弹窗标题
         searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'workshopCode',
-          value: 'workshopCode',
-          message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
-          isMainValue: true
-          }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },
+          {
+            key: 'workshopCode',
+            value: 'workshopCode',
+            message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
+            isMainValue: true
+          }
+        ]
       }
     },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '生产线信息', // 查询弹窗标题
-      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'workshopCode',
-        value: 'workshopCode',
-        message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
-        isMainValue: true
-      }]
-    },
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-    isForm: false,
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
     },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      isForm: false,
+      table: {
+        width: 150
+      },
+      isTable: false,
+      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+        return userDeptArray.find((account) => account.id == cellValue)?.name
+      },
+      form: {
+        value: userDept.id,
+        component: 'Select',
+        api: () => userDeptArray,
+        componentProps: {
+          disabled: true,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'id'
+          }
+        }
       }
     },
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false,
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false,
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false,
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 150
-    },
-    isTable: false,
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
-    form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
+    {
+      label: '自动提交',
+      field: 'autoCommit',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoCommit,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
         }
       }
-    }
-  },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoAgree,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
+    {
+      label: '自动执行',
+      field: 'autoExecute',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoExecute,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.directCreateRecord,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 300,
+        fixed: 'right'
+      },
+      isTable: false
     }
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isTable: false,
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 300,
-      fixed: 'right'
-    },
-    isTable: false,
-  }
-]))
+  ])
+)
 
 //表单校验
 export const ProductionscrapRequestMainRules = reactive({
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
index 957602e4f..7238ce579 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
@@ -1,506 +1,556 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+
 /**
  * @returns {Array} 制品报废任务主表
  */
-export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isSearch: true,
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true,
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const ProductscrapJobMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isSearch: true
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: 'requestDueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '过期时间',
-    field: 'expiredTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '要求截止时间',
+      field: 'requestDueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  // {
-  //   label: '状态',
-  //   field: 'jobStageStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  {
-    label: '优先级',
-    field: 'priority',
-    form: {
-      component: 'InputNumber',
-    },
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '优先级增量',
-    field: 'priorityIncrement',
-    form: {
-      component: 'InputNumber',
-    },
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.JOB_STATUS,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '承接人',
-    field: 'acceptUserId',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '过期时间',
+      field: 'expiredTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-  },
-  {
-    label: '承接时间',
-    field: 'acceptTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    // {
+    //   label: '状态',
+    //   field: 'jobStageStatus',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '优先级',
+      field: 'priority',
+      form: {
+        component: 'InputNumber'
+      },
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '完成人',
-    field: 'completeUserId',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '优先级增量',
+      field: 'priorityIncrement',
+      form: {
+        component: 'InputNumber'
+      },
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '完成时间',
-    field: 'completeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '承接人',
+      field: 'acceptUserId',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '承接时间',
+      field: 'acceptTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '完成人',
+      field: 'completeUserId',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '完成时间',
+      field: 'completeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '自动完成',
-    field: 'autoComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '自动完成',
+      field: 'autoComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改库位',
+      field: 'allowModifyLocation',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改库位',
-    field: 'allowModifyLocation',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改数量',
+      field: 'allowModifyQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改数量',
-    field: 'allowModifyQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许大于推荐数量',
+      field: 'allowBiggerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许大于推荐数量',
-    field: 'allowBiggerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许小于推荐数量',
+      field: 'allowSmallerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许小于推荐数量',
-    field: 'allowSmallerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改库存状态',
+      field: 'allowModifyInventoryStatus',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改库存状态',
-    field: 'allowModifyInventoryStatus',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许连续扫描',
+      field: 'allowContinuousScanning',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许连续扫描',
-    field: 'allowContinuousScanning',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许部分完成',
+      field: 'allowPartialComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许部分完成',
-    field: 'allowPartialComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改批次',
+      field: 'allowModifyBatch',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改批次',
-    field: 'allowModifyBatch',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改箱码',
+      field: 'allowModifyPackingNumber',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改箱码',
-    field: 'allowModifyPackingNumber',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 120,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 120,
-      fixed: 'right'
-    },
-  }
-]))
+  ])
+)
 
 //表单校验
 export const ProductscrapJobMainRules = reactive({
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 7685a6bda..fe3d913bd 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -1,348 +1,397 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 /**
  * @returns {Array} 制品报废记录主表
  */
-export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isSearch: true
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isForm:false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '车间',
-    field: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '生产线',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '班组',
-    field: 'team',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '班次',
-    field: 'shift',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '任务单号',
-    field: 'jobNumber',
-    sort: 'custom',
-    table: {
-      width: 180,
-      show:false
-    },
-    isTable: false,
-  },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '执行时间',
-    field: 'executeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const ProductscrapRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isSearch: true
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: 'activeDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '车间',
+      field: 'workshopCode',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '生产线',
+      field: 'productionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '班组',
+      field: 'team',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    isTable: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '班次',
+      field: 'shift',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    isTable: true,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '任务单号',
+      field: 'jobNumber',
+      sort: 'custom',
+      table: {
+        width: 180,
+        show: false
+      },
+      isTable: false
+    },
+    {
+      label: '出库事务类型',
+      field: 'outTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '入库事务类型',
+      field: 'inTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '执行时间',
+      field: 'executeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '生效日期',
+      field: 'activeDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      }
     },
-    isTable: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    table: {
-      width: 180
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '接口类型',
+      field: 'interfaceType',
+      dictType: DICT_TYPE.INTERFACE_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: true
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    table: {
-      width: 150
-    }
-  },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150,
-      show: false
     },
-    isTable: false,
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      sort: 'custom',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
+      }
     },
-    isTable: false,
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
+    // {
+    //   label: '代码',
+    //   field: 'code',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150,
+        show: false
+      },
+      isTable: false
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
     }
-  },
-]))
+  ])
+)
 
 //表单校验
 export const ProductscrapRecordMainRules = reactive({
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 33d66900f..bb03638d1 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -1,541 +1,608 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
 import * as BalanceApi from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
-import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
-import * as WorkshopApi from "@/api/wms/workshop";
-import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data";
-import * as TeamApi from "@/api/wms/team";
-import {Shift} from "@/views/wms/basicDataManage/orderManage/shift/shift.data";
-import * as ShiftApi from "@/api/wms/shift";
-import {
-  Productionline
-} from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data";
-import * as ProductionlineApi from "@/api/wms/productionline";
-import {
-  Workstation
-} from "@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data";
-import * as WorkstationApi from "@/api/wms/workstation";
-import {Process} from "@/views/wms/basicDataManage/factoryModeling/process/process.data";
-import * as ProcessApi from "@/api/wms/process";
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as TeamApi from '@/api/wms/team'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import * as ShiftApi from '@/api/wms/shift'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
+import * as ProcessApi from '@/api/wms/process'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
-import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
-import * as BomApi from "@/api/wms/bom";
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+import * as BomApi from '@/api/wms/bom'
+
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
+import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'ProductScrapRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'ProductScrapRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
-
- // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 
 /**
  * @returns {Array} 制品报废申请主表
  */
-export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isForm:false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
+export const ProductscrapRequestMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isForm: false,
+      isSearch: true
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择车间',
-        searchField: 'code',
-        searchTitle: '车间信息',
-        searchAllSchemas: Workshop.allSchemas,
-        searchPage: WorkshopApi.getWorkshopPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isSearch: true,
+      isForm: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '生产线',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    tableForm: {
-      enterSearch: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '生产线信息', // 查询弹窗标题
-      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'workshopCode',
-        value: 'workshopCode',
-        message: '请填写车间代码！',
-        isMainValue: true
-        }],
-      verificationParams: [{
-        key: 'code',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
+    {
+      label: '车间',
+      field: 'workshopCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择车间',
+          searchField: 'code',
+          searchTitle: '车间信息',
+          searchAllSchemas: Workshop.allSchemas,
+          searchPage: WorkshopApi.getWorkshopPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
+    {
+      label: '生产线',
+      field: 'productionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
         enterSearch: true,
-        isSearchList: true, // 开启查询弹窗
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '生产线信息', // 查询弹窗标题
         searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'workshopCode',
-          value: 'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-          }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },
+          {
+            key: 'workshopCode',
+            value: 'workshopCode',
+            message: '请填写车间代码！',
+            isMainValue: true
+          }
+        ],
+        verificationParams: [
+          {
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '生产线信息', // 查询弹窗标题
+          searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+          searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'workshopCode',
+              value: 'workshopCode',
+              message: '请填写车间代码！',
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '班组',
-    field: 'team',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择班组',
-        searchField: 'code',
-        searchTitle: '班组信息',
-        searchAllSchemas: Team.allSchemas,
-        searchPage: TeamApi.getTeamPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    {
+      label: '班组',
+      field: 'team',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择班组',
+          searchField: 'code',
+          searchTitle: '班组信息',
+          searchAllSchemas: Team.allSchemas,
+          searchPage: TeamApi.getTeamPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '班次',
-    field: 'shift',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择班次',
-        searchField: 'code',
-        searchTitle: '班次信息',
-        searchAllSchemas: Shift.allSchemas,
-        searchPage: ShiftApi.getShiftPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    {
+      label: '班次',
+      field: 'shift',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择班次',
+          searchField: 'code',
+          searchTitle: '班次信息',
+          searchAllSchemas: Shift.allSchemas,
+          searchPage: ShiftApi.getShiftPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150,
-      show: false
-    },
-    isForm: false,
-    isTable: false
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    isTable:false,
-    form: {
-      value: 'ProductScrap',
-      componentProps: {
-        disabled: true
-      }
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150,
+        show: false
+      },
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isSearch: true,
+      isForm: false
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        value: 'ProductScrap',
+        componentProps: {
+          disabled: true
+        }
+      },
+      isForm: false
     },
-    isForm: false,
-  },
 
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isTable:false,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  // {
-  //   label: '截止时间',
-  //   field: 'dueTime',
-  //   formatter: dateFormatter,
-  //   detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   isTable:false,
-  //   form: {
-  //     component: 'DatePicker',
-  //     componentProps: {
-  //       style: {width:'100%'},
-  //       type: 'datetime',
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //       valueFormat: 'x',
-  //     }
-  //   },
-  // },
-  // {
-  //   label: '备注',
-  //   field: 'remark',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: false,
-  // },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 150
-    },
-    isTable:false,
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
-    form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    // {
+    //   label: '截止时间',
+    //   field: 'dueTime',
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   isTable:false,
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       style: {width:'100%'},
+    //       type: 'datetime',
+    //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       valueFormat: 'x',
+    //     }
+    //   },
+    // },
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false,
+    // },
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      isForm: false,
+      table: {
+        width: 150
+      },
+      isTable: false,
+      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+        return userDeptArray.find((account) => account.id == cellValue)?.name
+      },
+      form: {
+        value: userDept.id,
+        component: 'Select',
+        api: () => userDeptArray,
+        componentProps: {
+          disabled: true,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'id'
+          }
         }
       }
-    }
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
     },
-    isTable:false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '自动提交',
+      field: 'autoCommit',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoCommit,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
     },
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false
-  },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable:false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoAgree,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable:false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '自动执行',
+      field: 'autoExecute',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoExecute,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable:false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.directCreateRecord,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 300,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 300,
-      fixed: 'right'
-    },
-  }
-]))
+  ])
+)
 
 //表单校验
 export const ProductscrapRequestMainRules = reactive({
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
index c38e328b5..1463bf747 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
@@ -1,601 +1,654 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
+import * as InspectionQ2Api from '@/api/qms/inspectionQ2'
+import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
+
 /**
  * @returns {Array} 采购退货任务主表
  */
-export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isSearch: true,
-    sortSearchDefault: 1,
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-  },
-  {
-    label: '采购收货记录单号',
-    field: 'purchaseReceiptRecordNumber',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 180
-    },
-    sortTableDefault: 4,
-    sortSearchDefault: 4
-  },
-  {
-    label: '发货单号',
-    field: 'asnNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true,
-    sortTableDefault: 3,
-    sortSearchDefault: 3
-  },
-  {
-    label: '要货计划单号',
-    field: 'ppNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    sortTableDefault: 2,
-    sortSearchDefault: 2
-  },
-  {
-    label: '发货月台',
-    field: 'deliverDock',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '承运商',
-    field: 'carrierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '运输方式',
-    field: 'transferMode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '车牌号',
-    field: 'vehiclePlateNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    isTable: false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    isTable: false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从月台代码',
-    field: 'fromDockCode',
-    sort: 'custom',
-    isTable: false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const PurchasereturnJobMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isSearch: true,
+      sortSearchDefault: 1
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: '采购收货记录单号',
+      field: 'purchaseReceiptRecordNumber',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 180
+      },
+      sortTableDefault: 4,
+      sortSearchDefault: 4
+    },
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true,
+      sortTableDefault: 3,
+      sortSearchDefault: 3
+    },
+    {
+      label: '要货计划单号',
+      field: 'ppNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: 'Q2通知单号',
+      field: 'q2Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      sortTableDefault: 5,
+      sortSearchDefault: 5,
+      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: '要求截止时间',
-    field: 'requestDueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      sortTableDefault: 2,
+      sortSearchDefault: 2
+    },
+    {
+      label: '发货月台',
+      field: 'deliverDock',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '承运商',
+      field: 'carrierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '运输方式',
+      field: 'transferMode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '车牌号',
+      field: 'vehiclePlateNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault: 1
-  },
-  // {
-  //   label: '状态',
-  //   field: 'jobStageStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  {
-    label: '过期时间',
-    field: 'expiredTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '优先级',
-    field: 'priority',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '优先级增量',
-    field: 'priorityIncrement',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '承接人',
-    field: 'acceptUserName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '承接时间',
-    field: 'acceptTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '完成人',
-    field: 'completeUserName',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      }
     },
-    isTable: false,
-  },
-  {
-    label: '完成时间',
-    field: 'completeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '从月台代码',
+      field: 'fromDockCode',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '要求截止时间',
+      field: 'requestDueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '自动完成',
-    field: 'autoComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.JOB_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1
+    },
+    // {
+    //   label: '状态',
+    //   field: 'jobStageStatus',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '过期时间',
+      field: 'expiredTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    isTable: false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '优先级',
+      field: 'priority',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
       }
-    }
-  },
-  {
-    label: '允许修改库位',
-    field: 'allowModifyLocation',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '优先级增量',
+      field: 'priorityIncrement',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
       }
-    }
-  },
-  {
-    label: '允许修改数量',
-    field: 'allowModifyQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '承接人',
+      field: 'acceptUserName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '承接时间',
+      field: 'acceptTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '允许大于推荐数量',
-    field: 'allowBiggerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '完成人',
+      field: 'completeUserName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '完成时间',
+      field: 'completeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '允许小于推荐数量',
-    field: 'allowSmallerQty',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '自动完成',
+      field: 'autoComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改库存状态',
-    field: 'allowModifyInventoryStatus',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改库位',
+      field: 'allowModifyLocation',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许连续扫描',
-    field: 'allowContinuousScanning',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改数量',
+      field: 'allowModifyQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许部分完成',
-    field: 'allowPartialComplete',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许大于推荐数量',
+      field: 'allowBiggerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改批次',
-    field: 'allowModifyBatch',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许小于推荐数量',
+      field: 'allowSmallerQty',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '允许修改箱码',
-    field: 'allowModifyPackingNumber',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '允许修改库存状态',
+      field: 'allowModifyInventoryStatus',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    isTable: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '允许连续扫描',
+      field: 'allowContinuousScanning',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
     },
-    isTable: true,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '允许部分完成',
+      field: 'allowPartialComplete',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '允许修改批次',
+      field: 'allowModifyBatch',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
     },
-    isTable: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '允许修改箱码',
+      field: 'allowModifyPackingNumber',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
     },
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 120,
-      fixed: 'right'
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: true
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-  }
-]))
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 120,
+        fixed: 'right'
+      }
+    }
+  ])
+)
 
 //表单校验
 export const PurchasereturnJobMainRules = reactive({
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index 27f5921b8..292b32b4e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -1,387 +1,439 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+
+import * as InspectionQ2Api from '@/api/qms/inspectionQ2'
+import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
 
 /**
  * @returns {Array} 采购退货记录主表
  */
-export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    sortTableDefault: 1012,
-    sortSearchDefault:1,
-    isSearch: true
-  },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false
-  },
-  {
-    label: '任务单号',
-    field: 'jobNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false
-  },
-  {
-    label: '采购收货记录单号',
-    field: 'purchaseReceiptRecordNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true,
-    sortTableDefault: 3,
-    sortSearchDefault: 5,
-  },  {
-    label: 'qad采购退货记录单号',
-    field: 'qadPurchaseReturnRecordCode',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    sortSearchDefault:3,
-    sortTableDefault: 4,
-    isTable: true
-  },
-  {
-    label: '发货单号',
-    field: 'asnNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    sortSearchDefault:3,
-    isSearch: true,
-    sortTableDefault: 2
-  },
-  {
-    label: '要货计划单号',
-    field: 'ppNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault: 1,
-    sortSearchDefault:2,
-    isSearch: true
-  },
-  {
-    label: '从月台代码',
-    field: 'fromDockCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '承运商',
-    field: 'carrierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '运输方式',
-    field: 'transferMode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '车牌号',
-    field: 'vehiclePlateNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '执行时间',
-    field: 'executeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+export const PurchasereturnRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      sortTableDefault: 1012,
+      sortSearchDefault: 1,
+      isSearch: true
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: '任务单号',
+      field: 'jobNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: '采购收货记录单号',
+      field: 'purchaseReceiptRecordNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true,
+      sortTableDefault: 3,
+      sortSearchDefault: 5
+    },
+    {
+      label: 'qad采购退货记录单号',
+      field: 'qadPurchaseReturnRecordCode',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      sortSearchDefault: 3,
+      sortTableDefault: 4,
+      isTable: true
+    },
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      sortSearchDefault: 3,
+      isSearch: true,
+      sortTableDefault: 2
+    },
+    {
+      label: '要货计划单号',
+      field: 'ppNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false
+    },
+    {
+      label: 'Q2通知单号',
+      field: 'q2Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      sortTableDefault: 4,
+      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: '生效日期',
-    field: 'activeDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1,
+      sortSearchDefault: 2,
+      isSearch: true
+    },
+    {
+      label: '从月台代码',
+      field: 'fromDockCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '承运商',
+      field: 'carrierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '运输方式',
+      field: 'transferMode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '车牌号',
+      field: 'vehiclePlateNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '出库事务类型',
+      field: 'outTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '入库事务类型',
+      field: 'inTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '执行时间',
+      field: 'executeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '生效日期',
+      field: 'activeDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      }
     },
-  },
-  // {
-  //   label: '原因',
-  //   field: 'available',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: true,
-  // },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    isTable: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    // {
+    //   label: '代码',
+    //   field: 'code',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '接口类型',
+      field: 'interfaceType',
+      dictType: DICT_TYPE.INTERFACE_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '是否可用',
+      field: 'available',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    isTable: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
+    // {
+    //   label: '原因',
+    //   field: 'available',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: true,
+    // },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-  }
-]))
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      }
+    }
+  ])
+)
 
 //表单校验
 export const PurchasereturnRecordMainRules = reactive({
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 861ff32fd..5f751f458 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -1,629 +1,688 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
-import { PurchasereceiptRecordDetail,PurchasereceiptRecordMain } from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+import {
+  PurchasereceiptRecordDetail,
+  PurchasereceiptRecordMain
+} from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
-import { Supplier } from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
-import * as SupplierApi from "@/api/wms/supplier";
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as SupplierApi from '@/api/wms/supplier'
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
-import * as LocationApi from "@/api/wms/location";
-import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import * as BalanceApi from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
-
+import * as InspectionQ2Api from '@/api/qms/inspectionQ2'
+import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'PurchaseReturnRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'PurchaseReturnRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
-
- // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 
 // 采购收货记录展示列
-export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    fixed: 'left',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true
-  },
-  {
-    label: '采购收货记录单号',
-    field: 'number',
-    fixed: 'left',
-    sort: 'custom',
-    table: {
-      width: 200
-    },
-    isSearch: true
-  },
-  {
-    label: '发货单号',
-    field: 'asnNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true
-  },
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
+export const PurchasereceiptRecordMain1 = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      fixed: 'left',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '采购收货记录单号',
+      field: 'number',
+      fixed: 'left',
+      sort: 'custom',
+      table: {
+        width: 200
+      },
+      isSearch: true
+    },
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true
+    },
+    {
+      label: '采购订单号',
+      field: 'poNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '订单行',
+      field: 'poLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
 
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
-    field: 'fromBatch',
-    sort: 'custom',
-    isForm:false,
-    isTableForm:false,
-    table: {
-      width: 150
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
+      field: 'fromBatch',
+      sort: 'custom',
+      isForm: false,
+      isTableForm: false,
+      table: {
+        width: 150
+      }
     },
-  },
-  // {
-  //   label: '包装规格',
-  //   field: 'packUnit',
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '从库位代码',
-  //   field: 'fromLocationCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //
-  // },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-
-
-]))
+    // {
+    //   label: '包装规格',
+    //   field: 'packUnit',
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    // {
+    //   label: '从库位代码',
+    //   field: 'fromLocationCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //
+    // },
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    }
+  ])
+)
 
 /**
  * @returns {Array} 采购退货申请主表
  */
-export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
+export const PurchasereturnRequestMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isForm: false,
+      isSearch: true
+    },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: true,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1,
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    sortTableDefault:1,
-    isSearch: true,
-    form:{
-      componentProps:{
-        enterSearch: true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1,
+      isSearch: true,
+      form: {
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '供应商信息', // 查询弹窗标题
+          searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+          searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '采购收货记录单号',
-    field: 'purchaseReceiptRecordNumber',
-    sort: 'custom',
-    table: {
-      width: 180
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        disabled:true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '采购收货记录', // 查询弹窗标题
-        searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法
-        searchCondition: [
-        {
-          key: 'supplierCode',
-          value: 'supplierCode',
-          isMainValue: true
-          }],
-        verificationParams: [{
-          key: 'number',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    {
+      label: '采购收货记录单号',
+      field: 'purchaseReceiptRecordNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          disabled: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: '采购收货记录', // 查询弹窗标题
+          searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
+          searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'supplierCode',
+              value: 'supplierCode',
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '发货单号',
-    field: 'asnNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isForm: false,
-    sortTableDefault:2
-  },
-  {
-    label: '要货计划单号',
-    field: 'ppNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isForm: false,
-    isTable: false,
-  },
-  {
-    label: '承运商',
-    field: 'carrierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '运输方式',
-    field: 'transferMode',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRANSFER_MODE,
-    dictClass: 'string',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '车牌号',
-    field: 'vehiclePlateNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTable: false,
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm:false,
-    isForm: false,
-    isTable: false,
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm:false,
-    isForm: false,
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTable: false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    isForm: false,
-    isTable: false,
-    isTableForm:false,
-  },
-  {
-    label: '从月台代码',
-    field: 'fromDockCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTable: false,
-
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'PurchaseReturn',
-      componentProps: {
-        disabled: true
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isForm: false,
+      sortTableDefault: 2
+    },
+    {
+      label: '要货计划单号',
+      field: 'ppNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isForm: false,
+      isTable: false
+    },
+    {
+      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
+            },
+            {
+              key: 'supplierCode',
+              value: 'supplierCode',
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
     },
-    isForm: false,
-    isTable: false,
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '承运商',
+      field: 'carrierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '运输方式',
+      field: 'transferMode',
+      sort: 'custom',
+      dictType: DICT_TYPE.TRANSFER_MODE,
+      dictClass: 'string',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '车牌号',
+      field: 'vehiclePlateNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: false,
+      isTableForm: false
+    },
+    {
+      label: '从月台代码',
+      field: 'fromDockCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        value: 'PurchaseReturn',
+        componentProps: {
+          disabled: true
+        }
+      },
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-    isForm: false,
-    isTable: false,
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      isForm: false,
+      table: {
+        width: 150
+      },
+      isTable: false,
+      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+        return userDeptArray.find((account) => account.id == cellValue)?.name
+      },
+      form: {
+        value: userDept.id,
+        component: 'Select',
+        api: () => userDeptArray,
+        componentProps: {
+          disabled: true,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'id'
+          }
+        }
       }
     },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 150
-    },
-    isTable: false,
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
-    form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
+
+    {
+      label: '原因',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      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'
         }
       }
-    }
-  },
-
-  {
-    label: '原因',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    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',
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      isForm: false,
+      isTable: true
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      sort: 'custom',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    table: {
-      width: 130
     },
-    isForm: false,
-    isTable: true
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '自动提交',
+      field: 'autoCommit',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoCommit,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '自动通过',
+      field: 'autoAgree',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoAgree,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '自动执行',
+      field: 'autoExecute',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoExecute,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.directCreateRecord,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 300,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 300,
-      fixed: 'right'
-    },
-  }
-]))
+  ])
+)
 
 //表单校验
 export const PurchasereturnRequestMainRules = reactive({