yrik 3 years ago
parent
commit
96a5d7f32b

BIN
ruoyi-ui/public/ceshibitou.pdf


BIN
ruoyi-ui/src/assets/images/icon_xq_wj.png


BIN
ruoyi-ui/src/assets/images/icon_xq_xz.png


+ 3 - 3
ruoyi-ui/src/settings.js

@@ -1,8 +1,8 @@
 module.exports = {
   title: 'OA管理系统',
-  // urls: `http://118.31.23.65:7090`,
-  // urls: `http://192.168.101.11:8090`,
-   urls: `http://192.168.101.49:8090`,
+  // urls: `http://118.178.139.79:5000`,
+  urls: `http://192.168.101.49:8090`,
+   // urls: `http://192.168.101.110:8090`,
 
 
 

+ 0 - 4
ruoyi-ui/src/utils/auth.js

@@ -2,8 +2,6 @@ import Cookies from 'js-cookie'
 
 const TokenKey = 'Admin-Token'
 
-const JiMuTokenKey = 'JmReport-Access-Token';
-
 const ExpiresInKey = 'Admin-Expires-In'
 
 export function getToken() {
@@ -11,12 +9,10 @@ export function getToken() {
 }
 
 export function setToken(token) {
-  window.localStorage.setItem(JiMuTokenKey, token);
   return Cookies.set(TokenKey, token)
 }
 
 export function removeToken() {
-  window.localStorage.removeItem(JiMuTokenKey);
   return Cookies.remove(TokenKey)
 }
 

+ 67 - 0
ruoyi-ui/src/views/system/eport/index.vue

@@ -0,0 +1,67 @@
+<template>
+  <div class="app-container">
+
+  </div>
+</template>
+
+<script>
+import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import IconSelect from "@/components/IconSelect";
+
+export default {
+  name: "Menu",
+  components: { Treeselect, IconSelect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 菜单表格树数据
+      menuList: [],
+      // 菜单树选项
+      menuOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 显示状态数据字典
+      visibleOptions: [],
+      // 菜单状态数据字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        menuName: undefined,
+        visible: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        menuName: [
+          { required: true, message: "菜单名称不能为空", trigger: "blur" }
+        ],
+        orderNum: [
+          { required: true, message: "菜单顺序不能为空", trigger: "blur" }
+        ],
+        path: [
+          { required: true, message: "路由地址不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+   // window.location.href = 'http://118.178.139.79:5000/prod-api/boman-report/jmreport/list'
+
+    window.open('http://118.178.139.79:5000/prod-api/boman-report/jmreport/list','_blank');
+    console.log(123);
+    this.$router.replace('/index')
+  },
+
+  methods: {
+
+  }
+};
+</script>

+ 1 - 1
ruoyi-ui/src/views/system/group/index.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
       <el-form-item label="名称" prop="deptName">
         <el-input
-          v-model="queryParams.deptName"
+          v-model="queryParams.groupName"
           placeholder="请输入名称"
           clearable
           size="small"

+ 22 - 18
ruoyi-ui/src/views/system/issue/index.vue

@@ -50,7 +50,7 @@
 
           </el-upload>
 <div  class="el-upload__tip" style="margin-left: 5px; color: red; margin-top: 0;">
-              只能上传/pdf文件,且不超过100MB
+              请上传pdf文档,且不超过100MB
         </div>
         </el-form-item>
         </el-col>
@@ -62,7 +62,7 @@
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
           <div  class="el-upload__tip" style="margin-left: 5px; color: red; margin-top: 0; ">
-                只能上传jpg/png/txt/word/pdf/exe/RAR/ZIP文件,且不超过100MB
+                只能上传jpg/png/txt/word/pdf/exe/RAR/ZIP/ofd/Excel文件,且不超过100MB
           </div>
         </el-form-item>
         </el-col>
@@ -99,7 +99,6 @@
             </ul>
         </el-form-item>
         </el-col>
-
         <el-col :span="24" style="border: 1px solid red;  padding: 20px 0 20px 10px;">
         <el-form-item class="renhdys" label="备注:" prop="message_remark">
           <el-input
@@ -684,21 +683,18 @@ export default {
         }
 
         // this.faerform.children[i].fixedData.receive_user_id = this.lisehtwo[i]
-        this.faerform.children[i].from_dept_name = this.jeogq.dept.deptName
+        this.faerform.children[i].fixedData.from_dept_name = this.jeogq.dept.deptName
         this.faerform.children[i].fixedData.message_id = 'fk.boman_message'
         this.faerform.children[i].fixedData.send_message_time = tmie
         if(this.objeuisd == -1){
-
           this.faerform.children[i].fixedData.receive_user_id = this.lisehtwo[i].id
-
-
         }else{
           this.faerform.children[i].fixedData.receive_user_id = this.lisehtwo[i].receive_user_id
         }
         this.faerform.children[i].fixedData.receive_user_name = this.lisehtwo[i].userName
         this.faerform.children[i].fixedData.send_user_name = this.jeogq.userName
         this.faerform.children[i].fixedData.send_user_id = this.jeogq.id
-        this.faerform.children[i].fixedData.from_dept_name = this.jeogq.deptName
+        this.faerform.children[i].fixedData.from_dept_name = this.jeogq.dept.deptName
         this.faerform.children[i].fixedData.message_title = this.querjtgoe.message_title
         if(this.lisehtwo[i].dept !== undefined && this.lisehtwo[i].dept !==null){
           this.faerform.children[i].fixedData.receive_dept_name = this.lisehtwo[i].dept.deptName
@@ -842,12 +838,18 @@ export default {
       }else{
         this.msgSuccess('上传成功');
         this.config.push(res.data);
+        console.log(res.data)
+        console.log(res.data.name.substr(0,res.data.name.length-4))
+
         this.querjtgoe.message_upload = this.config
-        this.querjtgoe.message_title = res.data.name
+        console.log(this.querjtgoe.message_upload)
+        // this.querjtgoe.message_title = res.data.name
+        this.querjtgoe.message_title = res.data.name.substr(0,res.data.name.length-4)
         this.querjtgoe.message_upload = JSON.stringify(this.querjtgoe.message_upload)
       }
       // querjtgoe.message_title
       console.log(res)
+      console.log(res.data.name.substr(-4))
     },
     upImageFntwo(res, file) {
       if(res.code == 200){
@@ -865,12 +867,14 @@ export default {
     // 上传前控制
     befors(res, file){
       console.log(res,file)
-      if(res.type !== 'application/pdf'){
-        this.msgSuccess('只能上传pdf文件');
-        return false
-      }else{
-        return true
-      }
+      console.log(res.name.substr(0,res.name.length-4))
+      // if(res.type !== 'application/pdf'){
+      //   this.msgSuccess('只能上传pdf文件');
+      //   return false
+      // }else{
+      //   return true
+      // }
+      return   true
     },
     // 时间控件
     iChange(){
@@ -1200,9 +1204,9 @@ export default {
       }
      const id = row.id || this.ids.join(',')
      let huew = []
-     if(row !== undefined){
-       this.idee = []
-     }
+     // if(row !== undefined){
+     //   this.idee = []
+     // }
 
      if(this.idee.length > 0 || row == undefined){
        console.log(345)

+ 3 - 3
ruoyi-ui/src/views/system/pdf/index.vue

@@ -116,13 +116,13 @@ export default {
     this.forew.fixedData.id = this.$route.query.id - 0;
     this.wfor.objId = this.$route.query.index - 0;
     this.wfor.messageId = this.$route.query.id - 0;
-    this.wfor.table = this.$route.query.tables;
+    // this.wfor.table = this.$route.query.tables;
     // 获取当前时间戳
     var  date1 =new Date();
     // let tmie = Date.parse(date1) / 1000
     let tmie = this.dateFormat()
-    console.log(tmie)
-    this.wfor.fixedData.receive_time = tmie
+    // console.log(tmie)
+    this.wfor.receiveTime = tmie
     if(this.$route.query.teiwog == 'weidu'){
       this.weideu()
     }

+ 158 - 0
ruoyi-ui/src/views/system/sonnel/index.vue

@@ -0,0 +1,158 @@
+<template>
+  <div class="sonnel">
+     <div class="sonnerHeader">
+       <p class="xiangq ">报表详情</p>
+       <div class="sonnelNave">
+         <div class="sonnelacr">
+           <p>报表名称:</p>
+           <p>潜山市教育局 人员信息列表</p>
+         </div>
+         <div class="sonnelacr">
+           <p>报表模板:</p>
+           <p class="aet">
+             <a href="#">下载模板</a>
+             <span>
+                <img src="../../../assets/images/icon_xq_wj.png" alt="" class="index_navTimeimg" />
+                <i>潜山市教育局 人员信息报表.xls</i>
+             </span>
+           </p>
+         </div>
+         <div class="sonnelacr">
+           <p>开始时间:</p>
+           <p>2021-08-17</p>
+         </div>
+         <div class="sonnelacr">
+           <p>截止时间:</p>
+           <p>2021-08-23</p>
+         </div>
+         <div class="sonnelacr">
+           <p>注意事项:</p>
+           <p>请各单位认真如实填写人员信息,务必在截止日期前提交!</p>
+         </div>
+         <div class="sonnelacr">
+           <p>参与人员:</p>
+           <p>潜山市源潭中心小学:沈明熙、刘晓旭、王思、李敏、韩晓辉、李启民、沈明熙、刘晓旭、王思、李敏、韩晓辉、李启民、沈明熙; 潜山市梅</p>
+         </div>
+         <div class="sonnelacr">
+           <p>已填报单位:</p>
+           <p class="djiwui">
+             <span class="jeiut">
+               <span>潜山市源潭中心小学 沈明熙</span>
+               <img src="../../../assets/images/icon_xq_wj.png" alt="" class="index_navTimeimg" />
+               <i>潜山市教育局 人员信息报表.xls</i>
+               <img src="../../../assets/images/icon_xq_xz.png" alt="" class="index_navTimeimgrt" />
+             </span>
+             <span class="jeiut">
+               <span>潜山市源潭中心小学 沈明熙</span>
+               <img src="../../../assets/images/icon_xq_wj.png" alt="" class="index_navTimeimg" />
+               <i>潜山市教育局 人员信息报表.xls</i>
+               <img src="../../../assets/images/icon_xq_xz.png" alt="" class="index_navTimeimgrt" />
+               </span>
+
+             </p>
+         </div>
+         <div class="sonnelacr">
+           <p>未填报单位:</p>
+           <p>潜山市源潭中心小学:沈明熙、刘晓旭、王思、李敏、韩晓辉、李启民、沈明熙、刘晓旭、王思、李敏、韩晓辉、李启民、沈明熙; 潜山市梅</p>
+         </div>
+       </div>
+       <div style="text-align: center;">
+         <el-button type="success"  size="medium" @click="handleQuery">查看汇总信息</el-button>
+       </div>
+     </div>
+  </div>
+</template>
+
+<script>
+
+</script>
+
+<style lang="scss" scoped>
+  .sonnel{
+    background-color:#eaeefa;
+    padding: 16px;
+  }
+  .sonnerHeader{
+    padding: 30px;
+    background-color: #fff;
+    border-radius: 6px;
+    .sonnelacr{
+      display: flex;
+      margin-bottom: 25px;
+      p:nth-child(1){
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #343434;
+        width: 10%;
+        text-align: right;
+      }
+      p:nth-child(2){
+        flex: 1;
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #343434;
+
+      }
+      .aet{
+        display: flex;
+        align-items: center;
+        a{
+          width: 100px;
+          height: 40px;
+          background: #1890FF;
+          border-radius: 10px;
+          font-size: 16px;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #FFFFFF;
+          text-align: center;
+          line-height: 40px;
+        }
+        i{
+          font-size: 13px;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #343434;
+          font-style:normal;
+        }
+      }
+      .djiwui{
+         display: flex;
+         flex-direction: column;
+         line-height: 25px;
+         .jeiut{
+           display: flex;
+           align-items: center;
+         }
+        i{
+          font-size: 13px;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #343434;
+          font-style:normal;
+        }
+      }
+    }
+  }
+  .xiangq{
+    border-left: 4px solid #1890FF;
+    padding-left: 6px;
+    font-size: 19px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #343434;
+    margin-bottom: 38px;
+  }
+  .index_navTimeimg{
+    width: 14px;
+    height: 16px;
+    margin: 0 11px;
+  }
+  .index_navTimeimgrt{
+    width: 12px;
+    height: 14px;
+    margin: 0 17px;
+  }
+</style>

+ 7 - 5
ruoyi-ui/src/views/system/surface/index.vue

@@ -22,7 +22,7 @@
       <el-table stripe v-loading="loading" :data="postList" @selection-change="handleSelectionChange" @row-click="rowclid">
         <el-table-column type="selection" width="45" style="color: red;" align="center" />
         <template v-for="(item, index) in tabData" >
-          <el-table-column :width="item.columnName =='message_title'? '200' : tabData.length>13?zjFn(item.columnComment)*19:'auto'" :label="item.columnComment" align="center" :prop="item.columnName" :key="index" show-overflow-tooltip v-if="item.columnName !== 'send_user_id' && item.columnName !== 'message_id'">
+          <el-table-column :width="item.columnName =='message_title'? '200' : tabData.length>13?zjFn(item.columnComment)*19:'auto'" :label="item.columnComment" align="center" :prop="item.columnName" :key="index" show-overflow-tooltip v-if="item.columnName !== 'send_user_id' && item.columnName !== 'message_id' && item.columnName !== 'receive_user_id'">
           <!-- :style="scope.row.list_class" scope.row[scope.column.property] -->
             <template slot-scope="scope"  style="width: 100%;" >
               <img class="img_icon" v-if="item.htmlType=='imageUpload' && scope.row[scope.column.property] && scope.row[scope.column.property] !== '[]'" @click="imgBtn(JSON.parse(scope.row[scope.column.property])[0].url)"
@@ -481,6 +481,7 @@
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
+        console.log(selection)
         this.ids = selection.map(item => item.id)
         this.idsty = selection.map(item => item.message_id)
         this.idee = selection
@@ -642,15 +643,16 @@
          this.msgInfo('请勾选一条信息')
          return
        }
+       console.log(row)
        const id = row.id || this.ids.join(',')
        let huew = []
-       if(row !== undefined){
-         this.idee = []
-       }
+       // if(row !== undefined){
+       //   this.idee = []
+       // }
        if(this.idee.length > 0){
          console.log(345)
          for(var j = 0 ; j < this.idee.length; j++ ){
-           this.eceivelist.dataList[j] = {message_id:0,receive_user_id:0,receive_user_name:'',message_title:'',send_user_name:'',send_user_id:0,message_time:''}
+           this.eceivelist.dataList[j] = {message_id:0,receive_user_id:0,receive_user_name:'',message_title:'',send_user_name:'',send_user_id:0,message_time:'',}
            this.eceivelist.dataList[j].message_id = this.idee[j].message_id
            this.eceivelist.dataList[j].receive_user_id = this.idee[j].receive_user_id
            this.eceivelist.dataList[j].receive_user_name = this.idee[j].receive_user_name

+ 358 - 0
ruoyi-ui/src/views/system/tatementsetr/index.vue

@@ -0,0 +1,358 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="字典名称" prop="dictName">
+        <el-input
+          v-model="queryParams.dictName"
+          placeholder="请输入字典名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="字典类型" prop="dictType">
+        <el-input
+          v-model="queryParams.dictType"
+          placeholder="请输入字典类型"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="字典状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:dict:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:dict:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:dict:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:dict:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-refresh"
+          size="mini"
+          @click="handleClearCache"
+          v-hasPermi="['system:dict:remove']"
+        >清理缓存</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="字典编号" align="center" prop="id" />
+      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <router-link :to="'/dict/type/data/' + scope.row.id" class="link-type">
+            <span>{{ scope.row.dictType }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dict:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dict:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="字典名称" prop="dictName">
+          <el-input v-model="form.dictName" placeholder="请输入字典名称" />
+        </el-form-item>
+        <el-form-item label="字典类型" prop="dictType">
+          <el-input v-model="form.dictType" placeholder="请输入字典类型" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listType, getType, delType, addType, updateType, clearCache } from "@/api/system/dict/type";
+
+export default {
+  name: "Dict",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 状态数据字典
+      statusOptions: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dictName: undefined,
+        dictType: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictName: [
+          { required: true, message: "字典名称不能为空", trigger: "blur" }
+        ],
+        dictType: [
+          { required: true, message: "字典类型不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询字典类型列表 */
+    getList() {
+      this.loading = true;
+      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.typeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 字典状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        dictName: undefined,
+        dictType: undefined,
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加字典类型";
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getType(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改字典类型";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            updateType(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addType(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除字典编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delType(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/dict/type/export', {
+        ...this.queryParams
+      }, `type_${new Date().getTime()}.xlsx`)
+    },
+    /** 清理缓存按钮操作 */
+    handleClearCache() {
+      clearCache().then(response => {
+        this.msgSuccess("清理成功");
+      });
+    }
+  }
+};
+</script>

+ 1 - 1
ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -31,7 +31,7 @@
           :max-height="tableHeight" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" align="center" />
-          <el-table-column label="字段列名" prop="columnName" min-width="10%" :show-overflow-tooltip="true" align="center" />
+          <el-table-column label="字段列名" prop="columnName" min-width="25%" :show-overflow-tooltip="true" align="center" />
           <el-table-column label="字段描述" min-width="10%" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.columnComment"></el-input>