From 33152481be86a617ab6851c15334a03c68cb778f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 22 九月 2023 09:04:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 2de73b5..4e05803 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -23,7 +23,7 @@
</template>
<script>
-import {getList} from "@/api/docking/loge";
+import {getLogoList} from "@/api/docking/loge";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
@@ -90,6 +90,20 @@
prop: 'interfaceStatus',
value:7
},
+ {
+ label: '鏍囧噯鐢宠',
+ prop: 'applyCodeForBZ',
+ value:8 },
+ {
+ label: '閮ㄩ棬鐢宠',
+ prop: 'syncDataForOrg',
+ value:9
+ },
+ {
+ label: '浜哄憳鐢宠',
+ prop: 'syncDataForPerson',
+ value:10
+ },
],
},
loading: false,
@@ -142,6 +156,24 @@
width: 140
},
{
+ label: '鏍囧噯鐢宠',
+ prop: 'applyCodeForBZ',
+ sortable:true,
+ width: 130
+ },
+ {
+ label: '閮ㄩ棬鐢宠',
+ prop: 'syncDataForOrg',
+ sortable:true,
+ width: 130
+ },
+ {
+ label: '浜哄憳鐢宠',
+ prop: 'syncDataForPerson',
+ sortable:true,
+ width: 130
+ },
+ {
label: '闆嗘垚绯荤粺缂栧彿',
prop: 'systemCode',
sortable:true,
@@ -219,8 +251,10 @@
},
methods: {
dockingGetList(val){
- console.log(val,'val')
- this.data=val;
+ this.data=val.records;
+ this.page.pageSize=val.size;
+ this.page.currentPage=val.current;
+ this.page.total=val.total;
},
async cellDbClick(row, column, cell, event) {
for (const key in row) {
@@ -269,7 +303,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+ getLogoList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
--
Gitblit v1.10.0