diff --git a/src/api/wms/purchaseprice/index.ts b/src/api/wms/purchaseprice/index.ts
index cf2438619..03c6af883 100644
--- a/src/api/wms/purchaseprice/index.ts
+++ b/src/api/wms/purchaseprice/index.ts
@@ -22,6 +22,17 @@ export const getPurchasepricePage = async (params) => {
   }
 }
 
+// 查询采购价格单列表
+export const getPurchasepricePageSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/purchaseprice/seniorSCP', data })
+  } else {
+    return await request.get({ url: `/wms/purchaseprice/pageSCP`, params })
+  }
+}
+
 // 查询采购价格单详情
 export const getPurchaseprice = async (id: number) => {
   return await request.get({ url: `/wms/purchaseprice/get?id=` + id })
@@ -52,6 +63,16 @@ export const exportPurchaseprice = async (params) => {
   }
 }
 
+// 导出采购价格单 Excel
+export const exportPurchasepriceSCP = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchaseprice/export-excel-senior-SCP`, data })
+  } else {
+    return await request.download({ url: `/wms/purchaseprice/export-excel-SCP`, params })
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchaseprice/get-import-template' })
diff --git a/src/api/wms/supplieritem/index.ts b/src/api/wms/supplieritem/index.ts
index 448b6b108..e6002d3c7 100644
--- a/src/api/wms/supplieritem/index.ts
+++ b/src/api/wms/supplieritem/index.ts
@@ -31,6 +31,17 @@ export const getSupplieritemPage = async (params) => {
   }
 }
 
+// 查询供应商物料列表
+export const getSupplieritemPageSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/supplieritem/seniorSCP', data })
+  } else {
+    return await request.get({ url: `/wms/supplieritem/pageSCP`, params })
+  }
+}
+
 // 查询供应商物料详情
 export const getSupplieritem = async (id: number) => {
   return await request.get({ url: `/wms/supplieritem/get?id=` + id })
@@ -61,6 +72,16 @@ export const exportSupplieritem = async (params) => {
   }
 }
 
+// 导出供应商物料 Excel
+export const exportSupplieritemSCP = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplieritem/export-excel-senior-SCP`, data })
+  } else {
+    return await request.download({ url: `/wms/supplieritem/export-excel-SCP`, params })
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplieritem/get-import-template' })
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 1d967ae75..408141d1d 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -193,8 +193,7 @@ export function formStagingBtn(option:any) {
     label: t(`btn.暂存`).replace('btn.', ''),
     name: 'staging',
     hide: false,
-    
-    color: '',
+    color: 'green',
     float:'right',
     hasPermi: ''
   })
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 0814259de..6fc8fc810 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -1,13 +1,17 @@
 <template>
   <div>
-    <Dialog :title="dialogTitle" v-model="dialogVisible" :width="dialogWidth" :close-on-click-modal="false" :vLoading="formLoading">
+    <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" />
+          <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-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">
@@ -39,7 +43,8 @@
               <el-row :gutter="20">
                 <el-col :span="12">
                   <el-form-item label="编码">
-                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.number" placeholder="根据系统生成" :disabled="true" />
+                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.number" placeholder="根据系统生成"
+                      :disabled="true" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -50,29 +55,33 @@
                 <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="请选择检验方法" />
+                      <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="请选择采样过程编码" />
+                      <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="请输入样品份数" />
+                      <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="请输入样品份数" />
+                      <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize" disabled
+                        placeholder="请输入样品份数" />
                     </div>
                   </el-form-item>
                 </el-col>
@@ -83,42 +92,52 @@
                 </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 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 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-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-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="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-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-input v-model="cur.qualifiedQuantity" placeholder="请输入合格数量" type="number" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1">
@@ -128,13 +147,15 @@
                     </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-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 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>
@@ -172,689 +193,816 @@
   </div>
 </template>
 <script setup lang="ts">
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { getCurrentInstance } from 'vue'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
-import { SearchTable } from '@/components/SearchTable'
- import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
-import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
+  import * as 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 { proxy } = getCurrentInstance()
 
-const message = useMessage() // 消息弹窗
+  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 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 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 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)
+  const dialogVisibleName = ref(false)
+  const nameForm = ref({
+    name: ''
+  })
+  const nameRef = ref()
+  if (props.basicFormWidth) {
+    dialogWidth.value = props.basicFormWidth + '%'
   } else {
-    dialogTitle.value = t('action.' + type)
+    dialogWidth.value = props.isBusiness ? '60%' : '40%'
   }
-  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) {
+  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
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-        for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
+        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: '' //不合格数量
-          })
-        }
-      } 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;
+          )
+        }
+        // 编辑判断上限下限目标值是否必填
+        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=>{
+      // 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
-          }
-        }
+      // })
+      dialogVisible.value = true
+      nextTick(() => {
+        formMainRef.value.setValues(row)
       })
+    } else {
+      data.value = {
+        code: '',
+        itemCode: '',
+        version: '',
+        testTypeCode: '',
+        programmeTemplateCode: '',
+        splitRule: '',
+        aql: '',
+        inspectionLevel: '',
+        effectiveDate: '',
+        expirationDate: '',
+        available: 'TRUE',
+        subList: []
+      }
     }
-    editableTabsValue.value = activeName
-    data.value.subList = tabs.filter((tab) => tab.name !== targetName)
+    dialogVisible.value = true
+    tabIndex = data.value.subList.length + 1
   }
-}
-/** 修改名称时间 */
-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: ''
+  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
+            }
           }
         })
-        console.log(data.value.subList)
-
-        editableTabsValue.value = newTabName
-        dialogVisibleName.value = false
-      } else {
-        console.log('error submit!')
-        return false
       }
-    })
+      editableTabsValue.value = activeName
+      data.value.subList = tabs.filter((tab) => tab.name !== targetName)
+    }
   }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisibleName.value = false
+  /** 修改名称时间 */
+  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()
+  const buttonBaseClick = async (val) => {
+    // 保存
+    if (val == 'save') {
+      submitForm()
+    }
+    // 关闭
+    else if (val == 'close') {
+      //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
+      dialogVisible.value = false
+    }
+    // 暂存
+    else if (val == 'staging') {
+      staging()
+    }
   }
-  // 关闭
-  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 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(`采样数量不能大于数量`)
+  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 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
-            }
+      // 判断数组是否有未填的选项
+      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 == 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.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 
-            }
+        }
+        // 开始时间大于结束时间放入数组中
+        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)
-            }
+          // 合格数量和不合格数量之和不等于总数量
+          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;
       }
-    })
-    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)
+      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)
     }
-  } 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
+
+  const staging = 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
         }
-        if (isNull) {
-          message.warning(
-            searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+        // 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
+              }
+            )
           )
-          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 (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;
+      }
+      await InspectionJobMainApi.stagingInspectionJobMain(data.value);
+    } catch {
+      console.log(111)
     }
-    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,
+
+  /** 弹窗按钮 */
+  let Butttondata : any = []
+  if (props.footButttondata) {
+    Butttondata = props.footButttondata
+  } else {
+    Butttondata = [
+      defaultButtons.formStagingBtn(null), // 暂存
+      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,
-    _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
+    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 {
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false
+          // 扩展 转换为筛选条件进行查询
+          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
+          }
         }
-      })
-      data.value.subList = list
+      }
+      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
+    )
   }
-
-  // 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: '' //不合格数量
-      })
+  // 弹层确定返回所选数据
+  // 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
+      }
     }
-  } else {
-    // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [
-      {
-        inspectionValue: '', //检验值
-        qualitativeCode: '', //定性字典项值
-        defectLevel: '', //缺陷级别
-        qualifiedQuantity: '', //合格数量
-        unqualifiedQuantity: '' //不合格数量
+
+    // 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
   }
-  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;
-}
+  .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;
-}
+  .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/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
index 02bca4f0b..1f9694b7c 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
@@ -84,7 +84,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PurchasepriceApi.getPurchasepricePage // 分页接口
+  getListApi: routeName.value.includes('SCP')?PurchasepriceApi.getPurchasepricePageSCP:PurchasepriceApi.getPurchasepricePage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -238,8 +238,13 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PurchasepriceApi.exportPurchaseprice(tableObject.params)
-    download.excel(data, `${t('ts.采购价格单')}.xlsx`)
+    if(routeName.value.includes('SCP')){
+      const data = await PurchasepriceApi.exportPurchasepriceSCP(tableObject.params)
+      download.excel(data, `${t('ts.采购价格单')}.xlsx`)
+    }else{
+      const data = await PurchasepriceApi.exportPurchaseprice(tableObject.params)
+      download.excel(data, `${t('ts.采购价格单')}.xlsx`)
+    }
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
index b3c637e76..182966119 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
@@ -83,7 +83,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: SupplieritemApi.getSupplieritemPage // 分页接口
+  getListApi: routeName.value.includes('SCP')?SupplieritemApi.getSupplieritemPageSCP:SupplieritemApi.getSupplieritemPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -237,8 +237,13 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await SupplieritemApi.exportSupplieritem(tableObject.params)
-    download.excel(data, `${t('ts.供应商物料')}.xlsx`)
+    if(routeName.value.includes('SCP')){
+      const data = await SupplieritemApi.exportSupplieritemSCP(tableObject.params)
+      download.excel(data, `${t('ts.供应商物料')}.xlsx`)
+    }else{
+      const data = await SupplieritemApi.exportSupplieritem(tableObject.params)
+      download.excel(data, `${t('ts.供应商物料')}.xlsx`)
+    }
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 3dc991349..13b18bc25 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -33,7 +33,7 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
+      <template #action="{ row,$index }">
         <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
@@ -374,7 +374,7 @@ const submitForm = async (formType,data) => {
     if (formType === 'create') {
       data.businessType = businessType.value
       console.log(data.businessType,999);
-      
+
     await ContainerMainRequestApi.createContainerMainRequest(data)
     message.success(t('common.createSuccess'))
   } else {
@@ -454,4 +454,4 @@ onMounted(async () => {
 })
 
 </script>
-./initialContainerMainRequest.data
\ No newline at end of file
+./initialContainerMainRequest.data
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 99843afc2..b798c5b92 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -1031,7 +1031,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
   },
   {
     label: '操作',
-    hiddenInMain:true,
     field: 'action',
     isDetail: false,
     isForm: false ,
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 8b336d9a3..43ef758a0 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -552,7 +552,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
   },
   {
     label: '操作',
-    hiddenInMain:true,
     field: 'action',
     isDetail: false,
     isForm: false ,
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 3fbf1f305..477d2451a 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -731,6 +731,20 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   }
 ]))
 
+const singlePriceFormart = (row, column, cellValue) => {
+  cellValue= Number(cellValue).toFixed(5)
+  cellValue = cellValue + '' || ''
+
+  let x = cellValue.split('.')
+  let x1 = x[0]
+  let x2  = x.length > 1 ? '.' + x[1] : ''
+  const reg = /(\d+)(\d{3})/
+  while(reg.test(x1)){
+    x1 = x1.replace(reg, '$1,$2')
+  }
+  return x1+x2
+}
+
 function validateTaxRate(rule, value, callback) {
   if (value>0) {
     callback()
@@ -913,7 +927,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '合同价格',
     field: 'singlePrice',
-    formatter: accountantFormart,
+    formatter: singlePriceFormart,
     table: {
       width: 150
     },