expert_management.git

RuoYi

2020-12-25 a9c6ba12e6f96fe316927324f2a038b61bc3a2bc

代码生成日期控件区分范围

已修改3个文件

	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/utils/ruoyi.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -38,14 +38,27 @@
          <el-option label="请选择字典生成" value="" />

        </el-select>

      </el-form-item>

#elseif($column.htmlType == "datetime")

#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")

      <el-form-item label="${comment}" prop="${column.javaField}">

        <el-date-picker clearable size="small" style="width: 200px"

        <el-date-picker clearable size="small"

          v-model="queryParams.${column.javaField}"

          type="date"

          value-format="yyyy-MM-dd"

          placeholder="选择${comment}">

        </el-date-picker>

      </el-form-item>

#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

      <el-form-item label="${comment}">

        <el-date-picker

          v-model="daterange${AttrName}"

          size="small"

          style="width: 240px"

          value-format="yyyy-MM-dd"

          type="daterange"

          range-separator="-"

          start-placeholder="开始日期"

          end-placeholder="结束日期"

        ></el-date-picker>

      </el-form-item>

#end

#end

@@ -201,7 +214,7 @@
        </el-form-item>

#elseif($column.htmlType == "datetime")

        <el-form-item label="${comment}" prop="${field}">

          <el-date-picker clearable size="small" style="width: 200px"

          <el-date-picker clearable size="small"

            v-model="form.${field}"

            type="date"

            value-format="yyyy-MM-dd"

@@ -283,6 +296,10 @@
#if(${column.dictType} != '')

      // $comment字典

      ${column.javaField}Options: [],

#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})

      // $comment时间范围

      daterange${AttrName}: [],

#end

#end

      // 查询参数

@@ -329,6 +346,21 @@
    /** 查询${functionName}列表 */

    getList() {

      this.loading = true;

#foreach ($column in $columns)

#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

      this.queryParams.params = {};

#break

#end

#end

#foreach ($column in $columns)

#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})

      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {

        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];

        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];

      }

#end

#end

      list${BusinessName}(this.queryParams).then(response => {

        this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");

        this.loading = false;

@@ -397,6 +429,12 @@
    },

    /** 重置按钮操作 */

    resetQuery() {

#foreach ($column in $columns)

#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})

      this.daterange${AttrName} = [];

#end

#end

      this.resetForm("queryForm");

      this.handleQuery();

    },


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

@@ -38,14 +38,27 @@
          <el-option label="请选择字典生成" value="" />

        </el-select>

      </el-form-item>

#elseif($column.htmlType == "datetime")

#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")

      <el-form-item label="${comment}" prop="${column.javaField}">

        <el-date-picker clearable size="small" style="width: 200px"

        <el-date-picker clearable size="small"

          v-model="queryParams.${column.javaField}"

          type="date"

          value-format="yyyy-MM-dd"

          placeholder="选择${comment}">

        </el-date-picker>

      </el-form-item>

#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

      <el-form-item label="${comment}">

        <el-date-picker

          v-model="daterange${AttrName}"

          size="small"

          style="width: 240px"

          value-format="yyyy-MM-dd"

          type="daterange"

          range-separator="-"

          start-placeholder="开始日期"

          end-placeholder="结束日期"

        ></el-date-picker>

      </el-form-item>

#end

#end

@@ -230,7 +243,7 @@
        </el-form-item>

#elseif($column.htmlType == "datetime")

        <el-form-item label="${comment}" prop="${field}">

          <el-date-picker clearable size="small" style="width: 200px"

          <el-date-picker clearable size="small"

            v-model="form.${field}"

            type="date"

            value-format="yyyy-MM-dd"

@@ -315,6 +328,10 @@
#if(${column.dictType} != '')

      // $comment字典

      ${column.javaField}Options: [],

#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})

      // $comment时间范围

      daterange${AttrName}: [],

#end

#end

      // 查询参数

@@ -363,6 +380,21 @@
    /** 查询${functionName}列表 */

    getList() {

      this.loading = true;

#foreach ($column in $columns)

#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

      this.queryParams.params = {};

#break

#end

#end

#foreach ($column in $columns)

#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})

      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {

        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];

        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];

      }

#end

#end

      list${BusinessName}(this.queryParams).then(response => {

        this.${businessName}List = response.rows;

        this.total = response.total;

@@ -413,6 +445,12 @@
    },

    /** 重置按钮操作 */

    resetQuery() {

#foreach ($column in $columns)

#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})

      this.daterange${AttrName} = [];

#end

#end

      this.resetForm("queryForm");

      this.handleQuery();

    },


 ruoyi-ui/src/utils/ruoyi.js

@@ -62,8 +62,8 @@
            search.params["beginTime"] = dateRange[0];
            search.params["endTime"] = dateRange[1];
        } else {
            search.params[propName + "BeginTime"] = dateRange[0];
            search.params[propName + "EndTime"] = dateRange[1];
            search.params["begin" + propName] = dateRange[0];
            search.params["end" + propName] = dateRange[1];
        }
    }
    return search;

			@@ -38,14 +38,27 @@
			<el-option label="请选择字典生成" value="" />
			</el-select>
			</el-form-item>
			#elseif($column.htmlType == "datetime")
			#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
			<el-form-item label="${comment}" prop="${column.javaField}">
			<el-date-picker clearable size="small" style="width: 200px"
			<el-date-picker clearable size="small"
			v-model="queryParams.${column.javaField}"
			type="date"
			value-format="yyyy-MM-dd"
			placeholder="选择${comment}">
			</el-date-picker>
			</el-form-item>
			#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
			<el-form-item label="${comment}">
			<el-date-picker
			v-model="daterange${AttrName}"
			size="small"
			style="width: 240px"
			value-format="yyyy-MM-dd"
			type="daterange"
			range-separator="-"
			start-placeholder="开始日期"
			end-placeholder="结束日期"
			></el-date-picker>
			</el-form-item>
			#end
			#end
			@@ -201,7 +214,7 @@
			</el-form-item>
			#elseif($column.htmlType == "datetime")
			<el-form-item label="${comment}" prop="${field}">
			<el-date-picker clearable size="small" style="width: 200px"
			<el-date-picker clearable size="small"
			v-model="form.${field}"
			type="date"
			value-format="yyyy-MM-dd"
			@@ -283,6 +296,10 @@
			#if(${column.dictType} != '')
			// $comment字典
			${column.javaField}Options: [],
			#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
			#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
			// $comment时间范围
			daterange${AttrName}: [],
			#end
			#end
			// 查询参数
			@@ -329,6 +346,21 @@
			/** 查询${functionName}列表 */
			getList() {
			this.loading = true;
			#foreach ($column in $columns)
			#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
			this.queryParams.params = {};
			#break
			#end
			#end
			#foreach ($column in $columns)
			#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
			#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
			if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
			this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
			this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
			}
			#end
			#end
			list${BusinessName}(this.queryParams).then(response => {
			this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
			this.loading = false;
			@@ -397,6 +429,12 @@
			},
			/** 重置按钮操作 */
			resetQuery() {
			#foreach ($column in $columns)
			#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
			#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
			this.daterange${AttrName} = [];
			#end
			#end
			this.resetForm("queryForm");
			this.handleQuery();
			},

			@@ -62,8 +62,8 @@
			search.params["beginTime"] = dateRange[0];
			search.params["endTime"] = dateRange[1];
			} else {
			search.params[propName + "BeginTime"] = dateRange[0];
			search.params[propName + "EndTime"] = dateRange[1];
			search.params["begin" + propName] = dateRange[0];
			search.params["end" + propName] = dateRange[1];
			}
			}
			return search;