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

疯狂的狮子li

2022-01-07 d9a0de20f89e61ca44be5a60d2344afafedad376

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

@@ -11,7 +11,7 @@
#else
#set($comment=$column.columnComment)
#end
#if($column.htmlType == "input")
#if($column.htmlType == "input" || $column.htmlType == "textarea")
      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-input
          v-model="queryParams.${column.javaField}"
@@ -108,7 +108,6 @@
          plain
          icon="el-icon-download"
          size="mini"
          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['${moduleName}:${businessName}:export']"
        >导出</el-button>
@@ -134,10 +133,20 @@
          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
#elseif($column.list && $column.htmlType == "imageUpload")
      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
          <template slot-scope="scope">
              <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
          </template>
      </el-table-column>
#elseif($column.list && $column.dictType && "" != $column.dictType)
      <el-table-column label="${comment}" align="center" prop="${javaField}">
        <template slot-scope="scope">
#if($column.htmlType == "checkbox")
          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
#else
          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
#end
        </template>
      </el-table-column>
#elseif($column.list && "" != $javaField)
@@ -163,7 +172,7 @@
        </template>
      </el-table-column>
    </el-table>
    

    <pagination
      v-show="total>0"
      :total="total"
@@ -191,11 +200,11 @@
        </el-form-item>
#elseif($column.htmlType == "imageUpload")
        <el-form-item label="${comment}">
          <imageUpload v-model="form.${field}"/>
          <image-upload v-model="form.${field}"/>
        </el-form-item>
#elseif($column.htmlType == "fileUpload")
        <el-form-item label="${comment}">
          <fileUpload v-model="form.${field}"/>
          <file-upload v-model="form.${field}"/>
        </el-form-item>
#elseif($column.htmlType == "editor")
        <el-form-item label="${comment}">
@@ -324,8 +333,6 @@
      buttonLoading: false,
      // 遮罩层
      loading: true,
      // 导出遮罩层
      exportLoading: false,
      // 选中数组
      ids: [],
#if($table.sub)
@@ -363,8 +370,7 @@
        pageSize: 10,
#foreach ($column in $columns)
#if($column.query)
        $column.javaField: undefined#if($velocityCount != $columns.size()),#end

        $column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end
#end
      },
@@ -382,8 +388,7 @@
#end
        $column.javaField: [
          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
        ]#if($velocityCount != $columns.size()),#end

        ]#if($foreach.count != $columns.size()),#end
#end
#end
      }
@@ -427,14 +432,11 @@
      this.form = {
#foreach ($column in $columns)
#if($column.htmlType == "radio")
        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end

        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
#elseif($column.htmlType == "checkbox")
        $column.javaField: []#if($velocityCount != $columns.size()),#end

        $column.javaField: []#if($foreach.count != $columns.size()),#end
#else
        $column.javaField: undefined#if($velocityCount != $columns.size()),#end

        $column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end
#end
      };
@@ -506,7 +508,7 @@
#end
          if (this.form.${pkColumn.javaField} != null) {
            update${BusinessName}(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.#[[$modal]]#.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            }).finally(() => {
@@ -514,7 +516,7 @@
            });
          } else {
            add${BusinessName}(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.#[[$modal]]#.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            }).finally(() => {
@@ -527,19 +529,15 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
      this.$confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.loading = true;
          return del${BusinessName}(${pkColumn.javaField}s);
        }).then(() => {
          this.loading = false;
          this.getList();
          this.msgSuccess("删除成功");
      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(() => {
        this.loading = true;
        return del${BusinessName}(${pkColumn.javaField}s);
      }).then(() => {
        this.loading = false;
        this.getList();
        this.#[[$modal]]#.msgSuccess("删除成功");
      }).finally(() => {
          this.loading = false;
        this.loading = false;
      });
    },
#if($table.sub)
@@ -561,7 +559,7 @@
    /** ${subTable.functionName}删除按钮操作 */
    handleDelete${subClassName}() {
      if (this.checked${subClassName}.length == 0) {
        this.msgError("请先选择要删除的${subTable.functionName}数据");
        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
      } else {
        const ${subclassName}List = this.${subclassName}List;
        const checked${subClassName} = this.checked${subClassName};
@@ -577,7 +575,9 @@
#end
    /** 导出按钮操作 */
    handleExport() {
      this.downLoadExcel('/${moduleName}/${businessName}/export', this.queryParams);
      this.download('${moduleName}/${businessName}/export', {
        ...this.queryParams
      }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
    }
  }
};