重复人员

src/views/administrative/appointment.vue

@@ -236,7 +236,7 @@
         <!--        </div>-->
 
         <van-popup v-model:show="data.showLawEnforcerFlag" position="bottom" :style="{ height: '30%' }"/>
-        <UserPopup :visible="data.popupVisible" :content="data.popupContent" @close="closePopup"
+        <UserPopup :visible="data.popupVisible" :content="data.popupContent" :lawEDid="submitData.lawEnforcerId" :LawEDs="data.lawCer"  @close="closePopup"
                    @reciveData="reciveVisible"/>
 
         <van-popup v-model:show="data.showTimePicker" position="bottom" :style="{ height: '30%' }">
@@ -312,6 +312,7 @@
     import UserPopup from './userFilter.vue';
     import DeptPopup from './deptFilter.vue';
 
+
     const {useCommon} = $globalStore;
 
     const router = useRouter();

src/views/administrative/appointmentRelaunch.vue

@@ -205,7 +205,7 @@
         <!--        </div>-->
 
         <van-popup v-model:show="data.showLawEnforcerFlag" position="bottom" :style="{ height: '30%' }" />
-        <UserPopup :visible="data.popupVisible" :content="data.popupContent" @close="closePopup" @reciveData="reciveVisible" />
+        <UserPopup :visible="data.popupVisible" :content="data.popupContent"  :lawEDid="submitData.lawEnforcerId" :LawEDs="data.lawCer"  @close="closePopup" @reciveData="reciveVisible" />
 
         <van-popup v-model:show="data.showTimePicker" position="bottom" :style="{ height: '30%' }" >
 <!--            <van-date-picker-->

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++;

src/views/enforce/sign.vue

@@ -230,7 +230,7 @@
                     @cancel="data.showTimePicker = false"
             />
         </van-popup>
-        <Popup :visible="data.popupVisible" :bureauDeptId="submitData.bureauDeptId" :lawEDid="submitData.lawEnforcerId" :LawEDs="data.lawCer" :content="data.popupContent" @close="closePopup" @reciveData="reciveData"/>
+        <Popup :visible="data.popupVisible" :bureauDeptId="submitData.bureauDeptId" :isShowCardId="0" :lawEDid="submitData.lawEnforcerId" :LawEDs="data.lawCer" :content="data.popupContent" @close="closePopup" @reciveData="reciveData"/>
         <Popup :visible="data.popupVisible2" :content="data.popupContent2" @close="closePopup"
                @reciveData="reciveData2"/>
 

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 => {

src/views/enterprise/registrationEdit.vue

@@ -301,8 +301,8 @@
             </van-form>
         </div>
 
-        <Popup :visible="data.popupVisible" :content="data.popupContent" @close="closePopup" @reciveData="reciveData" />
+        <Popup :visible="data.popupVisible" :content="data.popupContent" @close="closePopup"  :lawEDid="submitData.lawEnforcerId" :LawEDs="data.lawCer" @reciveData="reciveData" />
-        <Popup :visible="data.popupVisible2" :content="data.popupContent2" @close="closePopup" @reciveData="reciveData2" />
+        <Popup :visible="data.popupVisible2" :content="data.popupContent2" @close="closePopup" :lawEDid="submitData.lawEnforcerId" :LawEDs="data.lawCer"  @reciveData="reciveData2" />
 
 
         <van-popup v-model:show="data.showItem" position="bottom" :style="{ height: '30%' }">

src/views/non-law/sign.vue

@@ -132,7 +132,7 @@
         </van-overlay>
 
         <!-- 入企人员 -->
-        <Popup :visible="data.popupLawcerShow" :content="data.popupLawCerContent" @close="closePopup" @reciveData="confirmLawCer"/>
+        <Popup :visible="data.popupLawcerShow" :content="data.popupLawCerContent" @close="closePopup" :lawEDid="submitData.lawEnforcerId" :LawEDs="data.lawCer" @reciveData="confirmLawCer"/>
         <!-- 入企类别 -->
         <van-popup v-model:show="data.popupLawTypeShow" round position="bottom">
             <van-picker :columns="data.lawEnforcementTypes" @cancel="data.popupLawTypeShow = false" @confirm="confirmLawType" />