运费板块续件与续费调整

src/views/setting/template/create.vue

@@ -34,7 +34,7 @@
                   </el-form-item>
                 </td>
                 <td>
-                  <el-form-item :prop="`shippingTemplateRuleList.${index}.defaultNumber`" :rules='[{ required: true, message: "件数不能为空", trigger: "blur" },{ pattern: /^([1-9]\d*)$/, message: "请输入正确的件数", trigger: ["blur", "change"]}]' label-width="0">
+                  <el-form-item :prop="`shippingTemplateRuleList.${index}.defaultNumber`" :rules='[{ required: true, message: "首件不能为空", trigger: "blur" },{ pattern: /^([1-9]\d*)$/, message: "请输入正确的件数", trigger: ["blur", "change"]}]' label-width="0">
                     <el-input v-model="item.defaultNumber" placeholder="请输入内容"></el-input>
                   </el-form-item>
                 </td>
@@ -44,12 +44,12 @@
                   </el-form-item>
                 </td>
                 <td>
-                  <el-form-item :prop="`shippingTemplateRuleList.${index}.createNumber`" :rules='[{ required: true, message: "件数不能为空", trigger: "blur" },{ pattern: /^([0-9]\d*)$/, message: "请输入正确的件数", trigger: ["blur", "change"]}]' label-width="0">
+                  <el-form-item :prop="`shippingTemplateRuleList.${index}.createNumber`" :rules='[{ pattern: /^([0-9]\d*)$/, message: "请输入正确的件数", trigger: ["blur", "change"]}]' label-width="0">
                     <el-input v-model="item.createNumber" placeholder="请输入内容"></el-input>
                   </el-form-item>
                 </td>
                 <td>
-                  <el-form-item :prop="`shippingTemplateRuleList.${index}.createPrice`" :rules="[{ required: true, message: '运费不能为空', trigger: 'blur' },{ pattern: /^([0-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: '请输入正确的金额，最多两位小数', trigger: ['blur', 'change'] }]" label-width="0">
+                  <el-form-item :prop="`shippingTemplateRuleList.${index}.createPrice`" :rules="[{ pattern: /^([0-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: '请输入正确的金额，最多两位小数', trigger: ['blur', 'change'] }]" label-width="0">
                     <el-input v-model="item.createPrice" placeholder="请输入内容"></el-input>
                   </el-form-item>
                 </td>
@@ -218,7 +218,7 @@ export default {
     //付费地区
     getListData(){
       let data = this.shippingTemplateRuleList[this.shippingTemplateRuleList.length-1] || {}
-      if(data.shippingTemplateRuleAreaList == 1 ||data.createNumber == '' || data.createPrice == '' || data.defaultNumber == '' || data.defaultPrice == ''){
+      if(data.shippingTemplateRuleAreaList == 1 || data.shippingTemplateRuleAreaList.length == 0 || data.defaultNumber == '' || data.defaultPrice == ''){
         this.$message({
           showClose: true,
           message: '请输入完整后再添加',
@@ -326,7 +326,7 @@ export default {
       if (this.shippingTemplateRuleList){
         for (let i = 0; i < this.shippingTemplateRuleList.length; i++) {
           let item = this.shippingTemplateRuleList[i]
-          if(item.shippingTemplateRuleAreaList == 1 || item.createNumber == '' || item.createPrice == '' || item.defaultNumber == '' || item.defaultPrice == ''){
+          if(item.shippingTemplateRuleAreaList == 1 || item.shippingTemplateRuleAreaList.length == 0 || item.defaultNumber == '' || item.defaultPrice == ''){
             this.$message({
               showClose: true,
               message: '请输入完整后再保存',
@@ -335,7 +335,24 @@ export default {
             return
           }
         }
-        this.shippingTemplateRuleList.map(item =>{
+      }
+      //判断不发货区域
+      if(this.shippingTemplateRuleList2){
+        for (let i = 0; i < this.shippingTemplateRuleList2.length; i++) {
+          let item = this.shippingTemplateRuleList2[i]
+          if(item.shippingTemplateRuleAreaList == 1 || item.shippingTemplateRuleAreaList.length == 0 || item.remark == ''){
+            this.$message({
+              showClose: true,
+              message: '请输入完整后再保存',
+              type: 'warning'
+            });
+            return
+          }
+        }
+      }
+
+      let shippingTemplateRuleList = [...this.shippingTemplateRuleList,...this.shippingTemplateRuleList2]
+      shippingTemplateRuleList.map(item =>{
           let ressage = []
           item.shippingTemplateRuleAreaList.map(res=>{
             let city = ''
@@ -361,49 +378,8 @@ export default {
           })
           item.shippingTemplateRuleAreaList = ressage
           arr.push(item)
-        })
-      }
-      //判断不发货区域
-      if(this.shippingTemplateRuleList2){
-        for (let i = 0; i < this.shippingTemplateRuleList2.length; i++) {
-          let item = this.shippingTemplateRuleList2[i]
-          if(item.shippingTemplateRuleAreaList == 1 || item.remark == ''){
-            this.$message({
-              showClose: true,
-              message: '请输入完整后再保存',
-              type: 'warning'
-            });
-            return
-          }
-        }
-        this.shippingTemplateRuleList2.map(item =>{
-          let ressage = []
-            item.shippingTemplateRuleAreaList.map(res=>{
-              let city = ''
-              let province = ''
-              for (let i = 0; i < this.listPidProvince.length; i++) {
-                if(this.listPidProvince[i].areaId == res[0]){
-                  city =  this.listPidProvince[i].areaName
-                  let cityList =  this.listPidProvince[i].cityList
-                  for (let j = 0; j < cityList.length ; j++) {
-                    if(cityList[j].areaId == res[1]){
-                      province = cityList[j].areaName
-                    }
-                  }
-                }
-              }
-              res = {
-                provinceId:res[0],
-                cityId:res[1],
-                city:city,
-                province:province,
-              }
-              ressage = res
-            })
-            item.shippingTemplateRuleAreaList = ressage
-            arr.push(item)
-        })
-      }
+      })
+
       for (let i = 0; i < arr.length; i++) {
         if(arr[i].type == 1){
           arr[i].createPrice = accMul(arr[i].createPrice,100)
@@ -411,6 +387,7 @@ export default {
         }
       }
       this.addData.shippingTemplateRuleList = arr
+
       this.submitForm()
     },