diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 2ab77ef..28bd6e1 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -94,19 +94,19 @@
 }) // 表单
 const rules = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
-  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
   manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  // manufacturingDate: [{ required: true, message: '出厂年月不能为空', trigger: 'blur' }],
   modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
   abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
-  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
-  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  // cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  // enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureCycle: [{ required: true, message: '检定周期不能为空', trigger: 'blur' }],
-  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
-  // isMeasureAccount: [{ required: true, message: '必选', trigger: 'blur' }],
-  // isStandardSupportEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
-  // isCalibrationTestEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
+  // validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  isMeasureAccount: [{ required: true, message: '必选', trigger: 'blur' }],
+  isStandardSupportEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
+  isCalibrationTestEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -384,9 +384,10 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24" class="marg">
+      <!-- 只有资产类型是固定资产3的时候不显示 -->
+      <el-row v-if="ruleForm.assetType !== '3'" :gutter="24" class="marg">
         <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
+          <el-form-item label="生产厂家" :prop="ruleForm.assetType !== '3' ? '' : 'manufacturer'">
             <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === 'detail' ? '' : '生产厂家'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
@@ -398,7 +399,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
+          <el-form-item label="出厂编号" :prop="ruleForm.assetType !== '3' ? '' : 'manufacturingNo'">
             <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === 'detail' ? '' : '出厂编号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
@@ -413,52 +414,39 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
+        <el-col v-if="ruleForm.assetType !== '3'" :span="6">
+          <el-form-item label="型号" :prop="ruleForm.assetType !== '3' ? '' : 'modelNo'">
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType !== '3'" :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
+          <!-- 只有测量设备显示ABC -->
           <el-form-item label="ABC" prop="abc">
             <el-select v-model="ruleForm.abc" :placeholder="title === 'detail' ? '' : 'ABC'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === 'detail' ? '' : '标签'" :disabled="title === 'detail'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
+
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="测量范围" prop="mesureRange">
             <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="不确定度" prop="uncertainty">
             <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
         <el-col v-if="showAssetsItem" :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+          <el-form-item v-if="ruleForm.assetType !== '3'" label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
@@ -469,7 +457,7 @@
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
           </el-form-item> -->
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType !== '3'" :span="6">
           <el-form-item label="启用日期" prop="enableDate">
             <el-date-picker
               v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
@@ -478,24 +466,22 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定方式" prop="mesureType">
             <el-select v-model="ruleForm.mesureType" :placeholder="title === 'detail' ? '' : '检定方式'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" style="width: 100%;" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="使用部门" prop="useDept">
             <com-tree-select
               v-if="title !== 'detail'"
@@ -507,7 +493,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="使用人" prop="usePerson">
             <el-select v-model="ruleForm.usePerson" :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
@@ -515,15 +501,13 @@
           </el-form-item>
         </el-col>
         <el-col v-if="showAssetsItem" :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
+          <el-form-item v-if="ruleForm.assetType !== '3'" label="专业分类" prop="majorCategory">
             <el-select v-model="ruleForm.majorCategory" :placeholder="title === 'detail' ? '' : '专业分类'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定部门" prop="mesureDept">
             <com-tree-select
               v-if="title !== 'detail'"
@@ -535,7 +519,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定日期" prop="mesureDate">
             <el-date-picker
               v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
@@ -544,7 +528,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="有效日期" prop="validDate">
             <el-date-picker
               v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
@@ -553,7 +537,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定结果" prop="mesureResult">
             <el-select v-model="ruleForm.mesureResult" :placeholder="title === 'detail' ? '' : '检定结果'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
@@ -562,7 +546,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="24" class="marg">
+      <el-row v-if="ruleForm.assetType === '1'" :gutter="24" class="marg">
         <el-col :span="8">
           <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="280px">
             <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === 'detail' ? '' : '是/否'" :disabled="title === 'detail'" style="width: 100%;">
@@ -585,7 +569,9 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <!-- 资产类型3是固定资产 -->
       <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
+        <!-- 资产类型：1测量设备、2办公用品、3固定资产、255其他 -->
         <el-col :span="6">
           <el-form-item label="资产来源" prop="assetSource">
             <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === 'detail' ? '' : '资产来源'" :disabled="title === 'detail'" />
@@ -610,8 +596,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="资本来源" prop="capitalSource">
             <el-select v-model="ruleForm.capitalSource" :placeholder="title === 'detail' ? '' : '资本来源'" :disabled="title === 'detail'" style="width: 100%;">
@@ -631,8 +615,6 @@
             <el-input v-model.trim="ruleForm.purpose" :placeholder="title === 'detail' ? '' : '用途'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="技术水平" prop="technicalLevel">
             <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === 'detail' ? '' : '技术水平'" :disabled="title === 'detail'" />
@@ -653,8 +635,6 @@
             <el-input v-model.trim="ruleForm.weight" :placeholder="title === 'detail' ? '' : '重量'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="单价(元)" prop="singlePrice">
             <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === 'detail' ? '' : '单价'" :disabled="title === 'detail'" />
@@ -670,8 +650,6 @@
             <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === 'detail' ? '' : '安装地点'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
@@ -694,16 +672,36 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="属性" prop="attribute">
             <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="24" class="marg">
         <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" autosize placeholder="备注" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="标签绑定" prop="labelBind">
+            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === 'detail' ? '' : '标签'" :disabled="title === 'detail'" clearable>
+              <template #append>
+                <el-button type="primary" size="small">
+                  扫描
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24" class="marg">
+        <el-col :span="24">
           <el-form-item label="说明书" prop="minioFileName">
             <show-photo v-if="ruleForm.fileList.length > 0" :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
             <input ref="fileRef" style="width: 0;overflow: hidden;" type="file" @change="onFileChange">
@@ -714,13 +712,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
   </div>
 </template>

diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 2ab77ef..28bd6e1 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -94,19 +94,19 @@
 }) // 表单
 const rules = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
-  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
   manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  // manufacturingDate: [{ required: true, message: '出厂年月不能为空', trigger: 'blur' }],
   modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
   abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
-  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
-  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  // cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  // enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureCycle: [{ required: true, message: '检定周期不能为空', trigger: 'blur' }],
-  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
-  // isMeasureAccount: [{ required: true, message: '必选', trigger: 'blur' }],
-  // isStandardSupportEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
-  // isCalibrationTestEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
+  // validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  isMeasureAccount: [{ required: true, message: '必选', trigger: 'blur' }],
+  isStandardSupportEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
+  isCalibrationTestEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -384,9 +384,10 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24" class="marg">
+      <!-- 只有资产类型是固定资产3的时候不显示 -->
+      <el-row v-if="ruleForm.assetType !== '3'" :gutter="24" class="marg">
         <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
+          <el-form-item label="生产厂家" :prop="ruleForm.assetType !== '3' ? '' : 'manufacturer'">
             <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === 'detail' ? '' : '生产厂家'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
@@ -398,7 +399,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
+          <el-form-item label="出厂编号" :prop="ruleForm.assetType !== '3' ? '' : 'manufacturingNo'">
             <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === 'detail' ? '' : '出厂编号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
@@ -413,52 +414,39 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
+        <el-col v-if="ruleForm.assetType !== '3'" :span="6">
+          <el-form-item label="型号" :prop="ruleForm.assetType !== '3' ? '' : 'modelNo'">
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType !== '3'" :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
+          <!-- 只有测量设备显示ABC -->
           <el-form-item label="ABC" prop="abc">
             <el-select v-model="ruleForm.abc" :placeholder="title === 'detail' ? '' : 'ABC'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === 'detail' ? '' : '标签'" :disabled="title === 'detail'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
+
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="测量范围" prop="mesureRange">
             <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="不确定度" prop="uncertainty">
             <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
         <el-col v-if="showAssetsItem" :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+          <el-form-item v-if="ruleForm.assetType !== '3'" label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
@@ -469,7 +457,7 @@
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
           </el-form-item> -->
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType !== '3'" :span="6">
           <el-form-item label="启用日期" prop="enableDate">
             <el-date-picker
               v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
@@ -478,24 +466,22 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定方式" prop="mesureType">
             <el-select v-model="ruleForm.mesureType" :placeholder="title === 'detail' ? '' : '检定方式'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" style="width: 100%;" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="使用部门" prop="useDept">
             <com-tree-select
               v-if="title !== 'detail'"
@@ -507,7 +493,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="使用人" prop="usePerson">
             <el-select v-model="ruleForm.usePerson" :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
@@ -515,15 +501,13 @@
           </el-form-item>
         </el-col>
         <el-col v-if="showAssetsItem" :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
+          <el-form-item v-if="ruleForm.assetType !== '3'" label="专业分类" prop="majorCategory">
             <el-select v-model="ruleForm.majorCategory" :placeholder="title === 'detail' ? '' : '专业分类'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定部门" prop="mesureDept">
             <com-tree-select
               v-if="title !== 'detail'"
@@ -535,7 +519,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定日期" prop="mesureDate">
             <el-date-picker
               v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
@@ -544,7 +528,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="有效日期" prop="validDate">
             <el-date-picker
               v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
@@ -553,7 +537,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定结果" prop="mesureResult">
             <el-select v-model="ruleForm.mesureResult" :placeholder="title === 'detail' ? '' : '检定结果'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
@@ -562,7 +546,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="24" class="marg">
+      <el-row v-if="ruleForm.assetType === '1'" :gutter="24" class="marg">
         <el-col :span="8">
           <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="280px">
             <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === 'detail' ? '' : '是/否'" :disabled="title === 'detail'" style="width: 100%;">
@@ -585,7 +569,9 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <!-- 资产类型3是固定资产 -->
       <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
+        <!-- 资产类型：1测量设备、2办公用品、3固定资产、255其他 -->
         <el-col :span="6">
           <el-form-item label="资产来源" prop="assetSource">
             <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === 'detail' ? '' : '资产来源'" :disabled="title === 'detail'" />
@@ -610,8 +596,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="资本来源" prop="capitalSource">
             <el-select v-model="ruleForm.capitalSource" :placeholder="title === 'detail' ? '' : '资本来源'" :disabled="title === 'detail'" style="width: 100%;">
@@ -631,8 +615,6 @@
             <el-input v-model.trim="ruleForm.purpose" :placeholder="title === 'detail' ? '' : '用途'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="技术水平" prop="technicalLevel">
             <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === 'detail' ? '' : '技术水平'" :disabled="title === 'detail'" />
@@ -653,8 +635,6 @@
             <el-input v-model.trim="ruleForm.weight" :placeholder="title === 'detail' ? '' : '重量'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="单价(元)" prop="singlePrice">
             <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === 'detail' ? '' : '单价'" :disabled="title === 'detail'" />
@@ -670,8 +650,6 @@
             <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === 'detail' ? '' : '安装地点'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
@@ -694,16 +672,36 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="属性" prop="attribute">
             <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="24" class="marg">
         <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" autosize placeholder="备注" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="标签绑定" prop="labelBind">
+            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === 'detail' ? '' : '标签'" :disabled="title === 'detail'" clearable>
+              <template #append>
+                <el-button type="primary" size="small">
+                  扫描
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24" class="marg">
+        <el-col :span="24">
           <el-form-item label="说明书" prop="minioFileName">
             <show-photo v-if="ruleForm.fileList.length > 0" :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
             <input ref="fileRef" style="width: 0;overflow: hidden;" type="file" @change="onFileChange">
@@ -714,13 +712,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
   </div>
 </template>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 479ae05..fec6990 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -403,7 +403,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="120" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 2ab77ef..28bd6e1 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -94,19 +94,19 @@
 }) // 表单
 const rules = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
-  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
   manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  // manufacturingDate: [{ required: true, message: '出厂年月不能为空', trigger: 'blur' }],
   modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
   abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
-  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
-  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  // cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  // enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureCycle: [{ required: true, message: '检定周期不能为空', trigger: 'blur' }],
-  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
-  // isMeasureAccount: [{ required: true, message: '必选', trigger: 'blur' }],
-  // isStandardSupportEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
-  // isCalibrationTestEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
+  // validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  isMeasureAccount: [{ required: true, message: '必选', trigger: 'blur' }],
+  isStandardSupportEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
+  isCalibrationTestEquipment: [{ required: true, message: '必选', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -384,9 +384,10 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24" class="marg">
+      <!-- 只有资产类型是固定资产3的时候不显示 -->
+      <el-row v-if="ruleForm.assetType !== '3'" :gutter="24" class="marg">
         <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
+          <el-form-item label="生产厂家" :prop="ruleForm.assetType !== '3' ? '' : 'manufacturer'">
             <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === 'detail' ? '' : '生产厂家'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
@@ -398,7 +399,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
+          <el-form-item label="出厂编号" :prop="ruleForm.assetType !== '3' ? '' : 'manufacturingNo'">
             <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === 'detail' ? '' : '出厂编号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
@@ -413,52 +414,39 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
+        <el-col v-if="ruleForm.assetType !== '3'" :span="6">
+          <el-form-item label="型号" :prop="ruleForm.assetType !== '3' ? '' : 'modelNo'">
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType !== '3'" :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
+          <!-- 只有测量设备显示ABC -->
           <el-form-item label="ABC" prop="abc">
             <el-select v-model="ruleForm.abc" :placeholder="title === 'detail' ? '' : 'ABC'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === 'detail' ? '' : '标签'" :disabled="title === 'detail'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
+
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="测量范围" prop="mesureRange">
             <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="不确定度" prop="uncertainty">
             <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
         <el-col v-if="showAssetsItem" :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+          <el-form-item v-if="ruleForm.assetType !== '3'" label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
@@ -469,7 +457,7 @@
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
           </el-form-item> -->
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType !== '3'" :span="6">
           <el-form-item label="启用日期" prop="enableDate">
             <el-date-picker
               v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
@@ -478,24 +466,22 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定方式" prop="mesureType">
             <el-select v-model="ruleForm.mesureType" :placeholder="title === 'detail' ? '' : '检定方式'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" style="width: 100%;" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="使用部门" prop="useDept">
             <com-tree-select
               v-if="title !== 'detail'"
@@ -507,7 +493,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="使用人" prop="usePerson">
             <el-select v-model="ruleForm.usePerson" :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
@@ -515,15 +501,13 @@
           </el-form-item>
         </el-col>
         <el-col v-if="showAssetsItem" :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
+          <el-form-item v-if="ruleForm.assetType !== '3'" label="专业分类" prop="majorCategory">
             <el-select v-model="ruleForm.majorCategory" :placeholder="title === 'detail' ? '' : '专业分类'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定部门" prop="mesureDept">
             <com-tree-select
               v-if="title !== 'detail'"
@@ -535,7 +519,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定日期" prop="mesureDate">
             <el-date-picker
               v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
@@ -544,7 +528,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="有效日期" prop="validDate">
             <el-date-picker
               v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
@@ -553,7 +537,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="ruleForm.assetType === '1'" :span="6">
           <el-form-item label="检定结果" prop="mesureResult">
             <el-select v-model="ruleForm.mesureResult" :placeholder="title === 'detail' ? '' : '检定结果'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
@@ -562,7 +546,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="24" class="marg">
+      <el-row v-if="ruleForm.assetType === '1'" :gutter="24" class="marg">
         <el-col :span="8">
           <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="280px">
             <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === 'detail' ? '' : '是/否'" :disabled="title === 'detail'" style="width: 100%;">
@@ -585,7 +569,9 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <!-- 资产类型3是固定资产 -->
       <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
+        <!-- 资产类型：1测量设备、2办公用品、3固定资产、255其他 -->
         <el-col :span="6">
           <el-form-item label="资产来源" prop="assetSource">
             <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === 'detail' ? '' : '资产来源'" :disabled="title === 'detail'" />
@@ -610,8 +596,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="资本来源" prop="capitalSource">
             <el-select v-model="ruleForm.capitalSource" :placeholder="title === 'detail' ? '' : '资本来源'" :disabled="title === 'detail'" style="width: 100%;">
@@ -631,8 +615,6 @@
             <el-input v-model.trim="ruleForm.purpose" :placeholder="title === 'detail' ? '' : '用途'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="技术水平" prop="technicalLevel">
             <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === 'detail' ? '' : '技术水平'" :disabled="title === 'detail'" />
@@ -653,8 +635,6 @@
             <el-input v-model.trim="ruleForm.weight" :placeholder="title === 'detail' ? '' : '重量'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="单价(元)" prop="singlePrice">
             <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === 'detail' ? '' : '单价'" :disabled="title === 'detail'" />
@@ -670,8 +650,6 @@
             <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === 'detail' ? '' : '安装地点'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
@@ -694,16 +672,36 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showAssetsItem || ruleForm.isFixedAssets === '1'" :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item label="属性" prop="attribute">
             <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="24" class="marg">
         <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" autosize placeholder="备注" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="标签绑定" prop="labelBind">
+            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === 'detail' ? '' : '标签'" :disabled="title === 'detail'" clearable>
+              <template #append>
+                <el-button type="primary" size="small">
+                  扫描
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24" class="marg">
+        <el-col :span="24">
           <el-form-item label="说明书" prop="minioFileName">
             <show-photo v-if="ruleForm.fileList.length > 0" :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
             <input ref="fileRef" style="width: 0;overflow: hidden;" type="file" @change="onFileChange">
@@ -714,13 +712,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
   </div>
 </template>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 479ae05..fec6990 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -403,7 +403,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="120" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4bdb187..de9dd29 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,5 +1,5 @@
 <!-- 固定资产页面 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="FixedAssetsList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 // import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
@@ -7,6 +7,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const $route = useRoute()
@@ -23,7 +24,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   { text: '固定资产编号', value: 'assetNo', align: 'center', width: 160 },
   { text: '设备名称', value: 'equipmentName', align: 'center' },
   { text: '型号', value: 'modelNo', align: 'center' },
@@ -284,7 +285,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"