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

疯狂的狮子li

2020-02-24 6687efd887672a80db996d186922868888c67139

 ruoyi/src/main/resources/vm/vue/index.vue.vm

@@ -22,7 +22,7 @@
        />
      </el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
        <el-form-item label="${comment}" prop="${column.javaField}">
      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
          <el-option
            v-for="dict in ${column.javaField}Options"
@@ -33,7 +33,7 @@
        </el-select>
      </el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
        <el-form-item label="${comment}" prop="${column.javaField}">
      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
          <el-option label="请选择字典生成" value="" />
        </el-select>
@@ -230,6 +230,7 @@
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";

export default {
  name: "${BusinessName}",
  data() {
    return {
      // 遮罩层
@@ -288,6 +289,7 @@
        $column.javaField: [
          { required: true, message: "$comment不能为空", trigger: "blur" }
        ]#if($velocityCount != $columns.size()),#end

#end
#end
      }