短信功能调整

src/views/system/sms/smsNode.vue

@@ -82,7 +82,7 @@
       </el-table-column>
       <el-table-column label="国家" align="center" prop="countryId">
         <template slot-scope="scope">
-          {{ scope.row.countryId!=null?countryMap.get(scope.row.countryId)!=null?countryMap.get(scope.row.countryId).nameZh:'':'' }}
+          {{ scope.row.countryId | guojia(countryMap) }}
         </template>
       </el-table-column>
 
@@ -153,7 +153,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-form-item label="节点" prop="nodeValue">
-          <el-select v-model="form.nodeValue" placeholder="请选择节点类型">
+          <el-select v-model="form.nodeValue" placeholder="请选择节点类型" @change="handleChangeNode">
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_SMS_NODE_NODE)"
                        :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
@@ -166,8 +166,8 @@
             <el-option key="0" label="其他" :value="parseInt(0)" />
           </el-select>
         </el-form-item>
-        <el-form-item label="国家" prop="tel">
-          <el-select filterable clearable multiple v-model="form.countryIds" :placeholder="$t('请选择国家')" @change="handleChangeCountry">
+        <el-form-item label="国家" prop="countryIds">
+          <el-select filterable clearable multiple v-model="form.countryIds" :placeholder="$t('请选择国家')">
             <el-option key="0" label="全部" :value="parseInt(0)" />
             <el-option key="-1" label="其他" :value="parseInt(-1)" />
             <el-option v-for="dict in countryList"
@@ -197,25 +197,25 @@
         </el-form-item>
         <el-form-item label="模板1" prop="templateIdOne">
           <el-select filterable clearable v-model="form.templateIdOne" placeholder="请选择模板1">
-            <el-option v-for="dict in smsTemplateList"
+            <el-option v-for="dict in smsTemplateList2"
                         :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="模板2" prop="templateIdTwo">
           <el-select filterable clearable v-model="form.templateIdTwo" placeholder="请选择模板2">
-            <el-option v-for="dict in smsTemplateList"
+            <el-option v-for="dict in smsTemplateList2"
                         :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="模板3" prop="templateIdThree">
           <el-select filterable clearable v-model="form.templateIdThree" placeholder="请选择模板3">
-            <el-option v-for="dict in smsTemplateList"
+            <el-option v-for="dict in smsTemplateList2"
                         :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="模板4" prop="templateIdFour">
           <el-select filterable clearable v-model="form.templateIdFour" placeholder="请选择模板4">
-            <el-option v-for="dict in smsTemplateList"
+            <el-option v-for="dict in smsTemplateList2"
                         :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
@@ -354,6 +354,7 @@ export default {
       dateRangeCreateTime: [],
       countryList: [],
       smsTemplateList: [],
+      smsTemplateList2: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -380,8 +381,7 @@ export default {
       rules: {
         nodeValue: [{ required: true, message: "节点不能为空", trigger: "blur" }],
         transportId: [{ required: true, message: "运输方式不能为空", trigger: "blur" }],
-        countryCodes: [{ required: true, message: "国家区号不能为空", trigger: "change" }],
-        countryCode: [{ required: true, message: "国家区号不能为空", trigger: "blur" }],
+        countryIds: [{ required: true, message: "国家不能为空", trigger: "blur" }],
         status: [{ required: true, message: "启用状态不能为空", trigger: "change" }],
         templateIdOne: [{ required: true, message: "模板1不能为空", trigger: "change" }],
         isTransport: [{ required: true, message: "是否匹配运输方式不能为空", trigger: "change" }],
@@ -424,6 +424,21 @@ export default {
       this.channelOptions = response.data;
     })
   },
+  filters: {
+    guojia: function(value,countryMap) {
+      if(!value) return ''
+      var lists = value.split(',')
+      var text = ""
+      for(var i=0;i<lists.length;i++) {
+        if(text.length ==0) {
+          text = countryMap.get(lists[i]*1)!=undefined?countryMap.get(lists[i]*1).nameZh:''
+        } else {
+          text = text + "," + countryMap.get(lists[i]*1)!=undefined?countryMap.get(lists[i]*1).nameZh:''
+        }
+      }
+      return text
+    }
+  },
   methods: {
     /** 查询列表 */
     getList() {
@@ -544,13 +559,9 @@ export default {
           this.exportLoading = false;
         }).catch(() => {});
     },
-    // 切换国家
-    handleChangeCountry(val) {
-      // if(val==0||val==-1) {
-      //   this.form.countryCode = val
-      // } else {
-      //   this.form.countryCode = this.countryList.filter(a => a.id == val)[0].tel
-      // }
+    // 切换节点
+    handleChangeNode(val) {
+      this.smsTemplateList2 = this.smsTemplateList.filter(a=>a.nodeValue == val)
     },
     test(row) {
       this.sendSmsForm = {