短信节点新增备注、目的仓搜索条件

src/views/system/sms/smsNode.vue

@@ -42,6 +42,15 @@
           <el-option key="1" label="是" :value="parseInt(1)" />
         </el-select>
       </el-form-item>
+      <el-form-item label="目的仓" prop="extra">
+        <el-cascader
+          :options="regionTreeList2"
+          collapse-tags
+          v-model="queryParams.extra2"
+          :props="cascaderProps"
+          clearable>
+        </el-cascader>
+      </el-form-item>
       <el-form-item :label="$t('创建时间')">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -104,30 +113,41 @@
       </el-table-column>
       <el-table-column label="模板1" align="center" prop="templateIdOne">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="look(smsTemplateMap.get(scope.row.templateIdOne))">
+          <el-link type="primary" @click="look(smsTemplateMap.get(scope.row.templateIdOne))">
             {{ scope.row.templateIdOne!=null?smsTemplateMap.get(scope.row.templateIdOne)!=null?smsTemplateMap.get(scope.row.templateIdOne).name:'':'' }}
-          </el-button>
+          </el-link>
         </template>
       </el-table-column>
       <el-table-column label="模板2" align="center" prop="templateIdTwo">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="look(smsTemplateMap.get(scope.row.templateIdTwo))">
+          <el-link type="primary" @click="look(smsTemplateMap.get(scope.row.templateIdTwo))">
             {{ scope.row.templateIdTwo!=null?smsTemplateMap.get(scope.row.templateIdTwo)!=null?smsTemplateMap.get(scope.row.templateIdTwo).name:'':'' }}
-          </el-button>
+          </el-link>
         </template>
       </el-table-column>
       <el-table-column label="模板3" align="center" prop="templateIdThree">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="look(smsTemplateMap.get(scope.row.templateIdThree))">
+          <el-link type="primary" @click="look(smsTemplateMap.get(scope.row.templateIdThree))">
             {{ scope.row.templateIdThree!=null?smsTemplateMap.get(scope.row.templateIdThree)!=null?smsTemplateMap.get(scope.row.templateIdThree).name:'':'' }}
-          </el-button>
+          </el-link>
         </template>
       </el-table-column>
       <el-table-column label="模板4" align="center" prop="templateIdFour">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="look(smsTemplateMap.get(scope.row.templateIdFour))">
+          <el-link type="primary" @click="look(smsTemplateMap.get(scope.row.templateIdFour))">
             {{ scope.row.templateIdFour!=null?smsTemplateMap.get(scope.row.templateIdFour)!=null?smsTemplateMap.get(scope.row.templateIdFour).name:'':'' }}
-          </el-button>
+          </el-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="目的仓" align="center"  width="200">
+        <template slot-scope="scope" v-if="scope.row.extra!=null">
+          <el-cascader
+            style="width: 180px"
+            :options="regionTreeList2"
+            collapse-tags
+            v-model="JSON.parse(scope.row.extra).receiveAddrList"
+            :props="cascaderProps">
+          </el-cascader>
         </template>
       </el-table-column>
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
@@ -135,6 +155,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('备注')" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="test(scope.row)">测试</el-button>
@@ -236,6 +257,9 @@
                         :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('备注')" prop="remark">
+          <el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -398,7 +422,8 @@ export default {
         templateIdThree: null,
         templateIdFour: null,
         isTransport: null,
-        isOrders: null
+        isOrders: null,
+        extra2: []
       },
       // 表单参数
       form: {},
@@ -430,6 +455,7 @@ export default {
       node: {},
       cascaderState: true,
       regionTreeList: [],
+      regionTreeList2: [],
       lastSelectedList: [], //上一次选中数据
       oneDimensionalList: [],
     };
@@ -458,6 +484,26 @@ export default {
     })
     getRegionTreeList().then((res) => {
       this.regionTreeList = res.data
+      this.regionTreeList2 = JSON.parse(JSON.stringify(res.data))
+      this.regionTreeList2.unshift({
+        id: 0,
+        labelZh: "全选",
+        labelEn: "select ALL",
+        children: [
+          {
+            id: 0,
+            labelZh: "全选",
+            labelEn: "select ALL",
+            children: [
+              {
+                id: 0,
+                labelZh: "全选",
+                labelEn: "select ALL"
+              }
+            ]
+          }
+        ]
+      })
       this.regionTreeList.unshift({
         id: "000",
         labelZh: "全选",
@@ -604,6 +650,8 @@ export default {
       // 处理查询参数
       let params = {...this.queryParams};
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      console.log(this.queryParams)
+      params['extra'] = JSON.stringify(this.queryParams.extra2)
       // 执行查询
       getSmsNodePage(params).then(response => {
         this.list = response.data.list;
@@ -633,7 +681,8 @@ export default {
         isTransport: undefined,
         isOrders: undefined,
         receiveAddrList: [],
-        extra: undefined
+        extra: undefined,
+        remark: undefined
       };
       this.resetForm("form");
     },