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

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -5,8 +5,7 @@
         <el-input size="small" style="width:200px;margin-right:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
         <slot name="addProduct"/>
         <addProductContract class="inline-16"  title="添 加" :tablecolsAdd="tablecolsAdd" :tradefield="data.tradefield" :data="data"
-                             @addSuccess="queryProuctAdds" ref="addProduct" @addProduct="queryProuctAdd" @uploadData="queryUploadData"
-                             @closeDrawer="listData();$emit('onSuccess')" v-if="tool.checkAuth($route.name,'productBillManage') && data.status === '新建' && isLeader"
+                             @addSuccess="queryProuctAdds" ref="addProduct" @addProduct="queryProuctAdd" @uploadData="queryUploadData" v-if="tool.checkAuth($route.name,'productBillManage') && data.status === '新建' && isLeader"
         >
         </addProductContract>
         <uploadAllData

src/HDrpManagement/orderManage/modules/edit.vue

@@ -154,7 +154,7 @@
                     label="操作"
                     width="120">
                     <template slot-scope="scope">
-                      <el-button class="inline-16" type="text" @click="(selectEnterpriseInfo = scope.row,receiveAddress(),visible4=false)" size="mini">选 择</el-button>
+                      <el-button class="inline-16" type="text" @click="(selectEnterpriseInfo = scope.row,receiveAddress(),defaultData.re_info={},visible4=false)" size="mini">选 择</el-button>
                       <!-- <delete-btn 
                         message="确定删除当前地址吗?"
                         nameId="20221009155903" 

src/HDrpManagement/unit/components/list.vue

@@ -58,6 +58,8 @@ export default {
         "version":1,
         "content": {
           "nocache":true,
+          "pageSize":999999999,
+          "pageNumber":1,
           "where":{
               "condition":""
           }
@@ -73,6 +75,8 @@ export default {
         "version":1,
         "content": {
           "nocache":true,
+          "pageSize":999999999,
+          "pageNumber":1,
           "where":{
               "condition":""
           }

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -154,7 +154,7 @@
                     label="操作"
                     width="120">
                     <template slot-scope="scope">
-                      <el-button class="inline-16" type="text" @click="(selectEnterpriseInfo = scope.row,receiveAddress(),visible4=false)" size="mini">选 择</el-button>
+                      <el-button class="inline-16" type="text" @click="(selectEnterpriseInfo = scope.row,receiveAddress(),defaultData.re_info={},visible4=false)" size="mini">选 择</el-button>
                       <!-- <delete-btn 
                         message="确定删除当前地址吗?"
                         nameId="20221009155903" 

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -145,7 +145,7 @@
                     label="操作"
                     width="120">
                     <template slot-scope="scope">
-                      <el-button class="inline-16" type="text" @click="(selectEnterpriseInfo = scope.row,receiveAddress(),visible4=false)" size="mini">选 择</el-button>
+                      <el-button class="inline-16" type="text" @click="(selectEnterpriseInfo = scope.row,defaultData.re_info={},receiveAddress(),visible4=false)" size="mini">选 择</el-button>
                       <!-- <delete-btn 
                         message="确定删除当前地址吗?"
                         nameId="20221009155903" 

src/SManagement/submitedit_details/components/SubmiteditAction.vue

@@ -109,7 +109,7 @@ export default {
             this.upload_panl = ''
             this.param.content.content = ''
             this.param = {
-              "classname": "saletool.submitedit.submitedit",
+              "id":20221102095102,
               "method": "insertorupdate",
               "content": {
                 "sat_submiteditmodelid": "",
@@ -152,9 +152,9 @@ export default {
           let res = await this.$api.requested(param2)
           if (res.code != 1) return console.log('错误');
           this.upload_panl.status = '发布'
-          this.upload_panl.attinfos = null
+          this.upload_panl.attinfos = []
           this.param = {
-            "classname": "saletool.submitedit.submitedit",
+            "id":20221102095102,
             "method": "insertorupdate",
             "content": {
               "sat_submiteditmodelid": "",

src/SManagement/submitedit_details/index.vue

@@ -27,7 +27,7 @@
                         :fileData="calcList(detailData.submitedit)"
                         @submitEdit="submitEdit"
                         v-if="tool.checkAuth($route.name,'read')">
-        <pagination v-if="detailData.submitedit && $route.query.type == 'more'" :total="detailData.submitedit.length"
+        <pagination  v-if="detailData.submitedit && $route.query.type == 'more'" :total="detailData.submitedit.length"
                     :pageSize="pageSize"
                     :currentPage="currentIndex"
                     @pageChange="pageChange"
@@ -182,5 +182,9 @@ export default {
     flex-wrap: wrap;
   }
 
-  
+  /deep/.el-pagination {
+    position: relative !important;
+    text-align: right;
+    margin-top: 20px;
+  }
 </style>