Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

# Conflicts:
#	src/HDrpManagement/orderManage/details/tabs/productlist.vue

src/HDrpManagement/contractManage/components/addContract.vue

@@ -802,7 +802,7 @@ export default {
 
 
         } else {
-          if(this.$refs.member) this.$refs.member.listData()
+          if(this.$refs.member) this.$refs.member.listData(this.$refs.member.param.content.pageNumber = 1)
           if(this.$refs.project) {
             this.$refs.project.params.content.type = this.$route.query.type == '经销项目' ? '2' : '1'
             console.log(this.$refs.project.params.content.type,'项目类型');
@@ -1004,12 +1004,12 @@ export default {
         this.$refs.project.queryEnterpriseArchives()
         key ? this[key] = true : ''
       }else if(key === 'salesmanVisible'){
-        this.$refs.selectSalesman.listData()
+        this.$refs.selectSalesman.listData(this.$refs.member.param.content.pageNumber = 1)
         key ? this[key] = true : ''
       }else {
         key ? this[key] = true : ''
       }
-      this.$refs.member.listData()
+      this.$refs.member.listData(this.$refs.member.param.content.pageNumber = 1)
     },
     agentChange (data) {
       this.form.sys_enterpriseid = data[0].sys_enterpriseid
@@ -1118,13 +1118,13 @@ export default {
     tabClick(){
       console.log(this.activeName)
       if (this.activeName === '客户'){
-        this.agentListPrams.content.where.type = '7'
+        this.agentListPrams.content.where.type = '19'
         this.$refs.member.flag = true
-        this.$refs.member.listData()
+        this.$refs.member.listData(this.$refs.member.param.content.pageNumber = 1)
       }else {
-        this.agentListPrams.content.where.type = '16'
+        this.agentListPrams.content.where.type = '20'
         this.$refs.member.flag = true
-        this.$refs.member.listData()
+        this.$refs.member.listData(this.$refs.member.param.content.pageNumber = 1)
       }
     },
     /*获取付款条件*/

src/HDrpManagement/contractManage/components/editContract.vue

@@ -921,7 +921,6 @@ export default {
       })
     },
     showChange (key) {
-      console.log(key,"编辑")
       this.agentVisible = false
       this.salerVisible = false
       this.projectVisible = false
@@ -937,7 +936,7 @@ export default {
       }*/
       if (key === 'projectVisible'){
         if (this.form.sys_enterpriseid !== ''){
-          console.log("执行",key)
+
           this.$refs.project.params.content.sys_enterpriseid = this.form.sys_enterpriseid
           this.$refs.project.queryEnterpriseArchives()
           key ? this[key] = true : ''
@@ -959,12 +958,12 @@ export default {
         this.$refs.project.queryEnterpriseArchives()
         key ? this[key] = true : ''
       }else if(key === 'salesmanVisible'){
-        this.$refs.selectSalesman.listData()
+        this.$refs.selectSalesman.listData(this.$refs.member.param.content.pageNumber = 1)
         key ? this[key] = true : ''
       }else {
         key ? this[key] = true : ''
       }
-      this.$refs.member.listData()
+      this.$refs.member.listData(this.$refs.member.param.content.pageNumber = 1)
     },
     onCancel () {
       this.drawer = false
@@ -1070,15 +1069,14 @@ export default {
       this.form.enddate = time[1]
     },
     tabClick(){
-      console.log(this.activeName)
       if (this.activeName === '客户'){
-        this.agentListPrams.content.where.type = '7'
-
-        this.$refs.member.listData()
+        this.agentListPrams.content.where.type = '19'
+        this.$refs.member.flag = true
+        this.$refs.member.listData(this.$refs.member.param.content.pageNumber = 1)
       }else {
-        this.agentListPrams.content.where.type = '5'
-
-        this.$refs.member.listData()
+        this.agentListPrams.content.where.type = '20'
+        this.$refs.member.flag = true
+        this.$refs.member.listData(this.$refs.member.param.content.pageNumber = 1)
       }
     },
     /*获取付款条件*/

src/HDrpManagement/contractManage/components/selectAgent.vue

@@ -66,9 +66,9 @@ export default {
   },
   methods:{
     async listData () {
-      console.log(this.type,'typeValue')
+
      /* if(!this.type) this.param.content.where.type = ''*/
-      console.log(this.param,'param')
+
       if (!this.flag){
         this.param.content.where.type = this.type
       }
@@ -76,13 +76,13 @@ export default {
       this.param.content.where.typemx = this.typemx
 			this.param.content.where.condition = this.search
       this.param.content.where.sa_projectid = this.sa_projectid || ''
-      console.log(this.param)
+
       const res = await this.$api.requested(this.param)
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-      console.log(this.tableData);
-      
+
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -211,4 +211,4 @@ export default {
   background: #b5e4ff6e;
   cursor: pointer;
 }
-</style>
+</style>

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

@@ -506,7 +506,7 @@ export default {
       this.form.enterprisename = this.data.enterprisename
     },
     onSubmit(){
-      console.log(this.form,"添加联系人")
+
       this.form.sa_projectid = this.data.sa_projectid
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
@@ -600,12 +600,14 @@ 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)
+
       this.myContacts.listData = res.data
       this.myContacts.total = res.total
       this.myContacts.currentPage = res.pageNumber
     },
     /*选择我的联系人*/
     myContactSelect(val){
+
       this.form.enterprisename = ''
       this.form = Object.assign({},this.form,val)
       this.enterpriseContact.show = false