添加设置功能和发送名片

.env.testpeople

+NODE_ENV=production
 VUE_APP_ENV=people
\ No newline at end of file

.env.testpolice

+NODE_ENV=production
 VUE_APP_ENV=police
\ No newline at end of file

deploy.people.sh

+
+tar -czf oa.tar oa
+scp oa.tar root@xzd.me:/home/test-chat33pro/oa.tar
+rm -rf oa.tar
+ssh root@xzd.me 'cd /home/test-chat33pro && rm -rf oa && tar -xzf oa.tar && rm -rf oa.tar'
+echo '👉 http://121.40.18.70:8886/'
\ No newline at end of file

package.json

@@ -12,8 +12,10 @@
     "build:people": "vue-cli-service build --mode people",
     "build:orginone": "vue-cli-service build --mode orginone",
     "build:testorginone": "vue-cli-service build --mode testorginone",
+    "build:testpeople": "vue-cli-service build --mode testpeople",
     "deploy": "npm run build && bash deploy.sh",
-    "deploy:people": "vue-cli-service build --mode testpeople && bash deploy.sh",
+    "deploy:people": "vue-cli-service build --mode testpeople && bash deploy.people.sh",
+    "deploy:police": "vue-cli-service build --mode testpolice && bash deploy.sh",
     "lint": "vue-cli-service lint --fix"
   },
   "dependencies": {

src/Interface/index.ts

@@ -26,7 +26,9 @@ export interface Staff {
   "entName": string,
   "id": string,
   "workplace": string,
-  "isActivated": boolean
+  "isActivated": boolean,
+  cardViewable: number,
+  phoneViewable: number
 }
 
 // 通讯录

src/service/moudles/Staff.ts

 
 import BaseService from '../base'
-import { ChangeDepDTO, ChangeRoleDTO, GetRroupDTO, GetStaffInfoDTO, ResignDTO, UpdateStaffDTO, AddStaffDTO } from './service.dto'
+import { ChangeDepDTO, ChangeRoleDTO, GetRroupDTO, GetStaffInfoDTO, ResignDTO, UpdateStaffDTO, AddStaffDTO, SetCartViewableDTO, SetPhoneViewableDTO } from './service.dto'
 
 export default class Staff extends BaseService {
   static instance: Staff
@@ -19,7 +19,9 @@ export default class Staff extends BaseService {
     getInfo: { path: '/v1/staff/get-staff', crediential: true },
     resign: { path: '/v1/staff/resign', crediential: true },
     updateInfo: { path: '/v1/staff/update-staff-info', crediential: true },
-    addMember: { path: '/v1/staff/add-staff', crediential: true }
+    addMember: { path: '/v1/staff/add-staff', crediential: true },
+    setCardViewable: { path: '/v1/staff/set-card-viewable', crediential: true},
+    setPhoneViewable: { path: '/v1/staff/set-phone-viewable', crediential: true}
   }
   // constructor() {
   //   super()
@@ -93,5 +95,23 @@ export default class Staff extends BaseService {
   async addMember(data:AddStaffDTO) {
     return await this.useService(this.router.addMember, data)
   }
+
+  /**
+   * 设置团队名片可视范围
+   * @param {SetCartViewableDTO} data {SetCartViewableDTO}
+   * @returns
+   */
+  async setCardViewable(data:SetCartViewableDTO) {
+    return await this.useService(this.router.setCardViewable, data)
+  }
+
+  /**
+   * 设置团队手机号可视范围
+   * @param {SetPhoneViewableDTO} data {SetPhoneViewableDTO}
+   * @returns
+   */
+  async setPhoneViewable(data:SetPhoneViewableDTO) {
+    return await this.useService(this.router.setPhoneViewable, data)
+  }
 }
 

src/service/moudles/service.dto.ts

@@ -188,3 +188,19 @@ export interface SubmitQuitApplyDTO {
 // export interface GetBindDTO {
 
 // }
+
+export enum Viewable {
+  TEAMVISIABLE = 0,
+  NOTVISIABLE = 1,
+  ALLVISIABLE = 2
+}
+
+export interface SetCartViewableDTO {
+  cardViewable: Viewable,
+  entId: string
+}
+
+export interface SetPhoneViewableDTO {
+  phoneViewable: Viewable,
+  entId: string
+}
\ No newline at end of file

src/views/team/components/Setting/index.vue

@@ -3,12 +3,14 @@
   <van-popup
     v-model:show="show"
     position="right"
-    :style="{height: '100%', width: '100%'}">
+    :style="{height: '100%', width: '100%'}"
+    @open="open">
     <Options
       :show.sync="showOptions"
       :title="title"
       :info="info"
       :checked.sync="checked"
+      :type="type"
       @change="radioChange"
     ></Options>
     <div class="border bg-common-bg h-full flex flex-col">
@@ -27,7 +29,7 @@
       <div class="flex-1 overflow-y-scroll">
         <div class="p-3">
           <van-cell-group>
-            <van-cell size="large" :value="getShowVal(card)" @click="clickCell(CellClick.CARD)">
+            <van-cell size="large" :value="getShowVal(card)" @click="clickCell(ViewableType.CARD)">
               <div slot="title" class="">对外团队名片</div>
               <div slot="right-icon" class="flex items-center">
                 <AppIcon
@@ -38,7 +40,7 @@
                 ></AppIcon>
               </div>
             </van-cell>
-            <van-cell size="large" :value="getShowVal(phone)" @click="clickCell(CellClick.PHONE)">
+            <van-cell size="large" :value="getShowVal(phone)" @click="clickCell(ViewableType.PHONE)">
               <div slot="title" class="">对外团队手机号</div>
               <div slot="right-icon" class="flex items-center">
                 <AppIcon
@@ -62,7 +64,7 @@ import { Overlay, Cell, CellGroup, Popup } from 'vant'
 
 Vue.use(Overlay).use(Cell).use(CellGroup).use(Popup)
 
-export enum CellClick {
+export enum ViewableType {
   CARD = 'card',
   PHONE = 'phone'
 }
@@ -84,30 +86,32 @@ export default Vue.extend({
       checked: 1,
       phone: 1,
       card: 2,
-      type: CellClick.CARD,
-      CellClick
+      type: ViewableType.CARD,
+      ViewableType
     }
   },
   methods: {
-    clickCell(type: CellClick) {
-      if (type === CellClick.CARD) {
+    clickCell(type: ViewableType) {
+      if (type === ViewableType.CARD) {
         this.title = '对外团队名片'
         this.info = '谁可见我的团队名片'
-        this.type = CellClick.CARD
+        this.type = ViewableType.CARD
         this.checked = this.card
       } else {
         this.title = '对外团队手机号'
         this.info = '谁可见我的团队手机号'
-        this.type = CellClick.PHONE
+        this.type = ViewableType.PHONE
         this.checked = this.phone
       }
+      console.log('打开选项')
       this.showOptions = true
     },
     back() {
       this.$emit('update:show', false)
     },
     radioChange(val: number) {
-      if (this.type === CellClick.CARD) {
+      console.log(val, this.type, '设置成功了')
+      if (this.type === ViewableType.CARD) {
         this.card = val
       } else {
         this.phone = val
@@ -115,13 +119,19 @@ export default Vue.extend({
     },
     getShowVal(val: number) {
       switch(val) {
-        case 1:
+        case 0:
           return '仅同团队组织可见'
-        case 2:
+        case 1:
           return '所有人可见'
-        case 3:
+        case 2:
           return '所有人不可见'
       }
+    },
+    open() {
+      console.log('open setting')
+      const user = JSON.parse(localStorage.getItem('USR_INFO') as string)
+      this.phone = user.phoneViewable
+      this.card = user.cardViewable
     }
   }
 });

src/views/team/components/Setting/options.vue

@@ -20,13 +20,14 @@
       <div class="flex-1 overflow-y-scroll">
         <!-- <div class="px-3"> -->
           <div class="info px-3.5 py-3 text-text-secondary text-sm">{{ info }}</div>
-          <van-radio-group v-model="check" @change="radioChange">
+          <van-radio-group v-model="check">
             <van-cell-group inset>
               <van-cell
                 v-for="o in options"
                 size="large"
                 :title="o.title"
-                clickable>
+                clickable
+                @click="clickCell(o)">
                 <template #icon>
                   <van-radio :name="o.key">
                     <template #icon="props">
@@ -42,38 +43,6 @@
                   </van-radio>
                 </template>
               </van-cell>
-              <!-- <van-cell size="large" title="单选框 1" clickable @click="checked = '1'">
-                <template #icon>
-                  <van-radio name="1">
-                    <template #icon="props">
-                      <div class="mr-1.5">
-                        <AppIcon
-                          type="svg"
-                          :name="props.checked?'icon-radio-checked':'icon-radio'"
-                          :color="primaryInfo.color"
-                          size="20px"
-                        ></AppIcon>
-                      </div>
-                    </template>
-                  </van-radio>
-                </template>
-              </van-cell>
-              <van-cell size="large" title="单选框 2" clickable @click="checked = '2'">
-                <template #icon>
-                  <van-radio name="2">
-                    <template #icon="props">
-                      <div class="mr-1.5">
-                        <AppIcon
-                          type="svg"
-                          :name="props.checked?'icon-radio-checked':'icon-radio'"
-                          :color="primaryInfo.color"
-                          size="20px"
-                        ></AppIcon>
-                      </div>
-                    </template>
-                  </van-radio>
-                </template>
-              </van-cell> -->
             </van-cell-group>
           </van-radio-group>
         <!-- </div> -->
@@ -85,27 +54,30 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue'
 import { Overlay, Cell, CellGroup, Popup, Radio, RadioGroup} from 'vant'
+import { ViewableType } from './index.vue';
+import { SetCartViewableDTO, SetPhoneViewableDTO } from '@/service/moudles/service.dto';
 
 Vue.use(Overlay).use(Cell).use(CellGroup).use(Popup).use(Radio).use(RadioGroup)
 
 const options = [{
   title: '仅同团队组织可见',
-  key: 1
+  key: 0
 }, {
   title: '所有人可见',
-  key: 2
+  key: 1
 }, {
   title: '所有人不可见',
-  key: 3
+  key: 2
 }]
 
 export default Vue.extend({
-  name:'request',
+  name:'SettingOptions',
   props:{
     show: Boolean,
     title: String,
     info: String,
-    checked: Number
+    checked: Number,
+    type: String as unknown as PropType<ViewableType>
   },
   components: {
     AppIcon: () => import('@/components/common/Icon.vue'),
@@ -113,21 +85,74 @@ export default Vue.extend({
   data(){
     return{
       options,
-      check: 1
+      entId: ''
+    }
+  },
+  computed: {
+    check: {
+      get() {
+        return this.$props.checked
+      },
+      set(val) {
+        console.log('setting')
+        this.$emit('update:checked', val)
+      }
     }
   },
   methods: {
     back() {
       this.$emit('update:show', false)
     },
+    clickCell(o: any) {
+      console.log(o, this.check, 'oooo')
+      this.$emit('update:checked', o.key)
+      if (this.type === ViewableType.CARD) {
+        this.setCard()
+      } else {
+        this.setPhone()
+      }
+    },
     radioChange(val: number) {
       console.log(val, 'change')
       this.$emit('change', val)
-      this.$emit('update:checked', val)
-      this.$emit('update:show', false)
+      // this.$emit('update:show', false)
+      
+    },
+    setCard() {
+      const params: SetCartViewableDTO= {
+        cardViewable: this.check,
+        entId: this.entId
+      }
+      this.$service.staff.setCardViewable(params).then((res: any) => {
+        const {data} = res
+        if (data.code === this.$global.success) {
+          this.$toast('设置成功')
+          this.$emit('change', this.check)
+          this.$emit('update:show', false)
+        } else {
+          this.$toast(data.msg)
+        }
+      })
+    },
+    setPhone() {
+      const params: SetPhoneViewableDTO= {
+        phoneViewable: this.check,
+        entId: this.entId
+      }
+      this.$service.staff.setPhoneViewable(params).then((res: any) => {
+        const {data} = res
+        if (data.code === this.$global.success) {
+          this.$toast('设置成功')
+          this.$emit('change', this.check)
+          this.$emit('update:show', false)
+        } else {
+          this.$toast(data.msg)
+        }
+      })
     },
     open() {
-      this.check = this.$props.checked
+      console.log('open options')
+      this.entId = JSON.parse(localStorage.getItem('ENT_INFO') as string).id
     }
   }
 });

src/views/team/team-frame.vue

@@ -126,15 +126,15 @@ export default Vue.extend({
       isEdit: false,
       multiple: false,
       pageTitle: '组织架构',
-      showSetting: true
+      showSetting: false
     }
   },
   async created() {
     const userInfoDev = {
       depId: '168398222891421697',
       entId: '168398222891421696',
-      // id: '1K7cApKbEU9h5WySPVLNgdSd67i2XkSuoS',
-      id: '1Gwr2QzfHF3CYCYdPKJoEAxfCUimg1cPup',
+      id: '1K7cApKbEU9h5WySPVLNgdSd67i2XkSuoS',
+      // id: '1Gwr2QzfHF3CYCYdPKJoEAxfCUimg1cPup',
       joinTime: 1631090065,
       name: '徐丹',
       role: 3
@@ -185,7 +185,10 @@ export default Vue.extend({
           {name: '管理团队', action: 'manage'}
         ]
       }
-      return [{name: '退出团队', action: 'quit'}]
+      return [
+        {name: '设置', action: 'setting'},
+        {name: '退出团队', action: 'quit'}
+      ]
     },
     showHomeIcon(): boolean {
       return !this.isEdit
@@ -193,11 +196,9 @@ export default Vue.extend({
   },
   methods: {
     inviteMember() {
-      const entId = JSON.parse(localStorage.getItem('ENT_INFO') as string).id
-      this.$router.replace({
-        path: '/team/team-qrCode',
-        query: { entId }
-      })
+      const entInfo = JSON.parse(localStorage.getItem('ENT_INFO') as string)
+      const {id, oaServer, avatar, name} = entInfo
+      sendTeamCard({id, server: oaServer, avatar, name})
     },
     handleCancel() {
       this.isEdit = false

vue.config.js

@@ -43,7 +43,7 @@ module.exports = {
   },
   configureWebpack: {
     optimization: {
-      minimize: process.env.NODE_ENV === 'production',
+      minimize: true,
       minimizer: [
         new TerserPlugin({
           parallel: true,