修改添加总卡用户无数据bug

src/views/doorLock/doorLock.vue

@@ -42,7 +42,7 @@
               type="primary"
               class="search"
               @click="identityCardClick('总卡', '总卡')"
-              >总卡</el-button
+              >制作总卡</el-button
             >
             <div class="condition" style="margin-left: 30px">
               <span>楼栋单元</span>
@@ -56,7 +56,7 @@
                 <el-option
                   v-for="item in buildData"
                   :key="item.id"
-                  :label="`${item.building}${item.element}`"
+                  :label="`${item.building}-${item.element}`"
                   :value="item.id"
                 />
               </el-select>
@@ -1302,7 +1302,7 @@
               <el-option
                 v-for="item in buildData"
                 :key="item.id"
-                :label="`${item.building}${item.element}`"
+                :label="`${item.building}-${item.element}`"
                 :value="item.id"
               />
             </el-select>
@@ -1497,7 +1497,7 @@
                 <el-option
                   v-for="item in buildData"
                   :key="item.id"
-                  :label="`${item.building}${item.element}`"
+                  :label="`${item.building}-${item.element}`"
                   :value="item.id"
                 />
               </el-select>
@@ -1534,16 +1534,33 @@
                 border: 0,
               }"
             >
-              <el-table-column align="center" prop="roomNumber" label="生效时间">
+              <el-table-column align="center" prop="startTime" label="生效时间">
               </el-table-column>
-              <el-table-column align="center" prop="type" label="失效时间" />
-              <el-table-column align="center" prop="type" label="用户" />
-              <el-table-column align="center" prop="type" label="楼栋单元" />
-              <el-table-column align="center" prop="type" label="卡号" />
-              <el-table-column align="center" prop="type" label="创建时间" />
+              <el-table-column align="center" prop="endTime" label="失效时间" />
+              <el-table-column align="center" prop="employeeUsersName" label="用户" />
+              <el-table-column align="center" label="楼栋单元">
+                <template #default="{row}">
+                  <span>{{ row.building }}-{{ row.element }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="roomCardInformation" label="卡号" />
+              <el-table-column align="center" prop="createTime" label="创建时间" />
               <el-table-column align="center" prop="unlockType" label="操作">
                 <template #default="{row}">
-                  <span @click=detailDel(row)>删除</span>
+                  <el-popconfirm
+                    width="220"
+                    confirm-button-text="确认"
+                    cancel-button-text="取消"
+                    :icon="InfoFilled"
+                    icon-color="#f89626"
+                    title="是否删除此卡?"
+                    @confirm="detailDel(row)"
+                    @cancel="cancelEvent"
+                  >
+                    <template #reference>
+                      <span style="cursor: pointer;color:#0061ff">删除</span>
+                    </template>
+                  </el-popconfirm>
                 </template>
               </el-table-column>
             </el-table>
@@ -3255,6 +3272,7 @@ const identityCardClick = (val, card) => {
     } else if (card == "总卡") {
       addIdentityCardVisibleTitle.value = "制作总卡";
       identityCardRuleForm.buildingId=""
+      staffData(); // 员工筛选数据
     }
   } else {
     cardFlag.value = "";
@@ -3433,8 +3451,7 @@ const identityCardConfig = (formEl) => {
       }else if (keypassflag.value == "总卡"){
         let data = {
           adminId: sessionStorage.getItem("id"), //管理员id
-	        // "employeeUsersId": identityCardRuleForm.name, //员工id
-	        "employeeUsersId": 1, //员工id
+	        "employeeUsersId": identityCardRuleForm.name, //员工id
 	        "buildingId": identityCardRuleForm.buildingId, //楼栋单元id   
 	        "roomCardInformation": identityCardRuleForm.icCard, //房卡特殊编码
 	        "startTime": identityCardRuleForm.effectiveTime, //开始时间