From f844841e1eceb675d9d117434e2a0d00adf5aa68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chhk=E2=80=9D?= <“hhk@mail.com”>
Date: Thu, 8 Aug 2024 20:25:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/property/index.vue             | 89 ++++++++++---------
 src/views/base/property/position/index.vue    | 29 +++---
 .../base/property/propertydeal/index.vue      | 23 +++--
 .../base/property/propertydealitem/index.vue  | 35 ++++----
 .../base/property/propertykeep/index.vue      | 11 ++-
 5 files changed, 106 insertions(+), 81 deletions(-)

diff --git a/src/views/base/property/index.vue b/src/views/base/property/index.vue
index c48ba8c..c4e3763 100644
--- a/src/views/base/property/index.vue
+++ b/src/views/base/property/index.vue
@@ -2,44 +2,44 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="企业id" prop="corpId">
+      <!-- <el-form-item label="企业id" prop="corpId">
         <el-input v-model="queryParams.corpId" placeholder="请输入企业id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="部门id" prop="deptId">
         <el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="存放位置" prop="posId">
+      </el-form-item> -->
+      <!-- <el-form-item label="存放位置" prop="posId">
         <el-input v-model="queryParams.posId" placeholder="请输入存放位置" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="使用人id" prop="userId">
+      </el-form-item> -->
+      <!-- <el-form-item label="使用人id" prop="userId">
         <el-input v-model="queryParams.userId" placeholder="请输入使用人id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="资产编号" prop="propNo">
+      </el-form-item> -->
+      <el-form-item label="资产编号" prop="propNo" label-width="60">
         <el-input v-model="queryParams.propNo" placeholder="请输入资产编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="资产名称" prop="propName">
+      <el-form-item label="资产名称" prop="propName" label-width="60">
         <el-input v-model="queryParams.propName" placeholder="请输入资产名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="资产分类" prop="propCatg">
+      <el-form-item label="资产分类" prop="propCatg" label-width="60">
         <el-input v-model="queryParams.propCatg" placeholder="请输入资产分类" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="预计使用年限" prop="useYear">
+      <!-- <el-form-item label="预计使用年限" prop="useYear">
         <el-input v-model="queryParams.useYear" placeholder="请输入预计使用年限" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="价值类型" prop="costType">
+      </el-form-item> -->
+      <el-form-item label="价值类型" prop="costType" label-width="60">
         <el-select v-model="queryParams.costType" placeholder="请选择价值类型" clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPANY_COST_TYPE)" :key="dict.value"
             :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="资产数量" prop="propNum">
+      <!-- <el-form-item label="资产数量" prop="propNum">
         <el-input v-model="queryParams.propNum" placeholder="请输入资产数量" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="资产原值（元）" prop="costTotal">
+      </el-form-item> -->
+      <!-- <el-form-item label="资产原值（元）" prop="costTotal">
         <el-input v-model="queryParams.costTotal" placeholder="请输入资产原值（元）" clearable
           @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="资产状态" prop="propStatus">
+      </el-form-item> -->
+      <el-form-item label="资产状态" prop="propStatus" label-width="60">
         <el-select v-model="queryParams.propStatus" placeholder="请选择资产状态" clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPANY_PROP_STATUS)" :key="dict.value"
             :label="dict.label" :value="dict.value" />
@@ -48,67 +48,67 @@
       <el-form-item label="品牌" prop="brand">
         <el-input v-model="queryParams.brand" placeholder="请输入品牌" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="规格型号" prop="spec">
+      <!-- <el-form-item label="规格型号" prop="spec">
         <el-input v-model="queryParams.spec" placeholder="请输入规格型号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="生产厂家" prop="factory">
+      </el-form-item> -->
+      <!-- <el-form-item label="生产厂家" prop="factory">
         <el-input v-model="queryParams.factory" placeholder="请输入生产厂家" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="出场序列号/编号" prop="serialNo">
+      </el-form-item> -->
+      <!-- <el-form-item label="出场序列号/编号" prop="serialNo">
         <el-input v-model="queryParams.serialNo" placeholder="请输入出场序列号/编号" clearable
           @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="数量计量单位" prop="unit">
+      </el-form-item> -->
+      <!-- <el-form-item label="数量计量单位" prop="unit">
         <el-input v-model="queryParams.unit" placeholder="请输入数量计量单位" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="取得日期" prop="getDate">
+      </el-form-item> -->
+      <!-- <el-form-item label="取得日期" prop="getDate">
         <el-date-picker v-model="queryParams.getDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="出厂日期" prop="prodDate">
+      </el-form-item> -->
+      <!-- <el-form-item label="出厂日期" prop="prodDate">
         <el-date-picker v-model="queryParams.prodDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="供应商" prop="supplier">
         <el-input v-model="queryParams.supplier" placeholder="请输入供应商" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="启用日期" prop="openDate">
+      <el-form-item label="启用日期" prop="openDate" label-width="60">
         <el-date-picker v-model="queryParams.openDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
-      <el-form-item label="净值（元）" prop="netValue">
+      <!-- <el-form-item label="净值（元）" prop="netValue">
         <el-input v-model="queryParams.netValue" placeholder="请输入净值（元）" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="凭证号" prop="voucherNo">
         <el-input v-model="queryParams.voucherNo" placeholder="请输入凭证号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="维修/保养周期单位" prop="keepCycleType">
+      <!-- <el-form-item label="维修/保养周期单位" prop="keepCycleType">
         <el-select v-model="queryParams.keepCycleType" placeholder="请选择维修/保养周期单位" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
-      </el-form-item>
-      <el-form-item label="维修/保养周期" prop="keepCycle">
+      </el-form-item> -->
+      <!-- <el-form-item label="维修/保养周期" prop="keepCycle">
         <el-input v-model="queryParams.keepCycle" placeholder="请输入维修/保养周期" clearable
           @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="上次维修/保养日期" prop="lastKeepDate">
+      </el-form-item> -->
+      <el-form-item label="上次维修/保养日期" prop="lastKeepDate" label-width="100">
         <el-date-picker v-model="queryParams.lastKeepDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
-      <el-form-item label="下次维修/保养日期" prop="nextKeepDate">
+      <!-- <el-form-item label="下次维修/保养日期" prop="nextKeepDate">
         <el-date-picker v-model="queryParams.nextKeepDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      </el-form-item> -->
+      <!-- <el-form-item label="创建时间" prop="createTime">
         <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -129,7 +129,12 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键标识" align="center" prop="id" />
+      <el-table-column label="序号" align="center" prop="num">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ queryParams.pageSize * (queryParams.pageNo - 1) + scope.$index + 1
+            }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="企业id" align="center" prop="corpId" />
       <el-table-column label="部门id" align="center" prop="deptId" />
       <el-table-column label="存放位置" align="center" prop="posId" />
diff --git a/src/views/base/property/position/index.vue b/src/views/base/property/position/index.vue
index c5a7cd7..003612a 100644
--- a/src/views/base/property/position/index.vue
+++ b/src/views/base/property/position/index.vue
@@ -2,30 +2,30 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="企业id（base_company表中的id）" prop="corpId">
+      <!-- <el-form-item label="企业id" prop="corpId">
         <el-input v-model="queryParams.corpId" placeholder="请输入企业id（base_company表中的id）" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="部门id（system_dept表中的id，用来做数据权限控制）" prop="deptId">
-        <el-input v-model="queryParams.deptId" placeholder="请输入部门id（system_dept表中的id，用来做数据权限控制）" clearable
+      <el-form-item label="部门id" prop="deptId">
+        <el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable
           @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="存放地名称" prop="posName">
+      </el-form-item> -->
+      <el-form-item label="存放地名称" prop="posName" label-width="100">
         <el-input v-model="queryParams.posName" placeholder="请输入存放地名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="存放地地址" prop="address">
+      <el-form-item label="存放地地址" prop="address" label-width="100">
         <el-input v-model="queryParams.address" placeholder="请输入存放地地址" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="面积" prop="area">
         <el-input v-model="queryParams.area" placeholder="请输入面积" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="存放类型" prop="depositType">
+      <el-form-item label="存放类型" prop="depositType" label-width="60">
         <el-select v-model="queryParams.depositType" placeholder="请选择存放类型" clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPANY_DEPOSIT_TYPE)" :key="dict.value"
             :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      <el-form-item label="创建时间" prop="createTime" label-width="60">
         <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
@@ -50,9 +50,14 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键标识" align="center" prop="id" />
-      <el-table-column label="企业id（base_company表中的id）" align="center" prop="corpId" />
-      <el-table-column label="部门id（system_dept表中的id，用来做数据权限控制）" align="center" prop="deptId" />
+      <el-table-column label="序号" align="center" prop="num">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ queryParams.pageSize * (queryParams.pageNo - 1) + scope.$index + 1
+            }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="企业id（base_company表中的id）" align="center" prop="corpId" />
+      <el-table-column label="部门id（system_dept表中的id，用来做数据权限控制）" align="center" prop="deptId" /> -->
       <el-table-column label="存放地名称" align="center" prop="posName" />
       <el-table-column label="存放地地址" align="center" prop="address" />
       <el-table-column label="面积" align="center" prop="area" />
@@ -84,7 +89,7 @@
 </template>
 
 <script>
-    import * as PropertyPosApi from '@/api/base/property/position';
+import * as PropertyPosApi from '@/api/base/property/position';
 import PropertyPosForm from './PropertyPosForm.vue';
 export default {
   name: "PropertyPos",
diff --git a/src/views/base/property/propertydeal/index.vue b/src/views/base/property/propertydeal/index.vue
index 6092a03..e38d24d 100644
--- a/src/views/base/property/propertydeal/index.vue
+++ b/src/views/base/property/propertydeal/index.vue
@@ -2,29 +2,29 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="企业id（base_company表中的id）" prop="corpId">
+      <!-- <el-form-item label="企业id（base_company表中的id）" prop="corpId">
         <el-input v-model="queryParams.corpId" placeholder="请输入企业id（base_company表中的id）" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="部门id（system_dept表中的id，用来做数据权限控制）" prop="deptId">
         <el-input v-model="queryParams.deptId" placeholder="请输入部门id（system_dept表中的id，用来做数据权限控制）" clearable
           @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="数据类型" prop="dataType">
+      </el-form-item> -->
+      <el-form-item label="数据类型" prop="dataType" label-width="60">
         <el-select v-model="queryParams.dataType" placeholder="请选择数据类型" clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.PROPERTY_DATA_TYPE)" :key="dict.value"
             :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="处置/变动单号" prop="dealNo">
+      <el-form-item label="处置/变动单号" prop="dealNo" label-width="100">
         <el-input v-model="queryParams.dealNo" placeholder="请输入处置/变动单号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="处置/变动日期" prop="dealDate">
+      <el-form-item label="处置/变动日期" prop="dealDate" label-width="100">
         <el-date-picker v-model="queryParams.dealDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      <el-form-item label="创建时间" prop="createTime" label-width="60">
         <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
@@ -49,9 +49,14 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键标识" align="center" prop="id" />
-      <el-table-column label="企业id（base_company表中的id）" align="center" prop="corpId" />
-      <el-table-column label="部门id（system_dept表中的id，用来做数据权限控制）" align="center" prop="deptId" />
+      <el-table-column label="序号" align="center" prop="num">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ queryParams.pageSize * (queryParams.pageNo - 1) + scope.$index + 1
+            }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="企业id（base_company表中的id）" align="center" prop="corpId" />
+      <el-table-column label="部门id（system_dept表中的id，用来做数据权限控制）" align="center" prop="deptId" /> -->
       <el-table-column label="数据类型" align="center" prop="dataType">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.PROPERTY_DATA_TYPE" :value="scope.row.dataType" />
diff --git a/src/views/base/property/propertydealitem/index.vue b/src/views/base/property/propertydealitem/index.vue
index a30222b..b6f2fc1 100644
--- a/src/views/base/property/propertydealitem/index.vue
+++ b/src/views/base/property/propertydealitem/index.vue
@@ -2,19 +2,19 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="处置单/变动单id" prop="dealId">
+      <!-- <el-form-item label="处置单/变动单id" prop="dealId">
         <el-input v-model="queryParams.dealId" placeholder="请输入处置单/变动单id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="资产id" prop="propertyId">
+      </el-form-item> -->
+      <!-- <el-form-item label="资产id" prop="propertyId">
         <el-input v-model="queryParams.propertyId" placeholder="请输入资产id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="处置方式" prop="dealWay">
+      </el-form-item> -->
+      <el-form-item label="处置方式" prop="dealWay" label-width="60">
         <el-select v-model="queryParams.dealWay" placeholder="请选择处置方式" clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPANY_DEAL_WAY)" :key="dict.value" :label="dict.label"
             :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="原企业id" prop="oldCorpId">
+      <!-- <el-form-item label="原企业id" prop="oldCorpId">
         <el-input v-model="queryParams.oldCorpId" placeholder="请输入原企业id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="调入企业id" prop="corpId">
@@ -37,11 +37,11 @@
       </el-form-item>
       <el-form-item label="调入使用人id" prop="userId">
         <el-input v-model="queryParams.userId" placeholder="请输入调入使用人id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
+      </el-form-item> -->
+      <!-- <el-form-item label="备注" prop="remark">
         <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      </el-form-item> -->
+      <el-form-item label="创建时间" prop="createTime" label-width="60">
         <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
@@ -66,22 +66,27 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键标识" align="center" prop="id" />
-      <el-table-column label="处置单/变动单id" align="center" prop="dealId" />
-      <el-table-column label="资产id" align="center" prop="propertyId" />
+      <el-table-column label="序号" align="center" prop="num">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ queryParams.pageSize * (queryParams.pageNo - 1) + scope.$index + 1
+            }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="处置单/变动单id" align="center" prop="dealId" /> -->
+      <!-- <el-table-column label="资产id" align="center" prop="propertyId" /> -->
       <el-table-column label="处置方式" align="center" prop="dealWay">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.COMPANY_DEAL_WAY" :value="scope.row.dealWay" />
         </template>
       </el-table-column>
-      <el-table-column label="原企业id" align="center" prop="oldCorpId" />
+      <!-- <el-table-column label="原企业id" align="center" prop="oldCorpId" />
       <el-table-column label="调入企业id" align="center" prop="corpId" />
       <el-table-column label="原部门id" align="center" prop="oldDeptId" />
       <el-table-column label="调入部门id" align="center" prop="deptId" />
       <el-table-column label="原存放地id" align="center" prop="oldPosId" />
       <el-table-column label="调入存放地id" align="center" prop="posId" />
       <el-table-column label="原使用人id" align="center" prop="oldUserId" />
-      <el-table-column label="调入使用人id" align="center" prop="userId" />
+      <el-table-column label="调入使用人id" align="center" prop="userId" /> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
diff --git a/src/views/base/property/propertykeep/index.vue b/src/views/base/property/propertykeep/index.vue
index d9b2027..558804e 100644
--- a/src/views/base/property/propertykeep/index.vue
+++ b/src/views/base/property/propertykeep/index.vue
@@ -5,7 +5,7 @@
       <el-form-item label="资产id" prop="propertyId">
         <el-input v-model="queryParams.propertyId" placeholder="请输入资产id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="维修/保养日期" prop="keepDate">
+      <el-form-item label="维修/保养日期" prop="keepDate" label-width="100">
         <el-date-picker v-model="queryParams.keepDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
@@ -13,7 +13,7 @@
       <el-form-item label="备注" prop="remark">
         <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      <el-form-item label="创建时间" prop="createTime" label-width="60">
         <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
@@ -38,7 +38,12 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键标识" align="center" prop="id" />
+      <el-table-column label="序号" align="center" prop="num">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ queryParams.pageSize * (queryParams.pageNo - 1) + scope.$index + 1
+            }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="资产id" align="center" prop="propertyId" />
       <el-table-column label="维修/保养日期" align="center" prop="keepDate" />
       <el-table-column label="备注" align="center" prop="remark" />