我的联系人翻页调整

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

src/HDrpManagement/projectChange/modules/modules/contacts/components/add.vue

@@ -19,11 +19,12 @@
                     width="900"
                     v-model="enterpriseContact.show"
                     trigger="click">
-                  <el-tabs type="border-card" @tab-click="changeTab">
-                    <el-tab-pane label="企业联系人">
+                  <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">
+                    <el-tab-pane label="企业联系人" name="first">
                       <el-table
                           border
                           :data="enterpriseContact.listData"
+                          height="500px"
                           @row-click="enterpriseContactSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
                           size="mini">
@@ -81,6 +82,7 @@
                               @current-change="handleCurrentChangeEnterprise"
                               :current-page="enterpriseContact.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="enterpriseContact.total">
                           </el-pagination>
@@ -88,11 +90,12 @@
                         <slot name="footerLeft"></slot>
                       </div>
                     </el-tab-pane>
-                    <el-tab-pane label="我的联系人" >
+                    <el-tab-pane label="我的联系人" name="second">
                       <el-table
                           border
                           :data="myContacts.listData"
                           @row-click="myContactSelect"
+                          height="500px"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
                           size="mini">
                         <el-table-column width="80" label="姓名">
@@ -146,6 +149,7 @@
                               @current-change="handleCurrentChangeMy"
                               :current-page="myContacts.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="myContacts.total">
                           </el-pagination>
@@ -221,6 +225,7 @@
                       <el-table
                           border
                           :data="associatedCustomers.listData"
+                          height="500px"
                           style="margin-top: 10px"
                           @row-click="associatedCustomersSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
@@ -249,6 +254,7 @@
                               @current-change="handleCurrentAssociatedCustomers"
                               :current-page="associatedCustomers.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="associatedCustomers.total">
                           </el-pagination>
@@ -355,6 +361,7 @@ export default {
     return {
       dialogFormVisible:false,
       visible:false,
+      activeName:'first',
       groupname:'项目联系人',
       tabList:[],
       tagList:[],
@@ -403,7 +410,7 @@ export default {
           "content": {
             "sa_projectid": '',
             "pageNumber": 1,
-            "pageSize": 10,
+            "pageSize": 20,
             "where": {
               "condition": ""
             }
@@ -486,6 +493,10 @@ export default {
   methods:{
     onshow(){
       this.dialogFormVisible = true
+      this.activeName = 'first'
+      this.enterpriseContact.param.content.pageNumber = 1
+      this.myContacts.param.content.pageNumber = 1
+      this.associatedCustomers.param.content.pageNumber = 1
       this.associatedCustomersList()
       this.myCustomersList()
       this.enterpriseContactList()
@@ -603,26 +614,24 @@ export default {
     },
     handleSizeChangeMy(val) {
       // console.log(`每页 ${val} 条`);
-      this.enterpriseContact.param.content.pageSize = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageSize = val
+      this.myContactList()
     },
     handleCurrentChangeMy(val) {
       // console.log(`当前页: ${val}`);
-      this.enterpriseContact.param.content.pageNumber = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageNumber = val
+      this.myContactList()
     },
     /*关联客户*/
     async associatedCustomersList(){
       // this.associatedCustomers.param.content.where.condition = this.form.enterprisename
       this.associatedCustomers.param.content.where.sa_projectid = this.data.sa_projectid
       const res = await this.$api.requested(this.associatedCustomers.param)
-      console.log(res,"关联客户")
       this.associatedCustomers.listData = res.data
       this.associatedCustomers.total = res.total
       this.associatedCustomers.currentPage = res.pageNumber
     },
     associatedCustomersSelect(val){
-      console.log(val,"选择关联客户")
       this.form.sys_enterpriseid = val.sys_enterpriseid
       this.form.enterprisename = val.enterprisename
       this.associatedCustomers.show = false
@@ -641,13 +650,12 @@ export default {
     async myCustomersList(){
       this.myCustomers.param.content.where.condition = this.form.enterprisename
       const res = await this.$api.requested(this.myCustomers.param)
-      console.log(res,"我的客户")
       this.myCustomers.listData = res.data
       this.myCustomers.total = res.total
       this.myCustomers.currentPage = res.pageNumber
     },
     myCustomersSelect(val){
-      console.log(val,"选择我的客户")
+
       this.form.sys_enterpriseid = val.sys_enterpriseid
       this.form.enterprisename = val.enterprisename
       this.associatedCustomers.show = false

src/HDrpManagement/projectChange/modules/modules/contacts/components/edit.vue

@@ -23,6 +23,7 @@
                     <el-tab-pane label="企业联系人">
                       <el-table
                           border
+                          height="500px"
                           :data="enterpriseContact.listData"
                           @row-click="enterpriseContactSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
@@ -81,6 +82,7 @@
                               @current-change="handleCurrentChangeEnterprise"
                               :current-page="enterpriseContact.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="enterpriseContact.total">
                           </el-pagination>
@@ -91,6 +93,7 @@
                     <el-tab-pane label="我的联系人" >
                       <el-table
                           border
+                          height="500px"
                           :data="myContacts.listData"
                           @row-click="myContactSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
@@ -146,6 +149,7 @@
                               @current-change="handleCurrentChangeMy"
                               :current-page="myContacts.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="myContacts.total">
                           </el-pagination>
@@ -222,6 +226,7 @@
                       </el-input>
                       <el-table
                           border
+                          height="500px"
                           :data="associatedCustomers.listData"
                           style="margin-top: 10px"
                           @row-click="associatedCustomersSelect"
@@ -251,6 +256,7 @@
                               @current-change="handleCurrentAssociatedCustomers"
                               :current-page="associatedCustomers.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="associatedCustomers.total">
                           </el-pagination>
@@ -261,6 +267,7 @@
                     <el-tab-pane label="我的客户" >
                       <el-table
                           border
+                          height="500px"
                           :data="myCustomers.listData"
                           @row-click="myCustomersSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
@@ -289,6 +296,7 @@
                               @current-change="handleCurrentMyCustomers"
                               :current-page="myCustomers.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="myCustomers.total">
                           </el-pagination>
@@ -443,7 +451,7 @@ export default {
           "content": {
             "sa_projectid": '',
             "pageNumber": 1,
-            "pageSize": 10,
+            "pageSize": 20,
             "where": {
               "condition": ""
             }
@@ -647,13 +655,13 @@ export default {
     },
     handleSizeChangeMy(val) {
       // console.log(`每页 ${val} 条`);
-      this.enterpriseContact.param.content.pageSize = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageSize = val
+      this.myContactList()
     },
     handleCurrentChangeMy(val) {
       // console.log(`当前页: ${val}`);
-      this.enterpriseContact.param.content.pageNumber = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageNumber = val
+      this.myContactList()
     },
     /*关联客户*/
     async associatedCustomersList(){

src/HDrpManagement/publicCustomer/modules/detail/contacts/modules/add.vue

@@ -19,10 +19,11 @@
                     width="900"
                     v-model="enterpriseContact.show"
                     trigger="click">
-                  <el-tabs type="border-card" @tab-click="changeTab">
-                    <el-tab-pane label="企业联系人">
+                  <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">
+                    <el-tab-pane label="企业联系人" name="first">
                       <el-table
                           border
+                          height="500px"
                           :data="enterpriseContact.listData"
                           @row-click="enterpriseContactSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
@@ -81,6 +82,7 @@
                               @current-change="handleCurrentChangeEnterprise"
                               :current-page="enterpriseContact.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="enterpriseContact.total">
                           </el-pagination>
@@ -88,10 +90,11 @@
                         <slot name="footerLeft"></slot>
                       </div>
                     </el-tab-pane>
-                    <el-tab-pane label="我的联系人" >
+                    <el-tab-pane label="我的联系人" name="second">
                       <el-table
                           border
                           :data="myContacts.listData"
+                          height="500px"
                           @row-click="myContactSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
                           size="mini">
@@ -146,6 +149,7 @@
                               @current-change="handleCurrentChangeMy"
                               :current-page="myContacts.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="myContacts.total">
                           </el-pagination>
@@ -313,6 +317,7 @@ export default {
       tagList:[],
       tags:[],
       groupname:'客户联系人',
+      activeName:'first',
       form:{
         contactsid: 0,
         sys_enterpriseid: "",
@@ -356,7 +361,7 @@ export default {
           "content": {
             "sys_enterpriseid": '',
             "pageNumber": 1,
-            "pageSize": 10,
+            "pageSize": 20,
             "where": {
               "condition": ""
             }
@@ -402,6 +407,9 @@ export default {
   methods:{
     onshow(){
       this.dialogFormVisible = true
+      this.activeName = 'first'
+      this.enterpriseContact.param.content.pageNumber = 1
+      this.myContacts.param.content.pageNumber = 1
       this.enterpriseContactList()
       this.myContactList()
       this.getTag()
@@ -530,13 +538,13 @@ export default {
     },
     handleSizeChangeMy(val) {
       // console.log(`每页 ${val} 条`);
-      this.enterpriseContact.param.content.pageSize = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageSize = val
+      this.myContactList()
     },
     handleCurrentChangeMy(val) {
       // console.log(`当前页: ${val}`);
-      this.enterpriseContact.param.content.pageNumber = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageNumber = val
+      this.myContactList()
     },
     onClose(){
       this.$refs['form'].resetFields()

src/HDrpManagement/publicCustomer/modules/detail/contacts/modules/edit.vue

@@ -19,11 +19,12 @@
                     width="900"
                     v-model="enterpriseContact.show"
                     trigger="click">
-                  <el-tabs type="border-card" @tab-click="changeTab">
-                    <el-tab-pane label="企业联系人">
+                  <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">
+                    <el-tab-pane label="企业联系人" name="first">
                       <el-table
                           border
                           :data="enterpriseContact.listData"
+                          height="500px"
                           @row-click="enterpriseContactSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
                           size="mini">
@@ -78,6 +79,7 @@
                               @current-change="handleCurrentChangeEnterprise"
                               :current-page="enterpriseContact.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="enterpriseContact.total">
                           </el-pagination>
@@ -85,11 +87,12 @@
                         <slot name="footerLeft"></slot>
                       </div>
                     </el-tab-pane>
-                    <el-tab-pane label="我的联系人" >
+                    <el-tab-pane label="我的联系人" name="second">
                       <el-table
                           border
                           :data="myContacts.listData"
                           @row-click="myContactSelect"
+                          height="500px"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
                           size="mini">
                         <el-table-column width="80" label="姓名">
@@ -143,6 +146,7 @@
                               @current-change="handleCurrentChangeMy"
                               :current-page="myContacts.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="myContacts.total">
                           </el-pagination>
@@ -307,6 +311,7 @@ export default {
     return {
       dialogFormVisible:false,
       visible:false,
+      activeName:'first',
       tagList:[],
       tags:[],
       groupname:'客户联系人',
@@ -353,7 +358,7 @@ export default {
           "content": {
             "sys_enterpriseid": '',
             "pageNumber": 1,
-            "pageSize": 10,
+            "pageSize": 20,
             "where": {
               "condition": ""
             }
@@ -399,6 +404,9 @@ export default {
   methods:{
     onshow(){
       this.dialogFormVisible = true
+      this.activeName = 'first'
+      this.enterpriseContact.param.content.pageNumber = 1
+      this.myContacts.param.content.pageNumber = 1
       this.enterpriseContactList()
       this.myContactList()
       this.getTag()
@@ -485,14 +493,12 @@ export default {
       this.myContacts.param.content.where.condition = this.form.name
       this.myContacts.param.content.sys_enterpriseid = this.data.sys_enterpriseid
       const res = await this.$api.requested(this.myContacts.param)
-      console.log(res,"我的联系人")
       this.myContacts.listData = res.data
       this.myContacts.total = res.total
       this.myContacts.currentPage = res.pageNumber
     },
     /*选择我的联系人*/
     myContactSelect(val){
-      console.log(val,"选择的联系人")
       this.form.name = val.name
       this.form.phonenumber = val.phonenumber
       this.form.email = val.email
@@ -507,13 +513,13 @@ export default {
     },
     handleSizeChangeMy(val) {
       // console.log(`每页 ${val} 条`);
-      this.enterpriseContact.param.content.pageSize = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageSize = val
+      this.myContactList()
     },
     handleCurrentChangeMy(val) {
       // console.log(`当前页: ${val}`);
-      this.enterpriseContact.param.content.pageNumber = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageNumber = val
+      this.myContactList()
     },
     async getTag(){
       this.paramTag.content.ownertable = 'plm_unit'

src/SDrpManagement/salerPrivatecustomer/detail/modules/contacts/modules/add.vue

@@ -19,10 +19,11 @@
                     width="900"
                     v-model="enterpriseContact.show"
                     trigger="click">
-                  <el-tabs type="border-card" @tab-click="changeTab">
-                    <el-tab-pane label="企业联系人">
+                  <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">
+                    <el-tab-pane label="企业联系人" name="first" >
                       <el-table
                           border
+                          height="500px"
                           :data="enterpriseContact.listData"
                           @row-click="enterpriseContactSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
@@ -81,6 +82,7 @@
                               @current-change="handleCurrentChangeEnterprise"
                               :current-page="enterpriseContact.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="enterpriseContact.total">
                           </el-pagination>
@@ -88,10 +90,11 @@
                         <slot name="footerLeft"></slot>
                       </div>
                     </el-tab-pane>
-                    <el-tab-pane label="我的联系人" >
+                    <el-tab-pane label="我的联系人" name="second">
                         <el-table
                             border
                             :data="myContacts.listData"
+                            height="500px"
                             @row-click="myContactSelect"
                             :header-cell-style="{background:'#EEEEEE',color:'#333'}"
                             size="mini">
@@ -146,6 +149,7 @@
                                 @current-change="handleCurrentChangeMy"
                                 :current-page="myContacts.currentPage"
                                 :page-sizes="[20, 50, 100, 200]"
+                                :page-size="20"
                                 layout="total,sizes, prev, pager, next, jumper"
                                 :total="myContacts.total">
                             </el-pagination>
@@ -309,6 +313,7 @@ export default {
     }
     return {
       dialogFormVisible:false,
+      activeName:'first',
       visible:false,
       tagList:[],
       tags:[],
@@ -356,7 +361,7 @@ export default {
           "content": {
             "sys_enterpriseid": '',
             "pageNumber": 1,
-            "pageSize": 10,
+            "pageSize": 20,
             "where": {
               "condition": ""
             }
@@ -402,6 +407,9 @@ export default {
   methods:{
     onshow(){
       this.dialogFormVisible = true
+      this.activeName = 'first'
+      this.enterpriseContact.param.content.pageNumber = 1
+      this.myContacts.param.content.pageNumber = 1
       this.enterpriseContactList()
       this.myContactList()
       this.getTag()
@@ -530,13 +538,13 @@ export default {
     },
     handleSizeChangeMy(val) {
       // console.log(`每页 ${val} 条`);
-      this.enterpriseContact.param.content.pageSize = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageSize = val
+      this.myContactList()
     },
     handleCurrentChangeMy(val) {
       // console.log(`当前页: ${val}`);
-      this.enterpriseContact.param.content.pageNumber = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageNumber = val
+      this.myContactList()
     },
     onClose(){
       this.$refs['form'].resetFields()

src/SDrpManagement/salerPrivatecustomer/detail/modules/contacts/modules/edit.vue

@@ -19,12 +19,13 @@
                     width="900"
                     v-model="enterpriseContact.show"
                     trigger="click">
-                  <el-tabs type="border-card" @tab-click="changeTab">
-                    <el-tab-pane label="企业联系人">
+                  <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">
+                    <el-tab-pane label="企业联系人" name="first">
                       <el-table
                           border
                           :data="enterpriseContact.listData"
                           @row-click="enterpriseContactSelect"
+                          height="500px"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
                           size="mini">
                         <el-table-column width="80" label="姓名">
@@ -78,6 +79,7 @@
                               @current-change="handleCurrentChangeEnterprise"
                               :current-page="enterpriseContact.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="enterpriseContact.total">
                           </el-pagination>
@@ -85,10 +87,11 @@
                         <slot name="footerLeft"></slot>
                       </div>
                     </el-tab-pane>
-                    <el-tab-pane label="我的联系人" >
+                    <el-tab-pane label="我的联系人" name="second">
                       <el-table
                           border
                           :data="myContacts.listData"
+                          height="500px"
                           @row-click="myContactSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
                           size="mini">
@@ -143,6 +146,7 @@
                               @current-change="handleCurrentChangeMy"
                               :current-page="myContacts.currentPage"
                               :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
                               layout="total,sizes, prev, pager, next, jumper"
                               :total="myContacts.total">
                           </el-pagination>
@@ -308,6 +312,7 @@ export default {
       dialogFormVisible:false,
       visible:false,
       tagList:[],
+      activeName:'first',
       tags:[],
       groupname:'客户联系人',
       form:{
@@ -353,7 +358,7 @@ export default {
           "content": {
             "sys_enterpriseid": '',
             "pageNumber": 1,
-            "pageSize": 10,
+            "pageSize": 20,
             "where": {
               "condition": ""
             }
@@ -399,6 +404,9 @@ export default {
   methods:{
     onshow(){
       this.dialogFormVisible = true
+      this.activeName = 'first'
+      this.enterpriseContact.param.content.pageNumber = 1
+      this.myContacts.param.content.pageNumber = 1
       this.enterpriseContactList()
       this.myContactList()
       this.getTag()
@@ -506,13 +514,13 @@ export default {
     },
     handleSizeChangeMy(val) {
       // console.log(`每页 ${val} 条`);
-      this.enterpriseContact.param.content.pageSize = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageSize = val
+      this.myContactList()
     },
     handleCurrentChangeMy(val) {
       // console.log(`当前页: ${val}`);
-      this.enterpriseContact.param.content.pageNumber = val
-      this.enterpriseContactList()
+      this.myContacts.param.content.pageNumber = val
+      this.myContactList()
     },
     async getTag(){
       this.paramTag.content.ownertable = 'plm_unit'