Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-01 adb31b71f8c3490b923c8cb6f12b74be6ca3a02d

 ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -105,8 +105,12 @@
          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
#elseif($column.list && "" != $column.dictType)
      <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" />
#elseif($column.list && $column.dictType && "" != $column.dictType)
      <el-table-column label="${comment}" align="center" prop="${javaField}">
        <template slot-scope="scope">
          <dict-tag :options="${javaField}Options" :value="scope.row.${javaField}"/>
        </template>
      </el-table-column>
#elseif($column.list && "" != $javaField)
#if(${foreach.index} == 1)
      <el-table-column label="${comment}" prop="${javaField}" />
@@ -253,7 +257,7 @@
</template>

<script>
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";

@@ -285,7 +289,7 @@
#else
#set($comment=$column.columnComment)
#end
#if(${column.dictType} != '')
#if(${column.dictType} && ${column.dictType} != '')
      // $comment字典
      ${column.javaField}Options: [],
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
@@ -327,7 +331,7 @@
  created() {
    this.getList();
#foreach ($column in $columns)
#if(${column.dictType} != '')
#if(${column.dictType} && ${column.dictType} != '')
    this.getDicts("${column.dictType}").then(response => {
      this.${column.javaField}Options = response.data;
    });
@@ -378,20 +382,6 @@
        this.${businessName}Options.push(data);
      });
    },
#foreach ($column in $columns)
#if(${column.dictType} != '')
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
#else
#set($comment=$column.columnComment)
#end
    // $comment字典翻译
    ${column.javaField}Format(row, column) {
      return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});
    },
#end
#end
    // 取消按钮
    cancel() {
      this.open = false;
@@ -505,7 +495,9 @@
        this.loading = false;
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(() => {});
      }).finally(() => {
              this.loading = false;
      });
    }
  }
};