Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd into demo_

src/views/sb/change-record/SbChangeRecord.vue

@@ -289,10 +289,12 @@ export default {
     },
     handleView (record) {
       this.visible = false
-      fetchSbChangeRecord({ id: record.id }).then(res => {
+      const modal = this.$refs.detailModal
+      modal.base(record)
+      /* fetchSbChangeRecord({ id: record.id }).then(res => {
         const modal = this.$refs.detailModal
         modal.base(res.data)
-      })
+      }) */
     },
     handleOk (values) {
       this.visible = true

src/views/sb/change-record/modules/Detail.vue

@@ -8,20 +8,13 @@
       </a-col>
     </a-row>
     <detail-list title='' :col='2'>
-      <detail-list-item term='记录人ID'>{{ model.createdUserId }}</detail-list-item>
-      <detail-list-item term='修改人ID'>{{ model.updateUserId }}</detail-list-item>
-      <detail-list-item term='修改人'>{{ model.updateUserName }}</detail-list-item>
-      <detail-list-item term='设备ID'>{{ model.sbId }}</detail-list-item>
+      <detail-list-item term='设备'>{{ model.sbName }}</detail-list-item>
       <detail-list-item term='更改内容'>{{ model.content }}</detail-list-item>
-      <detail-list-item term='原设备位置'>{{ model.oldPositionId }}</detail-list-item>
-      <detail-list-item term='修改后设备位置'>{{ model.positionId }}</detail-list-item>
       <detail-list-item term='位号'>{{ model.sbNoId }}</detail-list-item>
-      <detail-list-item term='原父设备ID'>{{ model.oldParentId }}</detail-list-item>
-      <detail-list-item term='修改后父设备ID'>{{ model.parentId }}</detail-list-item>
-      <detail-list-item term='修改时间'>{{ model.updateTime }}</detail-list-item>
+      <detail-list-item term='记录时间'>{{ model.createdTime }}</detail-list-item>
+      <detail-list-item term='记录人'>{{ model.createdUserName }}</detail-list-item>
       <detail-list-item term='开始时间'>{{ model.startTime }}</detail-list-item>
       <detail-list-item term='结束时间'>{{ model.endTime }}</detail-list-item>
-      <detail-list-item term='更改类型 1 位置 2 位号 3 父设备'>{{ model.changeType }}</detail-list-item>
     </detail-list>
   </a-card>
 </template>
@@ -47,7 +40,7 @@ export default {
       model: {
         'createdUserId': null,
         'updateUserId': null,
-        'updateUserName': null,
+        'createdUserName': null,
         'sbId': null,
         'content': null,
         'oldPositionId': null,
@@ -58,7 +51,8 @@ export default {
         'updateTime': null,
         'startTime': null,
         'endTime': null,
-        'changeType': null
+        'changeType': null,
+        'sbName': null
       }
     }
   },