jufubao-admin-library 1.1.172 → 1.1.174

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -130,7 +130,7 @@ export default {
       server: this.channelServer || 'supplier-partner',
       fn: 'supplier-channel',
       path: 'p1',
-      params: this.channelParams
+      params: {...this.channelParams,from:1}
     })
     let all = [];
     this.isMain = channelTabList.data.list.length > 0;
@@ -526,6 +526,22 @@ export default {
           multiple: true, //多选
           list:  setting.data?.delivery_methods?.options || [],
         },
+        this.$setting.system==='partner-mall'&&{
+          label: "是否展示:", //label
+          ele: "xd-select-list", //package 名称
+          valueKey: "show_status", //form[valueKey]
+          value: [], //v-model
+          placeholder: "请选择配送方式",
+          multiple: false, //多选
+          className:'input40',
+          list: [{
+            value:'Y',
+            label:'展示'
+          },{
+            value:'N',
+            label:'隐藏'
+          }],
+        },
         setting.data?.delivery_logistics_company?.enabled&&{
           label: "配送公司:", //label
           ele: "xd-select-list", //package 名称

package/library/pageComponents/modules/JfbRuleCreate.vue

@@ -208,7 +208,9 @@
             label:'23时',
             value:'23',
           },
-        ]
+        ],
+        is_has_formula:true,
+        adjust_price_type:'',
 			}
 		},
     computed: {
@@ -217,7 +219,11 @@
         return this.$route.params.id;
       },
       btnName(){
-        return this.select_policy_id ? '更新': '提交';
+        if(this.select_policy_id&&!this.isCopy){
+          return '更新'
+        }else{
+          return '提交'
+        }
 			},
 
 			isMovie(){
@@ -281,7 +287,7 @@
 
           //非电影初始化
           else{
-            let {conditions, options, agg_channel_code,formula, ...other} = res.data;
+            let {conditions, options, agg_channel_code,formula,is_has_formula, ...other} = res.data;
 
             //按价格设置
             if (conditions.price !== undefined) {
@@ -332,6 +338,17 @@
 
             //设置渠道选择值
             this.channelActiveName = agg_channel_code || this.channelTabList[0]['value'];
+            //调价方式
+            
+            if(this.channelParams.scene === 'select'){
+              this.is_has_formula = is_has_formula;
+              if(!is_has_formula){
+                this.adjust_price_type = 'old';
+              }
+            }else {
+              this.is_has_formula = true;
+            }
+            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)
 					}
@@ -362,7 +379,7 @@
 
         //设置公共参数
         let commonConfig = {sort: {"enabled": true}};
-        if(this.channelParams.scene === 'modifyprice') {
+        if(this.channelParams.scene === 'modifyprice'||this.channelParams.scene === 'select') {
           commonConfig = {...commonConfig, ...{
               sale_price_base: {
                 "enabled": true,
@@ -411,7 +428,9 @@
 						&& policySettingObj.data.formula.options
 						&& policySettingObj.data.formula.options.length > 0
 					) {
-            commonConfig['sale_price_base'] = policySettingObj.data.formula;
+            if(this.channelParams.scene === 'modifyprice'){
+              commonConfig['sale_price_base'] = policySettingObj.data.formula;
+            }
           }
 
           this.policySettingObj = Object.assign({},commonConfig,policySettingObj.data.conditions) ;
@@ -487,7 +506,7 @@
             let params = {
               item: postData,
             };
-            if (select_policy_id) {
+            if (select_policy_id&&!this.isCopy) {
               fn = 'updateRole';
               params[this.keyword.role] = select_policy_id
 						}

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

@@ -52,6 +52,12 @@ export default {
         }
       }
     },
+    'listValue.adjust_price_type' (n, o) {
+      if (n && n !== o) {
+        this.adjust_price_type = n
+        this.initForm(this.listValue)
+      }
+    },
   },
   data () {
     return {
@@ -498,12 +504,35 @@ export default {
           ],
           inline: false,
         },
-        this.checkConfig('sale_price_base') && {
+        !this.is_has_formula && {
+          label: '调价方式:',
+          ele: 'xd-radio',
+          valueKey: 'adjust_price_type',
+          value: params.adjust_price_type||'old',
+          list: [
+            { "label": "使用原有调价规则(可在调价-调价规则管理查看)", "value": 'old' },
+            { "label": "新建调价规则", "value": 'new' }
+          ],
+          inline: false,
+        },
+        this.channelParams.scene === "select" && this.checkConfig('delivery_logistics_company') && {
+          label: "配送公司:", //label
+          ele: "xd-select-list", //package 名称
+          valueKey: "delivery_logistics_company", //form[valueKey]
+          value: params.delivery_logistics_company || '', //v-model
+          placeholder: "请选择配送公司",
+          multiple: false, //多选
+          list: [{
+            value: 'jd',
+            label: '京东物流',
+          }],
+        },
+        this.checkConfig('sale_price_base')&&(this.is_has_formula||this.adjust_price_type==='new') && {
           label: '售价调整',
           ele: 'title',
           size: 'small',
         },
-        this.checkConfig('sale_price_base') && {
+        this.checkConfig('sale_price_base')&&(this.is_has_formula||this.adjust_price_type==='new') && {
           label: '基于:',
           ele: 'xd-select-list',
           valueKey: 'sale_price_base',
@@ -520,7 +549,7 @@ export default {
           notice: '<span style="color:#000; font-size: 14px;">调整</span><span style="color:#f00; font-size: 14px;">售价</span>',
           inline: true
         },
-        this.checkConfig('sale_price_unit') && {
+        this.checkConfig('sale_price_unit')&&(this.is_has_formula||this.adjust_price_type==='new') && {
           label: " ",
           ele: "xd-radio",
           valueKey: "sale_price_unit",
@@ -529,7 +558,7 @@ export default {
           disabled: this.getSalePriceUnitDisabled('sale_price_unit', false),
           rules: [{ required: true, message: '请选择', trigger: 'blur' }],
         },
-        this.checkConfig('sale_price_value') && {
+        this.checkConfig('sale_price_value')&&(this.is_has_formula||this.adjust_price_type==='new') && {
           label: '上调/下调',
           ele: 'xd-input-unit',
           valueKey: 'sale_price_value',
@@ -548,7 +577,7 @@ export default {
           notice: '可设置正负值，负值时为下调',
           inline: false
         },
-        this.channelParams.scene === "modifyprice" && {
+        (this.is_has_formula||this.adjust_price_type==='new')&&{
           label: '不高于市场价:',
           ele: 'xd-radio',
           valueKey: 'no_high_market_price',
@@ -560,7 +589,7 @@ export default {
           inline: false,
           notice: '若调价后大于市场价则使用市场价为售价'
         },
-        this.channelParams.scene === "modifyprice" && {
+        (this.is_has_formula||this.adjust_price_type==='new')&&{
           label: '小数点保留位数:',
           ele: 'xd-select-list',
           valueKey: 'decimal',
@@ -578,12 +607,12 @@ export default {
             trigger: 'blur'
           }],
         },
-        this.isShowVipSet && this.channelParams.scene === "modifyprice" &&{
+        this.isShowVipSet&&(this.is_has_formula||this.adjust_price_type==='new') &&{
           label: 'PLUS售价',
           ele: 'title',
           size: 'small',
         },
-        this.isShowVipSet && this.channelParams.scene === "modifyprice" &&{
+        this.isShowVipSet&&(this.is_has_formula||this.adjust_price_type==='new') &&{
           label: '基于:',
           ele: 'xd-select-list',
           valueKey: 'vip_price_base',
@@ -600,7 +629,7 @@ export default {
           notice: '<span style="color:#000; font-size: 14px;">调整</span><span style="color:#f00; font-size: 14px;">售价</span>',
           inline: true
         },
-        this.isShowVipSet && this.channelParams.scene === "modifyprice" &&{
+        this.isShowVipSet&&(this.is_has_formula||this.adjust_price_type==='new') &&{
           label: " ",
           ele: "xd-radio",
           valueKey: "vip_price_unit",
@@ -609,7 +638,7 @@ export default {
           disabled: this.getSalePriceUnitDisabled('vip_price_unit', false),
           rules: [{ required: true, message: '请选择', trigger: 'blur' }],
         },
-        this.isShowVipSet && this.channelParams.scene === "modifyprice" &&{
+        this.isShowVipSet&&(this.is_has_formula||this.adjust_price_type==='new') &&{
           label: '上调/下调',
           ele: 'xd-input-unit',
           valueKey: 'vip_price_value',
@@ -628,7 +657,7 @@ export default {
           notice: '可设置正负值，负值时为下调',
           inline: false
         },
-        this.isShowVipSet && this.channelParams.scene === "modifyprice" && {
+        this.isShowVipSet&&(this.is_has_formula||this.adjust_price_type==='new') &&{
           label: '不高于市场价:',
           ele: 'xd-radio',
           valueKey: 'vip_price_no_high_market_price',
@@ -640,7 +669,7 @@ export default {
           inline: false,
           notice: '若调价后大于市场价则使用市场价为售价'
         },
-        this.isShowVipSet && this.channelParams.scene === "modifyprice" && {
+        this.isShowVipSet&&(this.is_has_formula||this.adjust_price_type==='new') &&{
           label: '小数点保留位数:',
           ele: 'xd-select-list',
           valueKey: 'vip_price_decimal',
@@ -658,27 +687,15 @@ export default {
             trigger: 'blur'
           }],
         },
-        this.channelParams.scene === "select" && {
-          label: '关联调价规则:',
-          ele: 'xd-select-list',
-          valueKey: 'modifyprice_policy_id',
-          value: params.modifyprice_policy_id || '',
-          placeholder: '请选择关联调价规则',
-          multiple: false,
-          list: this.modifypriceList,
-        },
-        this.channelParams.scene === "select" && this.checkConfig('delivery_logistics_company') && {
-          label: "配送公司:", //label
-          ele: "xd-select-list", //package 名称
-          valueKey: "delivery_logistics_company", //form[valueKey]
-          value: params.delivery_logistics_company || '', //v-model
-          placeholder: "请选择配送公司",
-          multiple: false, //多选
-          list: [{
-            value: 'jd',
-            label: '京东物流',
-          }],
-        },
+        // this.channelParams.scene === "select" && {
+        //   label: '关联调价规则:',
+        //   ele: 'xd-select-list',
+        //   valueKey: 'modifyprice_policy_id',
+        //   value: params.modifyprice_policy_id || '',
+        //   placeholder: '请选择关联调价规则',
+        //   multiple: false,
+        //   list: this.modifypriceList,
+        // },
 
       ].filter(i => i)
     },
@@ -1448,7 +1465,9 @@ export default {
         if (!this.checkVarEmpty(discount_ratio.max)) postData.conditions.discount_ratio.max = this.$xdHelper.multiplyFloatNumber(discount_ratio.max, 100)
         if (!this.checkVarEmpty(discount_ratio.min)) postData.conditions.discount_ratio.min = this.$xdHelper.multiplyFloatNumber(discount_ratio.min, 100)
       }
-
+      if(postData.conditions.sale_num&&!postData.conditions.sale_num.start&&!postData.conditions.sale_num.end){
+        delete postData.conditions.sale_num
+      }
       postData['formula'] = { 
         sale_price: { unit: '', base: '', value: '', decimal: 0 },
         vip_price: { unit: '', base: '', value: '', decimal: 0 }

package/library/viewModules/viewStore/viewStore/market/list.vue

@@ -271,7 +271,8 @@ export default {
       path: "p3",
       params:{
         type:'market',
-        consume_mode:this.storeType
+        consume_mode:this.storeType,
+        from:1,
       }
     }).then((res) => {
       this.channelTabList = res.data.channel_data

package/library/viewModules/viewStore/viewStore/rule/create.vue

@@ -130,7 +130,8 @@ export default {
         fn: "select-shop-channel",
         path: "p3",
         params:{
-          type:'market'
+          type:'market',
+          from:1,
         }
       }).then((res) => {
         this.channelTabList = res.data.channel_data

package/library/viewModules/viewStore/viewStore/selected/list.vue

@@ -384,7 +384,8 @@ export default {
       fn: "select-shop-channel",
       path: "p3",
       params:{
-        type:'select'
+        type:'select',
+        from:1,
       }
     }).then((res) => {
       this.channelTabList = res.data.channel_data

package/library/viewModules/viewsFinance/viewsFinance/balance/components/listPartner.vue

@@ -149,6 +149,7 @@ export default {
             wallet_type: row.wallet_type,
             wallet_nnid: row.wallet_nnid,
             partner_name: row.partner_name,
+            is_from_home:'N'
           }
         })
       }

package/library/viewModules/viewsFinance/viewsFinance/balance/detail_partner.vue

@@ -422,6 +422,9 @@ export default {
     partner_name() {
       return this.$route.query.partner_name;
     },
+    is_from_home(){
+      return this.$route.query.is_from_home;
+    },
   },
   watch: {
     channel_code(val) {
@@ -563,6 +566,7 @@ export default {
       const other = this.getParams();
       let params = {
         ...other,
+        is_from_home:this.is_from_home,
         export: true,
         file_ext: "xlsx",
         file_name: this.exportName,
@@ -594,6 +598,7 @@ export default {
       const other = this.getParams();
       let params = {
         ...other,
+        is_from_home:this.is_from_home,
         page_token: this.page_token,
         page_size: this.page_size,
       };

package/library/viewModules/viewsFinance/viewsFinance/index.vue

@@ -267,7 +267,8 @@ export default {
           query: {
             wallet_type: row.wallet_type,
             wallet_nnid: row.wallet_nnid,
-            partner_name: row.partner_name
+            partner_name: row.partner_name,
+            is_from_home:'Y'
           }
         })
       }

package/library/viewModules/viewsFlashSale/schemas/product.js

@@ -59,5 +59,17 @@ module.exports = {
     disabled: true,
     role: '',
   },
+  {
+    mapFn: 'getPolicyListSetting',
+    isRule: false,
+    title: '超管获取规则配置表',
+    isPublic: true,
+    path: '/product-partner/v1/:xspace/agg-channel-filters',
+    params: {
+      agg_channel_code: ['聚合渠道', 'String', '必填'],
+      xspace: ['xspace', 'String', '必填']
+    },
+    disabled: true,
+  },
   ],
 }

package/library/viewModules/viewsFlashSale/viewsFlashSale/product.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-card class="app-container__list" style="margin-bottom: 20px;">
     <div class="main-tab">
       <el-tabs
         type="card"
@@ -36,6 +37,7 @@
         </template>
       </xd-search>
     </div>
+    </el-card>
     <el-card class="app-container__list">
       <div class="app-container__list-pagination">
         <div style="display: flex; justify-content: space-between; width: 100%">
@@ -370,16 +372,20 @@ export default {
         xnamespace: this.business_code,
         scene: "selected",
         type: "MALL",
+        from:1,
       },
     }).then((res) => {
       this.channelTabList = res.data.list;
       this.channelTabList.unshift({
         label: "全部",
-        value: "",
+        value: 'all'
       });
       this.channelActiveName = this.channelTabList[0].value;
-      this.initSearchForm();
     });
+    console.log(this.channelActiveName,'this.channelActiveName')
+    let setting = await this.getPolicyListSetting({agg_channel_code: this.channelActiveName,xspace: this.business_code});
+    console.log(setting,'ssss')
+    this.initSearchForm();
     await this.getList();
   },
 
@@ -389,6 +395,7 @@ export default {
       "sessionAddProduct",
       "batchSessionAddProduct",
       "getActivityCodeCount",
+      "getPolicyListSetting"
     ]),
 
     /**
@@ -590,8 +597,12 @@ export default {
       ].filter((i) => i);
       this.searchFormKey = Date.now();
     },
-    handleTabClick(value) {
+    async handleTabClick(value) {
       console.log(value, "apapaapp");
+      let setting = await this.getPolicyListSetting({agg_channel_code: this.channelActiveName,xspace: this.business_code});
+      console.log(setting,'ssss')
+      this.initSearchForm();
+      await this.getList();
     },
 
     /**
@@ -723,7 +734,7 @@ export default {
         ...params,
         site_id: this.site_id,
         business_code: this.business_code,
-        channel_code: this.channelActiveName != 0 ? this.channelActiveName : "",
+        channel_code: this.channelActiveName,
         session_id: this.session_id,
         activity_id: this.activity_id,
         page_token: this.currentPage,
@@ -828,5 +839,23 @@ export default {
     line-height: 40px;
   }
 }
+::v-deep {
+  .el-tabs--card > .el-tabs__header .el-tabs__item {
+    background: #f8f8f8;
+    border-bottom: 1px solid #dfe4ed !important;
+    &.is-top.is-active {
+      &:first-child {
+        border-radius: 2px 0 0 0;
+      }
+
+      &:last-child {
+        border-radius: 0 2px 0 0;
+      }
+      background: $blue;
+      border-bottom: 1px solid $blue !important;
+      color: #fff !important;
+    }
+  }
+}
 </style>
 

package/package.json

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