From f5d88e4f31bec1d77721c0795afde3f3a571e9aa Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 11 Aug 2021 15:55:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/people/expression.vue | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/views/people/expression.vue b/src/views/people/expression.vue
index 0b173bc..dc6c443 100644
--- a/src/views/people/expression.vue
+++ b/src/views/people/expression.vue
@@ -79,8 +79,8 @@
trackRecordColumn,
} from "./data";
import { getUserPractitionersInfo } from "@/api/system/user";
-import { add, update, page, remove } from "@/api/performance/performance";
import { mapGetters } from "vuex";
+import { add, update, page, remove } from "@/api/performance/performance";
export default {
data() {
let baseUrl = "https://cli.avuejs.com/api/area";
@@ -461,7 +461,7 @@
return "";
},
//
- onLoad1(page, params = {}) {
+ onLoad1(page1, params = {}) {
this.loading1 = true;
// params["cardid"] = this.cardid;
// params["name"] = this.name;
@@ -486,20 +486,31 @@
// };
// }
var cardid = this.userInfo.user_id;
- console.log(this.userInfo, "111111111111");
- getPerformancePageInfo(cardid).then((res) => {
- // // page.currentPage,
- // // page.pageSize,
- // // Object.assign(params, this.query)
- // // values
- console.log(res);
- // const data = res.data.data;
- // this.page1.total = data.total;
- // this.data1 = data.records;
- // console.log(this.data1, 1);
- // this.loading1 = false;
+ // console.log(this.userInfo, "111111111111");
+ // getPerformancePageInfo(cardid).then((res) => {
+ // // // page.currentPage,
+ // // // page.pageSize,
+ // // // Object.assign(params, this.query)
+ // // // values
+ // // const data = res.data.data;
+ // // this.page1.total = data.total;
+ // // this.data1 = data;
+ // console.log(res, 1231131);
+ // // console.log(this.data1, 1);
+ // // this.loading1 = false;
+ // });
+ var param = {
+ securityid: cardid,
+ };
+ page(this.current, this.size, param).then((res2) => {
+ const data = res2.data.data;
+ this.page1.total = data.total;
+ this.data1 = data.records;
+ console.log(this.data1, 1);
+ this.loading1 = false;
});
},
+
//派遣记录
// saveLock(name, val) {
// localStorage.setItem(name, val);
--
Gitblit v1.9.3