linyanfei 3 years ago
parent
commit
7f434f264c

+ 2 - 1
shanXiPlatform/src/views/safeProduction/allSafe/index.vue

@@ -35,7 +35,8 @@
35
         <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
35
         <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
36
         <el-table-column prop="inspecTime" label="记录时间" align="center">
36
         <el-table-column prop="inspecTime" label="记录时间" align="center">
37
           <template slot-scope="scope">
37
           <template slot-scope="scope">
38
-            <span>{{scope.row.inspecTime}}</span>
38
+            <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
39
+            <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
39
           </template>
40
           </template>
40
         </el-table-column>
41
         </el-table-column>
41
         <el-table-column prop="inspecType" label="类型" align="center">
42
         <el-table-column prop="inspecType" label="类型" align="center">

+ 2 - 1
shanXiPlatform/src/views/safeProduction/newSafe/index.vue

@@ -12,7 +12,8 @@
12
         </el-table-column>
12
         </el-table-column>
13
         <el-table-column prop="inspecTime" label="最后记录时间" align="center">
13
         <el-table-column prop="inspecTime" label="最后记录时间" align="center">
14
           <template slot-scope="scope">
14
           <template slot-scope="scope">
15
-            <span>{{scope.row.inspecTime}}</span>
15
+            <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
16
+            <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
16
           </template>
17
           </template>
17
         </el-table-column>
18
         </el-table-column>
18
         <el-table-column prop="status" label="状态" align="center" width='100px'>
19
         <el-table-column prop="status" label="状态" align="center" width='100px'>

+ 2 - 1
shanXiPlatform/src/views/supervisionInspection/entrustedRepository/newEntrustedRepository/index.vue

@@ -33,7 +33,8 @@
33
             </el-table-column>
33
             </el-table-column>
34
             <el-table-column prop="inspecTime" label="时间" align="center">
34
             <el-table-column prop="inspecTime" label="时间" align="center">
35
               <template slot-scope="scope">
35
               <template slot-scope="scope">
36
-                <span>{{scope.row.inspecTime}}</span>
36
+                <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
37
+                <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
37
               </template>
38
               </template>
38
             </el-table-column>
39
             </el-table-column>
39
             <el-table-column prop="status" label="状态" align="center" width='100px'>
40
             <el-table-column prop="status" label="状态" align="center" width='100px'>

+ 2 - 1
shanXiPlatform/src/views/supervisionInspection/library/allLibrary/index.vue

@@ -35,7 +35,8 @@
35
         <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
35
         <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
36
         <el-table-column prop="inspecTime" label="检查时间" align="center">
36
         <el-table-column prop="inspecTime" label="检查时间" align="center">
37
           <template slot-scope="scope">
37
           <template slot-scope="scope">
38
-            <span>{{scope.row.inspecTime}}</span>
38
+            <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
39
+            <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
39
           </template>
40
           </template>
40
         </el-table-column>
41
         </el-table-column>
41
         <el-table-column prop="inspecType" label="检查类型" align="center">
42
         <el-table-column prop="inspecType" label="检查类型" align="center">

+ 2 - 1
shanXiPlatform/src/views/supervisionInspection/library/newLibrary/index.vue

@@ -11,7 +11,8 @@
11
         </el-table-column>
11
         </el-table-column>
12
         <el-table-column prop="inspecTime" label="最后记录时间" align="center">
12
         <el-table-column prop="inspecTime" label="最后记录时间" align="center">
13
           <template slot-scope="scope">
13
           <template slot-scope="scope">
14
-            <span>{{scope.row.inspecTime}}</span>
14
+            <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
15
+            <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
15
           </template>
16
           </template>
16
         </el-table-column>
17
         </el-table-column>
17
         <el-table-column prop="status" label="状态" align="center" width='100px'>
18
         <el-table-column prop="status" label="状态" align="center" width='100px'>

+ 2 - 1
shanXiPlatform/src/views/supervisionInspection/subTreasury/newSubTreasury/index.vue

@@ -33,7 +33,8 @@
33
             </el-table-column>
33
             </el-table-column>
34
             <el-table-column prop="inspecTime" label="时间" align="center">
34
             <el-table-column prop="inspecTime" label="时间" align="center">
35
               <template slot-scope="scope">
35
               <template slot-scope="scope">
36
-                <span>{{scope.row.inspecTime}}</span>
36
+                <span v-if="scope.row.inspecTime">{{scope.row.inspecTime.slice(0,16)}}</span>
37
+                <span v-if="!scope.row.inspecTime">{{scope.row.inspecTime}}</span>
37
               </template>
38
               </template>
38
             </el-table-column>
39
             </el-table-column>
39
             <el-table-column prop="status" label="状态" align="center" width='100px'>
40
             <el-table-column prop="status" label="状态" align="center" width='100px'>

+ 2 - 1
shanXiPlatform/src/views/systemManagement/notice/allNotice/index.vue

@@ -6,7 +6,8 @@
6
         <el-table-column prop="title" label="标题" align="center" />
6
         <el-table-column prop="title" label="标题" align="center" />
7
         <el-table-column prop="publishTime" label="发布时间" align="center">
7
         <el-table-column prop="publishTime" label="发布时间" align="center">
8
           <template slot-scope="scope">
8
           <template slot-scope="scope">
9
-            <span>{{dateFormatValue(scope.row.publishTime)}}</span>
9
+            <span v-if="scope.row.publishTime">{{scope.row.publishTime.slice(0,16)}}</span>
10
+            <span v-if="!scope.row.publishTime">{{scope.row.publishTime}}</span>
10
           </template>
11
           </template>
11
         </el-table-column>
12
         </el-table-column>
12
         <el-table-column prop="publishUserName" label="发布人" align="center" />
13
         <el-table-column prop="publishUserName" label="发布人" align="center" />

+ 2 - 1
shanXiPlatform/src/views/systemManagement/notice/newNotice/index.vue

@@ -26,7 +26,8 @@
26
         <el-table-column prop="title" label="标题" align="center" />
26
         <el-table-column prop="title" label="标题" align="center" />
27
         <el-table-column prop="publishTime" label="发布时间" align="center">
27
         <el-table-column prop="publishTime" label="发布时间" align="center">
28
           <template slot-scope="scope">
28
           <template slot-scope="scope">
29
-            <span>{{scope.row.publishTime}}</span>
29
+            <span v-if="scope.row.publishTime">{{scope.row.publishTime.slice(0,16)}}</span>
30
+            <span v-if="!scope.row.publishTime">{{scope.row.publishTime}}</span>
30
           </template>
31
           </template>
31
         </el-table-column>
32
         </el-table-column>
32
         <el-table-column prop="publishUserName" label="发布人" align="center" />
33
         <el-table-column prop="publishUserName" label="发布人" align="center" />

File diff suppressed because it is too large
+ 645 - 663
shanXiPlatform/src/views/systemManagement/userManagement/approverManagement/index.vue


+ 1 - 1
shanXiPlatform/src/views/systemManagement/userManagement/departmentManagement/index.vue

@@ -149,7 +149,7 @@ export default {
149
         var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
149
         var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
150
         var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
150
         var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
151
         // 拼接
151
         // 拼接
152
-        return (year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds)
152
+        return (year + '-' + month + '-' + day + ' ' + hours + ':' + minutes)
153
         // return (year + '-' + month + '-' + day)
153
         // return (year + '-' + month + '-' + day)
154
       }
154
       }
155
     },
155
     },

+ 2 - 1
shanXiPlatform/src/views/systemManagement/userManagement/roleManagement/index.vue

@@ -16,7 +16,8 @@
16
       <el-table-column prop="rname" label="角色名称" align="center" />
16
       <el-table-column prop="rname" label="角色名称" align="center" />
17
       <el-table-column prop="rCreateTime" label="创建时间" align="center">
17
       <el-table-column prop="rCreateTime" label="创建时间" align="center">
18
           <template slot-scope="scope">
18
           <template slot-scope="scope">
19
-            <span>{{scope.row.rCreateTime}}</span>
19
+            <span v-if="scope.row.rCreateTime">{{scope.row.rCreateTime.slice(0,16)}}</span>
20
+            <span v-if="!scope.row.rCreateTime">{{scope.row.rCreateTime}}</span>
20
           </template>
21
           </template>
21
         </el-table-column>
22
         </el-table-column>
22
       <el-table-column prop="rremark" label="备注" align="center" />
23
       <el-table-column prop="rremark" label="备注" align="center" />