通讯录调整

src/HManagement/addressList/addressBook/index.vue

@@ -2,7 +2,7 @@
   <div>
     <normalBook
         ref="basicLayout"
-        tableName="phoneBoolTable"
+        tableName="phoneBookTable"
         idName="sys_phonebookid"
         :apiId="{query:20231220085804,del:''}"
         :autoQuery="false"
@@ -85,7 +85,7 @@
 </template>
 
 <script>
-import normalBook from "@/components/normal-basic-layout/normalBook";
+import normalBook from "@/components/normal-basic-layout-new/normalBook";
 import myGroup from '../mycontact/index';
 import addContact from '../mycontact/modules/addContact'
 export default {
@@ -166,10 +166,10 @@ export default {
   },
   methods:{
     async listData(id){
-      console.log(id,'tabname')
-      /*const res = await this.$api.requested(this.param)*/
       this.$refs.basicLayout.param.content.type = this.tabName
-      this.$refs.basicLayout.listData()
+      this.$nextTick(()=>{
+        this.$refs.basicLayout.listData()
+      })
     },
     /*任务页面跳转*/
     onGoto(row){
@@ -220,8 +220,6 @@ export default {
       this.$refs.basicLayout.listData()
     },
     clickGroup(val,type){
-      console.log(this.tabName,'tabName22222')
-      console.log(type,'1111')
       this.$refs.basicLayout.param.content.groupname = val.groupname
       this.$refs.basicLayout.param.content.sys_phonebookgroupid = val.sys_phonebookgroupid
       this.listData()
@@ -236,7 +234,6 @@ export default {
       arr = this.tagList.filter(item=>{
         return this.tags.includes(item.tag)
       })
-      console.log(arr,'arr11')
       arr.forEach(e=>{
         arr2 = arr2.concat(e.mutextag)
       })

src/components/normal-basic-layout-new/details/modules/task/addTask.vue

@@ -202,13 +202,16 @@ export default {
 	methods:{
     onShow(){
       console.log(this.typeTask,'typeTask')
+      console.log(this.ownertable,'ownertable任务')
       this.dialogTableVisible = true
       this.queryTeam()
       this.followParam.content.ownertable = this.ownertable
-      this.followParam.content.ownerid = this.$route.query.id
+      this.followParam.content.ownerid = this.ownerid
     },
     /*获取团队信息*/
     async queryTeam(){
+      this.params.content.ownertable = this.ownertable
+      this.params.content.ownerid = this.ownerid
       const res = await this.$api.requested(this.params)
       console.log(res,"团队信息")
       if (res.data.length !== 0){
@@ -326,7 +329,7 @@ export default {
       this.form.remarks = ''
     },
     follow(content,type,contacts){
-      if (this.typeTask === '我的客户' || this.typeTask === '项目商机' || this.typeTask === '公海客户'){
+      if (this.typeTask === '我的客户' || this.typeTask === '项目商机' || this.typeTask === '公海客户' || this.ownertable === 'sys_enterprise_contacts' || this.ownertable === 'sa_project_contacts'){
         if (contacts.length === 0){
           this.form.remarks = '跟进类型：'+type+'\n' + '跟进对象：'  + content
         }else {

src/components/normal-basic-layout-new/modules/table.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="bs-table" :style="{height:height?height:'calc(100vh - 330px)'}">
-    <el-table border stripe ref="tables" :row-class-name="tableClassName" :header-cell-style="{background:'#fafafafa',height:'40px','color':'#000000'}" highlight-current-row :data="data" size="mini" @row-click="rowClick" height="100%" style="width:100%;" @selection-change="handleSelectionChange" >
+    <el-table :data="data"  border stripe ref="tables" :row-class-name="tableClassName" :header-cell-style="{background:'#fafafafa',height:'40px','color':'#000000'}" highlight-current-row  size="mini" @row-click="rowClick" height="100%" style="width:100%;" @selection-change="handleSelectionChange" >
       <!-- <div slot="empty">
         <el-empty :image="require('../../../assets/empty.svg')" :image-size="250">
         </el-empty>
@@ -19,24 +19,6 @@
           <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
         </template>
       </el-table-column>
-      <!-- <el-table-column  v-for="(col) in layout" :key="col.tablecolid">
-        <template #header>
-
-          <el-input v-if="col.filter === 1" size="mini" v-model="col.value" @change="inputChange" @keyup.native.enter="headerSearch(col.columnname)" @clear="headerSearch(col.columnname)" clearable/>
-
-
-        <slot v-if="col.filter === 2" name="temp" :data="col.columnname"></slot>
-
-        </template>
-        <el-table-column :prop="col.columnname" :label="col.title" :width="col.width ? col.width : 0" :min-width="col.width === 0 ? 150 : col.width" :fixed="checkFixed(col.columnname)">
-          <template slot-scope="scope">
-            <slot v-if="col.columnname !== 'operation'" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
-            <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
-          </template>
-        </el-table-column>
-
-
-      </el-table-column> -->
     </el-table>
   </div>
 </template>
@@ -53,10 +35,10 @@ export default {
   props:['data','tableName','custom','layout','fixRightData','fixLeftData','height'],
   data () {
     return {
-      list:[],
+      listData:[],
       act_column:'',
       value:'',
-      show:false
+      show:false,
     }
   },
   computed:{
@@ -69,6 +51,10 @@ export default {
       this.$nextTick(() => {
         this.$refs.tables.doLayout()
       });
+    },
+    data(val){
+      console.log(val,'输出表格数据')
+      this.listData = val
     }
   },
   methods:{

src/components/normal-basic-layout-new/normalBook.vue

@@ -165,7 +165,9 @@ export default {
       this.searchValue?this.param.content.where.condition = this.searchValue:''
       this.param.id = this.apiId.query
       const res = await this.$api.requested(this.param)
+      console.log(res.data,'2222')
       this.list = res.data
+      console.log(this.list)
       this.total = res.total
       this.currentPage = res.pageNumber
       /* 请求的数据暴露出去 二次处理 */