diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index cb68ced7d..7d5f0e142 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -3,7 +3,7 @@
   <div class="annex">
     <div class="title flex items-center">
       <!-- <div class="title-txt">附件</div> -->
-      <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData" :limit="10"
+      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" title="添加附件" :upData="upData" :limit="10"
         @update:modelValue="handleAnnexSuccess" v-if="annexData.annexList.length<5"/>
     </div>
     <div class="list">
@@ -48,6 +48,13 @@ const props = defineProps({
     type: Object,
     required: true
   },
+  fileType:{
+    type:Array,
+    required: false,
+    default: () => {
+      return ['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']
+    }
+  },
   showPreview: {
     type: Boolean,
     required: false
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index ad389ea97..9ce1534df 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -103,6 +103,7 @@
             <ElScrollbar ref="scrollbar" :style="{height:annexItem.hasSubDetail?'100%':(remarkHeight-40)+'px'}">
               <Annex v-show="tabsList[current].label==annexItem.label"
                   :annexData="annexItem"
+                  :fileType="annexItem.fileType"
                   :showPreview="annexItem.showPreview"
                   :showDownload = "annexItem.showDownload"
                   :hiddenDelete = "annexItem.hiddenDelete"
@@ -482,6 +483,7 @@ const getAnnexFileList =  async (row) => {
         annexList,
         hasSubDetail:item.hasSubDetail||false,
         subDetailTableData:item.subDetailTableData,
+        fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
         showPreview:item.showPreview||false, // 是否展示预览按钮
         showDownload:item.showDownload||false, // 是否展示下载按钮
         hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 33de112d5..05ce5f239 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -56,7 +56,7 @@ const props = defineProps({
   title: propTypes.string.def('文件上传'),
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
   upData: propTypes.object.def(),
-  fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileSize: propTypes.number.def(5), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
   autoUpload: propTypes.bool.def(true), // 自动上传
diff --git a/src/views/qms/basicDataManage/counter/counter.data.ts b/src/views/qms/counter/counter.data.ts
similarity index 100%
rename from src/views/qms/basicDataManage/counter/counter.data.ts
rename to src/views/qms/counter/counter.data.ts
diff --git a/src/views/qms/basicDataManage/counter/index.vue b/src/views/qms/counter/index.vue
similarity index 100%
rename from src/views/qms/basicDataManage/counter/index.vue
rename to src/views/qms/counter/index.vue
diff --git a/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts b/src/views/qms/dynamicRule/dynamicRule.data.ts
similarity index 100%
rename from src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts
rename to src/views/qms/dynamicRule/dynamicRule.data.ts
diff --git a/src/views/qms/basicDataManage/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue
similarity index 100%
rename from src/views/qms/basicDataManage/dynamicRule/index.vue
rename to src/views/qms/dynamicRule/index.vue
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
new file mode 100644
index 000000000..8d3704a9a
--- /dev/null
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -0,0 +1,860 @@
+<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" @opensearchTable="opensearchTable" />
+        <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>
+        <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">
+            <div class="small-title">检验工序</div>
+            <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>
+            <div class="small-title">检验特性</div>
+            <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+              <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">
+                  <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>
+                      <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-col :span="24" v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO.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.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="请输入检验值" type="number"/>
+                      </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.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>
+                </el-col>
+              </el-row>
+            </el-form>
+          </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 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))
+    // console.log(data.value)// 发起承接
+    //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
+    let list = []
+    list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
+    data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
+    list.forEach((item, index) => {
+      editableTabsValue.value = index + 1
+      item.name = index + 1
+      item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO
+      
+      // 总数量值是 样品份数 乘 每份样品量
+      allSamplePieceSize.value += parseFloat((parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *  parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)).toFixed(2))
+      // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+      if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 0) {
+        // 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: '', //合格数量
+            unqualifiedQuantity: '' //不合格数量
+          }
+        )
+      }
+      // 编辑判断上限下限目标值是否必填
+      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
+      }
+    })
+    console.log(22,allSamplePieceSize.value )
+    data.value.subList = list
+    /**
+      设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，
+      第一个包装采样数量>总数量 则显示总数量
+    */
+   for(let i = 0; i<data.value.packageList.length;i++){
+      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(2))
+      }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: ''
+          }
+        })
+        console.log(data.value.subList)
+
+        editableTabsValue.value = newTabName
+        dialogVisibleName.value = false
+      } else {
+        console.log('error submit!')
+        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
+  }
+}
+// 传递给父类
+const emit = defineEmits(['submitForm', 'searchTableSuccess'])
+const validateForm = (formRef) => {
+  // console.log(TableBaseForm_Ref.value)
+  let _lists = formRef?.map((v) => v.validate())
+  return Promise.all(_lists)
+    .then(() => {
+      return true
+    })
+    .catch(() => {
+      return false
+    })
+}
+const tableFormRef = ref()
+const submitForm = async () => {
+  try {
+    console.log(data.value.subList)
+    const elForm = unref(formMainRef)?.getElFormRef()
+    // 校验表单
+    if (!elForm) return
+    const valid = await elForm.validate()
+    if (!valid) return
+    // 校验包装列表
+ 
+    console.log(11,data.value.packageList)
+    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) => {
+              console.log(12,cur.qualifiedQuantity)
+              console.log(13,cur.unqualifiedQuantity)
+              console.log(14,item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
+              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;
+    }
+    if (formType.value == 'create') {
+      // 主子表——提交请求
+      emit('submitForm', formType.value, data.value)
+    } else {
+      // 编辑/执行
+      emit('submitForm', formType.value, data.value)
+    }
+  } catch {
+    console.log(111)
+  }
+}
+/** 弹窗按钮 */
+let Butttondata: any = []
+if (props.footButttondata) {
+  Butttondata = props.footButttondata
+} else {
+  Butttondata = [
+    defaultButtons.formSaveBtn(null), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+}
+// 选择特征类型
+const changeFeatureType = (e) => {
+  console.log(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: '' //不合格数量
+      }
+    ]
+  }
+  console.log(222, item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList)
+}
+// 选择选定级
+const changeQualitativeCode = (e, item, cur) => {
+  let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e)
+  console.log(obj)
+  cur.defectLevel = obj.defectLevel
+  cur.estimateCode = obj.estimateCode
+}
+</script>
+<style scoped>
+.small-title {
+  font-weight: bold;
+  padding: 0px 10px 10px;
+  color: #1a8bfc;
+  font-size: 16px;
+}
+</style>
+<style>
+.el-tabs--left .el-tabs__header.is-left {
+  min-height: 700px !important;
+  min-width: 150px !important;
+}
+.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
+  min-width: 120px !important;
+}
+</style>
diff --git a/src/views/qms/inspection/inspectionJob/detail.vue b/src/views/qms/inspectionJob/detail.vue
similarity index 100%
rename from src/views/qms/inspection/inspectionJob/detail.vue
rename to src/views/qms/inspectionJob/detail.vue
diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
new file mode 100644
index 000000000..dcc7d81b3
--- /dev/null
+++ b/src/views/qms/inspectionJob/index.vue
@@ -0,0 +1,314 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InspectionJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="InspectionJobMain.allSchemas" />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :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" />
+</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'
+
+  // 采购订单
+  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.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 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.mainListPackageBtn(null), // 包装
+    ]
+  }
+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 == 'mainJobAcc') { // 承接
+    handleAccept(row.id)
+  }
+  }
+
+  /** 添加/修改操作 */
+  // 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 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 {
+      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
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
+    }
+  }
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
+  })
+</script>
diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
similarity index 100%
rename from src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
rename to src/views/qms/inspectionJob/inspectionJobMain.data.ts
diff --git a/src/views/qms/inspection/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue
similarity index 100%
rename from src/views/qms/inspection/inspectionRecord/addForm.vue
rename to src/views/qms/inspectionRecord/addForm.vue
diff --git a/src/views/qms/inspection/inspectionRecord/detail.vue b/src/views/qms/inspectionRecord/detail.vue
similarity index 100%
rename from src/views/qms/inspection/inspectionRecord/detail.vue
rename to src/views/qms/inspectionRecord/detail.vue
diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
similarity index 100%
rename from src/views/qms/inspection/inspectionRecord/index.vue
rename to src/views/qms/inspectionRecord/index.vue
diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
similarity index 100%
rename from src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
rename to src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue
similarity index 100%
rename from src/views/qms/inspection/inspectionRequest/index.vue
rename to src/views/qms/inspectionRequest/index.vue
diff --git a/src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
similarity index 100%
rename from src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts
rename to src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
diff --git a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue
similarity index 99%
rename from src/views/qms/basicDataManage/inspectionScheme/addForm.vue
rename to src/views/qms/inspectionScheme/addForm.vue
index e199200ac..540a2dc53 100644
--- a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@@ -637,7 +637,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
 import { SearchTable } from '@/components/SearchTable'
 import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
-import { InspectionTemplateMain } from '@/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data'
+import { InspectionTemplateMain } from '@/views/qms/inspectionTemplate/inspectionTemplate.data'
 import * as InspectionTemplateApi from '@/api/qms/inspectionTemplate'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import * as ItemBasicApi from '@/api/wms/itembasic'
@@ -645,9 +645,9 @@ import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程
 import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法
 import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法
 import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
-import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则
+import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则
 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
-import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集
+import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集
 import {validateTwoNum} from '@/utils/validator'
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/qms/basicDataManage/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue
similarity index 100%
rename from src/views/qms/basicDataManage/inspectionScheme/index.vue
rename to src/views/qms/inspectionScheme/index.vue
diff --git a/src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
similarity index 100%
rename from src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts
rename to src/views/qms/inspectionScheme/inspectionScheme.data.ts
diff --git a/src/views/qms/basicDataManage/inspectionStage/index.vue b/src/views/qms/inspectionStage/index.vue
similarity index 100%
rename from src/views/qms/basicDataManage/inspectionStage/index.vue
rename to src/views/qms/inspectionStage/index.vue
diff --git a/src/views/qms/basicDataManage/inspectionStage/inspectionStage.data.ts b/src/views/qms/inspectionStage/inspectionStage.data.ts
similarity index 100%
rename from src/views/qms/basicDataManage/inspectionStage/inspectionStage.data.ts
rename to src/views/qms/inspectionStage/inspectionStage.data.ts
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/inspectionTemplate/addForm.vue
similarity index 99%
rename from src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
rename to src/views/qms/inspectionTemplate/addForm.vue
index aa72e0a49..3ac8f2979 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/inspectionTemplate/addForm.vue
@@ -431,9 +431,9 @@ import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程
 import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法
 import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法
 import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
-import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则
+import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则
 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
-import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集
+import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集
 import { validateInteger,validateTwoNum,validateMaxNumber5,validateNumSix } from '@/utils/validator'
 const message = useMessage() // 消息弹窗
 
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/index.vue b/src/views/qms/inspectionTemplate/index.vue
similarity index 100%
rename from src/views/qms/basicDataManage/inspectionTemplate/index.vue
rename to src/views/qms/inspectionTemplate/index.vue
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
similarity index 100%
rename from src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts
rename to src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
diff --git a/src/views/qms/basicDataManage/selectedProject/index.vue b/src/views/qms/selectedProject/index.vue
similarity index 100%
rename from src/views/qms/basicDataManage/selectedProject/index.vue
rename to src/views/qms/selectedProject/index.vue
diff --git a/src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts b/src/views/qms/selectedProject/selectedProject.data.ts
similarity index 100%
rename from src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts
rename to src/views/qms/selectedProject/selectedProject.data.ts
diff --git a/src/views/qms/basicDataManage/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue
similarity index 100%
rename from src/views/qms/basicDataManage/selectedSet/index.vue
rename to src/views/qms/selectedSet/index.vue
diff --git a/src/views/qms/basicDataManage/selectedSet/selectedSet.data.ts b/src/views/qms/selectedSet/selectedSet.data.ts
similarity index 100%
rename from src/views/qms/basicDataManage/selectedSet/selectedSet.data.ts
rename to src/views/qms/selectedSet/selectedSet.data.ts
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index e125b7976..34c890aa4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -15,6 +15,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
           tableId: '',
           tableName: 'SupplierdeliverInspectionDetail',
         },
+        fileType:['pdf','png','jpg','jpeg'],
         limit:1,
         fileSize:100
       }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 4002104d1..674cfb502 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -83,6 +83,7 @@
       tableName:'SupplierdeliverInspectionDetail',
       hasSubDetail:true, // 附件中是否展示明细表
       showPreview:true, // 附件中是否展示预览按钮
+      fileType:['pdf','jpg','png','jpeg'],
       align:'left',
       //明细表数据
       subDetailTableData:{