jufubao-admin-library 1.1.198 → 1.1.200

package/library/pageComponents/modules/JfbRuleCreate.vue

@@ -348,6 +348,18 @@
             }else {
               this.is_has_formula = true;
             }
+            //类目
+            // if(this.channelActiveName === 'jufubao'){
+            //   console.log(options.category_ids,'options.category_ids')
+            //   if(options.category_ids.length){
+            //     options.category_ids.map(item =>{
+            //       if(item.profit_rate||item.profit_rate==0){
+            //         item.label = item.label+'（'+item.profit_rate/100+'%）'
+            //       }
+            //     })
+            //   }
+              
+            // }
             console.log(this.channelParams.scene,this.is_has_formula,'this.is_has_formula')
             formData = {...other, ...conditions, ...options, city_codes: conditions.city_codes, ...formulaData};
             console.log('conditions', formData)

package/library/pageComponents/modules/lib/JfbRuleCreate.js

@@ -1322,11 +1322,18 @@ export default {
     handleRemoteCategorySearch ({ node, resolve }) {
       let value = 0
       if (node.level !== 0) value = node.value
-      getOptions({ server: "product-partner", fn: "categories", path: "p4", params: { value } })
-        .then(res => {
-          resolve(res.data.list)
-        })
-        .catch((err) => { console.error(err) })
+      this.getChildrenAndProfitRate({
+        value,
+        agg_channel_code: this.channelActiveName
+      }).then(res => {
+        console.log(res,'res')
+        if(this.channelActiveName === 'jufubao') {
+          res.data.list.map(item=>{
+            item.profit_rate_string = '（'+item.profit_rate/100+'%）'
+          })
+        }
+        resolve(res.data.list)
+      }) .catch((err) => { console.error(err) })
     },
 
     /**

package/library/viewModules/viewStat/viewsStat/product/index.vue

@@ -104,6 +104,7 @@ import tableCategory from "./components/table-category.vue";
 import XdStatTableGroup from "@/components/XdStatTableGroup.vue"
 import checkPermission from "@/utils/permission";
 import Role from "@/constant/modules/supplierStat";
+import RoleProduct from "@/constant/modules/productStat";
 import selectDiscount from "./components/select-discount.vue";
 import { getOptions } from "@/utils/options";
 import statAllM from "./components/stat-all-m.vue"
@@ -123,6 +124,7 @@ export default {
   data() {
     return {
       Role,
+      RoleProduct,
       title: "",
       activeName: "supplier",
       siteList: [],
@@ -166,7 +168,7 @@ export default {
       return checkPermission([Role.productCategoryCycSales]);
     },
     isSelectProdDis(){
-      return checkPermission([Role.getSelectedProdDiscounts]);
+      return checkPermission([RoleProduct.getSelectedProdDiscounts]);
     },
     has_tab() {
       return checkPermission([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.198",
+  "version": "1.1.200",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {