diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index a06d5161b..fdcef1ceb 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -1,6 +1,5 @@
 <template>
-  <el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules" class="login-form"
-    label-position="top" label-width="120px" size="large">
+  <el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules" class="login-form" label-position="top" label-width="120px" size="large">
     <el-row style="margin-right: -10px; margin-left: -10px">
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item>
@@ -9,27 +8,23 @@
       </el-col>
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
-          <el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
-            :prefix-icon="iconHouse" link type="primary" />
+          <el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')" :prefix-icon="iconHouse" link type="primary" />
         </el-form-item>
       </el-col>
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item prop="username">
-          <el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')"
-            :prefix-icon="iconAvatar" style="height: 42px;" />
+          <el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')" :prefix-icon="iconAvatar" style="height: 42px;" />
         </el-form-item>
       </el-col>
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item prop="password">
-          <el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')"
-            :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" />
+          <el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')" :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" />
         </el-form-item>
       </el-col>
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item prop="code">
           <div class="flex w-[100%]">
-            <el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')"
-              style="width: 76%;margin-right: 10px;height: 42px;" @keyup.enter="handleLogin()">
+            <el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')" style="width: 76%;margin-right: 10px;height: 42px;" @keyup.enter="handleLogin()">
               <template #prefix>
                 <img src="@/assets/imgs/code.png" alt="" style="width: 16px;height: 16px;" />
               </template>
@@ -38,11 +33,8 @@
               <img :src="codeUrl" @click="getCode" class="login-code-img" />
             </div>
           </div>
-
         </el-form-item>
       </el-col>
-
-
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px">
         <el-form-item>
           <el-row justify="space-between" style="width: 100%">
@@ -57,11 +49,9 @@
           </el-row>
         </el-form-item>
       </el-col>
-
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item>
-          <XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
-            @click="handleLogin()" />
+          <XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary" @click="handleLogin()" />
         </el-form-item>
       </el-col>
       <!-- <Verify
diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue
index 267d771d5..3e29b8ae4 100644
--- a/src/views/qms/inspection/inspectionJob/addForm.vue
+++ b/src/views/qms/inspection/inspectionJob/addForm.vue
@@ -1,69 +1,25 @@
 <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">
-        <!-- <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
-         
-        </el-form> -->
-        <Form
-          ref="formMainRef"
-          :rules="rules"
-          :schema="formSchema"
-          :is-col="true"
-          @opensearchTable="opensearchTable"
-        />
+        <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-tab-pane
-            v-for="item in data.subList"
-            :key="item.name"
-            :label="item.processCode"
-            :name="item.name"
-          >
+        <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.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-input v-model="item.processCode" placeholder="根据系统生成" :disabled="true" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="检验特性编号">
-                    <el-input
-                      v-model="item.inspectionFeatureCode"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
+                    <el-input v-model="item.inspectionFeatureCode" placeholder="根据系统生成" :disabled="true" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -76,15 +32,6 @@
                     <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>
@@ -92,236 +39,94 @@
               <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">
-                  <el-form-item
-                    label="描述"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                      :disabled="true"
-                    />
+                  <el-form-item label="描述" prop="inspectionJobCharacteristicsUpdateReqVO.description">
+                    <el-input v-model="item.inspectionJobCharacteristicsUpdateReqVO.description" :disabled="true" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item
-                    label="检验方法"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                  >
+                  <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"
-                  >
+                  <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.dynamicUpdateCode"
-                >
-                  <div style="display: flex; width: 100%">
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateName"
-                      disabled
-                      placeholder="请选择动态修改规则编码"
-                    />
-                  </div>
-                </el-form-item>
-              </el-col> -->
                 <el-col :span="12">
-                  <el-form-item
-                    label="是否允许修改特征值"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                      disabled
-                    />
+                  <el-form-item label="是否允许修改特征值" prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate">
+                    <el-switch v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate" disabled />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item
-                    label="结果录入方式"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                      placeholder="请选择结果录入方式"
-                      @change="resultEntryMethodChange($event, item)"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
+                  <el-form-item label="结果录入方式" prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod">
+                    <el-select v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod" placeholder="请选择结果录入方式"  @change="resultEntryMethodChange($event, item)" disabled>
+                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)" :key="dict.value" :label="dict.label" :value="dict.value" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item
-                    label="特征类型"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                      placeholder="请选择特征类型"
-                      @change="changeFeatureType"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
+                  <el-form-item label="特征类型" prop="inspectionJobCharacteristicsUpdateReqVO.featureType">
+                    <el-select v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType" placeholder="请选择特征类型" @change="changeFeatureType" disabled>
+                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item
-                    label="开始时间"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                  >
-                    <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                      type="datetime"
-                      placeholder="请选择开始时间"
-                      style="width: 100%"
-                      value-format="x"
-                    />
+                  <el-form-item label="开始时间" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime">
+                    <el-date-picker v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime" type="datetime" placeholder="请选择开始时间" style="width: 100%" value-format="x" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item
-                    label="结束时间"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                  >
-                    <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                      type="datetime"
-                      placeholder="请选择结束时间"
-                      style="width: 100%"
-                      value-format="x"
-                    />
+                  <el-form-item label="结束时间" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime">
+                    <el-date-picker v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime" type="datetime" placeholder="请选择结束时间" style="width: 100%" value-format="x" />
                   </el-form-item>
                 </el-col>
-                   <!-- 手动评估的时候显示 -->
-                   <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                      <el-form-item label="评估代码" required>
-                        <el-select
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                          placeholder="请选择评估代码"
-                          @change="changeFeatureType"
-                        >
-                          <el-option
-                            v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                <el-col
-                  :span="24"
-                  style="
-                    border: 1px solid #dedede;
-                    border-radius: 4px;
-                    padding-top: 16px;
-                    margin-bottom: 10px;
-                  "
-                  v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
-                    .recordInspectionQuantifyList"
-                  :key="i"
-                >
+                 <!-- 手动评估的时候显示 -->
+                 <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
+                    <el-form-item label="评估代码" required>
+                      <el-select v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode" placeholder="请选择评估代码" @change="changeFeatureType">
+                        <el-option v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)" :key="dict.value" :label="dict.label" :value="dict.value" />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                <el-col :span="24" v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList" :key="i" style="border: 1px solid #dedede; border-radius: 4px; padding-top: 16px; margin-bottom: 10px;">
                   <el-row>
                     <!-- 汇总录入的时候显示 -->
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
-                    >
+                    <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1">
                       <el-form-item label="合格数量" required>
                         <el-input v-model="cur.qualifiedQuantity" placeholder="请输入合格数量"  type="number"/>
                       </el-form-item>
                     </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
-                    >
+                    <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1">
                       <el-form-item label="不合格数量" required>
-                        <el-input
-                          v-model="cur.unqualifiedQuantity" type="number"
-                          placeholder="请输入不合格数量"
-                        />
+                        <el-input v-model="cur.unqualifiedQuantity" type="number" placeholder="请输入不合格数量" />
                       </el-form-item>
                     </el-col>
-                 
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                    >
+                    <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'">
                       <el-form-item label="检验值" required>
                         <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" type="number"/>
                       </el-form-item>
                     </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'"
-                    >
+                    <el-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>
-                    <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1" >
+                    <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
                       <el-form-item label="缺陷级别" required>
                         <el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>
-                          <el-option
-                            v-for="dict in getStrDictOptions(DICT_TYPE.DEFECT_LEVEL)"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                          />
+                          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.DEFECT_LEVEL)" :key="dict.value" :label="dict.label" :value="dict.value" />
                         </el-select>
                       </el-form-item>
                     </el-col>
@@ -336,18 +141,10 @@
         <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
       </template>
     </Dialog>
-    <Dialog
-      title="修改名称"
-      v-model="dialogVisibleName"
-      width="500px"
-      :close-on-click-modal="false"
-    >
+    <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-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>
diff --git a/src/views/qms/inspection/inspectionJob/detail.vue b/src/views/qms/inspection/inspectionJob/detail.vue
index 1a2673a19..3d93cde1d 100644
--- a/src/views/qms/inspection/inspectionJob/detail.vue
+++ b/src/views/qms/inspection/inspectionJob/detail.vue
@@ -1,43 +1,17 @@
 <template>
   <div>
-    <el-drawer
-      v-model="isShowDrawer"
-      title="详情"
-      direction="rtl"
-      size="80%"
-      v-loading="detailLoading"
-    >
+    <el-drawer v-model="isShowDrawer" title="详情" direction="rtl" size="80%" v-loading="detailLoading">
       <template #header>
         <div class="font-size-18px">
           {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
         </div>
       </template>
       <ContentWrap v-if="!isBasic">
-        <Descriptions
-          :data="data"
-          labelClassName="label-class-name"
-          label-align="left"
-          direction="vertical"
-          :column="8"
-          :schema="allSchemas.detailSchema"
-          :columns="2"
-          width="200px"
-        />
+        <Descriptions :data="data" labelClassName="label-class-name" label-align="left" direction="vertical" :column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px" />
       </ContentWrap>
       <ContentWrap>
-        <el-tabs
-          v-model="editableTabsValue"
-          class="demo-tabs"
-          type="border-card"
-          tab-position="left"
-          :stretch="false"
-        >
-          <el-tab-pane
-            v-for="item in data.subList"
-            :key="item.name"
-            :label="item.processCode"
-            :name="item.name"
-          >
+        <el-tabs v-model="editableTabsValue" class="demo-tabs" type="border-card" tab-position="left" :stretch="false">
+          <el-tab-pane v-for="item in data.subList" :key="item.name" :label="item.processCode" :name="item.name">
             <div class="small-title">检验工序</div>
             <el-form :model="item" label-width="auto" ref="formProcessRef">
               <el-row :gutter="20">
@@ -63,11 +37,7 @@
               <el-row :gutter="20">
                 <el-col :span="12">
                   <el-form-item label="编码">
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsRespVO.number"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
+                    <el-input v-model="item.inspectionJobCharacteristicsRespVO.number" placeholder="根据系统生成" :disabled="true" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -76,89 +46,44 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                <el-form-item
-                  label="检验方法"
-                  prop="inspectionJobCharacteristicsRespVO.inspectionMethodCode"
-                >
-                  <div style="display: flex; width: 100%">
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsRespVO.inspectionMethodName"
-                      disabled
-                      placeholder="请选择检验方法"
-                    />
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="采样过程编码"
-                  prop="inspectionJobCharacteristicsRespVO.samplingProcessCode"
-                >
-                  <div style="display: flex; width: 100%">
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsRespVO.samplingProcessName"
-                      disabled
-                      placeholder="请选择采样过程编码"
-                    />
-                  </div>
-                </el-form-item>
-              </el-col>
+                  <el-form-item label="检验方法" prop="inspectionJobCharacteristicsRespVO.inspectionMethodCode">
+                    <div style="display: flex; width: 100%">
+                      <el-input v-model="item.inspectionJobCharacteristicsRespVO.inspectionMethodName" disabled placeholder="请选择检验方法" />
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="采样过程编码" prop="inspectionJobCharacteristicsRespVO.samplingProcessCode">
+                    <div style="display: flex; width: 100%">
+                      <el-input v-model="item.inspectionJobCharacteristicsRespVO.samplingProcessName" disabled placeholder="请选择采样过程编码" />
+                    </div>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
-                  <el-form-item
-                    label="是否允许修改特征值"
-                    prop="inspectionJobCharacteristicsRespVO.isCanUpdate"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsRespVO.isCanUpdate"
-                      disabled
-                    />
+                  <el-form-item label="是否允许修改特征值" prop="inspectionJobCharacteristicsRespVO.isCanUpdate">
+                    <el-switch v-model="item.inspectionJobCharacteristicsRespVO.isCanUpdate" disabled />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item
-                    label="结果录入方式"
-                    prop="inspectionJobCharacteristicsRespVO.resultEntryMethod"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsRespVO.resultEntryMethod"
-                      placeholder="请选择结果录入方式"
-                      @change="resultEntryMethodChange($event,item)"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
+                  <el-form-item label="结果录入方式" prop="inspectionJobCharacteristicsRespVO.resultEntryMethod">
+                    <el-select v-model="item.inspectionJobCharacteristicsRespVO.resultEntryMethod" placeholder="请选择结果录入方式" @change="resultEntryMethodChange($event,item)" disabled>
+                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)" :key="dict.value" :label="dict.label" :value="dict.value" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="特征类型" prop="inspectionJobCharacteristicsRespVO.featureType">
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsRespVO.featureType"
-                      placeholder="请选择特征类型"
-                      @change="changeFeatureType"
-                      disabled
-                    >
-                      <el-option v-for="dict in getStrDictOptions( DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
+                    <el-select v-model="item.inspectionJobCharacteristicsRespVO.featureType" placeholder="请选择特征类型" @change="changeFeatureType" disabled>
+                      <el-option v-for="dict in getStrDictOptions( DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE )" :key="dict.value" :label="dict.label" :value="dict.value" />
                     </el-select>
                   </el-form-item>
-                </el-col> 
+                </el-col>
               </el-row>
             </el-form>
           </el-tab-pane>
         </el-tabs>
       </ContentWrap>
     </el-drawer>
-   
   </div>
 </template>
 
diff --git a/src/views/qms/inspection/inspectionRecord/detail.vue b/src/views/qms/inspection/inspectionRecord/detail.vue
index cec8987ac..cdb6ffa27 100644
--- a/src/views/qms/inspection/inspectionRecord/detail.vue
+++ b/src/views/qms/inspection/inspectionRecord/detail.vue
@@ -82,25 +82,25 @@
                 <el-col :span="12">
                   <el-form-item label="编码">
                     <el-input
-                      v-model="item.inspectionJobCharacteristicsRespVO.number"
+                      v-model="item.inspectionRecordCharacteristicsRespVO.number"
                       placeholder="根据系统生成"
                       :disabled="true"
                     />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="描述" prop="inspectionJobCharacteristicsRespVO.description">
-                    <el-input v-model="item.inspectionJobCharacteristicsRespVO.description"  :disabled="true" />
+                  <el-form-item label="描述" prop="inspectionRecordCharacteristicsRespVO.description">
+                    <el-input v-model="item.inspectionRecordCharacteristicsRespVO.description"  :disabled="true" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                 <el-form-item
                   label="检验方法"
-                  prop="inspectionJobCharacteristicsRespVO.inspectionMethodCode"
+                  prop="inspectionRecordCharacteristicsRespVO.inspectionMethodCode"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionJobCharacteristicsRespVO.inspectionMethodName"
+                      v-model="item.inspectionRecordCharacteristicsRespVO.inspectionMethodName"
                       disabled
                       placeholder="请选择检验方法"
                     />
@@ -110,11 +110,11 @@
               <el-col :span="12">
                 <el-form-item
                   label="采样过程编码"
-                  prop="inspectionJobCharacteristicsRespVO.inspectionMethod"
+                  prop="inspectionRecordCharacteristicsRespVO.inspectionMethod"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionJobCharacteristicsRespVO.inspectionName"
+                      v-model="item.inspectionRecordCharacteristicsRespVO.inspectionName"
                       disabled
                       placeholder="请选择采样过程编码"
                     />
@@ -124,11 +124,11 @@
               <!-- <el-col :span="12">
                 <el-form-item
                   label="动态修改规则编码"
-                  prop="inspectionJobCharacteristicsRespVO.dynamicUpdateCode"
+                  prop="inspectionRecordCharacteristicsRespVO.dynamicUpdateCode"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionJobCharacteristicsRespVO.dynamicUpdateName"
+                      v-model="item.inspectionRecordCharacteristicsRespVO.dynamicUpdateName"
                       disabled
                       placeholder="请选择动态修改规则编码"
                     />
@@ -138,10 +138,10 @@
                 <el-col :span="12">
                   <el-form-item
                     label="是否允许修改特征值"
-                    prop="inspectionJobCharacteristicsRespVO.isCanUpdate"
+                    prop="inspectionRecordCharacteristicsRespVO.isCanUpdate"
                   >
                     <el-switch
-                      v-model="item.inspectionJobCharacteristicsRespVO.isCanUpdate"
+                      v-model="item.inspectionRecordCharacteristicsRespVO.isCanUpdate"
                       disabled
                     />
                   </el-form-item>
@@ -149,10 +149,10 @@
                 <el-col :span="12">
                   <el-form-item
                     label="结果录入方式"
-                    prop="inspectionJobCharacteristicsRespVO.resultEntryMethod"
+                    prop="inspectionRecordCharacteristicsRespVO.resultEntryMethod"
                   >
                     <el-select
-                      v-model="item.inspectionJobCharacteristicsRespVO.resultEntryMethod"
+                      v-model="item.inspectionRecordCharacteristicsRespVO.resultEntryMethod"
                       placeholder="请选择结果录入方式"
                       @change="resultEntryMethodChange($event,item)"
                       disabled
@@ -169,9 +169,9 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="特征类型" prop="inspectionJobCharacteristicsRespVO.featureType">
+                  <el-form-item label="特征类型" prop="inspectionRecordCharacteristicsRespVO.featureType">
                     <el-select
-                      v-model="item.inspectionJobCharacteristicsRespVO.featureType"
+                      v-model="item.inspectionRecordCharacteristicsRespVO.featureType"
                       placeholder="请选择特征类型"
                       @change="changeFeatureType"
                       disabled
@@ -185,9 +185,9 @@
                   </el-form-item>
                 </el-col> 
                 <el-col :span="12">
-                  <el-form-item label="开始时间" prop="inspectionJobCharacteristicsRespVO.inspectionStartTime">
+                  <el-form-item label="开始时间" prop="inspectionRecordCharacteristicsRespVO.inspectionStartTime">
                     <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsRespVO.inspectionStartTime"
+                      v-model="item.inspectionRecordCharacteristicsRespVO.inspectionStartTime"
                       type="datetime"
                       placeholder="请选择开始时间"
                       style="width: 100%"
@@ -197,9 +197,9 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="结束时间" prop="inspectionJobCharacteristicsRespVO.inspectionEndTime">
+                  <el-form-item label="结束时间" prop="inspectionRecordCharacteristicsRespVO.inspectionEndTime">
                     <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsRespVO.inspectionEndTime"
+                      v-model="item.inspectionRecordCharacteristicsRespVO.inspectionEndTime"
                       type="datetime"
                       placeholder="请选择结束时间"
                       style="width: 100%"