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

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -79,8 +79,9 @@ export default {
     return {
       param:{
         "id": 20221228101203,
-        "pageSize":9999,
         "content": {
+          "pageSize":20,
+          "pageNumber":1,
           "sa_invoicebillid":0,
           "where":{
               "condition":""

src/HDrpManagement/orderManage/modules/edit.vue

@@ -132,7 +132,7 @@
                     v-model="enterpriseParam.content.where.condition" 
                     placeholder="请输入搜索内容" 
                     style="width:150px"
-                    @keyup.enter.native="receiveAddress(enterpriseParam.content.pageNumber = 1)" @clear="receiveAddress(enterpriseParam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                    @keyup.enter.native="getEnterpriseList(enterpriseParam.content.pageNumber = 1)" @clear="getEnterpriseList(enterpriseParam.content.pageNumber = 1)" clearable></el-input>&nbsp;
                 </div>
                 <el-table
                   :data="enterpriseList"

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -132,7 +132,7 @@
                     v-model="enterpriseParam.content.where.condition" 
                     placeholder="请输入搜索内容" 
                     style="width:150px"
-                    @keyup.enter.native="receiveAddress(enterpriseParam.content.pageNumber = 1)" @clear="receiveAddress(enterpriseParam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                    @keyup.enter.native="getEnterpriseList(enterpriseParam.content.pageNumber = 1)" @clear="getEnterpriseList(enterpriseParam.content.pageNumber = 1)" clearable></el-input>&nbsp;
                 </div>
                 <el-table
                   :data="enterpriseList"

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -122,7 +122,7 @@
                     v-model="enterpriseParam.content.where.condition" 
                     placeholder="请输入搜索内容" 
                     style="width:150px"
-                    @keyup.enter.native="receiveAddress(enterpriseParam.content.pageNumber = 1)" @clear="receiveAddress(enterpriseParam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                    @keyup.enter.native="getEnterpriseList(enterpriseParam.content.pageNumber = 1)" @clear="getEnterpriseList(enterpriseParam.content.pageNumber = 1)" clearable></el-input>&nbsp;
                 </div>
                 <el-table
                   :data="enterpriseList"
@@ -133,6 +133,7 @@
                     label="企业名称"
                     width="150">
                   </el-table-column>
+                  
                   <el-table-column
                     label="地址"
                     width="360">