jufubao-admin-library 1.1.220 → 1.1.222

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -76,8 +76,7 @@
                 type="primary" 
                 size="small" 
                 @click="handleAddSkuAdjust"
-                :disabled="skuAdjustList.length >= 10"
-              >新增规格调价（最多10个）</el-button>
+              >新增规格调价</el-button>
             </div>
             <el-table
               :data="skuAdjustList"
@@ -349,6 +348,7 @@ export default {
             this.adjustListValue.ratioValue = '';
             this.adjustListValue.moneyValue = '';
           }
+          this.adjustListValue.allow_below_cost = false;
           this.getAdjustForm(this.adjustListValue)
         }
       }
@@ -356,6 +356,7 @@ export default {
     'adjustListValue.vip_unit':{
       handler(n,o){
         if(n&&n!==o){
+          this.adjustListValue.vip_allow_below_cost = false;
           this.getAdjustForm(this.adjustListValue)
         }
       }
@@ -1162,6 +1163,17 @@ export default {
           ele: 'slot',
           slot:'showPrice'
         },
+        {
+          label: "是否低于成本:",
+          ele: "xd-radio",
+          valueKey: "allow_below_cost",
+          value: params.allow_below_cost ?? false,
+          list: [
+            { "label": "不允许低于成本", "value": false },
+            { "label": "允许低于成本", "value": true }
+          ],
+          inline: true
+        },
         this.isShowVipSet&&{
           label: 'PLUS售价调整',
           ele: 'title',
@@ -1319,6 +1331,17 @@ export default {
           ele: 'slot',
           slot:'showVipPrice'
         },
+        this.isShowVipSet && {
+          label: "是否低于成本:",
+          ele: "xd-radio",
+          valueKey: "vip_allow_below_cost",
+          value: params.vip_allow_below_cost ?? false,
+          list: [
+            { "label": "不允许低于成本", "value": false },
+            { "label": "允许低于成本", "value": true }
+          ],
+          inline: true
+        },
         this.sku_count>1&&{
           ele:'slot',
           slot:'sku_table'
@@ -1413,7 +1436,7 @@ export default {
       });
     },
     getAdjustParams () {
-      const { product_id, unit, base,decimal,rounding_method,ratioValue, moneyValue,vip_unit, vip_base,vip_decimal,vip_rounding_method,vipRatioValue, vipMoneyValue} = this.adjustListValue;
+      const { product_id, unit, base,decimal,rounding_method,ratioValue, moneyValue,vip_unit, vip_base,vip_decimal,vip_rounding_method,vipRatioValue, vipMoneyValue,allow_below_cost, vip_allow_below_cost} = this.adjustListValue;
       let value = 0;
       if(unit === 'ratio') value = Number(ratioValue);
       if(unit === 'money') value = Number(moneyValue);
@@ -1431,6 +1454,7 @@ export default {
           base: unit === 'fixed' ? 'jfb_price' : base,
           decimal: unit === 'fixed' ? 0 : decimal,
           rounding_method: unit === 'fixed' ? 'ceil' : rounding_method,
+          allow_below_cost: allow_below_cost ?? false,
         }
       };
 
@@ -1441,6 +1465,7 @@ export default {
           decimal: vip_unit === 'fixed' ? 0 : vip_decimal,
           rounding_method: vip_unit === 'fixed' ? 'ceil' : vip_rounding_method,
           value: this.$xdHelper.multiplyFloatNumber(Number(vip_value), 100),
+          allow_below_cost: vip_allow_below_cost ?? false,
         };
       }
       
@@ -1795,7 +1820,8 @@ export default {
           fn: 'selected-products-skus',
           path: 'p3',
           params:{
-            product_id:this.dialogRow.product_id
+            product_id: this.dialogRow.product_id,
+            status: 'Y'
           }
         })
         console.log(res,'aaaaaa')

package/package.json

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