chris il y a 3 ans
Parent
commit
f6c4e84988

+ 3 - 0
src/views/common/msg.vue

@@ -110,6 +110,9 @@
         newCollections.forEach((item) => {
           // 判断是否包含当前通知
           if (this.$store.state.common.msgCollection.findIndex(item1 => item1.noticeId === item.noticeId) === -1) {
+            if (!item.publishTime) {
+              item.publishTime = item.createTime
+            }
             this.$store.state.common.msgCollection.push(item)
           }
         })

+ 1 - 1
src/views/modules/msg-center/notice.vue

@@ -60,7 +60,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="publisherId"
+        prop="publisherName"
         header-align="center"
         align="center"
         label="发布人">

+ 1 - 1
src/views/modules/production/equipment.vue

@@ -126,7 +126,7 @@
         <template slot-scope="scope">
           <el-button v-if="isAuth('prod:equipment:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, false)">编辑</el-button>
           <el-button v-if="isAuth('prod:equipment:update')" type="text" size="small" @click="damaged(scope.row.id)">报损</el-button>
-          <el-button v-if="isAuth('prod:equipment:record')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, true)">点检记录</el-button>
+<!--          <el-button v-if="isAuth('prod:equipment:record')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, true)">点检记录</el-button>-->
         </template>
       </el-table-column>
     </el-table>