Merge remote-tracking branch 'origin/ah-simple' into ah-simple

src/views/user/goodsManagement/index.vue

@@ -1893,7 +1893,7 @@ const handleDel = (index: any) => {
                             />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <!-- <el-col :span="12">
                         <el-form-item label="原值：" prop="originaValue">
                             <el-input
                                 v-model="addAndEditForm.originaValue"
@@ -1902,7 +1902,7 @@ const handleDel = (index: any) => {
                                 maxlength="11"
                             />
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                 </el-row>
                 <!-- 1.13 需求变动要求隐藏 -->
                 <!-- <el-row :gutter="20">
@@ -2326,13 +2326,22 @@ const handleDel = (index: any) => {
                     </el-col>
                 </el-row> -->
             <!-- </el-form> -->
+
             <el-table :data="equipTableList" width="100%" height="450px" border>
                 <el-table-column label="序号" type="index" width="55" align="center" />
-                <el-table-column prop="identifyCode" align="center" :show-overflow-tooltip="true">
+                <el-table-column
+                    prop="identifyCode"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                    width="260"
+                >
                     <template #header>
                         <div style="display: flex; flex-direction: column; align-items: center">
                             <span>唯一标识符</span>
-                            <span style="font-size: 12px; color: #999"> 说明... </span>
+                            <span style="font-size: 10px; color: #999">
+                                WHMY-DLSSJ-JSD5B-2025070101：<br />
+                                公司简称首字母-设备名称首字母-设备型号-YYYYMMDD序号
+                            </span>
                         </div>
                     </template>
                     <template #default="{ row, $index }">