jufubao-admin-library 1.1.216 → 1.1.218

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -25,7 +25,6 @@
       :show.sync="showAdjust"
       title="手动调整售价"
       width="60%"
-      @onConfirm="handleAdjustConfirm"
     >
       <xd-base-dynamic-field
         ref="adjust"
@@ -92,39 +91,56 @@
                 label="规格"
                 min-width="120"
               />
+              <el-table-column
+                prop="unit_label"
+                label="调价方式"
+                min-width="80"
+              />
               <el-table-column
                 prop="base_label"
                 label="基于价格"
                 min-width="100"
-              />
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.unit === 'fixed' ? '-' : scope.row.base_label }}
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="original_price"
                 label="调整原始价格"
                 min-width="120"
               >
                 <template slot-scope="scope">
-                  {{ scope.row.original_price }}元
+                  {{ scope.row.unit === 'fixed' ? '-' : scope.row.original_price + '元' }}
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="unit_label"
-                label="调价方式"
-                min-width="80"
-              />
               <el-table-column
                 prop="adjust_value"
                 label="上调/下调"
                 min-width="100"
               >
                 <template slot-scope="scope">
-                  {{ scope.row.adjust_value }}{{ scope.row.unit === 'ratio' ? '%' : '元' }}
+                  {{ scope.row.unit === 'fixed' ? '-' : (scope.row.adjust_value + (scope.row.unit === 'ratio' ? '%' : '元')) }}
                 </template>
               </el-table-column>
               <el-table-column
                 prop="decimal_label"
                 label="小数点保留"
                 min-width="100"
-              />
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.unit === 'fixed' ? '-' : scope.row.decimal_label }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="rounding_method_label"
+                label="取数方式"
+                min-width="100"
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.unit === 'fixed' ? '-' : scope.row.rounding_method_label }}
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="adjusted_price"
                 label="调整后售价"
@@ -224,6 +240,11 @@
         </template>
       </xd-base-dynamic-field>
     </xd-dialog>
+      <div slot="btn">
+        <el-button  @click="adjustStatus = false;showAdjust = false">关闭</el-button>
+        <el-button v-if="dialogRow&&dialogRow.can_cancel_modifyprice===true"  @click="handleCancelAdjust">取消调价</el-button>
+        <el-button type="primary" @click="handleAdjustConfirm">确定修改售价</el-button>
+      </div>
     </xd-dialog>
     <xd-dialog
       v-if="showPublicSet"
@@ -316,7 +337,18 @@ export default {
   watch: {
     'adjustListValue.unit' : {
       handler(n,o){
-        if(n&&n!==o){
+        if(n && n !== o && o !== undefined){
+          if(n === 'fixed') {
+            this.adjustListValue.moneyValue = '';
+            this.adjustListValue.ratioValue = '';
+            this.adjustListValue.base = '';
+            this.adjustListValue.decimal = 2;
+          } else if(n === 'ratio') {
+            this.adjustListValue.moneyValue = '';
+          } else if(n === 'money') {
+            this.adjustListValue.ratioValue = '';
+            this.adjustListValue.moneyValue = '';
+          }
           this.getAdjustForm(this.adjustListValue)
         }
       }
@@ -330,12 +362,17 @@ export default {
     },
     'skuAdjustValue.unit': {
       handler(n,o){
-        if(n&&n!==o){
-          // 切换单位时清空另一个单位的值
+        if(n && o !== undefined && o !== n){
           if(n === 'ratio') {
             this.skuAdjustValue.moneyValue = '';
-          } else {
+          } else if(n === 'money') {
+            this.skuAdjustValue.ratioValue = '';
+            this.skuAdjustValue.moneyValue = '';
+          } else if(n === 'fixed') {
+            this.skuAdjustValue.moneyValue = '';
             this.skuAdjustValue.ratioValue = '';
+            this.skuAdjustValue.base = '';
+            this.skuAdjustValue.decimal = 2;
           }
           this.getSkuAdjustForm(this.skuAdjustValue);
         }
@@ -394,22 +431,25 @@ export default {
         }
       }
     },
-    // 规格调价 - 切换商品规格时重新计算
+    // 规格调价 - 切换商品规格时重置数据
     'skuAdjustValue.product_sku': {
       handler(n,o){
-        if(n && n !== o && this.skuDesireForm.price && this.skuAdjustValue.base){
-          // 重新计算上调/下调值
-          let unit = 'moneyValue';
-          if(this.skuAdjustValue['unit'] === 'ratio') unit = 'ratioValue';
-          
-          const skuData = this.skuList.find(sku => sku.value === n);
-          if (skuData && skuData.prices[this.skuAdjustValue.base]) {
-            let price = skuData.prices[this.skuAdjustValue.base];
-            let value = this.$xdHelper.divisionFloatNumber(this.$xdHelper.multiplyFloatNumber(this.skuDesireForm.price, 100) - price, price);
-            this.skuAdjustValue[unit] = this.$xdHelper.multiplyFloatNumber(value, 100).toFixed(2);
-            this.getSkuAdjustForm(this.skuAdjustValue);
-            this.skuAdjustKey = Date.now();
+        if(n && n !== o && o !== undefined){
+          this.skuAdjustValue.base = '';
+          this.skuAdjustValue.moneyValue = '';
+          this.skuAdjustValue.ratioValue = '';
+          if(this.skuDesireForm.price && this.skuAdjustValue.base){
+            const skuData = this.skuList.find(sku => sku.value === n);
+            if (skuData && skuData.prices[this.skuAdjustValue.base]) {
+              let unit = 'moneyValue';
+              if(this.skuAdjustValue['unit'] === 'ratio') unit = 'ratioValue';
+              let price = skuData.prices[this.skuAdjustValue.base];
+              let value = this.$xdHelper.divisionFloatNumber(this.$xdHelper.multiplyFloatNumber(this.skuDesireForm.price, 100) - price, price);
+              this.skuAdjustValue[unit] = this.$xdHelper.multiplyFloatNumber(value, 100).toFixed(2);
+            }
           }
+          this.getSkuAdjustForm(this.skuAdjustValue);
+          this.skuAdjustKey = Date.now();
         }
       }
     },
@@ -498,6 +538,7 @@ export default {
       skuList: [],
       currentEditSku: null,
       sku_count: 0,
+      adjust_product_id:'',
     }
   },
   computed: {
@@ -516,12 +557,45 @@ export default {
           temp = this.$xdHelper.multiplyFloatNumber(value, price)
         }
         let priceNew = this.$xdHelper.divisionFloatNumber(temp, 100);
-        return this.$xdHelper.divisionFloatNumber(priceNew * Math.pow(10, toFixed), Math.pow(10, toFixed)).toFixed(this.adjustListValue.decimal)
+        let roundingMethod = this.adjustListValue.rounding_method || 'ceil';
+        if(this.adjustListValue.decimal === -1) {
+          if(roundingMethod === 'ceil') {
+            return Math.ceil(priceNew);
+          } else if(roundingMethod === 'floor') {
+            return Math.floor(priceNew);
+          } else {
+            return Math.round(priceNew);
+          }
+        }
+        let pow = Math.pow(10, toFixed);
+        let roundedPrice = 0;
+        if(roundingMethod === 'ceil') {
+          roundedPrice = Math.ceil(priceNew * pow) / pow;
+        } else if(roundingMethod === 'floor') {
+          roundedPrice = Math.floor(priceNew * pow) / pow;
+        } else {
+          roundedPrice = Math.round(priceNew * pow) / pow;
+        }
+        return roundedPrice.toFixed(this.adjustListValue.decimal)
       };
 
       if(!this.adjustListValue.base
         || !this.adjustListValue.unit
       ) return  '';
+      if(this.adjustListValue.unit === 'fixed') {
+        let roundingMethod = this.adjustListValue.rounding_method || 'ceil';
+        let value = Number(this.adjustListValue.moneyValue);
+        if(this.adjustListValue.decimal === -1) {
+          if(roundingMethod === 'ceil') {
+            return Math.ceil(value);
+          } else if(roundingMethod === 'floor') {
+            return Math.floor(value);
+          } else {
+            return Math.round(value);
+          }
+        }
+        return value.toFixed(this.adjustListValue.decimal);
+      }
       if(!this.dialogRow['specs'][this.adjustListValue.base]) return '';
       let value = null;
       if(this.adjustListValue.unit === 'money') {
@@ -549,12 +623,45 @@ export default {
           temp = this.$xdHelper.multiplyFloatNumber(value, price)
         }
         let priceNew = this.$xdHelper.divisionFloatNumber(temp, 100);
-        return this.$xdHelper.divisionFloatNumber(priceNew * Math.pow(10, toFixed), Math.pow(10, toFixed)).toFixed(this.adjustListValue.vip_decimal)
+        let roundingMethod = this.adjustListValue.vip_rounding_method || 'ceil';
+        if(this.adjustListValue.vip_decimal === -1) {
+          if(roundingMethod === 'ceil') {
+            return Math.ceil(priceNew);
+          } else if(roundingMethod === 'floor') {
+            return Math.floor(priceNew);
+          } else {
+            return Math.round(priceNew);
+          }
+        }
+        let pow = Math.pow(10, toFixed);
+        let roundedPrice = 0;
+        if(roundingMethod === 'ceil') {
+          roundedPrice = Math.ceil(priceNew * pow) / pow;
+        } else if(roundingMethod === 'floor') {
+          roundedPrice = Math.floor(priceNew * pow) / pow;
+        } else {
+          roundedPrice = Math.round(priceNew * pow) / pow;
+        }
+        return roundedPrice.toFixed(this.adjustListValue.vip_decimal)
       };
 
       if(!this.adjustListValue.vip_base
         || !this.adjustListValue.vip_unit
       ) return  '';
+      if(this.adjustListValue.vip_unit === 'fixed') {
+        let roundingMethod = this.adjustListValue.vip_rounding_method || 'ceil';
+        let value = Number(this.adjustListValue.vipMoneyValue);
+        if(this.adjustListValue.vip_decimal === -1) {
+          if(roundingMethod === 'ceil') {
+            return Math.ceil(value);
+          } else if(roundingMethod === 'floor') {
+            return Math.floor(value);
+          } else {
+            return Math.round(value);
+          }
+        }
+        return value.toFixed(this.adjustListValue.vip_decimal);
+      }
       if(!this.dialogRow['specs'][this.adjustListValue.vip_base]) return '';
       let value = null;
       if(this.adjustListValue.vip_unit === 'money') {
@@ -580,16 +687,29 @@ export default {
     },
     showSkuOriginalPrice(){
       if(!this.skuAdjustValue.product_sku || !this.skuAdjustValue.base) return '';
+      if(this.skuAdjustValue.unit === 'fixed') return '';
       let skuData = this.skuList.find(sku => sku.value === this.skuAdjustValue.product_sku);
       if(!skuData || !skuData.prices[this.skuAdjustValue.base]) return '';
       let price = skuData.prices[this.skuAdjustValue.base];
       return this.$xdHelper.divisionFloatNumber(price, 100);
     },
     showSkuAdjustedPrice(){
-      if(!this.skuAdjustValue.product_sku || !this.skuAdjustValue.base || !this.skuAdjustValue.unit) return '';
+      if(!this.skuAdjustValue.product_sku || !this.skuAdjustValue.unit) return '';
+      if(this.skuAdjustValue.unit !== 'fixed' && !this.skuAdjustValue.base) return '';
+      if(this.skuAdjustValue.unit !== 'fixed') {
+        let skuData = this.skuList.find(sku => sku.value === this.skuAdjustValue.product_sku);
+        if(!skuData || !skuData.prices[this.skuAdjustValue.base]) return '';
+      }
+
+      if(this.skuAdjustValue.unit === 'fixed') {
+        let value = Number(this.skuAdjustValue.moneyValue);
+        if(isNaN(value)) return '';
+        return value.toFixed(2);
+      }
+
       let skuData = this.skuList.find(sku => sku.value === this.skuAdjustValue.product_sku);
       if(!skuData || !skuData.prices[this.skuAdjustValue.base]) return '';
-      
+
       const handle = (price, value, type) => {
         let toFixed = 0;
         if(this.skuAdjustValue.decimal > 0) toFixed = this.skuAdjustValue.decimal;
@@ -602,9 +722,28 @@ export default {
           temp = this.$xdHelper.multiplyFloatNumber(value, price)
         }
         let priceNew = this.$xdHelper.divisionFloatNumber(temp, 100);
-        return this.$xdHelper.divisionFloatNumber(priceNew * Math.pow(10, toFixed), Math.pow(10, toFixed), toFixed).toFixed(this.skuAdjustValue.decimal)
+        let roundingMethod = this.skuAdjustValue.rounding_method || 'ceil';
+        if(this.skuAdjustValue.decimal === -1) {
+          if(roundingMethod === 'ceil') {
+            return Math.ceil(priceNew);
+          } else if(roundingMethod === 'floor') {
+            return Math.floor(priceNew);
+          } else {
+            return Math.round(priceNew);
+          }
+        }
+        let pow = Math.pow(10, toFixed);
+        let roundedPrice = 0;
+        if(roundingMethod === 'ceil') {
+          roundedPrice = Math.ceil(priceNew * pow) / pow;
+        } else if(roundingMethod === 'floor') {
+          roundedPrice = Math.floor(priceNew * pow) / pow;
+        } else {
+          roundedPrice = Math.round(priceNew * pow) / pow;
+        }
+        return roundedPrice.toFixed(this.skuAdjustValue.decimal)
       };
-      
+
       let price = skuData.prices[this.skuAdjustValue.base];
       let value = null;
       if(this.skuAdjustValue.unit === 'money') {
@@ -614,7 +753,7 @@ export default {
         if(this.skuAdjustValue.ratioValue !== '') value = Number(this.skuAdjustValue.ratioValue);
       }
       if(value === null) return '';
-      
+
       return handle(price, value, this.skuAdjustValue.unit === 'money');
     },
     isShowVipSet(){
@@ -625,6 +764,7 @@ export default {
   async created () {
     console.warn(`created.dialogRow:${JSON.stringify(this.dialogRow)}`)
     console.warn(`created.dialogType:${this.dialogType}`);
+    console.log(this.channelParams,'this.channelParams')
     this.cookieKey = `${this.commonParams.xsiteid}.${this.commonParams.xnamespace}.${this.pagesType}.channel`
     //开启电子码查看
     if (this.dialogType === 'showCode') {
@@ -642,8 +782,9 @@ export default {
 
     //手动调整售价
     if (this.dialogType === 'showAdjust') {
-      let { id, product_id, product_name,sku_count } = this.dialogRow;
+      let { id, product_id, product_name,sku_count,can_cancel_modifyprice } = this.dialogRow;
       product_id = product_id || id;
+      this.adjust_product_id = product_id;
       this.sku_count = sku_count||0;
       let info = await this.getOnePriceInfo({ product_id });
       this.priceTypeList = info.data['price_options'];
@@ -664,13 +805,87 @@ export default {
         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调价值
+      else if(params.unit === 'ratio') params['ratioValue'] = this.$xdHelper.divisionFloatNumber(params['value'], 100);
+      else if(params.unit === 'fixed') params['moneyValue'] = this.$xdHelper.divisionFloatNumber(params['value'], 100);
       if(params.vip_unit === 'money') params['vipMoneyValue'] = this.$xdHelper.divisionFloatNumber(params['vip_value'], 100);
-      else  params['vipRatioValue'] = this.$xdHelper.divisionFloatNumber(params['vip_value'], 100);
+      else if(params.vip_unit === 'ratio') params['vipRatioValue'] = this.$xdHelper.divisionFloatNumber(params['vip_value'], 100);
+      else if(params.vip_unit === 'fixed') params['vipMoneyValue'] = this.$xdHelper.divisionFloatNumber(params['vip_value'], 100);
       this.getAdjustForm(params);
+
+      if(info.data.skus && info.data.skus.length > 0) {
+        await this.getSkuList();
+
+        this.skuAdjustList = info.data.skus.map(skuItem => {
+          const skuData = this.skuList.find(s => s.value === skuItem.product_sku);
+          const originalPriceData = skuData && skuData.prices ? skuData.prices[skuItem.formula.price.base] : '';
+          const originalPrice = originalPriceData
+            ? this.$xdHelper.divisionFloatNumber(originalPriceData, 100)
+            : '';
+
+          let adjustValue = '';
+          if(skuItem.formula.price.unit === 'money') {
+            adjustValue = this.$xdHelper.divisionFloatNumber(skuItem.formula.price.value, 100);
+          } else if(skuItem.formula.price.unit === 'ratio') {
+            adjustValue = this.$xdHelper.divisionFloatNumber(skuItem.formula.price.value, 100);
+          } else if(skuItem.formula.price.unit === 'fixed') {
+            adjustValue = this.$xdHelper.divisionFloatNumber(skuItem.formula.price.value, 100);
+          }
+
+          const basePrice = skuData && skuData.prices ? skuData.prices[skuItem.formula.price.base] : 0;
+          let adjustedPrice = '';
+          const formatPrice = (price, decimal, roundingMethod) => {
+            if(decimal === -1) {
+              if(roundingMethod === 'ceil') {
+                return Math.ceil(price);
+              } else if(roundingMethod === 'floor') {
+                return Math.floor(price);
+              } else {
+                return Math.round(price);
+              }
+            }
+            let pow = Math.pow(10, decimal);
+            let roundedPrice = 0;
+            if(roundingMethod === 'ceil') {
+              roundedPrice = Math.ceil(price * pow) / pow;
+            } else if(roundingMethod === 'floor') {
+              roundedPrice = Math.floor(price * pow) / pow;
+            } else {
+              roundedPrice = Math.round(price * pow) / pow;
+            }
+            return Number(roundedPrice.toFixed(decimal));
+          };
+          if(skuItem.formula.price.unit === 'fixed') {
+            adjustedPrice = formatPrice(adjustValue, 2, 'round');
+          } else {
+            const tempPrice = skuItem.formula.price.unit === 'money'
+              ? this.$xdHelper.addFloatNumber(this.$xdHelper.multiplyFloatNumber(adjustValue, 100), basePrice)
+              : this.$xdHelper.multiplyFloatNumber(this.$xdHelper.addFloatNumber(this.$xdHelper.divisionFloatNumber(adjustValue, 100), 1), basePrice);
+            adjustedPrice = formatPrice(
+              this.$xdHelper.divisionFloatNumber(tempPrice, 100),
+              skuItem.formula.price.decimal,
+              skuItem.formula.price.rounding_method || 'ceil'
+            );
+          }
+
+          return {
+            product_sku: skuItem.product_sku,
+            sku_name: skuData?.label || skuItem.product_sku_name,
+            base: skuItem.formula.price.base,
+            base_label: this.priceTypeList.find(p => p.value === skuItem.formula.price.base)?.label || skuItem.formula.price.base,
+            unit: skuItem.formula.price.unit,
+            unit_label: skuItem.formula.price.unit === 'money' ? '按金额' : skuItem.formula.price.unit === 'ratio' ? '按比例' : '固定售价',
+            decimal: skuItem.formula.price.decimal,
+            decimal_label: skuItem.formula.price.decimal === -1 ? '零位' : skuItem.formula.price.decimal === 1 ? '一位' : '两位',
+            rounding_method: skuItem.formula.price.rounding_method || 'ceil',
+            rounding_method_label: skuItem.formula.price.rounding_method === 'ceil' ? '向上' : skuItem.formula.price.rounding_method === 'floor' ? '向下' : '四舍五入',
+            adjust_value: adjustValue,
+            original_price: originalPrice,
+            adjusted_price: adjustedPrice
+          };
+        });
+      }
+
       this.adjustStatus = true;
       this.showAdjust = true;
     }
@@ -798,6 +1013,24 @@ export default {
           size: 'small',
         },
         {
+          label: "调价方式:",
+          ele: "xd-radio",
+          valueKey: "unit",
+          value: params['unit'] || 'money',
+          list: [
+            { "label": "按金额", "value": "money" },
+            { "label": "按比例", "value": "ratio" },
+            this.channelParams.showFixed&&this.sku_count<=1 && { "label": "固定售价", "value": "fixed" },
+          ].filter(i=>i),
+          notice: params.unit === 'fixed' ? '<span style="color:red;">此选项可能会导致亏本售卖，请谨慎设置 如低于成本价，则按成本价作为售价</span>' : '',
+          inline: false,
+          rules: [{
+            required: true,
+            message: '请选择调价方式',
+            trigger: 'change'
+          }],
+        },
+        params.unit !== 'fixed' && {
           label: '基于:',
           ele: 'xd-select-list',
           valueKey: 'base',
@@ -815,22 +1048,12 @@ export default {
           notice: '<span style="color:#000; font-size: 14px;">调整</span><span style="color:#f00; font-size: 14px;">售价</span>',
           inline: true
         },
-        {
+        params.unit !== 'fixed' && {
           keys: Date.now(),
           label: "",
           ele: 'slot',
           slot:'showSelectPrice'
         },
-        {
-          label: "",
-          ele: "xd-radio",
-          valueKey: "unit",
-          value: params['unit'] || 'money',
-          list: [
-            { "label": "按金额", "value": "money" },
-            { "label": "按比例", "value": "ratio" },
-          ],
-        },
         params.unit==='ratio'&& {
           label: "",
           ele: 'slot',
@@ -877,12 +1100,31 @@ export default {
           notice: '可设置正负值，负值时为下调',
           inline: false
         },
-        {
+        params.unit === 'fixed' && {
+          label: '固定售价:',
+          ele: 'xd-input-unit',
+          valueKey: 'moneyValue',
+          value: params['moneyValue'],
+          setting: {
+            unit: '元',
+            pos: 'append',
+            type: 'number'
+          },
+          placeholder: {
+            unitPlaceholder: '请输入固定售价',
+          },
+          rules: [
+            { required: true, message: '请输入固定售价', trigger: 'blur' },
+          ],
+          inline: false,
+          notice: '支持小数点后两位',
+        },
+        params.unit !== 'fixed' && {
           label: '小数点保留位数:',
           ele: 'xd-select-list',
           valueKey: 'decimal',
           className:'input50',
-          value: params.decimal || 2,
+          value: params.decimal ?? 2,
           placeholder: '请选择小数点保留位数',
           multiple: false,
           list: [
@@ -896,7 +1138,26 @@ export default {
             trigger: 'change'
           }],
         },
-        {
+        params.unit !== 'fixed' && {
+          label: '取数方式:',
+          ele: 'xd-select-list',
+          valueKey: 'rounding_method',
+          className: 'input50',
+          value: params.rounding_method || 'ceil',
+          placeholder: '请选择取数方式',
+          multiple: false,
+          list: [
+            { "label": "向上(默认)", "value": 'ceil' },
+            { "label": "向下", "value": 'floor'},
+            { "label": "四舍五入", "value": 'round' },
+          ],
+          rules: [{
+            required: true,
+            message: '请选择取数方式',
+            trigger: 'change'
+          }],
+        },
+        params.unit !== 'fixed' && {
           label: "调整后售价",
           ele: 'slot',
           slot:'showPrice'
@@ -907,6 +1168,24 @@ export default {
           size: 'small',
         },
         this.isShowVipSet&&{
+          label: "PLUS调价方式:",
+          ele: "xd-radio",
+          valueKey: "vip_unit",
+          value: params['vip_unit'] || 'money',
+          list: [
+            { "label": "按金额", "value": "money" },
+            { "label": "按比例", "value": "ratio" },
+            this.channelParams.showFixed && { "label": "固定售价", "value": "fixed" },
+          ].filter(i=>i),
+          notice: params.vip_unit === 'fixed' ? '此选项可能会导致亏本售卖，请谨慎设置 如低于成本价，则按成本价作为售价' : '',
+          inline: false,
+          rules: [{
+            required: true,
+            message: '请选择调价方式',
+            trigger: 'change'
+          }],
+        },
+        this.isShowVipSet&&params.vip_unit !== 'fixed' && {
           label: 'PLUS售价基于:',
           ele: 'xd-select-list',
           valueKey: 'vip_base',
@@ -924,22 +1203,13 @@ export default {
           notice: '<span style="color:#000; font-size: 14px;">调整</span><span style="color:#f00; font-size: 14px;">PLUS售价</span>',
           inline: true
         },
-        this.isShowVipSet&&{
+        this.isShowVipSet&&params.vip_unit !== 'fixed' && {
           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',
@@ -986,12 +1256,32 @@ export default {
           notice: '可设置正负值，负值时为下调',
           inline: false
         },
-        this.isShowVipSet&&{
+        this.isShowVipSet&&params.vip_unit === 'fixed' && {
+          label: '固定售价:',
+          ele: 'xd-input-unit',
+          valueKey: 'vipMoneyValue',
+          keys: Date.now(),
+          value: params['vipMoneyValue'],
+          setting: {
+            unit: '元',
+            pos: 'append',
+            type: 'number'
+          },
+          placeholder: {
+            unitPlaceholder: '请输入固定售价',
+          },
+          rules: [
+            { required: true, message: '请输入固定售价', trigger: 'blur' },
+          ],
+          inline: false,
+          notice: '支持小数点后两位',
+        },
+        this.isShowVipSet&&params.vip_unit !== 'fixed' && {
           label: '小数点保留位数:',
           ele: 'xd-select-list',
           valueKey: 'vip_decimal',
           className:'input50',
-          value: params.vip_decimal || 2,
+          value: params.vip_decimal ?? 2,
           placeholder: '请选择小数点保留位数',
           multiple: false,
           list: [
@@ -1005,7 +1295,26 @@ export default {
             trigger: 'change'
           }],
         },
-        this.isShowVipSet&&{
+        this.isShowVipSet&&params.vip_unit !== 'fixed' && {
+          label: '取数方式:',
+          ele: 'xd-select-list',
+          valueKey: 'vip_rounding_method',
+          className: 'input50',
+          value: params.vip_rounding_method || 'ceil',
+          placeholder: '请选择取数方式',
+          multiple: false,
+          list: [
+            { "label": "向上(默认)", "value": 'ceil' },
+            { "label": "向下", "value": 'floor'},
+            { "label": "四舍五入", "value": 'round' },
+          ],
+          rules: [{
+            required: true,
+            message: '请选择取数方式',
+            trigger: 'change'
+          }],
+        },
+        this.isShowVipSet&&params.vip_unit !== 'fixed' && {
           label: "调整后售价",
           ele: 'slot',
           slot:'showVipPrice'
@@ -1104,29 +1413,34 @@ export default {
       });
     },
     getAdjustParams () {
-      const { product_id, unit, base,decimal,ratioValue, moneyValue,vip_unit, vip_base,vip_decimal,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} = this.adjustListValue;
       let value = 0;
       if(unit === 'ratio') value = Number(ratioValue);
       if(unit === 'money') value = Number(moneyValue);
+      if(unit === 'fixed') value = Number(moneyValue);
+      
       let vip_value = 0;
       if(vip_unit === 'ratio') vip_value = Number(vipRatioValue);
       if(vip_unit === 'money') vip_value = Number(vipMoneyValue);
+      if(vip_unit === 'fixed') vip_value = Number(vipMoneyValue);
       
       const formula = {
         sale_price: {
           unit,
-          base,
           value: this.$xdHelper.multiplyFloatNumber(Number(value), 100),
-          decimal
+          base: unit === 'fixed' ? 'jfb_price' : base,
+          decimal: unit === 'fixed' ? 0 : decimal,
+          rounding_method: unit === 'fixed' ? 'ceil' : rounding_method,
         }
       };
-      
+
       if(this.isShowVipSet){
         formula.vip_price = {
-          unit:vip_unit,
-          base:vip_base,
+          unit: vip_unit,
+          base: vip_unit === 'fixed' ? 'jfb_price' : vip_base,
+          decimal: vip_unit === 'fixed' ? 0 : vip_decimal,
+          rounding_method: vip_unit === 'fixed' ? 'ceil' : vip_rounding_method,
           value: this.$xdHelper.multiplyFloatNumber(Number(vip_value), 100),
-          decimal:vip_decimal
         };
       }
       
@@ -1141,30 +1455,34 @@ export default {
           let sku_value = 0;
           if(item.unit === 'ratio') sku_value = Number(item.adjust_value);
           if(item.unit === 'money') sku_value = Number(item.adjust_value);
-          
+          if(item.unit === 'fixed') sku_value = Number(item.adjust_value);
+
           const skuFormula = {
             sale_price: {
               unit: item.unit,
-              base: item.base,
               value: this.$xdHelper.multiplyFloatNumber(Number(sku_value), 100),
-              decimal: item.decimal
+              base: item.unit === 'fixed' ? 'jfb_price' : item.base,
+              decimal: item.unit === 'fixed' ? 0 : item.decimal,
+              rounding_method: item.unit === 'fixed' ? 'ceil' : item.rounding_method,
             }
           };
-          
+
           // 如果支持VIP价格，添加vip_price到规格的formula中
           if(this.isShowVipSet && item.vip_unit && item.vip_base){
             let vip_sku_value = 0;
             if(item.vip_unit === 'ratio') vip_sku_value = Number(item.vip_adjust_value);
             if(item.vip_unit === 'money') vip_sku_value = Number(item.vip_adjust_value);
-            
+            if(item.vip_unit === 'fixed') vip_sku_value = Number(item.vip_adjust_value);
+
             skuFormula.vip_price = {
               unit: item.vip_unit,
-              base: item.vip_base,
               value: this.$xdHelper.multiplyFloatNumber(Number(vip_sku_value), 100),
-              decimal: item.vip_decimal
+              base: item.vip_unit === 'fixed' ? 'jfb_price' : item.vip_base,
+              decimal: item.vip_unit === 'fixed' ? 0 : item.vip_decimal,
+              rounding_method: item.vip_unit === 'fixed' ? 'ceil' : item.vip_rounding_method,
             };
           }
-          
+
           return {
             product_sku: item.product_sku,
             formula: skuFormula
@@ -1196,6 +1514,22 @@ export default {
         })
         .catch()
     },
+    //取消调价
+    handleCancelAdjust(){
+      this.$confirm("确认取消调价", "提示")
+        .then(() => {
+          this.cancelAdjust({product_id: this.adjust_product_id}).then(() => {
+            this.adjustStatus = false
+            this.showAdjust = false
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+            this.handleDialogSuccess()
+          })
+        })
+        .catch((err) => { })
+    },
     //==调价==============================
 
     //商品配置-是否公开
@@ -1349,27 +1683,33 @@ export default {
         ratioValue: ''
       };
       this.getSkuAdjustForm(this.skuAdjustValue);
+      this.skuAdjustKey = Date.now();
       this.skuAdjustStatus = true;
       this.showAddSkuAdjust = true;
     },
 
     handleEditSkuAdjust(row) {
       this.currentEditSku = row;
-      this.skuAdjustValue = {
-        product_sku: row.product_sku,
-        base: row.base,
-        unit: row.unit,
-        decimal: row.decimal,
-        moneyValue: row.unit === 'money' ? row.adjust_value : '',
-        ratioValue: row.unit === 'ratio' ? row.adjust_value : ''
-      };
-      // 如果是按比例，回显期望售价为调整后售价
-      if (row.unit === 'ratio') {
-        this.skuDesireForm.price = row.adjusted_price;
-      }
-      this.getSkuAdjustForm(this.skuAdjustValue);
-      this.skuAdjustStatus = true;
-      this.showAddSkuAdjust = true;
+      this._isSkuAdjustEditing = true;
+      this.skuAdjustValue = {};
+      this.$nextTick(() => {
+        this.skuAdjustValue = {
+          product_sku: row.product_sku,
+          base: row.base,
+          unit: row.unit,
+          decimal: row.decimal,
+          moneyValue: row.unit === 'money' || row.unit === 'fixed' ? row.adjust_value : '',
+          ratioValue: row.unit === 'ratio' ? row.adjust_value : '',
+          rounding_method: row.rounding_method || 'ceil'
+        };
+        if (row.unit === 'ratio') {
+          this.skuDesireForm.price = row.adjusted_price;
+        }
+        this.skuAdjustStatus = true;
+        this.getSkuAdjustForm(this.skuAdjustValue);
+        this.showAddSkuAdjust = true;
+        this._isSkuAdjustEditing = false;
+      });
     },
 
     handleDeleteSkuAdjust(index) {
@@ -1391,7 +1731,7 @@ export default {
     handleAddSkuAdjustConfirm() {
       this.$refs['skuAdjust'].submitAll()
         .then(res => {
-          const { product_sku, base, unit, decimal, moneyValue, ratioValue } = this.skuAdjustValue;
+          const { product_sku, base, unit, decimal, moneyValue, ratioValue, rounding_method } = this.skuAdjustValue;
           const skuData = this.skuList.find(sku => sku.value === product_sku);
           if (!skuData) return;
 
@@ -1405,7 +1745,7 @@ export default {
           }
 
           const originalPrice = this.$xdHelper.divisionFloatNumber(skuData.prices[base], 100);
-          const adjustValue = unit === 'money' ? moneyValue : ratioValue;
+          const adjustValue = unit === 'fixed' ? moneyValue : (unit === 'money' ? moneyValue : ratioValue);
           const adjustedPrice = this.showSkuAdjustedPrice;
 
           const adjustItem = {
@@ -1414,9 +1754,11 @@ export default {
             base,
             base_label: this.priceTypeList.find(item => item.value === base)?.label || base,
             unit,
-            unit_label: unit === 'money' ? '按金额' : '按比例',
+            unit_label: unit === 'money' ? '按金额' : unit === 'ratio' ? '按比例' : '固定售价',
             decimal,
             decimal_label: decimal === -1 ? '零位' : decimal === 1 ? '一位' : '两位',
+            rounding_method,
+            rounding_method_label: rounding_method === 'ceil' ? '向上' : rounding_method === 'floor' ? '向下' : '四舍五入',
             adjust_value: adjustValue,
             original_price: originalPrice,
             adjusted_price: adjustedPrice
@@ -1464,6 +1806,7 @@ export default {
     },
 
     getSkuAdjustForm(params) {
+      console.log(params,this.priceTypeList,'ppppp')
       // 确保当切换单位时，清空另一个单位的值
       if (params.unit === 'ratio' && params.moneyValue !== '') {
         this.skuAdjustValue.moneyValue = '';
@@ -1490,6 +1833,24 @@ export default {
           inline: true
         },
         {
+          label: "调价方式:",
+          ele: "xd-radio",
+          valueKey: "unit",
+          value: params.unit || 'money',
+          list: [
+            { "label": "按金额", "value": "money" },
+            { "label": "按比例", "value": "ratio" },
+            this.channelParams.showFixed && { "label": "固定售价", "value": "fixed" },
+          ].filter(i=>i),
+          notice: params.unit === 'fixed' ? '<span style="color:red;">此选项可能会导致亏本售卖，请谨慎设置 如低于成本价，则按成本价作为售价</span>' : '',
+          inline: false,
+          rules: [{
+            required: true,
+            message: '请选择调价方式',
+            trigger: 'change'
+          }],
+        },
+        params.unit !== 'fixed' && {
           label: '基于:',
           ele: 'xd-select-list',
           valueKey: 'base',
@@ -1507,22 +1868,13 @@ export default {
           notice: '<span style="color:#000; font-size: 14px;">调整</span><span style="color:#f00; font-size: 14px;">售价</span>',
           inline: true
         },
-        {
+        params.unit !== 'fixed' && {
           keys: Date.now(),
           label: "",
           ele: 'slot',
           slot: 'showSkuOriginalPrice'
         },
-        {
-          label: "",
-          ele: "xd-radio",
-          valueKey: "unit",
-          value: params.unit || 'money',
-          list: [
-            { "label": "按金额", "value": "money" },
-            { "label": "按比例", "value": "ratio" },
-          ],
-        },
+      
         this.skuAdjustValue.unit==='ratio' && {
           keys: Date.now(),
           label: "",
@@ -1570,12 +1922,32 @@ export default {
           notice: '可设置正负值，负值时为下调',
           inline: false
         },
-        {
+        params.unit === 'fixed' && {
+          label: '固定售价:',
+          ele: 'xd-input-unit',
+          valueKey: 'moneyValue',
+          keys: Date.now(),
+          value: params['moneyValue'],
+          setting: {
+            unit: '元',
+            pos: 'append',
+            type: 'number'
+          },
+          placeholder: {
+            unitPlaceholder: '请输入固定售价',
+          },
+          rules: [
+            { required: true, message: '请输入固定售价', trigger: 'blur' },
+          ],
+          inline: false,
+          notice: '支持小数点后两位',
+        },
+        params.unit !== 'fixed' && {
           label: '小数点保留位数:',
           ele: 'xd-select-list',
           valueKey: 'decimal',
           className: 'input50',
-          value: params.decimal || 2,
+          value: params.decimal ?? 2,
           placeholder: '请选择小数点保留位数',
           multiple: false,
           list: [
@@ -1589,7 +1961,26 @@ export default {
             trigger: 'change'
           }],
         },
-        {
+        params.unit !== 'fixed' && {
+          label: '取数方式:',
+          ele: 'xd-select-list',
+          valueKey: 'rounding_method',
+          className: 'input50',
+          value: params.rounding_method || 'ceil',
+          placeholder: '请选择取数方式',
+          multiple: false,
+          list: [
+            { "label": "向上(默认)", "value": 'ceil' },
+            { "label": "向下", "value": 'floor'},
+            { "label": "四舍五入", "value": 'round' },
+          ],
+          rules: [{
+            required: true,
+            message: '请选择取数方式',
+            trigger: 'change'
+          }],
+        },
+        params.unit !== 'fixed' && {
           label: "调整后售价",
           ele: 'slot',
           slot: 'showSkuAdjustedPrice'

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -471,6 +471,13 @@ export default {
           },
           notice: "市场价和分销价",
         },
+        this.channelParams.scene === 'selected'&&{
+          label: "商品条码:", //label
+          ele: "el-input", //package 名称
+          valueKey: "product_bar_code", //form[valueKey]
+          value: "", //v-model
+          placeholder: "请输入商品条码，即69码",
+        },
         this.projectType!=='wholesale'&&{
           label: "按折扣:", //label
           ele: "xd-input-range", //package 名称

package/library/viewModules/viewsPrize/viewsPrize/create.vue

@@ -18,7 +18,12 @@
         <template slot="prize_set" slot-scope="scope">
           <el-form ref="form" :model="form" label-width="140px">
             <el-form-item label="奖品设置" required>
+             <!-- #ifdef saas-admin  -->
+              <prize-set :list="prizeSetList" :site_id="siteId" @tableUpdate="handleChange" @tableNumChange="handleNumChange" :key="prizeSetKey"></prize-set>
+            <!-- #endif -->
+            <!-- #ifdef sms-prize -->
               <prize-set v-if="siteId" :list="prizeSetList" :site_id="siteId" @tableUpdate="handleChange" @tableNumChange="handleNumChange" :key="prizeSetKey"></prize-set>
+            <!-- #endif -->
             </el-form-item>
           </el-form>
         </template>

package/package.json

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