实现员工资产维护前端功能

ruoyi-ui/src/views/ccdiBaseStaff/index.vue

@@ -67,6 +67,16 @@
           v-hasPermi="['ccdi:employee:import']"
         >导入</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-upload"
+          size="mini"
+          @click="handleAssetImport"
+          v-hasPermi="['ccdi:employee:import']"
+        >导入资产信息</el-button>
+      </el-col>
       <el-col :span="1.5" v-if="showFailureButton">
         <el-tooltip
           :content="getLastImportTooltip()"
@@ -81,6 +91,20 @@
           >查看导入失败记录</el-button>
         </el-tooltip>
       </el-col>
+      <el-col :span="1.5" v-if="assetShowFailureButton">
+        <el-tooltip
+          :content="getLastAssetImportTooltip()"
+          placement="top"
+        >
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-warning-outline"
+            size="mini"
+            @click="viewAssetImportFailures"
+          >查看员工资产导入失败记录</el-button>
+        </el-tooltip>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -138,7 +162,7 @@
     />
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body class="employee-edit-dialog">
+    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body class="employee-edit-dialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <!-- 基本信息 -->
         <div class="section-header">基本信息</div>
@@ -192,6 +216,86 @@
             <el-radio label="1">离职</el-radio>
           </el-radio-group>
         </el-form-item>
+        <div class="section-header">
+          <span>资产信息</span>
+          <el-button type="primary" plain size="mini" icon="el-icon-plus" @click="handleAddAsset">新增资产</el-button>
+        </div>
+        <div class="assets-helper">
+          <div>新增、编辑时无需填写实际持有人身份证号</div>
+          <div>系统会默认带入并保留已有归属信息</div>
+        </div>
+        <el-form-item label-width="0" prop="assetInfoList">
+          <div v-if="!form.assetInfoList || !form.assetInfoList.length" class="empty-assets">
+            <i class="el-icon-office-building"></i>
+            <span>暂无资产信息，请点击新增资产</span>
+          </div>
+          <div v-else class="assets-table-wrapper">
+            <el-table :data="form.assetInfoList" border class="assets-table">
+              <el-table-column label="资产大类" min-width="140">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.assetMainType" placeholder="请输入资产大类" />
+                </template>
+              </el-table-column>
+              <el-table-column label="资产小类" min-width="140">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.assetSubType" placeholder="请输入资产小类" />
+                </template>
+              </el-table-column>
+              <el-table-column label="资产名称" min-width="180">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.assetName" placeholder="请输入资产名称" />
+                </template>
+              </el-table-column>
+              <el-table-column label="产权占比" min-width="120">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.ownershipRatio" placeholder="请输入产权占比" />
+                </template>
+              </el-table-column>
+              <el-table-column label="购买/评估日期" min-width="160">
+                <template slot-scope="scope">
+                  <el-date-picker v-model="scope.row.purchaseEvalDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%" />
+                </template>
+              </el-table-column>
+              <el-table-column label="资产原值" min-width="120">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.originalValue" placeholder="请输入资产原值" />
+                </template>
+              </el-table-column>
+              <el-table-column label="当前估值" min-width="120">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.currentValue" placeholder="请输入当前估值" />
+                </template>
+              </el-table-column>
+              <el-table-column label="估值截止日期" min-width="160">
+                <template slot-scope="scope">
+                  <el-date-picker v-model="scope.row.valuationDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%" />
+                </template>
+              </el-table-column>
+              <el-table-column label="资产状态" min-width="140">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.assetStatus" placeholder="请选择资产状态">
+                    <el-option
+                      v-for="option in assetStatusOptions"
+                      :key="option.value"
+                      :label="option.label"
+                      :value="option.value"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="备注" min-width="180">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.remarks" placeholder="请输入备注" />
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="100" fixed="right">
+                <template slot-scope="scope">
+                  <el-button type="text" size="mini" icon="el-icon-delete" @click="handleRemoveAsset(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
@@ -200,7 +304,7 @@
     </el-dialog>
 
     <!-- 详情对话框 -->
-    <el-dialog title="员工详情" :visible.sync="detailOpen" width="900px" append-to-body class="employee-detail-dialog">
+    <el-dialog title="员工详情" :visible.sync="detailOpen" width="80%" append-to-body class="employee-detail-dialog">
       <div class="detail-container">
         <!-- 基本信息卡片 -->
         <div class="info-section">
@@ -226,6 +330,30 @@
             </el-descriptions-item>
           </el-descriptions>
         </div>
+        <div class="info-section">
+          <div class="section-title">
+            <i class="el-icon-office-building"></i>
+            <span>资产信息</span>
+          </div>
+          <div v-if="!employeeDetail.assetInfoList || !employeeDetail.assetInfoList.length" class="empty-assets-detail">
+            暂无资产信息
+          </div>
+          <el-table v-else :data="employeeDetail.assetInfoList" border class="detail-assets-table">
+            <el-table-column label="资产实际持有人身份证号" prop="personId" min-width="220" />
+            <el-table-column label="归属类型" prop="ownerType" min-width="100">
+              <template slot-scope="scope">
+                <span>{{ formatAssetOwnerType(scope.row) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="资产大类" prop="assetMainType" min-width="120" />
+            <el-table-column label="资产小类" prop="assetSubType" min-width="120" />
+            <el-table-column label="资产名称" prop="assetName" min-width="140" />
+            <el-table-column label="产权占比" prop="ownershipRatio" min-width="100" />
+            <el-table-column label="当前估值" prop="currentValue" min-width="120" />
+            <el-table-column label="资产状态" prop="assetStatus" min-width="120" />
+            <el-table-column label="备注" prop="remarks" min-width="160" show-overflow-tooltip />
+          </el-table>
+        </div>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="detailOpen = false" icon="el-icon-close">关 闭</el-button>
@@ -270,6 +398,41 @@
       @close="handleImportResultClose"
     />
 
+    <el-dialog :title="assetUpload.title" :visible.sync="assetUpload.open" width="400px" append-to-body @close="handleAssetImportDialogClose" v-loading="assetUpload.isUploading" element-loading-text="正在导入员工资产数据,请稍候..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.7)">
+      <el-upload
+        ref="assetUpload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="assetUpload.headers"
+        :action="assetUpload.url"
+        :disabled="assetUpload.isUploading"
+        :on-progress="handleAssetFileUploadProgress"
+        :on-success="handleAssetFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip">
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline;" @click="importAssetTemplate">下载员工资产模板</el-link>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <span>仅允许导入"xls"或"xlsx"格式文件，系统将根据 personId/person_id 自动识别归属员工。</span>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitAssetFileForm" :loading="assetUpload.isUploading">确 定</el-button>
+        <el-button @click="assetUpload.open = false" :disabled="assetUpload.isUploading">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <import-result-dialog
+      :visible.sync="assetImportResultVisible"
+      :content="assetImportResultContent"
+      title="员工资产导入结果"
+      @close="handleAssetImportResultClose"
+    />
+
     <!-- 导入失败记录对话框 -->
     <el-dialog
       title="导入失败记录"
@@ -306,6 +469,43 @@
         <el-button type="danger" plain @click="clearImportHistory">清除历史记录</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      title="员工资产导入失败记录"
+      :visible.sync="assetFailureDialogVisible"
+      width="1200px"
+      append-to-body
+    >
+      <el-alert
+        v-if="lastAssetImportInfo"
+        :title="lastAssetImportInfo"
+        type="info"
+        :closable="false"
+        style="margin-bottom: 15px"
+      />
+
+      <el-table :data="assetFailureList" v-loading="assetFailureLoading">
+        <el-table-column label="归属员工身份证号" prop="familyId" align="center" min-width="180" />
+        <el-table-column label="资产实际持有人身份证号" prop="personId" align="center" min-width="180" />
+        <el-table-column label="资产大类" prop="assetMainType" align="center" />
+        <el-table-column label="资产小类" prop="assetSubType" align="center" />
+        <el-table-column label="资产名称" prop="assetName" align="center" />
+        <el-table-column label="失败原因" prop="errorMessage" align="center" min-width="200" :show-overflow-tooltip="true" />
+      </el-table>
+
+      <pagination
+        v-show="assetFailureTotal > 0"
+        :total="assetFailureTotal"
+        :page.sync="assetFailureQueryParams.pageNum"
+        :limit.sync="assetFailureQueryParams.pageSize"
+        @pagination="getAssetFailureList"
+      />
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="assetFailureDialogVisible = false">关闭</el-button>
+        <el-button type="danger" plain @click="clearAssetImportHistory">清除资产导入历史</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -319,6 +519,10 @@ import {
   listBaseStaff,
   updateBaseStaff
 } from "@/api/ccdiBaseStaff";
+import {
+  getAssetImportFailures,
+  getAssetImportStatus
+} from "@/api/ccdiAssetInfo";
 import {deptTreeSelect} from "@/api/system/user";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -375,6 +579,12 @@ export default {
       },
       // 表单参数
       form: {},
+      assetStatusOptions: [
+        { label: "正常", value: "正常" },
+        { label: "冻结", value: "冻结" },
+        { label: "处置中", value: "处置中" },
+        { label: "报废", value: "报废" }
+      ],
       // 表单校验
       rules: {
         name: [
@@ -418,12 +628,17 @@ export default {
       // 导入结果弹窗
       importResultVisible: false,
       importResultContent: "",
+      assetImportResultVisible: false,
+      assetImportResultContent: "",
       // 轮询定时器
       pollingTimer: null,
+      assetPollingTimer: null,
       // 是否显示查看失败记录按钮
       showFailureButton: false,
+      assetShowFailureButton: false,
       // 当前导入任务ID
       currentTaskId: null,
+      assetCurrentTaskId: null,
       // 失败记录对话框
       failureDialogVisible: false,
       failureList: [],
@@ -432,6 +647,21 @@ export default {
       failureQueryParams: {
         pageNum: 1,
         pageSize: 10
+      },
+      assetUpload: {
+        open: false,
+        title: "",
+        isUploading: false,
+        headers: { Authorization: "Bearer " + getToken() },
+        url: process.env.VUE_APP_BASE_API + "/ccdi/assetInfo/importData"
+      },
+      assetFailureDialogVisible: false,
+      assetFailureList: [],
+      assetFailureLoading: false,
+      assetFailureTotal: 0,
+      assetFailureQueryParams: {
+        pageNum: 1,
+        pageSize: 10
       }
     };
   },
@@ -445,12 +675,25 @@ export default {
         return `导入时间: ${this.parseTime(savedTask.saveTime)} | 总数: ${savedTask.totalCount}条 | 成功: ${savedTask.successCount}条 | 失败: ${savedTask.failureCount}条`;
       }
       return '';
+    },
+    lastAssetImportInfo() {
+      const savedTask = this.getAssetImportTaskFromStorage();
+      if (savedTask && savedTask.totalCount) {
+        return `导入时间: ${this.parseTime(savedTask.saveTime)} | 总数: ${savedTask.totalCount}条 | 成功: ${savedTask.successCount}条 | 失败: ${savedTask.failureCount}条`;
+      }
+      return '';
+    }
+  },
+  watch: {
+    'form.idCard'(newIdCard, oldIdCard) {
+      this.syncAssetPersonIds(newIdCard, oldIdCard);
     }
   },
   created() {
     this.getList();
     this.getDeptTree();
     this.restoreImportState(); // 新增:恢复导入状态
+    this.restoreAssetImportState();
   },
   beforeDestroy() {
     // 组件销毁时清除定时器
@@ -458,6 +701,10 @@ export default {
       clearInterval(this.pollingTimer);
       this.pollingTimer = null;
     }
+    if (this.assetPollingTimer) {
+      clearInterval(this.assetPollingTimer);
+      this.assetPollingTimer = null;
+    }
   },
   methods: {
     /**
@@ -522,6 +769,48 @@ export default {
         console.error('清除导入任务状态失败:', error);
       }
     },
+    saveAssetImportTaskToStorage(taskData) {
+      try {
+        const data = {
+          ...taskData,
+          saveTime: Date.now()
+        };
+        localStorage.setItem('employee_asset_import_last_task', JSON.stringify(data));
+      } catch (error) {
+        console.error('保存资产导入任务状态失败:', error);
+      }
+    },
+    getAssetImportTaskFromStorage() {
+      try {
+        const data = localStorage.getItem('employee_asset_import_last_task');
+        if (!data) return null;
+
+        const task = JSON.parse(data);
+        if (!task || !task.taskId) {
+          this.clearAssetImportTaskFromStorage();
+          return null;
+        }
+
+        const sevenDays = 7 * 24 * 60 * 60 * 1000;
+        if (task.saveTime && Date.now() - task.saveTime > sevenDays) {
+          this.clearAssetImportTaskFromStorage();
+          return null;
+        }
+
+        return task;
+      } catch (error) {
+        console.error('读取资产导入任务状态失败:', error);
+        this.clearAssetImportTaskFromStorage();
+        return null;
+      }
+    },
+    clearAssetImportTaskFromStorage() {
+      try {
+        localStorage.removeItem('employee_asset_import_last_task');
+      } catch (error) {
+        console.error('清除资产导入任务状态失败:', error);
+      }
+    },
     /**
      * 恢复导入状态
      * 在created()钩子中调用
@@ -541,6 +830,20 @@ export default {
         this.showFailureButton = true;
       }
     },
+    restoreAssetImportState() {
+      const savedTask = this.getAssetImportTaskFromStorage();
+
+      if (!savedTask) {
+        this.assetShowFailureButton = false;
+        this.assetCurrentTaskId = null;
+        return;
+      }
+
+      if (savedTask.hasFailures && savedTask.taskId) {
+        this.assetCurrentTaskId = savedTask.taskId;
+        this.assetShowFailureButton = true;
+      }
+    },
     /**
      * 获取上次导入的提示信息
      * @returns {String} 提示文本
@@ -554,6 +857,15 @@ export default {
       }
       return '';
     },
+    getLastAssetImportTooltip() {
+      const savedTask = this.getAssetImportTaskFromStorage();
+      if (savedTask && savedTask.saveTime) {
+        const date = new Date(savedTask.saveTime);
+        const timeStr = this.parseTime(date, '{y}-{m}-{d} {h}:{i}');
+        return `上次员工资产导入: ${timeStr}`;
+      }
+      return '';
+    },
     /**
      * 清除导入历史记录
      * 用户手动触发
@@ -571,6 +883,19 @@ export default {
         this.$message.success('已清除');
       }).catch(() => {});
     },
+    clearAssetImportHistory() {
+      this.$confirm('确认清除上次员工资产导入记录?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.clearAssetImportTaskFromStorage();
+        this.assetShowFailureButton = false;
+        this.assetCurrentTaskId = null;
+        this.assetFailureDialogVisible = false;
+        this.$message.success('已清除');
+      }).catch(() => {});
+    },
     /** 查询员工列表 */
     getList() {
       this.loading = true;
@@ -615,10 +940,135 @@ export default {
         phone: null,
         hireDate: null,
         status: "0",
-        relatives: []
+        relatives: [],
+        assetInfoList: []
       };
       this.resetForm("form");
     },
+    normalizeAssetInfoList() {
+      const assetInfoList = Array.isArray(this.form.assetInfoList)
+        ? this.form.assetInfoList
+        : [];
+      return assetInfoList.filter(item => {
+        if (!item || typeof item !== "object") {
+          return false;
+        }
+        return Object.keys(item).some(key => {
+          const value = item[key];
+          return value !== null && value !== undefined && String(value).trim() !== "";
+        });
+      });
+    },
+    validateAssetInfoList(assetInfoList) {
+      const requiredFields = [
+        { key: "personId", label: "资产实际持有人身份证号" },
+        { key: "assetMainType", label: "资产大类" },
+        { key: "assetSubType", label: "资产小类" },
+        { key: "assetName", label: "资产名称" },
+        { key: "currentValue", label: "当前估值" },
+        { key: "assetStatus", label: "资产状态" }
+      ];
+      const numericFields = [
+        { key: "ownershipRatio", label: "产权占比" },
+        { key: "originalValue", label: "资产原值" },
+        { key: "currentValue", label: "当前估值" }
+      ];
+
+      for (let index = 0; index < assetInfoList.length; index++) {
+        const asset = assetInfoList[index];
+        const rowNo = index + 1;
+
+        for (const field of requiredFields) {
+          const value = asset[field.key];
+          if (value === null || value === undefined || String(value).trim() === "") {
+            this.$modal.msgError(`第${rowNo}条资产的${field.label}不能为空`);
+            return false;
+          }
+        }
+
+        if (!idCardPattern.test(asset.personId)) {
+          this.$modal.msgError(`第${rowNo}条资产的资产实际持有人身份证号格式不正确`);
+          return false;
+        }
+
+        for (const field of numericFields) {
+          const value = asset[field.key];
+          if (value !== null && value !== undefined && String(value).trim() !== "") {
+            if (!/^-?\d+(\.\d+)?$/.test(String(value).trim())) {
+              this.$modal.msgError(`第${rowNo}条资产的${field.label}格式不正确`);
+              return false;
+            }
+          }
+        }
+
+        if (!this.assetStatusOptions.some(option => option.value === asset.assetStatus)) {
+          this.$modal.msgError(`第${rowNo}条资产的资产状态不在允许范围内`);
+          return false;
+        }
+      }
+
+      return true;
+    },
+    createEmptyAssetRow(defaultPersonId = "") {
+      return {
+        personId: defaultPersonId || "",
+        assetMainType: "",
+        assetSubType: "",
+        assetName: "",
+        ownershipRatio: "",
+        purchaseEvalDate: "",
+        originalValue: "",
+        currentValue: "",
+        valuationDate: "",
+        assetStatus: "",
+        remarks: ""
+      };
+    },
+    hasAssetContent(row) {
+      if (!row || typeof row !== "object") {
+        return false;
+      }
+      return Object.keys(row).some(key => {
+        const value = row[key];
+        return value !== null && value !== undefined && String(value).trim() !== "";
+      });
+    },
+    syncAssetPersonIds(newIdCard, oldIdCard) {
+      if (!Array.isArray(this.form.assetInfoList)) {
+        return;
+      }
+      this.form.assetInfoList = this.form.assetInfoList.map(asset => {
+        if (!asset || typeof asset !== "object") {
+          return asset;
+        }
+        const shouldSync = !asset.personId || asset.personId === oldIdCard;
+        if (!shouldSync) {
+          return asset;
+        }
+        return {
+          ...asset,
+          personId: newIdCard || ""
+        };
+      });
+    },
+    handleAddAsset() {
+      if (!Array.isArray(this.form.assetInfoList)) {
+        this.form.assetInfoList = [];
+      }
+      this.form.assetInfoList.push(this.createEmptyAssetRow(this.form.idCard));
+    },
+    handleRemoveAsset(index) {
+      if (!Array.isArray(this.form.assetInfoList)) {
+        return;
+      }
+      this.form.assetInfoList.splice(index, 1);
+    },
+    formatAssetOwnerType(asset) {
+      if (!asset) {
+        return "-";
+      }
+      return asset.personId && asset.personId === this.employeeDetail.idCard ? "本人" : "亲属";
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -638,6 +1088,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.assetInfoList = [];
       this.isAdd = true;
       this.open = true;
       this.title = "新增员工";
@@ -646,7 +1097,10 @@ export default {
     handleDetail(row) {
       const staffId = row.staffId;
       getBaseStaff(staffId).then(response => {
-        this.employeeDetail = response.data;
+        this.employeeDetail = {
+          ...response.data,
+          assetInfoList: response.data.assetInfoList || []
+        };
         this.detailOpen = true;
       });
     },
@@ -656,7 +1110,10 @@ export default {
       this.isAdd = false;
       const staffId = row.staffId || this.ids[0];
       getBaseStaff(staffId).then(response => {
-        this.form = response.data;
+        this.form = {
+          ...response.data,
+          assetInfoList: response.data.assetInfoList || []
+        };
         this.open = true;
         this.title = "编辑员工";
       });
@@ -665,6 +1122,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.assetInfoList = this.normalizeAssetInfoList();
+          if (!this.validateAssetInfoList(this.form.assetInfoList)) {
+            return;
+          }
           if (this.isAdd) {
             addBaseStaff(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
@@ -697,6 +1158,10 @@ export default {
       this.upload.title = "员工数据导入";
       this.upload.open = true;
     },
+    handleAssetImport() {
+      this.assetUpload.title = "员工资产数据导入";
+      this.assetUpload.open = true;
+    },
     /** 导入对话框关闭事件 */
     handleImportDialogClose() {
       this.$nextTick(() => {
@@ -705,14 +1170,27 @@ export default {
         }
       });
     },
+    handleAssetImportDialogClose() {
+      this.$nextTick(() => {
+        if (this.$refs.assetUpload) {
+          this.$refs.assetUpload.clearFiles();
+        }
+      });
+    },
     /** 下载模板操作 */
     importTemplate() {
       this.download('ccdi/baseStaff/importTemplate', {}, `员工信息模板_${new Date().getTime()}.xlsx`)
     },
+    importAssetTemplate() {
+      this.download('ccdi/assetInfo/importTemplate', {}, `员工资产信息模板_${new Date().getTime()}.xlsx`)
+    },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
     },
+    handleAssetFileUploadProgress() {
+      this.assetUpload.isUploading = true;
+    },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       this.upload.isUploading = false;
@@ -763,11 +1241,57 @@ export default {
         this.$modal.msgError(response.msg);
       }
     },
+    handleAssetFileSuccess(response) {
+      this.assetUpload.isUploading = false;
+      this.assetUpload.open = false;
+
+      if (response.code === 200) {
+        if (!response.data || !response.data.taskId) {
+          this.$modal.msgError('员工资产导入任务创建失败:缺少任务ID');
+          this.assetUpload.isUploading = false;
+          this.assetUpload.open = true;
+          return;
+        }
+
+        const taskId = response.data.taskId;
+
+        if (this.assetPollingTimer) {
+          clearInterval(this.assetPollingTimer);
+          this.assetPollingTimer = null;
+        }
+
+        this.clearAssetImportTaskFromStorage();
+        this.saveAssetImportTaskToStorage({
+          taskId: taskId,
+          status: 'PROCESSING',
+          timestamp: Date.now(),
+          hasFailures: false
+        });
+
+        this.assetShowFailureButton = false;
+        this.assetCurrentTaskId = taskId;
+
+        this.$notify({
+          title: '员工资产导入任务已提交',
+          message: '正在后台处理中,处理完成后将通知您',
+          type: 'info',
+          duration: 3000
+        });
+
+        this.startAssetImportStatusPolling(taskId);
+      } else {
+        this.$modal.msgError(response.msg);
+      }
+    },
     // 导入结果弹窗关闭
     handleImportResultClose() {
       this.importResultVisible = false;
       this.importResultContent = "";
     },
+    handleAssetImportResultClose() {
+      this.assetImportResultVisible = false;
+      this.assetImportResultContent = "";
+    },
     /** 开始轮询导入状态 */
     startImportStatusPolling(taskId) {
       let pollCount = 0;
@@ -796,6 +1320,32 @@ export default {
         }
       }, 2000); // 每2秒轮询一次
     },
+    startAssetImportStatusPolling(taskId) {
+      let pollCount = 0;
+      const maxPolls = 150;
+
+      this.assetPollingTimer = setInterval(async () => {
+        try {
+          pollCount++;
+
+          if (pollCount > maxPolls) {
+            clearInterval(this.assetPollingTimer);
+            this.$modal.msgWarning('员工资产导入任务处理超时,请联系管理员');
+            return;
+          }
+
+          const response = await getAssetImportStatus(taskId);
+
+          if (response.data && response.data.status !== 'PROCESSING') {
+            clearInterval(this.assetPollingTimer);
+            this.handleAssetImportComplete(response.data);
+          }
+        } catch (error) {
+          clearInterval(this.assetPollingTimer);
+          this.$modal.msgError('查询员工资产导入状态失败: ' + error.message);
+        }
+      }, 2000);
+    },
     /** 处理导入完成 */
     handleImportComplete(statusResult) {
       // 更新localStorage中的任务状态
@@ -833,11 +1383,47 @@ export default {
         this.getList();
       }
     },
+    handleAssetImportComplete(statusResult) {
+      this.saveAssetImportTaskToStorage({
+        taskId: statusResult.taskId,
+        status: statusResult.status,
+        hasFailures: statusResult.failureCount > 0,
+        totalCount: statusResult.totalCount,
+        successCount: statusResult.successCount,
+        failureCount: statusResult.failureCount
+      });
+
+      if (statusResult.status === 'SUCCESS') {
+        this.$notify({
+          title: '员工资产导入完成',
+          message: `全部成功!共导入${statusResult.totalCount}条数据`,
+          type: 'success',
+          duration: 5000
+        });
+        this.assetShowFailureButton = false;
+        this.getList();
+      } else if (statusResult.failureCount > 0) {
+        this.$notify({
+          title: '员工资产导入完成',
+          message: `成功${statusResult.successCount}条,失败${statusResult.failureCount}条`,
+          type: 'warning',
+          duration: 5000
+        });
+
+        this.assetShowFailureButton = true;
+        this.assetCurrentTaskId = statusResult.taskId;
+        this.getList();
+      }
+    },
     /** 查看导入失败记录 */
     viewImportFailures() {
       this.failureDialogVisible = true;
       this.getFailureList();
     },
+    viewAssetImportFailures() {
+      this.assetFailureDialogVisible = true;
+      this.getAssetFailureList();
+    },
     /** 查询失败记录列表 */
     getFailureList() {
       this.failureLoading = true;
@@ -876,9 +1462,46 @@ export default {
         }
       });
     },
+    getAssetFailureList() {
+      this.assetFailureLoading = true;
+      getAssetImportFailures(
+        this.assetCurrentTaskId,
+        this.assetFailureQueryParams.pageNum,
+        this.assetFailureQueryParams.pageSize
+      ).then(response => {
+        this.assetFailureList = response.rows;
+        this.assetFailureTotal = response.total;
+        this.assetFailureLoading = false;
+      }).catch(error => {
+        this.assetFailureLoading = false;
+
+        if (error.response) {
+          const status = error.response.status;
+
+          if (status === 404) {
+            this.$modal.msgWarning('员工资产导入记录已过期,无法查看失败记录');
+            this.clearAssetImportTaskFromStorage();
+            this.assetShowFailureButton = false;
+            this.assetCurrentTaskId = null;
+            this.assetFailureDialogVisible = false;
+          } else if (status === 500) {
+            this.$modal.msgError('服务器错误,请稍后重试');
+          } else {
+            this.$modal.msgError(`查询失败: ${error.response.data.msg || '未知错误'}`);
+          }
+        } else if (error.request) {
+          this.$modal.msgError('网络连接失败,请检查网络');
+        } else {
+          this.$modal.msgError('查询员工资产失败记录失败: ' + error.message);
+        }
+      });
+    },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
+    },
+    submitAssetFileForm() {
+      this.$refs.assetUpload.submit();
     }
   }
 };
@@ -898,6 +1521,7 @@ export default {
   background: #f9fafb;
   border-radius: 8px;
   padding: 16px;
+  margin-bottom: 16px;
 }
 
 .employee-detail-dialog .section-title {
@@ -921,6 +1545,20 @@ export default {
   background: #fff;
 }
 
+.employee-detail-dialog .detail-assets-table {
+  background: #fff;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.employee-detail-dialog .empty-assets-detail {
+  padding: 32px 0;
+  text-align: center;
+  color: #909399;
+  background: #fff;
+  border-radius: 4px;
+}
+
 .employee-detail-dialog .relatives-container {
   background: #fff;
   border-radius: 4px;
@@ -976,6 +1614,50 @@ export default {
   margin-right: 20px;
 }
 
+.employee-edit-dialog .assets-helper {
+  margin: -4px 0 12px;
+  padding: 10px 12px;
+  background: #f4f8ff;
+  border: 1px solid #d9ecff;
+  border-radius: 6px;
+  color: #606266;
+  line-height: 1.8;
+}
+
+.employee-edit-dialog .assets-table-wrapper {
+  width: 100%;
+  overflow-x: auto;
+}
+
+.employee-edit-dialog .assets-table {
+  min-width: 1460px;
+}
+
+.employee-edit-dialog .assets-table .el-input,
+.employee-edit-dialog .assets-table .el-date-editor {
+  width: 100%;
+}
+
+.employee-edit-dialog .empty-assets {
+  text-align: center;
+  padding: 30px 0;
+  color: #909399;
+  border: 1px dashed #dcdfe6;
+  border-radius: 4px;
+  background: #fafafa;
+}
+
+.employee-edit-dialog .empty-assets i {
+  display: block;
+  font-size: 30px;
+  color: #c0c4cc;
+  margin-bottom: 8px;
+}
+
+.employee-edit-dialog .empty-assets span {
+  font-size: 13px;
+}
+
 .employee-edit-dialog .relatives-table {
   width: 100%;
 }