From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityUnitChild/social.vue | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/views/securityUnitChild/social.vue b/src/views/securityUnitChild/social.vue
index d13c4a8..fdd6a98 100644
--- a/src/views/securityUnitChild/social.vue
+++ b/src/views/securityUnitChild/social.vue
@@ -73,7 +73,7 @@
import { mapGetters } from "vuex";
import { getToken } from "@/util/auth";
export default {
- props: ["deptid"],
+ props: ["deptid", "socialRE"],
data() {
var deptid = this.deptid;
if (this.deptid == undefined) {
@@ -147,10 +147,6 @@
label: "女",
value: 2,
},
- {
- label: "未知",
- value: 3,
- },
],
labelWidth: 110,
addDisabled: true,
@@ -163,21 +159,21 @@
},
],
},
- {
- label: "民族",
- prop: "nation",
- addDisabled: true,
- editDisabled: true,
- width: 55,
- labelWidth: 110,
- rules: [
- {
- required: true,
- message: "请输入民族",
- trigger: "blur",
- },
- ],
- },
+ // {
+ // label: "民族",
+ // prop: "nation",
+ // addDisabled: true,
+ // editDisabled: true,
+ // width: 55,
+ // labelWidth: 110,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入民族",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
// {
// label: "出生日期",
// labelWidth: 110,
@@ -380,6 +376,10 @@
this.deptid;
}
},
+ socialRE() {
+ this.$refs.crud.refreshTable();
+ this.$refs.crud.doLayout();
+ },
},
computed: {
...mapGetters(["permission", "userInfo"]),
@@ -552,6 +552,8 @@
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$refs.crud.refreshTable();
+ this.$refs.crud.doLayout();
this.selectionClear();
});
},
--
Gitblit v1.9.3