diff --git a/src/api/qms/inspectionJob/inspectionJobDetail/index.ts b/src/api/qms/inspectionJob/inspectionJobDetail/index.ts
index 742627e2b..12679e310 100644
--- a/src/api/qms/inspectionJob/inspectionJobDetail/index.ts
+++ b/src/api/qms/inspectionJob/inspectionJobDetail/index.ts
@@ -28,38 +28,42 @@ export const getInspectionJobDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/inspection/inspection-job-detail/senior', data })
+    return await request.post({ url: '/qms/inspection-job-detail/senior', data })
   } else {
-    return await request.get({ url: `/inspection/inspection-job-detail/page`, params })
+    return await request.get({ url: `/qms/inspection-job-detail/page`, params })
   }
 }
+//查询检验申请列表
+export const getInspectionJobDetailList = async (id: number) => {
+  return await request.get({ url: `/qms/inspection-job-detail/list?masterId=` + id })
+}
 
 // 查询检验申请详情
 export const getInspectionJobDetail = async (id: number) => {
-  return await request.get({ url: `/inspection/inspection-job-detail/get?id=` + id })
+  return await request.get({ url: `/qms/inspection-job-detail/get?id=` + id })
 }
 
 // 新增检验申请
 export const createInspectionJobDetail = async (data: InspectionJobDetailVO) => {
-  return await request.post({ url: `/inspection/inspection-job-detail/create`, data })
+  return await request.post({ url: `/qms/inspection-job-detail/create`, data })
 }
 
 // 修改检验申请
 export const updateInspectionJobDetail = async (data: InspectionJobDetailVO) => {
-  return await request.put({ url: `/inspection/inspection-job-detail/update`, data })
+  return await request.put({ url: `/qms/inspection-job-detail/update`, data })
 }
 
 // 删除检验申请
 export const deleteInspectionJobDetail = async (id: number) => {
-  return await request.delete({ url: `/inspection/inspection-job-detail/delete?id=` + id })
+  return await request.delete({ url: `/qms/inspection-job-detail/delete?id=` + id })
 }
 
 // 导出检验申请 Excel
 export const exportInspectionJobDetail = async (params) => {
-  return await request.download({ url: `/inspection/inspection-job-detail/export-excel`, params })
+  return await request.download({ url: `/qms/inspection-job-detail/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/inspection/inspection-job-detail/get-import-template' })
+  return request.download({ url: '/qms/inspection-job-detail/get-import-template' })
 }
diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
index 7bb8b4411..96170650a 100644
--- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts
+++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
@@ -28,38 +28,38 @@ export const getInspectionJobMainPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/inspection/inspection-job-main/senior', data })
+    return await request.post({ url: '/qms/inspection-job-main/senior', data })
   } else {
-    return await request.get({ url: `/inspection/inspection-job-main/page`, params })
+    return await request.get({ url: `/qms/inspection-job-main/page`, params })
   }
 }
 
 // 查询检验申请详情
 export const getInspectionJobMain = async (id: number) => {
-  return await request.get({ url: `/inspection/inspection-job-main/get?id=` + id })
+  return await request.get({ url: `/qms/inspection-job-main/get?id=` + id })
 }
 
 // 新增检验申请
 export const createInspectionJobMain = async (data: InspectionJobMainVO) => {
-  return await request.post({ url: `/inspection/inspection-job-main/create`, data })
+  return await request.post({ url: `/qms/inspection-job-main/create`, data })
 }
 
 // 修改检验申请
 export const updateInspectionJobMain = async (data: InspectionJobMainVO) => {
-  return await request.put({ url: `/inspection/inspection-job-main/update`, data })
+  return await request.put({ url: `/qms/inspection-job-main/update`, data })
 }
 
 // 删除检验申请
 export const deleteInspectionJobMain = async (id: number) => {
-  return await request.delete({ url: `/inspection/inspection-job-main/delete?id=` + id })
+  return await request.delete({ url: `/qms/inspection-job-main/delete?id=` + id })
 }
 
 // 导出检验申请 Excel
 export const exportInspectionJobMain = async (params) => {
-  return await request.download({ url: `/inspection/inspection-job-main/export-excel`, params })
+  return await request.download({ url: `/qms/inspection-job-main/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/inspection/inspection-job-main/get-import-template' })
+  return request.download({ url: '/qms/inspection-job-main/get-import-template' })
 }
diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index 591a4a6cb..f427dbd65 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -7,7 +7,7 @@
       :close-on-click-modal="false"
       :vLoading="formLoading"
     >
-      <div style="max-height: 60vh; overflow-y: auto; padding: 0px 20px">
+      <div style="max-height: 80vh; overflow-y: auto; padding: 0px 20px">
         <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
           <el-row gutter="20">
             <el-col :span="12">
@@ -879,6 +879,7 @@ const submitForm = async () => {
   try {
     const validateForm1 = await validateForm(formProcessRef.value)
     console.log(validateForm1)
+    console.log(data.value)
     await formMainRef.value.validate()
     if (!data.value.process || data.value.process.length == 0) {
       message.error(`请添加工序`)
diff --git a/src/views/qms/basicDataManage/inspectionPlan/index.vue b/src/views/qms/basicDataManage/inspectionPlan/index.vue
index a77b24eb8..787063cb2 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/index.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/index.vue
@@ -60,7 +60,6 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import AddForm from './addForm.vue'
 import * as InspectionPlanApi from '@/api/qms/inspectionPlan'
-import { json } from 'stream/consumers'
 
 defineOptions({ name: 'AgvLocationrelation' })
 
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index 28d00ba06..2d701589d 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -6,7 +6,7 @@
     :close-on-click-modal="false"
     :vLoading="formLoading"
   >
-    <div style="max-height: 60vh; overflow-y: auto; padding: 0px 20px">
+    <div style="max-height: 80vh; overflow-y: auto; padding: 0px 20px">
       <!-- <Form ref="formRefMain" :schema="formAllSchemasMain" :is-col="true" :rules="rules" /> -->
       <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
         <el-row gutter="20">
@@ -571,6 +571,9 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       version: '',
       process: []
     }
+    rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
   }
 
   tabIndex = data.value.process.length + 1
@@ -625,9 +628,9 @@ const buttonBaseClick1 = (val) => {
             isDestructionInspection: '',
             resultEntryMethod: '',
             featureType: '',
-            quantifyIsCapping: '',
-            quantifyIsLowlimit: '',
-            quantifyIsTarget: '',
+            quantifyIsCapping: false,
+            quantifyIsLowlimit: false,
+            quantifyIsTarget: false,
             quantifyTarget: '',
             quantifyCapping: '',
             quantifyLowlimit: '',
@@ -636,8 +639,9 @@ const buttonBaseClick1 = (val) => {
             quantifyQuantifyCode: ''
           }
         })
-        console.log(data.value.process)
-
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
         editableTabsValue.value = newTabName
         dialogVisibleName.value = false
       } else {
diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue
new file mode 100644
index 000000000..3f8177d67
--- /dev/null
+++ b/src/views/qms/inspection/inspectionJob/addForm.vue
@@ -0,0 +1,1010 @@
+<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">
+        <!-- <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
+         
+        </el-form> -->
+        <Form
+          ref="formMainRef"
+          :rules="rules"
+          :schema="formSchema"
+          :is-col="true"
+          :disabled="true"
+          @opensearchTable="opensearchTable"
+        />
+        <el-tabs
+          v-model="editableTabsValue"
+          editable
+          class="demo-tabs"
+          @edit="handleTabsEdit"
+          type="border-card"
+          tab-position="left"
+          :stretch="false"
+        >
+          <el-tab-pane
+            v-for="item in data.process"
+            :key="item.name"
+            :label="item.processCode"
+            :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.inspectionCode"
+                      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-col :span="12">
+                  <el-form-item label="检验特性编码">
+                    <el-input
+                      v-model="item.inspectionCharCode"
+                      placeholder="根据系统生成"
+                      :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.inspectionCharacteristicsBaseVO.number"
+                      placeholder="根据系统生成"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="描述" prop="inspectionCharacteristicsBaseVO.description">
+                    <el-input v-model="item.inspectionCharacteristicsBaseVO.description"  :disabled="true" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                <el-form-item
+                  label="检验方法"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodName"
+                      disabled
+                      placeholder="请选择检验方法"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'inspectionMethodCode',
+                          null,
+                          '检验方法',
+                          InspectionMethod.allSchemas,
+                          InspectionMethodApi.getInspectionMethodPage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                          false,
+                          'features',
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="采样过程编码"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionName"
+                      disabled
+                      placeholder="请选择采样过程编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'inspectionMethod',
+                          null,
+                          '采样过程编码',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                          false,
+                          'features',
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="动态修改规则编码"
+                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateName"
+                      disabled
+                      placeholder="请选择动态修改规则编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'dynamicUpdateCode',
+                          null,
+                          '动态修改规则编码',
+                          DynamicRule.allSchemas,
+                          DynamicRuleApi.getDynamicRulePage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                          false,
+                          'features',
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="是否允许修改特征值"
+                    prop="inspectionCharacteristicsBaseVO.isCanUpdate"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="结果录入方式"
+                    prop="inspectionCharacteristicsBaseVO.resultEntryMethod"
+                  >
+                    <el-select
+                      v-model="item.inspectionCharacteristicsBaseVO.resultEntryMethod"
+                      placeholder="请选择结果录入方式"
+                    >
+                      <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="inspectionCharacteristicsBaseVO.featureType">
+                    <!-- <el-input v-model="item.featureType" /> -->
+                    <el-select
+                      v-model="item.inspectionCharacteristicsBaseVO.featureType"
+                      placeholder="请选择特征类型"
+                      @change="changeFeatureType"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    >
+                      <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.inspectionCharacteristicsBaseVO.featureType == 0">
+                  <el-form-item
+                    label="是否设定上限"
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                      @change="changeIsCapping"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="上限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                    label="是否设定下限"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                      @change="changeLowlimit"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="下限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyLowlimit"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                    label="是否设定目标值"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                      @change="changeIsTarget"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="目标值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyTarget"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12">
+                  <el-form-item
+                    label="计量单位"
+                    prop="inspectionCharacteristicsBaseVO.quantifyUom"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyUom"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="小数位"
+                    prop="inspectionCharacteristicsBaseVO.quantifyDecimal"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="选择集编码"
+                    prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 1"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                        disabled
+                        placeholder="请选择选择集编码"
+                      />
+                      <el-button
+                        type="info"
+                        plain
+                        style="width: 40px"
+                        @click="
+                          opensearchTable(
+                            'quantifyQuantifyCode',
+                            null,
+                            '选择集编码',
+                            SelectedSet.allSchemas,
+                            SelectedSetApi.getSelectedSetPage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                            false,
+                            null,
+                            item
+                          )
+                        "
+                        v-if="item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                        ><Icon icon="ep:search"
+                      /></el-button>
+                    </div>
+                  </el-form-item>
+                </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 { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
+// import { InspectionTemplateMain } from '@/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data'
+// import * as InspectionTemplateApi from '@/api/qms/inspectionTemplate'
+// import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+// import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程
+import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法
+import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法
+import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
+import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则
+import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
+import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集
+
+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
+  },
+})
+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 data = ref({
+  code: '',
+  itemCode: '',
+  version: '',
+  testTypeCode: '',
+  programmeTemplateCode: '',
+  splitRule: '',
+  aql: '',
+  inspectionLevel: '',
+  effectiveDate: '',
+  expirationDate: '',
+  available: 'TRUE',
+  process: []
+})
+
+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,
+    'inspectionCharacteristicsBaseVO.description': [
+    { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.inspectionMethodCode': [
+    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.dynamicUpdateCode': [
+    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.inspectionMethod': [
+    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.resultEntryMethod': [
+    { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.featureType': [
+    { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyTarget': [
+    { required: true, message: '请输入目标值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyCapping': [
+    { required: true, message: '请输入上限值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyLowlimit': [
+    { required: true, message: '请输入下限值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyUom': [
+    { required: true, message: '请选择计量单位', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyDecimal': [
+    { required: true, message: '请输入小数位', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
+    { required: true, message: '请输入选择集编码', trigger: 'blur' }
+  ]
+})
+// const rules = ref({
+//   itemCode: [{ required: true, message: '请选择物料编码', trigger: 'blur' }],
+//   version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
+//   testTypeCode: [{ required: true, message: '请选择检验类型编码', trigger: ['blur', 'change'] }],
+//   programmeTemplateCode: [
+//     { required: true, message: '请选择检验模板编码', trigger: ['blur', 'change'] }
+//   ],
+//   splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }],
+//   aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }],
+//   inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }],
+//   effectiveDate: [{ required: true, message: '请选择生效时间', trigger: ['blur', 'change'] }],
+//   expirationDate: [{ required: true, message: '请选择失效时间', trigger: ['blur', 'change'] }],
+//   'inspectionCharacteristicsBaseVO.description': [
+//     { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
+//   ],
+//   'inspectionCharacteristicsBaseVO.inspectionMethodCode': [
+//     { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.dynamicUpdateCode': [
+//     { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
+//   ],
+//   'inspectionCharacteristicsBaseVO.inspectionMethod': [
+//     { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
+//   ],
+//   'inspectionCharacteristicsBaseVO.resultEntryMethod': [
+//     { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
+//   ],
+//   'inspectionCharacteristicsBaseVO.featureType': [
+//     { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyTarget': [
+//     { required: true, message: '请输入目标值', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyCapping': [
+//     { required: true, message: '请输入上限值', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyLowlimit': [
+//     { required: true, message: '请输入下限值', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyUom': [
+//     { required: true, message: '请选择计量单位', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyDecimal': [
+//     { required: true, message: '请输入小数位', trigger: 'blur' }
+//   ],
+//   'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
+//     { required: true, message: '请输入选择集编码', trigger: 'blur' }
+//   ]
+// })
+
+/** 打开弹窗 */
+let tabIndex = 1
+const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
+  dialogVisible.value = true
+  if (titleName) {
+    dialogTitle.value = t('action.' + titleName)
+  } else {
+    dialogTitle.value = t('action.' + type)
+  }
+  formType.value = type
+  if (row) {
+    data.value = JSON.parse(JSON.stringify(row))
+    let list = []
+    list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
+    // if (row.inspectionSchemeJson) {
+    //   list = JSON.parse(JSON.parse(row.inspectionSchemeJson))
+    // } else {
+    //   list = await InspectionJobDetailPageApi.getListByTempleteCode(row.programmeTemplateCode)
+    // }
+console.log(list)
+console.log(typeof list)
+    list.forEach((item, index) => {
+      editableTabsValue.value = index + 1
+      item.name = index + 1
+      item.inspectionCharacteristicsBaseVO = item.inspectionJobCharacteristicsRespVO
+      // 编辑判断上限下限目标值是否必填
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+      } else {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+      }
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+      } else {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+      }
+      if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+      } else {
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+      }
+    })
+    data.value.process = list
+    formMainRef.value.setValues(row)
+  } else {
+    data.value = {
+      code: '',
+      itemCode: '',
+      version: '',
+      testTypeCode: '',
+      programmeTemplateCode: '',
+      splitRule: '',
+      aql: '',
+      inspectionLevel: '',
+      effectiveDate: '',
+      expirationDate: '',
+      available: 'TRUE',
+      process: []
+    }
+  }
+
+  tabIndex = data.value.process.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.process
+    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.process = tabs.filter((tab) => tab.name !== targetName)
+  }
+}
+/** 修改名称时间 */
+const buttonBaseClick1 = (val) => {
+  // 保存
+  if (val == 'save') {
+    if (!nameRef.value) return
+    nameRef.value.validate((valid, fields) => {
+      if (valid) {
+        const newTabName = `${++tabIndex}`
+        data.value.process.push({
+          description: nameForm.value.name,
+          name: newTabName,
+          inspectionCode: '',
+          sequenceCode: '',
+          inspectionCharCode: '',
+          inspectionJobCharacteristicsRespVO: {
+            describe: '',
+            inspectionMethodCode: '',
+            dynamicUpdateCode: '',
+            inspectionMethod: '',
+            isCanUpdate: '',
+            isDestructionInspection: '',
+            resultEntryMethod: '',
+            featureType: '',
+            quantifyIsCapping: '',
+            quantifyIsLowlimit: '',
+            quantifyIsTarget: '',
+            quantifyTarget: '',
+            quantifyCapping: '',
+            quantifyLowlimit: '',
+            quantifyUom: '',
+            quantifyDecimal: '',
+            quantifyQuantifyCode: ''
+          }
+        })
+        console.log(data.value.process)
+
+        editableTabsValue.value = newTabName
+        dialogVisibleName.value = false
+      } else {
+        console.log('error submit!')
+        return false
+      }
+    })
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisibleName.value = false
+  }
+}
+const buttonBaseClick = (val) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    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 submitForm = async () => {
+  try {
+    const validateForm1 = await validateForm(formProcessRef.value)
+    console.log(validateForm1)
+    await formMainRef.value.validate()
+    if (!data.value.process || data.value.process.length == 0) {
+      message.error(`请添加工序`)
+      return
+    }
+    const bol1 = await validateForm(formProcessRef.value)
+    const bol2 = await validateForm(formFeaturesRef.value)
+    if (!bol1 || !bol2) {
+      message.error(`模板中有检验工序和检验特性未填写完全`)
+      return
+    }
+    const arr = data.value.process.filter(
+      (item) =>
+        !item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+        !item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+        !item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+        item.inspectionCharacteristicsBaseVO.featureType == 0
+    )
+    console.log(arr)
+    if (arr && arr.length > 0) {
+      const str = arr.map((item) => item.description).join(',')
+      message.error(`${str}是否设定上线,是否设定下限,是否是定目标值至少一项为是`)
+      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['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true
+  // } else {
+  //   rules.value['inspectionCharacteristicsBaseVO.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.inspectionCharacteristicsBaseVO[formField] = val[0].code
+    if(formField == 'inspectionMethodCode'){
+      row.inspectionCharacteristicsBaseVO.inspectionMethodName = val[0].description
+    }else if(formField == 'dynamicUpdateCode'){
+      row.inspectionCharacteristicsBaseVO.dynamicUpdateName = val[0].description
+    }else if(formField == 'inspectionMethod'){
+      row.inspectionCharacteristicsBaseVO.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.inspectionCharacteristicsBaseVO.quantifyIsCapping) {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+        } else {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+        }
+        if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+        } else {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+        }
+        if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+        } else {
+          rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+        }
+      })
+      data.value.process = list
+    }
+  }
+
+  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
+// 选择是否设定上限值
+const changeIsCapping = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+  }
+}
+// 选择是否设定下限值
+const changeLowlimit = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+  }
+}
+// 选择是否设定目标值
+const changeIsTarget = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+  }
+}
+</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/index.vue b/src/views/qms/inspection/inspectionJob/index.vue
index 48b31afaa..6b393c63d 100644
--- a/src/views/qms/inspection/inspectionJob/index.vue
+++ b/src/views/qms/inspection/inspectionJob/index.vue
@@ -27,13 +27,22 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="InspectionJobMainRules"
+  <!-- <BasicForm ref="formRef" @success="getList" :rules="InspectionJobMainRules"
     :formAllSchemas="InspectionJobMain.allSchemas" :tableAllSchemas="InspectionJobDetail.allSchemas"
     :tableFormRules="InspectionJobDetailRules" :tableData="tableData"
     :apiUpdate="InspectionJobMainApi.updateInspectionJobMain" :apiCreate="InspectionJobMainApi.createInspectionJobMain"
     :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
-
+    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" /> -->
+    <AddForm
+    ref="basicFormRef"
+    basicFormWidth="80"
+    :formAllSchemasFeatures="InspectionTemplateFeatures.allSchemas"
+    :formAllSchemasProcess="InspectionTemplateProcess.allSchemas"
+    :formAllSchemasMain="InspectionTemplateMain.allSchemas"
+    :rules="InspectionTemplateRules"
+    :formAllSchemas="InspectionJobMain.allSchemas"
+    @submitForm="submitForm"
+  />
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectionJobMain.allSchemas"
     :detailAllSchemas="InspectionJobDetail.allSchemas" :detailAllSchemasRules="InspectionJobDetailRules"
@@ -51,11 +60,15 @@
 <script setup lang="ts">
   import download from '@/utils/download'
   import { InspectionJobMain, InspectionJobMainRules, InspectionJobDetail, InspectionJobDetailRules } from './inspectionJobMain.data'
+  import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../../basicDataManage/inspectionTemplate/inspectionTemplate.data'
+
   import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
   import * as InspectionJobDetailApi from '@/api/qms/inspectionJob/inspectionJobDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
   import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import AddForm from './addForm.vue'
+  import * as InspectionPlanApi from '@/api/qms/inspectionPlan'
 
   // 采购订单
   defineOptions({ name: 'InspectionJobMain' })
@@ -160,18 +173,19 @@
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-      // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
-      // defaultButtons.mainListEditBtn(null), // 编辑
-      // defaultButtons.mainListDeleteBtn(null), // 删除
+      // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+      defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+      defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
     ]
   }
 
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
-    if (val == 'edit') { // 编辑
-      openForm('update', row)
+    if (val == 'mainJobExe') { // 执行
+      execute('update', row)
     }
-    else if (val == 'delete') { // 删除
+    else if (val == 'mainJobClo') { // 关闭
       handleDelete(row.id)
     }
   }
@@ -188,7 +202,12 @@
   const openDetail = (row : any, titleName : any, titleValue : any) => {
     detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionJobMain')
   }
-
+  //执行
+  
+  const basicFormRef = ref()
+  const execute = async (type : string, row ?: number) => {
+    basicFormRef.value.open(type, row)
+  }
   /** 删除按钮操作 */
   const handleDelete = async (id : number) => {
     try {
diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
index 42da7a50d..91d5ab456 100644
--- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
@@ -76,12 +76,12 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
   },
-  {
-    label: '检验方案Json',
-    field: 'inspectionSchemeJson',
-    sort: 'custom',
-    isSearch: false,
-  },
+  // {
+  //   label: '检验方案Json',
+  //   field: 'inspectionSchemeJson',
+  //   sort: 'custom',
+  //   isSearch: false,
+  // },
   {
     label: '检验批次',
     field: 'inspectionBatch',