Merge branch 'mergeBranch' into redUrgent

src/HDrpManagement/afterSalesmag/components/add.vue

@@ -15,7 +15,7 @@
             <el-col :span="24">
               <el-form-item label="订单号:" prop="sonum">
                 <selectOrder ref="order" @selectRow="orderChange">
-                    <el-input readonly :disabled="!form.sys_enterpriseid" type="text" slot="input" size="small" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.sonum"></el-input>
+                    <el-input readonly :disabled="!form.sys_enterpriseid" type="text" slot="input" size="small" @focus="$refs.order.listData($refs.order.param.content.pageNumber = 1),$refs.order.visible=true" v-model="form.sonum"></el-input>
                 </selectOrder>
               </el-form-item>
             </el-col>

src/HDrpManagement/afterSalesmag/components/selectOrder.vue

@@ -1,5 +1,5 @@
 <template>
-  <div> 
+  <div>
     <el-dialog :visible.sync="visible" append-to-body width="50%">
       <div class="flex-align-center flex-between mt-10">
         <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
@@ -27,7 +27,7 @@
             prop="rebate_userate"
             label="订单使用返利占比">
           </el-table-column>
-          
+
           <el-table-column
             label="操作"
             width="90">
@@ -63,7 +63,9 @@ export default {
         "id": 20230105110003,
         "version":1,
         "content": {
-            "sys_enterpriseid":'',
+          "sys_enterpriseid":'',
+          "pageSize":20,
+          "pageNumber":1,
           "where":{
               "condition":""
           }
@@ -81,7 +83,7 @@ export default {
       this.total = res.total
       this.currentPage = res.pageNumber
       console.log(this.tableData);
-      
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -103,4 +105,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/aftersalesBill/components/add.vue

@@ -15,7 +15,7 @@
             <el-col :span="24">
               <el-form-item label="订单号:" prop="sonum">
                 <selectOrder ref="order" @selectRow="orderChange">
-                    <el-input readonly type="text" slot="input" placeholder="请选择订单" size="small" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.sonum"></el-input>
+                    <el-input readonly type="text" slot="input" placeholder="请选择订单" size="small" @focus="$refs.order.listData($refs.order.param.content.pageNumber = 1),$refs.order.visible=true" v-model="form.sonum"></el-input>
                 </selectOrder>
               </el-form-item>
             </el-col>
@@ -99,7 +99,7 @@ export default {
     dialogFormVisible (val) {
       if (!val) {
         this.$refs['form'].resetFields()
-        
+
       }
     }
   },
@@ -147,4 +147,4 @@ export default {
 .el-input {
   width: 100% !important;
 }
-</style>
+</style>

src/HDrpManagement/aftersalesBill/components/selectOrder.vue

@@ -1,5 +1,5 @@
 <template>
-  <div> 
+  <div>
     <el-dialog :visible.sync="visible" append-to-body width="50%">
       <div class="flex-align-center flex-between mt-10">
         <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
@@ -27,7 +27,7 @@
             prop="rebate_userate"
             label="订单使用返利占比">
           </el-table-column>
-          
+
           <el-table-column
             label="操作"
             width="90">
@@ -61,8 +61,9 @@ export default {
       visible:false,
       param:{
         "id": 20230105110003,
-        "version":1,
         "content": {
+          "pageSize":20,
+          "pageNumber":1,
           "where":{
               "condition":""
           }
@@ -80,7 +81,7 @@ export default {
       this.total = res.total
       this.currentPage = res.pageNumber
       console.log(this.tableData);
-      
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -103,4 +104,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>