Browse Source

fix:筛选框对应分页器与序列码状态

liyangbin 2 years ago
parent
commit
bd174012f6

+ 2 - 1
src/views/Device.vue

@@ -153,6 +153,7 @@ export default {
       this.pagingQuery()
     },
     searchInfo() {
+      this.currentPage = 1
       this.pagingQuery()
     },
     // 下载设备文件
@@ -256,7 +257,7 @@ export default {
             placeholder="Search User Name / Email / UUID"
           >
           </el-input>
-          <button class="absolute top-8px right-8px"><Search /></button>
+          <button class="absolute top-8px right-8px" @click="searchInfo()"><Search /></button>
         </div>
         <button
           type="button"

+ 5 - 1
src/views/LicenseManage.vue

@@ -68,6 +68,8 @@ const pagingQuery = (val) => {
         data[i].validFlag = 'Assigned'
       } else if (data[i].validFlag === 3) {
         data[i].validFlag = 'Activated'
+      } else if (data[i].validFlag === 5) {
+        data[i].validFlag = 'Expired'
       } else {
         data[i].validFlag = 'Canceled'
         // data[i].endDate = ''
@@ -166,6 +168,7 @@ const handleCurrentChange = (val) => {
 }
 //筛选
 const searchInfo = (val) => {
+  currentPage.value = 1
   pagingQuery()
 }
 </script>
@@ -265,6 +268,7 @@ const searchInfo = (val) => {
           <option value="3">Activated</option>
           <option value="4">Canceled</option>
           <option value="1">Unassigned</option>
+          <option value="5">Expired</option>
         </select>
         <select class="w-140px ml-16px" v-model="teamId" :class="{ '!text-[#232A40]': teamId !== '' }">
           <option value="" selected>Team</option>
@@ -280,7 +284,7 @@ const searchInfo = (val) => {
             placeholder="Search User Name / Email / License Code"
           >
           </el-input>
-          <button class="absolute top-8px right-8px"><Search /></button>
+          <button class="absolute top-8px right-8px" @click="searchInfo()"><Search /></button>
         </div>
         <button
           type="button"

+ 1 - 0
src/views/ManageAdmin.vue

@@ -81,6 +81,7 @@ const pagingQuery = () => {
 const searchInfo = () => {
   if(click){
     click = false
+    currentPage.value = 1
     pagingQuery()
   }
 }

+ 1 - 0
src/views/ProductManagement.vue

@@ -26,6 +26,7 @@ onMounted(() => {
 })
 //筛选
 const searchInfo = () => {
+  currentPage.value = 1
   pagingQuery()
 }
 //获取分页数据

+ 3 - 2
src/views/TeamManagement/ManageMember.vue

@@ -106,7 +106,7 @@ function getManageMemberList() {
       } else {
         data[i].validFlag = 'Invited'
       }
-      data[i].productNames = res.data.result.list[i].productNames?.split(",")
+      data[i].productNames = res.data.result.list[i].productNames?.replace(/,/g, ",|").split("|")
     }
     tableData.value = data
     total.value = res.data.result.total
@@ -145,6 +145,7 @@ function exportManageMemberList() {
 const searchInfo = () => {
   if(click){
     click = false
+    currentPage.value = 1
     getManageMemberList()
   }
 }
@@ -278,7 +279,7 @@ onMounted(() => {
           min-width="150px"
         >
         <template slot-scope="scope">
-          <span v-for="(item, index) in scope.row.productNames" :key="index">{{item}},<br></span>
+          <span v-for="(item, index) in scope.row.productNames" :key="index">{{item}}<br></span>
         </template>
         </el-table-column>
         <!-- <el-table-column

+ 1 - 0
src/views/TeamManagement/ManageTeam.vue

@@ -122,6 +122,7 @@ function handleDelete() {
 const searchInfo = () => {
   if(click){
     click = false
+    currentPage.value = 1
     getManageTeamList()
   }
 }