wansfa 1 year ago
parent
commit
201584acf3

+ 8 - 3
src/views/company/schedule/report.vue

@@ -73,7 +73,7 @@
             icon="el-icon-download"
             size="mini"
             @click="handleExport"
-            v-hasPermi="['company:tcmScheduleReport:export']"
+            v-hasPermi="['company:scheduleReport:export']"
         >导出</el-button>
       </el-col>
 	     <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -140,12 +140,17 @@
                 {{ renderTotalVal(scope.row,3) }}
            </template>
     </el-table-column>
-    <el-table-column  label="创建时间" align="center" prop="createTime" width="100">
+     <el-table-column  label="创建时间" align="center" prop="createTime" width="100">
             <template slot-scope="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
       </el-table-column>
-
+     
+       <el-table-column  label="最后更新时间" align="center" prop="updateTime" width="100">
+            <template slot-scope="scope">
+               <span>{{ parseTime(scope.row.updateTime) }}</span>
+            </template>
+      </el-table-column>
 
     <el-table-column v-for='index in 36' :key='index' :label="renderLabel(index-1)"  :width="(index-1)%4==2?'85':'72'"  :prop="renderLabelProp(index)"  align="center" >
            <template slot-scope="scope">

+ 10 - 3
src/views/company/schedule/statistics.vue

@@ -86,7 +86,7 @@
             icon="el-icon-download"
             size="mini"
             @click="handleExport"
-            v-hasPermi="['company:tcmScheduleReport:export']"
+            v-hasPermi="['company:scheduleReport:export']"
         >导出</el-button>
       </el-col>
 	     <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -135,11 +135,18 @@
            </template>
     </el-table-column>
 
-    <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+      <el-table-column  label="创建时间" align="center" prop="createTime" width="100">
             <template slot-scope="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
-      </el-table-column> -->
+      </el-table-column>
+     
+       <el-table-column  label="最后更新时间" align="center" prop="updateTime" width="100">
+            <template slot-scope="scope">
+               <span>{{ parseTime(scope.row.updateTime) }}</span>
+            </template>
+      </el-table-column>
+
 
       <el-table-column v-for='index in 36' :key='index' :label="renderLabel(index-1)"  :width="(index-1)%4==2?'85':'72'"  :prop="renderLabelProp(index)"  align="center" >
            <template slot-scope="scope">

+ 2 - 0
src/views/monitor/operlog/index.vue

@@ -113,6 +113,8 @@
       <el-table-column label="操作类型" align="center" prop="businessType" :formatter="typeFormat" />
       <el-table-column label="请求方式" align="center" prop="requestMethod" />
       <el-table-column label="操作人员" align="center" prop="operName" />
+     
+        <el-table-column label="操作人员姓名" align="center" prop="operNickName" />
       <el-table-column label="主机" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
       <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
       <el-table-column label="操作状态" align="center" prop="status" :formatter="statusFormat" />

+ 3 - 0
src/views/system/user/index.vue

@@ -13,6 +13,9 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+         <el-form-item label="编号" prop="userName">
+            <el-input v-model="queryParams.userName" placeholder="请输入编号" clearable size="small"   @keyup.enter.native="handleQuery" />
+          </el-form-item>
           <el-form-item label="姓名" prop="nickName">
             <el-input v-model="queryParams.nickName" placeholder="请输入姓名" clearable size="small"   @keyup.enter.native="handleQuery" />
           </el-form-item>