jufubao-admin-library 1.1.172 → 1.1.173

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -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,
@@ -487,7 +504,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,23 @@ 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.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 +537,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 +546,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 +565,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 +577,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 +595,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 +617,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 +626,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 +645,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 +657,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,15 +675,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" && {
+        //   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 名称
@@ -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/package.json

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