运费优化

src/views/freight/freight-config.vue

@@ -526,6 +526,7 @@ export default {
 
       if(row.conditionType == 2){
         vm.goodCondition = {
+          id:row.id,
           goodIds:row.goodIds,
           conditionType:row.conditionType,
           number:row.number/100,
@@ -536,6 +537,7 @@ export default {
       }
       else {
         vm.goodCondition = {
+          id:row.id,
           goodIds:row.goodIds,
           conditionType:row.conditionType,
           number:row.number,
@@ -569,7 +571,8 @@ export default {
 
             if(res.data.goodConditionDtoList[i].goodExpressConditionConfig.conditionType == 2){
               this.resultForm.goodConditionReqList.push(
-                {goodIds:res.data.goodConditionDtoList[i].goodIds,
+                 {id:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id,
+                  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,
@@ -579,7 +582,8 @@ export default {
             }
             else {
               this.resultForm.goodConditionReqList.push(
-                {goodIds:res.data.goodConditionDtoList[i].goodIds,
+                 {id:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id,
+                  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,
@@ -676,13 +680,18 @@ export default {
           //   return item.goodIds == vm.goodCondition.goodIds;
           // });
           for(let i=0; i < vm.resultForm.goodConditionReqList.length; i++){
-            if(vm.getIdArray(vm.resultForm.goodConditionReqList[i].goodIds) == vm.getIdArray(vm.goodCondition.goodIds)){
+            if((vm.goodCondition.id != ""
+              && vm.resultForm.goodConditionReqList[i].id == vm.goodCondition.id)
+            || (vm.goodCondition.id == "" && vm.getIdArray(vm.resultForm.goodConditionReqList[i].goodIds) == vm.getIdArray(vm.goodCondition.goodIds))){
               vm.resultForm.goodConditionReqList[i].conditionType = vm.goodCondition.conditionType;
 
               if(vm.goodCondition.conditionType == 2){
                 vm.resultForm.goodConditionReqList[i].number = vm.goodCondition.number * 100;
                 vm.resultForm.goodConditionReqList[i].numberText = vm.goodCondition.number;
               }
+              else{
+                vm.resultForm.goodConditionReqList[i].number = vm.goodCondition.number;
+              }
               vm.resultForm.goodConditionReqList[i].intro = vm.goodCondition.intro;
               vm.resultForm.goodConditionReqList[i].introId = vm.goodCondition.introId;
               addFlag = false;