lbqms.git - Gitblit

Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-01-12 5413b37d71ddbaa42dc6f1ba7b885a322b9a3871

Merge remote-tracking branch 'ruoyi-vue/master' into dev

# Conflicts:
#	README.md
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
#	ruoyi-ui/src/views/index.vue

已修改3个文件

	ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/views/system/dept/index.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -17,13 +17,12 @@
          v-model="queryParams.${column.javaField}"
          placeholder="请输入${comment}"
          clearable
          size="small"
          @keyup.enter="handleQuery"
        />
      </el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
          <el-option
            v-for="dict in ${dictType}"
            :key="dict.value"
@@ -34,13 +33,13 @@
      </el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
          <el-option label="请选择字典生成" value="" />
        </el-select>
      </el-form-item>
#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-date-picker clearable size="small"
        <el-date-picker clearable
          v-model="queryParams.${column.javaField}"
          type="date"
          value-format="YYYY-MM-DD"
@@ -48,11 +47,9 @@
        </el-date-picker>
      </el-form-item>
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
      <el-form-item label="${comment}">
      <el-form-item label="${comment}" style="width: 308px">
        <el-date-picker
          v-model="daterange${AttrName}"
          size="small"
          style="width: 240px"
          value-format="YYYY-MM-DD"
          type="daterange"
          range-separator="-"
@@ -64,8 +61,8 @@
#end
#end
      <el-form-item>
        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

@@ -75,7 +72,6 @@
          type="primary"
          plain
          icon="Plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['${moduleName}:${businessName}:add']"
        >新增</el-button>
@@ -132,21 +128,18 @@
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template #default="scope">
          <el-button
            size="mini"
            type="text"
            icon="Edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['${moduleName}:${businessName}:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="Plus"
            @click="handleAdd(scope.row)"
            v-hasPermi="['${moduleName}:${businessName}:add']"
          >新增</el-button>
          <el-button
            size="mini"
            type="text"
            icon="Delete"
            @click="handleDelete(scope.row)"
@@ -248,7 +241,7 @@
        </el-form-item>
#elseif($column.htmlType == "datetime")
        <el-form-item label="${comment}" prop="${field}">
          <el-date-picker clearable size="small"
          <el-date-picker clearable
            v-model="form.${field}"
            type="datetime"
            value-format="YYYY-MM-DD HH:mm:ss"

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

@@ -17,13 +17,12 @@
          v-model="queryParams.${column.javaField}"
          placeholder="请输入${comment}"
          clearable
          size="small"
          @keyup.enter="handleQuery"
        />
      </el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
          <el-option
            v-for="dict in ${dictType}"
            :key="dict.value"
@@ -34,13 +33,13 @@
      </el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
          <el-option label="请选择字典生成" value="" />
        </el-select>
      </el-form-item>
#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-date-picker clearable size="small"
        <el-date-picker clearable
          v-model="queryParams.${column.javaField}"
          type="date"
          value-format="YYYY-MM-DD"
@@ -48,11 +47,9 @@
        </el-date-picker>
      </el-form-item>
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
      <el-form-item label="${comment}">
      <el-form-item label="${comment}" style="width: 308px">
        <el-date-picker
          v-model="daterange${AttrName}"
          size="small"
          style="width: 240px"
          value-format="YYYY-MM-DD"
          type="daterange"
          range-separator="-"
@@ -64,8 +61,8 @@
#end
#end
      <el-form-item>
        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

@@ -75,7 +72,6 @@
          type="primary"
          plain
          icon="Plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['${moduleName}:${businessName}:add']"
        >新增</el-button>
@@ -85,7 +81,6 @@
          type="success"
          plain
          icon="Edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['${moduleName}:${businessName}:edit']"
@@ -96,7 +91,6 @@
          type="danger"
          plain
          icon="Delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['${moduleName}:${businessName}:remove']"
@@ -107,7 +101,6 @@
          type="warning"
          plain
          icon="Download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['${moduleName}:${businessName}:export']"
        >导出</el-button>
@@ -156,14 +149,12 @@
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template #default="scope">
          <el-button
            size="mini"
            type="text"
            icon="Edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['${moduleName}:${businessName}:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="Delete"
            @click="handleDelete(scope.row)"
@@ -176,8 +167,8 @@
    <pagination
      v-show="total>0"
      :total="total"
      v-model:p:page="queryParams.pageNum"
      v-model:p:limit="queryParams.pageSize"
      v-model:page="queryParams.pageNum"
      v-model:limit="queryParams.pageSize"
      @pagination="getList"
    />

@@ -264,7 +255,7 @@
        </el-form-item>
#elseif($column.htmlType == "datetime")
        <el-form-item label="${comment}" prop="${field}">
          <el-date-picker clearable size="small"
          <el-date-picker clearable
            v-model="form.${field}"
            type="datetime"
            value-format="YYYY-MM-DD HH:mm:ss"
@@ -282,10 +273,10 @@
        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
            <el-button type="primary" icon="Plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
            <el-button type="primary" icon="Plus" @click="handleAdd${subClassName}">添加</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button type="danger" icon="Delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
            <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
          </el-col>
        </el-row>
        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">

 ruoyi-ui/src/views/system/dept/index.vue

@@ -106,6 +106,8 @@
              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="部门名称" prop="deptName">
              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
@@ -116,6 +118,8 @@
              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="负责人" prop="leader">
              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
@@ -126,6 +130,8 @@
              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="邮箱" prop="email">
              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />

			@@ -17,13 +17,12 @@
			v-model="queryParams.${column.javaField}"
			placeholder="请输入${comment}"
			clearable
			size="small"
			@keyup.enter="handleQuery"
			/>
			</el-form-item>
			#elseif(($column.htmlType == "select" \|\| $column.htmlType == "radio") && "" != $dictType)
			<el-form-item label="${comment}" prop="${column.javaField}">
			<el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
			<el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
			<el-option
			v-for="dict in ${dictType}"
			:key="dict.value"
			@@ -34,13 +33,13 @@
			</el-form-item>
			#elseif(($column.htmlType == "select" \|\| $column.htmlType == "radio") && $dictType)
			<el-form-item label="${comment}" prop="${column.javaField}">
			<el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
			<el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
			<el-option label="请选择字典生成" value="" />
			</el-select>
			</el-form-item>
			#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
			<el-form-item label="${comment}" prop="${column.javaField}">
			<el-date-picker clearable size="small"
			<el-date-picker clearable
			v-model="queryParams.${column.javaField}"
			type="date"
			value-format="YYYY-MM-DD"
			@@ -48,11 +47,9 @@
			</el-date-picker>
			</el-form-item>
			#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
			<el-form-item label="${comment}">
			<el-form-item label="${comment}" style="width: 308px">
			<el-date-picker
			v-model="daterange${AttrName}"
			size="small"
			style="width: 240px"
			value-format="YYYY-MM-DD"
			type="daterange"
			range-separator="-"
			@@ -64,8 +61,8 @@
			#end
			#end
			<el-form-item>
			<el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
			<el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
			<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
			<el-button icon="Refresh" @click="resetQuery">重置</el-button>
			</el-form-item>
			</el-form>

			@@ -75,7 +72,6 @@
			type="primary"
			plain
			icon="Plus"
			size="mini"
			@click="handleAdd"
			v-hasPermi="['${moduleName}:${businessName}:add']"
			>新增</el-button>
			@@ -132,21 +128,18 @@
			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
			<template #default="scope">
			<el-button
			size="mini"
			type="text"
			icon="Edit"
			@click="handleUpdate(scope.row)"
			v-hasPermi="['${moduleName}:${businessName}:edit']"
			>修改</el-button>
			<el-button
			size="mini"
			type="text"
			icon="Plus"
			@click="handleAdd(scope.row)"
			v-hasPermi="['${moduleName}:${businessName}:add']"
			>新增</el-button>
			<el-button
			size="mini"
			type="text"
			icon="Delete"
			@click="handleDelete(scope.row)"
			@@ -248,7 +241,7 @@
			</el-form-item>
			#elseif($column.htmlType == "datetime")
			<el-form-item label="${comment}" prop="${field}">
			<el-date-picker clearable size="small"
			<el-date-picker clearable
			v-model="form.${field}"
			type="datetime"
			value-format="YYYY-MM-DD HH:mm:ss"

			@@ -106,6 +106,8 @@
			<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="12">
			<el-form-item label="部门名称" prop="deptName">
			<el-input v-model="form.deptName" placeholder="请输入部门名称" />
			@@ -116,6 +118,8 @@
			<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="12">
			<el-form-item label="负责人" prop="leader">
			<el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
			@@ -126,6 +130,8 @@
			<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="12">
			<el-form-item label="邮箱" prop="email">
			<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />