前端代码合并提交

src/views/customer/customerComPanyDetail.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="企业名称" class="input-demo" v-model="companyNum"></el-input>
+              <el-input  placeholder="企业名称" class="input-demo" v-model="companyName"></el-input>
               <el-input  placeholder="经办人姓名" class="input-demo" v-model="operatorName"></el-input>
               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="addOperatorList = true">添加经办人</el-button>
@@ -275,9 +275,10 @@ export default{
               ]
 
             },
-      companyNum: ``,
+      companyName: ``,
       operatorName: ``,
       comPanyNumList: [],
+      customerCompanytable: [],
       hightt: `0px`,
       formOperatorList: {
         'custId': ``,
@@ -451,7 +452,7 @@ httpRequest(data) {
       const formData = new FormData()
       formData.append(`current`, this.current)
       formData.append(`size`, this.pagesize)
-      formData.append(`companyNum`, this.companyNum)
+      formData.append(`companyName`, this.companyName)
       formData.append(`operatorName`, this.operatorName)
       const response = await this.$http.post(`customerCompany/page`, formData)
       if (response.data.code == 0) {
@@ -551,7 +552,7 @@ httpRequest(data) {
     // 分页方法
     handleSizeChange(val) {
       this.pagesize = val
-      if (this.companyNum != `` || this.operatorName != ``) {
+      if (this.companyName != `` || this.operatorName != ``) {
         this.queryLook()
       } else {
         this.loadData()
@@ -559,7 +560,7 @@ httpRequest(data) {
     },
     handleCurrentChange(val) {
       this.current = val
-      if (this.companyNum != `` || this.operatorName != ``) {
+      if (this.companyName != `` || this.operatorName != ``) {
         this.queryLook()
       } else {
         this.loadData()