运费配置

src/views/freight/freight-config.vue

@@ -136,7 +136,7 @@
               满{{scope.row.number}}件包邮
             </div>
             <div v-if="scope.row.conditionType == 2">
-              满{{scope.row.number}}元包邮
+              满{{scope.row.numberText}}元包邮
             </div>
           </template>
         </el-table-column>
@@ -304,6 +304,7 @@ export default {
         intro:'',
         goodIdList:''
       },
+      goodIdsArray:[],
       nameList:[],
       resultForm:{
         goodConditionReqList:[],
@@ -475,7 +476,7 @@ export default {
     // 查看商品详情
     viewGoods(row){
       // url = `/create-good?id=${row.goodsId}&storeId=${this.searchForm.storeId}&goodsType=${goodsType}&commissionFlag=${this.commissionFlag}`
-      let url = `/create-good?id=${row.goodsId}&storeId=5344&goodsType=5&commissionFlag=1`
+      let url = `/create-good?id=${row}&storeId=${this.storeId}&goodsType=5&commissionFlag=1`
     // this.$store.dispatch('goodsManage/changeGoodsInfo', {...row});
     this.$router.push({
       path: url
@@ -534,13 +535,28 @@ export default {
 
         if(res.data.goodConditionDtoList){
           for (let i=0;i < res.data.goodConditionDtoList.length; i++){
-            this.resultForm.goodConditionReqList.push(
-              {goodIds:res.data.goodConditionDtoList[i].goodIds,
-              conditionType:res.data.goodConditionDtoList[i].goodExpressConditionConfig.conditionType,
-                number:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number,
-                intro:res.data.goodConditionDtoList[i].goodExpressConditionConfig.intro,
-                introId:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id
-              });
+
+            if(res.data.goodConditionDtoList[i].goodExpressConditionConfig.conditionType == 2){
+              this.resultForm.goodConditionReqList.push(
+                {goodIds:res.data.goodConditionDtoList[i].goodIds,
+                  conditionType:res.data.goodConditionDtoList[i].goodExpressConditionConfig.conditionType,
+                  number:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number,
+                  numberText:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number/100,
+                  intro:res.data.goodConditionDtoList[i].goodExpressConditionConfig.intro,
+                  introId:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id
+                });
+            }
+            else {
+              this.resultForm.goodConditionReqList.push(
+                {goodIds:res.data.goodConditionDtoList[i].goodIds,
+                  conditionType:res.data.goodConditionDtoList[i].goodExpressConditionConfig.conditionType,
+                  number:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number,
+                  numberText:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number,
+                  intro:res.data.goodConditionDtoList[i].goodExpressConditionConfig.intro,
+                  introId:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id
+                });
+            }
+
           }
         }
         // this.tableData = res.data.goodConditionDtoList;
@@ -625,7 +641,9 @@ export default {
         for(let i=0; i < vm.expertData.length; i++){
           if (val == vm.expertData[i].goodsId) {
             let item = vm.expertData[i];
-            vm.goodCondition.goodIdList = val;
+            vm.goodIdsArray = vm.goodCondition.goodIds;
+            vm.goodIdsArray.push(val);
+            vm.goodCondition.goodIdList = this.getIdArray(vm.goodIdsArray);
             break;
             // vm.model.userName = item.name;
             // vm.model.mobile = item.mobilePhone;
@@ -660,7 +678,11 @@ export default {
           for(let i=0; i < vm.resultForm.goodConditionReqList.length; i++){
             if(vm.getIdArray(vm.resultForm.goodConditionReqList[i].goodIds) == vm.goodCondition.goodIds){
               vm.resultForm.goodConditionReqList[i].conditionType = vm.goodCondition.conditionType;
-              vm.resultForm.goodConditionReqList[i].number = vm.goodCondition.number;
+
+              if(vm.goodCondition.conditionType == 2){
+                vm.resultForm.goodConditionReqList[i].number = vm.goodCondition.number * 100;
+                vm.resultForm.goodConditionReqList[i].numberText = vm.goodCondition.number;
+              }
               vm.resultForm.goodConditionReqList[i].intro = vm.goodCondition.intro;
               vm.resultForm.goodConditionReqList[i].introId = vm.goodCondition.introId;
               addFlag = false;
@@ -684,13 +706,28 @@ export default {
     },
 
     addGoodConditionReqList(){
-      vm.resultForm.goodConditionReqList.push({
-        goodIds:vm.goodCondition.goodIds,
-        conditionType:vm.goodCondition.conditionType,
-        number:vm.goodCondition.number,
-        intro:vm.goodCondition.intro,
-        introId:vm.goodCondition.introId
-      })
+
+      if(vm.goodCondition.conditionType == 2){
+        vm.resultForm.goodConditionReqList.push({
+          goodIds:vm.goodCondition.goodIds,
+          conditionType:vm.goodCondition.conditionType,
+          number:vm.goodCondition.number * 100,
+          numberText:vm.goodCondition.number,
+          intro:vm.goodCondition.intro,
+          introId:vm.goodCondition.introId
+        });
+      }
+      else {
+        vm.resultForm.goodConditionReqList.push({
+          goodIds:vm.goodCondition.goodIds,
+          conditionType:vm.goodCondition.conditionType,
+          number:vm.goodCondition.number,
+          numberText:vm.goodCondition.number,
+          intro:vm.goodCondition.intro,
+          introId:vm.goodCondition.introId
+        });
+      }
+
     }
 
   },