diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/depositRecord.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/depositRecord.vue index 4cf14a1512c099f354d7f44c6c792962be15fc07..b07374f1906d5c4a878248499a8508a7822094be 100644 --- a/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/depositRecord.vue +++ b/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/depositRecord.vue @@ -72,8 +72,8 @@ :columns="tableHeaders" :dataSource="tableSourceData" > - <template slot="status" slot-scope="text"> - <a-tag v-if="text.status == 1" color="red"> 鏈彇浠� </a-tag> + <template slot="status" slot-scope="text, record"> + <a-tag v-if="record.status == 1" color="red"> 鏈彇浠� </a-tag> <a-tag v-else color="blue"> 宸插彇浠� </a-tag> </template> </a-table> @@ -124,6 +124,7 @@ export default { title: "閭€掑憳", align: "center", dataIndex: "courier", + customRender: (text, record, index) => text.courier || "--", }, { title: "鑱旂郴鐢佃瘽", @@ -148,7 +149,7 @@ export default { { title: "鍙栦欢浜鸿仈绯荤數璇�", align: "center", - dataIndex: "phone", + customRender: (text, record, index) => text.phone || "--", }, { title: "鍙栦欢鐮�", @@ -197,6 +198,7 @@ export default { }, created() { this.getSitePickupDevice(); + this.getStorageList(); }, methods: { // 鑾峰彇璁惧鍒楄〃 diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/pickUpRecord.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/pickUpRecord.vue index b3354e0aad3f70ef81a9cf2a68faab67569ac68c..7f6f09d1a315d3c4b38e15b751b1bdad99ea5fe9 100644 --- a/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/pickUpRecord.vue +++ b/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/pickUpRecord.vue @@ -131,6 +131,7 @@ export default { title: "鍙栦欢浜�", align: "center", dataIndex: "name", + customRender: (text, record, index) => text.name || "--", }, { title: "鍙栦欢鏂瑰紡", @@ -152,7 +153,7 @@ export default { { title: "鑱旂郴鐢佃瘽", align: "center", - dataIndex: "phone", + customRender: (text, record, index) => text.phone || "--", }, { title: "鍙栦欢鏃堕棿", @@ -164,7 +165,7 @@ export default { { title: "閭€掑憳", align: "center", - dataIndex: "courier", + customRender: (text, record, index) => text.courier || "--", }, { title: "瀛樹欢鏃堕棿",