页面修改

src/components/pintuan/pintuanActive.vue

@@ -396,12 +396,10 @@
               </groupStep>
             </el-tab-pane>
             <el-tab-pane label="分销价设置">
-              <distributePrice v-if="TempSpecList&&TempSpecList.length>0" :addMsg="addMsg" :SpecList="TempSpecList"
-                :SpecificationPriceList="TempGroupPriceList" @getDisCommission="getDisCommission"></distributePrice>
+              <distributePrice v-if="addMsg.SpecificationList&&addMsg.SpecificationList.length>0" :addMsg="addMsg"></distributePrice>
             </el-tab-pane>
             <el-tab-pane label="会员价设置">
-              <memberPrice v-if="TempSpecList&&TempSpecList.length>0" :addMsg="addMsg" :SpecList="TempSpecList"
-                :SpecificationPriceList="TempGroupPriceList" @getMemberList="getMemberList"></memberPrice>
+              <memberPrice v-if="addMsg.SpecificationList&&addMsg.SpecificationList.length>0" :addMsg="addMsg"></memberPrice>
             </el-tab-pane>
           </el-tabs>
         </el-row>

src/components/pintuan/pintuanPlugin/distributePrice.vue

@@ -25,7 +25,7 @@
       <!--普通设置-->
       <el-form-item v-if="addMsg.SeparateDistributionType==1">
         <div class="pintuan-share">
-          <el-card v-for="(item,index) in DistributioncommissionList" :key="index" style="margin-bottom:20px;">
+          <el-card v-for="(item,index) in addMsg.GroupList" :key="index" style="margin-bottom:20px;">
             <div slot="header" class="clearfix">
               <div class="box">
                 <div style="display:inline-block;">
@@ -46,7 +46,8 @@
                 <el-button size="small" type="primary" @click="setInfo(item,index)">设置</el-button>
               </div>
               <el-table :ref="'multipleTable'+index" :data="item.DistributioncommissionList" tooltip-effect="dark"
-                style="width: 100%;border:1px solid #E8EAEE" @selection-change="(selections)=>{handleSelectionChange(selections,index,item)}">
+                style="width: 100%;border:1px solid #E8EAEE"
+                @selection-change="(selections)=>{handleSelectionChange(selections,index,item)}">
                 <el-table-column type="selection" width="55">
                 </el-table-column>
                 <el-table-column width="100" label="等级名称">
@@ -93,8 +94,7 @@
       <!--详细设置-->
       <el-form-item v-else>
         <div class="pintuan-share">
-          <el-card v-for="(rootItem,rootIndex) in DistributioncommissionList" :key="rootIndex+500"
-            style="margin-bottom:20px;">
+          <el-card v-for="(rootItem,rootIndex) in addMsg.GroupList" :key="rootIndex+500" style="margin-bottom:20px;">
             <div slot="header" class="clearfix">
               <div class="box">
                 <div style="display:inline-block;">
@@ -114,11 +114,12 @@
                 </el-input>
                 <el-button size="small" type="primary" @click="setInfo(rootItem,rootIndex)">设置</el-button>
               </div>
-              <el-table ref="multipleTable" :data="rootItem.DistributioncommissionList" tooltip-effect="dark"
-                style="width: 100%;border:1px solid #E8EAEE" @selection-change="(selections)=>{handleSelectionChange(selections,rootIndex,rootItem)}">
+              <el-table ref="multipleTable" :data="rootItem.DistributionCommissionTreeList" tooltip-effect="dark"
+                style="width: 100%;border:1px solid #E8EAEE"
+                @selection-change="(selections)=>{handleSelectionChange(selections,rootIndex,rootItem)}">
                 <el-table-column type="selection" width="55">
                 </el-table-column>
-                <template v-for="(specItem, specIndex) in SpecList">
+                <template v-for="(specItem, specIndex) in addMsg.SpecificationList">
                   <el-table-column :key="specIndex+'13'" :label="specItem.Name" width="100">
                     <template slot-scope="scope">
                       <span v-if="specIndex == specValueIndex"
@@ -172,7 +173,7 @@
 </template>
 <script>
   export default {
-    props: ["SpecificationPriceList", "addMsg", "SpecList"],
+    props: ["addMsg"],
     data() {
       return {
         fxVal: '',
@@ -189,87 +190,25 @@
 
         //多选数组
         selectList: [],
-        CommonIndex:-1, //选中index
+        CommonIndex: -1, //选中index
       };
     },
-    watch: {
-      'SpecificationPriceList': {
-        immediate: true,
-        handler: function (val, oldval) {
-          console.log("val", this.SpecificationPriceList);
-          if (val != oldval) {
-            this.DistributioncommissionList = [];
-            if (this.SpecificationPriceList && this.SpecificationPriceList.length > 0) {
-              if (this.SpecificationPriceList[0].DistributioncommissionList && this.SpecificationPriceList[0]
-                .DistributioncommissionList.length > 0) {
-                this.SpecificationPriceList.forEach(item => {
-                  var obj = {
-                    People_Num: item.People_Num,
-                    DistributioncommissionList: item.DistributioncommissionList,
-                    Leavel: '', //层级
-                    Number: 0, //设置->金额/百分比
-                    selectList:[], //选中数组
-                  };
-                  this.DistributioncommissionList.push(obj);
-                })
-                this.$forceUpdate();
-              } else if (this.SpecificationPriceList[0].DistributionCommissionTreeList && this.SpecificationPriceList[
-                  0].DistributionCommissionTreeList.length > 0) {
-                this.SpecificationPriceList.forEach(item => {
-                  var obj = {
-                    People_Num: item.People_Num,
-                    DistributioncommissionList: item.DistributionCommissionTreeList,
-                    Leavel: '', //层级
-                    Number: 0, //设置->金额/百分比
-                    selectList:[], //选中数组
-                  };
-                  this.DistributioncommissionList.push(obj);
-                  console.log(this.DistributioncommissionList, 'this.DistributioncommissionList');
-                })
-                this.$forceUpdate();
-              } else {
-                this.checkedChange();
-              }
-            } else {
-              this.checkedChange();
-            }
-          }
-        }
-      },
-      "DistributioncommissionList": {
-        handler: function (val, oldval) {
-          this.$emit('getDisCommission', this.DistributioncommissionList);
-        },
-        deep: true
-      },
-    },
-    created() {
 
-    },
+
     methods: {
       //切换显示
       checkedChange() {
-        this.DistributioncommissionList = [];
+
         //普通设置
         if (this.addMsg.SeparateDistributionType == 1) {
-          this.SpecificationPriceList.forEach(item => {
-            var obj = {
-              People_Num: item.People_Num,
-              DistributioncommissionList: JSON.parse(JSON.stringify(this.tempGeneralArray)),
-            };
-            this.DistributioncommissionList.push(obj);
+          this.addMsg.GroupList.forEach(item => {
+            item.DistributioncommissionList = JSON.parse(JSON.stringify(this.tempGeneralArray))
           });
         }
         //详细设置
         else if (this.addMsg.SeparateDistributionType == 2) {
-          this.SpecificationPriceList.forEach(item => {
-            var obj = {
-              People_Num: item.People_Num,
-              DistributioncommissionList: [],
-              Leavel: '', //层级
-              Number: 0, //设置->金额/百分比
-              selectList:[], //选中数组
-            }
+          this.addMsg.GroupList.forEach(item => {
+            item.DistributionCommissionTreeList=[];
             item.StepPriceList.forEach(subItem => {
               var tempObj = JSON.parse(JSON.stringify(subItem));
               var commissionObj = {
@@ -288,18 +227,15 @@
                 }
                 commissionObj.GradeCommissionList.push(tempObj);
               });
-              obj.DistributioncommissionList.push(commissionObj);
+              item.DistributionCommissionTreeList.push(commissionObj);
             });
-            this.DistributioncommissionList.push(obj);
           })
         }
       },
-      handleSelectionChange(val,index,item) {
-        console.log(val,'val');
-        console.log(index,'index');
-        console.log(item,'item');
+      handleSelectionChange(val, index, item) {
+
         this.selectList = val;
-        item.selectList=val;
+        item.selectList = val;
       },
       //获取分销层级
       getDistributor() {
@@ -359,22 +295,22 @@
             this.Error('请选择分销层级');
             return;
           }
-          item.DistributioncommissionList.forEach(x=>{
-            item.selectList.forEach(y=>{
-              if(x.DistributorGrade==y.DistributorGrade){
-                if(item.Leavel==1){
-                  x.OneCommission=item.Number
+          item.DistributioncommissionList.forEach(x => {
+            item.selectList.forEach(y => {
+              if (x.DistributorGrade == y.DistributorGrade) {
+                if (item.Leavel == 1) {
+                  x.OneCommission = item.Number
                 }
-                if(item.Leavel==2){
-                  x.TwoCommission=item.Number
+                if (item.Leavel == 2) {
+                  x.TwoCommission = item.Number
                 }
-                if(item.Leavel==3){
-                  x.ThreeCommission=item.Number
+                if (item.Leavel == 3) {
+                  x.ThreeCommission = item.Number
                 }
               }
             })
           })
-         } else {
+        } else {
           if (!item.selectList || item.selectList.length === 0) {
             this.Error('请勾选商品规格');
             return;
@@ -402,7 +338,7 @@
               });
             });
           });
-         }
+        }
       }
     },
     mounted() {