diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 789a2be..f8d58d9 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -236,7 +236,7 @@
-
@@ -312,6 +312,7 @@
import UserPopup from './userFilter.vue';
import DeptPopup from './deptFilter.vue';
+
const {useCommon} = $globalStore;
const router = useRouter();
diff --git a/src/views/administrative/appointmentRelaunch.vue b/src/views/administrative/appointmentRelaunch.vue
index edb8233..dfca8ac 100644
--- a/src/views/administrative/appointmentRelaunch.vue
+++ b/src/views/administrative/appointmentRelaunch.vue
@@ -205,7 +205,7 @@
-
+
diff --git a/src/views/administrative/userFilter.vue b/src/views/administrative/userFilter.vue
index aa8a38f..b495f4e 100644
--- a/src/views/administrative/userFilter.vue
+++ b/src/views/administrative/userFilter.vue
@@ -42,6 +42,25 @@
type: String,
default: ''
},
+ lawEDid: {
+ type: String,
+ default: ''
+ },
+ LawEDs: {
+ type: Array,
+ default: () => []
+ }
+ },
+ watch: {
+ visible(newVal, oldVal) {
+ if (newVal) {
+ console.log(`监听的值从 ${oldVal} 变为了 ${newVal}`);
+ // 在这里执行你的逻辑
+ this.curPage = 1;
+ this.dataList = [];
+ this.onRefresh();
+ }
+ }
},
data() {
return {
@@ -68,6 +87,16 @@
this.$emit('close');
},
queryList() {
+ // 创建一个 Set 来存储唯一的值
+ const uniqueItemsSet = new Set();
+ uniqueItemsSet.add(this.lawEDid);
+ this.LawEDs.forEach(item => {
+ if (item.id != '') {
+ uniqueItemsSet.add(item.id);
+ }
+ });
+ const setAsString = Array.from(uniqueItemsSet).join(',');
+ this.searchParam.notUserId = setAsString;
this.searchParam.pageNum = (this.curPage-1)*this.searchParam.pageSize;
queryUsers(this.searchParam, success => {
this.curPage++;
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 96dc942..9b97b1c 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -230,7 +230,7 @@
@cancel="data.showTimePicker = false"
/>
-
+
diff --git a/src/views/enforce/userFilter.vue b/src/views/enforce/userFilter.vue
index da6415f..66be6bb 100644
--- a/src/views/enforce/userFilter.vue
+++ b/src/views/enforce/userFilter.vue
@@ -53,6 +53,10 @@
LawEDs: {
type: Array,
default: () => []
+ },
+ isShowCardId: {
+ type: String,
+ default: '1'
}
},
watch: {
@@ -127,6 +131,7 @@
});
const setAsString = Array.from(uniqueItemsSet).join(',');
this.searchParam.notUserId = setAsString;
+ this.searchParam.isShowCardId = this.isShowCardId;
this.searchParam.pageNum = (this.curPage-1)*this.searchParam.pageSize;
// this.searchParam.deptId = this.bureauDeptId;
queryUsers(this.searchParam, success => {
diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue
index 142ac19..1aa2de2 100644
--- a/src/views/enterprise/registrationEdit.vue
+++ b/src/views/enterprise/registrationEdit.vue
@@ -301,8 +301,8 @@
-
-
+
+
diff --git a/src/views/non-law/sign.vue b/src/views/non-law/sign.vue
index 8cb4515..186cc3e 100644
--- a/src/views/non-law/sign.vue
+++ b/src/views/non-law/sign.vue
@@ -132,7 +132,7 @@
-
+