1

src/views/team/department-management.vue

@@ -38,7 +38,6 @@
         @click="selectLeader"
       />
       <c-cell
-        dot
         title="上级部门"
         :content="parentDepName"
       />

src/views/team/join-team/confirm-join.vue

@@ -112,8 +112,9 @@ export default Vue.extend({
   },
   created() {
     this.info = this.$route.query as unknown as AcceptJoinDTO
-    this.entName = JSON.parse(localStorage.getItem('ENT_INFO') as string).name
+    // this.entName = JSON.parse(localStorage.getItem('ENT_INFO') as string).name
     this.getDepInfo(this.info)
+    this.getEntInfo(this.info)
   },
   methods: {
     appNavBack,
@@ -148,6 +149,18 @@ export default Vue.extend({
           this.departName = data.data.name
         }
       })
+    },
+    getEntInfo(item:AcceptJoinDTO) {
+      this.loading = true
+      this.$service.enterprise.getEnterpriseInfo({
+        id: item.entId
+      }).then((res: any) => {
+        this.loading = false
+        const {data} = res
+        if (data.code === this.$global.success) {
+          this.entName = data.data.name
+        }
+      })
     }
   }
 })

src/views/team/team-frame.vue

@@ -41,10 +41,10 @@
         </div>
         <!-- 底部操作 -->
         <div class="py-2 px-4 bg-white w-screen fixed bottom-0 left-0 z-30">
-          <div class="grid grid-cols-3 gap-2.5">
+          <div class="grid gap-2.5" :class="currentDep.parentId !== '-1' ? 'grid-cols-3' : 'grid-cols-2'">
             <c-button round @click="addMember">添加成员</c-button>
             <c-button round @click="addDep">添加部门</c-button>
-            <c-button round @click="setDepartment">部门设置</c-button>
+            <c-button round @click="setDepartment" v-if="currentDep.parentId !== '-1'">部门设置</c-button>
           </div>
         </div>
       </div>

src/views/team/two-code.vue

@@ -8,8 +8,7 @@
     <div class="mx-4 pt-14">
       <div class="shadow-md rounded overflow-hidden" id="qrcode">
         <div class="bg-color-primary text-center h-24 pt-6">
-          <div class="text-white flex-initial">{{msg1}}</div>
-          <!-- <div class="text-gray-300 flex-initial">团队号：{{msg2}}</div>        -->
+          <div class="text-white flex-initial">{{entName}}</div>
         </div>
         <div class="bg-white">
           <div class="flex flex-row justify-around">
@@ -39,7 +38,7 @@
               <div>{{ formatDate(Number(joinInfo.joinTime)*1000, 'YYYY-MM-DD') || '2021-09-05' }}</div>
             </div>
           </div>
-          <div class=" text-center text-gray-400 pb-8 pt-4">扫描二维码加入我们{{entName}}的团队</div>
+          <div class=" text-center text-gray-400 pb-8 pt-4">扫描二维码加入{{entName}}</div>
         </div>
       </div>
       <div class="flex justify-center  pt-8 text-color-primary font-medium text-sm text-center px-7">
@@ -85,8 +84,6 @@ export default Vue.extend({
     data() {
     return {
       formatDate,
-      msg1:'团队名称',
-      msg2:'ABCDEF',
       entName:'',
       joinInfo: {} as JoinInfoType,
       qrCodeText:'',