diff --git a/src/api/wms/productionreturnRecordDetail/index.ts b/src/api/wms/productionreturnRecordDetail/index.ts
index f9ffcd4a4..910cb941e 100644
--- a/src/api/wms/productionreturnRecordDetail/index.ts
+++ b/src/api/wms/productionreturnRecordDetail/index.ts
@@ -44,6 +44,26 @@ export const getProductionreturnRecordDetailPage = async (params) => {
     return await request.get({ url: `/wms/productionreturn-record-detail/page`, params })
   }
 }
+// 查询生产退料记录子列表
+export const getProductionreturnRecordDetailPageStore = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-record-detail-store/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-record-detail-store/page`, params })
+  }
+}
+// 查询隔离退料记录子列表
+export const getProductionreturnRecordDetailPageHold = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-record-detail-hold/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-record-detail-hold/page`, params })
+  }
+}
 
 // 查询生产退料记录子详情
 export const getProductionreturnRecordDetail = async (id: number) => {
diff --git a/src/api/wms/purchasePlanDetail/index.ts b/src/api/wms/purchasePlanDetail/index.ts
index a436ab74a..d09baf96a 100644
--- a/src/api/wms/purchasePlanDetail/index.ts
+++ b/src/api/wms/purchasePlanDetail/index.ts
@@ -20,10 +20,12 @@ const getPageParams = (params)=>{
 
   console.log('params.status',params.status)
   // 状态
-  if(params.status&&params.status.length>0){
-    params.statuss = params.status.join(',')
+  if(Array.isArray(params.status)){
+    if(params.status&&params.status.length>0){
+      params.statuss = params.status.join(',')
+    }
+    params.status = ''
   }
-  params.status = ''
   return params
 }
 // 查询要货计划子列表
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 9d92b889c..7fcdee9ed 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -6,6 +6,7 @@
       :width="dialogWidth"
       :close-on-click-modal="false"
       :vLoading="formLoading"
+      :before-close="handleClose"
     >
       <div
         class="box"
@@ -1519,6 +1520,11 @@ const inspectionValueInput = (item, cur) => {
     }
   }
 }
+const handleClose =async (done: () => void) => {
+    await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
+    emit('close')
+    done()
+}
 </script>
 <style scoped>
 .small-title {
diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index 3d430b68f..47f35526a 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -4,11 +4,8 @@
     <Search
       :schema="InspectionJobMain.allSchemas.searchSchema"
       @search="setSearchParams"
-      @reset="setSearchParams({
-          available: true,
-    excludeInspectionType: '1,4'
-        })"
-      />
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -23,7 +20,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -60,6 +58,7 @@
     :rules="InspectionJobMainRules"
     :formAllSchemas="InspectionJobMain.allSchemas"
     @submitForm="submitForm"
+    @close="getList"
   />
   <!-- 详情 -->
   <Detail
@@ -86,13 +85,13 @@
     :list="list"
   />
   <el-dialog
-      v-model="showQualityReport"
-      :title="t('质检明细')"
-      :append-to-body="false"
-      destroy-on-close
-      fullscreen
-    >
-    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
   </el-dialog>
 </template>
 
@@ -122,6 +121,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import AddForm from './addForm.vue'
 import Detail from './detail.vue'
 import { getReportUrl } from '@/utils/systemParam'
+import { useUserStore } from '@/store/modules/user'
 
 // 采购订单
 defineOptions({ name: 'inspectionJobMain' })
@@ -132,7 +132,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(InspectionJobMain.allSchemas.tableColumns)
-
+const userStore = useUserStore()
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -202,7 +202,7 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') {
     // 刷新
-    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
       searchFormClick({
         filters: tableObject.params.filters
       })
@@ -235,23 +235,35 @@ const isShowMainButton2 = (row, val) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton1 = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (userStore.getUser.id == row.acceptUserId) {
+      return false
+    } else {
+      return true
+    }
+  } else {
+    return true
+  }
+}
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({
-      hide: isShowMainButton(row, ['1']),
-      hasPermi: 'qms:inspection-job-main:accept'
-    }), // 承接
+    // defaultButtons.mainListJobAccBtn({
+    //   hide: isShowMainButton(row, ['1']),
+    //   hasPermi: 'qms:inspection-job-main:accept'
+    // }), // 承接
     defaultButtons.mainListJobCloBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'qms:inspection-job-main:close'
     }), // 关闭
     defaultButtons.mainListJobAbaBtn({
-      hide: isShowMainButton(row, ['2']),
+      hide: isShowMainButton1(row, ['2']),
       hasPermi: 'qms:inspection-job-main:abandon'
     }), // 放弃
     defaultButtons.mainListJobExeBtn({
-      hide: isShowMainButton(row, ['2']),
+      hide: isShowMainButton(row, ['1', '2']),
       hasPermi: 'qms:inspection-job-main:execute'
     }), // 执行
     defaultButtons.mainListOrderPubBtn({
@@ -299,7 +311,7 @@ const showQualityReport = ref(false)
 const qualityReport = ref('')
 const checkQualityReport = async (row) => {
   showQualityReport.value = true
-  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+  qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
 }
 
 /** 添加/修改操作 */
@@ -317,8 +329,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 //执行
 
 const formRef = ref()
-const execute = async (type: string, row?: number) => {
-  formRef.value.open(type, row)
+const execute = async (type: string, row?: any) => {
+  if (row.status == '2') {
+    if (userStore.getUser.id == row.acceptUserId) {
+      formRef.value.open(type, row)
+    } else {
+      message.error('承接人与当前登录人不一致')
+    }
+  } else if (row.status == '1') {
+    await handleAccept(row.id)
+    formRef.value.open(type, row)
+    await getList()
+  }
 }
 /** 关闭按钮操作 */
 const handleClose = async (id: number) => {
@@ -329,7 +351,7 @@ const handleClose = async (id: number) => {
     await InspectionJobMainApi.closeInspectionJobMain(id)
     message.success(t('common.closeSuccess'))
     // 刷新列表
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } catch {}
 }
 /** 发布按钮操作 */
@@ -341,19 +363,19 @@ const handleRelease = async (id: number) => {
     await InspectionJobMainApi.releaseInspectionJobMain(id)
     message.success('发布成功！')
     // 刷新列表
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } catch {}
 }
 // 承接
 const handleAccept = async (id: number) => {
   try {
     // 承接的二次确认
-    await message.confirm(t('common.confirmAccept'))
+    // await message.confirm(t('common.confirmAccept'))
     // 发起承接
     await InspectionJobMainApi.acceptInspectionJobMain(id)
-    message.success(t('common.acceptSuccess'))
+    // message.success(t('common.acceptSuccess'))
     // 刷新列表(TB反馈，取消承接后刷新页面)
-    buttonBaseClick('refresh',null)
+    // buttonBaseClick('refresh', null)
   } catch {}
 }
 // 放弃任务
@@ -365,7 +387,7 @@ const handleAbandon = async (id: number) => {
     await InspectionJobMainApi.abandonInspectionJobMain(id)
     message.success(t('common.giveupSuccess'))
     // 刷新列表
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } catch {}
 }
 
@@ -411,8 +433,8 @@ const submitForm = async (formType, data) => {
     // 刷新当前列表
     if (formType === 'create') {
       getList()
-    }else{
-      buttonBaseClick('refresh',null)
+    } else {
+      buttonBaseClick('refresh', null)
     }
   } finally {
     formRef.value.formLoading = false
@@ -429,11 +451,25 @@ const handleImport = () => {
 const searchFormClick = (searchData) => {
   let isHave = searchData?.filters?.some((item) => item.column == 'inspectionType')
   if (!isHave) {
-    searchData.filters.push({
-      action: 'notIn',
-      column: 'inspectionType',
-      value: '1,4'
-    })
+    if (route.name == 'inspectionJobProductionMain') {
+      searchData.filters.push({
+        action: '==',
+        column: 'inspectionType',
+        value: '4'
+      })
+    } else if (route.name == 'inspectionJobPurchaseMain') {
+      searchData.filters.push({
+        action: '==',
+        column: 'inspectionType',
+        value: '1'
+      })
+    } else {
+      searchData.filters.push({
+        action: 'notIn',
+        column: 'excludeInspectionType',
+        value: '1,4'
+      })
+    }
   }
   tableObject.params = {
     isSearch: true,
@@ -441,14 +477,47 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
 /** 初始化 **/
 onMounted(async () => {
-  tableObject.params = {
-    available: true,
-    excludeInspectionType: '1,4'
+  console.log(11,route.name)
+  if (route.name == 'inspectionJobProductionMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '4'
+    }
+  } else if (route.name == 'inspectionJobPurchaseMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '1'
+    }
+  } else {
+    tableObject.params = {
+      available: true,
+      excludeInspectionType: '1,4'
+    }
   }
+
   getList()
   // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
 })
+onActivated(() => {
+  if (route.name == 'inspectionJobProductionMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '4'
+    }
+  } else if (route.name == 'inspectionJobPurchaseMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '1'
+    }
+  } else {
+    tableObject.params = {
+      available: true,
+      excludeInspectionType: '1,4'
+    }
+  }
+
+  getList()
+})
 </script>
diff --git a/src/views/qms/inspectionJobProduction/addForm.vue b/src/views/qms/inspectionJobProduction/addForm.vue
deleted file mode 100644
index 6b2e16b28..000000000
--- a/src/views/qms/inspectionJobProduction/addForm.vue
+++ /dev/null
@@ -1,1552 +0,0 @@
-<template>
-  <div>
-    <Dialog
-      :title="dialogTitle"
-      v-model="dialogVisible"
-      :width="dialogWidth"
-      :close-on-click-modal="false"
-      :vLoading="formLoading"
-    >
-      <div
-        class="box"
-        style="max-height: 80vh; overflow-y: auto; padding: 0px 20px"
-        ref="mianscroll"
-      >
-        <!-- <el-backtop :right="40" :bottom="100" target=".box" @click="topScrollClick" /> -->
-        <Form
-          ref="formMainRef"
-          :rules="rules"
-          :schema="formSchema"
-          :is-col="true"
-          @opensearchTable="opensearchTable"
-        />
-        <div ref="boxList">
-          <div class="small-title">包装列表</div>
-          <div style="border: 1px solid #dedede; margin-bottom: 20px; display: flex">
-            <TableForm
-              ref="tableFormRef"
-              style="width: 100%"
-              :maxHeight="490"
-              :tableFields="tableAllSchemas.tableFormColumns"
-              :tableFormRules="tableFormRules"
-              :tableData="data.packageList"
-              :isShowButton="false"
-              :isShowReduceButton="false"
-            />
-          </div>
-        </div>
-
-        <el-tabs
-          v-model="editableTabsValue"
-          class="demo-tabs"
-          @edit="handleTabsEdit"
-          type="border-card"
-          tab-position="left"
-          :stretch="false"
-        >
-          <el-tab-pane
-            v-for="item in data.subList"
-            :key="item.name"
-            :label="item.processDescribe"
-            :name="item.name"
-            v-next-focus
-          >
-            <template #label>
-              <span class="custom-tabs-label" style="display: flex; align-items: center">
-                <Icon
-                  class="mr-5px"
-                  icon="ep:circle-check-filled"
-                  v-if="item.isPass === true"
-                  color="#67C23A"
-                  style="margin-top: 4px"
-                />
-                <Icon
-                  class="mr-5px"
-                  icon="ep:circle-close-filled"
-                  v-if="item.isPass === false"
-                  color="#ff0000"
-                  style="margin-top: 4px"
-                />
-                <span>{{ item.processDescribe }}</span>
-              </span>
-            </template>
-            <div class="tabs-box">
-              <el-collapse v-model="collapseShow">
-                <el-collapse-item name="1">
-                  <template #title>
-                    <div class="small-title">检验工序</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-form-item label="编码" prop="processCode">
-                          <el-input
-                            v-model="item.processCode"
-                            placeholder="根据系统生成"
-                            :disabled="true"
-                          />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="检验特性编号">
-                          <el-input
-                            v-model="item.inspectionFeatureCode"
-                            placeholder="根据系统生成"
-                            :disabled="true"
-                          />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="描述" prop="processDescribe">
-                          <el-input v-model="item.processDescribe" :disabled="true" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="顺序号" prop="sequenceCode">
-                          <el-input v-model="item.sequenceCode" :disabled="true" />
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </el-form>
-                </el-collapse-item>
-                <el-collapse-item name="2">
-                  <template #title>
-                    <div class="small-title">检验特性</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-                    <div>
-                      <el-row :gutter="20">
-                        <el-col :span="12">
-                          <el-form-item label="编码">
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
-                              placeholder="根据系统生成"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="描述"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="检验方法"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
-                                "
-                                disabled
-                                placeholder="请选择检验方法"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="采样过程编码"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
-                                "
-                                disabled
-                                placeholder="请选择采样过程编码"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="样品份数"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                                disabled
-                                placeholder="请输入样品份数"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                          <el-form-item
-                            label="每份样品量"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize
-                                "
-                                disabled
-                                placeholder="请输入样品份数"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="是否允许修改特征值"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                          >
-                            <el-switch
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                              disabled
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="结果录入方式"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                          >
-                            <el-select
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
-                              "
-                              placeholder="请选择结果录入方式"
-                              @change="resultEntryMethodChange($event, item)"
-                              disabled
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(
-                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                                )"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="特征类型"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                          >
-                            <el-select
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                              placeholder="请选择特征类型"
-                              @change="changeFeatureType"
-                              disabled
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(
-                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                                )"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定上限"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                          "
-                        >
-                          <el-form-item
-                            label="上限值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定下限"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                          "
-                        >
-                          <el-form-item
-                            label="下限值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定目标值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                          "
-                        >
-                          <el-form-item
-                            label="目标值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                          <el-form-item
-                            label="开始时间"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                          >
-                            <el-date-picker
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
-                              "
-                              type="datetime"
-                              placeholder="请选择开始时间"
-                              style="width: 100%"
-                              value-format="x"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="结束时间"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                          >
-                            <el-date-picker
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-                              "
-                              type="datetime"
-                              placeholder="请选择结束时间"
-                              style="width: 100%"
-                              value-format="x"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <!-- 手动评估的时候显示 -->
-                        <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                          <el-form-item
-                            label="评估代码"
-                            required
-                            prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                          >
-                            <el-select
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                              placeholder="请选择评估代码"
-                              @change="changeFeatureType"
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-                      </el-row>
-                    </div>
-                  </el-form>
-                </el-collapse-item>
-                <el-collapse-item name="3">
-                  <template #title>
-                    <div class="small-title">检验结果</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-                    <div>
-                      <el-row :gutter="20">
-                        <el-col
-                          :span="24"
-                          v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
-                            .recordInspectionQuantifyList"
-                          :key="i"
-                        >
-                          <div
-                            style="
-                              border: 1px solid #dedede;
-                              border-radius: 4px;
-                              padding-top: 16px;
-                              margin-bottom: 10px;
-                            "
-                          >
-                            <el-row :gutter="20">
-                              <!-- 汇总录入的时候显示 -->
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
-                                  1
-                                "
-                              >
-                                <el-form-item label="合格数量" required>
-                                  <el-input
-                                    v-model="cur.qualifiedQuantity"
-                                    placeholder="请输入合格数量"
-                                    type="number"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
-                                  1
-                                "
-                              >
-                                <el-form-item label="不合格数量" required>
-                                  <el-input
-                                    v-model="cur.unqualifiedQuantity"
-                                    type="number"
-                                    placeholder="请输入不合格数量"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'
-                                "
-                              >
-                                <el-form-item label="检验值" required>
-                                  <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" @input="inputChange($event,cur)" @blur="inspectionValueInput(item, cur)" />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'
-                                "
-                              >
-                                <el-form-item label="选定集" required>
-                                  <el-select
-                                    v-model="cur.qualitativeCode"
-                                    placeholder="请选择选定集"
-                                    @change="changeQualitativeCode($event, item, cur)"
-                                  >
-                                    <el-option
-                                      v-for="dict in item.selectedProjectRespVOList"
-                                      :key="dict.dictionaryValue"
-                                      :label="dict.dictionaryLabel"
-                                      :value="dict.dictionaryValue"
-                                    />
-                                  </el-select>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO
-                            .recordInspectionQuantifyList?.length-1 == i">
-                                <el-form-item label="备注">
-                                  <el-input
-                                    v-model="cur.remark"
-                                    placeholder="请输入备注"
-                                    type="text"
-                                    maxlength="200"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
-                      <el-form-item label="缺陷级别" required>
-                        <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-row>
-                          </div>
-                        </el-col>
-                      </el-row>
-                    </div>
-                  </el-form>
-                </el-collapse-item>
-              </el-collapse>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-      <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
-      </template>
-    </Dialog>
-    <Dialog
-      title="修改名称"
-      v-model="dialogVisibleName"
-      width="500px"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 0px 20px">
-        <el-form ref="nameRef" :model="nameForm">
-          <el-form-item
-            :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
-            prop="name"
-          >
-            <el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
-          </el-form-item>
-        </el-form>
-      </div>
-      <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" />
-      </template>
-    </Dialog>
-    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
-  </div>
-</template>
-<script setup lang="ts">
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { getCurrentInstance } from 'vue'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-import { SearchTable } from '@/components/SearchTable'
-import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
-
-const { proxy } = getCurrentInstance()
-
-const message = useMessage() // 消息弹窗
-
-const props = defineProps({
-  // 显示窗口宽度设置
-  basicFormWidth: {
-    type: String,
-    default: ''
-  },
-  // 检验特性表单，列表 相关信息
-  formAllSchemasFeatures: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 检验工序表单，列表 相关信息
-  formAllSchemasProcess: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 检验模板表单，列表 相关信息
-  formAllSchemasMain: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 底部按钮集合
-  footButttondata: {
-    type: Array,
-    required: false,
-    default: null
-  },
-  // 表单，列表 相关信息
-  formAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 校验rules
-  rules: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 包装 列表 相关信息
-  tableAllSchemas: {
-    type: Array,
-    required: true,
-    default: null
-  },
-  tableFormRules: {
-    type: Array,
-    required: true,
-    default: null
-  }
-})
-const { t } = useI18n() // 国际化
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const dialogWidth = ref()
-const formMainRef = ref()
-const formFeaturesRef = ref()
-const formProcessRef = ref()
-const formSchema = ref(props.formAllSchemas?.formSchema)
-const tableAllSchemas = ref(props.tableAllSchemas)
-const tableFormRules = ref(props.tableFormRules)
-const collapseShow = ref(['1', '2', '3'])
-
-const data = ref({
-  code: '',
-  itemCode: '',
-  version: '',
-  testTypeCode: '',
-  programmeTemplateCode: '',
-  splitRule: '',
-  aql: '',
-  inspectionLevel: '',
-  effectiveDate: '',
-  expirationDate: '',
-  available: 'TRUE',
-  subList: []
-})
-
-const dialogVisibleName = ref(false)
-const nameForm = ref({
-  name: ''
-})
-const nameRef = ref()
-if (props.basicFormWidth) {
-  dialogWidth.value = props.basicFormWidth + '%'
-} else {
-  dialogWidth.value = props.isBusiness ? '60%' : '40%'
-}
-const rules = ref({
-  ...props.rules,
-  'inspectionJobCharacteristicsUpdateReqVO.description': [
-    { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [
-    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateCode': [
-    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethod': [
-    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod': [
-    { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.featureType': [
-    { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyTarget': [
-    { required: true, message: '请输入目标值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyCapping': [
-    { required: true, message: '请输入上限值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit': [
-    { required: true, message: '请输入下限值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyUom': [
-    { required: true, message: '请选择计量单位', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyDecimal': [
-    { required: true, message: '请输入小数位', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [
-    { required: true, message: '请选择集编码', trigger: 'change' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.estimateCode': [
-    { required: true, message: '请选择评估代码', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.sampleQty': [
-    { required: true, message: '请输入样品份数', trigger: 'blur' }
-  ],
-  qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }]
-})
-const allSamplePieceSize = ref(0)
-/** 打开弹窗 */
-let tabIndex = 1
-const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
-  if (titleName) {
-    dialogTitle.value = t('action.' + titleName)
-  } else {
-    dialogTitle.value = t('action.' + type)
-  }
-  formType.value = type
-  allSamplePieceSize.value = 0 //打开时候归0
-  if (row) {
-    data.value = JSON.parse(JSON.stringify(row))
-    //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
-    let list = []
-    const masterId = row.jobId || row.id
-    list = await InspectionJobDetailPageApi.getInspectionJobDetailList(masterId)
-    data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(masterId)
-    list.forEach((item, index) => {
-      editableTabsValue.value = 1
-      item.name = index + 1
-      item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO
-      item.isPass = '' //判断是否显示对号错误图标
-      // 总数量值是 样品份数 乘 每份样品量
-      allSamplePieceSize.value += parseFloat(
-        (
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
-        ).toFixed(6)
-      )
-      // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
-        // 单个录入时
-        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) {
-          // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-          for (
-            let i = 0;
-            i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty);
-            i++
-          ) {
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-              inspectionValue: '', //检验值
-              qualitativeCode: '', //定性字典项值
-              defectLevel: '', //缺陷级别
-              qualifiedQuantity: '', //合格数量
-              unqualifiedQuantity: '' //不合格数量
-            })
-          }
-        } else {
-          // 汇总录入时
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-            inspectionValue: '', //检验值
-            qualitativeCode: '', //定性字典项值
-            defectLevel: '', //缺陷级别
-            qualifiedQuantity: parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty), //合格数量
-            unqualifiedQuantity: '0' //不合格数量
-          })
-        }
-      }
-
-      // 编辑判断上限下限目标值是否必填
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
-      }
-      if (item.samplingProcessRespVO.evaluationMode == 1) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false
-      }
-    })
-    list.forEach((item) => {
-      item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime = new Date()
-    })
-    data.value.subList = list
-    /**
-        设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，
-        第一个包装采样数量>总数量 则显示总数量
-      */
-
-    for (let i = 0; i < data.value?.packageList?.length; i++) {
-      if (data.value.packageList[i].sampleAmount == null) {
-        if (allSamplePieceSize.value > data.value.packageList[i].amount) {
-          data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
-          allSamplePieceSize.value = parseFloat(
-            (allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(6)
-          )
-        } else {
-          data.value.packageList[i].sampleAmount = allSamplePieceSize.value
-          allSamplePieceSize.value = 0
-          // return;
-        }
-      }
-    }
-    // data.value.packageList.forEach(item=>{
-
-    // })
-    dialogVisible.value = true
-    nextTick(() => {
-      formMainRef.value.setValues(row)
-    })
-  } else {
-    data.value = {
-      code: '',
-      itemCode: '',
-      version: '',
-      testTypeCode: '',
-      programmeTemplateCode: '',
-      splitRule: '',
-      aql: '',
-      inspectionLevel: '',
-      effectiveDate: '',
-      expirationDate: '',
-      available: 'TRUE',
-      subList: []
-    }
-  }
-  dialogVisible.value = true
-  tabIndex = data.value.subList.length + 1
-}
-defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
-import type { TabPaneName } from 'element-plus'
-
-const editableTabsValue = ref(1)
-// const editableTabs = ref([])
-const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => {
-  if (action === 'add') {
-    nameForm.value.name = ''
-    dialogVisibleName.value = true
-  } else if (action === 'remove') {
-    const tabs = data.value.subList
-    let activeName = editableTabsValue.value
-    if (activeName === targetName) {
-      tabs.forEach((tab, index) => {
-        if (tab.name === targetName) {
-          const nextTab = tabs[index + 1] || tabs[index - 1]
-          if (nextTab) {
-            activeName = nextTab.name
-          }
-        }
-      })
-    }
-    editableTabsValue.value = activeName
-    data.value.subList = tabs.filter((tab) => tab.name !== targetName)
-  }
-}
-/** 修改名称时间 */
-const buttonBaseClick1 = async (val) => {
-  // 保存
-  if (val == 'save') {
-    if (!nameRef.value) return
-    nameRef.value.validate((valid, fields) => {
-      if (valid) {
-        const newTabName = `${++tabIndex}`
-        data.value.subList.push({
-          description: nameForm.value.name,
-          name: newTabName,
-          inspectionCode: '',
-          sequenceCode: '',
-          inspectionCharCode: '',
-          inspectionJobCharacteristicsUpdateReqVO: {
-            describe: '',
-            inspectionMethodCode: '',
-            dynamicUpdateCode: '',
-            inspectionMethod: '',
-            isCanUpdate: '',
-            isDestructionInspection: '',
-            resultEntryMethod: '',
-            featureType: '',
-            quantifyIsCapping: '',
-            quantifyIsLowlimit: '',
-            quantifyIsTarget: '',
-            quantifyTarget: '',
-            quantifyCapping: '',
-            quantifyLowlimit: '',
-            quantifyUom: '',
-            quantifyDecimal: '',
-            quantifyQuantifyCode: ''
-          }
-        })
-
-        editableTabsValue.value = newTabName
-        dialogVisibleName.value = false
-      } else {
-        return false
-      }
-    })
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisibleName.value = false
-  }
-}
-const buttonBaseClick = async (val) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
-    dialogVisible.value = false
-  }
-  // 暂存
-  else if (val == 'staging') {
-    staging()
-  }
-}
-// 传递给父类
-const emit = defineEmits(['submitForm', 'searchTableSuccess'])
-const validateForm = (formRef) => {
-  let _lists = formRef?.map((v) => v.validate())
-  return Promise.all(_lists)
-    .then(() => {
-      return true
-    })
-    .catch(() => {
-      return false
-    })
-}
-const tableFormRef = ref()
-const submitForm = async () => {
-  try {
-    const elForm = unref(formMainRef)?.getElFormRef()
-    // 校验表单
-    if (!elForm) return
-    const valid = await elForm.validate()
-    if (!valid) return
-    // 校验包装列表
-    if (data.value.packageList?.length > 0) {
-      const validateForm1 = await tableFormRef.value.validateForm()
-      if (!validateForm1) return
-      let isPass = data.value.packageList.some(
-        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
-      )
-      if (isPass) {
-        message.error(`采样数量不能大于数量`)
-        return
-      }
-
-      // let number = 0
-      // data.value.packageList.forEach(cur=>{
-      //   number += parseFloat(cur.sampleAmount)
-      // })
-      // number = number.toFixed('2')
-      // if(number != data.value.sampleTotalAmount){
-      //   message.error(`采样数量之和必须等于采样总数量`)
-      //   return
-      // }
-    }
-
-    const bol2 = await validateForm(formFeaturesRef.value)
-    if (!bol2) {
-      message.error(`模板中有检验工序和检验特性未填写完全`)
-      return
-    }
-    // 判断数组是否有未填的选项
-    let arrBol = []
-    let isOutweigh = [] //结束时间是否大于开始时间
-    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
-    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
-    data.value.subList.forEach((item, index) => {
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.inspectionValue
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.qualitativeCode
-            }
-          )
-        )
-      }
-      // 开始时间大于结束时间放入数组中
-      if (
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-      ) {
-        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
-      }
-      // 合格数量和不合格数量之和不能是小数
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        parseFloatList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
-                String(cur.unqualifiedQuantity).indexOf('.') > -1
-              )
-            }
-          )
-        )
-        // 合格数量和不合格数量之和不等于总数量
-        numberList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              )
-            }
-          )
-        )
-      }
-    })
-    let isEmpty1 = arrBol.some((item) => item == true)
-    let isEmptyNumberList = numberList.some((item) => item == true)
-    let isParseFloat = parseFloatList.some((item) => item == true)
-    if (isEmpty1) {
-      message.error('检验工序和检验特性有字段未填写完全')
-      return
-    }
-    // if (isOutweigh?.length > 0) {
-    //   message.error('检验特性中有开始时间大于结束时间')
-    //   return
-    // }
-    if (isParseFloat) {
-      message.error('合格数量和不合格数量之和不可以是小数')
-      return
-    }
-    if (isEmptyNumberList) {
-      message.error('合格数量和不合格数量之和必须等于样品份数')
-      return
-    }
-    data.value.id = data.value.jobId || data.value.id
-    if (formType.value == 'create') {
-      // 主子表——提交请求
-      emit('submitForm', formType.value, data.value)
-    } else {
-      // 编辑/执行
-      emit('submitForm', formType.value, data.value)
-    }
-  } catch {}
-}
-
-const staging = async () => {
-  try {
-    const elForm = unref(formMainRef)?.getElFormRef()
-    // 校验表单
-    if (!elForm) return
-    const valid = await elForm.validate()
-    if (!valid) return
-    // 校验包装列表
-
-    if (data.value.packageList?.length > 0) {
-      const validateForm1 = await tableFormRef.value.validateForm()
-      if (!validateForm1) return
-      let isPass = data.value.packageList.some(
-        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
-      )
-      if (isPass) {
-        message.error(`采样数量不能大于数量`)
-        return
-      }
-      // let number = 0
-      // data.value.packageList.forEach(cur=>{
-      //   number += parseFloat(cur.sampleAmount)
-      // })
-      // number = number.toFixed('2')
-      // if(number != data.value.sampleTotalAmount){
-      //   message.error(`采样数量之和必须等于采样总数量`)
-      //   return
-      // }
-    }
-
-    const bol2 = await validateForm(formFeaturesRef.value)
-    if (!bol2) {
-      message.error(`模板中有检验工序和检验特性未填写完全`)
-      return
-    }
-    // 判断数组是否有未填的选项
-    let arrBol = []
-    let isOutweigh = [] //结束时间是否大于开始时间
-    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
-    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
-    data.value.subList.forEach((item, index) => {
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.inspectionValue
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.qualitativeCode
-            }
-          )
-        )
-      }
-      // 开始时间大于结束时间放入数组中
-      if (
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-      ) {
-        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
-      }
-      // 合格数量和不合格数量之和不能是小数
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        parseFloatList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
-                String(cur.unqualifiedQuantity).indexOf('.') > -1
-              )
-            }
-          )
-        )
-        // 合格数量和不合格数量之和不等于总数量
-        numberList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              )
-            }
-          )
-        )
-      }
-    })
-    let isEmpty1 = arrBol.some((item) => item == true)
-    let isEmptyNumberList = numberList.some((item) => item == true)
-    let isParseFloat = parseFloatList.some((item) => item == true)
-    if (isEmpty1) {
-      message.error('检验工序和检验特性有字段未填写完全')
-      return
-    }
-    // if (isOutweigh?.length > 0) {
-    //   message.error('检验特性中有开始时间大于结束时间')
-    //   return
-    // }
-    if (isParseFloat) {
-      message.error('合格数量和不合格数量之和不可以是小数')
-      return
-    }
-    if (isEmptyNumberList) {
-      message.error('合格数量和不合格数量之和必须等于样品份数')
-      return
-    }
-    await InspectionJobMainApi.stagingInspectionJobMain(data.value)
-    message.success('暂存成功')
-  } catch {}
-}
-
-/** 弹窗按钮 */
-let Butttondata: any = []
-if (props.footButttondata) {
-  Butttondata = props.footButttondata
-} else {
-  Butttondata = [
-    defaultButtons.formStagingBtn(null), // 暂存
-    defaultButtons.formSaveBtn(null), // 保存
-    defaultButtons.formCloseBtn(null) // 关闭
-  ]
-}
-// 选择特征类型
-const changeFeatureType = (e) => {
-  // if (e) {
-  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = true
-  // } else {
-  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = false
-  // }
-}
-const searchTableRef = ref()
-const opensearchTable = (
-  formField,
-  searchField,
-  searchTitle,
-  searchAllSchemas,
-  searchPage,
-  searchCondition,
-  multiple,
-  type,
-  row
-) => {
-  const _searchCondition = {}
-  // 判断查询条件中，是否存在指向主表的数据
-  if (searchCondition && searchCondition.length > 0) {
-    // 转换筛选条件所需
-    let filters: any[] = []
-    for (var i = 0; i < searchCondition.length; i++) {
-      // searchCondition.forEach((item) => {
-      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
-      if (searchCondition[i].isMainValue) {
-        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
-          ? formRef.value.formModel[searchCondition[i].value]
-          : props.detailData
-          ? props.detailData[searchCondition[i].value]
-          : row
-          ? row[searchCondition[i].value]
-          : ''
-        // 是否含有空参数情况
-        let isNull = false
-        if (
-          _searchCondition[searchCondition[i].key] == '' ||
-          _searchCondition[searchCondition[i].key] == undefined
-        ) {
-          isNull = true
-        }
-        if (isNull) {
-          message.warning(
-            searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
-          )
-          return
-        }
-      } else {
-        // 扩展 转换为筛选条件进行查询
-        if (searchCondition[i].isSearch) {
-          filters.push({
-            action: searchCondition[i].action,
-            column: searchCondition[i].key,
-            value: searchCondition[i].value
-          })
-        } else {
-          _searchCondition[searchCondition[i].key] = searchCondition[i].value
-        }
-      }
-    }
-    if (filters.length > 0) {
-      _searchCondition.isSearch = true
-      _searchCondition.filters = filters
-    }
-  }
-  const _searchTableTitle = searchTitle
-  const _searchTableAllSchemas = searchAllSchemas
-  const _searchTablePage = searchPage
-  searchTableRef.value.open(
-    _searchTableTitle,
-    _searchTableAllSchemas,
-    _searchTablePage,
-    formField,
-    searchField,
-    multiple,
-    type,
-    row,
-    _searchCondition
-  )
-}
-// 弹层确定返回所选数据
-// val ： 弹层列表row 数据
-const searchTableSuccess = async (formField, searchField, val, type, row) => {
-  if (type == 'features') {
-    row.inspectionJobCharacteristicsUpdateReqVO[formField] = val[0].code
-    if (formField == 'inspectionMethodCode') {
-      row.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName = val[0].description
-    } else if (formField == 'dynamicUpdateCode') {
-      row.inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateName = val[0].description
-    } else if (formField == 'inspectionMethod') {
-      row.inspectionJobCharacteristicsUpdateReqVO.inspectionName = val[0].description
-    }
-  } else if (type == 'main') {
-    data.value[formField] = val[0].code
-    if (formField == 'itemCode') {
-      data.value.itemName = val[0].name
-    } else if (formField == 'testTypeCode') {
-      data.value.testTypeName = val[0].description
-    } else if (formField == 'programmeTemplateCode') {
-      data.value.programmeTemplateName = val[0].description
-    }
-    if (formField == 'programmeTemplateCode') {
-      let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
-      list.forEach((item, index) => {
-        editableTabsValue.value = index + 1
-        item.name = index + 1
-        // 编辑判断上限下限目标值是否必填
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
-            false
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
-        }
-      })
-      data.value.subList = list
-    }
-  }
-
-  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
-}
-// 请选择结果录入方式
-const resultEntryMethodChange = (e, item) => {
-  item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-  if (e == 0) {
-    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-    for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-        inspectionValue: '', //检验值
-        qualitativeCode: '', //定性字典项值
-        defectLevel: '', //缺陷级别
-        qualifiedQuantity: '', //合格数量
-        unqualifiedQuantity: '' //不合格数量
-      })
-    }
-  } else {
-    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [
-      {
-        inspectionValue: '', //检验值
-        qualitativeCode: '', //定性字典项值
-        defectLevel: '', //缺陷级别
-        qualifiedQuantity: '', //合格数量
-        unqualifiedQuantity: '' //不合格数量
-      }
-    ]
-  }
-}
-// 选择选定级
-const changeQualitativeCode = (e, item, cur) => {
-  let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e)
-  cur.defectLevel = obj.defectLevel
-  cur.estimateCode = obj.estimateCode
-  // 显示图标
-  for (
-    let i = 0;
-    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList?.length;
-    i++
-  ) {
-    item.isPass = true
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].estimateCode ==
-      '2'
-    ) {
-      item.isPass = false
-      return
-    }
-  }
-}
-const mianscroll = ref()
-const boxList = ref()
-
-// const topScrollClick = () => {
-//   nextTick(() => {
-//     mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
-//   })
-// }
-const inputChange = (val,cur) => {
-  cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '')
-}
-const inspectionValueInput = (item, cur) => {
-  for (
-    let i = 0;
-    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
-    i++
-  ) {
-    item.isPass = true
-    //  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和下限值,目标值存在 大于上限并且小于下限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      item.isPass = false
-      return
-    }
-  }
-}
-</script>
-<style scoped>
-.small-title {
-  font-weight: bold;
-  padding: 0px 10px 10px;
-  color: #1a8bfc;
-  font-size: 16px;
-}
-.tabs-box {
-  max-height: calc(80vh - 40px);
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-</style>
-<style>
-.el-tabs--left .el-tabs__header.is-left {
-  padding-bottom: 5000px;
-  margin-bottom: -5000px;
-  min-width: 150px !important;
-}
-
-.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
-  min-width: 120px !important;
-}
-.el-backtop {
-  position: absolute !important;
-}
-.red .el-input__inner {
-  color: red !important;
-}
-</style>
diff --git a/src/views/qms/inspectionJobProduction/detail.vue b/src/views/qms/inspectionJobProduction/detail.vue
deleted file mode 100644
index 3dc132caf..000000000
--- a/src/views/qms/inspectionJobProduction/detail.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-  <div>
-    <el-drawer v-model="isShowDrawer" title="详情" direction="rtl" size="80%" v-loading="detailLoading">
-      <template #header>
-        <div class="font-size-18px">
-          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
-        </div>
-      </template>
-      <ContentWrap v-if="!isBasic">
-        <Descriptions :data="data" labelClassName="label-class-name" label-align="left" direction="vertical" :column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px" />
-      </ContentWrap>
-      <ContentWrap>
-        <el-tabs v-model="editableTabsValue" class="demo-tabs" type="border-card" tab-position="left" :stretch="false">
-          <el-tab-pane v-for="item in data.subList" :key="item.name" :label="item.processDescribe" :name="item.name">
-            <div class="small-title">检验工序</div>
-            <el-form :model="item" label-width="auto" ref="formProcessRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码" prop="processCode">
-                    <el-input v-model="item.processCode" placeholder="根据系统生成" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="processDescribe">
-                    <el-input v-model="item.processDescribe" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="顺序号" prop="sequenceCode">
-                    <el-input v-model="item.sequenceCode"  :disabled="true" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div class="small-title">检验特性</div>
-            <el-form :model="item" label-width="auto"  ref="formFeaturesRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码">
-                    <el-input v-model="item.inspectionJobCharacteristicsRespVO.number" placeholder="根据系统生成" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="inspectionJobCharacteristicsRespVO.description">
-                    <el-input v-model="item.inspectionJobCharacteristicsRespVO.description"  :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="检验方法" prop="inspectionJobCharacteristicsRespVO.inspectionMethodCode">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsRespVO.inspectionMethodName" disabled placeholder="请选择检验方法" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="采样过程编码" prop="inspectionJobCharacteristicsRespVO.samplingProcessCode">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsRespVO.samplingProcessName" disabled placeholder="请选择采样过程编码" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="样品份数" prop="inspectionJobCharacteristicsRespVO.sampleQty">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsRespVO.sampleQty" disabled placeholder="请输入样品份数" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                
-                <el-col :span="12">
-                  <el-form-item label="每份样品量" prop="inspectionJobCharacteristicsRespVO.samplePieceSize">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsRespVO.samplePieceSize" disabled placeholder="请输入每份样品量" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="是否允许修改特征值" prop="inspectionJobCharacteristicsRespVO.isCanUpdate">
-                    <el-switch v-model="item.inspectionJobCharacteristicsRespVO.isCanUpdate" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="结果录入方式" prop="inspectionJobCharacteristicsRespVO.resultEntryMethod">
-                    <el-select v-model="item.inspectionJobCharacteristicsRespVO.resultEntryMethod" placeholder="请选择结果录入方式" @change="resultEntryMethodChange($event,item)" disabled>
-                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)" :key="dict.value" :label="dict.label" :value="dict.value" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="特征类型" prop="inspectionJobCharacteristicsRespVO.featureType">
-                    <el-select v-model="item.inspectionJobCharacteristicsRespVO.featureType" placeholder="请选择特征类型" @change="changeFeatureType" disabled>
-                      <el-option v-for="dict in getStrDictOptions( DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE )" :key="dict.value" :label="dict.label" :value="dict.value" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-tab-pane>
-        </el-tabs>
-      </ContentWrap>
-    </el-drawer>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-
-defineOptions({ name: 'Detail' })
-
-const editableTabsValue = ref('1')
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const updateKey = ref(0)
-
-const props = defineProps({
-  // 表单，列表 相关信息
-  allSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 明细列表相关信息
-  detailAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 详情列表扩展操作按钮
-  buttondataTable: {
-    type: Array,
-    required: false,
-    default: ()=>{
-      return []
-    }
-  },
-})
-const isShowDrawer = ref(false)
-const detailLoading = ref(false)
-const data = ref({
-  code: '',
-  itemCode: '',
-  version: '',
-  testTypeCode: '',
-  programmeTemplateCode: '',
-  splitRule: '',
-  aql: '',
-  inspectionLevel: '',
-  effectiveDate: '',
-  expirationDate: '',
-  available: 'TRUE',
-  subList: []
-})
-
-/** 打开弹窗 */
-const formRef = ref()
-const titleNameRef = ref()
-const titleValueRef = ref()
-const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
-  titleNameRef.value = titleName
-  titleValueRef.value = titleValue
- 
-  isShowDrawer.value = true
-  if (row) {
-    detailLoading.value = true
-    try {
-      data.value = row
-      let list = []
-      list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
-      list.forEach((item, index) => {
-      editableTabsValue.value = index + 1
-      item.name = index + 1
-      })
-      data.value.subList = list
-    } finally {
-      detailLoading.value = false
-    }
-  }
-}
-defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
-
-
-</script>
-<style lang="scss">
-.el-drawer__body {
-  background: #f5f5f5 !important;
-}
-
-::v-deep(.label-class-name) {
-  color: #dedede;
-}
-</style>
-<style scoped lang="scss"></style>
diff --git a/src/views/qms/inspectionJobProduction/index.vue b/src/views/qms/inspectionJobProduction/index.vue
deleted file mode 100644
index 04c960c99..000000000
--- a/src/views/qms/inspectionJobProduction/index.vue
+++ /dev/null
@@ -1,442 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search
-      :schema="InspectionJobMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams({
-          available: true,
-          inspectionType: '4'
-        })"
-      />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="InspectionJobMain.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>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <AddForm
-    ref="formRef"
-    basicFormWidth="80"
-    :formAllSchemasFeatures="InspectionTemplateFeatures.allSchemas"
-    :formAllSchemasProcess="InspectionTemplateProcess.allSchemas"
-    :formAllSchemasMain="InspectionTemplateMain.allSchemas"
-    :tableAllSchemas="InspectionJobPackage.allSchemas"
-    :tableFormRules="InspectionJobPackageRules"
-    :rules="InspectionJobMainRules"
-    :formAllSchemas="InspectionJobMain.allSchemas"
-    @submitForm="submitForm"
-  />
-  <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="InspectionJobMain.allSchemas"
-    :detailAllSchemas="InspectionJobDetail.allSchemas"
-    :detailAllSchemasRules="InspectionJobDetailRules"
-    :apiCreate="InspectionJobDetailApi.createInspectionJobDetail"
-    :apiUpdate="InspectionJobDetailApi.updateInspectionJobDetail"
-    :apiPage="InspectionJobDetailApi.getInspectionJobDetailPage"
-    :apiDelete="InspectionJobDetailApi.deleteInspectionJobDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="false"
-    :detailButtonIsShow="true"
-  />
-  <!-- 包装信息 -->
-  <ListTable
-    ref="listTableRef"
-    titleName="包装信息"
-    :allSchemas="InspectionJobMain.allSchemas"
-    :detailAllSchemas="InspectionJobPackage.allSchemas"
-    :detailAllSchemasRules="InspectionJobPackageRules"
-    :list="list"
-  />
-  <el-dialog
-      v-model="showQualityReport"
-      :title="t('质检明细')"
-      :append-to-body="false"
-      destroy-on-close
-      fullscreen
-    >
-    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
-  </el-dialog>
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import {
-  InspectionJobMain,
-  InspectionJobMainRules,
-  InspectionJobDetail,
-  InspectionJobDetailRules,
-  InspectionJobPackage,
-  InspectionJobPackageRules
-} from './inspectionJobMain.data'
-import {
-  InspectionTemplateMain,
-  InspectionTemplateProcess,
-  InspectionTemplateFeatures,
-  InspectionTemplateRules
-} from '../inspectionTemplate/inspectionTemplate.data'
-
-import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
-import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-import * as InspectionJobDetailApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import ListTable from '@/components/ListTable/src/ListTable.vue'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import AddForm from './addForm.vue'
-import Detail from './detail.vue'
-import { getReportUrl } from '@/utils/systemParam'
-
-// 采购订单
-defineOptions({ name: 'inspectionJobMain' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(InspectionJobMain.allSchemas.tableColumns)
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  nextTick(async () => {
-    if (type == 'tableForm') {
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      // row['itemNumber'] = val[0]['number']
-      // row['itemName'] = val[0]['name']
-      // row['uom'] = val[0]['uom']
-      // row['isRadeIn'] = val[0]['isRadeIn']
-      // row['available'] = val[0]['available']
-    } else {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      formRef.setValues(setV)
-    }
-  })
-}
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-  nextTick(async () => {
-    const setV = {}
-    // if(formField == 'itemCode'){
-    //     await ItembasicApi.getItembasicPage({
-    //       code: setV['itemCode']
-    //     }).then(res => {
-    //       setV['uom'] = res.list[0].uom
-    //       setV[formField] = val[0][searchField]
-    //     })
-    //   }
-    formRef.setValues(setV)
-  })
-}
-
-// 子表新增的时候选择表格之后需要会显得字段
-const Echo = []
-const { tableObject, tableMethods } = useTable({
-  getListApi: InspectionJobMainApi.getInspectionJobMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultExportBtn(null), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null) // 设置
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') {
-    // 新增
-    openForm('create')
-  } else if (val == 'import') {
-    // 导入
-    handleImport()
-  } else if (val == 'export') {
-    // 导出
-    handleExport()
-  } else if (val == 'refresh') {
-    // 刷新
-    getList()
-  } else if (val == 'filtrate') {
-    // 筛选
-  } else {
-    // 其他按钮
-    console.log('其他按钮', item)
-  }
-}
-
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row, val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 根据状态返回该按钮是否显示
-const isShowMainButton2 = (row, val) => {
-  if (val.indexOf(row.isStaging) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 列表-操作按钮
-const butttondata = (row) => {
-  return [
-    defaultButtons.mainListJobAccBtn({
-      hide: isShowMainButton(row, ['1']),
-      hasPermi: 'qms:inspection-job-main:accept'
-    }), // 承接
-    defaultButtons.mainListJobCloBtn({
-      hide: isShowMainButton(row, ['1']),
-      hasPermi: 'qms:inspection-job-main:close'
-    }), // 关闭
-    defaultButtons.mainListJobAbaBtn({
-      hide: isShowMainButton(row, ['2']),
-      hasPermi: 'qms:inspection-job-main:abandon'
-    }), // 放弃
-    defaultButtons.mainListJobExeBtn({
-      hide: isShowMainButton(row, ['2']),
-      hasPermi: 'qms:inspection-job-main:execute'
-    }), // 执行
-    defaultButtons.mainListOrderPubBtn({
-      hide: isShowMainButton2(row, ['TRUE']),
-      hasPermi: 'qms:inspection-job-main:execute'
-    }), // 发布
-    defaultButtons.mainListPackageBtn(null), // 包装
-    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
-  ]
-}
-const listTableRef = ref()
-const list = ref([])
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'mainJobExe') {
-    // 执行
-    execute('execute', row)
-  } else if (val == 'mainPackage') {
-    // 包装
-
-    list.value = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
-    // row.status = '1'
-    listTableRef.value.openPackage(row, '包装信息', InspectionJobPackage.allSchemas.tableColumns)
-  } else if (val == 'mainJobAba') {
-    // 放弃
-    handleAbandon(row.id)
-  } else if (val == 'mainJobClo') {
-    // 关闭
-    handleClose(row.id)
-  } else if (val == 'mainOrderPub') {
-    // 发布
-    handleRelease(row.id)
-  } else if (val == 'mainPlanCheckQualityReport') {
-    // 查看质检报告
-    checkQualityReport(row)
-  } else if (val == 'mainJobAcc') {
-    // 承接
-    handleAccept(row.id)
-  }
-}
-
-// 查看质检报告
-// 查看质检报告
-const reportHeight = ref(window.innerHeight - 120)
-const showQualityReport = ref(false)
-const qualityReport = ref('')
-const checkQualityReport = async (row) => {
-  showQualityReport.value = true
-  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
-}
-
-/** 添加/修改操作 */
-// const formRef = ref()
-// const openForm = async (type : string, row ?: number) => {
-//   tableData.value = [] // 重置明细数据
-//   formRef.value.open(type, row)
-// }
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionJobMain')
-}
-//执行
-
-const formRef = ref()
-const execute = async (type: string, row?: number) => {
-  formRef.value.open(type, row)
-}
-/** 关闭按钮操作 */
-const handleClose = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.confirm(t('common.confirmColse'))
-    // 发起删除
-    await InspectionJobMainApi.closeInspectionJobMain(id)
-    message.success(t('common.closeSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-/** 发布按钮操作 */
-const handleRelease = async (id: number) => {
-  try {
-    // 发布的二次确认
-    await message.confirm('确认发布吗？')
-    // 发起发布
-    await InspectionJobMainApi.releaseInspectionJobMain(id)
-    message.success('发布成功！')
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-// 承接
-const handleAccept = async (id: number) => {
-  try {
-    // 承接的二次确认
-    await message.confirm(t('common.confirmAccept'))
-    // 发起承接
-    await InspectionJobMainApi.acceptInspectionJobMain(id)
-    message.success(t('common.acceptSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-// 放弃任务
-const handleAbandon = async (id: number) => {
-  try {
-    // 放弃的二次确认
-    await message.confirm(t('common.confirmGiveup'))
-    // 发起放弃
-    await InspectionJobMainApi.abandonInspectionJobMain(id)
-    message.success(t('common.giveupSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await InspectionJobMainApi.exportInspectionJobMain(tableObject.params)
-    download.excel(data, '检验任务.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/**
- * tableForm方法
- */
-const tableFormKeys = {}
-InspectionJobDetail.allSchemas.tableFormColumns.forEach((item) => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-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'))
-    } else if (formType === 'execute') {
-      await InspectionJobMainApi.executeInspectionJobMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    formRef.value.formLoading = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = false
-  }
-}
-
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-
-// 筛选提交
-const searchFormClick = (searchData) => {
-  searchData.filters.push({
-    action: "==",
-    column: "inspectionType",
-    value: "4"
-  })
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
-  }
-  getList() // 刷新当前列表
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  tableObject.params = {
-    available: true,
-    inspectionType: '4'
-  }
-  getList()
-  // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
-})
-</script>
diff --git a/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts b/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts
deleted file mode 100644
index 802586cd9..000000000
--- a/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts
+++ /dev/null
@@ -1,885 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter2 } from '@/utils/formatTime'
-import { validateHanset, validateEmail } from '@/utils/validator'
-import { dateFormatter } from '@/utils/formatTime'
-import { validateTwoNum, validateSixNum } from '@/utils/validator'
-const { t } = useI18n() // 国际化
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-const resultEntryMethodList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)
-const featureTypeList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE)
-const isCanUpdateList = [
-  {
-    label: '是',
-    value: true
-  },
-  {
-    label: '否',
-    value: false
-  }
-]
-
-/**
- * @returns {Array} 检验任务主表
- */
-export const InspectionJobMain = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '编码',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 200,
-        fixed: 'left'
-      }
-    },
-    {
-      label: '申请单号',
-      field: 'requestNumber',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 200
-      }
-    },
-    {
-      label: '发货单号',
-      field: 'asnNumber',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 180
-      }
-    },
-    {
-      label: '供应商编码',
-      field: 'supplierCode',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '供应商名称',
-      field: 'supplierName',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 175
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '物料编码',
-      field: 'itemCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '物料名称',
-      field: 'itemName',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 175
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '物料批次',
-      field: 'batch',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考订单号',
-      field: 'referenceOrderCode',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考订单行',
-      field: 'referenceOrderRow',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考凭证号',
-      field: 'referenceCertificateCode',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考凭证行',
-      field: 'referenceCertificateRow',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '检验方案编码',
-      field: 'inspectionSchemeCode',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 200
-      }
-    },
-    {
-      label: '批次',
-      field: 'inspectionBatch',
-      sort: 'custom',
-      isSearch: false,
-      isDetail: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '供应商批次',
-      field: 'supplierBatch',
-      sort: 'custom',
-      isSearch: false,
-      isDetail: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '检验批数量',
-      field: 'inspectionBatchAmount',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    // {
-    //   label: '采样总数量',
-    //   field: 'sampleTotalAmount',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   form: {
-    //     componentProps:{
-    //       disabled:true
-    //     }
-    //   },
-    //   table: {
-    //     width: 150
-    //   }
-    // },
-    {
-      label: '检验类型',
-      field: 'inspectionType',
-      sort: 'custom',
-      dictType: DICT_TYPE.INSPECTION_TYPE,
-      dictClass: 'string',
-      isSearch: false,
-      form: {
-        component: 'Select',
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '完成人',
-      field: 'completeUser',
-      sort: 'custom',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-      isTable: false,
-      isDetail: false,
-      isSearch: true,
-      isTableForm: false,
-      isForm: false
-    },
-    // {
-    //   label: '检验批来源',
-    //   field: 'inspectionBatchSource',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   dictType: DICT_TYPE.INSPECTION_BATCH_SOURCE,
-    //   dictClass: 'string',
-    //   form:{
-    //     componentProps:{
-    //       disabled:true
-    //     }
-    //   },
-    //   table: {
-    //     width: 150
-    //   }
-    // },
-    {
-      label: '检验阶段',
-      field: 'inspectionStage',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '检验严格性',
-      field: 'inspectionStringency',
-      sort: 'custom',
-      isSearch: false,
-      dictType: DICT_TYPE.INSPECTION_SEVERITY,
-      dictClass: 'string',
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '计划开始时间',
-      field: 'planStartTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '计划结束时间',
-      field: 'planEndTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '检验水平',
-      field: 'inspectionLevel',
-      sort: 'custom',
-      isSearch: false,
-      dictType: DICT_TYPE.INSPECTION_LEVEL,
-      dictClass: 'string',
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: 'AQL值',
-      field: 'aqlValue',
-      sort: 'custom',
-      isSearch: false,
-      dictType: DICT_TYPE.BASIC_AQL,
-      dictClass: 'string',
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    // {
-    //   label: '使用决策',
-    //   field: 'usageDecision',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   dictType: DICT_TYPE.USAGE_DECISION,
-    //   form:{
-    //     componentProps:{
-    //     }
-    //   }
-    // },
-    // {
-    //   label: '是否可用',
-    //   field: 'available',
-    //   dictType: DICT_TYPE.TRUE_FALSE,
-    //   dictClass: 'string',
-    //   isTable: true,
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     component: 'Switch',
-    //     value: 'TRUE',
-    //     componentProps: {
-    //       inactiveValue: 'FALSE',
-    //       activeValue: 'TRUE',
-    //       disabled:true
-    //     }
-    //   }
-    // },
-    {
-      label: '承接人',
-      field: 'acceptUserName',
-      table: {
-        width: 130
-      },
-      isForm: false,
-      isTable: false,
-      isDetail: true
-    },
-    {
-      label: '承接时间',
-      field: 'acceptTime',
-      isForm: false,
-      table: {
-        width: 180
-      },
-      isTable: false,
-      isDetail: true,
-      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: 'deliveryTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x'
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-
-    {
-      label: '完成人',
-      field: 'completeUserName',
-      table: {
-        width: 130
-      },
-      isForm: false,
-      isTable: true,
-      isDetail: true
-    },
-    {
-      label: '完成时间',
-      field: 'completeTime',
-      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: 'status',
-      dictType: DICT_TYPE.JOB_STATUS,
-      dictClass: 'string',
-      isForm: false,
-      isTable: true,
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '是否可用',
-      field: 'available',
-      sort: 'custom',
-      isSearch: true,
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-      search: {
-        value: 'TRUE'
-      },
-      form: {
-        component: 'Switch',
-        value: 'TRUE',
-        componentProps: {
-          inactiveValue: 'FALSE',
-          activeValue: 'TRUE'
-        }
-      },
-      table: {
-        width: 110
-      }
-    },
-    {
-      label: '包装号',
-      field: 'packageCode',
-      sort: 'custom',
-      isSearch: true,
-      isTable: false,
-      isForm: false,
-      tableForm: {
-        disabled: false
-      }
-    },
-    {
-      label: '创建时间',
-      field: 'createTime',
-      isForm: false,
-      isTable: true,
-      table: {
-        width: 180
-      },
-      formatter: dateFormatter,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          style: { width: '100%' },
-          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
-        }
-      },
-      isSearch: true,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      }
-    },
-    {
-      label: '创建者',
-      field: '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: 'updater',
-      isDetail: true,
-      isForm: false,
-      isTable: false,
-      table: {
-        width: 150
-      }
-    },
-
-    {
-      label: '操作',
-      field: 'action',
-      isForm: false,
-      isDetail: false,
-      table: {
-        width: 300,
-        fixed: 'right'
-      }
-    }
-  ])
-)
-
-//表单校验
-export const InspectionJobMainRules = reactive({
-  // usageDecision: [required],
-})
-
-/**
- * @returns {Array} 检验任务子表
- */
-export const InspectionJobDetail = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '编码',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true
-    },
-    {
-      label: '检验方案模板编码',
-      field: 'inspectionCode',
-      sort: 'custom',
-      isSearch: true
-    },
-    {
-      label: '描述',
-      field: 'processDescribe',
-      sort: 'custom',
-      isSearch: true
-    },
-    {
-      label: '顺序号',
-      field: 'sequenceCode',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        component: 'InputNumber',
-        value: 0
-      }
-    },
-    {
-      label: '检验特性编号',
-      field: 'inspectionCharCode',
-      sort: 'custom',
-      isSearch: true
-    },
-    {
-      label: '检验特性编码',
-      field: 'inspectionJobCharacteristicsRespVO.number',
-      sort: 'custom'
-    },
-    {
-      label: '检验特性描述',
-      field: 'inspectionJobCharacteristicsRespVO.description',
-      sort: 'custom'
-    },
-    {
-      label: '检验方法',
-      field: 'inspectionJobCharacteristicsRespVO.inspectionMethodCode',
-      sort: 'custom'
-    },
-    {
-      label: '采样过程编码',
-      field: 'inspectionJobCharacteristicsRespVO.samplingProcessCode',
-      sort: 'custom'
-    },
-    {
-      label: '动态修改规则编码',
-      field: 'inspectionJobCharacteristicsRespVO.dynamicUpdateCode',
-      sort: 'custom'
-    },
-    {
-      label: '是否允许修改特征值',
-      field: 'inspectionJobCharacteristicsRespVO.isCanUpdate',
-      sort: 'custom',
-      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-        return isCanUpdateList.find((account) => account.value == cellValue)?.label
-      }
-    },
-    {
-      label: '结果录入方式',
-      field: 'inspectionJobCharacteristicsRespVO.resultEntryMethod',
-      sort: 'custom',
-      // dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY,
-      // dictClass: 'string',
-      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-        return resultEntryMethodList.find((account) => account.value == cellValue)?.label
-      }
-    },
-    {
-      label: '特征类型',
-      field: 'inspectionJobCharacteristicsRespVO.featureType',
-      sort: 'custom',
-      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-        return featureTypeList.find((account) => account.value == cellValue)?.label
-      }
-    }
-  ])
-)
-
-//表单校验
-export const InspectionJobDetailRules = reactive({
-  taskCode: [required],
-  processCode: [required],
-  sequenceCode: [required],
-  available: [required]
-})
-/**
- * @returns {Array} 检验任务包装
- */
-export const InspectionJobPackage = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '编码',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true,
-      tableForm: {
-        disabled: true
-      },
-      table: {
-        width: 200
-      }
-    },
-    {
-      label: '包装号',
-      field: 'packageCode',
-      sort: 'custom',
-      isSearch: true,
-      tableForm: {
-        disabled: true
-      },
-      table: {
-        width: 200
-      }
-    },
-    {
-      label: '包装规格',
-      field: 'packageSpecificationCode',
-      sort: 'custom',
-      isSearch: true,
-      tableForm: {
-        disabled: true
-      },
-      table: {
-        width: 180
-      }
-    },
-    {
-      label: '数量',
-      field: 'amount',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        component: 'InputNumber',
-        value: 0
-      },
-      tableForm: {
-        disabled: true
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '计量单位',
-      field: 'measuringUnit',
-      sort: 'custom',
-      isSearch: true,
-      tableForm: {
-        disabled: true
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '采样数量',
-      field: 'sampleAmount',
-      sort: 'custom',
-      isSearch: true,
-      isTable: false,
-      table: {
-        width: 150
-      }
-    }
-  ])
-)
-//表单校验
-export const InspectionJobPackageRules = reactive({
-  sampleAmount: [required, { validator: validateSixNum, trigger: 'blur' }]
-})
diff --git a/src/views/qms/inspectionJobPurchase/addForm.vue b/src/views/qms/inspectionJobPurchase/addForm.vue
deleted file mode 100644
index 6b2e16b28..000000000
--- a/src/views/qms/inspectionJobPurchase/addForm.vue
+++ /dev/null
@@ -1,1552 +0,0 @@
-<template>
-  <div>
-    <Dialog
-      :title="dialogTitle"
-      v-model="dialogVisible"
-      :width="dialogWidth"
-      :close-on-click-modal="false"
-      :vLoading="formLoading"
-    >
-      <div
-        class="box"
-        style="max-height: 80vh; overflow-y: auto; padding: 0px 20px"
-        ref="mianscroll"
-      >
-        <!-- <el-backtop :right="40" :bottom="100" target=".box" @click="topScrollClick" /> -->
-        <Form
-          ref="formMainRef"
-          :rules="rules"
-          :schema="formSchema"
-          :is-col="true"
-          @opensearchTable="opensearchTable"
-        />
-        <div ref="boxList">
-          <div class="small-title">包装列表</div>
-          <div style="border: 1px solid #dedede; margin-bottom: 20px; display: flex">
-            <TableForm
-              ref="tableFormRef"
-              style="width: 100%"
-              :maxHeight="490"
-              :tableFields="tableAllSchemas.tableFormColumns"
-              :tableFormRules="tableFormRules"
-              :tableData="data.packageList"
-              :isShowButton="false"
-              :isShowReduceButton="false"
-            />
-          </div>
-        </div>
-
-        <el-tabs
-          v-model="editableTabsValue"
-          class="demo-tabs"
-          @edit="handleTabsEdit"
-          type="border-card"
-          tab-position="left"
-          :stretch="false"
-        >
-          <el-tab-pane
-            v-for="item in data.subList"
-            :key="item.name"
-            :label="item.processDescribe"
-            :name="item.name"
-            v-next-focus
-          >
-            <template #label>
-              <span class="custom-tabs-label" style="display: flex; align-items: center">
-                <Icon
-                  class="mr-5px"
-                  icon="ep:circle-check-filled"
-                  v-if="item.isPass === true"
-                  color="#67C23A"
-                  style="margin-top: 4px"
-                />
-                <Icon
-                  class="mr-5px"
-                  icon="ep:circle-close-filled"
-                  v-if="item.isPass === false"
-                  color="#ff0000"
-                  style="margin-top: 4px"
-                />
-                <span>{{ item.processDescribe }}</span>
-              </span>
-            </template>
-            <div class="tabs-box">
-              <el-collapse v-model="collapseShow">
-                <el-collapse-item name="1">
-                  <template #title>
-                    <div class="small-title">检验工序</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-form-item label="编码" prop="processCode">
-                          <el-input
-                            v-model="item.processCode"
-                            placeholder="根据系统生成"
-                            :disabled="true"
-                          />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="检验特性编号">
-                          <el-input
-                            v-model="item.inspectionFeatureCode"
-                            placeholder="根据系统生成"
-                            :disabled="true"
-                          />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="描述" prop="processDescribe">
-                          <el-input v-model="item.processDescribe" :disabled="true" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="顺序号" prop="sequenceCode">
-                          <el-input v-model="item.sequenceCode" :disabled="true" />
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </el-form>
-                </el-collapse-item>
-                <el-collapse-item name="2">
-                  <template #title>
-                    <div class="small-title">检验特性</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-                    <div>
-                      <el-row :gutter="20">
-                        <el-col :span="12">
-                          <el-form-item label="编码">
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
-                              placeholder="根据系统生成"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="描述"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="检验方法"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
-                                "
-                                disabled
-                                placeholder="请选择检验方法"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="采样过程编码"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
-                                "
-                                disabled
-                                placeholder="请选择采样过程编码"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="样品份数"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                                disabled
-                                placeholder="请输入样品份数"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                          <el-form-item
-                            label="每份样品量"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize
-                                "
-                                disabled
-                                placeholder="请输入样品份数"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="是否允许修改特征值"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                          >
-                            <el-switch
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                              disabled
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="结果录入方式"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                          >
-                            <el-select
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
-                              "
-                              placeholder="请选择结果录入方式"
-                              @change="resultEntryMethodChange($event, item)"
-                              disabled
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(
-                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                                )"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="特征类型"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                          >
-                            <el-select
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                              placeholder="请选择特征类型"
-                              @change="changeFeatureType"
-                              disabled
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(
-                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                                )"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定上限"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                          "
-                        >
-                          <el-form-item
-                            label="上限值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定下限"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                          "
-                        >
-                          <el-form-item
-                            label="下限值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定目标值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                          "
-                        >
-                          <el-form-item
-                            label="目标值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                          <el-form-item
-                            label="开始时间"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                          >
-                            <el-date-picker
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
-                              "
-                              type="datetime"
-                              placeholder="请选择开始时间"
-                              style="width: 100%"
-                              value-format="x"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="结束时间"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                          >
-                            <el-date-picker
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-                              "
-                              type="datetime"
-                              placeholder="请选择结束时间"
-                              style="width: 100%"
-                              value-format="x"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <!-- 手动评估的时候显示 -->
-                        <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                          <el-form-item
-                            label="评估代码"
-                            required
-                            prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                          >
-                            <el-select
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                              placeholder="请选择评估代码"
-                              @change="changeFeatureType"
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-                      </el-row>
-                    </div>
-                  </el-form>
-                </el-collapse-item>
-                <el-collapse-item name="3">
-                  <template #title>
-                    <div class="small-title">检验结果</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-                    <div>
-                      <el-row :gutter="20">
-                        <el-col
-                          :span="24"
-                          v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
-                            .recordInspectionQuantifyList"
-                          :key="i"
-                        >
-                          <div
-                            style="
-                              border: 1px solid #dedede;
-                              border-radius: 4px;
-                              padding-top: 16px;
-                              margin-bottom: 10px;
-                            "
-                          >
-                            <el-row :gutter="20">
-                              <!-- 汇总录入的时候显示 -->
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
-                                  1
-                                "
-                              >
-                                <el-form-item label="合格数量" required>
-                                  <el-input
-                                    v-model="cur.qualifiedQuantity"
-                                    placeholder="请输入合格数量"
-                                    type="number"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
-                                  1
-                                "
-                              >
-                                <el-form-item label="不合格数量" required>
-                                  <el-input
-                                    v-model="cur.unqualifiedQuantity"
-                                    type="number"
-                                    placeholder="请输入不合格数量"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'
-                                "
-                              >
-                                <el-form-item label="检验值" required>
-                                  <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" @input="inputChange($event,cur)" @blur="inspectionValueInput(item, cur)" />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'
-                                "
-                              >
-                                <el-form-item label="选定集" required>
-                                  <el-select
-                                    v-model="cur.qualitativeCode"
-                                    placeholder="请选择选定集"
-                                    @change="changeQualitativeCode($event, item, cur)"
-                                  >
-                                    <el-option
-                                      v-for="dict in item.selectedProjectRespVOList"
-                                      :key="dict.dictionaryValue"
-                                      :label="dict.dictionaryLabel"
-                                      :value="dict.dictionaryValue"
-                                    />
-                                  </el-select>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO
-                            .recordInspectionQuantifyList?.length-1 == i">
-                                <el-form-item label="备注">
-                                  <el-input
-                                    v-model="cur.remark"
-                                    placeholder="请输入备注"
-                                    type="text"
-                                    maxlength="200"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
-                      <el-form-item label="缺陷级别" required>
-                        <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-row>
-                          </div>
-                        </el-col>
-                      </el-row>
-                    </div>
-                  </el-form>
-                </el-collapse-item>
-              </el-collapse>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-      <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
-      </template>
-    </Dialog>
-    <Dialog
-      title="修改名称"
-      v-model="dialogVisibleName"
-      width="500px"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 0px 20px">
-        <el-form ref="nameRef" :model="nameForm">
-          <el-form-item
-            :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
-            prop="name"
-          >
-            <el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
-          </el-form-item>
-        </el-form>
-      </div>
-      <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" />
-      </template>
-    </Dialog>
-    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
-  </div>
-</template>
-<script setup lang="ts">
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { getCurrentInstance } from 'vue'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-import { SearchTable } from '@/components/SearchTable'
-import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
-
-const { proxy } = getCurrentInstance()
-
-const message = useMessage() // 消息弹窗
-
-const props = defineProps({
-  // 显示窗口宽度设置
-  basicFormWidth: {
-    type: String,
-    default: ''
-  },
-  // 检验特性表单，列表 相关信息
-  formAllSchemasFeatures: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 检验工序表单，列表 相关信息
-  formAllSchemasProcess: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 检验模板表单，列表 相关信息
-  formAllSchemasMain: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 底部按钮集合
-  footButttondata: {
-    type: Array,
-    required: false,
-    default: null
-  },
-  // 表单，列表 相关信息
-  formAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 校验rules
-  rules: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 包装 列表 相关信息
-  tableAllSchemas: {
-    type: Array,
-    required: true,
-    default: null
-  },
-  tableFormRules: {
-    type: Array,
-    required: true,
-    default: null
-  }
-})
-const { t } = useI18n() // 国际化
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const dialogWidth = ref()
-const formMainRef = ref()
-const formFeaturesRef = ref()
-const formProcessRef = ref()
-const formSchema = ref(props.formAllSchemas?.formSchema)
-const tableAllSchemas = ref(props.tableAllSchemas)
-const tableFormRules = ref(props.tableFormRules)
-const collapseShow = ref(['1', '2', '3'])
-
-const data = ref({
-  code: '',
-  itemCode: '',
-  version: '',
-  testTypeCode: '',
-  programmeTemplateCode: '',
-  splitRule: '',
-  aql: '',
-  inspectionLevel: '',
-  effectiveDate: '',
-  expirationDate: '',
-  available: 'TRUE',
-  subList: []
-})
-
-const dialogVisibleName = ref(false)
-const nameForm = ref({
-  name: ''
-})
-const nameRef = ref()
-if (props.basicFormWidth) {
-  dialogWidth.value = props.basicFormWidth + '%'
-} else {
-  dialogWidth.value = props.isBusiness ? '60%' : '40%'
-}
-const rules = ref({
-  ...props.rules,
-  'inspectionJobCharacteristicsUpdateReqVO.description': [
-    { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [
-    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateCode': [
-    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethod': [
-    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod': [
-    { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.featureType': [
-    { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyTarget': [
-    { required: true, message: '请输入目标值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyCapping': [
-    { required: true, message: '请输入上限值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit': [
-    { required: true, message: '请输入下限值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyUom': [
-    { required: true, message: '请选择计量单位', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyDecimal': [
-    { required: true, message: '请输入小数位', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [
-    { required: true, message: '请选择集编码', trigger: 'change' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.estimateCode': [
-    { required: true, message: '请选择评估代码', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.sampleQty': [
-    { required: true, message: '请输入样品份数', trigger: 'blur' }
-  ],
-  qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }]
-})
-const allSamplePieceSize = ref(0)
-/** 打开弹窗 */
-let tabIndex = 1
-const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
-  if (titleName) {
-    dialogTitle.value = t('action.' + titleName)
-  } else {
-    dialogTitle.value = t('action.' + type)
-  }
-  formType.value = type
-  allSamplePieceSize.value = 0 //打开时候归0
-  if (row) {
-    data.value = JSON.parse(JSON.stringify(row))
-    //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
-    let list = []
-    const masterId = row.jobId || row.id
-    list = await InspectionJobDetailPageApi.getInspectionJobDetailList(masterId)
-    data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(masterId)
-    list.forEach((item, index) => {
-      editableTabsValue.value = 1
-      item.name = index + 1
-      item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO
-      item.isPass = '' //判断是否显示对号错误图标
-      // 总数量值是 样品份数 乘 每份样品量
-      allSamplePieceSize.value += parseFloat(
-        (
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
-        ).toFixed(6)
-      )
-      // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
-        // 单个录入时
-        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) {
-          // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-          for (
-            let i = 0;
-            i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty);
-            i++
-          ) {
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-              inspectionValue: '', //检验值
-              qualitativeCode: '', //定性字典项值
-              defectLevel: '', //缺陷级别
-              qualifiedQuantity: '', //合格数量
-              unqualifiedQuantity: '' //不合格数量
-            })
-          }
-        } else {
-          // 汇总录入时
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-            inspectionValue: '', //检验值
-            qualitativeCode: '', //定性字典项值
-            defectLevel: '', //缺陷级别
-            qualifiedQuantity: parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty), //合格数量
-            unqualifiedQuantity: '0' //不合格数量
-          })
-        }
-      }
-
-      // 编辑判断上限下限目标值是否必填
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
-      }
-      if (item.samplingProcessRespVO.evaluationMode == 1) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false
-      }
-    })
-    list.forEach((item) => {
-      item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime = new Date()
-    })
-    data.value.subList = list
-    /**
-        设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，
-        第一个包装采样数量>总数量 则显示总数量
-      */
-
-    for (let i = 0; i < data.value?.packageList?.length; i++) {
-      if (data.value.packageList[i].sampleAmount == null) {
-        if (allSamplePieceSize.value > data.value.packageList[i].amount) {
-          data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
-          allSamplePieceSize.value = parseFloat(
-            (allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(6)
-          )
-        } else {
-          data.value.packageList[i].sampleAmount = allSamplePieceSize.value
-          allSamplePieceSize.value = 0
-          // return;
-        }
-      }
-    }
-    // data.value.packageList.forEach(item=>{
-
-    // })
-    dialogVisible.value = true
-    nextTick(() => {
-      formMainRef.value.setValues(row)
-    })
-  } else {
-    data.value = {
-      code: '',
-      itemCode: '',
-      version: '',
-      testTypeCode: '',
-      programmeTemplateCode: '',
-      splitRule: '',
-      aql: '',
-      inspectionLevel: '',
-      effectiveDate: '',
-      expirationDate: '',
-      available: 'TRUE',
-      subList: []
-    }
-  }
-  dialogVisible.value = true
-  tabIndex = data.value.subList.length + 1
-}
-defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
-import type { TabPaneName } from 'element-plus'
-
-const editableTabsValue = ref(1)
-// const editableTabs = ref([])
-const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => {
-  if (action === 'add') {
-    nameForm.value.name = ''
-    dialogVisibleName.value = true
-  } else if (action === 'remove') {
-    const tabs = data.value.subList
-    let activeName = editableTabsValue.value
-    if (activeName === targetName) {
-      tabs.forEach((tab, index) => {
-        if (tab.name === targetName) {
-          const nextTab = tabs[index + 1] || tabs[index - 1]
-          if (nextTab) {
-            activeName = nextTab.name
-          }
-        }
-      })
-    }
-    editableTabsValue.value = activeName
-    data.value.subList = tabs.filter((tab) => tab.name !== targetName)
-  }
-}
-/** 修改名称时间 */
-const buttonBaseClick1 = async (val) => {
-  // 保存
-  if (val == 'save') {
-    if (!nameRef.value) return
-    nameRef.value.validate((valid, fields) => {
-      if (valid) {
-        const newTabName = `${++tabIndex}`
-        data.value.subList.push({
-          description: nameForm.value.name,
-          name: newTabName,
-          inspectionCode: '',
-          sequenceCode: '',
-          inspectionCharCode: '',
-          inspectionJobCharacteristicsUpdateReqVO: {
-            describe: '',
-            inspectionMethodCode: '',
-            dynamicUpdateCode: '',
-            inspectionMethod: '',
-            isCanUpdate: '',
-            isDestructionInspection: '',
-            resultEntryMethod: '',
-            featureType: '',
-            quantifyIsCapping: '',
-            quantifyIsLowlimit: '',
-            quantifyIsTarget: '',
-            quantifyTarget: '',
-            quantifyCapping: '',
-            quantifyLowlimit: '',
-            quantifyUom: '',
-            quantifyDecimal: '',
-            quantifyQuantifyCode: ''
-          }
-        })
-
-        editableTabsValue.value = newTabName
-        dialogVisibleName.value = false
-      } else {
-        return false
-      }
-    })
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisibleName.value = false
-  }
-}
-const buttonBaseClick = async (val) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
-    dialogVisible.value = false
-  }
-  // 暂存
-  else if (val == 'staging') {
-    staging()
-  }
-}
-// 传递给父类
-const emit = defineEmits(['submitForm', 'searchTableSuccess'])
-const validateForm = (formRef) => {
-  let _lists = formRef?.map((v) => v.validate())
-  return Promise.all(_lists)
-    .then(() => {
-      return true
-    })
-    .catch(() => {
-      return false
-    })
-}
-const tableFormRef = ref()
-const submitForm = async () => {
-  try {
-    const elForm = unref(formMainRef)?.getElFormRef()
-    // 校验表单
-    if (!elForm) return
-    const valid = await elForm.validate()
-    if (!valid) return
-    // 校验包装列表
-    if (data.value.packageList?.length > 0) {
-      const validateForm1 = await tableFormRef.value.validateForm()
-      if (!validateForm1) return
-      let isPass = data.value.packageList.some(
-        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
-      )
-      if (isPass) {
-        message.error(`采样数量不能大于数量`)
-        return
-      }
-
-      // let number = 0
-      // data.value.packageList.forEach(cur=>{
-      //   number += parseFloat(cur.sampleAmount)
-      // })
-      // number = number.toFixed('2')
-      // if(number != data.value.sampleTotalAmount){
-      //   message.error(`采样数量之和必须等于采样总数量`)
-      //   return
-      // }
-    }
-
-    const bol2 = await validateForm(formFeaturesRef.value)
-    if (!bol2) {
-      message.error(`模板中有检验工序和检验特性未填写完全`)
-      return
-    }
-    // 判断数组是否有未填的选项
-    let arrBol = []
-    let isOutweigh = [] //结束时间是否大于开始时间
-    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
-    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
-    data.value.subList.forEach((item, index) => {
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.inspectionValue
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.qualitativeCode
-            }
-          )
-        )
-      }
-      // 开始时间大于结束时间放入数组中
-      if (
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-      ) {
-        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
-      }
-      // 合格数量和不合格数量之和不能是小数
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        parseFloatList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
-                String(cur.unqualifiedQuantity).indexOf('.') > -1
-              )
-            }
-          )
-        )
-        // 合格数量和不合格数量之和不等于总数量
-        numberList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              )
-            }
-          )
-        )
-      }
-    })
-    let isEmpty1 = arrBol.some((item) => item == true)
-    let isEmptyNumberList = numberList.some((item) => item == true)
-    let isParseFloat = parseFloatList.some((item) => item == true)
-    if (isEmpty1) {
-      message.error('检验工序和检验特性有字段未填写完全')
-      return
-    }
-    // if (isOutweigh?.length > 0) {
-    //   message.error('检验特性中有开始时间大于结束时间')
-    //   return
-    // }
-    if (isParseFloat) {
-      message.error('合格数量和不合格数量之和不可以是小数')
-      return
-    }
-    if (isEmptyNumberList) {
-      message.error('合格数量和不合格数量之和必须等于样品份数')
-      return
-    }
-    data.value.id = data.value.jobId || data.value.id
-    if (formType.value == 'create') {
-      // 主子表——提交请求
-      emit('submitForm', formType.value, data.value)
-    } else {
-      // 编辑/执行
-      emit('submitForm', formType.value, data.value)
-    }
-  } catch {}
-}
-
-const staging = async () => {
-  try {
-    const elForm = unref(formMainRef)?.getElFormRef()
-    // 校验表单
-    if (!elForm) return
-    const valid = await elForm.validate()
-    if (!valid) return
-    // 校验包装列表
-
-    if (data.value.packageList?.length > 0) {
-      const validateForm1 = await tableFormRef.value.validateForm()
-      if (!validateForm1) return
-      let isPass = data.value.packageList.some(
-        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
-      )
-      if (isPass) {
-        message.error(`采样数量不能大于数量`)
-        return
-      }
-      // let number = 0
-      // data.value.packageList.forEach(cur=>{
-      //   number += parseFloat(cur.sampleAmount)
-      // })
-      // number = number.toFixed('2')
-      // if(number != data.value.sampleTotalAmount){
-      //   message.error(`采样数量之和必须等于采样总数量`)
-      //   return
-      // }
-    }
-
-    const bol2 = await validateForm(formFeaturesRef.value)
-    if (!bol2) {
-      message.error(`模板中有检验工序和检验特性未填写完全`)
-      return
-    }
-    // 判断数组是否有未填的选项
-    let arrBol = []
-    let isOutweigh = [] //结束时间是否大于开始时间
-    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
-    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
-    data.value.subList.forEach((item, index) => {
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.inspectionValue
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.qualitativeCode
-            }
-          )
-        )
-      }
-      // 开始时间大于结束时间放入数组中
-      if (
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-      ) {
-        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
-      }
-      // 合格数量和不合格数量之和不能是小数
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        parseFloatList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
-                String(cur.unqualifiedQuantity).indexOf('.') > -1
-              )
-            }
-          )
-        )
-        // 合格数量和不合格数量之和不等于总数量
-        numberList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              )
-            }
-          )
-        )
-      }
-    })
-    let isEmpty1 = arrBol.some((item) => item == true)
-    let isEmptyNumberList = numberList.some((item) => item == true)
-    let isParseFloat = parseFloatList.some((item) => item == true)
-    if (isEmpty1) {
-      message.error('检验工序和检验特性有字段未填写完全')
-      return
-    }
-    // if (isOutweigh?.length > 0) {
-    //   message.error('检验特性中有开始时间大于结束时间')
-    //   return
-    // }
-    if (isParseFloat) {
-      message.error('合格数量和不合格数量之和不可以是小数')
-      return
-    }
-    if (isEmptyNumberList) {
-      message.error('合格数量和不合格数量之和必须等于样品份数')
-      return
-    }
-    await InspectionJobMainApi.stagingInspectionJobMain(data.value)
-    message.success('暂存成功')
-  } catch {}
-}
-
-/** 弹窗按钮 */
-let Butttondata: any = []
-if (props.footButttondata) {
-  Butttondata = props.footButttondata
-} else {
-  Butttondata = [
-    defaultButtons.formStagingBtn(null), // 暂存
-    defaultButtons.formSaveBtn(null), // 保存
-    defaultButtons.formCloseBtn(null) // 关闭
-  ]
-}
-// 选择特征类型
-const changeFeatureType = (e) => {
-  // if (e) {
-  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = true
-  // } else {
-  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = false
-  // }
-}
-const searchTableRef = ref()
-const opensearchTable = (
-  formField,
-  searchField,
-  searchTitle,
-  searchAllSchemas,
-  searchPage,
-  searchCondition,
-  multiple,
-  type,
-  row
-) => {
-  const _searchCondition = {}
-  // 判断查询条件中，是否存在指向主表的数据
-  if (searchCondition && searchCondition.length > 0) {
-    // 转换筛选条件所需
-    let filters: any[] = []
-    for (var i = 0; i < searchCondition.length; i++) {
-      // searchCondition.forEach((item) => {
-      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
-      if (searchCondition[i].isMainValue) {
-        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
-          ? formRef.value.formModel[searchCondition[i].value]
-          : props.detailData
-          ? props.detailData[searchCondition[i].value]
-          : row
-          ? row[searchCondition[i].value]
-          : ''
-        // 是否含有空参数情况
-        let isNull = false
-        if (
-          _searchCondition[searchCondition[i].key] == '' ||
-          _searchCondition[searchCondition[i].key] == undefined
-        ) {
-          isNull = true
-        }
-        if (isNull) {
-          message.warning(
-            searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
-          )
-          return
-        }
-      } else {
-        // 扩展 转换为筛选条件进行查询
-        if (searchCondition[i].isSearch) {
-          filters.push({
-            action: searchCondition[i].action,
-            column: searchCondition[i].key,
-            value: searchCondition[i].value
-          })
-        } else {
-          _searchCondition[searchCondition[i].key] = searchCondition[i].value
-        }
-      }
-    }
-    if (filters.length > 0) {
-      _searchCondition.isSearch = true
-      _searchCondition.filters = filters
-    }
-  }
-  const _searchTableTitle = searchTitle
-  const _searchTableAllSchemas = searchAllSchemas
-  const _searchTablePage = searchPage
-  searchTableRef.value.open(
-    _searchTableTitle,
-    _searchTableAllSchemas,
-    _searchTablePage,
-    formField,
-    searchField,
-    multiple,
-    type,
-    row,
-    _searchCondition
-  )
-}
-// 弹层确定返回所选数据
-// val ： 弹层列表row 数据
-const searchTableSuccess = async (formField, searchField, val, type, row) => {
-  if (type == 'features') {
-    row.inspectionJobCharacteristicsUpdateReqVO[formField] = val[0].code
-    if (formField == 'inspectionMethodCode') {
-      row.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName = val[0].description
-    } else if (formField == 'dynamicUpdateCode') {
-      row.inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateName = val[0].description
-    } else if (formField == 'inspectionMethod') {
-      row.inspectionJobCharacteristicsUpdateReqVO.inspectionName = val[0].description
-    }
-  } else if (type == 'main') {
-    data.value[formField] = val[0].code
-    if (formField == 'itemCode') {
-      data.value.itemName = val[0].name
-    } else if (formField == 'testTypeCode') {
-      data.value.testTypeName = val[0].description
-    } else if (formField == 'programmeTemplateCode') {
-      data.value.programmeTemplateName = val[0].description
-    }
-    if (formField == 'programmeTemplateCode') {
-      let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
-      list.forEach((item, index) => {
-        editableTabsValue.value = index + 1
-        item.name = index + 1
-        // 编辑判断上限下限目标值是否必填
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
-            false
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
-        }
-      })
-      data.value.subList = list
-    }
-  }
-
-  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
-}
-// 请选择结果录入方式
-const resultEntryMethodChange = (e, item) => {
-  item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-  if (e == 0) {
-    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-    for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-        inspectionValue: '', //检验值
-        qualitativeCode: '', //定性字典项值
-        defectLevel: '', //缺陷级别
-        qualifiedQuantity: '', //合格数量
-        unqualifiedQuantity: '' //不合格数量
-      })
-    }
-  } else {
-    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [
-      {
-        inspectionValue: '', //检验值
-        qualitativeCode: '', //定性字典项值
-        defectLevel: '', //缺陷级别
-        qualifiedQuantity: '', //合格数量
-        unqualifiedQuantity: '' //不合格数量
-      }
-    ]
-  }
-}
-// 选择选定级
-const changeQualitativeCode = (e, item, cur) => {
-  let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e)
-  cur.defectLevel = obj.defectLevel
-  cur.estimateCode = obj.estimateCode
-  // 显示图标
-  for (
-    let i = 0;
-    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList?.length;
-    i++
-  ) {
-    item.isPass = true
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].estimateCode ==
-      '2'
-    ) {
-      item.isPass = false
-      return
-    }
-  }
-}
-const mianscroll = ref()
-const boxList = ref()
-
-// const topScrollClick = () => {
-//   nextTick(() => {
-//     mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
-//   })
-// }
-const inputChange = (val,cur) => {
-  cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '')
-}
-const inspectionValueInput = (item, cur) => {
-  for (
-    let i = 0;
-    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
-    i++
-  ) {
-    item.isPass = true
-    //  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和下限值,目标值存在 大于上限并且小于下限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      item.isPass = false
-      return
-    }
-  }
-}
-</script>
-<style scoped>
-.small-title {
-  font-weight: bold;
-  padding: 0px 10px 10px;
-  color: #1a8bfc;
-  font-size: 16px;
-}
-.tabs-box {
-  max-height: calc(80vh - 40px);
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-</style>
-<style>
-.el-tabs--left .el-tabs__header.is-left {
-  padding-bottom: 5000px;
-  margin-bottom: -5000px;
-  min-width: 150px !important;
-}
-
-.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
-  min-width: 120px !important;
-}
-.el-backtop {
-  position: absolute !important;
-}
-.red .el-input__inner {
-  color: red !important;
-}
-</style>
diff --git a/src/views/qms/inspectionJobPurchase/detail.vue b/src/views/qms/inspectionJobPurchase/detail.vue
deleted file mode 100644
index 3dc132caf..000000000
--- a/src/views/qms/inspectionJobPurchase/detail.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-  <div>
-    <el-drawer v-model="isShowDrawer" title="详情" direction="rtl" size="80%" v-loading="detailLoading">
-      <template #header>
-        <div class="font-size-18px">
-          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
-        </div>
-      </template>
-      <ContentWrap v-if="!isBasic">
-        <Descriptions :data="data" labelClassName="label-class-name" label-align="left" direction="vertical" :column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px" />
-      </ContentWrap>
-      <ContentWrap>
-        <el-tabs v-model="editableTabsValue" class="demo-tabs" type="border-card" tab-position="left" :stretch="false">
-          <el-tab-pane v-for="item in data.subList" :key="item.name" :label="item.processDescribe" :name="item.name">
-            <div class="small-title">检验工序</div>
-            <el-form :model="item" label-width="auto" ref="formProcessRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码" prop="processCode">
-                    <el-input v-model="item.processCode" placeholder="根据系统生成" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="processDescribe">
-                    <el-input v-model="item.processDescribe" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="顺序号" prop="sequenceCode">
-                    <el-input v-model="item.sequenceCode"  :disabled="true" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div class="small-title">检验特性</div>
-            <el-form :model="item" label-width="auto"  ref="formFeaturesRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码">
-                    <el-input v-model="item.inspectionJobCharacteristicsRespVO.number" placeholder="根据系统生成" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="inspectionJobCharacteristicsRespVO.description">
-                    <el-input v-model="item.inspectionJobCharacteristicsRespVO.description"  :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="检验方法" prop="inspectionJobCharacteristicsRespVO.inspectionMethodCode">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsRespVO.inspectionMethodName" disabled placeholder="请选择检验方法" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="采样过程编码" prop="inspectionJobCharacteristicsRespVO.samplingProcessCode">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsRespVO.samplingProcessName" disabled placeholder="请选择采样过程编码" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="样品份数" prop="inspectionJobCharacteristicsRespVO.sampleQty">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsRespVO.sampleQty" disabled placeholder="请输入样品份数" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                
-                <el-col :span="12">
-                  <el-form-item label="每份样品量" prop="inspectionJobCharacteristicsRespVO.samplePieceSize">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionJobCharacteristicsRespVO.samplePieceSize" disabled placeholder="请输入每份样品量" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="是否允许修改特征值" prop="inspectionJobCharacteristicsRespVO.isCanUpdate">
-                    <el-switch v-model="item.inspectionJobCharacteristicsRespVO.isCanUpdate" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="结果录入方式" prop="inspectionJobCharacteristicsRespVO.resultEntryMethod">
-                    <el-select v-model="item.inspectionJobCharacteristicsRespVO.resultEntryMethod" placeholder="请选择结果录入方式" @change="resultEntryMethodChange($event,item)" disabled>
-                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)" :key="dict.value" :label="dict.label" :value="dict.value" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="特征类型" prop="inspectionJobCharacteristicsRespVO.featureType">
-                    <el-select v-model="item.inspectionJobCharacteristicsRespVO.featureType" placeholder="请选择特征类型" @change="changeFeatureType" disabled>
-                      <el-option v-for="dict in getStrDictOptions( DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE )" :key="dict.value" :label="dict.label" :value="dict.value" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-tab-pane>
-        </el-tabs>
-      </ContentWrap>
-    </el-drawer>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-
-defineOptions({ name: 'Detail' })
-
-const editableTabsValue = ref('1')
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const updateKey = ref(0)
-
-const props = defineProps({
-  // 表单，列表 相关信息
-  allSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 明细列表相关信息
-  detailAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 详情列表扩展操作按钮
-  buttondataTable: {
-    type: Array,
-    required: false,
-    default: ()=>{
-      return []
-    }
-  },
-})
-const isShowDrawer = ref(false)
-const detailLoading = ref(false)
-const data = ref({
-  code: '',
-  itemCode: '',
-  version: '',
-  testTypeCode: '',
-  programmeTemplateCode: '',
-  splitRule: '',
-  aql: '',
-  inspectionLevel: '',
-  effectiveDate: '',
-  expirationDate: '',
-  available: 'TRUE',
-  subList: []
-})
-
-/** 打开弹窗 */
-const formRef = ref()
-const titleNameRef = ref()
-const titleValueRef = ref()
-const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
-  titleNameRef.value = titleName
-  titleValueRef.value = titleValue
- 
-  isShowDrawer.value = true
-  if (row) {
-    detailLoading.value = true
-    try {
-      data.value = row
-      let list = []
-      list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
-      list.forEach((item, index) => {
-      editableTabsValue.value = index + 1
-      item.name = index + 1
-      })
-      data.value.subList = list
-    } finally {
-      detailLoading.value = false
-    }
-  }
-}
-defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
-
-
-</script>
-<style lang="scss">
-.el-drawer__body {
-  background: #f5f5f5 !important;
-}
-
-::v-deep(.label-class-name) {
-  color: #dedede;
-}
-</style>
-<style scoped lang="scss"></style>
diff --git a/src/views/qms/inspectionJobPurchase/index.vue b/src/views/qms/inspectionJobPurchase/index.vue
deleted file mode 100644
index 3b9d26dd4..000000000
--- a/src/views/qms/inspectionJobPurchase/index.vue
+++ /dev/null
@@ -1,442 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search
-      :schema="InspectionJobMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams({
-          available: true,
-          inspectionType: '1'
-        })"
-      />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="InspectionJobMain.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>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <AddForm
-    ref="formRef"
-    basicFormWidth="80"
-    :formAllSchemasFeatures="InspectionTemplateFeatures.allSchemas"
-    :formAllSchemasProcess="InspectionTemplateProcess.allSchemas"
-    :formAllSchemasMain="InspectionTemplateMain.allSchemas"
-    :tableAllSchemas="InspectionJobPackage.allSchemas"
-    :tableFormRules="InspectionJobPackageRules"
-    :rules="InspectionJobMainRules"
-    :formAllSchemas="InspectionJobMain.allSchemas"
-    @submitForm="submitForm"
-  />
-  <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="InspectionJobMain.allSchemas"
-    :detailAllSchemas="InspectionJobDetail.allSchemas"
-    :detailAllSchemasRules="InspectionJobDetailRules"
-    :apiCreate="InspectionJobDetailApi.createInspectionJobDetail"
-    :apiUpdate="InspectionJobDetailApi.updateInspectionJobDetail"
-    :apiPage="InspectionJobDetailApi.getInspectionJobDetailPage"
-    :apiDelete="InspectionJobDetailApi.deleteInspectionJobDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="false"
-    :detailButtonIsShow="true"
-  />
-  <!-- 包装信息 -->
-  <ListTable
-    ref="listTableRef"
-    titleName="包装信息"
-    :allSchemas="InspectionJobMain.allSchemas"
-    :detailAllSchemas="InspectionJobPackage.allSchemas"
-    :detailAllSchemasRules="InspectionJobPackageRules"
-    :list="list"
-  />
-  <el-dialog
-      v-model="showQualityReport"
-      :title="t('质检明细')"
-      :append-to-body="false"
-      destroy-on-close
-      fullscreen
-    >
-    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
-  </el-dialog>
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import {
-  InspectionJobMain,
-  InspectionJobMainRules,
-  InspectionJobDetail,
-  InspectionJobDetailRules,
-  InspectionJobPackage,
-  InspectionJobPackageRules
-} from './inspectionJobMain.data'
-import {
-  InspectionTemplateMain,
-  InspectionTemplateProcess,
-  InspectionTemplateFeatures,
-  InspectionTemplateRules
-} from '../inspectionTemplate/inspectionTemplate.data'
-
-import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
-import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-import * as InspectionJobDetailApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import ListTable from '@/components/ListTable/src/ListTable.vue'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import AddForm from './addForm.vue'
-import Detail from './detail.vue'
-import { getReportUrl } from '@/utils/systemParam'
-
-// 采购订单
-defineOptions({ name: 'inspectionJobMain' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(InspectionJobMain.allSchemas.tableColumns)
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  nextTick(async () => {
-    if (type == 'tableForm') {
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      // row['itemNumber'] = val[0]['number']
-      // row['itemName'] = val[0]['name']
-      // row['uom'] = val[0]['uom']
-      // row['isRadeIn'] = val[0]['isRadeIn']
-      // row['available'] = val[0]['available']
-    } else {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      formRef.setValues(setV)
-    }
-  })
-}
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-  nextTick(async () => {
-    const setV = {}
-    // if(formField == 'itemCode'){
-    //     await ItembasicApi.getItembasicPage({
-    //       code: setV['itemCode']
-    //     }).then(res => {
-    //       setV['uom'] = res.list[0].uom
-    //       setV[formField] = val[0][searchField]
-    //     })
-    //   }
-    formRef.setValues(setV)
-  })
-}
-
-// 子表新增的时候选择表格之后需要会显得字段
-const Echo = []
-const { tableObject, tableMethods } = useTable({
-  getListApi: InspectionJobMainApi.getInspectionJobMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-   defaultButtons.defaultExportBtn(null), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null) // 设置
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') {
-    // 新增
-    openForm('create')
-  } else if (val == 'import') {
-    // 导入
-    handleImport()
-  } else if (val == 'export') {
-    // 导出
-    handleExport()
-  } else if (val == 'refresh') {
-    // 刷新
-    getList()
-  } else if (val == 'filtrate') {
-    // 筛选
-  } else {
-    // 其他按钮
-    console.log('其他按钮', item)
-  }
-}
-
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row, val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 根据状态返回该按钮是否显示
-const isShowMainButton2 = (row, val) => {
-  if (val.indexOf(row.isStaging) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 列表-操作按钮
-const butttondata = (row) => {
-  return [
-    defaultButtons.mainListJobAccBtn({
-      hide: isShowMainButton(row, ['1']),
-      hasPermi: 'qms:inspection-job-main:accept'
-    }), // 承接
-    defaultButtons.mainListJobCloBtn({
-      hide: isShowMainButton(row, ['1']),
-      hasPermi: 'qms:inspection-job-main:close'
-    }), // 关闭
-    defaultButtons.mainListJobAbaBtn({
-      hide: isShowMainButton(row, ['2']),
-      hasPermi: 'qms:inspection-job-main:abandon'
-    }), // 放弃
-    defaultButtons.mainListJobExeBtn({
-      hide: isShowMainButton(row, ['2']),
-      hasPermi: 'qms:inspection-job-main:execute'
-    }), // 执行
-    defaultButtons.mainListOrderPubBtn({
-      hide: isShowMainButton2(row, ['TRUE']),
-      hasPermi: 'qms:inspection-job-main:execute'
-    }), // 发布
-    defaultButtons.mainListPackageBtn(null), // 包装
-    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
-  ]
-}
-const listTableRef = ref()
-const list = ref([])
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'mainJobExe') {
-    // 执行
-    execute('execute', row)
-  } else if (val == 'mainPackage') {
-    // 包装
-
-    list.value = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
-    // row.status = '1'
-    listTableRef.value.openPackage(row, '包装信息', InspectionJobPackage.allSchemas.tableColumns)
-  } else if (val == 'mainJobAba') {
-    // 放弃
-    handleAbandon(row.id)
-  } else if (val == 'mainJobClo') {
-    // 关闭
-    handleClose(row.id)
-  } else if (val == 'mainOrderPub') {
-    // 发布
-    handleRelease(row.id)
-  } else if (val == 'mainPlanCheckQualityReport') {
-    // 查看质检报告
-    checkQualityReport(row)
-  } else if (val == 'mainJobAcc') {
-    // 承接
-    handleAccept(row.id)
-  }
-}
-
-// 查看质检报告
-// 查看质检报告
-const reportHeight = ref(window.innerHeight - 120)
-const showQualityReport = ref(false)
-const qualityReport = ref('')
-const checkQualityReport = async (row) => {
-  showQualityReport.value = true
-  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
-}
-
-/** 添加/修改操作 */
-// const formRef = ref()
-// const openForm = async (type : string, row ?: number) => {
-//   tableData.value = [] // 重置明细数据
-//   formRef.value.open(type, row)
-// }
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionJobMain')
-}
-//执行
-
-const formRef = ref()
-const execute = async (type: string, row?: number) => {
-  formRef.value.open(type, row)
-}
-/** 关闭按钮操作 */
-const handleClose = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.confirm(t('common.confirmColse'))
-    // 发起删除
-    await InspectionJobMainApi.closeInspectionJobMain(id)
-    message.success(t('common.closeSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-/** 发布按钮操作 */
-const handleRelease = async (id: number) => {
-  try {
-    // 发布的二次确认
-    await message.confirm('确认发布吗？')
-    // 发起发布
-    await InspectionJobMainApi.releaseInspectionJobMain(id)
-    message.success('发布成功！')
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-// 承接
-const handleAccept = async (id: number) => {
-  try {
-    // 承接的二次确认
-    await message.confirm(t('common.confirmAccept'))
-    // 发起承接
-    await InspectionJobMainApi.acceptInspectionJobMain(id)
-    message.success(t('common.acceptSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-// 放弃任务
-const handleAbandon = async (id: number) => {
-  try {
-    // 放弃的二次确认
-    await message.confirm(t('common.confirmGiveup'))
-    // 发起放弃
-    await InspectionJobMainApi.abandonInspectionJobMain(id)
-    message.success(t('common.giveupSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await InspectionJobMainApi.exportInspectionJobMain(tableObject.params)
-    download.excel(data, '检验任务.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/**
- * tableForm方法
- */
-const tableFormKeys = {}
-InspectionJobDetail.allSchemas.tableFormColumns.forEach((item) => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-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'))
-    } else if (formType === 'execute') {
-      await InspectionJobMainApi.executeInspectionJobMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    formRef.value.formLoading = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = false
-  }
-}
-
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-
-// 筛选提交
-const searchFormClick = (searchData) => {
-  searchData.filters.push({
-    action: "==",
-    column: "inspectionType",
-    value: "1"
-  })
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
-  }
-  getList() // 刷新当前列表
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  tableObject.params = {
-    available: true,
-    inspectionType: '1'
-  }
-  getList()
-  // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
-})
-</script>
diff --git a/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts b/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts
deleted file mode 100644
index fa86592bf..000000000
--- a/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts
+++ /dev/null
@@ -1,885 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter2 } from '@/utils/formatTime'
-import { validateHanset, validateEmail } from '@/utils/validator'
-import { dateFormatter } from '@/utils/formatTime'
-import { validateTwoNum, validateSixNum } from '@/utils/validator'
-const { t } = useI18n() // 国际化
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-const resultEntryMethodList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)
-const featureTypeList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE)
-const isCanUpdateList = [
-  {
-    label: '是',
-    value: true
-  },
-  {
-    label: '否',
-    value: false
-  }
-]
-
-/**
- * @returns {Array} 检验任务主表
- */
-export const InspectionJobMain = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '编码',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 200,
-        fixed: 'left'
-      }
-    },
-    {
-      label: '申请单号',
-      field: 'requestNumber',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 200
-      }
-    },
-    {
-      label: '发货单号',
-      field: 'asnNumber',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 180
-      }
-    },
-    {
-      label: '供应商编码',
-      field: 'supplierCode',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '供应商名称',
-      field: 'supplierName',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 175
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '物料编码',
-      field: 'itemCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '物料名称',
-      field: 'itemName',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 175
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '物料批次',
-      field: 'batch',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考订单号',
-      field: 'referenceOrderCode',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考订单行',
-      field: 'referenceOrderRow',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考凭证号',
-      field: 'referenceCertificateCode',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考凭证行',
-      field: 'referenceCertificateRow',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '检验方案编码',
-      field: 'inspectionSchemeCode',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 200
-      }
-    },
-    {
-      label: '批次',
-      field: 'inspectionBatch',
-      sort: 'custom',
-      isSearch: false,
-      isDetail: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '供应商批次',
-      field: 'supplierBatch',
-      sort: 'custom',
-      isSearch: false,
-      isDetail: true,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '检验批数量',
-      field: 'inspectionBatchAmount',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    // {
-    //   label: '采样总数量',
-    //   field: 'sampleTotalAmount',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   form: {
-    //     componentProps:{
-    //       disabled:true
-    //     }
-    //   },
-    //   table: {
-    //     width: 150
-    //   }
-    // },
-    {
-      label: '检验类型',
-      field: 'inspectionType',
-      sort: 'custom',
-      dictType: DICT_TYPE.INSPECTION_TYPE,
-      dictClass: 'string',
-      isSearch: false,
-      form: {
-        component: 'Select',
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '完成人',
-      field: 'completeUser',
-      sort: 'custom',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-      isTable: false,
-      isDetail: false,
-      isSearch: true,
-      isTableForm: false,
-      isForm: false
-    },
-    // {
-    //   label: '检验批来源',
-    //   field: 'inspectionBatchSource',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   dictType: DICT_TYPE.INSPECTION_BATCH_SOURCE,
-    //   dictClass: 'string',
-    //   form:{
-    //     componentProps:{
-    //       disabled:true
-    //     }
-    //   },
-    //   table: {
-    //     width: 150
-    //   }
-    // },
-    {
-      label: '检验阶段',
-      field: 'inspectionStage',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '检验严格性',
-      field: 'inspectionStringency',
-      sort: 'custom',
-      isSearch: false,
-      dictType: DICT_TYPE.INSPECTION_SEVERITY,
-      dictClass: 'string',
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '计划开始时间',
-      field: 'planStartTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '计划结束时间',
-      field: 'planEndTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '检验水平',
-      field: 'inspectionLevel',
-      sort: 'custom',
-      isSearch: false,
-      dictType: DICT_TYPE.INSPECTION_LEVEL,
-      dictClass: 'string',
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: 'AQL值',
-      field: 'aqlValue',
-      sort: 'custom',
-      isSearch: false,
-      dictType: DICT_TYPE.BASIC_AQL,
-      dictClass: 'string',
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    // {
-    //   label: '使用决策',
-    //   field: 'usageDecision',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   dictType: DICT_TYPE.USAGE_DECISION,
-    //   form:{
-    //     componentProps:{
-    //     }
-    //   }
-    // },
-    // {
-    //   label: '是否可用',
-    //   field: 'available',
-    //   dictType: DICT_TYPE.TRUE_FALSE,
-    //   dictClass: 'string',
-    //   isTable: true,
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     component: 'Switch',
-    //     value: 'TRUE',
-    //     componentProps: {
-    //       inactiveValue: 'FALSE',
-    //       activeValue: 'TRUE',
-    //       disabled:true
-    //     }
-    //   }
-    // },
-    {
-      label: '承接人',
-      field: 'acceptUserName',
-      table: {
-        width: 130
-      },
-      isForm: false,
-      isTable: false,
-      isDetail: true
-    },
-    {
-      label: '承接时间',
-      field: 'acceptTime',
-      isForm: false,
-      table: {
-        width: 180
-      },
-      isTable: false,
-      isDetail: true,
-      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: 'deliveryTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x'
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-
-    {
-      label: '完成人',
-      field: 'completeUserName',
-      table: {
-        width: 130
-      },
-      isForm: false,
-      isTable: true,
-      isDetail: true
-    },
-    {
-      label: '完成时间',
-      field: 'completeTime',
-      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: 'status',
-      dictType: DICT_TYPE.JOB_STATUS,
-      dictClass: 'string',
-      isForm: false,
-      isTable: true,
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '是否可用',
-      field: 'available',
-      sort: 'custom',
-      isSearch: true,
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-      search: {
-        value: 'TRUE'
-      },
-      form: {
-        component: 'Switch',
-        value: 'TRUE',
-        componentProps: {
-          inactiveValue: 'FALSE',
-          activeValue: 'TRUE'
-        }
-      },
-      table: {
-        width: 110
-      }
-    },
-    {
-      label: '包装号',
-      field: 'packageCode',
-      sort: 'custom',
-      isSearch: true,
-      isTable: false,
-      isForm: false,
-      tableForm: {
-        disabled: 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'
-        }
-      },
-      isTable: true,
-      isSearch: true,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      }
-    },
-    {
-      label: '创建者',
-      field: '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: 'updater',
-      isDetail: true,
-      isForm: false,
-      isTable: false,
-      table: {
-        width: 150
-      }
-    },
-
-    {
-      label: '操作',
-      field: 'action',
-      isForm: false,
-      isDetail: false,
-      table: {
-        width: 300,
-        fixed: 'right'
-      }
-    }
-  ])
-)
-
-//表单校验
-export const InspectionJobMainRules = reactive({
-  // usageDecision: [required],
-})
-
-/**
- * @returns {Array} 检验任务子表
- */
-export const InspectionJobDetail = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '编码',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true
-    },
-    {
-      label: '检验方案模板编码',
-      field: 'inspectionCode',
-      sort: 'custom',
-      isSearch: true
-    },
-    {
-      label: '描述',
-      field: 'processDescribe',
-      sort: 'custom',
-      isSearch: true
-    },
-    {
-      label: '顺序号',
-      field: 'sequenceCode',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        component: 'InputNumber',
-        value: 0
-      }
-    },
-    {
-      label: '检验特性编号',
-      field: 'inspectionCharCode',
-      sort: 'custom',
-      isSearch: true
-    },
-    {
-      label: '检验特性编码',
-      field: 'inspectionJobCharacteristicsRespVO.number',
-      sort: 'custom'
-    },
-    {
-      label: '检验特性描述',
-      field: 'inspectionJobCharacteristicsRespVO.description',
-      sort: 'custom'
-    },
-    {
-      label: '检验方法',
-      field: 'inspectionJobCharacteristicsRespVO.inspectionMethodCode',
-      sort: 'custom'
-    },
-    {
-      label: '采样过程编码',
-      field: 'inspectionJobCharacteristicsRespVO.samplingProcessCode',
-      sort: 'custom'
-    },
-    {
-      label: '动态修改规则编码',
-      field: 'inspectionJobCharacteristicsRespVO.dynamicUpdateCode',
-      sort: 'custom'
-    },
-    {
-      label: '是否允许修改特征值',
-      field: 'inspectionJobCharacteristicsRespVO.isCanUpdate',
-      sort: 'custom',
-      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-        return isCanUpdateList.find((account) => account.value == cellValue)?.label
-      }
-    },
-    {
-      label: '结果录入方式',
-      field: 'inspectionJobCharacteristicsRespVO.resultEntryMethod',
-      sort: 'custom',
-      // dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY,
-      // dictClass: 'string',
-      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-        return resultEntryMethodList.find((account) => account.value == cellValue)?.label
-      }
-    },
-    {
-      label: '特征类型',
-      field: 'inspectionJobCharacteristicsRespVO.featureType',
-      sort: 'custom',
-      formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-        return featureTypeList.find((account) => account.value == cellValue)?.label
-      }
-    }
-  ])
-)
-
-//表单校验
-export const InspectionJobDetailRules = reactive({
-  taskCode: [required],
-  processCode: [required],
-  sequenceCode: [required],
-  available: [required]
-})
-/**
- * @returns {Array} 检验任务包装
- */
-export const InspectionJobPackage = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '编码',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true,
-      tableForm: {
-        disabled: true
-      },
-      table: {
-        width: 200
-      }
-    },
-    {
-      label: '包装号',
-      field: 'packageCode',
-      sort: 'custom',
-      isSearch: true,
-      tableForm: {
-        disabled: true
-      },
-      table: {
-        width: 200
-      }
-    },
-    {
-      label: '包装规格',
-      field: 'packageSpecificationCode',
-      sort: 'custom',
-      isSearch: true,
-      tableForm: {
-        disabled: true
-      },
-      table: {
-        width: 180
-      }
-    },
-    {
-      label: '数量',
-      field: 'amount',
-      sort: 'custom',
-      isSearch: true,
-      form: {
-        component: 'InputNumber',
-        value: 0
-      },
-      tableForm: {
-        disabled: true
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '计量单位',
-      field: 'measuringUnit',
-      sort: 'custom',
-      isSearch: true,
-      tableForm: {
-        disabled: true
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '采样数量',
-      field: 'sampleAmount',
-      sort: 'custom',
-      isSearch: true,
-      isTable: false,
-      table: {
-        width: 150
-      }
-    }
-  ])
-)
-//表单校验
-export const InspectionJobPackageRules = reactive({
-  sampleAmount: [required, { validator: validateSixNum, trigger: 'blur' }]
-})
diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index d437324cf..75bc47e35 100644
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@@ -4,11 +4,8 @@
     <Search
       :schema="InspectionRecordMain.allSchemas.searchSchema"
       @search="setSearchParams"
-       @reset="setSearchParams({
-         available: true,
-        excludeInspectionType: '11'
-        })"
-      />
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -94,14 +91,14 @@
     :detailAllSchemasRules="InspectionRecordPackageRules"
     :list="list"
   />
-    <el-dialog
-      v-model="showQualityReport"
-      :title="t('质检明细')"
-      :append-to-body="false"
-      destroy-on-close
-      fullscreen
-    >
-    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+  <el-dialog
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
   </el-dialog>
 </template>
 
@@ -202,7 +199,7 @@ const buttonBaseClick = (val, item) => {
     // 其他按钮
     console.log('其他按钮', item)
   }
-}   
+}
 
 const isShowMainButton = (row, val) => {
   if (!row.callbackRequestNumber) {
@@ -292,7 +289,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainOrderPub') {
     //发布
     handleOrderPub(row)
-  }else if (val == 'mainPlanCheckQualityReport') {
+  } else if (val == 'mainPlanCheckQualityReport') {
     // 查看质检报告
     checkQualityReport(row)
   } else if (val == 'edit') {
@@ -308,7 +305,7 @@ const showQualityReport = ref(false)
 const qualityReport = ref('')
 const checkQualityReport = async (row) => {
   showQualityReport.value = true
-  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+  qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
 }
 /** 添加/修改操作 */
 const basicFormRef = ref()
@@ -318,8 +315,10 @@ const basicFormRef = ref()
 // }
 /** 使用决策操作操作 */
 const formRef = ref()
+const rowData = ref()
 const openUseForm = async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
+  rowData.value = row
   formRef.value.open(type, row)
 }
 
@@ -396,6 +395,7 @@ const submitForm = async (formType, data) => {
       message.success(t('common.updateSuccess'))
     }
     formRef.value.dialogVisible = false
+    handleOrderPub(rowData.value)
     // 刷新当前列表
     getList()
   } finally {
@@ -429,12 +429,35 @@ const submitFormExecute = async (formType, data) => {
 const searchFormClick = (searchData) => {
   let isHave = searchData?.filters?.some((item) => item.column == 'inspectionType')
   if (!isHave) {
-    searchData.filters.push({
+    if (route.name == 'inspectionRecordPurchaseMain') {
+     searchData.filters.push({
+      action: '==',
+      column: 'inspectionType',
+      value: '1'
+    },{
+      action: '==',
+      column: 'available',
+      value: true
+    })
+  } else if (route.name == 'inspectionRecordProductionMain') {
+      searchData.filters.push({
+      action: '==',
+      column: 'inspectionType',
+      value: '4'
+    },{
+      action: '==',
+      column: 'available',
+      value: true
+    })
+  } else {
+      searchData.filters.push({
       action: 'notIn',
       column: 'inspectionType',
       value: '1,4,11'
     })
   }
+  
+  }
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
@@ -444,10 +467,43 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  tableObject.params = {
-    available: true,
-    excludeInspectionType: '1,4,11'
+  if (route.name == 'inspectionRecordPurchaseMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '1'
+    }
+  } else if (route.name == 'inspectionRecordProductionMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '4'
+    }
+  } else {
+    tableObject.params = {
+      available: true,
+      excludeInspectionType: '1,4,11'
+    }
   }
+
+  getList()
+})
+onActivated(() => {
+  if (route.name == 'inspectionRecordPurchaseMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '1'
+    }
+  } else if (route.name == 'inspectionRecordProductionMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '4'
+    }
+  } else {
+    tableObject.params = {
+      available: true,
+      excludeInspectionType: '1,4,11'
+    }
+  }
+
   getList()
 })
 </script>
diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue
index 3ad3462ac..f9c4c06bf 100644
--- a/src/views/qms/inspectionRecordFirst/index.vue
+++ b/src/views/qms/inspectionRecordFirst/index.vue
@@ -7,7 +7,6 @@
       inspectionType:'11'
         })"
       />
-     />
   </ContentWrap>
 
   <!-- 列表头部 -->
diff --git a/src/views/qms/inspectionRecordProduction/addForm.vue b/src/views/qms/inspectionRecordProduction/addForm.vue
deleted file mode 100644
index 037c9456b..000000000
--- a/src/views/qms/inspectionRecordProduction/addForm.vue
+++ /dev/null
@@ -1,1571 +0,0 @@
-<template>
-  <div>
-    <Dialog
-      :title="dialogTitle"
-      v-model="dialogVisible"
-      :width="dialogWidth"
-      :close-on-click-modal="false"
-      :vLoading="formLoading"
-    >
-      <div
-        class="box"
-        style="max-height: 80vh; overflow-y: auto; padding: 0px 20px"
-        ref="mianscroll"
-      >
-        <!-- <el-backtop :right="40" :bottom="100" target=".box" @click="topScrollClick" /> -->
-        <Form
-          ref="formMainRef"
-          :rules="rules"
-          :schema="formSchema"
-          :is-col="true"
-          @opensearchTable="opensearchTable"
-        />
-        <div ref="boxList">
-          <div class="small-title">包装列表</div>
-          <div style="border: 1px solid #dedede; margin-bottom: 20px; display: flex">
-            <TableForm
-              ref="tableFormRef"
-              style="width: 100%"
-              :maxHeight="490"
-              :tableFields="tableAllSchemas.tableFormColumns"
-              :tableFormRules="tableFormRules"
-              :tableData="data.packageList"
-              :isShowButton="false"
-              :isShowReduceButton="false"
-            />
-          </div>
-        </div>
-
-        <el-tabs
-          v-model="editableTabsValue"
-          class="demo-tabs"
-          @edit="handleTabsEdit"
-          type="border-card"
-          tab-position="left"
-          :stretch="false"
-        >
-          <el-tab-pane
-            v-for="item in data.subList"
-            :key="item.name"
-            :label="item.processDescribe"
-            :name="item.name"
-            v-next-focus
-          >
-            <template #label>
-              <span class="custom-tabs-label" style="display: flex; align-items: center">
-                <Icon
-                  class="mr-5px"
-                  icon="ep:circle-check-filled"
-                  v-if="item.isPass === true"
-                  color="#67C23A"
-                  style="margin-top: 4px"
-                />
-                <Icon
-                  class="mr-5px"
-                  icon="ep:circle-close-filled"
-                  v-if="item.isPass === false"
-                  color="#ff0000"
-                  style="margin-top: 4px"
-                />
-                <span>{{ item.processDescribe }}</span>
-              </span>
-            </template>
-            <div class="tabs-box">
-              <el-collapse v-model="collapseShow">
-                <el-collapse-item name="1">
-                  <template #title>
-                    <div class="small-title">检验工序</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-form-item label="编码" prop="processCode">
-                          <el-input
-                            v-model="item.processCode"
-                            placeholder="根据系统生成"
-                            :disabled="true"
-                          />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="检验特性编号">
-                          <el-input
-                            v-model="item.inspectionFeatureCode"
-                            placeholder="根据系统生成"
-                            :disabled="true"
-                          />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="描述" prop="processDescribe">
-                          <el-input v-model="item.processDescribe" :disabled="true" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="顺序号" prop="sequenceCode">
-                          <el-input v-model="item.sequenceCode" :disabled="true" />
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </el-form>
-                </el-collapse-item>
-                <el-collapse-item name="2">
-                  <template #title>
-                    <div class="small-title">检验特性</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-                    <div>
-                      <el-row :gutter="20">
-                        <el-col :span="12">
-                          <el-form-item label="编码">
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
-                              placeholder="根据系统生成"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="描述"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="检验方法"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
-                                "
-                                disabled
-                                placeholder="请选择检验方法"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="采样过程编码"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
-                                "
-                                disabled
-                                placeholder="请选择采样过程编码"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="样品份数"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                                disabled
-                                placeholder="请输入样品份数"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                          <el-form-item
-                            label="每份样品量"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize
-                                "
-                                disabled
-                                placeholder="请输入样品份数"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="是否允许修改特征值"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                          >
-                            <el-switch
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                              disabled
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="结果录入方式"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                          >
-                            <el-select
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
-                              "
-                              placeholder="请选择结果录入方式"
-                              @change="resultEntryMethodChange($event, item)"
-                              disabled
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(
-                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                                )"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="特征类型"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                          >
-                            <el-select
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                              placeholder="请选择特征类型"
-                              @change="changeFeatureType"
-                              disabled
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(
-                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                                )"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定上限"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                          "
-                        >
-                          <el-form-item
-                            label="上限值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定下限"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                          "
-                        >
-                          <el-form-item
-                            label="下限值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定目标值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                          "
-                        >
-                          <el-form-item
-                            label="目标值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                          <el-form-item
-                            label="开始时间"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                          >
-                            <el-date-picker
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
-                              "
-                              type="datetime"
-                              placeholder="请选择开始时间"
-                              style="width: 100%"
-                              value-format="x"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="结束时间"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                          >
-                            <el-date-picker
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-                              "
-                              type="datetime"
-                              placeholder="请选择结束时间"
-                              style="width: 100%"
-                              value-format="x"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <!-- 手动评估的时候显示 -->
-                        <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                          <el-form-item
-                            label="评估代码"
-                            required
-                            prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                          >
-                            <el-select
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                              placeholder="请选择评估代码"
-                              @change="changeFeatureType"
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-                      </el-row>
-                    </div>
-                  </el-form>
-                </el-collapse-item>
-                <el-collapse-item name="3">
-                  <template #title>
-                    <div class="small-title">检验结果</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-                    <div>
-                      <el-row :gutter="20">
-                        <el-col
-                          :span="24"
-                          v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
-                            .recordInspectionQuantifyList"
-                          :key="i"
-                        >
-                          <div
-                            style="
-                              border: 1px solid #dedede;
-                              border-radius: 4px;
-                              padding-top: 16px;
-                              margin-bottom: 10px;
-                            "
-                          >
-                            <el-row :gutter="20">
-                              <!-- 汇总录入的时候显示 -->
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
-                                  1
-                                "
-                              >
-                                <el-form-item label="合格数量" required>
-                                  <el-input
-                                    v-model="cur.qualifiedQuantity"
-                                    placeholder="请输入合格数量"
-                                    type="number"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
-                                  1
-                                "
-                              >
-                                <el-form-item label="不合格数量" required>
-                                  <el-input
-                                    v-model="cur.unqualifiedQuantity"
-                                    type="number"
-                                    placeholder="请输入不合格数量"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'
-                                "
-                              >
-                                <el-form-item label="检验值" required>
-                                  <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" @input="inputChange($event,cur)" @blur="inspectionValueInput(item, cur)" />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'
-                                "
-                              >
-                                <el-form-item label="选定集" required>
-                                  <el-select
-                                    v-model="cur.qualitativeCode"
-                                    placeholder="请选择选定集"
-                                    @change="changeQualitativeCode($event, item, cur)"
-                                  >
-                                    <el-option
-                                      v-for="dict in item.selectedProjectRespVOList"
-                                      :key="dict.dictionaryValue"
-                                      :label="dict.dictionaryLabel"
-                                      :value="dict.dictionaryValue"
-                                    />
-                                  </el-select>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="备注">
-                                  <el-input
-                                    v-model="cur.remark"
-                                    placeholder="请输入备注"
-                                    type="text"
-                                    maxlength="200"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
-                      <el-form-item label="缺陷级别" required>
-                        <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-row>
-                          </div>
-                        </el-col>
-                      </el-row>
-                    </div>
-                  </el-form>
-                </el-collapse-item>
-              </el-collapse>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-      <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
-      </template>
-    </Dialog>
-    <Dialog
-      title="修改名称"
-      v-model="dialogVisibleName"
-      width="500px"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 0px 20px">
-        <el-form ref="nameRef" :model="nameForm">
-          <el-form-item
-            :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
-            prop="name"
-          >
-            <el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
-          </el-form-item>
-        </el-form>
-      </div>
-      <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" />
-      </template>
-    </Dialog>
-    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
-  </div>
-</template>
-<script setup lang="ts">
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { getCurrentInstance } from 'vue'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-import { SearchTable } from '@/components/SearchTable'
-import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
-import * as InspectionRecordDetailPageApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
-
-import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
-const { proxy } = getCurrentInstance()
-
-const message = useMessage() // 消息弹窗
-
-const props = defineProps({
-  // 显示窗口宽度设置
-  basicFormWidth: {
-    type: String,
-    default: ''
-  },
-  // 检验特性表单，列表 相关信息
-  formAllSchemasFeatures: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 检验工序表单，列表 相关信息
-  formAllSchemasProcess: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 检验模板表单，列表 相关信息
-  formAllSchemasMain: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 底部按钮集合
-  footButttondata: {
-    type: Array,
-    required: false,
-    default: null
-  },
-  // 表单，列表 相关信息
-  formAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 校验rules
-  rules: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 包装 列表 相关信息
-  tableAllSchemas: {
-    type: Array,
-    required: true,
-    default: null
-  },
-  tableFormRules: {
-    type: Array,
-    required: true,
-    default: null
-  }
-})
-const { t } = useI18n() // 国际化
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const dialogWidth = ref()
-const formMainRef = ref()
-const formFeaturesRef = ref()
-const formProcessRef = ref()
-const formSchema = ref(props.formAllSchemas?.formSchema)
-const tableAllSchemas = ref(props.tableAllSchemas)
-const tableFormRules = ref(props.tableFormRules)
-const collapseShow = ref(['1','2','3'])
-
-const data = ref({
-  code: '',
-  itemCode: '',
-  version: '',
-  testTypeCode: '',
-  programmeTemplateCode: '',
-  splitRule: '',
-  aql: '',
-  inspectionLevel: '',
-  effectiveDate: '',
-  expirationDate: '',
-  available: 'TRUE',
-  subList: []
-})
-
-const dialogVisibleName = ref(false)
-const nameForm = ref({
-  name: ''
-})
-const nameRef = ref()
-if (props.basicFormWidth) {
-  dialogWidth.value = props.basicFormWidth + '%'
-} else {
-  dialogWidth.value = props.isBusiness ? '60%' : '40%'
-}
-const rules = ref({
-  ...props.rules,
-  'inspectionJobCharacteristicsUpdateReqVO.description': [
-    { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [
-    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateCode': [
-    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethod': [
-    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod': [
-    { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.featureType': [
-    { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyTarget': [
-    { required: true, message: '请输入目标值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyCapping': [
-    { required: true, message: '请输入上限值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit': [
-    { required: true, message: '请输入下限值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyUom': [
-    { required: true, message: '请选择计量单位', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyDecimal': [
-    { required: true, message: '请输入小数位', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [
-    { required: true, message: '请选择集编码', trigger: 'change' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.estimateCode': [
-    { required: true, message: '请选择评估代码', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.sampleQty': [
-    { required: true, message: '请输入样品份数', trigger: 'blur' }
-  ],
-  qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }]
-})
-const allSamplePieceSize = ref(0)
-/** 打开弹窗 */
-let tabIndex = 1
-const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
-  if (titleName) {
-    dialogTitle.value = t('action.' + titleName)
-  } else {
-    dialogTitle.value = t('action.' + type)
-  }
-  formType.value = type
-  allSamplePieceSize.value = 0 //打开时候归0
-  if (row) {
-    data.value = JSON.parse(JSON.stringify(row))
-    //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
-    let list = []
-    const masterId = row.id
-    list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id)
-    data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(
-      masterId
-    )
-    list.forEach((item, index) => {
-      editableTabsValue.value = 1
-      item.name = index + 1
-      item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionRecordCharacteristicsRespVO
-      item.isPass = '' //判断是否显示对号错误图标
-      // 总数量值是 样品份数 乘 每份样品量
-      allSamplePieceSize.value += parseFloat(
-        (
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
-        ).toFixed(6)
-      )
-      // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList =
-        item.inspectionRecordCharacteristicsRespVO.featureType == 1
-          ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList
-          : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList
-      if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
-        // 单个录入时
-        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) {
-          // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-          for (
-            let i = 0;
-            i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty);
-            i++
-          ) {
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-              inspectionValue: '', //检验值
-              qualitativeCode: '', //定性字典项值
-              defectLevel: '', //缺陷级别
-              qualifiedQuantity: '', //合格数量
-              unqualifiedQuantity: '' //不合格数量
-            })
-          }
-        } else {
-          // 汇总录入时
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-            inspectionValue: '', //检验值
-            qualitativeCode: '', //定性字典项值
-            defectLevel: '', //缺陷级别
-            qualifiedQuantity: parseFloat(
-              (
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
-              ).toFixed(6)
-            ), //合格数量
-            unqualifiedQuantity: '0' //不合格数量
-          })
-        }
-      }
-
-      // 编辑判断上限下限目标值是否必填
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
-      }
-      if (item.samplingProcessRespVO.evaluationMode == 1) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false
-      }
-    })
-    list.forEach((item) => {
-      item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime = new Date()
-    })
-    data.value.subList = list
-    /**
-        设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，
-        第一个包装采样数量>总数量 则显示总数量
-      */
-
-    for (let i = 0; i < data.value?.packageList?.length; i++) {
-      if (data.value.packageList[i].sampleAmount == null) {
-        if (allSamplePieceSize.value > data.value.packageList[i].amount) {
-          data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
-          allSamplePieceSize.value = parseFloat(
-            (allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(6)
-          )
-        } else {
-          data.value.packageList[i].sampleAmount = allSamplePieceSize.value
-          allSamplePieceSize.value = 0
-          // return;
-        }
-      }
-    }
-    // data.value.packageList.forEach(item=>{
-
-    // })
-    dialogVisible.value = true
-    nextTick(() => {
-      formMainRef.value.setValues(row)
-    })
-  } else {
-    data.value = {
-      code: '',
-      itemCode: '',
-      version: '',
-      testTypeCode: '',
-      programmeTemplateCode: '',
-      splitRule: '',
-      aql: '',
-      inspectionLevel: '',
-      effectiveDate: '',
-      expirationDate: '',
-      available: 'TRUE',
-      subList: []
-    }
-  }
-  dialogVisible.value = true
-  tabIndex = data.value.subList.length + 1
-}
-defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
-import type { TabPaneName } from 'element-plus'
-
-const editableTabsValue = ref(1)
-// const editableTabs = ref([])
-const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => {
-  if (action === 'add') {
-    nameForm.value.name = ''
-    dialogVisibleName.value = true
-  } else if (action === 'remove') {
-    const tabs = data.value.subList
-    let activeName = editableTabsValue.value
-    if (activeName === targetName) {
-      tabs.forEach((tab, index) => {
-        if (tab.name === targetName) {
-          const nextTab = tabs[index + 1] || tabs[index - 1]
-          if (nextTab) {
-            activeName = nextTab.name
-          }
-        }
-      })
-    }
-    editableTabsValue.value = activeName
-    data.value.subList = tabs.filter((tab) => tab.name !== targetName)
-  }
-}
-/** 修改名称时间 */
-const buttonBaseClick1 = async (val) => {
-  // 保存
-  if (val == 'save') {
-    if (!nameRef.value) return
-    nameRef.value.validate((valid, fields) => {
-      if (valid) {
-        const newTabName = `${++tabIndex}`
-        data.value.subList.push({
-          description: nameForm.value.name,
-          name: newTabName,
-          inspectionCode: '',
-          sequenceCode: '',
-          inspectionCharCode: '',
-          inspectionJobCharacteristicsUpdateReqVO: {
-            describe: '',
-            inspectionMethodCode: '',
-            dynamicUpdateCode: '',
-            inspectionMethod: '',
-            isCanUpdate: '',
-            isDestructionInspection: '',
-            resultEntryMethod: '',
-            featureType: '',
-            quantifyIsCapping: '',
-            quantifyIsLowlimit: '',
-            quantifyIsTarget: '',
-            quantifyTarget: '',
-            quantifyCapping: '',
-            quantifyLowlimit: '',
-            quantifyUom: '',
-            quantifyDecimal: '',
-            quantifyQuantifyCode: ''
-          }
-        })
-
-        editableTabsValue.value = newTabName
-        dialogVisibleName.value = false
-      } else {
-        return false
-      }
-    })
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisibleName.value = false
-  }
-}
-const buttonBaseClick = async (val) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
-    dialogVisible.value = false
-  }
-  // 暂存
-  // else if (val == 'staging') {
-  //   staging()
-  // }
-}
-// 传递给父类
-const emit = defineEmits(['submitForm', 'searchTableSuccess'])
-const validateForm = (formRef) => {
-  let _lists = formRef?.map((v) => v.validate())
-  return Promise.all(_lists)
-    .then(() => {
-      return true
-    })
-    .catch(() => {
-      return false
-    })
-}
-const tableFormRef = ref()
-const submitForm = async () => {
-  try {
-    const elForm = unref(formMainRef)?.getElFormRef()
-    // 校验表单
-    if (!elForm) return
-    const valid = await elForm.validate()
-    if (!valid) return
-    // 校验包装列表
-    if (data.value.packageList?.length > 0) {
-      const validateForm1 = await tableFormRef.value.validateForm()
-      if (!validateForm1) return
-      let isPass = data.value.packageList.some(
-        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
-      )
-      if (isPass) {
-        message.error(`采样数量不能大于数量`)
-        return
-      }
-
-      // let number = 0
-      // data.value.packageList.forEach(cur=>{
-      //   number += parseFloat(cur.sampleAmount)
-      // })
-      // number = number.toFixed('2')
-      // if(number != data.value.sampleTotalAmount){
-      //   message.error(`采样数量之和必须等于采样总数量`)
-      //   return
-      // }
-    }
-
-    const bol2 = await validateForm(formFeaturesRef.value)
-    if (!bol2) {
-      message.error(`模板中有检验工序和检验特性未填写完全`)
-      return
-    }
-    // 判断数组是否有未填的选项
-    let arrBol = []
-    let isOutweigh = [] //结束时间是否大于开始时间
-    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
-    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
-    data.value.subList.forEach((item, index) => {
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.inspectionValue
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.qualitativeCode
-            }
-          )
-        )
-      }
-      // 开始时间大于结束时间放入数组中
-      if (
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-      ) {
-        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
-      }
-      // 合格数量和不合格数量之和不能是小数
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        parseFloatList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
-                String(cur.unqualifiedQuantity).indexOf('.') > -1
-              )
-            }
-          )
-        )
-        // 合格数量和不合格数量之和不等于总数量
-        numberList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              )
-            }
-          )
-        )
-      }
-    })
-    let isEmpty1 = arrBol.some((item) => item == true)
-    let isEmptyNumberList = numberList.some((item) => item == true)
-    let isParseFloat = parseFloatList.some((item) => item == true)
-    if (isEmpty1) {
-      message.error('检验工序和检验特性有字段未填写完全')
-      return
-    }
-    // if (isOutweigh?.length > 0) {
-    //   message.error('检验特性中有开始时间大于结束时间')
-    //   return
-    // }
-    if (isParseFloat) {
-      message.error('合格数量和不合格数量之和不可以是小数')
-      return
-    }
-    if (isEmptyNumberList) {
-      message.error('合格数量和不合格数量之和必须等于样品份数')
-      return
-    }
-    data.value.id = data.value.jobId || data.value.id
-    if (formType.value == 'create') {
-      // 主子表——提交请求
-      emit('submitForm', formType.value, data.value)
-    } else {
-      // 编辑/执行
-      emit('submitForm', formType.value, data.value)
-    }
-  } catch {}
-}
-
-const staging = async () => {
-  try {
-    const elForm = unref(formMainRef)?.getElFormRef()
-    // 校验表单
-    if (!elForm) return
-    const valid = await elForm.validate()
-    if (!valid) return
-    // 校验包装列表
-
-    if (data.value.packageList?.length > 0) {
-      const validateForm1 = await tableFormRef.value.validateForm()
-      if (!validateForm1) return
-      let isPass = data.value.packageList.some(
-        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
-      )
-      if (isPass) {
-        message.error(`采样数量不能大于数量`)
-        return
-      }
-      // let number = 0
-      // data.value.packageList.forEach(cur=>{
-      //   number += parseFloat(cur.sampleAmount)
-      // })
-      // number = number.toFixed('2')
-      // if(number != data.value.sampleTotalAmount){
-      //   message.error(`采样数量之和必须等于采样总数量`)
-      //   return
-      // }
-    }
-
-    const bol2 = await validateForm(formFeaturesRef.value)
-    if (!bol2) {
-      message.error(`模板中有检验工序和检验特性未填写完全`)
-      return
-    }
-    // 判断数组是否有未填的选项
-    let arrBol = []
-    let isOutweigh = [] //结束时间是否大于开始时间
-    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
-    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
-    data.value.subList.forEach((item, index) => {
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.inspectionValue
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.qualitativeCode
-            }
-          )
-        )
-      }
-      // 开始时间大于结束时间放入数组中
-      if (
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-      ) {
-        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
-      }
-      // 合格数量和不合格数量之和不能是小数
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        parseFloatList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
-                String(cur.unqualifiedQuantity).indexOf('.') > -1
-              )
-            }
-          )
-        )
-        // 合格数量和不合格数量之和不等于总数量
-        numberList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              )
-            }
-          )
-        )
-      }
-    })
-    let isEmpty1 = arrBol.some((item) => item == true)
-    let isEmptyNumberList = numberList.some((item) => item == true)
-    let isParseFloat = parseFloatList.some((item) => item == true)
-    if (isEmpty1) {
-      message.error('检验工序和检验特性有字段未填写完全')
-      return
-    }
-    // if (isOutweigh?.length > 0) {
-    //   message.error('检验特性中有开始时间大于结束时间')
-    //   return
-    // }
-    if (isParseFloat) {
-      message.error('合格数量和不合格数量之和不可以是小数')
-      return
-    }
-    if (isEmptyNumberList) {
-      message.error('合格数量和不合格数量之和必须等于样品份数')
-      return
-    }
-    await InspectionJobMainApi.stagingInspectionJobMain(data.value)
-    message.success('暂存成功')
-  } catch {}
-}
-
-/** 弹窗按钮 */
-let Butttondata: any = []
-if (props.footButttondata) {
-  Butttondata = props.footButttondata
-} else {
-  Butttondata = [
-    // defaultButtons.formStagingBtn(null), // 暂存
-    defaultButtons.formSaveBtn(null), // 保存
-    defaultButtons.formCloseBtn(null) // 关闭
-  ]
-}
-// 选择特征类型
-const changeFeatureType = (e) => {
-  // if (e) {
-  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = true
-  // } else {
-  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = false
-  // }
-}
-const searchTableRef = ref()
-const opensearchTable = (
-  formField,
-  searchField,
-  searchTitle,
-  searchAllSchemas,
-  searchPage,
-  searchCondition,
-  multiple,
-  type,
-  row
-) => {
-  const _searchCondition = {}
-  // 判断查询条件中，是否存在指向主表的数据
-  if (searchCondition && searchCondition.length > 0) {
-    // 转换筛选条件所需
-    let filters: any[] = []
-    for (var i = 0; i < searchCondition.length; i++) {
-      // searchCondition.forEach((item) => {
-      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
-      if (searchCondition[i].isMainValue) {
-        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
-          ? formRef.value.formModel[searchCondition[i].value]
-          : props.detailData
-          ? props.detailData[searchCondition[i].value]
-          : row
-          ? row[searchCondition[i].value]
-          : ''
-        // 是否含有空参数情况
-        let isNull = false
-        if (
-          _searchCondition[searchCondition[i].key] == '' ||
-          _searchCondition[searchCondition[i].key] == undefined
-        ) {
-          isNull = true
-        }
-        if (isNull) {
-          message.warning(
-            searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
-          )
-          return
-        }
-      } else {
-        // 扩展 转换为筛选条件进行查询
-        if (searchCondition[i].isSearch) {
-          filters.push({
-            action: searchCondition[i].action,
-            column: searchCondition[i].key,
-            value: searchCondition[i].value
-          })
-        } else {
-          _searchCondition[searchCondition[i].key] = searchCondition[i].value
-        }
-      }
-    }
-    if (filters.length > 0) {
-      _searchCondition.isSearch = true
-      _searchCondition.filters = filters
-    }
-  }
-  const _searchTableTitle = searchTitle
-  const _searchTableAllSchemas = searchAllSchemas
-  const _searchTablePage = searchPage
-  searchTableRef.value.open(
-    _searchTableTitle,
-    _searchTableAllSchemas,
-    _searchTablePage,
-    formField,
-    searchField,
-    multiple,
-    type,
-    row,
-    _searchCondition
-  )
-}
-// 弹层确定返回所选数据
-// val ： 弹层列表row 数据
-const searchTableSuccess = async (formField, searchField, val, type, row) => {
-  if (type == 'features') {
-    row.inspectionJobCharacteristicsUpdateReqVO[formField] = val[0].code
-    if (formField == 'inspectionMethodCode') {
-      row.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName = val[0].description
-    } else if (formField == 'dynamicUpdateCode') {
-      row.inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateName = val[0].description
-    } else if (formField == 'inspectionMethod') {
-      row.inspectionJobCharacteristicsUpdateReqVO.inspectionName = val[0].description
-    }
-  } else if (type == 'main') {
-    data.value[formField] = val[0].code
-    if (formField == 'itemCode') {
-      data.value.itemName = val[0].name
-    } else if (formField == 'testTypeCode') {
-      data.value.testTypeName = val[0].description
-    } else if (formField == 'programmeTemplateCode') {
-      data.value.programmeTemplateName = val[0].description
-    }
-    if (formField == 'programmeTemplateCode') {
-      let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
-      list.forEach((item, index) => {
-        editableTabsValue.value = index + 1
-        item.name = index + 1
-        // 编辑判断上限下限目标值是否必填
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
-            false
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
-        }
-      })
-      data.value.subList = list
-    }
-  }
-
-  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
-}
-// 请选择结果录入方式
-const resultEntryMethodChange = (e, item) => {
-  item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-  if (e == 0) {
-    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-    for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-        inspectionValue: '', //检验值
-        qualitativeCode: '', //定性字典项值
-        defectLevel: '', //缺陷级别
-        qualifiedQuantity: '', //合格数量
-        unqualifiedQuantity: '' //不合格数量
-      })
-    }
-  } else {
-    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [
-      {
-        inspectionValue: '', //检验值
-        qualitativeCode: '', //定性字典项值
-        defectLevel: '', //缺陷级别
-        qualifiedQuantity: '', //合格数量
-        unqualifiedQuantity: '' //不合格数量
-      }
-    ]
-  }
-}
-// 选择选定级
-const changeQualitativeCode = (e, item, cur) => {
-  let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e)
-  cur.defectLevel = obj.defectLevel
-  cur.estimateCode = obj.estimateCode
-  // 显示图标
-  for (
-    let i = 0;
-    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList?.length;
-    i++
-  ) {
-    item.isPass = true
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].estimateCode ==
-      '2'
-    ) {
-      item.isPass = false
-      return
-    }
-  }
-}
-const mianscroll = ref()
-const boxList = ref()
-
-// const topScrollClick = () => {
-//   nextTick(() => {
-//     mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
-//   })
-// }
-const inputChange = (val,cur) => {
-  cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '')
-}
-const inspectionValueInput = (item, cur) => {
-  for (
-    let i = 0;
-    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
-    i++
-  ) {
-    item.isPass = true
-    //  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和下限值,目标值存在 大于上限并且小于下限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      console.log(parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ))
-      console.log( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-      console.log( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping))
-      console.log(333)
-      item.isPass = false
-      return
-    }
-  }
-}
-</script>
-<style scoped>
-.small-title {
-  font-weight: bold;
-  padding: 0px 10px 10px;
-  color: #1a8bfc;
-  font-size: 16px;
-}
-.tabs-box {
-  max-height: calc(80vh - 40px);
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-</style>
-<style>
-.el-tabs--left .el-tabs__header.is-left {
-  padding-bottom: 5000px;
-  margin-bottom: -5000px;
-  min-width: 150px !important;
-}
-
-.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
-  min-width: 120px !important;
-}
-.el-backtop {
-  position: absolute !important;
-}
-.red .el-input__inner {
-  color: red !important;
-}
-</style>
diff --git a/src/views/qms/inspectionRecordProduction/detail.vue b/src/views/qms/inspectionRecordProduction/detail.vue
deleted file mode 100644
index 4b27eddbf..000000000
--- a/src/views/qms/inspectionRecordProduction/detail.vue
+++ /dev/null
@@ -1,402 +0,0 @@
-<template>
-  <div>
-    <el-drawer
-      v-model="isShowDrawer"
-      title="详情"
-      direction="rtl"
-      size="80%"
-      v-loading="detailLoading"
-    >
-      <template #header>
-        <div class="font-size-18px">
-          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
-        </div>
-      </template>
-      <ContentWrap v-if="!isBasic">
-        <Descriptions
-          :data="data"
-          labelClassName="label-class-name"
-          label-align="left"
-          direction="vertical"
-          :column="8"
-          :schema="allSchemas.detailSchema"
-          :columns="2"
-          width="200px"
-        />
-      </ContentWrap>
-      <ContentWrap>
-        <el-tabs
-          v-model="editableTabsValue"
-          class="demo-tabs"
-          type="border-card"
-          tab-position="left"
-          :stretch="false"
-        >
-          <el-tab-pane
-            v-for="item in data.subList"
-            :key="item.name"
-            :label="item.processDescribe"
-            :name="item.name"
-          >
-            <div class="small-title">检验工序</div>
-            <el-form :model="item" label-width="auto" ref="formProcessRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码" prop="processCode">
-                    <el-input v-model="item.processCode" placeholder="根据系统生成" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="processDescribe">
-                    <el-input v-model="item.processDescribe" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="顺序号" prop="sequenceCode">
-                    <el-input v-model="item.sequenceCode" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div class="small-title">检验特性</div>
-            <el-form :model="item" label-width="auto"  ref="formFeaturesRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码">
-                    <el-input
-                      v-model="item.inspectionRecordCharacteristicsRespVO.number"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="inspectionRecordCharacteristicsRespVO.description">
-                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.description"  :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="检验方法"
-                    prop="inspectionRecordCharacteristicsRespVO.inspectionMethodCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionRecordCharacteristicsRespVO.inspectionMethodName"
-                        disabled
-                        placeholder="请输入检验方法"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="采样过程"
-                    prop="inspectionRecordCharacteristicsRespVO.inspectionMethod"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionRecordCharacteristicsRespVO.samplingProcessName"
-                        disabled
-                        placeholder="请输入采样过程"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="采样过程编码" prop="inspectionRecordCharacteristicsRespVO.samplingProcessCode">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionRecordCharacteristicsRespVO.samplingProcessName" disabled placeholder="请选择采样过程编码" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="样品份数" prop="inspectionRecordCharacteristicsRespVO.sampleQty">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionRecordCharacteristicsRespVO.sampleQty" disabled placeholder="请输入样品份数" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="12">
-                  <el-form-item
-                    label="动态修改规则编码"
-                    prop="inspectionRecordCharacteristicsRespVO.dynamicUpdateCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionRecordCharacteristicsRespVO.dynamicUpdateName"
-                        disabled
-                        placeholder="请输入动态修改规则编码"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="12">
-                  <el-form-item
-                    label="是否允许修改特征值"
-                    prop="inspectionRecordCharacteristicsRespVO.isCanUpdate"
-                  >
-                    <el-switch
-                      v-model="item.inspectionRecordCharacteristicsRespVO.isCanUpdate"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="结果录入方式"
-                    prop="inspectionRecordCharacteristicsRespVO.resultEntryMethod"
-                  >
-                    <el-select
-                      v-model="item.inspectionRecordCharacteristicsRespVO.resultEntryMethod"
-                      placeholder="请选择结果录入方式"
-                      @change="resultEntryMethodChange($event,item)"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="特征类型" prop="inspectionRecordCharacteristicsRespVO.featureType">
-                    <el-select
-                      v-model="item.inspectionRecordCharacteristicsRespVO.featureType"
-                      placeholder="请选择特征类型"
-                      @change="changeFeatureType"
-                      disabled
-                    >
-                      <el-option v-for="dict in getStrDictOptions( DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col> 
-                <el-col :span="12">
-                  <el-form-item label="开始时间" prop="inspectionRecordCharacteristicsRespVO.inspectionStartTime">
-                    <el-date-picker
-                      v-model="item.inspectionRecordCharacteristicsRespVO.inspectionStartTime"
-                      type="datetime"
-                      placeholder="请选择开始时间"
-                      style="width: 100%"
-                      value-format="x"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="结束时间" prop="inspectionRecordCharacteristicsRespVO.inspectionEndTime">
-                    <el-date-picker
-                      v-model="item.inspectionRecordCharacteristicsRespVO.inspectionEndTime"
-                      type="datetime"
-                      placeholder="请选择结束时间"
-                      style="width: 100%"
-                      value-format="x"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                <el-form-item label="计量单位" prop="inspectionRecordCharacteristicsRespVO.quantifyUom" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0" >
-                  <el-select v-model="item.inspectionRecordCharacteristicsRespVO.quantifyUom" placeholder="请选择计量单位" disabled >
-                    <el-option v-for="dict in getStrDictOptions(DICT_TYPE.UOM)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="小数位" prop="inspectionRecordCharacteristicsRespVO.quantifyDecimal" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0" >
-                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyDecimal" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0">
-                  <el-form-item label="是否设定上限" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" >
-                    <el-switch v-model="item.inspectionRecordCharacteristicsRespVO.quantifyIsCapping" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0">
-                  <el-form-item prop="inspectionRecordCharacteristicsRespVO.quantifyIsLowlimit" label="是否设定下限" >
-                    <el-switch v-model="item.inspectionRecordCharacteristicsRespVO.quantifyIsLowlimit" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item prop="inspectionRecordCharacteristicsRespVO.quantifyIsTarget" label="是否设定目标值" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0" >
-                    <el-switch v-model="item.inspectionRecordCharacteristicsRespVO.quantifyIsTarget" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0 && item.inspectionRecordCharacteristicsRespVO.quantifyIsCapping">
-                  <el-form-item  label="上限值" prop="inspectionRecordCharacteristicsRespVO.quantifyCapping" >
-                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyCapping" type="number" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0 && item.inspectionRecordCharacteristicsRespVO.quantifyIsLowlimit">
-                  <el-form-item label="下限值" prop="inspectionRecordCharacteristicsRespVO.quantifyLowlimit" >
-                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyLowlimit" type="number" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12"  v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0 && item.inspectionRecordCharacteristicsRespVO.quantifyIsTarget">
-                  <el-form-item label="目标值"  prop="inspectionRecordCharacteristicsRespVO.quantifyTarget" >
-                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyTarget" type="number" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" >
-                  <el-form-item label="评估代码">
-                    <el-select v-model="item.inspectionRecordCharacteristicsRespVO.estimateCode" placeholder="请选择评估代码" disabled>
-                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)" :key="dict.value" :label="dict.label" :value="dict.value" disabled/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-for="(cur, i) in item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList" :key="i" style="border: 1px solid #dedede; border-radius: 4px; padding-top: 16px; margin-bottom: 10px;">
-                  <el-row>
-                    <!-- 汇总录入的时候显示 -->
-                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.resultEntryMethod == 1">
-                      <el-form-item label="合格数量">
-                        <el-input v-model="cur.qualifiedQuantity" placeholder="请输入合格数量"  type="number" disabled/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.resultEntryMethod == 1">
-                      <el-form-item label="不合格数量">
-                        <el-input v-model="cur.unqualifiedQuantity" type="number" placeholder="请输入不合格数量" disabled/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == '0'">
-                      <el-form-item label="检验值">
-                        <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" type="number" disabled/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == '1'">
-                      <el-form-item label="选定集">
-                          <el-select
-                          v-model="cur.qualitativeCode"
-                          placeholder="请选择选定集"
-                          disabled
-                        >
-                          <el-option
-                            v-for="dict in item.selectedProjectRespVOList"
-                            :key="dict.dictionaryValue"
-                            :label="dict.dictionaryLabel"
-                            :value="dict.dictionaryValue"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                    <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-row>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-tab-pane>
-        </el-tabs>
-      </ContentWrap>
-    </el-drawer>
-   
-  </div>
-</template>
-
-<script lang="ts" setup>
-import * as InspectionRecordDetailPageApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-
-defineOptions({ name: 'InspectionRecordDetail' })
-
-const editableTabsValue = ref('1')
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const updateKey = ref(0)
-
-const props = defineProps({
-  // 表单，列表 相关信息
-  allSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 明细列表相关信息
-  detailAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 详情列表扩展操作按钮
-  buttondataTable: {
-    type: Array,
-    required: false,
-    default: ()=>{
-      return []
-    }
-  },
-})
-const isShowDrawer = ref(false)
-const detailLoading = ref(false)
-const data = ref({
-  code: '',
-  itemCode: '',
-  version: '',
-  testTypeCode: '',
-  programmeTemplateCode: '',
-  splitRule: '',
-  aql: '',
-  inspectionLevel: '',
-  effectiveDate: '',
-  expirationDate: '',
-  available: 'TRUE',
-  subList: []
-})
-
-/** 打开弹窗 */
-const formRef = ref()
-const titleNameRef = ref()
-const titleValueRef = ref()
-const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
-  titleNameRef.value = titleName
-  titleValueRef.value = titleValue
- 
-  isShowDrawer.value = true
-  if (row) {
-    detailLoading.value = true
-    try {
-      data.value = row
-      let list = []
-      list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id)
-      list.forEach((item, index) => {
-      editableTabsValue.value = index + 1
-        item.name = index + 1
-        item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList = item.inspectionRecordCharacteristicsRespVO.featureType == 1 ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList
-      })
-      data.value.subList = list
-    } finally {
-      detailLoading.value = false
-    }
-  }
-}
-defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
-
-
-</script>
-<style lang="scss">
-.el-drawer__body {
-  background: #f5f5f5 !important;
-}
-
-::v-deep(.label-class-name) {
-  color: #dedede;
-}
-</style>
-<style scoped lang="scss"></style>
diff --git a/src/views/qms/inspectionRecordProduction/index.vue b/src/views/qms/inspectionRecordProduction/index.vue
deleted file mode 100644
index 59c7e9b79..000000000
--- a/src/views/qms/inspectionRecordProduction/index.vue
+++ /dev/null
@@ -1,450 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search
-      :schema="InspectionRecordMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="InspectionRecordMain.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>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <UseAddForm
-    ref="formRef"
-    basicFormWidth="80"
-    :tableAllSchemas="InspectionRecordPackage.allSchemas"
-    :tableFormRules="InspectionRecordPackageRules"
-    :rules="InspectionRecordUserRules"
-    :formAllSchemas="InspectionRecordUser.allSchemas"
-    @submitForm="submitForm"
-  />
-
-  <!-- 新增  -->
-  <AddForm
-    ref="basicFormRef"
-    basicFormWidth="80"
-    :formAllSchemas="InspectionRecordMain.allSchemas"
-    :tableAllSchemas="InspectionJobPackage.allSchemas"
-    :tableFormRules="InspectionJobPackageRules"
-    :rules="InspectionTemplateRules"
-    @submitForm="submitFormExecute"
-  />
-
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="InspectionRecordMain.allSchemas"
-    :detailAllSchemas="InspectionRecordDetail.allSchemas"
-    :detailAllSchemasRules="InspectionRecordDetailRules"
-    :apiCreate="InspectionRecordDetailApi.createInspectionRecordDetail"
-    :apiUpdate="InspectionRecordDetailApi.updateInspectionRecordDetail"
-    :apiPage="InspectionRecordDetailApi.getInspectionRecordDetailPage"
-    :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="false"
-    :detailButtonIsShow="true"
-  />
-  <!-- 包装信息 -->
-  <ListTable
-    ref="listTableRef"
-    titleName="包装信息"
-    :allSchemas="InspectionRecordMain.allSchemas"
-    :detailAllSchemas="InspectionRecordPackage.allSchemas"
-    :detailAllSchemasRules="InspectionRecordPackageRules"
-    :list="list"
-  />
-    <el-dialog
-      v-model="showQualityReport"
-      :title="t('质检明细')"
-      :append-to-body="false"
-      destroy-on-close
-      fullscreen
-    >
-    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
-  </el-dialog>
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import {
-  InspectionRecordMain,
-  InspectionRecordMainRules,
-  InspectionRecordDetail,
-  InspectionRecordDetailRules,
-  InspectionRecordPackage,
-  InspectionRecordPackageRules,
-  InspectionRecordUser,
-  InspectionRecordUserRules
-} from './inspectionRecordMain.data'
-// import { InspectionJobPackage,InspectionJobPackageRules} from '../inspectionJob/inspectionJobMain.data'
-import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
-import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
-import * as InspectionRecordDetailApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import ListTable from '@/components/ListTable/src/ListTable.vue'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import UseAddForm from './useAddForm.vue'
-import AddForm from './addForm.vue'
-import Detail from './detail.vue'
-import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-import { getReportUrl } from '@/utils/systemParam'
-
-import {
-  InspectionJobMain,
-  InspectionJobMainRules,
-  InspectionJobDetail,
-  InspectionJobDetailRules,
-  InspectionJobPackage,
-  InspectionJobPackageRules
-} from '../inspectionJob/inspectionJobMain.data'
-
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-
-// 采购订单
-defineOptions({ name: 'inspectionRecordMain' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(InspectionRecordMain.allSchemas.tableColumns)
-if (routeName.value == 'InspectRecordMain') {
-  tableColumns.value = tableColumns.value.filter((item) => {
-    return item.label != '操作'
-  })
-}
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  if (routeName.value == 'InspectRecordMain') {
-    tableColumns.value = val.filter((item) => {
-      return item.label != '操作'
-    })
-  } else {
-    tableColumns.value = val
-  }
-}
-
-// 子表新增的时候选择表格之后需要会显得字段
-const { tableObject, tableMethods } = useTable({
-  getListApi: InspectionRecordMainApi.getInspectionRecordMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-let HeadButttondata = [
-  defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-recode-main:export' }), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null) // 设置
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') {
-    // 新增
-    openForm('create')
-  } else if (val == 'import') {
-    // 导入
-    handleImport()
-  } else if (val == 'export') {
-    // 导出
-    handleExport()
-  } else if (val == 'refresh') {
-    // 刷新
-    getList()
-  } else if (val == 'filtrate') {
-    // 筛选
-  } else {
-    // 其他按钮
-    console.log('其他按钮', item)
-  }
-}   
-
-const isShowMainButton = (row, val) => {
-  if (!row.callbackRequestNumber) {
-    //callbackRequestNumber为空是手工创建订单，不需要使用决策和发布
-    return true
-  }
-  if (row.useDecision) {
-    return row.isPublished
-  } else {
-    return val ? true : false
-  }
-}
-const isShowEditBtn = (row, val) => {
-  if (val.indexOf(row.inspectionType) > -1) {
-    return true
-  } else {
-    return row.useDecision
-  }
-}
-const isShowPackageBtn = (row, val) => {
-  if (val.indexOf(row.inspectionType) > -1) {
-    return true
-  } else {
-    return false
-  }
-}
-// 列表-操作按钮
-const butttondata = (row) => {
-  return [
-    // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
-    defaultButtons.mainApplyDecisionBtn({
-      hide: isShowMainButton(row, null),
-      hasPermi: 'qms:inspection-recode-main:edit'
-    }), // 使用决策
-    // defaultButtons.mainListDeleteBtn(null), // 删除
-    defaultButtons.mainListOrderPubBtn({
-      hide: isShowMainButton(row, 'publish'),
-      hasPermi: 'qms:inspection-recode-main:pub'
-    }), // 发布
-    defaultButtons.mainListPackageBtn({ hide: isShowPackageBtn(row, ['11']) }), // 包装
-    // defaultButtons.mainListJobExeBtn({
-    // hide:row.useDecision,
-    // hasPermi: 'qms:inspection-recode-main:execute',
-    //  }), // 执行
-    defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), // 编辑
-    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
-  ]
-}
-
-const listTableRef = ref()
-const list = ref([])
-const useDecisionList = getStrDictOptions(DICT_TYPE.USAGE_DECISION)
-// const useDecisionList = InspectionRecordMain.allSchemas.formSchema.filter(item=>item.field == "useDecision")
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'applyDecision') {
-    // 编辑
-    // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
-    if (row.estimateCode == 1) {
-      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
-        if (itemColumn.field == 'useDecision') {
-          itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1)
-        }
-      })
-    } else if (row.estimateCode == 2) {
-      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
-        if (itemColumn.field == 'useDecision') {
-          itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1)
-        }
-      })
-    }
-    openUseForm('update', row)
-  } else if (val == 'mainPackage') {
-    // 包装
-    list.value = await InspectionRecordPackageApi.getInspectionRecordPackageList(row.id)
-    list.value.forEach((item) => {
-      item.qualifiedAmount = item.qualifiedAmount ? item.qualifiedAmount : 0
-      item.noQualifiedAmount = item.noQualifiedAmount ? item.noQualifiedAmount : 0
-      item.destroyAmount = item.destroyAmount ? item.destroyAmount : 0
-      item.frozenAmount = item.frozenAmount ? item.frozenAmount : 0
-    })
-    // row.status = '1'
-    listTableRef.value.openPackage(row, '包装信息', InspectionRecordPackage.allSchemas.tableColumns)
-  } else if (val == 'delete') {
-    // 删除
-    handleDelete(row.id)
-  } else if (val == 'mainOrderPub') {
-    //发布
-    handleOrderPub(row)
-  }else if (val == 'mainPlanCheckQualityReport') {
-    // 查看质检报告
-    checkQualityReport(row)
-  } else if (val == 'edit') {
-    //修改
-    // 执行
-    execute('execute', row)
-  }
-}
-
-// 查看质检报告
-const reportHeight = ref(window.innerHeight - 120)
-const showQualityReport = ref(false)
-const qualityReport = ref('')
-const checkQualityReport = async (row) => {
-  showQualityReport.value = true
-  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
-}
-/** 添加/修改操作 */
-const basicFormRef = ref()
-// const openForm = async (type : string, row ?: number) => {
-//   tableData.value = [] // 重置明细数据
-//   basicFormRef.value.open(type, row)
-// }
-/** 使用决策操作操作 */
-const formRef = ref()
-const openUseForm = async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  formRef.value.open(type, row)
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionRecordMain')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await InspectionRecordMainApi.deleteInspectionRecordMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-/** 发布按钮操作 */
-const handleOrderPub = async (row: object) => {
-  try {
-    // 删除的二次确认
-    await message.confirm(t('common.confirmPublish'))
-    // 发起删除
-    await InspectionRecordMainApi.publishInspectionRecordMain(row.id)
-    message.success(t('common.publishSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-//执行
-
-const execute = async (type: string, row?: number) => {
-  basicFormRef.value.open(type, row)
-}
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
-    download.excel(data, '完工检验记录.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/**
- * tableForm方法
- */
-const tableFormKeys = {}
-InspectionRecordDetail.allSchemas.tableFormColumns.forEach((item) => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
-
-//   // 主子数据 提交
-const submitForm = async (formType, data) => {
-  // data.subList = tableData.value // 拼接子表数据参数
-  try {
-    if (formType === 'create') {
-      await InspectionRecordMainApi.createInspectionRecordMain(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await InspectionRecordMainApi.updateInspectionRecordMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = false
-  }
-}
-// 执行
-const submitFormExecute = async (formType, data) => {
-  // return
-  console.log(formType, data)
-  data.status = '2'
-  try {
-    basicFormRef.value.formLoading = true
-    if (formType === 'create') {
-      await InspectionJobMainApi.createInspectionJobMain(data)
-      message.success(t('common.createSuccess'))
-    } else if (formType === 'execute') {
-      await InspectionRecordMainApi.executeInspectionRecordMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    basicFormRef.value.dialogVisible = false
-    basicFormRef.value.formLoading = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    basicFormRef.value.formLoading = false
-  }
-}
-
-// 筛选提交
-const searchFormClick = (searchData) => {
-  let isHave = searchData?.filters?.some((item) => item.column == 'inspectionType')
-  if (!isHave) {
-    searchData.filters.push({
-      action: '==',
-      column: 'inspectionType',
-      value: '4'
-    })
-  }
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
-  }
-  getList() // 刷新当前列表
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  tableObject.params = {
-    available: true,
-    inspectionType: '4'
-  }
-  getList()
-})
-</script>
diff --git a/src/views/qms/inspectionRecordProduction/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecordProduction/inspectionRecordMain.data.ts
deleted file mode 100644
index 9c106671b..000000000
--- a/src/views/qms/inspectionRecordProduction/inspectionRecordMain.data.ts
+++ /dev/null
@@ -1,964 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter2 } from '@/utils/formatTime'
-import { validateHanset, validateEmail } from '@/utils/validator'
-import { dateFormatter } from '@/utils/formatTime'
-import { validateTwoNum, validateSixNum } from '@/utils/validator'
-const { t } = useI18n() // 国际化
-
-/**
- * @returns {Array} 检验任务主表
- */
-export const InspectionRecordMain = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '记录编码',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true,
-      table: {
-        width: 200,
-        fixed: 'left'
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '申请编码',
-      field: 'requestNumber',
-      sort: 'custom',
-      isSearch: true,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '任务编码',
-      field: 'jobNumber',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '发货单号',
-      field: 'asnNumber',
-      sort: 'custom',
-      isSearch: true,
-      isForm: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 180
-      }
-    },
-    {
-      label: '供应商编码',
-      field: 'supplierCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '供应商名称',
-      field: 'supplierName',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '物料编码',
-      field: 'itemCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '物料名称',
-      field: 'itemName',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '批次',
-      field: 'batch',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '供应商批次',
-      field: 'supplierBatch',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '检验方案编码',
-      field: 'inspectionSchemeCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '检验批次',
-      field: 'inspectionBatch',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '检验批数量',
-      field: 'inspectionBatchAmount',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    // {
-    //   label: '采样总数量',
-    //   field: 'sampleTotalAmount',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isForm:false,
-    //   table: {
-    //     width: 150
-    //   }
-    // },
-    {
-      label: '检验类型',
-      field: 'inspectionType',
-      dictType: DICT_TYPE.INSPECTION_TYPE,
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'Select',
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考订单号',
-      field: 'referenceOrderCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '参考订单行',
-      field: 'referenceOrderRow',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考凭证号',
-      field: 'referenceCertificateCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      // reference_certificate_row
-      label: '参考凭证行',
-      field: 'referenceCertificateRow',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '检验阶段',
-      field: 'inspectionStage',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '检验严格性',
-      field: 'inspectionStringency',
-      dictType: DICT_TYPE.INSPECTION_SEVERITY,
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '计划开始时间',
-      field: 'planStartTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '计划结束时间',
-      field: 'planEndTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '实际开始时间',
-      field: 'realStartTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '实际结束时间',
-      field: 'realEndTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-
-    {
-      label: '收货时间',
-      field: 'deliveryTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x'
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '检验水平',
-      field: 'inspectionLevel',
-      dictType: DICT_TYPE.INSPECTION_LEVEL,
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: 'AQL值',
-      field: 'aqlValue',
-      dictType: DICT_TYPE.BASIC_AQL,
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '使用决策',
-      field: 'useDecision',
-      sort: 'custom',
-      isSearch: false,
-      dictType: DICT_TYPE.USAGE_DECISION,
-      table: {
-        width: 150
-      },
-      isForm: false
-    },
-    {
-      label: '执行结果',
-      field: 'estimateCode',
-      dictType: DICT_TYPE.EVALUATION_CODE,
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '包装号',
-      field: 'packageCode',
-      sort: 'custom',
-      isSearch: true,
-      isTable: false,
-      isForm: false,
-      tableForm: {
-        disabled: 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'
-        }
-      },
-      isSearch: true,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      }
-    },
-    {
-      label: '创建者',
-      field: '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: 'updater',
-      isDetail: true,
-      isForm: false,
-      isTable: false,
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '操作',
-      field: 'action',
-      isForm: false,
-      isDetail: false,
-      table: {
-        width: 300,
-        fixed: 'right'
-      }
-    }
-  ])
-)
-
-//表单校验
-export const InspectionRecordMainRules = reactive({
-  useDecision: [required],
-
-})
-
-/**
- * @returns {Array} 检验任务子表
- */
-export const InspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isTable: false,
-    isSearch: false,
-    isForm: false,
-  },
-  {
-    label: '记录编码',
-    field: 'recordCode',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '工序编码',
-    field: 'processCode',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '工序描述',
-    field: 'processDescribe',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '顺序号',
-    field: 'sequenceCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '是否破坏性检验',
-    field: 'isDestroyInspection',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'Radio'
-    },
-  },
-  {
-    label: '检验开始时间',
-    field: 'inspectionStartTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '检验结束时间',
-    field: 'inspectionEndTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '检验人',
-    field: 'inspectionOperator',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '检验特性编码',
-    field: 'inspectionFeaturesCode',
-    sort: 'custom',
-    isSearch: false,
-  },
-  // {
-  //   label: '是否可用',
-  //   field: 'available',
-  //   sort: 'custom',
-  //   isSearch: false,
-  // },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-  },
-
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm: false,
-  }
-]))
-
-//表单校验
-export const InspectionRecordDetailRules = reactive({
-  recordCode: [required],
-  processCode: [required],
-  sequenceCode: [required],
-  isDestroyInspection: [required],
-  available: [required],
-})
-
-/**
- * @returns {Array} 检验记录包装
- */
-export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 200
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '包装号',
-    field: 'packageCode',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 160
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '包装规格',
-    field: 'packageSpecificationCode',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 150
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '数量',
-    field: 'amount',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-    tableForm: {
-      disabled: true,
-      width: 120
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'measuringUnit',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 120
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '采样数量',
-    field: 'sampleAmount',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 100
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '合格数量',
-    field: 'qualifiedAmount',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 100
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '不合格数量',
-    field: 'noQualifiedAmount',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 100
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '破坏数量',
-    field: 'destroyAmount',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 100
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '冻结数量',
-    field: 'frozenAmount',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 100
-    },
-    table: {
-      width: 150
-    }
-  }
-]))
-
-//表单校验
-export const InspectionRecordPackageRules = reactive({
-  qualifiedAmount: [
-    required,
-    { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' }
-  ],
-  frozenAmount: [
-    required,
-    { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' }
-  ],
-  destroyAmount: [
-    required,
-    { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' }
-  ],
-  noQualifiedAmount: [
-    required,
-    { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' }
-  ],
-})
-
-
-//表单校验
-export const InspectionRecordUserRules = reactive({
-  useDecision: [required],
-
-})
-
-/**
- * @returns {Array} 检验任务子表
- */
-export const InspectionRecordUser = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '发货单号',
-    field: 'asnNumber',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '使用决策',
-    field: 'useDecision',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.USAGE_DECISION,
-    table: {
-      width: 150
-    }
-  },
-]))
diff --git a/src/views/qms/inspectionRecordProduction/useAddForm.vue b/src/views/qms/inspectionRecordProduction/useAddForm.vue
deleted file mode 100644
index c430495c8..000000000
--- a/src/views/qms/inspectionRecordProduction/useAddForm.vue
+++ /dev/null
@@ -1,312 +0,0 @@
-<template>
-  <div>
-    <Dialog
-      :title="dialogTitle"
-      v-model="dialogVisible"
-      :width="dialogWidth"
-      :close-on-click-modal="false"
-      :vLoading="formLoading"
-    >
-      <div style="max-height: 80vh; overflow-y: auto; padding: 0px 20px">
-        <Form
-          ref="formMainRef"
-          :rules="rules"
-          :schema="formSchema"
-          :is-col="true"
-          @onChange="onChange"
-        />
-        <div class="small-title">包装列表</div>
-        <div style="border:1px solid #dedede;margin-bottom:20px;display: flex;">
-          <TableForm
-            ref="tableFormRef"
-            style="width:100%;"
-            :maxHeight = "490"
-            :tableFields="tableSchemas.tableFormColumns"
-            :tableFormRules="tableFormRules"
-            :tableData="data.packageList"
-            :isShowButton="false"
-            :isShowReduceButton="false"
-            @inputStringBlur="tableFormBlur"
-          />
-        </div>
-      </div>
-      <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
-      </template>
-    </Dialog>
-    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
-  </div>
-</template>
-
-<script setup lang="ts">44
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { getCurrentInstance } from 'vue'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import { SearchTable } from '@/components/SearchTable'
-import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
-import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
-
-const { proxy } = getCurrentInstance()
-
-const message = useMessage() // 消息弹窗
-
-const props = defineProps({
-  // 显示窗口宽度设置
-  basicFormWidth: {
-    type: String,
-    default: ''
-  },
-  // 底部按钮集合
-  footButttondata: {
-    type: Array,
-    required: false,
-    default: null
-  },
-  // 表单，列表 相关信息
-  formAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 校验rules
-  rules: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 包装 列表 相关信息
-  tableAllSchemas: {
-    type: Array,
-    required: true,
-    default: null
-  },
-  tableFormRules: {
-    type: Array,
-    required: true,
-    default: null
-  },
-})
-const { t } = useI18n() // 国际化
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const dialogWidth = ref()
-const formSchema = ref(props.formAllSchemas?.formSchema)
-const tableSchemas = ref(props.tableAllSchemas)
-const tableFormRules = ref(props.tableFormRules)
-const formMainRef = ref()
-
-const data = ref({
-  code: '',
-  itemCode: '',
-  version: '',
-  testTypeCode: '',
-  programmeTemplateCode: '',
-  splitRule: '',
-  aql: '',
-  inspectionLevel: '',
-  effectiveDate: '',
-  expirationDate: '',
-  available: 'TRUE',
-  subList: []
-})
-
-if (props.basicFormWidth) {
-  dialogWidth.value = props.basicFormWidth + '%'
-} else {
-  dialogWidth.value = props.isBusiness ? '60%' : '40%'
-}
-
-/** 打开弹窗 */
-const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
-  dialogTitle.value = t('action.applyDecision')
-  formType.value = type
-  if (row) {
-    data.value = JSON.parse(JSON.stringify(row))
-    data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(row.id)
-    data.value.packageList.forEach(item=>{
-      item.qualifiedAmount = item.qualifiedAmount?item.qualifiedAmount:0
-      item.noQualifiedAmount = item.noQualifiedAmount?item.noQualifiedAmount:0
-      item.destroyAmount = item.destroyAmount?item.destroyAmount:0
-      item.frozenAmount = item.frozenAmount?item.frozenAmount:0
-    })
-    dialogVisible.value = true
-    tableSchemas.value.tableFormColumns.map(item=>{
-      item.tableForm.disabled = true
-    })
-    // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
-    if(row.estimateCode == 1){
-      data.value.useDecision = '1'
-    }else{
-      data.value.useDecision =''
-    }
-    // 全部合格时合格数量==数量
-    if(data.value.useDecision == 1){
-      data.value.packageList.forEach(item=>{
-        item.qualifiedAmount = item.amount
-      })
-    }
-    // 让步接收和部分合格
-    else if(data.value.useDecision  == 2 || data.value.useDecision  == 6){
-      tableSchemas.value.tableFormColumns.map(item=>{
-        if(item.field == 'noQualifiedAmount'){
-          item.tableForm.disabled = false
-        }else{
-          item.tableForm.disabled = true
-        }
-      })
-    }
-    // 全不合格只能输入不合格数量
-    else if(data.value.useDecision  == 3){
-      data.value.packageList.forEach(item=>{
-        item.noQualifiedAmount = item.amount
-      })
-    }
-    else if(data.value.useDecision  == 4){
-      data.value.packageList.forEach(item=>{
-        item.frozenAmount = item.amount
-      })
-    }
-    
-    nextTick(() => {
-      formMainRef.value.setValues( data.value)
-    })
-  } 
-  dialogVisible.value = true
-}
-defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
-
-// console.log(11,tableAllSchemas.value.tableFormColumns)
-// 传递给父类
-const emit = defineEmits([
-  'onChange',
-  'submitForm'
-])
-/** 弹窗按钮 */
-let Butttondata: any = []
-if (props.footButttondata) {
-  Butttondata = props.footButttondata
-} else {
-  Butttondata = [
-    defaultButtons.formSaveBtn(null), // 保存
-    defaultButtons.formCloseBtn(null) // 关闭
-  ]
-}
-const onChange = (field, cur)=>{
-  if(field=='useDecision'){
-    tableSchemas.value.tableFormColumns.map(item=>{
-      item.tableForm.disabled = true
-    })
-    data.value.packageList.forEach(item=>{
-        item.qualifiedAmount =0
-        item.noQualifiedAmount =0
-        item.destroyAmount =0
-        item.frozenAmount =0
-      })
-    // 全部合格时合格数量==数量
-    if(cur == 1){
-      data.value.packageList.forEach(item=>{
-        item.qualifiedAmount = item.amount
-      })
-    }
-    // 全不合格只能输入不合格数量
-    else if(cur == 2 || cur == 6){
-      data.value.packageList.forEach(item=>{
-        item.qualifiedAmount = item.amount
-      })
-      tableSchemas.value.tableFormColumns.map(item=>{
-        if(item.field == 'noQualifiedAmount'){
-          item.tableForm.disabled = false
-        }else{
-          item.tableForm.disabled = true
-        }
-      })
-    }
-    // 全不合格只能输入不合格数量
-    else if(cur == 3){
-      data.value.packageList.forEach(item=>{
-        item.noQualifiedAmount = item.amount
-      })
-    }
-    else if(cur == 4){
-      data.value.packageList.forEach(item=>{
-        item.frozenAmount = item.amount
-      })
-    }
-  }
-}
-// 失去焦点
-const tableFormBlur = (field, val,row)=>{
-  if( row.amount < val){
-    row.noQualifiedAmount = row.amount
-    row.qualifiedAmount = 0
-  }else{
-    row.qualifiedAmount = row.amount - val
-    row.qualifiedAmount = row.qualifiedAmount.toFixed(6)
-  }
-  
-}
-const buttonBaseClick = (val) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
-const tableFormRef = ref()
-const submitForm = async () => {
-  try {
-    const elForm = unref(formMainRef)?.getElFormRef()
-    // 校验表单
-    if (!elForm) return
-    const valid = await elForm.validate()
-    if (!valid) return
-    // 校验包装列表
-    const validateForm1 = await tableFormRef.value.validateForm()
-    if (!validateForm1) return
-      const data1 = unref(formMainRef)?.formModel
-      data.value.useDecision = data1.useDecision
-    if(data1.useDecision == 2 || data1.useDecision == 6){
-      if(data.value.packageList.length>0){
-        let isBol = data.value.packageList.filter(cur=>parseFloat(cur.qualifiedAmount)+parseFloat(cur.noQualifiedAmount)!=parseFloat(cur.amount))
-        console.log(isBol)
-        if(isBol&&isBol.length>0){
-          message.error(`合格数量和不合格数量总和不等于数量`)
-          return
-        }
-      } 
-    }
-    if (formType.value == 'create') {
-      // 主子表——提交请求
-      emit('submitForm', formType.value, data.value)
-    } else {
-      // 编辑/执行
-      emit('submitForm', formType.value, data.value)
-    }
-  } catch {
-    console.log(111)
-  }
-}
-</script>
-<style scoped>
-.small-title {
-  font-weight: bold;
-  padding: 0px 10px 10px;
-  color: #1a8bfc;
-  font-size: 16px;
-}
-</style>
-<style>
-.el-tabs--left .el-tabs__header.is-left {
-  min-height: 700px !important;
-  min-width: 150px !important;
-}
-.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
-  min-width: 120px !important;
-}
-</style>
diff --git a/src/views/qms/inspectionRecordPurchase/addForm.vue b/src/views/qms/inspectionRecordPurchase/addForm.vue
deleted file mode 100644
index 037c9456b..000000000
--- a/src/views/qms/inspectionRecordPurchase/addForm.vue
+++ /dev/null
@@ -1,1571 +0,0 @@
-<template>
-  <div>
-    <Dialog
-      :title="dialogTitle"
-      v-model="dialogVisible"
-      :width="dialogWidth"
-      :close-on-click-modal="false"
-      :vLoading="formLoading"
-    >
-      <div
-        class="box"
-        style="max-height: 80vh; overflow-y: auto; padding: 0px 20px"
-        ref="mianscroll"
-      >
-        <!-- <el-backtop :right="40" :bottom="100" target=".box" @click="topScrollClick" /> -->
-        <Form
-          ref="formMainRef"
-          :rules="rules"
-          :schema="formSchema"
-          :is-col="true"
-          @opensearchTable="opensearchTable"
-        />
-        <div ref="boxList">
-          <div class="small-title">包装列表</div>
-          <div style="border: 1px solid #dedede; margin-bottom: 20px; display: flex">
-            <TableForm
-              ref="tableFormRef"
-              style="width: 100%"
-              :maxHeight="490"
-              :tableFields="tableAllSchemas.tableFormColumns"
-              :tableFormRules="tableFormRules"
-              :tableData="data.packageList"
-              :isShowButton="false"
-              :isShowReduceButton="false"
-            />
-          </div>
-        </div>
-
-        <el-tabs
-          v-model="editableTabsValue"
-          class="demo-tabs"
-          @edit="handleTabsEdit"
-          type="border-card"
-          tab-position="left"
-          :stretch="false"
-        >
-          <el-tab-pane
-            v-for="item in data.subList"
-            :key="item.name"
-            :label="item.processDescribe"
-            :name="item.name"
-            v-next-focus
-          >
-            <template #label>
-              <span class="custom-tabs-label" style="display: flex; align-items: center">
-                <Icon
-                  class="mr-5px"
-                  icon="ep:circle-check-filled"
-                  v-if="item.isPass === true"
-                  color="#67C23A"
-                  style="margin-top: 4px"
-                />
-                <Icon
-                  class="mr-5px"
-                  icon="ep:circle-close-filled"
-                  v-if="item.isPass === false"
-                  color="#ff0000"
-                  style="margin-top: 4px"
-                />
-                <span>{{ item.processDescribe }}</span>
-              </span>
-            </template>
-            <div class="tabs-box">
-              <el-collapse v-model="collapseShow">
-                <el-collapse-item name="1">
-                  <template #title>
-                    <div class="small-title">检验工序</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-form-item label="编码" prop="processCode">
-                          <el-input
-                            v-model="item.processCode"
-                            placeholder="根据系统生成"
-                            :disabled="true"
-                          />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="检验特性编号">
-                          <el-input
-                            v-model="item.inspectionFeatureCode"
-                            placeholder="根据系统生成"
-                            :disabled="true"
-                          />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="描述" prop="processDescribe">
-                          <el-input v-model="item.processDescribe" :disabled="true" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="顺序号" prop="sequenceCode">
-                          <el-input v-model="item.sequenceCode" :disabled="true" />
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </el-form>
-                </el-collapse-item>
-                <el-collapse-item name="2">
-                  <template #title>
-                    <div class="small-title">检验特性</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-                    <div>
-                      <el-row :gutter="20">
-                        <el-col :span="12">
-                          <el-form-item label="编码">
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
-                              placeholder="根据系统生成"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="描述"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="检验方法"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
-                                "
-                                disabled
-                                placeholder="请选择检验方法"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="采样过程编码"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
-                                "
-                                disabled
-                                placeholder="请选择采样过程编码"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="样品份数"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                                disabled
-                                placeholder="请输入样品份数"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                          <el-form-item
-                            label="每份样品量"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                          >
-                            <div style="display: flex; width: 100%">
-                              <el-input
-                                v-model="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize
-                                "
-                                disabled
-                                placeholder="请输入样品份数"
-                              />
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="是否允许修改特征值"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                          >
-                            <el-switch
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                              disabled
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="结果录入方式"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                          >
-                            <el-select
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
-                              "
-                              placeholder="请选择结果录入方式"
-                              @change="resultEntryMethodChange($event, item)"
-                              disabled
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(
-                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                                )"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="特征类型"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                          >
-                            <el-select
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                              placeholder="请选择特征类型"
-                              @change="changeFeatureType"
-                              disabled
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(
-                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                                )"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定上限"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                          "
-                        >
-                          <el-form-item
-                            label="上限值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定下限"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                          "
-                        >
-                          <el-form-item
-                            label="下限值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col
-                          :span="12"
-                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                        >
-                          <el-form-item
-                            label="是否设定目标值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                          >
-                            <el-switch
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                              "
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col
-                          :span="12"
-                          v-if="
-                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                          "
-                        >
-                          <el-form-item
-                            label="目标值"
-                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                          >
-                            <el-input
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
-                              :disabled="true"
-                            />
-                          </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                          <el-form-item
-                            label="开始时间"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                          >
-                            <el-date-picker
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
-                              "
-                              type="datetime"
-                              placeholder="请选择开始时间"
-                              style="width: 100%"
-                              value-format="x"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item
-                            label="结束时间"
-                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                          >
-                            <el-date-picker
-                              v-model="
-                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-                              "
-                              type="datetime"
-                              placeholder="请选择结束时间"
-                              style="width: 100%"
-                              value-format="x"
-                            />
-                          </el-form-item>
-                        </el-col>
-                        <!-- 手动评估的时候显示 -->
-                        <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                          <el-form-item
-                            label="评估代码"
-                            required
-                            prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                          >
-                            <el-select
-                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                              placeholder="请选择评估代码"
-                              @change="changeFeatureType"
-                            >
-                              <el-option
-                                v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                          </el-form-item>
-                        </el-col>
-                      </el-row>
-                    </div>
-                  </el-form>
-                </el-collapse-item>
-                <el-collapse-item name="3">
-                  <template #title>
-                    <div class="small-title">检验结果</div>
-                  </template>
-                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-                    <div>
-                      <el-row :gutter="20">
-                        <el-col
-                          :span="24"
-                          v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
-                            .recordInspectionQuantifyList"
-                          :key="i"
-                        >
-                          <div
-                            style="
-                              border: 1px solid #dedede;
-                              border-radius: 4px;
-                              padding-top: 16px;
-                              margin-bottom: 10px;
-                            "
-                          >
-                            <el-row :gutter="20">
-                              <!-- 汇总录入的时候显示 -->
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
-                                  1
-                                "
-                              >
-                                <el-form-item label="合格数量" required>
-                                  <el-input
-                                    v-model="cur.qualifiedQuantity"
-                                    placeholder="请输入合格数量"
-                                    type="number"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
-                                  1
-                                "
-                              >
-                                <el-form-item label="不合格数量" required>
-                                  <el-input
-                                    v-model="cur.unqualifiedQuantity"
-                                    type="number"
-                                    placeholder="请输入不合格数量"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'
-                                "
-                              >
-                                <el-form-item label="检验值" required>
-                                  <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" @input="inputChange($event,cur)" @blur="inspectionValueInput(item, cur)" />
-                                </el-form-item>
-                              </el-col>
-                              <el-col
-                                :span="12"
-                                v-if="
-                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'
-                                "
-                              >
-                                <el-form-item label="选定集" required>
-                                  <el-select
-                                    v-model="cur.qualitativeCode"
-                                    placeholder="请选择选定集"
-                                    @change="changeQualitativeCode($event, item, cur)"
-                                  >
-                                    <el-option
-                                      v-for="dict in item.selectedProjectRespVOList"
-                                      :key="dict.dictionaryValue"
-                                      :label="dict.dictionaryLabel"
-                                      :value="dict.dictionaryValue"
-                                    />
-                                  </el-select>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="备注">
-                                  <el-input
-                                    v-model="cur.remark"
-                                    placeholder="请输入备注"
-                                    type="text"
-                                    maxlength="200"
-                                  />
-                                </el-form-item>
-                              </el-col>
-                              <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
-                      <el-form-item label="缺陷级别" required>
-                        <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-row>
-                          </div>
-                        </el-col>
-                      </el-row>
-                    </div>
-                  </el-form>
-                </el-collapse-item>
-              </el-collapse>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-      <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
-      </template>
-    </Dialog>
-    <Dialog
-      title="修改名称"
-      v-model="dialogVisibleName"
-      width="500px"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 0px 20px">
-        <el-form ref="nameRef" :model="nameForm">
-          <el-form-item
-            :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
-            prop="name"
-          >
-            <el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
-          </el-form-item>
-        </el-form>
-      </div>
-      <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" />
-      </template>
-    </Dialog>
-    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
-  </div>
-</template>
-<script setup lang="ts">
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { getCurrentInstance } from 'vue'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-import { SearchTable } from '@/components/SearchTable'
-import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
-import * as InspectionRecordDetailPageApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
-
-import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
-const { proxy } = getCurrentInstance()
-
-const message = useMessage() // 消息弹窗
-
-const props = defineProps({
-  // 显示窗口宽度设置
-  basicFormWidth: {
-    type: String,
-    default: ''
-  },
-  // 检验特性表单，列表 相关信息
-  formAllSchemasFeatures: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 检验工序表单，列表 相关信息
-  formAllSchemasProcess: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 检验模板表单，列表 相关信息
-  formAllSchemasMain: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 底部按钮集合
-  footButttondata: {
-    type: Array,
-    required: false,
-    default: null
-  },
-  // 表单，列表 相关信息
-  formAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 校验rules
-  rules: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 包装 列表 相关信息
-  tableAllSchemas: {
-    type: Array,
-    required: true,
-    default: null
-  },
-  tableFormRules: {
-    type: Array,
-    required: true,
-    default: null
-  }
-})
-const { t } = useI18n() // 国际化
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const dialogWidth = ref()
-const formMainRef = ref()
-const formFeaturesRef = ref()
-const formProcessRef = ref()
-const formSchema = ref(props.formAllSchemas?.formSchema)
-const tableAllSchemas = ref(props.tableAllSchemas)
-const tableFormRules = ref(props.tableFormRules)
-const collapseShow = ref(['1','2','3'])
-
-const data = ref({
-  code: '',
-  itemCode: '',
-  version: '',
-  testTypeCode: '',
-  programmeTemplateCode: '',
-  splitRule: '',
-  aql: '',
-  inspectionLevel: '',
-  effectiveDate: '',
-  expirationDate: '',
-  available: 'TRUE',
-  subList: []
-})
-
-const dialogVisibleName = ref(false)
-const nameForm = ref({
-  name: ''
-})
-const nameRef = ref()
-if (props.basicFormWidth) {
-  dialogWidth.value = props.basicFormWidth + '%'
-} else {
-  dialogWidth.value = props.isBusiness ? '60%' : '40%'
-}
-const rules = ref({
-  ...props.rules,
-  'inspectionJobCharacteristicsUpdateReqVO.description': [
-    { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [
-    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateCode': [
-    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.inspectionMethod': [
-    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod': [
-    { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.featureType': [
-    { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyTarget': [
-    { required: true, message: '请输入目标值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyCapping': [
-    { required: true, message: '请输入上限值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit': [
-    { required: true, message: '请输入下限值', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyUom': [
-    { required: true, message: '请选择计量单位', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyDecimal': [
-    { required: true, message: '请输入小数位', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [
-    { required: true, message: '请选择集编码', trigger: 'change' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.estimateCode': [
-    { required: true, message: '请选择评估代码', trigger: 'blur' }
-  ],
-  'inspectionJobCharacteristicsUpdateReqVO.sampleQty': [
-    { required: true, message: '请输入样品份数', trigger: 'blur' }
-  ],
-  qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }]
-})
-const allSamplePieceSize = ref(0)
-/** 打开弹窗 */
-let tabIndex = 1
-const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
-  if (titleName) {
-    dialogTitle.value = t('action.' + titleName)
-  } else {
-    dialogTitle.value = t('action.' + type)
-  }
-  formType.value = type
-  allSamplePieceSize.value = 0 //打开时候归0
-  if (row) {
-    data.value = JSON.parse(JSON.stringify(row))
-    //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
-    let list = []
-    const masterId = row.id
-    list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id)
-    data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(
-      masterId
-    )
-    list.forEach((item, index) => {
-      editableTabsValue.value = 1
-      item.name = index + 1
-      item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionRecordCharacteristicsRespVO
-      item.isPass = '' //判断是否显示对号错误图标
-      // 总数量值是 样品份数 乘 每份样品量
-      allSamplePieceSize.value += parseFloat(
-        (
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
-        ).toFixed(6)
-      )
-      // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList =
-        item.inspectionRecordCharacteristicsRespVO.featureType == 1
-          ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList
-          : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList
-      if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
-        // 单个录入时
-        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) {
-          // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-          for (
-            let i = 0;
-            i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty);
-            i++
-          ) {
-            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-              inspectionValue: '', //检验值
-              qualitativeCode: '', //定性字典项值
-              defectLevel: '', //缺陷级别
-              qualifiedQuantity: '', //合格数量
-              unqualifiedQuantity: '' //不合格数量
-            })
-          }
-        } else {
-          // 汇总录入时
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-            inspectionValue: '', //检验值
-            qualitativeCode: '', //定性字典项值
-            defectLevel: '', //缺陷级别
-            qualifiedQuantity: parseFloat(
-              (
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
-              ).toFixed(6)
-            ), //合格数量
-            unqualifiedQuantity: '0' //不合格数量
-          })
-        }
-      }
-
-      // 编辑判断上限下限目标值是否必填
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
-      }
-      if (item.samplingProcessRespVO.evaluationMode == 1) {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = true
-      } else {
-        rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false
-      }
-    })
-    list.forEach((item) => {
-      item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime = new Date()
-    })
-    data.value.subList = list
-    /**
-        设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，
-        第一个包装采样数量>总数量 则显示总数量
-      */
-
-    for (let i = 0; i < data.value?.packageList?.length; i++) {
-      if (data.value.packageList[i].sampleAmount == null) {
-        if (allSamplePieceSize.value > data.value.packageList[i].amount) {
-          data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
-          allSamplePieceSize.value = parseFloat(
-            (allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(6)
-          )
-        } else {
-          data.value.packageList[i].sampleAmount = allSamplePieceSize.value
-          allSamplePieceSize.value = 0
-          // return;
-        }
-      }
-    }
-    // data.value.packageList.forEach(item=>{
-
-    // })
-    dialogVisible.value = true
-    nextTick(() => {
-      formMainRef.value.setValues(row)
-    })
-  } else {
-    data.value = {
-      code: '',
-      itemCode: '',
-      version: '',
-      testTypeCode: '',
-      programmeTemplateCode: '',
-      splitRule: '',
-      aql: '',
-      inspectionLevel: '',
-      effectiveDate: '',
-      expirationDate: '',
-      available: 'TRUE',
-      subList: []
-    }
-  }
-  dialogVisible.value = true
-  tabIndex = data.value.subList.length + 1
-}
-defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
-import type { TabPaneName } from 'element-plus'
-
-const editableTabsValue = ref(1)
-// const editableTabs = ref([])
-const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => {
-  if (action === 'add') {
-    nameForm.value.name = ''
-    dialogVisibleName.value = true
-  } else if (action === 'remove') {
-    const tabs = data.value.subList
-    let activeName = editableTabsValue.value
-    if (activeName === targetName) {
-      tabs.forEach((tab, index) => {
-        if (tab.name === targetName) {
-          const nextTab = tabs[index + 1] || tabs[index - 1]
-          if (nextTab) {
-            activeName = nextTab.name
-          }
-        }
-      })
-    }
-    editableTabsValue.value = activeName
-    data.value.subList = tabs.filter((tab) => tab.name !== targetName)
-  }
-}
-/** 修改名称时间 */
-const buttonBaseClick1 = async (val) => {
-  // 保存
-  if (val == 'save') {
-    if (!nameRef.value) return
-    nameRef.value.validate((valid, fields) => {
-      if (valid) {
-        const newTabName = `${++tabIndex}`
-        data.value.subList.push({
-          description: nameForm.value.name,
-          name: newTabName,
-          inspectionCode: '',
-          sequenceCode: '',
-          inspectionCharCode: '',
-          inspectionJobCharacteristicsUpdateReqVO: {
-            describe: '',
-            inspectionMethodCode: '',
-            dynamicUpdateCode: '',
-            inspectionMethod: '',
-            isCanUpdate: '',
-            isDestructionInspection: '',
-            resultEntryMethod: '',
-            featureType: '',
-            quantifyIsCapping: '',
-            quantifyIsLowlimit: '',
-            quantifyIsTarget: '',
-            quantifyTarget: '',
-            quantifyCapping: '',
-            quantifyLowlimit: '',
-            quantifyUom: '',
-            quantifyDecimal: '',
-            quantifyQuantifyCode: ''
-          }
-        })
-
-        editableTabsValue.value = newTabName
-        dialogVisibleName.value = false
-      } else {
-        return false
-      }
-    })
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisibleName.value = false
-  }
-}
-const buttonBaseClick = async (val) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
-    dialogVisible.value = false
-  }
-  // 暂存
-  // else if (val == 'staging') {
-  //   staging()
-  // }
-}
-// 传递给父类
-const emit = defineEmits(['submitForm', 'searchTableSuccess'])
-const validateForm = (formRef) => {
-  let _lists = formRef?.map((v) => v.validate())
-  return Promise.all(_lists)
-    .then(() => {
-      return true
-    })
-    .catch(() => {
-      return false
-    })
-}
-const tableFormRef = ref()
-const submitForm = async () => {
-  try {
-    const elForm = unref(formMainRef)?.getElFormRef()
-    // 校验表单
-    if (!elForm) return
-    const valid = await elForm.validate()
-    if (!valid) return
-    // 校验包装列表
-    if (data.value.packageList?.length > 0) {
-      const validateForm1 = await tableFormRef.value.validateForm()
-      if (!validateForm1) return
-      let isPass = data.value.packageList.some(
-        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
-      )
-      if (isPass) {
-        message.error(`采样数量不能大于数量`)
-        return
-      }
-
-      // let number = 0
-      // data.value.packageList.forEach(cur=>{
-      //   number += parseFloat(cur.sampleAmount)
-      // })
-      // number = number.toFixed('2')
-      // if(number != data.value.sampleTotalAmount){
-      //   message.error(`采样数量之和必须等于采样总数量`)
-      //   return
-      // }
-    }
-
-    const bol2 = await validateForm(formFeaturesRef.value)
-    if (!bol2) {
-      message.error(`模板中有检验工序和检验特性未填写完全`)
-      return
-    }
-    // 判断数组是否有未填的选项
-    let arrBol = []
-    let isOutweigh = [] //结束时间是否大于开始时间
-    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
-    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
-    data.value.subList.forEach((item, index) => {
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.inspectionValue
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.qualitativeCode
-            }
-          )
-        )
-      }
-      // 开始时间大于结束时间放入数组中
-      if (
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-      ) {
-        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
-      }
-      // 合格数量和不合格数量之和不能是小数
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        parseFloatList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
-                String(cur.unqualifiedQuantity).indexOf('.') > -1
-              )
-            }
-          )
-        )
-        // 合格数量和不合格数量之和不等于总数量
-        numberList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              )
-            }
-          )
-        )
-      }
-    })
-    let isEmpty1 = arrBol.some((item) => item == true)
-    let isEmptyNumberList = numberList.some((item) => item == true)
-    let isParseFloat = parseFloatList.some((item) => item == true)
-    if (isEmpty1) {
-      message.error('检验工序和检验特性有字段未填写完全')
-      return
-    }
-    // if (isOutweigh?.length > 0) {
-    //   message.error('检验特性中有开始时间大于结束时间')
-    //   return
-    // }
-    if (isParseFloat) {
-      message.error('合格数量和不合格数量之和不可以是小数')
-      return
-    }
-    if (isEmptyNumberList) {
-      message.error('合格数量和不合格数量之和必须等于样品份数')
-      return
-    }
-    data.value.id = data.value.jobId || data.value.id
-    if (formType.value == 'create') {
-      // 主子表——提交请求
-      emit('submitForm', formType.value, data.value)
-    } else {
-      // 编辑/执行
-      emit('submitForm', formType.value, data.value)
-    }
-  } catch {}
-}
-
-const staging = async () => {
-  try {
-    const elForm = unref(formMainRef)?.getElFormRef()
-    // 校验表单
-    if (!elForm) return
-    const valid = await elForm.validate()
-    if (!valid) return
-    // 校验包装列表
-
-    if (data.value.packageList?.length > 0) {
-      const validateForm1 = await tableFormRef.value.validateForm()
-      if (!validateForm1) return
-      let isPass = data.value.packageList.some(
-        (cur) => parseFloat(cur.sampleAmount) > parseFloat(cur.amount)
-      )
-      if (isPass) {
-        message.error(`采样数量不能大于数量`)
-        return
-      }
-      // let number = 0
-      // data.value.packageList.forEach(cur=>{
-      //   number += parseFloat(cur.sampleAmount)
-      // })
-      // number = number.toFixed('2')
-      // if(number != data.value.sampleTotalAmount){
-      //   message.error(`采样数量之和必须等于采样总数量`)
-      //   return
-      // }
-    }
-
-    const bol2 = await validateForm(formFeaturesRef.value)
-    if (!bol2) {
-      message.error(`模板中有检验工序和检验特性未填写完全`)
-      return
-    }
-    // 判断数组是否有未填的选项
-    let arrBol = []
-    let isOutweigh = [] //结束时间是否大于开始时间
-    let numberList = [] //判断合格数量和不合格数量之和是否等于主表数量
-    let parseFloatList = [] //判断合格数量和不合格数量是否是整数
-    data.value.subList.forEach((item, index) => {
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.inspectionValue
-            }
-          )
-        )
-      }
-      if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-        arrBol.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return !cur.qualitativeCode
-            }
-          )
-        )
-      }
-      // 开始时间大于结束时间放入数组中
-      if (
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >
-        item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
-      ) {
-        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
-      }
-      // 合格数量和不合格数量之和不能是小数
-      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        parseFloatList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                String(cur.qualifiedQuantity).indexOf('.') > -1 ||
-                String(cur.unqualifiedQuantity).indexOf('.') > -1
-              )
-            }
-          )
-        )
-        // 合格数量和不合格数量之和不等于总数量
-        numberList.push(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-            (cur, key) => {
-              return (
-                parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              )
-            }
-          )
-        )
-      }
-    })
-    let isEmpty1 = arrBol.some((item) => item == true)
-    let isEmptyNumberList = numberList.some((item) => item == true)
-    let isParseFloat = parseFloatList.some((item) => item == true)
-    if (isEmpty1) {
-      message.error('检验工序和检验特性有字段未填写完全')
-      return
-    }
-    // if (isOutweigh?.length > 0) {
-    //   message.error('检验特性中有开始时间大于结束时间')
-    //   return
-    // }
-    if (isParseFloat) {
-      message.error('合格数量和不合格数量之和不可以是小数')
-      return
-    }
-    if (isEmptyNumberList) {
-      message.error('合格数量和不合格数量之和必须等于样品份数')
-      return
-    }
-    await InspectionJobMainApi.stagingInspectionJobMain(data.value)
-    message.success('暂存成功')
-  } catch {}
-}
-
-/** 弹窗按钮 */
-let Butttondata: any = []
-if (props.footButttondata) {
-  Butttondata = props.footButttondata
-} else {
-  Butttondata = [
-    // defaultButtons.formStagingBtn(null), // 暂存
-    defaultButtons.formSaveBtn(null), // 保存
-    defaultButtons.formCloseBtn(null) // 关闭
-  ]
-}
-// 选择特征类型
-const changeFeatureType = (e) => {
-  // if (e) {
-  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = true
-  // } else {
-  //   rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = false
-  // }
-}
-const searchTableRef = ref()
-const opensearchTable = (
-  formField,
-  searchField,
-  searchTitle,
-  searchAllSchemas,
-  searchPage,
-  searchCondition,
-  multiple,
-  type,
-  row
-) => {
-  const _searchCondition = {}
-  // 判断查询条件中，是否存在指向主表的数据
-  if (searchCondition && searchCondition.length > 0) {
-    // 转换筛选条件所需
-    let filters: any[] = []
-    for (var i = 0; i < searchCondition.length; i++) {
-      // searchCondition.forEach((item) => {
-      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
-      if (searchCondition[i].isMainValue) {
-        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
-          ? formRef.value.formModel[searchCondition[i].value]
-          : props.detailData
-          ? props.detailData[searchCondition[i].value]
-          : row
-          ? row[searchCondition[i].value]
-          : ''
-        // 是否含有空参数情况
-        let isNull = false
-        if (
-          _searchCondition[searchCondition[i].key] == '' ||
-          _searchCondition[searchCondition[i].key] == undefined
-        ) {
-          isNull = true
-        }
-        if (isNull) {
-          message.warning(
-            searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
-          )
-          return
-        }
-      } else {
-        // 扩展 转换为筛选条件进行查询
-        if (searchCondition[i].isSearch) {
-          filters.push({
-            action: searchCondition[i].action,
-            column: searchCondition[i].key,
-            value: searchCondition[i].value
-          })
-        } else {
-          _searchCondition[searchCondition[i].key] = searchCondition[i].value
-        }
-      }
-    }
-    if (filters.length > 0) {
-      _searchCondition.isSearch = true
-      _searchCondition.filters = filters
-    }
-  }
-  const _searchTableTitle = searchTitle
-  const _searchTableAllSchemas = searchAllSchemas
-  const _searchTablePage = searchPage
-  searchTableRef.value.open(
-    _searchTableTitle,
-    _searchTableAllSchemas,
-    _searchTablePage,
-    formField,
-    searchField,
-    multiple,
-    type,
-    row,
-    _searchCondition
-  )
-}
-// 弹层确定返回所选数据
-// val ： 弹层列表row 数据
-const searchTableSuccess = async (formField, searchField, val, type, row) => {
-  if (type == 'features') {
-    row.inspectionJobCharacteristicsUpdateReqVO[formField] = val[0].code
-    if (formField == 'inspectionMethodCode') {
-      row.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName = val[0].description
-    } else if (formField == 'dynamicUpdateCode') {
-      row.inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateName = val[0].description
-    } else if (formField == 'inspectionMethod') {
-      row.inspectionJobCharacteristicsUpdateReqVO.inspectionName = val[0].description
-    }
-  } else if (type == 'main') {
-    data.value[formField] = val[0].code
-    if (formField == 'itemCode') {
-      data.value.itemName = val[0].name
-    } else if (formField == 'testTypeCode') {
-      data.value.testTypeName = val[0].description
-    } else if (formField == 'programmeTemplateCode') {
-      data.value.programmeTemplateName = val[0].description
-    }
-    if (formField == 'programmeTemplateCode') {
-      let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
-      list.forEach((item, index) => {
-        editableTabsValue.value = index + 1
-        item.name = index + 1
-        // 编辑判断上限下限目标值是否必填
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
-            false
-        }
-        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
-        } else {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
-        }
-      })
-      data.value.subList = list
-    }
-  }
-
-  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
-}
-// 请选择结果录入方式
-const resultEntryMethodChange = (e, item) => {
-  item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-  if (e == 0) {
-    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-    for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-        inspectionValue: '', //检验值
-        qualitativeCode: '', //定性字典项值
-        defectLevel: '', //缺陷级别
-        qualifiedQuantity: '', //合格数量
-        unqualifiedQuantity: '' //不合格数量
-      })
-    }
-  } else {
-    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [
-      {
-        inspectionValue: '', //检验值
-        qualitativeCode: '', //定性字典项值
-        defectLevel: '', //缺陷级别
-        qualifiedQuantity: '', //合格数量
-        unqualifiedQuantity: '' //不合格数量
-      }
-    ]
-  }
-}
-// 选择选定级
-const changeQualitativeCode = (e, item, cur) => {
-  let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e)
-  cur.defectLevel = obj.defectLevel
-  cur.estimateCode = obj.estimateCode
-  // 显示图标
-  for (
-    let i = 0;
-    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList?.length;
-    i++
-  ) {
-    item.isPass = true
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].estimateCode ==
-      '2'
-    ) {
-      item.isPass = false
-      return
-    }
-  }
-}
-const mianscroll = ref()
-const boxList = ref()
-
-// const topScrollClick = () => {
-//   nextTick(() => {
-//     mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
-//   })
-// }
-const inputChange = (val,cur) => {
-  cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '')
-}
-const inspectionValueInput = (item, cur) => {
-  for (
-    let i = 0;
-    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
-    i++
-  ) {
-    item.isPass = true
-    //  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标
-    if (
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
-        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
-          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      item.isPass = false
-      return
-    }
-    // 如果上限值和下限值,目标值存在 大于上限并且小于下限值显示红色图标
-    if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-        .inspectionValue &&
-      (parseFloat(
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
-      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-    ) {
-      console.log(parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ))
-      console.log( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-      console.log( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping))
-      console.log(333)
-      item.isPass = false
-      return
-    }
-  }
-}
-</script>
-<style scoped>
-.small-title {
-  font-weight: bold;
-  padding: 0px 10px 10px;
-  color: #1a8bfc;
-  font-size: 16px;
-}
-.tabs-box {
-  max-height: calc(80vh - 40px);
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-</style>
-<style>
-.el-tabs--left .el-tabs__header.is-left {
-  padding-bottom: 5000px;
-  margin-bottom: -5000px;
-  min-width: 150px !important;
-}
-
-.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
-  min-width: 120px !important;
-}
-.el-backtop {
-  position: absolute !important;
-}
-.red .el-input__inner {
-  color: red !important;
-}
-</style>
diff --git a/src/views/qms/inspectionRecordPurchase/detail.vue b/src/views/qms/inspectionRecordPurchase/detail.vue
deleted file mode 100644
index 4b27eddbf..000000000
--- a/src/views/qms/inspectionRecordPurchase/detail.vue
+++ /dev/null
@@ -1,402 +0,0 @@
-<template>
-  <div>
-    <el-drawer
-      v-model="isShowDrawer"
-      title="详情"
-      direction="rtl"
-      size="80%"
-      v-loading="detailLoading"
-    >
-      <template #header>
-        <div class="font-size-18px">
-          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
-        </div>
-      </template>
-      <ContentWrap v-if="!isBasic">
-        <Descriptions
-          :data="data"
-          labelClassName="label-class-name"
-          label-align="left"
-          direction="vertical"
-          :column="8"
-          :schema="allSchemas.detailSchema"
-          :columns="2"
-          width="200px"
-        />
-      </ContentWrap>
-      <ContentWrap>
-        <el-tabs
-          v-model="editableTabsValue"
-          class="demo-tabs"
-          type="border-card"
-          tab-position="left"
-          :stretch="false"
-        >
-          <el-tab-pane
-            v-for="item in data.subList"
-            :key="item.name"
-            :label="item.processDescribe"
-            :name="item.name"
-          >
-            <div class="small-title">检验工序</div>
-            <el-form :model="item" label-width="auto" ref="formProcessRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码" prop="processCode">
-                    <el-input v-model="item.processCode" placeholder="根据系统生成" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="processDescribe">
-                    <el-input v-model="item.processDescribe" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="顺序号" prop="sequenceCode">
-                    <el-input v-model="item.sequenceCode" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div class="small-title">检验特性</div>
-            <el-form :model="item" label-width="auto"  ref="formFeaturesRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码">
-                    <el-input
-                      v-model="item.inspectionRecordCharacteristicsRespVO.number"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="inspectionRecordCharacteristicsRespVO.description">
-                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.description"  :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="检验方法"
-                    prop="inspectionRecordCharacteristicsRespVO.inspectionMethodCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionRecordCharacteristicsRespVO.inspectionMethodName"
-                        disabled
-                        placeholder="请输入检验方法"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="采样过程"
-                    prop="inspectionRecordCharacteristicsRespVO.inspectionMethod"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionRecordCharacteristicsRespVO.samplingProcessName"
-                        disabled
-                        placeholder="请输入采样过程"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="采样过程编码" prop="inspectionRecordCharacteristicsRespVO.samplingProcessCode">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionRecordCharacteristicsRespVO.samplingProcessName" disabled placeholder="请选择采样过程编码" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="样品份数" prop="inspectionRecordCharacteristicsRespVO.sampleQty">
-                    <div style="display: flex; width: 100%">
-                      <el-input v-model="item.inspectionRecordCharacteristicsRespVO.sampleQty" disabled placeholder="请输入样品份数" />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="12">
-                  <el-form-item
-                    label="动态修改规则编码"
-                    prop="inspectionRecordCharacteristicsRespVO.dynamicUpdateCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionRecordCharacteristicsRespVO.dynamicUpdateName"
-                        disabled
-                        placeholder="请输入动态修改规则编码"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="12">
-                  <el-form-item
-                    label="是否允许修改特征值"
-                    prop="inspectionRecordCharacteristicsRespVO.isCanUpdate"
-                  >
-                    <el-switch
-                      v-model="item.inspectionRecordCharacteristicsRespVO.isCanUpdate"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="结果录入方式"
-                    prop="inspectionRecordCharacteristicsRespVO.resultEntryMethod"
-                  >
-                    <el-select
-                      v-model="item.inspectionRecordCharacteristicsRespVO.resultEntryMethod"
-                      placeholder="请选择结果录入方式"
-                      @change="resultEntryMethodChange($event,item)"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="特征类型" prop="inspectionRecordCharacteristicsRespVO.featureType">
-                    <el-select
-                      v-model="item.inspectionRecordCharacteristicsRespVO.featureType"
-                      placeholder="请选择特征类型"
-                      @change="changeFeatureType"
-                      disabled
-                    >
-                      <el-option v-for="dict in getStrDictOptions( DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col> 
-                <el-col :span="12">
-                  <el-form-item label="开始时间" prop="inspectionRecordCharacteristicsRespVO.inspectionStartTime">
-                    <el-date-picker
-                      v-model="item.inspectionRecordCharacteristicsRespVO.inspectionStartTime"
-                      type="datetime"
-                      placeholder="请选择开始时间"
-                      style="width: 100%"
-                      value-format="x"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="结束时间" prop="inspectionRecordCharacteristicsRespVO.inspectionEndTime">
-                    <el-date-picker
-                      v-model="item.inspectionRecordCharacteristicsRespVO.inspectionEndTime"
-                      type="datetime"
-                      placeholder="请选择结束时间"
-                      style="width: 100%"
-                      value-format="x"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                <el-form-item label="计量单位" prop="inspectionRecordCharacteristicsRespVO.quantifyUom" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0" >
-                  <el-select v-model="item.inspectionRecordCharacteristicsRespVO.quantifyUom" placeholder="请选择计量单位" disabled >
-                    <el-option v-for="dict in getStrDictOptions(DICT_TYPE.UOM)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="小数位" prop="inspectionRecordCharacteristicsRespVO.quantifyDecimal" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0" >
-                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyDecimal" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0">
-                  <el-form-item label="是否设定上限" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" >
-                    <el-switch v-model="item.inspectionRecordCharacteristicsRespVO.quantifyIsCapping" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0">
-                  <el-form-item prop="inspectionRecordCharacteristicsRespVO.quantifyIsLowlimit" label="是否设定下限" >
-                    <el-switch v-model="item.inspectionRecordCharacteristicsRespVO.quantifyIsLowlimit" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item prop="inspectionRecordCharacteristicsRespVO.quantifyIsTarget" label="是否设定目标值" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0" >
-                    <el-switch v-model="item.inspectionRecordCharacteristicsRespVO.quantifyIsTarget" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0 && item.inspectionRecordCharacteristicsRespVO.quantifyIsCapping">
-                  <el-form-item  label="上限值" prop="inspectionRecordCharacteristicsRespVO.quantifyCapping" >
-                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyCapping" type="number" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0 && item.inspectionRecordCharacteristicsRespVO.quantifyIsLowlimit">
-                  <el-form-item label="下限值" prop="inspectionRecordCharacteristicsRespVO.quantifyLowlimit" >
-                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyLowlimit" type="number" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12"  v-if="item.inspectionRecordCharacteristicsRespVO.featureType == 0 && item.inspectionRecordCharacteristicsRespVO.quantifyIsTarget">
-                  <el-form-item label="目标值"  prop="inspectionRecordCharacteristicsRespVO.quantifyTarget" >
-                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.quantifyTarget" type="number" disabled/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" >
-                  <el-form-item label="评估代码">
-                    <el-select v-model="item.inspectionRecordCharacteristicsRespVO.estimateCode" placeholder="请选择评估代码" disabled>
-                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)" :key="dict.value" :label="dict.label" :value="dict.value" disabled/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-for="(cur, i) in item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList" :key="i" style="border: 1px solid #dedede; border-radius: 4px; padding-top: 16px; margin-bottom: 10px;">
-                  <el-row>
-                    <!-- 汇总录入的时候显示 -->
-                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.resultEntryMethod == 1">
-                      <el-form-item label="合格数量">
-                        <el-input v-model="cur.qualifiedQuantity" placeholder="请输入合格数量"  type="number" disabled/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.resultEntryMethod == 1">
-                      <el-form-item label="不合格数量">
-                        <el-input v-model="cur.unqualifiedQuantity" type="number" placeholder="请输入不合格数量" disabled/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == '0'">
-                      <el-form-item label="检验值">
-                        <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" type="number" disabled/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" v-if="item.inspectionRecordCharacteristicsRespVO.featureType == '1'">
-                      <el-form-item label="选定集">
-                          <el-select
-                          v-model="cur.qualitativeCode"
-                          placeholder="请选择选定集"
-                          disabled
-                        >
-                          <el-option
-                            v-for="dict in item.selectedProjectRespVOList"
-                            :key="dict.dictionaryValue"
-                            :label="dict.dictionaryLabel"
-                            :value="dict.dictionaryValue"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                    <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-row>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-tab-pane>
-        </el-tabs>
-      </ContentWrap>
-    </el-drawer>
-   
-  </div>
-</template>
-
-<script lang="ts" setup>
-import * as InspectionRecordDetailPageApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-
-defineOptions({ name: 'InspectionRecordDetail' })
-
-const editableTabsValue = ref('1')
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const updateKey = ref(0)
-
-const props = defineProps({
-  // 表单，列表 相关信息
-  allSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 明细列表相关信息
-  detailAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 详情列表扩展操作按钮
-  buttondataTable: {
-    type: Array,
-    required: false,
-    default: ()=>{
-      return []
-    }
-  },
-})
-const isShowDrawer = ref(false)
-const detailLoading = ref(false)
-const data = ref({
-  code: '',
-  itemCode: '',
-  version: '',
-  testTypeCode: '',
-  programmeTemplateCode: '',
-  splitRule: '',
-  aql: '',
-  inspectionLevel: '',
-  effectiveDate: '',
-  expirationDate: '',
-  available: 'TRUE',
-  subList: []
-})
-
-/** 打开弹窗 */
-const formRef = ref()
-const titleNameRef = ref()
-const titleValueRef = ref()
-const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
-  titleNameRef.value = titleName
-  titleValueRef.value = titleValue
- 
-  isShowDrawer.value = true
-  if (row) {
-    detailLoading.value = true
-    try {
-      data.value = row
-      let list = []
-      list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id)
-      list.forEach((item, index) => {
-      editableTabsValue.value = index + 1
-        item.name = index + 1
-        item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList = item.inspectionRecordCharacteristicsRespVO.featureType == 1 ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList
-      })
-      data.value.subList = list
-    } finally {
-      detailLoading.value = false
-    }
-  }
-}
-defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
-
-
-</script>
-<style lang="scss">
-.el-drawer__body {
-  background: #f5f5f5 !important;
-}
-
-::v-deep(.label-class-name) {
-  color: #dedede;
-}
-</style>
-<style scoped lang="scss"></style>
diff --git a/src/views/qms/inspectionRecordPurchase/index.vue b/src/views/qms/inspectionRecordPurchase/index.vue
deleted file mode 100644
index 652820c96..000000000
--- a/src/views/qms/inspectionRecordPurchase/index.vue
+++ /dev/null
@@ -1,450 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search
-      :schema="InspectionRecordMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="InspectionRecordMain.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>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <UseAddForm
-    ref="formRef"
-    basicFormWidth="80"
-    :tableAllSchemas="InspectionRecordPackage.allSchemas"
-    :tableFormRules="InspectionRecordPackageRules"
-    :rules="InspectionRecordUserRules"
-    :formAllSchemas="InspectionRecordUser.allSchemas"
-    @submitForm="submitForm"
-  />
-
-  <!-- 新增  -->
-  <AddForm
-    ref="basicFormRef"
-    basicFormWidth="80"
-    :formAllSchemas="InspectionRecordMain.allSchemas"
-    :tableAllSchemas="InspectionJobPackage.allSchemas"
-    :tableFormRules="InspectionJobPackageRules"
-    :rules="InspectionTemplateRules"
-    @submitForm="submitFormExecute"
-  />
-
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="InspectionRecordMain.allSchemas"
-    :detailAllSchemas="InspectionRecordDetail.allSchemas"
-    :detailAllSchemasRules="InspectionRecordDetailRules"
-    :apiCreate="InspectionRecordDetailApi.createInspectionRecordDetail"
-    :apiUpdate="InspectionRecordDetailApi.updateInspectionRecordDetail"
-    :apiPage="InspectionRecordDetailApi.getInspectionRecordDetailPage"
-    :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="false"
-    :detailButtonIsShow="true"
-  />
-  <!-- 包装信息 -->
-  <ListTable
-    ref="listTableRef"
-    titleName="包装信息"
-    :allSchemas="InspectionRecordMain.allSchemas"
-    :detailAllSchemas="InspectionRecordPackage.allSchemas"
-    :detailAllSchemasRules="InspectionRecordPackageRules"
-    :list="list"
-  />
-    <el-dialog
-      v-model="showQualityReport"
-      :title="t('质检明细')"
-      :append-to-body="false"
-      destroy-on-close
-      fullscreen
-    >
-    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
-  </el-dialog>
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import {
-  InspectionRecordMain,
-  InspectionRecordMainRules,
-  InspectionRecordDetail,
-  InspectionRecordDetailRules,
-  InspectionRecordPackage,
-  InspectionRecordPackageRules,
-  InspectionRecordUser,
-  InspectionRecordUserRules
-} from './inspectionRecordMain.data'
-// import { InspectionJobPackage,InspectionJobPackageRules} from '../inspectionJob/inspectionJobMain.data'
-import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
-import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
-import * as InspectionRecordDetailApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import ListTable from '@/components/ListTable/src/ListTable.vue'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import UseAddForm from './useAddForm.vue'
-import AddForm from './addForm.vue'
-import Detail from './detail.vue'
-import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-import { getReportUrl } from '@/utils/systemParam'
-
-import {
-  InspectionJobMain,
-  InspectionJobMainRules,
-  InspectionJobDetail,
-  InspectionJobDetailRules,
-  InspectionJobPackage,
-  InspectionJobPackageRules
-} from '../inspectionJob/inspectionJobMain.data'
-
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-
-// 采购订单
-defineOptions({ name: 'inspectionRecordMain' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(InspectionRecordMain.allSchemas.tableColumns)
-if (routeName.value == 'InspectRecordMain') {
-  tableColumns.value = tableColumns.value.filter((item) => {
-    return item.label != '操作'
-  })
-}
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  if (routeName.value == 'InspectRecordMain') {
-    tableColumns.value = val.filter((item) => {
-      return item.label != '操作'
-    })
-  } else {
-    tableColumns.value = val
-  }
-}
-
-// 子表新增的时候选择表格之后需要会显得字段
-const { tableObject, tableMethods } = useTable({
-  getListApi: InspectionRecordMainApi.getInspectionRecordMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-let HeadButttondata = [
-  defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-recode-main:export' }), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null) // 设置
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') {
-    // 新增
-    openForm('create')
-  } else if (val == 'import') {
-    // 导入
-    handleImport()
-  } else if (val == 'export') {
-    // 导出
-    handleExport()
-  } else if (val == 'refresh') {
-    // 刷新
-    getList()
-  } else if (val == 'filtrate') {
-    // 筛选
-  } else {
-    // 其他按钮
-    console.log('其他按钮', item)
-  }
-}   
-
-const isShowMainButton = (row, val) => {
-  if (!row.callbackRequestNumber) {
-    //callbackRequestNumber为空是手工创建订单，不需要使用决策和发布
-    return true
-  }
-  if (row.useDecision) {
-    return row.isPublished
-  } else {
-    return val ? true : false
-  }
-}
-const isShowEditBtn = (row, val) => {
-  if (val.indexOf(row.inspectionType) > -1) {
-    return true
-  } else {
-    return row.useDecision
-  }
-}
-const isShowPackageBtn = (row, val) => {
-  if (val.indexOf(row.inspectionType) > -1) {
-    return true
-  } else {
-    return false
-  }
-}
-// 列表-操作按钮
-const butttondata = (row) => {
-  return [
-    // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
-    defaultButtons.mainApplyDecisionBtn({
-      hide: isShowMainButton(row, null),
-      hasPermi: 'qms:inspection-recode-main:edit'
-    }), // 使用决策
-    // defaultButtons.mainListDeleteBtn(null), // 删除
-    defaultButtons.mainListOrderPubBtn({
-      hide: isShowMainButton(row, 'publish'),
-      hasPermi: 'qms:inspection-recode-main:pub'
-    }), // 发布
-    defaultButtons.mainListPackageBtn({ hide: isShowPackageBtn(row, ['11']) }), // 包装
-    // defaultButtons.mainListJobExeBtn({
-    // hide:row.useDecision,
-    // hasPermi: 'qms:inspection-recode-main:execute',
-    //  }), // 执行
-    defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), // 编辑
-    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
-  ]
-}
-
-const listTableRef = ref()
-const list = ref([])
-const useDecisionList = getStrDictOptions(DICT_TYPE.USAGE_DECISION)
-// const useDecisionList = InspectionRecordMain.allSchemas.formSchema.filter(item=>item.field == "useDecision")
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'applyDecision') {
-    // 编辑
-    // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
-    if (row.estimateCode == 1) {
-      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
-        if (itemColumn.field == 'useDecision') {
-          itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1)
-        }
-      })
-    } else if (row.estimateCode == 2) {
-      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
-        if (itemColumn.field == 'useDecision') {
-          itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1)
-        }
-      })
-    }
-    openUseForm('update', row)
-  } else if (val == 'mainPackage') {
-    // 包装
-    list.value = await InspectionRecordPackageApi.getInspectionRecordPackageList(row.id)
-    list.value.forEach((item) => {
-      item.qualifiedAmount = item.qualifiedAmount ? item.qualifiedAmount : 0
-      item.noQualifiedAmount = item.noQualifiedAmount ? item.noQualifiedAmount : 0
-      item.destroyAmount = item.destroyAmount ? item.destroyAmount : 0
-      item.frozenAmount = item.frozenAmount ? item.frozenAmount : 0
-    })
-    // row.status = '1'
-    listTableRef.value.openPackage(row, '包装信息', InspectionRecordPackage.allSchemas.tableColumns)
-  } else if (val == 'delete') {
-    // 删除
-    handleDelete(row.id)
-  } else if (val == 'mainOrderPub') {
-    //发布
-    handleOrderPub(row)
-  }else if (val == 'mainPlanCheckQualityReport') {
-    // 查看质检报告
-    checkQualityReport(row)
-  } else if (val == 'edit') {
-    //修改
-    // 执行
-    execute('execute', row)
-  }
-}
-
-// 查看质检报告
-const reportHeight = ref(window.innerHeight - 120)
-const showQualityReport = ref(false)
-const qualityReport = ref('')
-const checkQualityReport = async (row) => {
-  showQualityReport.value = true
-  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
-}
-/** 添加/修改操作 */
-const basicFormRef = ref()
-// const openForm = async (type : string, row ?: number) => {
-//   tableData.value = [] // 重置明细数据
-//   basicFormRef.value.open(type, row)
-// }
-/** 使用决策操作操作 */
-const formRef = ref()
-const openUseForm = async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  formRef.value.open(type, row)
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionRecordMain')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await InspectionRecordMainApi.deleteInspectionRecordMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-/** 发布按钮操作 */
-const handleOrderPub = async (row: object) => {
-  try {
-    // 删除的二次确认
-    await message.confirm(t('common.confirmPublish'))
-    // 发起删除
-    await InspectionRecordMainApi.publishInspectionRecordMain(row.id)
-    message.success(t('common.publishSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-//执行
-
-const execute = async (type: string, row?: number) => {
-  basicFormRef.value.open(type, row)
-}
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
-    download.excel(data, '采购检验记录.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/**
- * tableForm方法
- */
-const tableFormKeys = {}
-InspectionRecordDetail.allSchemas.tableFormColumns.forEach((item) => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
-
-//   // 主子数据 提交
-const submitForm = async (formType, data) => {
-  // data.subList = tableData.value // 拼接子表数据参数
-  try {
-    if (formType === 'create') {
-      await InspectionRecordMainApi.createInspectionRecordMain(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await InspectionRecordMainApi.updateInspectionRecordMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = false
-  }
-}
-// 执行
-const submitFormExecute = async (formType, data) => {
-  // return
-  console.log(formType, data)
-  data.status = '2'
-  try {
-    basicFormRef.value.formLoading = true
-    if (formType === 'create') {
-      await InspectionJobMainApi.createInspectionJobMain(data)
-      message.success(t('common.createSuccess'))
-    } else if (formType === 'execute') {
-      await InspectionRecordMainApi.executeInspectionRecordMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    basicFormRef.value.dialogVisible = false
-    basicFormRef.value.formLoading = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    basicFormRef.value.formLoading = false
-  }
-}
-
-// 筛选提交
-const searchFormClick = (searchData) => {
-  let isHave = searchData?.filters?.some((item) => item.column == 'inspectionType')
-  if (!isHave) {
-    searchData.filters.push({
-      action: '==',
-      column: 'inspectionType',
-      value: '1'
-    })
-  }
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
-  }
-  getList() // 刷新当前列表
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  tableObject.params = {
-    available: true,
-    inspectionType: '1'
-  }
-  getList()
-})
-</script>
diff --git a/src/views/qms/inspectionRecordPurchase/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecordPurchase/inspectionRecordMain.data.ts
deleted file mode 100644
index 9c106671b..000000000
--- a/src/views/qms/inspectionRecordPurchase/inspectionRecordMain.data.ts
+++ /dev/null
@@ -1,964 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter2 } from '@/utils/formatTime'
-import { validateHanset, validateEmail } from '@/utils/validator'
-import { dateFormatter } from '@/utils/formatTime'
-import { validateTwoNum, validateSixNum } from '@/utils/validator'
-const { t } = useI18n() // 国际化
-
-/**
- * @returns {Array} 检验任务主表
- */
-export const InspectionRecordMain = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '记录编码',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true,
-      table: {
-        width: 200,
-        fixed: 'left'
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '申请编码',
-      field: 'requestNumber',
-      sort: 'custom',
-      isSearch: true,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '任务编码',
-      field: 'jobNumber',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '发货单号',
-      field: 'asnNumber',
-      sort: 'custom',
-      isSearch: true,
-      isForm: false,
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 180
-      }
-    },
-    {
-      label: '供应商编码',
-      field: 'supplierCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '供应商名称',
-      field: 'supplierName',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '物料编码',
-      field: 'itemCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '物料名称',
-      field: 'itemName',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '批次',
-      field: 'batch',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '供应商批次',
-      field: 'supplierBatch',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '检验方案编码',
-      field: 'inspectionSchemeCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 200
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '检验批次',
-      field: 'inspectionBatch',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '检验批数量',
-      field: 'inspectionBatchAmount',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    // {
-    //   label: '采样总数量',
-    //   field: 'sampleTotalAmount',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isForm:false,
-    //   table: {
-    //     width: 150
-    //   }
-    // },
-    {
-      label: '检验类型',
-      field: 'inspectionType',
-      dictType: DICT_TYPE.INSPECTION_TYPE,
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'Select',
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考订单号',
-      field: 'referenceOrderCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '参考订单行',
-      field: 'referenceOrderRow',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '参考凭证号',
-      field: 'referenceCertificateCode',
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      // reference_certificate_row
-      label: '参考凭证行',
-      field: 'referenceCertificateRow',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '检验阶段',
-      field: 'inspectionStage',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0,
-        componentProps: {
-          disabled: true
-        }
-      },
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '检验严格性',
-      field: 'inspectionStringency',
-      dictType: DICT_TYPE.INSPECTION_SEVERITY,
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '计划开始时间',
-      field: 'planStartTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '计划结束时间',
-      field: 'planEndTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '实际开始时间',
-      field: 'realStartTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '实际结束时间',
-      field: 'realEndTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x',
-          disabled: true
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-
-    {
-      label: '收货时间',
-      field: 'deliveryTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x'
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      table: {
-        width: 175
-      }
-    },
-    {
-      label: '检验水平',
-      field: 'inspectionLevel',
-      dictType: DICT_TYPE.INSPECTION_LEVEL,
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: 'AQL值',
-      field: 'aqlValue',
-      dictType: DICT_TYPE.BASIC_AQL,
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '使用决策',
-      field: 'useDecision',
-      sort: 'custom',
-      isSearch: false,
-      dictType: DICT_TYPE.USAGE_DECISION,
-      table: {
-        width: 150
-      },
-      isForm: false
-    },
-    {
-      label: '执行结果',
-      field: 'estimateCode',
-      dictType: DICT_TYPE.EVALUATION_CODE,
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '包装号',
-      field: 'packageCode',
-      sort: 'custom',
-      isSearch: true,
-      isTable: false,
-      isForm: false,
-      tableForm: {
-        disabled: 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'
-        }
-      },
-      isSearch: true,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      }
-    },
-    {
-      label: '创建者',
-      field: '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: 'updater',
-      isDetail: true,
-      isForm: false,
-      isTable: false,
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '操作',
-      field: 'action',
-      isForm: false,
-      isDetail: false,
-      table: {
-        width: 300,
-        fixed: 'right'
-      }
-    }
-  ])
-)
-
-//表单校验
-export const InspectionRecordMainRules = reactive({
-  useDecision: [required],
-
-})
-
-/**
- * @returns {Array} 检验任务子表
- */
-export const InspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isTable: false,
-    isSearch: false,
-    isForm: false,
-  },
-  {
-    label: '记录编码',
-    field: 'recordCode',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '工序编码',
-    field: 'processCode',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '工序描述',
-    field: 'processDescribe',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '顺序号',
-    field: 'sequenceCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '是否破坏性检验',
-    field: 'isDestroyInspection',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'Radio'
-    },
-  },
-  {
-    label: '检验开始时间',
-    field: 'inspectionStartTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '检验结束时间',
-    field: 'inspectionEndTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '检验人',
-    field: 'inspectionOperator',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '检验特性编码',
-    field: 'inspectionFeaturesCode',
-    sort: 'custom',
-    isSearch: false,
-  },
-  // {
-  //   label: '是否可用',
-  //   field: 'available',
-  //   sort: 'custom',
-  //   isSearch: false,
-  // },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-  },
-
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm: false,
-  }
-]))
-
-//表单校验
-export const InspectionRecordDetailRules = reactive({
-  recordCode: [required],
-  processCode: [required],
-  sequenceCode: [required],
-  isDestroyInspection: [required],
-  available: [required],
-})
-
-/**
- * @returns {Array} 检验记录包装
- */
-export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '编码',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 200
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '包装号',
-    field: 'packageCode',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 160
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '包装规格',
-    field: 'packageSpecificationCode',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 150
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '数量',
-    field: 'amount',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-    tableForm: {
-      disabled: true,
-      width: 120
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'measuringUnit',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 120
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '采样数量',
-    field: 'sampleAmount',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 100
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '合格数量',
-    field: 'qualifiedAmount',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 100
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '不合格数量',
-    field: 'noQualifiedAmount',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 100
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '破坏数量',
-    field: 'destroyAmount',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 100
-    },
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '冻结数量',
-    field: 'frozenAmount',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-      width: 100
-    },
-    table: {
-      width: 150
-    }
-  }
-]))
-
-//表单校验
-export const InspectionRecordPackageRules = reactive({
-  qualifiedAmount: [
-    required,
-    { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' }
-  ],
-  frozenAmount: [
-    required,
-    { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' }
-  ],
-  destroyAmount: [
-    required,
-    { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' }
-  ],
-  noQualifiedAmount: [
-    required,
-    { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' }
-  ],
-})
-
-
-//表单校验
-export const InspectionRecordUserRules = reactive({
-  useDecision: [required],
-
-})
-
-/**
- * @returns {Array} 检验任务子表
- */
-export const InspectionRecordUser = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '发货单号',
-    field: 'asnNumber',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '使用决策',
-    field: 'useDecision',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.USAGE_DECISION,
-    table: {
-      width: 150
-    }
-  },
-]))
diff --git a/src/views/qms/inspectionRecordPurchase/useAddForm.vue b/src/views/qms/inspectionRecordPurchase/useAddForm.vue
deleted file mode 100644
index c430495c8..000000000
--- a/src/views/qms/inspectionRecordPurchase/useAddForm.vue
+++ /dev/null
@@ -1,312 +0,0 @@
-<template>
-  <div>
-    <Dialog
-      :title="dialogTitle"
-      v-model="dialogVisible"
-      :width="dialogWidth"
-      :close-on-click-modal="false"
-      :vLoading="formLoading"
-    >
-      <div style="max-height: 80vh; overflow-y: auto; padding: 0px 20px">
-        <Form
-          ref="formMainRef"
-          :rules="rules"
-          :schema="formSchema"
-          :is-col="true"
-          @onChange="onChange"
-        />
-        <div class="small-title">包装列表</div>
-        <div style="border:1px solid #dedede;margin-bottom:20px;display: flex;">
-          <TableForm
-            ref="tableFormRef"
-            style="width:100%;"
-            :maxHeight = "490"
-            :tableFields="tableSchemas.tableFormColumns"
-            :tableFormRules="tableFormRules"
-            :tableData="data.packageList"
-            :isShowButton="false"
-            :isShowReduceButton="false"
-            @inputStringBlur="tableFormBlur"
-          />
-        </div>
-      </div>
-      <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
-      </template>
-    </Dialog>
-    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
-  </div>
-</template>
-
-<script setup lang="ts">44
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { getCurrentInstance } from 'vue'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import { SearchTable } from '@/components/SearchTable'
-import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
-import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
-
-const { proxy } = getCurrentInstance()
-
-const message = useMessage() // 消息弹窗
-
-const props = defineProps({
-  // 显示窗口宽度设置
-  basicFormWidth: {
-    type: String,
-    default: ''
-  },
-  // 底部按钮集合
-  footButttondata: {
-    type: Array,
-    required: false,
-    default: null
-  },
-  // 表单，列表 相关信息
-  formAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 校验rules
-  rules: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 包装 列表 相关信息
-  tableAllSchemas: {
-    type: Array,
-    required: true,
-    default: null
-  },
-  tableFormRules: {
-    type: Array,
-    required: true,
-    default: null
-  },
-})
-const { t } = useI18n() // 国际化
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const dialogWidth = ref()
-const formSchema = ref(props.formAllSchemas?.formSchema)
-const tableSchemas = ref(props.tableAllSchemas)
-const tableFormRules = ref(props.tableFormRules)
-const formMainRef = ref()
-
-const data = ref({
-  code: '',
-  itemCode: '',
-  version: '',
-  testTypeCode: '',
-  programmeTemplateCode: '',
-  splitRule: '',
-  aql: '',
-  inspectionLevel: '',
-  effectiveDate: '',
-  expirationDate: '',
-  available: 'TRUE',
-  subList: []
-})
-
-if (props.basicFormWidth) {
-  dialogWidth.value = props.basicFormWidth + '%'
-} else {
-  dialogWidth.value = props.isBusiness ? '60%' : '40%'
-}
-
-/** 打开弹窗 */
-const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
-  dialogTitle.value = t('action.applyDecision')
-  formType.value = type
-  if (row) {
-    data.value = JSON.parse(JSON.stringify(row))
-    data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(row.id)
-    data.value.packageList.forEach(item=>{
-      item.qualifiedAmount = item.qualifiedAmount?item.qualifiedAmount:0
-      item.noQualifiedAmount = item.noQualifiedAmount?item.noQualifiedAmount:0
-      item.destroyAmount = item.destroyAmount?item.destroyAmount:0
-      item.frozenAmount = item.frozenAmount?item.frozenAmount:0
-    })
-    dialogVisible.value = true
-    tableSchemas.value.tableFormColumns.map(item=>{
-      item.tableForm.disabled = true
-    })
-    // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
-    if(row.estimateCode == 1){
-      data.value.useDecision = '1'
-    }else{
-      data.value.useDecision =''
-    }
-    // 全部合格时合格数量==数量
-    if(data.value.useDecision == 1){
-      data.value.packageList.forEach(item=>{
-        item.qualifiedAmount = item.amount
-      })
-    }
-    // 让步接收和部分合格
-    else if(data.value.useDecision  == 2 || data.value.useDecision  == 6){
-      tableSchemas.value.tableFormColumns.map(item=>{
-        if(item.field == 'noQualifiedAmount'){
-          item.tableForm.disabled = false
-        }else{
-          item.tableForm.disabled = true
-        }
-      })
-    }
-    // 全不合格只能输入不合格数量
-    else if(data.value.useDecision  == 3){
-      data.value.packageList.forEach(item=>{
-        item.noQualifiedAmount = item.amount
-      })
-    }
-    else if(data.value.useDecision  == 4){
-      data.value.packageList.forEach(item=>{
-        item.frozenAmount = item.amount
-      })
-    }
-    
-    nextTick(() => {
-      formMainRef.value.setValues( data.value)
-    })
-  } 
-  dialogVisible.value = true
-}
-defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
-
-// console.log(11,tableAllSchemas.value.tableFormColumns)
-// 传递给父类
-const emit = defineEmits([
-  'onChange',
-  'submitForm'
-])
-/** 弹窗按钮 */
-let Butttondata: any = []
-if (props.footButttondata) {
-  Butttondata = props.footButttondata
-} else {
-  Butttondata = [
-    defaultButtons.formSaveBtn(null), // 保存
-    defaultButtons.formCloseBtn(null) // 关闭
-  ]
-}
-const onChange = (field, cur)=>{
-  if(field=='useDecision'){
-    tableSchemas.value.tableFormColumns.map(item=>{
-      item.tableForm.disabled = true
-    })
-    data.value.packageList.forEach(item=>{
-        item.qualifiedAmount =0
-        item.noQualifiedAmount =0
-        item.destroyAmount =0
-        item.frozenAmount =0
-      })
-    // 全部合格时合格数量==数量
-    if(cur == 1){
-      data.value.packageList.forEach(item=>{
-        item.qualifiedAmount = item.amount
-      })
-    }
-    // 全不合格只能输入不合格数量
-    else if(cur == 2 || cur == 6){
-      data.value.packageList.forEach(item=>{
-        item.qualifiedAmount = item.amount
-      })
-      tableSchemas.value.tableFormColumns.map(item=>{
-        if(item.field == 'noQualifiedAmount'){
-          item.tableForm.disabled = false
-        }else{
-          item.tableForm.disabled = true
-        }
-      })
-    }
-    // 全不合格只能输入不合格数量
-    else if(cur == 3){
-      data.value.packageList.forEach(item=>{
-        item.noQualifiedAmount = item.amount
-      })
-    }
-    else if(cur == 4){
-      data.value.packageList.forEach(item=>{
-        item.frozenAmount = item.amount
-      })
-    }
-  }
-}
-// 失去焦点
-const tableFormBlur = (field, val,row)=>{
-  if( row.amount < val){
-    row.noQualifiedAmount = row.amount
-    row.qualifiedAmount = 0
-  }else{
-    row.qualifiedAmount = row.amount - val
-    row.qualifiedAmount = row.qualifiedAmount.toFixed(6)
-  }
-  
-}
-const buttonBaseClick = (val) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
-const tableFormRef = ref()
-const submitForm = async () => {
-  try {
-    const elForm = unref(formMainRef)?.getElFormRef()
-    // 校验表单
-    if (!elForm) return
-    const valid = await elForm.validate()
-    if (!valid) return
-    // 校验包装列表
-    const validateForm1 = await tableFormRef.value.validateForm()
-    if (!validateForm1) return
-      const data1 = unref(formMainRef)?.formModel
-      data.value.useDecision = data1.useDecision
-    if(data1.useDecision == 2 || data1.useDecision == 6){
-      if(data.value.packageList.length>0){
-        let isBol = data.value.packageList.filter(cur=>parseFloat(cur.qualifiedAmount)+parseFloat(cur.noQualifiedAmount)!=parseFloat(cur.amount))
-        console.log(isBol)
-        if(isBol&&isBol.length>0){
-          message.error(`合格数量和不合格数量总和不等于数量`)
-          return
-        }
-      } 
-    }
-    if (formType.value == 'create') {
-      // 主子表——提交请求
-      emit('submitForm', formType.value, data.value)
-    } else {
-      // 编辑/执行
-      emit('submitForm', formType.value, data.value)
-    }
-  } catch {
-    console.log(111)
-  }
-}
-</script>
-<style scoped>
-.small-title {
-  font-weight: bold;
-  padding: 0px 10px 10px;
-  color: #1a8bfc;
-  font-size: 16px;
-}
-</style>
-<style>
-.el-tabs--left .el-tabs__header.is-left {
-  min-height: 700px !important;
-  min-width: 150px !important;
-}
-.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
-  min-width: 120px !important;
-}
-</style>
diff --git a/src/views/system/serialNumber/index.vue b/src/views/system/serialNumber/index.vue
index 3dec54e48..2095c5d07 100644
--- a/src/views/system/serialNumber/index.vue
+++ b/src/views/system/serialNumber/index.vue
@@ -99,6 +99,9 @@
 import download from '@/utils/download'
 import * as SerialNumberApi from '@/api/system/serialNumber'
 import SerialNumberForm from './SerialNumberForm.vue'
+import { formatDate } from '@/utils/formatTime'
+
+const route = useRoute() //路由信息
 
 defineOptions({ name: 'SerialNumber' })
 
@@ -168,7 +171,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SerialNumberApi.exportSerialNumber(queryParams)
-    download.excel(data, '流水号规则.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index e2650dbe4..aba13417d 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -104,6 +104,8 @@ import download from '@/utils/download'
 import * as TenantApi from '@/api/system/tenant'
 import * as TenantPackageApi from '@/api/system/tenantPackage'
 import TenantForm from './TenantForm.vue'
+import { formatDate } from '@/utils/formatTime'
+const route = useRoute() //路由信息
 
 defineOptions({ name: 'SystemTenant' })
 
@@ -177,7 +179,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await TenantApi.exportTenant(queryParams)
-    download.excel(data, '租户列表.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/agvManage/agvLocationrelation/index.vue b/src/views/wms/agvManage/agvLocationrelation/index.vue
index 0119205df..11bc4ff83 100644
--- a/src/views/wms/agvManage/agvLocationrelation/index.vue
+++ b/src/views/wms/agvManage/agvLocationrelation/index.vue
@@ -69,6 +69,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'AgvLocationrelation' })
 
@@ -243,7 +244,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await AgvLocationrelationApi.exportAgvLocationrelation(tableObject.params)
-    download.excel(data, 'AGV库位转换.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -258,7 +259,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'AGV库位转换导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
index e99169502..7f0add9a9 100644
--- a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
@@ -244,7 +244,7 @@ export const Customer = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -267,7 +267,7 @@ export const Customer = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
index 4ece20cf8..55f5941d9 100644
--- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
@@ -296,7 +296,7 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -319,7 +319,7 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
index 396528e7b..5372ea34b 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
@@ -284,7 +284,7 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -307,7 +307,7 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
index 70b4ca87c..d54cd7751 100644
--- a/src/views/wms/basicDataManage/customerManage/project/project.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
@@ -163,7 +163,7 @@ export const Project = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -186,7 +186,7 @@ export const Project = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
index f298961eb..6b01575b9 100644
--- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
@@ -222,7 +222,7 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -245,7 +245,7 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
index b5ddadaa5..6160bd6dd 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
@@ -78,6 +78,7 @@ 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 { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
 
 // 业务类型
 defineOptions({ name: 'Businesstype' })
@@ -365,7 +366,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BusinesstypeApi.exportBusinesstype(tableObject.params)
-    download.excel(data, '业务类型.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -380,7 +381,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '业务类型导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
index 0d2e5e767..9c663adfc 100644
--- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Documentsetting' })
 
@@ -213,7 +214,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DocumentsettingApi.exportDocumentsetting(tableObject.params)
-    download.excel(data, '单据设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -228,7 +229,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '单据设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
index 9132137cb..b210a0d47 100644
--- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Jobsetting' })
 
@@ -213,7 +214,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await JobsettingApi.exportJobsetting(tableObject.params)
-    download.excel(data, '任务单设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -228,7 +229,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '任务单设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
index 48405deac..2c24c8bc4 100644
--- a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Plansetting' })
 
@@ -214,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PlansettingApi.exportPlansetting(tableObject.params)
-    download.excel(data, '计划单设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -229,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '计划单设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
index ecce4f292..90c93f87f 100644
--- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Recordsetting' })
 
@@ -214,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RecordsettingApi.exportRecordsetting(tableObject.params)
-    download.excel(data, '记录单设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -229,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '记录单设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
index 34bb3745b..e5ea8a81b 100644
--- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Requestsetting' })
 
@@ -214,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RequestsettingApi.exportRequestsetting(tableObject.params)
-    download.excel(data, '申请单设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -229,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '申请单设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
index 66339989c..50cf76a72 100644
--- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Switch' })
 
@@ -189,7 +190,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SwitchApi.exportSwitch(tableObject.params)
-    download.excel(data, '单据开关.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -204,7 +205,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '单据开关导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts
index 3acd75e5b..e55807042 100644
--- a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts
@@ -25,7 +25,7 @@ export const Switch = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       componentProps: {
-        disabled: true
+        disabled: false
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
index cdd17db2f..877409fff 100644
--- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Transactiontype' })
 
@@ -215,7 +216,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await TransactiontypeApi.exportTransactiontype(tableObject.params)
-    download.excel(data, '事务类型.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -230,7 +231,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '事务类型导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
index dfa823146..257a5f71a 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -214,7 +214,7 @@ export const Area = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -237,7 +237,7 @@ export const Area = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
index 6be85ba6b..b6f94685a 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
@@ -68,6 +68,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Area' })
 
@@ -247,7 +248,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await AreaApi.exportArea(tableObject.params)
-    download.excel(data, '库区.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -262,7 +263,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '库区导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
index dbbc72a7a..11a7c465a 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
@@ -252,7 +252,7 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -275,7 +275,7 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
index 9adc80970..d002a2475 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
@@ -70,6 +70,7 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Dock' })
 
@@ -261,7 +262,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DockApi.exportDock(tableObject.params)
-    download.excel(data, '月台.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -276,7 +277,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '月台导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
index 2567a8018..14700c5cb 100644
--- a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
@@ -59,6 +59,7 @@ import download from '@/utils/download'
 import { Enterprise,EnterpriseRules } from './enterprise.data'
 import * as EnterpriseApi from '@/api/wms/enterprise'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Enterprise' })
 
@@ -229,7 +230,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await EnterpriseApi.exportEnterprise(tableObject.params)
-    download.excel(data, '企业.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
index 98f0c1283..2ac2ee173 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
@@ -66,6 +66,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 // 基础信息——库位
 defineOptions({ name: 'Location' })
@@ -265,7 +266,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await LocationApi.exportLocation(tableObject.params)
-    download.excel(data, '库位.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -280,7 +281,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '库位导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index 1a74eea06..07ef0409c 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -392,7 +392,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -415,7 +415,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
index db65ec6f0..40785ee97 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
@@ -66,6 +66,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 // 库位组管理
 defineOptions({ name: 'Locationgroup' })
@@ -246,7 +247,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await LocationgroupApi.exportLocationgroup(tableObject.params)
-    download.excel(data, '库位组.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -261,7 +262,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '库位组导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
index da5fdfbd5..70ee060af 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
@@ -214,7 +214,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -237,7 +237,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
index b112d1837..40731066f 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
@@ -66,6 +66,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Process' })
 
@@ -253,7 +254,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProcessApi.exportProcess(tableObject.params)
-    download.excel(data, '工序.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -268,7 +269,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '工序导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
index 7f4690a51..6db2fb2f5 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
@@ -217,7 +217,7 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -240,7 +240,7 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
index b1a2b22cd..3a916a03c 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
@@ -66,6 +66,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 // 生产线管理
 defineOptions({ name: 'Productionline' })
@@ -246,7 +247,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionlineApi.exportProductionline(tableObject.params)
-    download.excel(data, '生产线.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -261,7 +262,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '生产线导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
index 1e17db6d5..72cee3e30 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
@@ -227,7 +227,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -250,7 +250,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
index bc20bb421..c1549165d 100644
--- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Warehouse' })
 
@@ -226,7 +227,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await WarehouseApi.exportWarehouse(tableObject.params)
-    download.excel(data, '仓库.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -241,7 +242,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '仓库导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
index ffb93df3e..3f82b7907 100644
--- a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
@@ -156,7 +156,7 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -179,7 +179,7 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
index f086a1428..3a8fc9f96 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Workshop' })
 
@@ -228,7 +229,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await WorkshopApi.exportWorkshop(tableObject.params)
-    download.excel(data, '车间.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -243,7 +244,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '车间导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
index b7ea81be4..569ded4e1 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
@@ -124,7 +124,7 @@ export const Workshop = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -147,7 +147,7 @@ export const Workshop = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
index 5c963542e..d200d5f0a 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -66,6 +66,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 // 工位管理
 defineOptions({ name: 'Workstation' })
@@ -255,7 +256,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await WorkstationApi.exportWorkstation(tableObject.params)
-    download.excel(data, '工位.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -270,7 +271,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '工位导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index b8da1ff1c..cebf01a68 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -302,7 +302,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -325,7 +325,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue
index 91ea8cbab..62e73fd39 100644
--- a/src/views/wms/basicDataManage/labelManage/barcode/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/barcode/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Barcode' })
 
@@ -218,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarcodeApi.exportBarcode(tableObject.params)
-    download.excel(data, '条码片段.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -234,7 +235,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '条码片段导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
index 0350c674a..602801310 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -79,6 +79,7 @@ import * as PackageApi from '@/api/wms/package'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 叫料标签
 defineOptions({ name: 'Callmaterials' })
 
@@ -290,7 +291,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await CallmaterialsApi.exportCallmaterials(tableObject.params)
-    download.excel(data, '叫料标签.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -338,7 +339,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '叫料标签导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
index b39ba8e44..50c977fc7 100644
--- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
@@ -54,6 +54,7 @@ import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import * as Itempackaging from '@/api/wms/itempackaging'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 库位标签
 defineOptions({ name: 'LocationLabel' })
@@ -177,7 +178,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
-    download.excel(data, '库位标签.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
index 6aa6e2db1..bda0f5106 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@@ -67,6 +67,7 @@ import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import * as Itempackaging from '@/api/wms/itempackage'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
@@ -154,6 +155,7 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'import') { // 导入
     handleImport()
   } else if (val == 'export') { // 导出
+    debugger
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -241,12 +243,13 @@ const handleDelete = async (id: number) => {
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
+    debugger
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
-    download.excel(data, '制造件件标签.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -318,7 +321,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '包装导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index c13cfd8d5..a755d2bea 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -68,6 +68,7 @@ import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import * as Itempackaging from '@/api/wms/itempackage'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
@@ -247,7 +248,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
-    download.excel(data, '采购件标签.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -314,7 +315,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '包装导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
index bf41d8eac..68424897e 100644
--- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
@@ -64,6 +64,7 @@ import { getAccessToken } from '@/utils/auth'
 import { Package,PackageRules } from './utensilPackage.data'
 import * as BarbasicApi from '@/api/wms/barbasic'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 器具标签
 defineOptions({ name: 'UtensilPackage' })
@@ -229,7 +230,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
-    download.excel(data, '器具标签.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -252,7 +253,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '包装导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
index 6e087650c..84931c430 100644
--- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Carrier' })
 
@@ -233,7 +234,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await CarrierApi.exportCarrier(tableObject.params)
-    download.excel(data, '承运商.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -248,7 +249,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '承运商导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue
index 8c999e712..d217f2ac4 100644
--- a/src/views/wms/basicDataManage/orderManage/owner/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Owner' })
 
@@ -234,7 +235,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await OwnerApi.exportOwner(tableObject.params)
-    download.excel(data, '货主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -249,7 +250,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '货主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue
index 36770fa22..c6892a584 100644
--- a/src/views/wms/basicDataManage/orderManage/team/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/team/index.vue
@@ -68,6 +68,7 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import TeamForm from "@/views/wms/basicDataManage/orderManage/team/teamForm.vue";
 import {sync} from "rimraf";
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Team' })
 
@@ -228,7 +229,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await TeamApi.exportTeam(tableObject.params)
-    download.excel(data, '班组.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -243,7 +244,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '班组导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
index c4737a072..86836632c 100644
--- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
@@ -75,6 +75,7 @@ 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 { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Configurationsetting' })
 
@@ -210,7 +211,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ConfigurationsettingApi.exportConfigurationsetting(tableObject.params)
-    download.excel(data, '配置设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -225,7 +226,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '配置设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
index 7638fafb5..3b2c0b61d 100644
--- a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
@@ -66,6 +66,7 @@ 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 { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Paramsetting' })
 
@@ -181,7 +182,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ParamsettingApi.exportParamsetting(tableObject.params)
-    download.excel(data, '参数设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -196,7 +197,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '参数设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
index e79792b66..5061b5315 100644
--- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
@@ -74,6 +74,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Rule' })
 
@@ -213,7 +214,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RuleApi.exportRule(tableObject.params)
-    download.excel(data, '规则.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -228,7 +229,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '规则导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 7034e3a20..47ed9e9e9 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -310,7 +310,6 @@
                   v-model="warehouseType"
                   placeholder=""
                   style="width: 110px; margin-right: 10px"
-                  @change="changeWarehouse"
                 >
                   <el-option
                     :label="cur.label"
@@ -319,7 +318,45 @@
                     :key="'仓库'+cur.value"
                   />
                 </el-select>
-                <el-select
+
+
+                <!-- 仓库 -->
+                <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" v-model="formData.configuration.WarehouseCode">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+
+                  <!-- 库区 -->
+                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择库区" v-model="formData.configuration.AreaCode">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+
+                  
+                  <!-- 库位组 -->
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" v-model="formData.configuration.LocationGroupCode">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+
+                  <!-- 库位 -->
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择库位" v-model="formData.configuration.LocationCode">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
+                <!-- <el-select
                   v-model="formData.configuration.WarehouseCode"
                   v-if="warehouseType == 'WarehouseCode'"
                   placeholder="请选择仓库"
@@ -387,7 +424,7 @@
                     :label="cur.code"
                     :value="cur.code"
                   />
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </el-col>
             <!-- 数量排序方向 -->
@@ -560,6 +597,10 @@
       <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
     </template>
   </Dialog>
+  <SearchTable
+    ref="searchTableRef"
+    @searchTableSuccess="searchTableSuccess"
+  />
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -571,7 +612,15 @@ import { getAreaList } from '@/api/wms/areabasic'
 import { getLocationgroupList } from '@/api/wms/locationgroup'
 import { getLocationList } from '@/api/wms/location'
 import * as RuleApi from '@/api/wms/rule'
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+import * as LocationgroupApi from '@/api/wms/locationgroup'
+import { Locationgroup } from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
 
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import { isString } from '@/utils/is'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
@@ -836,7 +885,81 @@ const filterMethodWarehouseList = (query: string) => {
     options.warehouseList = options.originWarehouseList
   }
 }
-getFormWarehouseList()
+
+
+const searchTableRef = ref()
+const searchWarehouse = ()=>{
+
+
+  if(warehouseType.value == 'WarehouseCode'){
+    // 仓库
+    searchTableRef.value.open(
+      '请选择仓库',
+      Warehouse.allSchemas,
+      WarehouseApi.getWarehousePage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+  }else if(warehouseType.value == 'AreaCode'){
+    searchTableRef.value.open(
+      '请选择库区',
+      Area.allSchemas,
+      AreaApi.getAreaPage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+
+  }else if(warehouseType.value == 'LocationGroupCode'){
+    
+    searchTableRef.value.open(
+      '请选择库位组',
+      Locationgroup.allSchemas,
+      LocationgroupApi.getLocationgroupPage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+
+  }else if(warehouseType.value == 'LocationCode'){
+    searchTableRef.value.open(
+      '请选择库位',
+      Location.allSchemas,
+      LocationApi.getLocationPage,
+      'WarehouseCode',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+
+  }
+  
+}
+const searchTableSuccess = (formField, searchField, val, type, row) => {
+  // let searchTableTitle  =  warehouseType.value == 'WarehouseCode'?'请选择仓库':warehouseType.value == 'AreaCode'?'请选择库区':warehouseType.value == 'LocationGroupCode'?'请选择库位组':warehouseType.value == 'LocationCode'?'请选择库位':''
+  console.log('searchTableSuccess',formField, searchField, val, type, row)
+  console.log(val.map(item=>(item['code'])).join(','))
+  formData.value.configuration[warehouseType.value] = val.map(item=>(item['code'])).join(',')
+  let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode']
+  fields.forEach(item=>{
+    if(item!=warehouseType.value){
+      formData.value.configuration[item] = ''
+    }
+  })
+}
+// getFormWarehouseList()
 // 选择仓库/库位/库位组/库区
 const changeWarehouse = (e) => {
   formData.value.configuration.WarehouseCode = ''
@@ -906,25 +1029,25 @@ const open = async (type: string, strategyCode: string, id?: number) => {
         formData.value.configuration.WarehouseCode
       ) {
         warehouseType.value = 'WarehouseCode'
-        getFormWarehouseList()
+        // getFormWarehouseList()
       } else if (
         'AreaCode' in formData.value.configuration &&
         formData.value.configuration.AreaCode
       ) {
         warehouseType.value = 'AreaCode'
-        getFormAreaList()
+        // getFormAreaList()
       } else if (
         'LocationGroupCode' in formData.value.configuration &&
         formData.value.configuration.LocationGroupCode
       ) {
         warehouseType.value = 'LocationGroupCode'
-        getFormLocationgrouList()
+        // getFormLocationgrouList()
       } else if (
         'LocationCode' in formData.value.configuration &&
         formData.value.configuration.LocationCode
       ) {
         warehouseType.value = 'LocationCode'
-        getFormLocationList()
+        // getFormLocationList()
       }
     } finally {
       formLoading.value = false
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
index 690f7fd36..27be15c7c 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
@@ -108,7 +108,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    buttonBaseClick('refresh',null)
+    getList()
   } catch { }
 }
 // 列表头部按钮
@@ -127,13 +127,7 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
-      searchFormClick({
-        filters: tableObject.params.filters
-      })
-    } else {
-      getList()
-    }
+    getList()
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮 
     console.log('其他按钮', item)
diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue
index 56634a966..3ee5a05ec 100644
--- a/src/views/wms/basicDataManage/subject/mstr/index.vue
+++ b/src/views/wms/basicDataManage/subject/mstr/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Mstr' })
 
@@ -212,7 +213,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await MstrApi.exportMstr(tableObject.params)
-    download.excel(data, '产品类信息.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -227,7 +228,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '产品类信息导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
index 87b6a5273..a50649fbb 100644
--- a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
+++ b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'QadCostcentre' })
 
@@ -221,7 +222,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await QadCostcentreApi.exportQadCostcentre(tableObject.params)
-    download.excel(data, 'QAD成品中心.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -236,7 +237,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'QAD成品中心导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/subject/qadProject/index.vue b/src/views/wms/basicDataManage/subject/qadProject/index.vue
index 0658d4d47..b5d878efb 100644
--- a/src/views/wms/basicDataManage/subject/qadProject/index.vue
+++ b/src/views/wms/basicDataManage/subject/qadProject/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'QadProject' })
 
@@ -221,7 +222,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await QadProjectApi.exportQadProject(tableObject.params)
-    download.excel(data, 'QAD项目信息.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -236,7 +237,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'QAD项目信息导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
index cb5cc5ac0..db7621df2 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'SubjectAccount' })
 
@@ -230,7 +231,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SubjectAccountApi.exportSubjectAccount(tableObject.params)
-    download.excel(data, '科目账户配置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -245,7 +246,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '科目账户配置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
index 399553c0a..ad342343c 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
@@ -214,7 +214,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -237,7 +237,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
index 2508b2d78..b386fcf1a 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
@@ -227,6 +227,9 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -241,7 +244,10 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     isForm: false,
-    isTable: true
+    isTable: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '最后更新时间',
@@ -249,7 +255,7 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -272,7 +278,7 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index 5ddace825..200a5484d 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -302,6 +302,9 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -316,7 +319,10 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     isForm: false,
-    isTable: true
+    isTable: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '最后更新时间',
@@ -324,7 +330,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -347,7 +353,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
index 7d383b84d..6ce4163de 100644
--- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
@@ -246,7 +246,7 @@ export const Accountcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -269,7 +269,7 @@ export const Accountcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
index c1b7af032..ee11428cb 100644
--- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Accountcalendar' })
 
@@ -214,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await AccountcalendarApi.exportAccountcalendar(tableObject.params)
-    download.excel(data, '账期日历.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -229,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '账期日历导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
index a0451761d..02366d873 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
@@ -155,7 +155,7 @@ export const Currencyexchange = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -178,7 +178,7 @@ export const Currencyexchange = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
index 69e50046b..83203a9ad 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
@@ -66,6 +66,7 @@ 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 { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Currencyexchange' })
 
@@ -215,7 +216,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await CurrencyexchangeApi.exportCurrencyexchange(tableObject.params)
-    download.excel(data, '货币转换.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -230,7 +231,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '货币转换导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
index d9830e769..5d7a069da 100644
--- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Systemcalendar' })
 
@@ -214,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SystemcalendarApi.exportSystemcalendar(tableObject.params)
-    download.excel(data, '系统日历.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -229,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '系统日历导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts
index 4e41b2ff4..c413767db 100644
--- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts
@@ -179,7 +179,7 @@ export const Systemcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -202,7 +202,7 @@ export const Systemcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue
index 7d4cda97d..a0ac95b07 100644
--- a/src/views/wms/buttMesManage/mesBarCode/index.vue
+++ b/src/views/wms/buttMesManage/mesBarCode/index.vue
@@ -73,6 +73,7 @@ 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 { getTenantId }from '@/utils/auth'
+import { formatDate } from '@/utils/formatTime'
 
 
 defineOptions({ name: 'MesBarCode' })
@@ -223,7 +224,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await MesBarCodeApi.exportMesBarCode(tableObject.params)
-    download.excel(data, '生产条码清单.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -238,7 +239,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '生产条码清单导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 1a697012a..bf1e93890 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -882,47 +882,47 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
-      searchCondition: [{
-        key:'customerCode', // 查询列表中字段
-        value:'customerCode', // 指主表某字段
-        message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
-        isMainValue: true // 表示查询条件是主表的字段的值
-      }
-    ]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
-        searchCondition: [{
-          key:'customerCode', // 查询列表中字段
-          value:'customerCode', // 指主表某字段
-          message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
-          isMainValue: true // 表示查询条件是主表的字段的值
-        }
-      ]
-      }
-    }
-  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择包装号',
+  //     searchField: 'packingNumber',
+  //     searchTitle: '库存余额信息',
+  //     searchAllSchemas: Balance.allSchemas,
+  //     searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
+  //     searchCondition: [{
+  //       key:'customerCode', // 查询列表中字段
+  //       value:'customerCode', // 指主表某字段
+  //       message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+  //       isMainValue: true // 表示查询条件是主表的字段的值
+  //     }
+  //   ]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择包装号',
+  //       searchField: 'packingNumber',
+  //       searchTitle: '库存余额信息',
+  //       searchAllSchemas: Balance.allSchemas,
+  //       searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
+  //       searchCondition: [{
+  //         key:'customerCode', // 查询列表中字段
+  //         value:'customerCode', // 指主表某字段
+  //         message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+  //         isMainValue: true // 表示查询条件是主表的字段的值
+  //       }
+  //     ]
+  //     }
+  //   }
+  // },
   // {
   //   label: '器具号',
   //   field: 'containerNumber',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index b46e6663e..a6b1b8c67 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -220,6 +220,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             value = obj.fromLocationCode
             obj.fromLocationCode = obj.toLocationCode
             obj.toLocationCode = ''
+            obj.packingNumber = '' // 包装号所有为空
             CustomerreturnRequestDetail.allSchemas.tableFormColumns.map(item =>{
               if(item.field == 'packingNumber') {
               item.isInpuFocusShow = false
@@ -319,6 +320,7 @@ const isShowMainButton = (row,val) => {
   }
 }
 
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -336,7 +338,8 @@ const butttondata = (row,$index) => {
         {
       label: '生成标签',
       name: 'ssbq',
-      hide: isShowMainButton(row, ['3','6']),
+      // hide: isShowMainButton(row, ['3','6']),
+      hide: isShowMainButton(row, ['3']),
       type: 'primary',
       icon: '',
       color: '',
@@ -407,6 +410,19 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainHandle') { // 处理
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('请先创建标签')
+      return
+    }
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
     CustomerreturnRequestMainApi.handle(row.masterId).then(() => {
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
index b4da910ea..ce27beb2c 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@@ -11,14 +11,14 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
+  // {
+  //   label: '申请单号',
+  //   field: 'requestNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  // },
   {
     label: '任务单据号',
     field: 'jobNumber',
diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue
index 5489eadbd..3236df4a8 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue
@@ -74,6 +74,7 @@ import * as IssueJobDetailApi from '@/api/wms/issueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getDictLabel, DICT_TYPE } from '@/utils/dict'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 发料任务主
 defineOptions({ name: 'IssueJobMain' })
 
@@ -300,7 +301,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await IssueJobMainApi.exportIssueJobMain(tableObject.params)
-    download.excel(data, '发料任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
index 61c8326cd..1d33dadca 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as IssueRecordMainApi from '@/api/wms/issueRecordMain'
 import * as IssueRecordDetailApi from '@/api/wms/issueRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 发料记录主
 defineOptions({ name: 'IssueRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await IssueRecordMainApi.exportIssueRecordMain(tableObject.params)
-    download.excel(data, '发料记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 2f8e7a6ab..cc0172aea 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -103,6 +103,7 @@ import * as IssueRequestMainApi from '@/api/wms/issueRequestMain'
 import * as IssueRequestDetailApi from '@/api/wms/issueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as WorkstationApi from '@/api/wms/workstation'
+import { formatDate } from '@/utils/formatTime'
 
 // 发料申请
 defineOptions({ name: 'IssueRequestMain' })
@@ -443,7 +444,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await IssueRequestMainApi.exportIssueRequestMain(tableObject.params)
-    download.excel(data, '发料申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -545,7 +546,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '发料申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
index b4f8a8d89..6a4851095 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
@@ -67,6 +67,7 @@ import * as OnlinesettlementRecordMainApi from '@/api/wms/onlinesettlementRecord
 import * as OnlinesettlementRecordDetailApi from '@/api/wms/onlinesettlementRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 上线结算记录主
 defineOptions({ name: 'OnlinesettlementRecordMain' })
 
@@ -151,7 +152,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await OnlinesettlementRecordMainApi.exportOnlinesettlementRecordMain(tableObject.params)
-    download.excel(data, '上线结算记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
index ff16d1679..3ed7419cb 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
@@ -86,6 +86,7 @@ import * as OnlinesettlementRequestMainApi from '@/api/wms/onlinesettlementReque
 import * as OnlinesettlementRequestDetailApi from '@/api/wms/onlinesettlementRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { formatDate } from '@/utils/formatTime'
 
 // 上线结算申请
 defineOptions({ name: 'OnlinesettlementRequestMain' })
@@ -267,7 +268,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await OnlinesettlementRequestMainApi.exportOnlinesettlementRequestMain(tableObject.params)
-    download.excel(data, '上线结算申请主.xlsx')
+     download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -325,7 +326,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '上线结算申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index 8ea4298e2..cbe5bb6f4 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -88,6 +88,7 @@ import * as PreparetoissueMainApi from '@/api/wms/preparetoissueMain'
 import * as PreparetoissueDetailApi from '@/api/wms/preparetoissueDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { formatDate } from '@/utils/formatTime'
 
 // 备料计划
 defineOptions({ name: 'PreparetoissueMain' })
@@ -458,7 +459,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PreparetoissueMainApi.exportPreparetoissueMain(tableObject.params)
-    download.excel(data, '备料计划主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -532,7 +533,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '备料计划主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
index 096a6dc78..c215034cd 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -73,6 +73,7 @@ import * as ProductionreceiptJobMainApi from '@/api/wms/productionreceiptJobMain
 import * as ProductionreceiptJobDetailApi from '@/api/wms/productionreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 生产收料任务主
 defineOptions({ name: 'ProductionreceiptJobMain' })
 
@@ -300,7 +301,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreceiptJobMainApi.exportProductionreceiptJobMain(tableObject.params)
-    download.excel(data, '生产收料任务.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
index 23ce2913b..7a21ef6bb 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as ProductionreceiptRecordMainApi from '@/api/wms/productionreceiptReco
 import * as ProductionreceiptRecordDetailApi from '@/api/wms/productionreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 生产收料记录主
 defineOptions({ name: 'ProductionreceiptRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreceiptRecordMainApi.exportProductionreceiptRecordMain(tableObject.params)
-    download.excel(data, '生产收料记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index 1401944b8..15e2231be 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -17,7 +17,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     isSearch: true
   },
   {
-    label: '申请单号',
+    label: '生产收料任务单号',
     field: 'jobNumber',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index 922094c35..76b2ea5a7 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -73,6 +73,7 @@ import * as ProductionreturnJobMainApi from '@/api/wms/productionreturnJobMain'
 import * as ProductionreturnJobDetailApi from '@/api/wms/productionreturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 生产退料任务主
 defineOptions({ name: 'ProductionreturnJobMain' })
 
@@ -272,7 +273,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreturnJobMainApi.exportProductionreturnJobMain(tableObject.params)
-    download.excel(data, '生产退料任务.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
index ae8aebbeb..17197ae23 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
@@ -68,7 +68,8 @@ import * as ProductionreturnRecordMainApi from '@/api/wms/productionreturnRecord
 import * as ProductionreturnRecordDetailApi from '@/api/wms/productionreturnRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-// 生产退料记录主
+import { formatDate } from '@/utils/formatTime'
+// 生产退料记录主 and 隔离退料记录
 defineOptions({ name: 'ProductionreturnRecordMain' })
 
 const message = useMessage() // 消息弹窗
@@ -77,6 +78,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
+
 const tableColumns = ref([...ProductionreturnRecordMain.allSchemas.tableColumns,...ProductionreturnRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
@@ -85,7 +87,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPage // 分页接口
+  getListApi: 'ProductionreturnRecordMain'==routeName.value?ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPageStore:ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPageHold // 分页接口
 })
 
 // 获得表格的各种操作
@@ -156,7 +158,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(tableObject.params)
-    download.excel(data, '生产退料记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index 7ed0e0d69..bcc489c2e 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -110,6 +110,7 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 生产退料申请
 defineOptions({ name: 'ProductionreturnRequestMain' })
@@ -607,7 +608,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreturnRequestMainApi.exportProductionreturnRequestMain(tableObject.params)
-    download.excel(data, '生产退料合格申请.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -769,7 +770,7 @@ const labelPrint = async (row) => {
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '生产退料导入模版.xlsx'
+    templateTitle: `【${route.meta.title}】导入模版.xlsx`
   })
 
   // 导入成功之后
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 87e930fa3..97ccff14f 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -664,7 +664,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       searchPage: LocationApi.selectBusinessTypeOutLocation, // 查询弹窗所需分页方法
       searchCondition: [{
         key: 'businessType',
-        value: 'ReturnToHold', // 隔离退料
+        value: 'ReturnToStore', // 生产退料
         isMainValue: false
       },
       {
@@ -686,7 +686,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
         searchPage: LocationApi.selectBusinessTypeOutLocation, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'businessType',
-          value: 'ReturnToHold', // 隔离退料
+          value: 'ReturnToStore', // 生产退料
           isMainValue: false
         },
         {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index 257dccab8..cf54e1ceb 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -112,6 +112,7 @@ import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 隔离退料申请
 defineOptions({ name: 'ProductionreturnRequestMainNo' })
@@ -551,7 +552,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreturnRequestMainNoApi.exportProductionreturnRequestMain(tableObject.params)
-    download.excel(data, '生产退料不合格申请.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -757,7 +758,7 @@ const importFormRef = ref()
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '隔离退料导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
   })
 
   // 导入成功之后
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
index 7f402440b..a86d7465d 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as ProductionscrapRecordMainApi from '@/api/wms/productionscrapRecordMa
 import * as ProductionscrapRecordDetailApi from '@/api/wms/productionscrapRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 生产退料记录主
 defineOptions({ name: 'ProductionscrapRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionscrapRecordMainApi.exportProductionscrapRecordMain(tableObject.params)
-    download.excel(data, '线标报废记录.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 2e5272cea..706cfc44d 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -110,6 +110,7 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 线标原料报废申请
 defineOptions({ name: 'ProductionscrapRequestMain' })
@@ -607,7 +608,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionscrapRequestMainApi.exportProductionscrapRequestMain(tableObject.params)
-    download.excel(data, '线边原料报废申请.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -768,7 +769,7 @@ const labelPrint = async (row) => {
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '线边原料报废导入模版.xlsx'
+    templateTitle: `【${route.meta.title}】导入模版.xlsx`
   })
 
   // 导入成功之后
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
index c7d0035a6..b2ced7cb5 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
@@ -73,6 +73,7 @@ import { RepleinshJobMain,RepleinshJobMainRules,RepleinshJobDetail,RepleinshJobD
 import * as RepleinshJobMainApi from '@/api/wms/repleinshJobMain'
 import * as RepleinshJobDetailApi from '@/api/wms/repleinshJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 补料任务主
 defineOptions({ name: 'RepleinshJobMain' })
@@ -328,7 +329,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RepleinshJobMainApi.exportRepleinshJobMain(tableObject.params)
-    download.excel(data, '补料任务.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
index 5f1e898c8..3cd277407 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
@@ -67,6 +67,7 @@ import { RepleinshRecordMain,RepleinshRecordMainRules,RepleinshRecordDetail,Repl
 import * as RepleinshRecordMainApi from '@/api/wms/repleinshRecordMain'
 import * as RepleinshRecordDetailApi from '@/api/wms/repleinshRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 补料记录主
 defineOptions({ name: 'RepleinshRecordMain' })
@@ -153,7 +154,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RepleinshRecordMainApi.exportRepleinshRecordMain(tableObject.params)
-    download.excel(data, '补料记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index f3ee228f1..f1429b571 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -87,6 +87,7 @@ import { RepleinshRequestMain,RepleinshRequestMainRules,RepleinshRequestDetail,R
 import * as RepleinshRequestMainApi from '@/api/wms/repleinshRequestMain'
 import * as RepleinshRequestDetailApi from '@/api/wms/repleinshRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 补料申请
 defineOptions({ name: 'RepleinshRequestMain' })
@@ -344,7 +345,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RepleinshRequestMainApi.exportRepleinshRequestMain(tableObject.params)
-    download.excel(data, '补料申请.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -423,7 +424,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '补料申请导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index 499e908c3..7ddee302a 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -88,6 +88,7 @@ import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveReq
 import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain'
 import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as LocationApi  from '@/api/wms/location'
 
 // 库存转移申请
 defineOptions({ name: 'InventorymoveRequestMain' })
@@ -336,7 +337,32 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-
+// 物料隔离-获取到库位默认值
+const getDefaultToLocationCode = async ()=>{
+  let searchCondition = []
+  InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
+    if(item.field == "toLocationCode"){
+      searchCondition = item.tableForm.searchCondition
+    }
+  })
+  let params = {}
+  searchCondition.forEach(item=>{
+    if(item['isMainValue']){
+      params[item['key']] = formRef.value.formRef.formModel[item['value']]
+    }else{
+      params[item['key']] = item['value']
+    }
+  })
+  let res = await LocationApi.selectBusinessTypeToLocation(params)
+  console.log('res',res)
+ if(res&&res.list.length>0){
+  tableData.value.forEach(item=>{
+    if(!item['toLocationCode']){
+      item['toLocationCode'] = res.list[0]['code']
+    }
+  })
+ }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
@@ -371,6 +397,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           }
           tableData.value.push(newRow)
         })
+        if(routeName.value == 'OktoholdRequestMain'){
+          getDefaultToLocationCode()
+        }
       } else {
         row[formField] = val[0][searchField]
       }
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
index 357c857df..cb2d66d12 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as OfflinesettlementRecordMainApi from '@/api/wms/offlinesettlementReco
 import * as OfflinesettlementRecordDetailApi from '@/api/wms/offlinesettlementRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 下线结算记录主
 defineOptions({ name: 'OfflinesettlementRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await OfflinesettlementRecordMainApi.exportOfflinesettlementRecordMain(tableObject.params)
-    download.excel(data, '下线结算记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index e4708e8f2..9a60f2238 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -98,6 +98,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 
 defineOptions({ name: 'ProcessproductionRequestMain' })
@@ -408,7 +409,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProcessproductionRequestMainApi.exportProcessproductionRequestMain(tableObject.params)
-    download.excel(data, '工序报产申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -423,7 +424,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '工序报产申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
index 42c4f37f6..9ed0d75e4 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
@@ -73,6 +73,7 @@ import * as ProductdismantleJobMainApi from '@/api/wms/productdismantleJobMain'
 import * as ProductdismantleJobDetailApi from '@/api/wms/productdismantleJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 制品拆解任务主
 defineOptions({ name: 'ProductdismantleJobMain' })
 
@@ -223,7 +224,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductdismantleJobMainApi.exportProductdismantleJobMain(tableObject.params)
-    download.excel(data, '制品拆解任务主.xlsx')
+     download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
index b39050448..fcd8edda1 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
@@ -93,6 +93,7 @@ import * as ProductdismantleRecordDetailApi from '@/api/wms/productdismantleReco
 import * as DismantleRecordDetailbApi from '@/api/wms/dismantleRecordDetailb'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 制品拆解记录主
 defineOptions({ name: 'ProductdismantleRecordMain' })
 
@@ -226,7 +227,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductdismantleRecordMainApi.exportProductdismantleRecordMain(tableObject.params)
-    download.excel(data, '制品拆解记录主.xlsx')
+     download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index 3f4786a8b..a396a2639 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -112,6 +112,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from '@/api/wms/bomDismantle'
 import * as dismantleRequestDetailbApi from '@/api/wms/dismantleRequestDetailb'
 import * as BomApi from "@/api/wms/bom";
+import { formatDate } from '@/utils/formatTime'
 
 
 // 制品拆解申请
@@ -541,7 +542,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductdismantleRequestMainApi.exportProductdismantleRequestMain(tableObject.params)
-    download.excel(data, '制品拆解申请主.xlsx')
+     download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index c107abc6d..b00d63f2c 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -89,6 +89,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
 import * as BomApi from "@/api/wms/bom";
 import * as SwitchApi from '@/api/wms/switch'
+import { formatDate } from '@/utils/formatTime'
 // 生产计划主
 // 预生产计划
 defineOptions({ name: 'ProductionMain' })
@@ -549,7 +550,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionMainApi.exportProductionMain(tableObject.params)
-    download.excel(data, '预生产计划.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -627,7 +628,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '生产计划导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index d9923a922..76d95435d 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -89,6 +89,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
 import * as BomApi from "@/api/wms/bom";
 import * as SwitchApi from '@/api/wms/switch'
+import { formatDate } from '@/utils/formatTime'
 
 // 装配计划
 defineOptions({ name: 'ProductionMainAssemble' })
@@ -512,7 +513,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionMainApi.exportProductionMainAssemble(tableObject.params)
-    download.excel(data, '装配计划.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -626,7 +627,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '装配计划导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index f289523a4..4e6129d82 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -89,6 +89,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
 import * as BomApi from "@/api/wms/bom";
 import * as SwitchApi from '@/api/wms/switch'
+import { formatDate } from '@/utils/formatTime'
 
 // 装配备件计划
 defineOptions({ name: 'ProductionMainASparePart' })
@@ -500,7 +501,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionMainApi.exportProductionMainAssembleSparePart(tableObject.params)
-    download.excel(data, '装配备件计划.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 3585c8f56..9f35454a4 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -89,6 +89,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
 import * as BomApi from "@/api/wms/bom";
 import * as SwitchApi from '@/api/wms/switch'
+import { formatDate } from '@/utils/formatTime'
 
 // 预生产备件计划
 defineOptions({ name: 'ProductionMainPredictSparePart' })
@@ -502,7 +503,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionMainApi.exportProductionMainPredictSparePart(tableObject.params)
-    download.excel(data, '预生产备件计划.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -619,7 +620,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '预生产备件计划导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
index 8897f1807..b75866a36 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'QadProductionPlanMain' })
 
@@ -214,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await QadProductionPlanMainApi.exportQadProductionPlanMain(tableObject.params)
-    download.excel(data, 'QAD生产计划主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -229,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'QAD生产计划主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index c14093312..ed31768e3 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -76,6 +76,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {getAccessToken} from "@/utils/auth";
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import * as SwitchApi from '@/api/wms/switch'
+import { formatDate } from '@/utils/formatTime'
 
 // 制品上架任务主
 defineOptions({ name: 'ProductputawayJobMain' })
@@ -246,7 +247,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductputawayJobMainApi.exportProductputawayJobMain(tableObject.params)
-    download.excel(data, '制品上架任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
index c788adcc7..2abfe9ab6 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as ProductputawayRecordMainApi from '@/api/wms/productputawayRecordMain
 import * as ProductputawayRecordDetailApi from '@/api/wms/productputawayRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 制品上架记录主
 defineOptions({ name: 'ProductputawayRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
-    download.excel(data, '制品上架记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index f1d1619f0..2712cf70f 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -88,6 +88,7 @@ import { ProductputawayRequestMain,ProductputawayRequestMainRules,Productputaway
 import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMain'
 import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 制品上架申请
 defineOptions({ name: 'ProductputawayRequestMain' })
@@ -342,7 +343,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductputawayRequestMainApi.exportProductputawayRequestMain(tableObject.params)
-    download.excel(data, '制品上架申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -416,7 +417,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '制品上架申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
index a6fe1a158..eb9b174f7 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
@@ -76,6 +76,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import * as SwitchApi from '@/api/wms/switch'
 import {getAccessToken} from "@/utils/auth";
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 装配制品上架任务主
 defineOptions({ name: 'ProductputawayJobMain' })
 
@@ -249,7 +250,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductputawayJobMainApi.exportProductputawayJobMain(tableObject.params)
-    download.excel(data,  route.meta.title+'.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
index d1451da7b..4bffe5fac 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as ProductputawayRecordMainApi from '@/api/wms/productputawayRecordMain
 import * as ProductputawayRecordDetailApi from '@/api/wms/productputawayRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 制品上架记录主
 defineOptions({ name: 'ProductputawayRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
-    download.excel(data, route.meta.title+'.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index 28366c9bf..1b39b44e4 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@@ -88,6 +88,7 @@ import { ProductputawayRequestMain,ProductputawayRequestMainRules,Productputaway
 import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMain'
 import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 制品上架申请 装配上架申请 装配制品上架申请
 defineOptions({ name: 'ProductputawayRequestMain' })
@@ -344,7 +345,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductputawayRequestMainApi.exportProductputawayRequestMainAssemble(tableObject.params)
-    download.excel(data,  route.meta.title+'.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -417,7 +418,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '制品上架申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 253fb0f49..24215192e 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -104,6 +104,7 @@ import {
   BackflushRecordDetailb
 } from "@/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data";
 
+import { formatDate } from '@/utils/formatTime'
 // 制品收货任务主
 // 预生产收货任务主
 defineOptions({ name: 'ProductreceiptJobMain' })
@@ -350,7 +351,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
-    download.excel(data, '制品收货任务.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 8493a2bd0..3abac7cae 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -102,6 +102,7 @@ import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequest
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 
+import { formatDate } from '@/utils/formatTime'
 // 制品收货记录主
 // 预生产收货记录主
 defineOptions({ name: 'ProductreceiptRecordMain' })
@@ -294,7 +295,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params)
-    download.excel(data, '制品收货记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index f5f87a731..1ba04efcc 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -150,6 +150,7 @@ import { getAccessToken } from '@/utils/auth'
 import dayjs from 'dayjs'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import * as BomApi from "@/api/wms/bom";
+import { formatDate } from '@/utils/formatTime'
 // 制品收货申请
 // 预生产收货申请
 defineOptions({ name: 'ProductreceiptRequestMain' })
@@ -567,7 +568,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(tableObject.params)
-    download.excel(data, '制品收货申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -645,7 +646,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '制品收货申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
index dac357f0d..bf7f05680 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
@@ -73,6 +73,7 @@ import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
 import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 
 // 装配收货任务主
 defineOptions({ name: 'ProductreceiptJobMainA' })
@@ -290,7 +291,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptJobMainApi.exportProductreceiptJobMainAssemble(tableObject.params)
-    download.excel(data, '装配收货任务.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index 67e177c28..6c885fcae 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -122,6 +122,7 @@ import {
   SupplierdeliverRequestPackage
 } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 装配收货记录主
 defineOptions({ name: 'ProductreceiptRecordMainA' })
@@ -358,7 +359,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordAssembleMain(tableObject.params)
-    download.excel(data, '装配收货记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 37b729e3f..db480fd1e 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -150,6 +150,7 @@ import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import * as BomApi from "@/api/wms/bom";
+import { formatDate } from '@/utils/formatTime'
 
 // 装配收货申请
 defineOptions({ name: 'ProductreceiptRequestMainA' })
@@ -567,7 +568,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMainAssemble(tableObject.params)
-    download.excel(data, '制品收货申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -646,7 +647,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '装配收货申请导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index 995a10ac6..836ed5a27 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -74,6 +74,7 @@ import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
 import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 制品收货任务主
 defineOptions({ name: 'ProductreceiptJobMain' })
 
@@ -287,7 +288,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
-    download.excel(data, route.meta.title+'.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
index 69439d8b4..a40cdcdc8 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -92,6 +92,7 @@ import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 制品收货记录主
 defineOptions({ name: 'ProductreceiptRecordMain' })
 
@@ -199,7 +200,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params)
-    download.excel(data, route.meta.title+'.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 2fa3d5bd2..5a386df07 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -141,6 +141,7 @@ import {
   SupplierdeliverRequestPackage
 } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 制品收货申请
 // 隔离报工申请
@@ -554,7 +555,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(tableObject.params)
-    download.excel(data, route.meta.title+'.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -631,7 +632,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '隔离报工申请导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
index 19de72466..80c0ff2ff 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
@@ -60,6 +60,7 @@ import { ProductredressJobMain,ProductredressJobMainRules,ProductredressJobDetai
 import * as ProductredressJobMainApi from '@/api/wms/productredressJobMain'
 import * as ProductredressJobDetailApi from '@/api/wms/productredressJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'ProductredressJobMain' })
 
@@ -195,7 +196,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductredressJobMainApi.exportProductredressJobMain(tableObject.params)
-    download.excel(data, '制品回收任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
index f85fe1943..c4c8cc8e4 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
@@ -58,6 +58,7 @@ import { ProductredressRecordMain,ProductredressRecordMainRules,ProductredressRe
 import * as ProductredressRecordMainApi from '@/api/wms/productredressRecordMain'
 import * as ProductredressRecordDetailApi from '@/api/wms/productredressRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'ProductredressRecordMain' })
 
@@ -139,7 +140,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductredressRecordMainApi.exportProductredressRecordMain(tableObject.params)
-    download.excel(data, '制品回收记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index 8a9c000a3..fce1bdba6 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -113,6 +113,7 @@ 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 { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'ProductredressRequestMain' })
 
@@ -382,7 +383,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductredressRequestMainApi.exportProductredressRequestMain(tableObject.params)
-    download.excel(data, '制品回收申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -457,7 +458,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '制品回收申请导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
index 8cab2de1e..848994c16 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
@@ -96,6 +96,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle";
 import {getBomDismantleRecordPage} from "@/api/wms/bomDismantle";
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 制品返修记录主
 defineOptions({ name: 'ProductrepairRecordMain' })
 
@@ -265,7 +266,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductrepairRecordMainApi.exportProductrepairRecordMain(tableObject.params)
-    download.excel(data, '制品返修记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 89c622b32..542181a69 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -117,6 +117,7 @@ import * as BomDismantleApi from '@/api/wms/bomDismantle'
 import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb";
 import {updateProductscrapDetailRequestBom} from "@/api/wms/productrepairRequestMain";
 import * as BomApi from "@/api/wms/bom";
+import { formatDate } from '@/utils/formatTime'
 
 
 // 制品返修申请
@@ -575,7 +576,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductrepairRequestMainApi.exportProductrepairRequestMain(tableObject.params)
-    download.excel(data, '制品返修申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -680,7 +681,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '制品返修申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
index c03c33b32..ce2845cca 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
@@ -73,6 +73,7 @@ import * as ProductscrapJobMainApi from '@/api/wms/productscrapJobMain'
 import * as ProductscrapJobDetailApi from '@/api/wms/productscrapJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 制品报废任务主
 defineOptions({ name: 'ProductscrapJobMain' })
 
@@ -223,7 +224,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductscrapJobMainApi.exportProductscrapJobMain(tableObject.params)
-    download.excel(data, '制品报废任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
index 76405880a..68546914a 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
@@ -95,6 +95,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle";
 import {getProductscrapBomDismantleRecordPage} from "@/api/wms/bomDismantle";
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 制品报废记录主
 defineOptions({ name: 'ProductscrapRecordMain' })
 
@@ -266,7 +267,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductscrapRecordMainApi.exportProductscrapRecordMain(tableObject.params)
-    download.excel(data, '制品报废记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 9274b2073..76301b377 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -498,14 +498,14 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: 'Bom版本',
-  //   field: 'bomVersion',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '批次',
     field: 'batch',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 31d59a712..93a39b2c9 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -122,6 +122,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle"
 import * as BomApi from "@/api/wms/bom";
 import * as BalanceApi from "@/api/wms/balance";
+import { formatDate } from '@/utils/formatTime'
 
 // 制品报废申请
 defineOptions({ name: 'ProductscrapRequestMain' })
@@ -676,7 +677,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductscrapRequestMainApi.exportProductscrapRequestMain(tableObject.params)
-    download.excel(data, '制品报废申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -803,7 +804,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '制品报废申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
index b2779c087..73a95c56b 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
@@ -73,6 +73,7 @@ import * as InspectJobMainApi from '@/api/wms/inspectJobMain'
 import * as InspectJobDetailApi from '@/api/wms/inspectJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { formatDate } from '@/utils/formatTime'
 // 检验任务主
 defineOptions({ name: 'InspectJobMain' })
 
@@ -233,7 +234,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params)
-    download.excel(data, '检验任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index b7f63eff1..a987cad02 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -72,6 +72,7 @@ import * as InspectRecordDetailApi from '@/api/wms/inspectRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import  Preview  from '@/components/UploadFile/src/Preview.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { formatDate } from '@/utils/formatTime'
 // 检验记录主
 defineOptions({ name: 'InspectRecordMain' })
 
@@ -179,7 +180,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params)
-    download.excel(data, '检验记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index 91b579ad2..4cbc8f5df 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -53,6 +53,7 @@
   import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
   import * as InspectRequestDetailApi from '@/api/wms/inspectRequestDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import { formatDate } from '@/utils/formatTime'
 
   // 到货检验申请
   defineOptions({ name: 'InspectRequestMain' })
@@ -322,7 +323,7 @@
       // 发起导出
       exportLoading.value = true
       const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params)
-      download.excel(data, '检验申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
       exportLoading.value = false
@@ -385,7 +386,7 @@
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '检验申请主导入模版.xlsx'
+    templateTitle: `【${route.meta.title}】导入模版.xlsx`
   })
 
   // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 80dbd8b06..6cf95dc4e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -104,6 +104,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getReportUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 采购收货任务主
 defineOptions({ name: 'PurchasereceiptJobMain' })
 
@@ -363,7 +364,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params)
-    download.excel(data, '采购收货任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index b51dbbefd..8eb9603f4 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -115,6 +115,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getReportUrl } from '@/utils/systemParam'
+
+import { formatDate } from '@/utils/formatTime'
 // 采购收货记录主
 defineOptions({ name: 'PurchasereceiptRecordMain' })
 const message = useMessage() // 消息弹窗
@@ -303,10 +305,10 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
-      download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
-      download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {
   } finally {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
index c96206f80..2dcb35833 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
@@ -115,6 +115,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { PurchasereceiptRefuseRequestTabsList } from '@/utils/disposition/tabsList'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getReportUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 采购收货记录主
 defineOptions({ name: 'PurchasereceiptRecordRefuseMain' })
 const message = useMessage() // 消息弹窗
@@ -292,10 +293,10 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
-      download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params)
-      download.excel(data, `${t('ts.采购拒收记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {
   } finally {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index d7dd91517..c05b715f6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -762,7 +762,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
-    download.excel(data, '采购收货申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -838,7 +838,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购收货申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
index 07e80cbb0..e5365a2ca 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -73,6 +73,7 @@ import * as PurchasereturnJobMainApi from '@/api/wms/purchasereturnJobMain'
 import * as PurchasereturnJobDetailApi from '@/api/wms/purchasereturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 
 // 采购退货任务主
 defineOptions({ name: 'PurchasereturnJobMain' })
@@ -238,7 +239,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params)
-    download.excel(data, '采购退货任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index 4619a99d0..6765de99b 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -70,6 +70,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getAccessToken } from '@/utils/auth'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 采购退货记录主
 defineOptions({ name: 'PurchasereturnRecordMain' })
 
@@ -140,15 +141,15 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'documentPrint') {
     // 单据打印
-    handleDocumentPrint(row.masterId)
+    handleDocumentPrint(row.id,row.masterId)
   }
 }
 
 // 单据打印
 const BASE_URL = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken())
-const handleDocumentPrint = async (id) => {
-  window.open(documentSrc.value + '&id=' + id)
+const handleDocumentPrint = async (id,masterId) => {
+  window.open(documentSrc.value + '&id=' + id+ '&masterId=' + masterId)
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
@@ -170,12 +171,11 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
-      download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
-      download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
-    
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 2bf3d83ec..700d90eda 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -139,6 +139,7 @@ import { getAccessToken } from '@/utils/auth'
 import * as BalanceApi from '@/api/wms/balance'
 import { async } from '@antv/x6/lib/registry/marker/async'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestMain' })
 
@@ -758,7 +759,7 @@ const handleExport = async () => {
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
       tableObject.params
     )
-    download.excel(data, '采购退货申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -983,7 +984,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购退货申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
index 5f5e2b9ed..a2ec773c7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
@@ -70,6 +70,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getAccessToken } from '@/utils/auth'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+  import { formatDate } from '@/utils/formatTime'
 // 采购退货记录主
 defineOptions({ name: 'PurchasereturnRecordSpareMain' })
 
@@ -170,10 +171,10 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
-      download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params)
-      download.excel(data, `维修备件退货记录主.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
     
   } catch {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
index bea529f22..a5de550cc 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
@@ -141,6 +141,7 @@ import { getAccessToken } from '@/utils/auth'
 import * as BalanceApi from '@/api/wms/balance'
 import { async } from '@antv/x6/lib/registry/marker/async'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+  import { formatDate } from '@/utils/formatTime'
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestSpareMain' })
 
@@ -708,7 +709,7 @@ const handleExport = async () => {
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare(
       tableObject.params
     )
-    download.excel(data, '维修备件退货申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index c4a0dd4b4..7dee1ed75 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -101,6 +101,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {getAccessToken} from "@/utils/auth";
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+  import { formatDate } from '@/utils/formatTime'
 // 上架任务主
 defineOptions({ name: 'PutawayJobMain' })
 
@@ -348,7 +349,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params)
-    download.excel(data, '上架任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
index 3d07d9ad2..9aa5e6792 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
@@ -91,6 +91,7 @@ import * as PutawayRecordMainApi from '@/api/wms/putawayRecordMain'
 import * as PutawayRecordDetailApi from '@/api/wms/putawayRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { formatDate } from '@/utils/formatTime'
 // 上架记录主
 defineOptions({ name: 'PutawayRecordMain' })
 
@@ -211,7 +212,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params)
-    download.excel(data, '上架记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index 1223cadad..ad499e129 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -110,6 +110,7 @@ import { PutawayRequestMain,
 import * as PutawayRequestMainApi from '@/api/wms/putawayRequestMain'
 import * as PutawayRequestDetailApi from '@/api/wms/putawayRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import { formatDate } from '@/utils/formatTime'
 
 // 上架申请
 defineOptions({ name: 'PutawayRequestMain' })
@@ -406,7 +407,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params)
-    download.excel(data, '上架申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -475,7 +476,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '上架申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
index 76e6d66a4..b32591516 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@@ -74,6 +74,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {exportSparereceiptJobMain} from "@/api/wms/purchasereceiptJobMain";
+import { formatDate } from '@/utils/formatTime'
 // 备件收货任务主
 defineOptions({ name: 'PurchasereceiptJobMain' })
 
@@ -259,7 +260,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params)
-    download.excel(data, '备件收货任务.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
index f5270ed4f..0682aad0b 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
@@ -85,6 +85,7 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...PurchasereceiptRecordMain.allSchemas.tableColumns,...PurchasereceiptRecordDetail.allSchemas.tableMainColumns])
 const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
+import { formatDate } from '@/utils/formatTime'
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -160,7 +161,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params)
-    download.excel(data, '备件收货记录.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index 622c5196f..8020ef79d 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -561,7 +561,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params)
-    download.excel(data, '备件收货申请.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -628,7 +628,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购收货申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index 19632d743..2ffc91738 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -109,45 +109,45 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '版本号',
-  //   field: 'version',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isSearch:true,
-  //   search: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       multiple: true,
-  //       enterSearch: true,
-  //       isSearchList: true, // 开启查询弹窗
-  //       searchListPlaceholder: '请选择版本号', // 输入框占位文本
-  //       searchField: 'detailVersion', // 查询弹窗赋值字段
-  //       searchTitle: '版本号', // 查询弹窗标题
-  //       searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
-  //       searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
-  //       searchCondition: [{
-  //         key: 'supplierCodes',
-  //         value: 'supplierCode',
-  //         message: '请填写供应商代码！',
-  //         isMainValue: true,
-  //         isCSV:true,//是否用逗号分隔参数
-  //       },{
-  //         key: 'itemCodes',
-  //         value: 'itemCode',
-  //         message: '请填写物料代码！',
-  //         isMainValue: true,
-  //         isCSV:true,//是否用逗号分隔参数
-  //       },{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       }]
-  //     }
-  //   }
-  // },
+  {
+    label: '版本号',
+    field: 'version',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:false,
+    search: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        multiple: true,
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择版本号', // 输入框占位文本
+        searchField: 'detailVersion', // 查询弹窗赋值字段
+        searchTitle: '版本号', // 查询弹窗标题
+        searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
+        searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'supplierCodes',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'itemCodes',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
   {
     label: '到货日期',
     field: 'dueDate',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index dc00704d6..ee1d15355 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -687,13 +687,13 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6
     }
   },
@@ -1255,11 +1255,11 @@ const validateBatch = (rule: any, value: any, callback: any) => {
 
 const validateQty = (rule: any, value: any, callback: any,a,b) => {
   console.log('validateQty',rule, value,a,b)
-  // if (!reg.test(value)) {
-  //     callback(new Error('英文字母、数字或下划线'));
-  // } else {
+  if (!value) {
+      callback(new Error('发货数量必须大于0'));
+  } else {
       callback();
-  // }
+  }
 }  
 //表单校验
 export const SupplierdeliverRequestDetailRules = reactive({
@@ -1267,8 +1267,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
   //   { required: true, message: '请输入包装号', trigger: 'blur' }
   // ],
   qty:[
-    { required: true, message: '请输入发货数量1', trigger: 'change' },
-    // { validator: validateQty, trigger: 'change' },
+    { required: true, message: '请输入发货数量', trigger: 'change' },
+    { validator: validateQty, trigger: 'change' },
   ],
   supplierBatch: [
     { required: true, message: '请输入供应商批次', trigger: 'blur' }
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
index f3342060f..6784b9653 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as PurchaseclaimRecordMainApi from '@/api/wms/purchaseclaimRecordMain'
 import * as PurchaseclaimRecordDetailApi from '@/api/wms/purchaseclaimRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { formatDate } from '@/utils/formatTime'
 // 采购索赔记录主
 defineOptions({ name: 'PurchaseclaimRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params)
-    download.excel(data, '采购索赔记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index d95021822..3b4377640 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -77,6 +77,7 @@
   import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+  import { formatDate } from '@/utils/formatTime'
 
   // 供应商索赔申请
   defineOptions({ name: 'PurchaseclaimRequestMain' })
@@ -414,7 +415,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
       // 发起导出
       exportLoading.value = true
       const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(tableObject.params)
-      download.excel(data, '采购索赔申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
       exportLoading.value = false
@@ -484,7 +485,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '采购索赔申请信息导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
   })
   // 导入成功之后
   const importSuccess = () => {