jufubao-admin-library 1.1.211 → 1.1.212

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -24,7 +24,7 @@
     <xd-dialog
       :show.sync="showAdjust"
       title="手动调整售价"
-      width="600px"
+      width="60%"
       @onConfirm="handleAdjustConfirm"
     >
       <xd-base-dynamic-field
@@ -69,6 +69,93 @@
             <div><el-input class="input50" type="number" v-model="showVipSelectPrice" disabled></el-input></div>
           </div>
         </template>
+        <template slot="sku_table">
+          <div style="margin-top: 20px;">
+            <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
+              <h3 style="font-size: 16px; font-weight: 500; margin: 0;">规格调价</h3>
+              <el-button 
+                type="primary" 
+                size="small" 
+                @click="handleAddSkuAdjust"
+                :disabled="skuAdjustList.length >= 10"
+              >新增规格调价（最多10个）</el-button>
+            </div>
+            <el-table
+              :data="skuAdjustList"
+              border
+              stripe
+              style="width: 100%"
+              size="small"
+            >
+              <el-table-column
+                prop="sku_name"
+                label="规格"
+                min-width="120"
+              />
+              <el-table-column
+                prop="base_label"
+                label="基于价格"
+                min-width="100"
+              />
+              <el-table-column
+                prop="original_price"
+                label="调整原始价格"
+                min-width="120"
+              >
+                <template slot-scope="scope">
+                  {{ 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' ? '%' : '元' }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="decimal_label"
+                label="小数点保留"
+                min-width="100"
+              />
+              <el-table-column
+                prop="adjusted_price"
+                label="调整后售价"
+                min-width="100"
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.adjusted_price }}元
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="操作"
+                min-width="100"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="small"
+                    @click="handleEditSkuAdjust(scope.row)"
+                  >编辑</el-button>
+                  <el-button
+                    type="text"
+                    size="small"
+                    @click="handleDeleteSkuAdjust(scope.$index)"
+                    style="color: #ff4d4f;"
+                  >删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
       </xd-base-dynamic-field>
       <xd-dialog
         v-if="showDesire"
@@ -102,6 +189,41 @@
         </el-form>
       </div>
     </xd-dialog>
+    <!-- 新增规格调价弹框 -->
+    <xd-dialog
+      v-if="showAddSkuAdjust"
+      :show.sync="showAddSkuAdjust"
+      width="50%"
+      @onConfirm="handleAddSkuAdjustConfirm"
+      :title="currentEditSku ? '编辑规格调价' : '新增规格调价'"
+    >
+      <xd-base-dynamic-field
+        ref="skuAdjust"
+        v-if="skuAdjustStatus && skuAdjustForm.length > 0"
+        v-model="skuAdjustValue"
+        :list="skuAdjustForm"
+        :key="skuAdjustKey"
+        label-width="130px"
+      >
+        <template slot="showSkuOriginalPrice">
+          <div class="show-price">
+            <div>调整原始价格：</div>
+            <div><el-input class="input50" type="number" v-model="showSkuOriginalPrice" disabled></el-input></div>
+          </div>
+        </template>
+        <template slot="skuDesire">
+          <el-form-item prop="skuDesire" label="">
+            <el-button type="primary" size="small" @click="handleSetSkuDesire">设置期望售价</el-button>
+          </el-form-item>
+        </template>
+        <template slot="showSkuAdjustedPrice">
+          <div class="show-price">
+            <div>调整后售价：</div>
+            <div><el-input class="input50" type="number" v-model="showSkuAdjustedPrice" disabled></el-input></div>
+          </div>
+        </template>
+      </xd-base-dynamic-field>
+    </xd-dialog>
     </xd-dialog>
     <xd-dialog
       v-if="showPublicSet"
@@ -147,6 +269,13 @@
 
       </el-form>
     </xd-dialog>
+    <xd-dialog :show.sync="showSkuDesire" title="设置规格期望售价" width="400px" @onConfirm="handleSkuDesire">
+      <el-form ref="skuDesireForm" :model="skuDesireForm" :rules="rules" label-width="120px">
+        <el-form-item prop="price" label="期望售价">
+          <el-input v-model.number="skuDesireForm.price" type="number" placeholder="请输入期望售价" step="0.01"></el-input>
+        </el-form-item>
+      </el-form>
+    </xd-dialog>
     <xd-dialog :show.sync="showOpen" title="发票名称设置" width="600px" @onConfirm="handleOpenConfirm">
       <xd-base-dynamic-field
         ref="open"
@@ -173,6 +302,7 @@
 <script>
 import XdDialog from "@/components/XdDialog"
 import { getOptions } from "@/utils/options"
+import XdTable from "@/components/XdTable"
 import XdBaseDynamicField from "@/components/XdBaseDynamicField"
 import checkPermission from "@/utils/permission"
 import { mapActions, mapState } from "vuex"
@@ -180,7 +310,8 @@ export default {
   name: "JfbProductDialog",
   components: {
     XdDialog,
-    XdBaseDynamicField
+    XdBaseDynamicField,
+    XdTable,
   },
   watch: {
     'adjustListValue.unit' : {
@@ -197,6 +328,91 @@ export default {
         }
       }
     },
+    'skuAdjustValue.unit': {
+      handler(n,o){
+        if(n&&n!==o){
+          // 切换单位时清空另一个单位的值
+          if(n === 'ratio') {
+            this.skuAdjustValue.moneyValue = '';
+          } else {
+            this.skuAdjustValue.ratioValue = '';
+          }
+          this.getSkuAdjustForm(this.skuAdjustValue);
+        }
+      }
+    },
+    // 手动调整售价 - 切换基于价格类型时重新计算
+    'adjustListValue.base': {
+      handler(n,o){
+        if(n && n !== o && this.desireForm.price){
+          // 重新计算上调/下调值
+          let unit = 'moneyValue';
+          if(this.adjustListValue['unit'] === 'ratio') unit = 'ratioValue';
+          let price = this.dialogRow['specs'][n];
+          if(price){
+            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();
+          }
+        }
+      }
+    },
+    // 规格调价 - 切换基于价格类型时重新计算
+    'skuAdjustValue.base': {
+      handler(n,o){
+        if(n && n !== o && this.skuDesireForm.price){
+          // 重新计算上调/下调值
+          let unit = 'moneyValue';
+          if(this.skuAdjustValue['unit'] === 'ratio') unit = 'ratioValue';
+          
+          const skuData = this.skuList.find(sku => sku.value === this.skuAdjustValue.product_sku);
+          if (skuData && skuData.prices[n]) {
+            let price = skuData.prices[n];
+            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();
+          }
+        }
+      }
+    },
+    // VIP价格 - 切换基于价格类型时重新计算
+    'adjustListValue.vip_base': {
+      handler(n,o){
+        if(n && n !== o && this.vipDesireForm.price){
+          // 重新计算上调/下调值
+          let unit = 'vipMoneyValue';
+          if(this.adjustListValue['vip_unit'] === 'ratio') unit = 'vipRatioValue';
+          let price = this.dialogRow['specs'][n];
+          if(price){
+            let value = this.$xdHelper.divisionFloatNumber(this.$xdHelper.multiplyFloatNumber(this.vipDesireForm.price, 100) - price, price);
+            this.adjustListValue[unit] = this.$xdHelper.multiplyFloatNumber(value, 100).toFixed(2);
+            this.getAdjustForm(this.adjustListValue);
+            this.adjustListKey = Date.now();
+          }
+        }
+      }
+    },
+    // 规格调价 - 切换商品规格时重新计算
+    '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();
+          }
+        }
+      }
+    },
   },
  
   data () {
@@ -259,6 +475,11 @@ export default {
           { required: true, message: '请输入期望售价', trigger: 'change' }
         ],
       },
+      // 规格期望售价
+      showSkuDesire: false,
+      skuDesireForm: {
+        price: ''
+      },
       setRules:{
         public: [
           { required: true, message: '请选择是否公开', trigger: 'change' }
@@ -267,6 +488,16 @@ export default {
           { required: true, message: '请选择标签', trigger: 'change' }
         ],
       },
+      //规格调价相关
+      skuAdjustList: [],
+      showAddSkuAdjust: false,
+      skuAdjustForm: [],
+      skuAdjustValue: {},
+      skuAdjustKey: 'skuAdjustKey',
+      skuAdjustStatus: false,
+      skuList: [],
+      currentEditSku: null,
+      sku_count: 0,
     }
   },
   computed: {
@@ -347,6 +578,45 @@ export default {
       let price = this.dialogRow['specs'][this.adjustListValue.vip_base];
       return this.$xdHelper.divisionFloatNumber(price, 100)
     },
+    showSkuOriginalPrice(){
+      if(!this.skuAdjustValue.product_sku || !this.skuAdjustValue.base) 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 '';
+      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;
+        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 this.$xdHelper.divisionFloatNumber(priceNew * Math.pow(10, toFixed), Math.pow(10, toFixed), toFixed).toFixed(this.skuAdjustValue.decimal)
+      };
+      
+      let price = skuData.prices[this.skuAdjustValue.base];
+      let value = null;
+      if(this.skuAdjustValue.unit === 'money') {
+        if(this.skuAdjustValue.moneyValue !== '') value = Number(this.skuAdjustValue.moneyValue);
+      }
+      if(this.skuAdjustValue.unit === 'ratio') {
+        if(this.skuAdjustValue.ratioValue !== '') value = Number(this.skuAdjustValue.ratioValue);
+      }
+      if(value === null) return '';
+      
+      return handle(price, value, this.skuAdjustValue.unit === 'money');
+    },
     isShowVipSet(){
       return this.channelParams.group_key&&this.channelParams.group_key==='vip'
     }
@@ -372,8 +642,9 @@ export default {
 
     //手动调整售价
     if (this.dialogType === 'showAdjust') {
-      let { id, product_id, product_name } = this.dialogRow;
+      let { id, product_id, product_name,sku_count } = this.dialogRow;
       product_id = product_id || id;
+      this.sku_count = sku_count||0;
       let info = await this.getOnePriceInfo({ product_id });
       this.priceTypeList = info.data['price_options'];
       let params = info.data['formula']['price'];
@@ -739,6 +1010,10 @@ export default {
           ele: 'slot',
           slot:'showVipPrice'
         },
+        this.sku_count>1&&{
+          ele:'slot',
+          slot:'sku_table'
+        }
       ].filter(i => i)
       this.adjustListKey = Date.now()
     },
@@ -786,7 +1061,7 @@ export default {
           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.adjustListValue[unit] = this.$xdHelper.multiplyFloatNumber(value, 100).toFixed(2);
           this.getAdjustForm(this.adjustListValue);
           this.adjustListKey = Date.now()
           this.showVipDesire = false
@@ -796,6 +1071,38 @@ export default {
       });
       // this.desireForm.price:''
     },
+    /**设置规格期望售价**/
+    handleSetSkuDesire(){
+      if(!this.skuAdjustValue.product_sku || !this.skuAdjustValue.base){
+        this.$message.error('请选择商品规格和基于类型');
+        return;
+      }
+      this.showSkuDesire = true;
+    },
+    /**设置规格期望售价确定**/
+    handleSkuDesire(){
+      this.$refs['skuDesireForm'].validate((valid) => {
+        if (valid) {
+          if(!this.skuAdjustValue.product_sku || !this.skuAdjustValue.base || !this.skuDesireForm.price) return false;
+          
+          let unit = 'moneyValue';
+          if(this.skuAdjustValue['unit'] === 'ratio') unit = 'ratioValue';
+          
+          const skuData = this.skuList.find(sku => sku.value === this.skuAdjustValue.product_sku);
+          if (!skuData || !skuData.prices[this.skuAdjustValue.base]) return false;
+          
+          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();
+          this.showSkuDesire = false;
+        } else {
+          return false;
+        }
+      });
+    },
     getAdjustParams () {
       const { product_id, unit, base,decimal,ratioValue, moneyValue,vip_unit, vip_base,vip_decimal,vipRatioValue, vipMoneyValue} = this.adjustListValue;
       let value = 0;
@@ -804,38 +1111,68 @@ export default {
       let vip_value = 0;
       if(vip_unit === 'ratio') vip_value = Number(vipRatioValue);
       if(vip_unit === 'money') vip_value = Number(vipMoneyValue);
+      
+      const formula = {
+        sale_price: {
+          unit,
+          base,
+          value: this.$xdHelper.multiplyFloatNumber(Number(value), 100),
+          decimal
+        }
+      };
+      
       if(this.isShowVipSet){
-        return {
-          product_id,
-          formula: {
+        formula.vip_price = {
+          unit:vip_unit,
+          base:vip_base,
+          value: this.$xdHelper.multiplyFloatNumber(Number(vip_value), 100),
+          decimal:vip_decimal
+        };
+      }
+      
+      const params = {
+        product_id,
+        formula
+      };
+      
+      // 添加规格调价信息到skus数组
+      if(this.skuAdjustList && this.skuAdjustList.length > 0){
+        params.skus = this.skuAdjustList.map(item => {
+          let sku_value = 0;
+          if(item.unit === 'ratio') sku_value = Number(item.adjust_value);
+          if(item.unit === 'money') sku_value = Number(item.adjust_value);
+          
+          const skuFormula = {
             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
+              unit: item.unit,
+              base: item.base,
+              value: this.$xdHelper.multiplyFloatNumber(Number(sku_value), 100),
+              decimal: item.decimal
             }
+          };
+          
+          // 如果支持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);
+            
+            skuFormula.vip_price = {
+              unit: item.vip_unit,
+              base: item.vip_base,
+              value: this.$xdHelper.multiplyFloatNumber(Number(vip_sku_value), 100),
+              decimal: item.vip_decimal
+            };
           }
-        }
-      }else{
-        return {
-          product_id,
-          formula: {
-            sale_price: {
-              unit,
-              base,
-              value: this.$xdHelper.multiplyFloatNumber(Number(value), 100),
-              decimal
-            },
-          }
-        }
+          
+          return {
+            product_sku: item.product_sku,
+            formula: skuFormula
+          };
+        });
       }
       
+      return params;
     },
 
     handleAdjustConfirm () {
@@ -997,6 +1334,271 @@ export default {
         })
     },
 
+    //==规格调价相关方法==============================
+    async handleAddSkuAdjust() {
+      if (!this.skuList || this.skuList.length === 0) {
+        await this.getSkuList();
+      }
+      this.currentEditSku = null;
+      this.skuAdjustValue = {
+        product_sku: '',
+        base: '',
+        unit: 'money',
+        decimal: 2,
+        moneyValue: '',
+        ratioValue: ''
+      };
+      this.getSkuAdjustForm(this.skuAdjustValue);
+      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;
+    },
+
+    handleDeleteSkuAdjust(index) {
+      this.$confirm('确定要删除该规格调价吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.skuAdjustList.splice(index, 1);
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        });
+      }).catch(() => {
+        // 用户取消删除
+      });
+    },
+
+    handleAddSkuAdjustConfirm() {
+      this.$refs['skuAdjust'].submitAll()
+        .then(res => {
+          const { product_sku, base, unit, decimal, moneyValue, ratioValue } = this.skuAdjustValue;
+          const skuData = this.skuList.find(sku => sku.value === product_sku);
+          if (!skuData) return;
+
+          // 检查是否已存在该sku的调价记录（编辑时除外）
+          if (!this.currentEditSku) {
+            const existingSku = this.skuAdjustList.find(item => item.product_sku === product_sku);
+            if (existingSku) {
+              this.$message.error('该规格已存在调价记录，不能重复添加');
+              return;
+            }
+          }
+
+          const originalPrice = this.$xdHelper.divisionFloatNumber(skuData.prices[base], 100);
+          const adjustValue = unit === 'money' ? moneyValue : ratioValue;
+          const adjustedPrice = this.showSkuAdjustedPrice;
+
+          const adjustItem = {
+            product_sku,
+            sku_name: skuData.label,
+            base,
+            base_label: this.priceTypeList.find(item => item.value === base)?.label || base,
+            unit,
+            unit_label: unit === 'money' ? '按金额' : '按比例',
+            decimal,
+            decimal_label: decimal === -1 ? '零位' : decimal === 1 ? '一位' : '两位',
+            adjust_value: adjustValue,
+            original_price: originalPrice,
+            adjusted_price: adjustedPrice
+          };
+
+          if (this.currentEditSku) {
+            const index = this.skuAdjustList.findIndex(item => item.product_sku === this.currentEditSku.product_sku);
+            if (index !== -1) {
+              this.$set(this.skuAdjustList, index, adjustItem);
+            }
+          } else {
+            this.skuAdjustList.push(adjustItem);
+          }
+
+          this.showAddSkuAdjust = false;
+          this.skuAdjustStatus = false;
+          this.currentEditSku = null;
+          this.skuDesireForm.price = '';
+          this.$message({
+            message: '操作成功',
+            type: 'success'
+          });
+        })
+        .catch(err => {
+          console.log(err, 'err');
+        });
+    },
+
+    async getSkuList() {
+      if (!this.dialogRow.product_id) return;
+      try {
+        let res = await getOptions({
+          server: 'product-partner',
+          fn: 'selected-products-skus',
+          path: 'p3',
+          params:{
+            product_id:this.dialogRow.product_id
+          }
+        })
+        console.log(res,'aaaaaa')
+        this.skuList = res.data.list
+      } catch (error) {
+        console.error('获取商品规格失败:', error);
+      }
+    },
+
+    getSkuAdjustForm(params) {
+      // 确保当切换单位时，清空另一个单位的值
+      if (params.unit === 'ratio' && params.moneyValue !== '') {
+        this.skuAdjustValue.moneyValue = '';
+      }
+      if (params.unit === 'money' && params.ratioValue !== '') {
+        this.skuAdjustValue.ratioValue = '';
+      }
+      
+      this.skuAdjustForm = [
+        {
+          label: '商品规格:',
+          ele: 'xd-select-list',
+          valueKey: 'product_sku',
+          value: params.product_sku || '',
+          placeholder: '请选择商品规格',
+          multiple: false,
+          list: this.skuList,
+          rules: [{
+            required: true,
+            message: '请选择商品规格',
+            trigger: 'change'
+          }],
+          className: 'input70',
+          inline: true
+        },
+        {
+          label: '基于:',
+          ele: 'xd-select-list',
+          valueKey: 'base',
+          value: params.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;">售价</span>',
+          inline: true
+        },
+        {
+          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: "",
+          ele: 'slot',
+          slot: 'skuDesire'
+        },
+        params.unit === 'ratio' && {
+          label: '上调/下调:',
+          ele: 'xd-input-unit',
+          valueKey: 'ratioValue',
+          keys: Date.now(),
+          value: params['ratioValue'],
+          className: 'input50',
+          setting: {
+            unit: '%',
+            pos: 'append',
+            type: 'number'
+          },
+          placeholder: {
+            unitPlaceholder: '请输入比例',
+          },
+          rules: [
+            { required: true, message: '请输入比例', trigger: 'blur' },
+          ],
+          notice: '可设置正负值，负值时为下调',
+          inline: false
+        },
+        params.unit === 'money' && {
+          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' },
+          ],
+          notice: '可设置正负值，负值时为下调',
+          inline: false
+        },
+        {
+          label: '小数点保留位数:',
+          ele: 'xd-select-list',
+          valueKey: 'decimal',
+          className: 'input50',
+          value: params.decimal || 2,
+          placeholder: '请选择小数点保留位数',
+          multiple: false,
+          list: [
+            { "label": "零位", "value": -1 },
+            { "label": "一位", "value": 1 },
+            { "label": "两位", "value": 2 },
+          ],
+          rules: [{
+            required: true,
+            message: '请选择小数点保留位数',
+            trigger: 'change'
+          }],
+        },
+        {
+          label: "调整后售价",
+          ele: 'slot',
+          slot: 'showSkuAdjustedPrice'
+        }
+      ].filter(i => i);
+      this.skuAdjustKey = Date.now();
+    },
+    //==规格调价相关方法==============================
+
   }
 }
 </script>

package/library/viewModules/viewStore/schemas/store_selection.js

@@ -570,6 +570,19 @@ module.exports = {
       disabled: true,
       role: 'ROLE_MARKET_STORE_PRODUCT_RULE_LOG_DETAIL',
     },
+    {
+      title: "加盟商后台 复制选店规则条件",
+      mapFn: "selectShopRuleCopy",
+      isPublic: true,
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-rule/copy-rule-id',
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        rule_id: ['rule_id', 'String', '必填'],
+      },
+      disabled: true,
+    },
   ],
 }
 

package/library/viewModules/viewStore/viewStore/rule/list.vue

@@ -36,6 +36,22 @@
         ></xd-pagination>
       </div>
     </el-card>
+    <xd-dialog
+      v-if="createMethodShow"
+      :show.sync="createMethodShow"
+      @onConfirm="handleCreateMethodConfirm()"
+      @onCancel="handleCreateMethodCancel()"
+      title=""
+      width="500px"
+    >
+      <xd-base-dynamic-field
+        ref="createMethod"
+        v-if="createMethodForm.length > 0"
+        v-model="createMethodValue"
+        :key="createMethodKey"
+        :list="createMethodForm"
+      ></xd-base-dynamic-field>
+    </xd-dialog>
   </div>
 </template>
 
@@ -49,6 +65,8 @@ import XdPagination from "@/components/XdPagination.vue"
 import XdTable from "@/components/XdTable"
 import checkPermission from "@/utils/permission"
 import permissions from "@/constant/permissions"
+import XdDialog from "@/components/XdDialog"
+import XdBaseDynamicField from "@/components/XdBaseDynamicField"
 
 export default {
   name: "StoreRuleList",
@@ -56,7 +74,9 @@ export default {
     XdPagination,
     XdSearch,
     XdTableStatus,
-    XdTable
+    XdTable,
+    XdDialog,
+    XdBaseDynamicField
   },
 
   data () {
@@ -69,6 +89,10 @@ export default {
       searchParams: null, // 搜索参数
       tables: [],
       total: 0,
+      createMethodKey: 'createMethodKey',
+      createMethodShow: false,
+      createMethodValue: {},
+      createMethodForm: [],
     }
   },
   computed:{
@@ -115,6 +139,16 @@ export default {
         }
       ]
     }
+  },
+   watch:{
+    'createMethodValue.create_method':{
+      handler(newVal,oldVal){
+        if(newVal&&newVal!==oldVal){
+          this.initCreateMethodForm(this.createMethodValue)
+          this.createMethodKey = Date.now()
+        }
+      }
+    }
   },
   created () {
     this.getList()
@@ -125,7 +159,8 @@ export default {
     ...mapActions('store_selection', [
       'selectShopRuleList',
       'selectShopRuleExecTask',
-      'selectShopRuleDelete'
+      'selectShopRuleDelete',
+      'selectShopRuleCopy'
     ]),
 
     onJfbTagForReload () {
@@ -240,7 +275,67 @@ export default {
     },
     //创建
     handleCreate(){
-      this.$router.push('/store/store_rule_create')
+       this.initCreateMethodForm({})
+    },
+    initCreateMethodForm(params){
+      this.createMethodForm = [
+        {
+          label: "创建方式:",
+          ele: "xd-radio",
+          valueKey: "create_method",
+          value: params.create_method || "custom",
+          rules: [
+            { required: true, message: "请选择", trigger: ["blur", "change"] },
+          ],
+          list: [
+            { label: "自定义", value: "custom" },
+            { label: "按规则ID", value: "by_rule_id" },
+          ],
+        },
+        params.create_method==='by_rule_id' && {
+          label: " ",
+          ele: "el-input",
+          type: "text",
+          valueKey: "rule_id",
+          value: params.rule_id || "",
+          placeholder: "请输入规则ID",
+          className: "input40",
+          rules: [
+            {
+              required: true,
+              message: "请输入规则ID",
+              trigger: "blur",
+            },
+          ],
+        },
+      ].filter(i=>i);
+      this.createMethodKey = Date.now();
+      this.createMethodShow = true;
+    },
+    handleCreateMethodConfirm(){
+      this.$refs["createMethod"].submit().then(() => {
+        if(this.createMethodValue.create_method==='by_rule_id'){
+          if(!this.createMethodValue.rule_id){
+            this.$message.error("请输入规则ID")
+            return
+          }
+          // 请求接口
+          this.selectShopRuleCopy({rule_id:this.createMethodValue.rule_id}).then(res=>{
+            this.$message.success("操作成功")
+            this.getList()
+            this.createMethodShow = false
+          })
+        }else if(this.createMethodValue.create_method==='custom'){
+          this.createMethodShow = false
+          this.$router.push('/store/store_rule_create')
+        }
+      }).catch(() => {
+        this.$message.error("操作失败")
+      })
+    },
+    handleCreateMethodCancel(){
+      this.createMethodValue = {}
+      this.createMethodShow = false
     },
   }
 }

package/library/viewModules/viewsCompany/viewsCompany/list.vue

@@ -91,6 +91,7 @@ import {mapActions,} from 'vuex'
 import XdBaseDynamicField from "@/components/XdBaseDynamicField.vue";
 import XdDialog from "@/components/XdDialog.vue";
 import mCompany from '@/constant/modules/mCompany'
+import { getSiteRouter } from "@/utils/xd.base";
 
 export default {
   name: "ModuleCompanyList",
@@ -125,8 +126,17 @@ export default {
     }
   },
   watch:{
-   'listValue.site_id'(){
-     this.initForm(this.listValue);
+   'listValue.site_id':{
+    handler(newVal,oldVal){
+    console.log(newVal,oldVal,'newVal,oldVal')
+      if(newVal&&newVal!==oldVal){
+        let params = this.$xdHelper.cloneDeep(this.listValue);
+        if(this.default_entry_page){
+          params.default_entry_page = this.default_entry_page
+        }
+        this.initForm(params);
+      }
+    }
    },
   },
   data () {
@@ -155,6 +165,7 @@ export default {
       //是否为编辑
       isEdit: false,
       isPc: false,
+      default_entry_page: null,
     }
   },
 
@@ -167,7 +178,8 @@ export default {
       'getSaasCompanyList',
       'getSaasSiteList',
       'updateSaasCompany',
-      'xAppSync'
+      'xAppSync',
+      'getEditxSiteLists',
     ]),
      ...mapActions({
       getAllPlatformCatelogs: 'mCompany/getAllMPlatformCatelogs',
@@ -190,8 +202,14 @@ export default {
       this.$refs['form'].submit()
         .then(res=>{
           let form = this.$xdHelper.cloneDeep(this.$refs['form'].getAllFormData());
+          let copyForm = this.$xdHelper.cloneDeep(form);
+          if(form.default_entry_page){
+            copyForm['default_entry_page'] = JSON.stringify(form.default_entry_page) 
+          }else{
+            delete copyForm['default_entry_page']
+          }
           let loading = Loading.service({});
-          this.updateSaasCompany({id:this.id,item:form})
+          this.updateSaasCompany({id:this.id,item:copyForm})
             .then(res=>{
               loading.close();
               this.clearDialog();
@@ -207,6 +225,7 @@ export default {
     },
 
     initForm (params = {}) {
+      console.log(params,'ppppp')
       this.listForm = [
         params.company_id && {
           label: "客户ID",
@@ -281,6 +300,49 @@ export default {
             { required: true, message: "请选择默认进入应用",trigger: ['change']}
           ]
         },
+        params.site_id && {
+          label: "默认进入页面:",
+          ele: "xd-select-site-path",
+          className: "input100",
+          valueKey: "default_entry_page",
+          value: params.default_entry_page || null,
+          placeholder: "请选择默认进入页面",
+          setting:{
+            site_id:params.site_id,
+            hiddenSite:true
+          },
+          handleCustom: ({ action, data }) => {
+            if (action === "siteList") {
+              this.getEditxSiteLists()
+                .then((res) => {
+                  data.cb(
+                    res.data.list.map((item) => {
+                      return {
+                        ...item,
+                        label: item["site_name"],
+                        value: item["site_id"],
+                      };
+                    })
+                  );
+                })
+                .catch((res) => {
+                  console.error(res);
+                  data.cb([]);
+                });
+            }
+            //获取应用列表
+            if (action === 'appList') {
+              if (data.params && data.params.value) {
+                getSiteRouter(this, data.cb, {site_id: data.params.value,isLimit: true});
+              } else {
+                data.cb([])
+              }
+            }
+          },
+          rules: [
+            { required: false, message: "请选择网站地址", trigger: "change" },
+          ],
+        },
         {
           label: '客户状态:',
           ele: 'xd-radio-status',
@@ -336,6 +398,12 @@ export default {
           company_status: row.company_status,
           index_path:row.index_path
         };
+        if(row.default_entry_page){
+          info.default_entry_page = JSON.parse(row.default_entry_page)
+          this.default_entry_page = info.default_entry_page
+        }else{
+          this.default_entry_page = null
+        }
         this.isEdit = !!row.site_id;
         this.initForm(info);
         this.dialog = true;

package/package.json

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