Ver Fonte

feat(volumeCancel;manageMember):添加这两个页面的模板文件与部分接口

liyangbin há 2 anos atrás
pai
commit
862fb3fa33

BIN
download/团队成员导入模板.xlsx


BIN
download/批量取消授权导入模板.xlsx


+ 32 - 18
src/views/TeamManagement/ManageMember.vue

@@ -4,7 +4,7 @@ import Search from '@/components/icon/search.vue'
 import Warning from '@/components/icon/warning.vue'
 import { get } from '../../../utils/request'
 
-const tableData = [{
+const tableData = ref([{
   MemberName: '程梓宣',
   Email: 'chengzixuan@kdanmobile.com',
   Team: 'Product Designer',
@@ -12,12 +12,13 @@ const tableData = [{
   AssignedProduct: 'PDF Reader Pro Win',
   ActivatedDeviceUUID: 'B9E5E0C324200E064ECBF4BC41CE2C3A',
   ExpireData: '10/16/2023'
-}]
-const currentPage = 1
+}])
+const currentPage = ref(1)
 const search = ref('')
 const dialogVisible = ref(false)
 const MemberName = ref('')
 const teamId = ref('')
+const size = ref(5)
 
 //打开对话框
 const handleClick = (val) => {
@@ -33,13 +34,31 @@ function handleCurrentChange(val) {
 }
 // 获取团队管理列表
 function getManageMemberList() {
-  
+  get(
+    'http://81.68.234.235:8032/pdf-tech/vppRTeamMemberRole/pageForMember?page=' +
+      currentPage.value +
+      '&' +
+      'pageSize=' +
+      size.value
+  ).then((res) => {
+    const data = res.data.result.list
+    for(let i = 0; i < data.length; i++){
+      if(data[i].validFlag === '0'){
+        data[i].validFlag = "Deleted"
+      } else if(data[i].validFlag === '1'){
+        data[i].validFlag = "Joined"
+      }else{
+        data[i].validFlag = "Invited"
+      }
+    }
+    console.log(data)
+    tableData.value = data
+  })
 }
 // 团队成员列表导出
 function exportManageMemberList() {
   
 }
-
 onMounted(() => {
   let pageText = document.getElementsByClassName("el-pagination__jump")[0]
   if (pageText) {
@@ -99,40 +118,35 @@ onMounted(() => {
         :data="tableData"
         style="width: 100%">
         <el-table-column
-          prop="MemberName"
+          prop="fullName"
           label="Member Name"
           min-width="100px">
         </el-table-column>
         <el-table-column
-          prop="Email"
+          prop="email"
           label="Email"
           min-width="100px">
         </el-table-column>
         <el-table-column
-          prop="Team"
+          prop="teamName"
           label="Team"
           min-width="130px">
         </el-table-column>
         <el-table-column
-          prop="Status"
+          prop="validFlag"
           label="Status"
           min-width="80px">
         </el-table-column>
         <el-table-column
-          prop="AssignedProduct"
+          prop="productNames"
           label="Assigned Product"
           min-width="150px">
         </el-table-column>
         <el-table-column
-          prop="ActivatedDeviceUUID"
+          prop="uniqueSns"
           label="Activated Device UUID"
           min-width="178px">
         </el-table-column>
-        <el-table-column
-          prop="ExpireData"
-          label="Expire Data"
-          min-width="126px">
-        </el-table-column>
         <el-table-column
           label="Operate"
           min-width="62px">
@@ -169,10 +183,10 @@ onMounted(() => {
       @current-change="handleCurrentChange"
       :current-page.sync="currentPage"
       :page-sizes="[5, 10, 20]"
-      :page-size="100"
+      :page-size="1"
       :background="true"
       layout="prev, pager, next, sizes, jumper"
-      :total="100"
+      :total="tableData.length"
       class="
         px-24px
         !rounded-0

+ 43 - 36
src/views/TeamManagement/ManageMember/AddManageMember.vue

@@ -8,26 +8,10 @@ export default {
       formData: {
         memberEmail: '',
         memberName: '',
-        team: ''
+        teamId: ''
       },
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      file: {},
-      fileList: []
+      teamList: {},
+      file: {}
     }
   },
   methods: {
@@ -38,17 +22,26 @@ export default {
     },
     //提交单个添加表单
     submitFormSingle(){
-      if (this.formData.memberEmail.trim() === '' || this.formData.team.trim() === '') {
+      if (this.formData.memberEmail.trim() === '' || this.formData.teamId.trim() === '') {
         this.$message.error('Missing required information')
+      } else {
+        post('http://81.68.234.235:8032/pdf-tech/vppTeam/addTeamMember',this.formData).then((res)=>{
+          if(res.data.msg === 'Add Success!'){
+            this.$message({
+              message: 'Change Success',
+              type: "success",
+            })
+          }
+        })
       }
     },
-    //提交多个添加表单
+    //提交批量添加表单
     submitFormVolume(){
+      this.$refs.upload.submit()
       const formData = new FormData()
       formData.append("file",this.file)
-      post('http://127.0.0.1:4523/m1/1998420-0-default/pdf-tech/vppTeam/addTeamMemberBatch', formData).then((res) => {
-        console.log(res)
-        if(res){
+      post('http://81.68.234.235:8032/pdf-tech/vppTeam/addTeamMemberBatch', formData).then((res) => {
+        if(res.data.msg === "Add Success!"){
           this.$message({
             message: 'Change Success',
             type: "success",
@@ -59,12 +52,19 @@ export default {
     //批量上传文件
     upLoadChange(file){
       this.file = file
-      this.fileList.push(file)
-      console.log("上传的单个文件",this.file)
-      console.log("上传的文件",this.fileList)
+      return false
     }
   },
-  mounted() {},
+  mounted() {
+    //获取团队列表
+    get('http://81.68.234.235:8032/pdf-tech/vppTeam/listWithAdmin').then(
+      (res) => {
+        if(res.data.msg === "success"){
+          this.teamList = res.data.result
+        }
+      }
+    )
+  },
   watch: {
     
   }
@@ -138,15 +138,15 @@ export default {
             <span class="text-[#FF5054]">*</span>
           </span>
           <el-select
-            v-model="formData.team"
+            v-model="formData.teamId"
             placeholder="Product Designer"
             class="w-[40%]"
           >
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in teamList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -208,14 +208,18 @@ export default {
             drag
             action=""
             :before-upload="upLoadChange"
-            multiple
-            accept=".csv">
+            :auto-upload="false"
+            :limit="1"
+            accept=".xlsx"
+            ref="upload">
             <div class="el-upload__text">Drag or drop CSV file here or <em>browse</em></div>
           </el-upload>
         </el-form-item>
         <el-form-item>
           <span slot="label" class="label leading-20px text-[#1460F3] hover:opacity-70 cursor-pointer">
-            Download sample CSV <img src="@/assets/images/downLoadBlue.svg" class="inline-block ">
+            <a href="/download/团队成员导入模板.xlsx" download="团队成员导入模板.xlsx">
+              Download sample CSV <img src="@/assets/images/downLoadBlue.svg" class="inline-block ">
+            </a>
           </span>
         </el-form-item>
         <el-form-item>
@@ -304,6 +308,9 @@ export default {
 ::v-deep .el-upload{
   width: 50%;
 }
+::v-deep .el-upload-list__item{
+  width: 50%;
+}
 </style>
 
 <style lang="scss">

+ 22 - 5
src/views/VolumeCancel.vue

@@ -15,15 +15,25 @@ export default {
     },
     //提交表单
     submitFormVolume(){
+      this.$refs.upload.submit()
       const formData = new FormData()
       formData.append("file",this.file)
+      post('http://81.68.234.235:8032/pdf-tech/vppLicenseCode/cancelLicenceAssignBatch', formData).then((res) => {
+        console.log("批量取消授权码",res)
+        if(res.data.msg === " Assign Success!"){
+          this.$message({
+            message: 'Change Success',
+            type: "success",
+          })
+        }
+      })
     },
     //上传文件
     upLoadChange(file){
       this.file = file
       this.fileList.push(file)
       console.log("上传的单个文件",this.file)
-      console.log("上传的文件",this.fileList)
+      return false
     }
   },
   mounted() {},
@@ -60,16 +70,20 @@ export default {
           <el-upload
             class="upload-demo"
             drag
-            action=""
+            action="111"
             :before-upload="upLoadChange"
-            multiple
-            accept=".csv">
+            :auto-upload="false"
+            :limit="1"
+            accept=".xlsx"
+            ref="upload">
             <div class="el-upload__text">Drag or drop CSV file here or <em>browse</em></div>
           </el-upload>
         </el-form-item>
         <el-form-item>
           <span slot="label" class="label leading-20px text-[#1460F3] hover:opacity-70 cursor-pointer">
-            Download sample CSV <img src="@/assets/images/downLoadBlue.svg" class="inline-block ">
+            <a href="/download/批量取消授权导入模板.xlsx" download="批量取消授权导入模板.xlsx">
+              Download sample CSV <img src="@/assets/images/downLoadBlue.svg" class="inline-block ">
+            </a>
           </span>
         </el-form-item>
         <el-form-item>
@@ -143,6 +157,9 @@ export default {
 ::v-deep .el-upload{
   width: 50%;
 }
+::v-deep .el-upload-list__item{
+  width: 50%;
+}
 </style>
 
 <style lang="scss">