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

# Conflicts:
#	src/HManagement/siteManage/securityConfig/modules/basicinfo.vue
#	src/HManagement/siteManage/securityConfig/modules/edit.vue

src/HDrpManagement/orderManage/modules/add.vue

@@ -7,6 +7,7 @@
         <el-dropdown-item command="特殊订单">特殊订单</el-dropdown-item>
         <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
         <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>
+        <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
     <el-drawer

src/HDrpManagement/rebatesettlement/index.vue

@@ -6,7 +6,7 @@
       :oldFormPath="{
         add:'HDrpManagement/rebatesettlement/modules'
       }"
-      tableName="rebatesettlementTable" 
+      tableName="rebatesettlement" 
       idName="sa_rebatesettlementid" 
       :apiId="{query:20230104194002,del:20230104193402}"
       :options="options"

src/HDrpManagement/rebatesettlement/modules/add.vue

@@ -1,5 +1,7 @@
 <template>
-  <div></div>
+  <div>
+    <el-button type="primary" size="small">新 建</el-button>
+  </div>
 </template>
 
 <script>

src/HManagement/siteManage/securityConfig/modules/basicinfo.vue

@@ -26,22 +26,8 @@
         </el-descriptions-item> -->
       </el-descriptions>
     </div>
-<!--    <edit v-if="tool.checkAuth($route.name,'update')" :basicInfo="siteinfo" v-on="$listeners"></edit>-->
     <el-button  :disabled="!tool.checkAuth($route.name,'update')" icon="el-icon-edit" size="small" type="primary" style="width:120px;height: 30px"
-                @click="$store.dispatch('changeDetailDrawer',true),$router.push({path:'/enterpriseDetail',query:{basicInfo:siteinfo}})" >编 辑</el-button>
-    <!--抽屉面板-->
-    <el-drawer
-        title="我是标题"
-        :visible.sync="drawer"
-        :with-header="false"
-        direction="rtl"
-        size="90%"
-        append-to-body
-        @close="closeDrawer">
-      <div class="detail__panel">
-        <router-view/>
-      </div>
-    </el-drawer>
+                @click="onShowDtail">编 辑</el-button>
   </div>
 </template>
 
@@ -59,10 +45,14 @@ export default {
   components:{edit},
   computed:{
     ...mapGetters({
-      siteinfo:'siteinfo'
+      siteinfo:'siteinfo',
+      closeDrawerTemp:'closeDrawerTemp',
     })
   },
   methods:{
+     onShowDtail () {
+      this.$store.dispatch('changeDetailDrawer',true),this.$router.push({path:'/enterpriseDetail',query:{basicInfo:this.siteinfo}})
+     },
     async enterpriseData(){
       const res = await this.$api.requested({
         "id": 20221022165203,
@@ -74,19 +64,16 @@ export default {
       this.enterprise = res.data
     },
     closeDrawer () {
-     /* this.$router.push('/security_config')
-      this.$store.dispatch('DrawerShowChange',false)*/
       this.drawer = false
-      console.log("企业信息输出")
-      this.enterpriseData()
     },
-    onSuccess(){
-      console.log("执行")
-      this.enterpriseData()
-    }
   },
   mounted () {
     this.enterpriseData()
+  },
+  watch:{
+    closeDrawerTemp (val) {
+      !val?this.enterpriseData():""
+    }
   }
 }
 

src/HManagement/siteManage/securityConfig/modules/edit.vue

@@ -124,9 +124,8 @@ export default {
           "content": this.form
         })
         this.tool.showMessage(res,()=>{
-          this.$emit('onSuccess')
           this.$store.dispatch('changeDetailDrawer',false)
-
+          this.$emit('onSuccess')
         })
       });
     },

src/SDrpManagement/ProductGroup/index.vue

@@ -17,7 +17,18 @@
       </div>
     </div>
     <el-empty description="暂无数据" v-else></el-empty>
-    
+     <div style="margin-top:16px;text-align:center">
+      <el-pagination
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="params.content.pageSize"
+        layout="total, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+  </div>
   </div>
 </template>
 
@@ -45,6 +56,7 @@ export default {
         }
       },
       total:0,
+      currentPage:0
     };
   },
   components:{selectClass},
@@ -82,7 +94,7 @@ export default {
       let res = await this.$api.requested(this.params)
       this.productGroup = res.data
       this.total = res.total
-      console.log(this.productGroup);
+      this.currentPage = res.pageNumber
     },
     itemClick(id) {
       this.$router.push({
@@ -118,7 +130,17 @@ export default {
     clickField (item) {
       this.params.content.tradefield = item.tradefield
       this.getProductGroup()
-    }
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
   },
 };
 </script>

src/SDrpManagement/agentOrder/modules/add.vue

@@ -6,6 +6,7 @@
         <el-dropdown-item command="标准订单">标准订单</el-dropdown-item>
         <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
         <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>
+        <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
     <el-drawer

src/SDrpManagement/salerOrder/modules/add.vue

@@ -6,6 +6,7 @@
         <el-dropdown-item command="标准订单">标准订单</el-dropdown-item>
         <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
         <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>
+        <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
     <el-drawer

src/template/orderCanUseProduct/index.vue

@@ -100,6 +100,9 @@ export default {
         case '促销订单':
           this.params.id = 20230107182302
           break;
+        case '工具订单':
+          this.params.id = 20221109153502
+          break;
         default:
           break;
       }