Merge branch 'develop_wzl' into develop

src/views/Dashboard.vue

@@ -71,6 +71,7 @@ export default {
       get('http://81.68.234.235:8032/pdf-tech/vppDashboard/getOverviewProduct', {
         codeList: this.dataFilterProductSelect
       }).then((res) => {
+        Object.keys(this.overviewProduct).forEach(key => (this.overviewProduct[key] = ''))
         if (res.data.code === 200) {
           this.overviewProduct.totalLicenses = res.data.result.totalLicenses
           this.overviewProduct.availableLicenses = res.data.result.availableLicenses
@@ -94,7 +95,7 @@ export default {
           this.chartData.assignedLicensesYData = []
           this.chartData.activatedLicenseYData = []
           res.data.result.forEach((item) => {
-            this.chartData.date.push(item.date)
+            this.chartData.date.push(this.formatterDate(item.date))
             this.chartData.assignedLicensesYData.push(item.licences.assignedLicenses)
             this.chartData.activatedLicenseYData.push(item.licences.activatedLicense)
           })
@@ -120,6 +121,7 @@ export default {
         teamId: this.teamSelect,
         codeList: this.teamFilterProductSelect
       }).then((res) => {
+        Object.keys(this.teamMemberData).forEach(key => (this.teamMemberData[key] = ''))
         if (res.data.code === 200) {
           this.teamMemberData.teamMember = res.data.result.teamMember
           this.teamMemberData.assignedMember = res.data.result.assignedMember
@@ -238,7 +240,6 @@ export default {
       get('http://81.68.234.235:8032/pdf-tech/product/listWithAdmin').then((res) => {
         if (res.data.code === 200) {
           this.productList = res.data.result
-          console.log(this.productList)
         }
       })
     },
@@ -257,6 +258,12 @@ export default {
           })
         }
       })
+    },
+    // 日期自定格式
+    formatterDate (data) {
+      if (!data) return ''
+      const dateArr = data.split('-')
+      return dateArr[1] + '/' + dateArr[2]
     }
   }
 }

src/views/TeamManagement/ManageTeamOperate.vue

@@ -15,8 +15,7 @@ export default {
       },
       flag: '',
       adminOptions: [],
-      projectOptions: [],
-      dialogVisible: false
+      projectOptions: []
     }
   },
   computed: {
@@ -68,7 +67,6 @@ export default {
         if (this.flag === 'create') this.createTeam()
         if (this.flag === 'edit') this.editTeam()
       }
-      // this.dialogVisible = true
     },
     // 重置表单
     resetForm (formName) {
@@ -126,10 +124,12 @@ export default {
       get('http://81.68.234.235:8032/pdf-tech/vppRTeamMemberRole/pageForAdmin').then((res) => {
         if (res.data.code === 200) {
           res.data.result.list.forEach(item => {
-            this.adminOptions.push({
-                label: item.email,
-                value: item.id
-            })
+            if (item.memberRole !== '1') {
+              this.adminOptions.push({
+                  label: item.email,
+                  value: item.id
+              })
+            }
           })
         }
       })
@@ -175,9 +175,6 @@ export default {
           <el-select
             v-model="formData.teamAdminId"
             multiple
-            filterable
-            allow-create
-            default-first-option
             placeholder=""
             class="w-600px">
             <el-option
@@ -220,7 +217,7 @@ export default {
         </div> 
       </el-form>
     </div>
-    <el-dialog
+    <!-- <el-dialog
       title=""
       :visible.sync="dialogVisible"
       width="376px"
@@ -235,7 +232,7 @@ export default {
         <el-button @click="dialogVisible = false">Change Admin</el-button>
         <el-button type="primary" @click="dialogVisible = false">Invite</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>