jufubao-admin-library 1.1.2 → 1.1.4

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -40,6 +40,18 @@
             <el-button type="primary" size="small" @click="handleSetDesire">设置期望售价</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="showSelectPrice">
+          <div class="show-price">
+            <div>调整原始价格：</div>
+            <div><el-input class="input50" type="number" v-model="showSelectPrice" disabled></el-input></div>
+          </div>
+        </template>
       </xd-base-dynamic-field>
       <xd-dialog
         v-if="showDesire"
@@ -52,7 +64,7 @@
           <el-form ref="desireForm" :model="desireForm" :rules="rules" label-width="80px">
             <el-form-item prop="price" label="期望售价">
               <el-input v-model="desireForm.price" placeholder="请输入期望售价"></el-input>
-              <span style="color:'#999';font-size:12px;line-height:20px;display:block">将根据期望售价和选择的基准价格自动计算上调比除不尽时自动进位，故实际售价与期望值会略有偏差</span>
+              <span style="color:#999;font-size:12px;line-height:20px;display:block">将根据期望售价和选择的基准价格自动计算上调比除不尽时自动进位，故实际售价与期望值会略有偏差</span>
             </el-form-item>
           </el-form>
         </div>
@@ -61,7 +73,7 @@
     <xd-dialog
       v-if="showPublicSet"
       :show.sync="showPublicSet"
-      title="商品配置" 
+      title="商品配置"
       width="460px"
       @onConfirm="handlePublicSet"
     >
@@ -77,7 +89,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item prop="partner_product_tags" label="商品标签">
-          <el-checkbox-group 
+          <el-checkbox-group
             v-model="setForm.partner_product_tags"
             >
             <el-checkbox v-for="(item,index) in tagData" :label="item.value" :key="index">{{item.label}}</el-checkbox>
@@ -122,7 +134,7 @@ export default {
   watch: {
     'adjustListValue.unit' (value) {
       this.getAdjustForm(this.adjustListValue)
-    }
+    },
   },
   data () {
     return {
@@ -186,29 +198,49 @@ export default {
   },
   computed: {
     ...mapState(['commonParams']),
-  },
-  watch:{
-    'adjustListValue.unit': {
-      handler (n, o) {
-        console.log(n, o, 'nnnn')
-        this.adjustListValue.after_price = ''
-        this.adjustListValue.value = ''
-        this.getAdjustForm(this.adjustListValue)
-      }
-    },
-    'adjustListValue.value':{
-      handler (n, o) {
-        console.log(n, o,this.dialogRow['specs'][this.adjustListValue['base']], 'nnnn')
-        if(this.adjustListValue.unit==='money'){
-          this.adjustListValue.after_price = this.$xdHelper.divisionFloatNumber(this.dialogRow['specs'][this.adjustListValue['base']], 100)+Number(n);
-          this.getAdjustForm(this.adjustListValue)
+    showPrice(){
+      const handle = (price, value, type)=>{
+        console.warn(`adjustList:{price:${price},value:${value},type:${type}`);
+        let toFixed = 0;
+        if(this.adjustListValue.decimal > 0) toFixed = this.adjustListValue.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)
         }
+        return  this.$xdHelper.divisionFloatNumber(temp, 100).toFixed(toFixed)
+      };
+
+      if(!this.adjustListValue.base
+        || !this.adjustListValue.unit
+      ) return  '';
+      if(!this.dialogRow['specs'][this.adjustListValue.base]) return '';
+      let value = null;
+      if(this.adjustListValue.unit === 'money') {
+        if(this.adjustListValue.moneyValue) value = Number(this.adjustListValue.moneyValue);
       }
+      if(this.adjustListValue.unit === 'ratio') {
+        if(this.adjustListValue.ratioValue) value = Number(this.adjustListValue.ratioValue);
+      }
+      if(value === null) return '';
+
+      let price = this.dialogRow['specs'][this.adjustListValue.base];
+      return  handle(price,value, this.adjustListValue.unit === 'money');
     },
+
+    showSelectPrice(){
+      if(!this.adjustListValue.base) return  '';
+      let price = this.dialogRow['specs'][this.adjustListValue.base];
+      return this.$xdHelper.divisionFloatNumber(price, 100)
+    }
   },
-  async created () {
 
-    console.log('created', this.dialogRow, this.dialogType)
+  async created () {
+    console.warn(`created.dialogRow:${JSON.stringify(this.dialogRow)}`)
+    console.warn(`created.dialogType:${this.dialogType}`);
     this.cookieKey = `${this.commonParams.xsiteid}.${this.commonParams.xnamespace}.${this.pagesType}.channel`
     //开启电子码查看
     if (this.dialogType === 'showCode') {
@@ -226,20 +258,20 @@ export default {
 
     //手动调整售价
     if (this.dialogType === 'showAdjust') {
-      let { id, product_id, product_name } = this.dialogRow
-      product_id = product_id || id
-      let info = await this.getOnePriceInfo({ product_id })
-      this.priceTypeList = info.data['price_options']
-      let params = info.data['formula']['price']
+      let { id, product_id, product_name } = this.dialogRow;
+      product_id = product_id || id;
+      let info = await this.getOnePriceInfo({ product_id });
+      this.priceTypeList = info.data['price_options'];
+      let params = info.data['formula']['price'];
       params = {
         ...params,
         product_id, product_name,
         modifyprice_method_name: info.data['modifyprice_method_name'],
         value: this.$xdHelper.divisionFloatNumber(params['value'], 100)
-      }
-      this.getAdjustForm(params)
-      this.adjustStatus = true
-      this.showAdjust = true
+      };
+      this.getAdjustForm(params);
+      this.adjustStatus = true;
+      this.showAdjust = true;
     }
     //是否公开配置
     if (this.dialogType === 'showSet') {
@@ -322,7 +354,12 @@ export default {
         })
     },
 
+
+
     //==调价==============================
+    getShowPrice(){
+
+    },
     getAdjustForm (params) {
       this.adjustListForm = [
         params['modifyprice_method_name'] && {
@@ -365,11 +402,17 @@ export default {
           rules: [{
             required: true,
             message: '请选择调价基准类型',
-            trigger: 'blur'
+            trigger: 'change'
           }],
           notice: '<span style="color:#000; font-size: 14px;">调整</span><span style="color:#f00; font-size: 14px;">售价</span>',
           inline: true
         },
+        {
+          keys: Date.now(),
+          label: "",
+          ele: 'slot',
+          slot:'showSelectPrice'
+        },
         {
           label: "",
           ele: "xd-radio",
@@ -380,16 +423,38 @@ export default {
             { "label": "按比例", "value": "ratio" },
           ],
         },
-        params.unit==='ratio'&&{
+        params.unit==='ratio'&& {
           label: "",
           ele: 'slot',
           slot:'desire'
         },
-        {
+        params.unit==='ratio' && {
           label: '上调/下调:',
           ele: 'xd-input-unit',
-          valueKey: 'value',
-          value: params['value'],
+          valueKey: 'ratioValue',
+          keys: Date.now(),
+          value: params['ratioValue'],
+          className:'input50',
+          setting: {
+            unit: params['unit'] === 'money' ? '元' : '%',
+            pos: 'append',
+            type: 'number'
+          },
+          placeholder:{
+            unitPlaceholder:params['unit'] === 'money' ? '请输入金额' : '请输入比例',
+          },
+          rules: [
+            { required: true, message: params['unit'] === 'money' ? '请输入金额' : '请输入比例', trigger: 'blur' },
+          ],
+          notice: '可设置正负值，负值时为下调',
+          inline: false
+        },
+        params.unit==='money' && {
+          label: '上调/下调:',
+          ele: 'xd-input-unit',
+          valueKey: 'moneyValue',
+          keys: Date.now(),
+          value: params['moneyValue'],
           setting: {
             unit: params['unit'] === 'money' ? '元' : '%',
             pos: 'append',
@@ -408,7 +473,7 @@ export default {
           label: '小数点保留位数:',
           ele: 'xd-select-list',
           valueKey: 'decimal',
-          className:'input60',
+          className:'input50',
           value: params.decimal || 2,
           placeholder: '请选择小数点保留位数',
           multiple: false,
@@ -420,20 +485,15 @@ export default {
           rules: [{
             required: true,
             message: '请选择小数点保留位数',
-            trigger: 'blur'
+            trigger: 'change'
           }],
         },
         {
-          label: '调整后售价:',
-          ele: 'el-input',
-          type: 'text',
-          valueKey: 'after_price',
-          value: params.after_price,
-          className: 'input90',
-          disabled: true
+          label: "调整后售价",
+          ele: 'slot',
+          slot:'showPrice'
         },
       ].filter(i => i)
-      this.adjustListKey = Date.now()
     },
     /**设置期望售价**/
     handleSetDesire(){
@@ -447,14 +507,16 @@ export default {
     handleDesire(){
       this.$refs['desireForm'].validate((valid) => {
         if (valid) {
-          let value =this.$xdHelper.divisionFloatNumber(this.$xdHelper.multiplyFloatNumber(this.desireForm.price, 100)-this.dialogRow['specs'][this.adjustListValue['base']], this.dialogRow['specs'][this.adjustListValue['base']]);
-          this.adjustListValue.value = this.$xdHelper.multiplyFloatNumber(value, 100).toFixed(2)
-          console.log(value,this.adjustListValue.value,'this.adjustListValue.value')
-          this.adjustListValue.after_price = this.desireForm.price
-          this.getAdjustForm(this.adjustListValue)
+          if(!this.adjustListValue.base || !this.desireForm.price) return false;
+          let unit = 'moneyValue';
+          if(this.adjustListValue['unit'] === 'ratio') unit = 'ratioValue';
+          let price = this.dialogRow['specs'][this.adjustListValue['base']];
+          let value = this.$xdHelper.divisionFloatNumber( this.$xdHelper.multiplyFloatNumber(this.desireForm.price, 100) - price, price);
+          this.adjustListValue[unit] = this.$xdHelper.multiplyFloatNumber(value, 100).toFixed(2);
+          this.getAdjustForm(this.adjustListValue);
+          this.adjustListKey = Date.now()
           this.showDesire = false
         } else {
-          console.log('error submit!!');
           return false;
         }
       });
@@ -462,7 +524,11 @@ export default {
     },
 
     getAdjustParams () {
-      const { product_id, unit, base, value,decimal } = this.adjustListValue
+      const { product_id, unit, base,decimal,ratioValue, moneyValue} = this.adjustListValue;
+      let value = 0;
+      if(unit === 'ratio') value = Number(ratioValue);
+      if(unit === 'money') value = Number(moneyValue);
+      debugger
       return {
         product_id,
         formula: {
@@ -637,4 +703,25 @@ export default {
 </script>
 
 <style scoped>
+.show-price {
+  box-sizing: border-box;
+  margin: 5px 0;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  height: 36px;
+  line-height: 36px;
+
+  & > div:first-child {
+    width: 130px;
+    flex-shrink: 0;
+    font-weight: 500;
+    color: #666;
+    text-align: right;
+  }
+
+  & > div:last-child {
+    flex: 1;
+  }
+}
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {
@@ -26,7 +26,7 @@
     "element-ui": "2.13.2",
     "gxd-file-preview": "1.2.1",
     "gxd-helper": "2.0.21",
-    "gxd-vue-library": "1.1.68",
+    "gxd-vue-library": "1.1.69",
     "js-base64": "^3.4.5",
     "js-cookie": "2.2.0",
     "md5": "^2.3.0",