Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

src/api/school/index.js

@@ -516,11 +516,11 @@ export function getEduEmployeeNumList(data) {
 }
 //获取用户资产列表
 export function propertyGetPageList(data) {
-  // return request_zc({
-  //     url: '/property/PropertyGetPageList',
-  //     method: 'post',
-  //     data
-  // });
+  return request_zc({
+      url: '/property/PropertyGetPageList',
+      method: 'post',
+      data
+  });
 }
 /**
  *  获取班级下拉_（出库单）

src/pages/school/receiveNumList.vue

@@ -118,8 +118,10 @@
           </q-td>
         </template>
         <template v-slot:body-cell-EmName="props">
-          <div>{{props.row.EmName}}</div>
-          <div>{{props.row.GetTime}}</div>
+          <q-td>
+            <div>{{props.row.EmName}}</div>
+            <div>{{props.row.GetTime}}</div>
+          </q-td>
         </template>
         <template v-slot:bottom>
           <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"