兰宝车间质量管理系统
上一版本: 92653f3d | 补丁 | 提交 | 忽略空白
疯狂的狮子li
2022-01-07 d9a0de20f89e61ca44be5a60d2344afafedad376 
Merge remote-tracking branch 'ruoyi-vue/master' into dev

# Conflicts:
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
#	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
已添加1个文件
已修改6个文件
55 ■■■■■ 文件已修改
.github/FUNDING.yml 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
README.md 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .github/FUNDING.yml


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1 @@


custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html




 README.md


@@ -1,3 +1,14 @@


<p align="center">


    <img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">


</p>


<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.1</h1>


<h4 align="center">基于SpringBoot+Vue前后端分离的Java快速开发框架</h4>


<p align="center">


    <a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>


    <a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.1-brightgreen.svg"></a>


    <a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>


</p>




## å¹³å°ç®€ä»‹


[![码云Gitee](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/badge/star.svg?theme=blue)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)


[![GitHub](https://img.shields.io/github/stars/JavaLionLi/RuoYi-Vue-Plus.svg?style=social&label=Stars)](https://github.com/JavaLionLi/RuoYi-Vue-Plus)




 ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java


@@ -149,3 +149,4 @@


    String SYS_DICT_KEY = "sys_dict:";




}






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


@@ -105,6 +105,12 @@


          <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 #default="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">


@@ -173,11 +179,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}">




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


@@ -133,6 +133,12 @@


          <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">


@@ -194,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}">




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


@@ -64,7 +64,7 @@


#end


#end


      <el-form-item>


        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>


        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>


        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>


      </el-form-item>


    </el-form>


@@ -104,6 +104,12 @@


        <template #default="scope">


          <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 #default="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}">


@@ -178,11 +184,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}">




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


@@ -133,6 +133,12 @@


          <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 #default="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 #default="scope">


@@ -194,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}">