jufubao-admin-library 1.1.156 → 1.1.158

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -40,18 +40,35 @@
             <el-button type="primary" size="small" @click="handleSetDesire">设置期望售价</el-button>
           </el-form-item>
         </template>
+        <template slot="vipDesire">
+          <el-form-item prop="vipDesire" label="">
+            <el-button type="primary" size="small" @click="handleSetVipDesire">设置期望售价</el-button>
+          </el-form-item>
+        </template>
         <template slot="showPrice">
           <div class="show-price">
             <div>调整后售价：</div>
             <div><el-input class="input50" type="number" v-model="showPrice" disabled></el-input></div>
           </div>
         </template>
+        <template slot="showVipPrice">
+          <div class="show-price">
+            <div>调整后售价：</div>
+            <div><el-input class="input50" type="number" v-model="showVipPrice" disabled></el-input></div>
+          </div>
+        </template>
         <template slot="showSelectPrice">
           <div class="show-price">
             <div>调整原始价格：</div>
             <div><el-input class="input50" type="number" v-model="showSelectPrice" disabled></el-input></div>
           </div>
         </template>
+        <template slot="showVipSelectPrice">
+          <div class="show-price">
+            <div>调整原始价格：</div>
+            <div><el-input class="input50" type="number" v-model="showVipSelectPrice" disabled></el-input></div>
+          </div>
+        </template>
       </xd-base-dynamic-field>
       <xd-dialog
         v-if="showDesire"
@@ -69,6 +86,22 @@
           </el-form>
         </div>
     </xd-dialog>
+    <xd-dialog
+      v-if="showVipDesire"
+      :show.sync="showVipDesire"
+      width="460px"
+      @onConfirm="handleVipDesire"
+      title='设置'
+    >
+      <div style="display: flex">
+        <el-form ref="desireForm" :model="desireVipForm" :rules="rules" label-width="80px">
+          <el-form-item prop="price" label="期望售价">
+            <el-input v-model="desireVipForm.price" placeholder="请输入期望售价"></el-input>
+            <span style="color:#999;font-size:12px;line-height:20px;display:block">将根据期望售价和选择的基准价格自动计算上调比除不尽时自动进位，故实际售价与期望值会略有偏差</span>
+          </el-form-item>
+        </el-form>
+      </div>
+    </xd-dialog>
     </xd-dialog>
     <xd-dialog
       v-if="showPublicSet"
@@ -124,6 +157,7 @@
 import XdDialog from "@/components/XdDialog"
 import { getOptions } from "@/utils/options"
 import XdBaseDynamicField from "@/components/XdBaseDynamicField"
+import checkPermission from "@/utils/permission"
 import { mapActions, mapState } from "vuex"
 export default {
   name: "JfbProductDialog",
@@ -132,10 +166,22 @@ export default {
     XdBaseDynamicField
   },
   watch: {
-    'adjustListValue.unit' (value) {
-      this.getAdjustForm(this.adjustListValue)
+    'adjustListValue.unit' : {
+      handler(n,o){
+        if(n&&n!==o){
+          this.getAdjustForm(this.adjustListValue)
+        }
+      }
+    },
+    'adjustListValue.vip_unit':{
+      handler(n,o){
+        if(n&&n!==o){
+          this.getAdjustForm(this.adjustListValue)
+        }
+      }
     },
   },
+ 
   data () {
     return {
       showCount: false,
@@ -178,6 +224,7 @@ export default {
       is_allow_public_product:true,
       cookieKey:'cookieKey',
       showDesire:false,
+      showVipDesire:false,
       desireForm:{
         price:''
       },
@@ -186,6 +233,14 @@ export default {
           { required: true, message: '请输入期望售价', trigger: 'change' }
         ],
       },
+      desireVipForm:{
+        price:''
+      },
+      vipRules: {
+        price: [
+          { required: true, message: '请输入期望售价', trigger: 'change' }
+        ],
+      },
       setRules:{
         public: [
           { required: true, message: '请选择是否公开', trigger: 'change' }
@@ -231,11 +286,51 @@ export default {
       let price = this.dialogRow['specs'][this.adjustListValue.base];
       return  handle(price,value, this.adjustListValue.unit === 'money');
     },
+    showVipPrice(){
+      const handle = (price, value, type)=>{
+        console.warn(`adjustList:{price:${price},value:${value},type:${type}`);
+        let toFixed = 0;
+        if(this.adjustListValue.vip_decimal > 0) toFixed = this.adjustListValue.vip_decimal;
+        let temp = 0;
+        if(type) {
+          value = this.$xdHelper.multiplyFloatNumber(value, 100);
+          temp = this.$xdHelper.addFloatNumber(value, price)
+        } else {
+          value = this.$xdHelper.addFloatNumber(this.$xdHelper.divisionFloatNumber(value, 100), 1);
+          temp = this.$xdHelper.multiplyFloatNumber(value, price)
+        }
+        let priceNew = this.$xdHelper.divisionFloatNumber(temp, 100);
+        return Math.ceil(priceNew * Math.pow(10, toFixed)) / Math.pow(10, toFixed)
+      };
+
+      if(!this.adjustListValue.vip_base
+        || !this.adjustListValue.vip_unit
+      ) return  '';
+      if(!this.dialogRow['specs'][this.adjustListValue.vip_base]) return '';
+      let value = null;
+      if(this.adjustListValue.vip_unit === 'money') {
+        if(this.adjustListValue.vipMoneyValue) value = Number(this.adjustListValue.vipMoneyValue);
+      }
+      if(this.adjustListValue.vip_unit === 'ratio') {
+        if(this.adjustListValue.vipRatioValue) value = Number(this.adjustListValue.vipRatioValue);
+      }
+      if(value === null) return '';
 
+      let price = this.dialogRow['specs'][this.adjustListValue.vip_base];
+      return  handle(price,value, this.adjustListValue.vip_unit === 'money');
+    },
     showSelectPrice(){
       if(!this.adjustListValue.base) return  '';
       let price = this.dialogRow['specs'][this.adjustListValue.base];
       return this.$xdHelper.divisionFloatNumber(price, 100)
+    },
+    showVipSelectPrice(){
+      if(!this.adjustListValue.vip_base) return  '';
+      let price = this.dialogRow['specs'][this.adjustListValue.vip_base];
+      return this.$xdHelper.divisionFloatNumber(price, 100)
+    },
+    isShowVipSet(){
+      return this.channelParams.group_key&&this.channelParams.group_key==='vip'
     }
   },
 
@@ -264,14 +359,28 @@ export default {
       let info = await this.getOnePriceInfo({ product_id });
       this.priceTypeList = info.data['price_options'];
       let params = info.data['formula']['price'];
+      let vip_params = null;
+      if(info.data['formula']['vip_price']){
+        vip_params = {
+          vip_base: info.data['formula']['vip_price']['base'],
+          vip_unit: info.data['formula']['vip_price']['unit'],
+          vip_decimal: info.data['formula']['vip_price']['decimal'],
+          vip_no_high_market_price: info.data['formula']['vip_price']['no_high_market_price'],
+          vip_value: info.data['formula']['vip_price']['value'],
+        }
+      }
       params = {
         ...params,
+        ...vip_params,
         product_id, product_name,
         modifyprice_method_name: info.data['modifyprice_method_name'],
       };
       //设置调价值
       if(params.unit === 'money') params['moneyValue'] = this.$xdHelper.divisionFloatNumber(params['value'], 100);
       else  params['ratioValue'] = this.$xdHelper.divisionFloatNumber(params['value'], 100);
+      //设置vip_plus调价值
+      if(params.vip_unit === 'money') params['vipMoneyValue'] = this.$xdHelper.divisionFloatNumber(params['vip_value'], 100);
+      else  params['vipRatioValue'] = this.$xdHelper.divisionFloatNumber(params['vip_value'], 100);
       this.getAdjustForm(params);
       this.adjustStatus = true;
       this.showAdjust = true;
@@ -392,6 +501,11 @@ export default {
           className: 'input90',
           disabled: true
         },
+        {
+          label: '售价调整',
+          ele: 'title',
+          size: 'small',
+        },
         {
           label: '基于:',
           ele: 'xd-select-list',
@@ -496,7 +610,117 @@ export default {
           ele: 'slot',
           slot:'showPrice'
         },
+        this.isShowVipSet&&{
+          label: 'PLUS售价调整',
+          ele: 'title',
+          size: 'small',
+        },
+        this.isShowVipSet&&{
+          label: 'PLUS售价基于:',
+          ele: 'xd-select-list',
+          valueKey: 'vip_base',
+          value: params['vip_base'],
+          placeholder: '请选择调价基准类型',
+          multiple: false,
+          list: this.priceTypeList,
+          disabled: this.priceTypeList.length === 1,
+          className: 'input70',
+          rules: [{
+            required: true,
+            message: '请选择调价基准类型',
+            trigger: 'change'
+          }],
+          notice: '<span style="color:#000; font-size: 14px;">调整</span><span style="color:#f00; font-size: 14px;">PLUS售价</span>',
+          inline: true
+        },
+        this.isShowVipSet&&{
+          keys: Date.now(),
+          label: "",
+          ele: 'slot',
+          slot:'showVipSelectPrice'
+        },
+        this.isShowVipSet&&{
+          label: "",
+          ele: "xd-radio",
+          valueKey: "vip_unit",
+          value: params['vip_unit'] || 'money',
+          list: [
+            { "label": "按金额", "value": "money" },
+            { "label": "按比例", "value": "ratio" },
+          ],
+        },
+        this.isShowVipSet&&params.vip_unit==='ratio'&& {
+          label: "",
+          ele: 'slot',
+          slot:'vipDesire'
+        },
+        this.isShowVipSet&&params.vip_unit==='ratio' && {
+          label: '上调/下调:',
+          ele: 'xd-input-unit',
+          valueKey: 'vipRatioValue',
+          keys: Date.now(),
+          value: params['vipRatioValue'],
+          className:'input50',
+          setting: {
+            unit: params['vip_unit'] === 'money' ? '元' : '%',
+            pos: 'append',
+            type: 'number'
+          },
+          placeholder:{
+            unitPlaceholder:params['unit'] === 'money' ? '请输入金额' : '请输入比例',
+          },
+          rules: [
+            { required: true, message: params['unit'] === 'money' ? '请输入金额' : '请输入比例', trigger: 'blur' },
+          ],
+          notice: '可设置正负值，负值时为下调',
+          inline: false
+        },
+        this.isShowVipSet&&params.vip_unit==='money' && {
+          label: '上调/下调:',
+          ele: 'xd-input-unit',
+          valueKey: 'vipMoneyValue',
+          keys: Date.now(),
+          value: params['vipMoneyValue'],
+          setting: {
+            unit: params['vip_unit'] === 'money' ? '元' : '%',
+            pos: 'append',
+            type: 'number'
+          },
+          placeholder:{
+            unitPlaceholder:params['vip_unit'] === 'money' ? '请输入金额' : '请输入比例',
+          },
+          rules: [
+            { required: true, message: params['vip_unit'] === 'money' ? '请输入金额' : '请输入比例', trigger: 'blur' },
+          ],
+          notice: '可设置正负值，负值时为下调',
+          inline: false
+        },
+        this.isShowVipSet&&{
+          label: '小数点保留位数:',
+          ele: 'xd-select-list',
+          valueKey: 'vip_decimal',
+          className:'input50',
+          value: params.vip_decimal || 2,
+          placeholder: '请选择小数点保留位数',
+          multiple: false,
+          list: [
+            { "label": "零位", "value": -1 },
+            { "label": "一位", "value": 1 },
+            { "label": "两位", "value": 2 },
+          ],
+          rules: [{
+            required: true,
+            message: '请选择小数点保留位数',
+            trigger: 'change'
+          }],
+        },
+        this.isShowVipSet&&{
+          label: "调整后售价",
+          ele: 'slot',
+          slot:'showVipPrice'
+        },
       ].filter(i => i)
+      this.adjustListKey = Date.now()
     },
     /**设置期望售价**/
     handleSetDesire(){
@@ -506,6 +730,14 @@ export default {
       }
       this.showDesire = true
     },
+    /**设置VIP_PLUS期望售价**/
+    handleSetVipDesire(){
+      if(!this.adjustListValue['vip_base']){
+        this.$message.error('请选择基于类型')
+        return
+      }
+      this.showVipDesire = true
+    },
     /**设置期望售价确定**/
     handleDesire(){
       this.$refs['desireForm'].validate((valid) => {
@@ -525,24 +757,65 @@ export default {
       });
       // this.desireForm.price:''
     },
-
+    /**设置PLUS期望售价确定**/
+    handleVipDesire(){
+      this.$refs['desireVipForm'].validate((valid) => {
+        if (valid) {
+          if(!this.adjustListValue.vip_base || !this.desireVipForm.price) return false;
+          let unit = 'vipMoneyValue';
+          if(this.adjustListValue['vip_unit'] === 'ratio') unit = 'vipRatioValue';
+          let price = this.dialogRow['specs'][this.adjustListValue['vip_base']];
+          let value = this.$xdHelper.divisionFloatNumber( this.$xdHelper.multiplyFloatNumber(this.desireVipForm.price, 100) - price, price);
+          this.adjustListValue[vip_unit] = this.$xdHelper.multiplyFloatNumber(value, 100).toFixed(2);
+          this.getAdjustForm(this.adjustListValue);
+          this.adjustListKey = Date.now()
+          this.showVipDesire = false
+        } else {
+          return false;
+        }
+      });
+      // this.desireForm.price:''
+    },
     getAdjustParams () {
-      const { product_id, unit, base,decimal,ratioValue, moneyValue} = this.adjustListValue;
+      const { product_id, unit, base,decimal,ratioValue, moneyValue,vip_unit, vip_base,vip_decimal,vipRatioValue, vipMoneyValue} = this.adjustListValue;
       let value = 0;
       if(unit === 'ratio') value = Number(ratioValue);
       if(unit === 'money') value = Number(moneyValue);
-      debugger
-      return {
-        product_id,
-        formula: {
-          sale_price: {
-            unit,
-            base,
-            value: this.$xdHelper.multiplyFloatNumber(Number(value), 100),
-            decimal
+      let vip_value = 0;
+      if(vip_unit === 'ratio') vip_value = Number(vipRatioValue);
+      if(vip_unit === 'money') vip_value = Number(vipMoneyValue);
+      if(this.isShowVipSet){
+        return {
+          product_id,
+          formula: {
+            sale_price: {
+              unit,
+              base,
+              value: this.$xdHelper.multiplyFloatNumber(Number(value), 100),
+              decimal
+            },
+            vip_price:{
+              unit:vip_unit,
+              base:vip_base,
+              value: this.$xdHelper.multiplyFloatNumber(Number(vip_value), 100),
+              decimal:vip_decimal
+            }
+          }
+        }
+      }else{
+        return {
+          product_id,
+          formula: {
+            sale_price: {
+              unit,
+              base,
+              value: this.$xdHelper.multiplyFloatNumber(Number(value), 100),
+              decimal
+            },
           }
         }
       }
+      
     },
 
     handleAdjustConfirm () {
@@ -705,7 +978,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .show-price {
   box-sizing: border-box;
   margin: 5px 0;

package/library/pageComponents/modules/JfbRuleCreate.vue

@@ -95,6 +95,7 @@
 <script>
 	import JfbRuleCreate from "./lib/JfbRuleCreate";
   import XdBaseDynamicField from "@/components/XdBaseDynamicField";
+  import checkPermission from "@/utils/permission"
   import {mapState} from 'vuex';
 
   export default {
@@ -232,6 +233,9 @@
           ...this.channelParams,
           agg_channel_code: this.channelActiveName
 				}
+      },
+      isShowVipSet(){
+        return this.channelParams.group_key&&this.channelParams.group_key==='vip'
       }
     },
 
@@ -311,6 +315,14 @@
               formulaData['sale_price_value'] = this.$xdHelper.divisionFloatNumber(formula.sale_price.value, 100);
               formulaData['decimal'] = formula.sale_price.decimal;
 						}
+            if(formula && formula.vip_price) {
+               // plus会员
+              formulaData['vip_price_base'] = formula.vip_price.base;
+              formulaData['vip_price_unit'] = formula.vip_price.unit;
+              formulaData['vip_price_no_high_market_price'] = formula.vip_price.no_high_market_price;
+              formulaData['vip_price_value'] = this.$xdHelper.divisionFloatNumber(formula.vip_price.value, 100);
+              formulaData['vip_price_decimal'] = formula.vip_price.decimal;
+            }
             // //按标签设置
             if (conditions.partner_product_tags !== undefined) {
               console.log('bbbbb')
@@ -368,6 +380,23 @@
               },
               sale_price_value: {
                 "enabled": true,
+              },
+              vip_price_base: {
+                "enabled": true,
+                "options": [
+                  {"label": "分销价", "value": 'dist_price'},
+                  {"label": "市场价", "value": 'market_price'},
+                ]
+              },
+              vip_price_unit: {
+                "enabled": true,
+                "options": [
+                  {"label": "按金额", "value": "money"},
+                  {"label": "按比例", "value": "ratio"},
+                ]
+              },
+              vip_price_value: {
+                "enabled": true,
               }
             }
           }