Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-ui-pc into dev

src/views/setting/template/create.vue

@@ -7,6 +7,9 @@
           <el-input v-model="addData.title" :readonly="readonly" placeholder="请输入模板名称" :maxlength="32" show-word-limit style="width: 500px;"/>
         </el-form-item>
         <br>
+      </el-form>
+
+      <el-form ref="addItem" :model="addData" label-width="120px">
         <el-form-item label="买家付费地区:" style="width: 75%">
           <el-table :data="shippingTemplateRuleList" border style="width: 100%">
             <el-table-column prop="shippingTemplateRuleAreaList" label="付费区域"  width="280%" @click="getList">
@@ -15,8 +18,8 @@
               </template>
             </el-table-column>
             <el-table-column prop="defaultNumber" label="首件（个）">
-              <template slot-scope="{row}">
-                <el-input v-model="row.defaultNumber" placeholder="请输入内容"></el-input>
+              <template slot-scope="{row,$index}">
+                  <el-input v-model="row.defaultNumber" placeholder="请输入内容"></el-input>
               </template>
             </el-table-column>
             <el-table-column prop="defaultPrice" label="运费（元）">
@@ -34,14 +37,19 @@
                 <el-input v-model="row.createPrice" placeholder="请输入内容"></el-input>
               </template>
             </el-table-column>
+            <el-table-column label="操作"  width="170%">
+              <template slot-scope="{row}">
+                <el-button  type="text" @click="delRow(row)">删除</el-button>
+              </template>
+            </el-table-column>
           </el-table>
           <el-col style="margin-top: 10px">
             <el-button type="primary" size="mini" @click="getListData">添加地区</el-button>
           </el-col>
         </el-form-item>
-        <br>
-        <br>
       </el-form>
+      <br>
+      <br>
       <el-form ref="form" :model="addData" label-width="120px">
         <el-form-item label="不发货地区:"   style="width: 75%">
           <el-table :data="shippingTemplateRuleList2" border style="width: 100%">
@@ -55,6 +63,11 @@
                 <el-input v-model="row.remark" placeholder="请输入内容"></el-input>
               </template>
             </el-table-column>
+            <el-table-column label="操作" width="170%">
+              <template slot-scope="{row}">
+                <el-button  type="text" @click="delRowTwo(row)">删除</el-button>
+              </template>
+            </el-table-column>
           </el-table>
           <el-col style="margin-top: 10px">
             <el-button type="primary" size="mini" @click="getListData2">添加地区</el-button>
@@ -80,6 +93,7 @@
 import RegionList from "./components/regionList";
 import { getTemplateList, addTemplateList, getTreeList, getTemplateDetail, setTemplateDetail} from "@/api/setting/template";
 import { accDiv, accMul } from '@/utils/util'
+import {addData} from "../../../api/system/dict/data";
 export default {
   components: {RegionList},
   data() {
@@ -130,7 +144,7 @@ export default {
       listPid:[],
 
       rules: {
-        title: [{ required: true, message: '请输入模板名称', trigger: 'blur' }]
+        title: [{ required: true, message: '请输入模板名称', trigger: 'blur' }],
       }
     };
   },
@@ -249,14 +263,19 @@ export default {
     },
 
     update() {
-      if(this.addData.title.trim() == ""){
-        this.$message.error('请输入模板名称');
-        return
-      }
+      this.$refs['addItem'].validate((valid) => {
+        if (valid) {
+        } else {
+          // this.$message.error('请输入模板名称');
+          return false;
+        }
+      });
+
       let arr = []
       if (this.shippingTemplateRuleList){
         this.shippingTemplateRuleList.map(item =>{
           let ressage = []
+
           if(item.shippingTemplateRuleAreaList != 1 && item.createNumber != '' && item.createPrice != '' && item.defaultNumber != '' && item.defaultPrice != ''){
               item.shippingTemplateRuleAreaList.map(res=>{
                 let city = ''
@@ -348,7 +367,22 @@ export default {
         })
       }
 
+    },
+    delRow(row){
+      for (let i = 0; i < this.shippingTemplateRuleList.length; i++) {
+        if(this.shippingTemplateRuleList[i] == row){
+          this.shippingTemplateRuleList.splice(i,1)
+        }
+      }
+    },
+    delRowTwo(row){
+      for (let i = 0; i < this.shippingTemplateRuleList2.length; i++) {
+        if(this.shippingTemplateRuleList2[i] == row){
+          this.shippingTemplateRuleList2.splice(i,1)
+        }
+      }
     }
+
   },
 };
 </script>