1

src/api/customer.ts

@@ -14,24 +14,24 @@ import Axios from './axios'
  * @property {string} password -用户密码
  */
 interface CutomerParams {
-  PageIndex: number,
-  PageSize: number,
-  pageCount: number,
-  CorpName: string, //企业名称
-  CustomerName: string, //备注名
-  WeChatName: string, //昵称
-  CustomerMobile: string, //手机号码
-  CreateSTime: string, //创建开始时间
-  CreateETime: string, //创建结束时间
-  FriendSTime: string, //好友开始时间
-  FriendETime: string, //好友结束时间
-  Q_NotFollowUpDay: number, //几天未跟进
-  Q_Friends: string, //好友关系 多选逗号分隔、
-  Q_AddWay: string, //获取来源 多选英文逗号分隔
-  EmpId: number, //员工id
-  CustomerType: number, //类型1微信用户 2企业微信用户
-  SelectList: Array<any>, //自定义查询
-  OrderBy: number, //排序
+  PageIndex: number
+  PageSize: number
+  pageCount: number
+  CorpName: string //企业名称
+  CustomerName: string //备注名
+  WeChatName: string //昵称
+  CustomerMobile: string //手机号码
+  CreateSTime: string //创建开始时间
+  CreateETime: string //创建结束时间
+  FriendSTime: string //好友开始时间
+  FriendETime: string //好友结束时间
+  Q_NotFollowUpDay: number //几天未跟进
+  Q_Friends: string //好友关系 多选逗号分隔、
+  Q_AddWay: string //获取来源 多选英文逗号分隔
+  EmpId: number //员工id
+  CustomerType: number //类型1微信用户 2企业微信用户
+  SelectList: Array<any> //自定义查询
+  OrderBy: number //排序
   AddCondition: number //查询条件
 }
 

src/components/common/visibleColumns.vue

@@ -31,11 +31,10 @@ export default {
     const myAllCol = computed(() => {
       return props.allCol
     })
+     
     const showCol = computed(() => {
-        console.log(props.modelValue)
       return props.modelValue
     })
-    
     const changeVisible = (e) => {
       if (e.visible) {
         showCol.value.push(e.value)
@@ -43,7 +42,6 @@ export default {
         showCol.value.splice(showCol.value.indexOf(e.value), 1)
       }
       context.emit('update:modelValue', showCol.value)
-      console.log(showCol.value)
     }
 
     return { myAllCol, scrollStyle, changeVisible }

src/pages/customerManage/customerSet/components/CustomerOperation.vue

@@ -18,7 +18,7 @@
             <q-btn color="primary" :disable="!PublicGetDeptState" unelevated label="修改" size="xs" class="q-ml-lg"
               @click="checkedPublicGetDept" />
           </div>
-          <div>
+          <div v-if="PublicGetDeptState">
             <div v-for="(item,index) in PublicGetDeptNameList" :key="index" class="dept-item">
               <div class="flex justify-center items-center">
                 <q-icon name="work" color="primary" v-if="item.Type==1" />
@@ -33,8 +33,7 @@
         <Abandon v-model:AabandonType="data.AbandonType" v-model:AbandonDept="data.AbandonDept"
           v-model:AbandonAudit="data.AbandonAudit" :AbandonReasonList="data.AbandonReasonList"
           v-model:AbandonReason="data.AbandonReason" v-model:AbandonSelectType="data.AbandonSelectType"
-          :AbandonEmpList="data.AbandonEmpList" :AbandonDeptList="data.AbandonDeptList"
-           />
+          :AbandonEmpList="data.AbandonEmpList" :AbandonDeptList="data.AbandonDeptList" />
       </div>
       <div v-if="curItem == 3" class="row">
         <div class="collaborator-title">申请成为协作人：</div>
@@ -226,7 +225,7 @@
           AbandonReasonList: [],
         },
         PublicGetDeptState: false, //以下部门允许领取公海客户
-        PublicGetDeptNameList:[],//允许领取公海客户列表
+        PublicGetDeptNameList: [], //允许领取公海客户列表
         showDptDialog: false,
         DptDataTreeDefault: [], //部门默认值
       })
@@ -245,7 +244,15 @@
           } else {
             data.PublicGetDeptState = true
           }
-          
+          const PublicGetDeptList = data.data.PublicGetDeptList.map(e => {
+            e.Type = 1
+            return e
+          })
+          const PublicGetEmpList = data.data.PublicGetEmpList.map(e => {
+            e.Type = 2
+            return e
+          })
+          data.PublicGetDeptNameList=[...PublicGetDeptList,...PublicGetEmpList]
         })
       }
       const getDptTree = () => {
@@ -270,8 +277,7 @@
       }
       //保存客户操作配置
       const setCustomerConfig = () => {
-        customerSetService.setCustomerConfig(data.data).then(res => {
-          console.log('set', res.data.Data)
+        customerSetService.setCustomerConfig(data.data).then(() => {
           message.successMsg('设置成功')
           getConfig()
         })
@@ -292,7 +298,7 @@
         const dept = JSON.parse(JSON.stringify(val))
         if (curItem.value === 1) {
           data.data.PublicGetDept = ids
-          data.data.PublicGetDeptList = dept
+          data.PublicGetDeptNameList = dept
         }
         if (curItem.value === 2) {
           data.data.AbandonDept = ids