yahyahy 3 жил өмнө
parent
commit
eee60b0eb5

+ 7 - 0
ruoyi-ui/src/api/system/table.js

@@ -56,6 +56,13 @@ export function delMenu(data) {
     data
   })
 }
+export function delMenude(data) {
+  return request({
+    url: '/boman-web-core/p/cs/objectLogicDelete',
+    method: 'POST',
+    data
+  })
+}
 
 // 撤回
 export function isech(data) {

+ 1 - 1
ruoyi-ui/src/api/system/tatementsetr.js

@@ -12,7 +12,7 @@ export function tistDept(query) {
 // 查询报表列表
 export function reportList(data) {
   return request({
-    url: '/boman-report/statistic/reportPersonnel/list',
+    url: '/boman-report/report/statistic/reportPersonnel/list',
     method: 'post',
     data: data
   })

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

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

+ 21 - 6
ruoyi-ui/src/views/system/collection/index.vue

@@ -32,7 +32,9 @@
         </el-col>
         <el-col :span="6" class="eigj" style="border: 1px solid red; border-bottom: 0; border-left: 0; ">
         <el-form-item label="收到日期" prop="recieve_time">
-          <el-date-picker :disabled="false" @change="iChange" v-model="colleobje.recieve_time"   style="width: 100%"        type="date" :placeholder="'请输入'">
+          <el-date-picker :disabled="false" @change="iChange" v-model="colleobje.recieve_time"   style="width: 100%"   type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss" :placeholder="'请输入'">
           </el-date-picker>
         </el-form-item>
         </el-col>
@@ -122,7 +124,7 @@
         </el-form-item>
         </el-col> -->
         <el-col :span="24" style="text-align: right; padding-top: 20px;">
-          <el-button type="danger" @click="submitForm" >保存</el-button>
+          <el-button :disabled="jdods" type="danger" @click="submitForm" >保存</el-button>
         </el-col>
         </el-row>
       </el-form>
@@ -254,7 +256,7 @@ export default {
       // 总条数
       total: 0,
       // 部门名称
-      deptName: undefined,
+      deptName: '',
       // 角色表格数据
       roleList: [],
       // 弹出层标题
@@ -383,7 +385,10 @@ export default {
       fileList: [],
       titlet:'',
       user:{},
-      colleobje:{}
+      colleobje:{
+        recieve_time:''
+      },
+      jdods:false
 
     };
   },
@@ -398,6 +403,11 @@ export default {
     }else if(this.$route.query.tabname == 'fawen'){
       this.titlet = '待归档'
     }
+    if(this.$route.query.id !== -1){
+     this.jdods = true
+    }else{
+     this.jdods = false
+    }
     this.getList();
     this.getTreeselect()
     this.getUser()
@@ -433,9 +443,14 @@ export default {
             this.colleobje.leader_suggest = res.data.leader_suggest
             this.colleobje.result = res.data.result
             this.colleobje.check_user_name = res.data.check_user_name
-            this.colleobje.recieve_time = res.data.recieve_time
+            if(res.data.recieve_time !== null){
+              this.colleobje.recieve_time = res.data.recieve_time
+            }else{
+              this.colleobje.recieve_time = ''
+            }
+
 
-            if(res.data.message_body !== undefined){
+            if(res.data.message_body !== undefined && res.data.message_body !== ""){
               this.config = res.data.message_body
             }
           }

+ 29 - 11
ruoyi-ui/src/views/system/eport/index.vue

@@ -36,14 +36,18 @@
         <el-form-item label="开始时间:" prop="sTime">
           <el-date-picker
             v-model="queryParams.sTime"
-            type="date"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="截止时间:" prop="eTime">
           <el-date-picker
             v-model="queryParams.eTime"
-            type="date"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
@@ -94,7 +98,7 @@
          <template slot-scope="scope">
            <el-switch
              v-model="scope.row.status"
-             active-value="0"
+             active-value="2"
              inactive-value="1"
              @change="handleStatusChange(scope.row)"
            ></el-switch>
@@ -139,7 +143,7 @@
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        @pagination="getReportList"
       />
 
       <!-- 添加或修改部门对话框 -->
@@ -191,7 +195,9 @@
     ]">
                 <el-date-picker
                       v-model="form.startTime"
-                      type="date"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      format="yyyy-MM-dd HH:mm:ss"
                       placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
@@ -202,7 +208,9 @@
     ]">
                 <el-date-picker
                       v-model="form.endTime"
-                      type="date"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      format="yyyy-MM-dd HH:mm:ss"
                       placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
@@ -342,7 +350,9 @@
     ]">
                 <el-date-picker
                       v-model="formty.startTime"
-                      type="date"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      format="yyyy-MM-dd HH:mm:ss"
                       placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
@@ -353,7 +363,9 @@
     ]">
                 <el-date-picker
                       v-model="formty.endTime"
-                      type="date"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                       format="yyyy-MM-dd HH:mm:ss"
                       placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
@@ -495,12 +507,18 @@ export default {
   created() {
     //this.getList();
     this.getReportList();
-    this.getDicts("sys_normal_disable").then(response => {
+    this.getDicts("report_status").then(response => {
       this.statusOptions = response.data;
     });
     this.getTreeselect()
   },
   methods: {
+    dateString() {
+        let year = new Date().toLocaleDateString().substring(0, 4);
+        let month = new Date().toLocaleDateString().substring(5, 6);
+        let day = new Date().toLocaleDateString().substring(7, 9);
+        return year+"-"+month+"-"+day+" "+"20:30:00";
+      },
     /** 查询部门列表 */
     getList() {
       this.loading = true;
@@ -848,10 +866,11 @@ export default {
     },
     upImageFn(res, file) {
       if(res.code !== 200){
-        this.msgSuccess('上传失败');
+        this.msgInfo('上传失败');
         return false
       }else{
         this.msgSuccess('上传成功');
+        // this.msgInfo('上传失败');
         this.config= res.data
         console.log(res.data)
         console.log(res.data.name.substr(0,res.data.name.length-4))
@@ -869,7 +888,6 @@ export default {
           this.formty.templateName = res.data.name
           this.formty.repUploadFile = JSON.stringify(this.config)
         }
-
         // this.querjtgoe.message_title = res.data.name.substr(0,res.data.name.length-4)
         // this.querjtgoe.message_upload = JSON.stringify(this.querjtgoe.message_upload)
       }

+ 17 - 4
ruoyi-ui/src/views/system/issue/index.vue

@@ -25,7 +25,9 @@
         </el-col>
         <el-col :span="12" style="border: 1px solid red; border-bottom: 0; border-left: 0; padding: 15px 0 15px 10px;">
         <el-form-item :label="titlet + '日期:'" prop="message_time">
-          <el-date-picker :disabled="false" @change="iChange" v-model="querjtgoe.message_time" value-format="yyyy-MM-dd"   style="width: 100%"    type="date" :placeholder="'请输入'">
+          <el-date-picker :disabled="false" @change="iChange" v-model="querjtgoe.message_time" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss"   style="width: 100%"  :placeholder="'请输入'">
           </el-date-picker>
         </el-form-item>
         </el-col>
@@ -204,8 +206,9 @@
     <!-- 图片预览 -->
     <el-dialog   :close-on-click-modal="false" title="预览" :visible.sync="imashow" width="1200px" append-to-body>
     <div class="demo-image__preview">
-      <img v-if="!shouewhu" :src="dialogImageUrl" alt="" style="width: 100%;">
+      <img v-if="shouewhu==false && exelshow == false " :src="dialogImageUrl" alt="" style="width: 100%;">
       <iframe v-if="shouewhu" :src="dialogImageUrl" frameborder="0" style="width: 100%; height: 100vh;"></iframe>
+      <a v-if="exelshow"  :href="dialogImageUrl" :download="dialogImageUrlname" >{{dialogImageUrlname}} <span style="color: #039BE5;">点击下载</span></a>
     </div>
     </el-dialog>
     <!-- 流程进度 -->
@@ -365,6 +368,7 @@ export default {
         ]
       },
       dialogImageUrl: '',
+      dialogImageUrlname:'',
       process: process.env.VUE_APP_BASE_API,
       dialogVisible: false,
       disabled: false,
@@ -435,6 +439,7 @@ export default {
       srcList:[],
       imashow:false,
       shouewhu:false,
+      exelshow:false,
       modalShowdu:false,
       listnemd:[],
       listnemrt:[],
@@ -717,7 +722,7 @@ export default {
       }
 
       this.faerform.fixedData = this.querjtgoe
-      console.log(this.faerform)   
+      console.log(this.faerform)
       this.nuki = this.nuki + 1
       console.log(this.nuki)
       if(this.nuki > 1){
@@ -832,9 +837,17 @@ export default {
       if(hegs[hegs.length - 1] == 'pdf'){
         this.shouewhu = true
       }else{
-        this.shouewhu = false
+        if(hegs[hegs.length - 1] == 'jpg' || hegs[hegs.length - 1] == 'png'){
+          this.shouewhu = false
+          this.exelshow = false
+        }else{
+          this.exelshow = true
+        }
       }
+      console.log(this.shouewhu,this.exelshow)
       this.dialogImageUrl = file.url;
+      this.dialogImageUrlname = file.name
+      console.log(this.dialogImageUrlname)
       this.dialogVisible = true;
       this.imashow = true
     },

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

@@ -1,83 +1,30 @@
 <template>
   <div class="pdf" v-show="fileType === 'pdf'">
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:menu:add']"
-        >转收文</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:menu:add']"
-        >转本部门</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:menu:add']"
-        >分发范围</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:menu:add']"
-        >阅读情况</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:menu:add']"
-        >收藏公文</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          size="mini"
-          @click="pdfdele"
-          v-hasPermi="['system:menu:add']"
-        >退回</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:menu:add']"
-        >收文签收</el-button>
-      </el-col>
+      <el-col :span="1.5"><el-button type="primary" plain size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">转收文</el-button></el-col>
+      <el-col :span="1.5"><el-button type="primary" plain size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">转本部门</el-button></el-col>
+      <el-col :span="1.5"><el-button type="primary" plain size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">分发范围</el-button></el-col>
+      <el-col :span="1.5"><el-button type="primary" plain size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">阅读情况</el-button></el-col>
+      <el-col :span="1.5"><el-button type="primary" plain size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">收藏公文</el-button></el-col>
+      <el-col :span="1.5"><el-button type="primary" plain size="mini" @click="pdfdele" v-hasPermi="['system:menu:add']">退回</el-button></el-col>
+      <el-col :span="1.5"><el-button type="primary" plain size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">收文签收</el-button></el-col>
     </el-row>
     <div>
       <p style="font-size: 28px; font-weight: 700;">正文:</p>
-       <a v-if="shouwe" :href="src" download="测试">{{name}}</a>
-       <span v-if="!shouwe" @click="down">{{name}}</span>
+      <a v-if="shouwe" :href="src" :download="name">{{ name }}</a>
+      <span v-if="!shouwe" @click="down">{{ name }}</span>
     </div>
     <p style="font-size: 28px; font-weight: 700;">附件:</p>
-    <p style="text-align: right; font-size: 20px; color: #1890FF;"><a :href="src"  target="_blank" >全屏</a></p>
+    <p v-for="(item,idnex) in heiqagh" :key="idnex + 'nu'">
+      <a style="font-size: 14px;"  :href="item.url" :download="item.name">{{item.name}} <span style="color: #039BE5;">点击下载</span></a>
+    </p>
+    <p style="text-align: right; font-size: 20px; color: #1890FF;"><a :href="src" target="_blank">全屏</a></p>
     <iframe :src="src" frameborder="0" style="width: 100%; height: 100vh;"></iframe>
   </div>
 </template>
 <script>
-import Pdf from 'vue-pdf'
-import { listRoles,pdfDwon,timeu,weit} from "@/api/system/isses";
+import Pdf from 'vue-pdf';
+import { listRoles, pdfDwon, timeu, weit } from '@/api/system/isses';
 export default {
   components: {
     Pdf
@@ -86,77 +33,86 @@ export default {
     return {
       dialogVisible: true,
       // src: `${window.location.origin}/ceshi.pdf`,
-      src:'',
-      fileType:'pdf',
-      name:'',
-      forew:{
-       table:'',
-       fixedData:{
-         id:-1
-       }
+      src: '',
+      fileType: 'pdf',
+      name: '',
+      forew: {
+        table: '',
+        fixedData: {
+          id: -1
+        }
       },
-      juegh:{
-        preview:false,
-        absolutePath:''
+      juegh: {
+        preview: false,
+        absolutePath: ''
       },
-      shouwe:true,
-      wfor:{
-        table: "",
-        objId:0,
-        fixedData:{
-          status:'Y',
-          receive_time :''
+      shouwe: true,
+      wfor: {
+        table: '',
+        objId: 0,
+        fixedData: {
+          status: 'Y',
+          receive_time: ''
         }
-      }
-    }
+      },
+      heiqagh:[]
+    };
   },
   created() {
-    console.log(this.$route.query.tables)
+    console.log(this.$route.query.tables);
     this.forew.table = 'boman_message';
     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;
     // 获取当前时间戳
-    var  date1 =new Date();
+    var date1 = new Date();
     // let tmie = Date.parse(date1) / 1000
-    let tmie = this.dateFormat()
+    let tmie = this.dateFormat();
     // console.log(tmie)
-    this.wfor.receiveTime = tmie
-    if(this.$route.query.teiwog == 'weidu'){
-      this.weideu()
+    this.wfor.receiveTime = tmie;
+    if (this.$route.query.teiwog == 'weidu') {
+      this.weideu();
     }
-    this.getList()
-    this.timeta()
+    this.getList();
+    this.timeta();
   },
   methods: {
-    handleAdd(){},
+    handleAdd() {},
     // 路径
     getList() {
       this.loading = true;
-      console.log(this.forew)
-      listRoles(this.forew).then(
-        res => {
-          console.log(34)
-          console.log(res)
-          let pdflis = []
-          if(res.data !== undefined){
-            if(res.data.message_upload !== null && res.data.message_upload !==''){
-              pdflis = JSON.parse(res.data.message_upload)
-              this.src = pdflis[0].url
-              this.name = res.data.message_title
-              this.juegh.absolutePath = pdflis[0].absolutePath
-            }
-            console.log(this.src.split('.'))
+      console.log(this.forew);
+      listRoles(this.forew).then(res => {
+        console.log(34);
+        console.log(res);
+        let pdflis = [];
+        if (res.data !== undefined) {
+          if (res.data.message_upload !== null && res.data.message_upload !== '') {
+            pdflis = JSON.parse(res.data.message_upload);
+            this.src = pdflis[0].url;
+            this.name = res.data.message_title;
+            this.juegh.absolutePath = pdflis[0].absolutePath;
+          }
+
+          if (res.data.message_enclosure !== null && res.data.message_enclosure !== undefined) {
+            console.log(2345)
+            this.heiqagh = JSON.parse(res.data.message_enclosure);
+            console.log(this.heiqagh)
+            // this.src = pdflis[0].url;
+            // this.name = res.data.message_title;
+            // this.juegh.absolutePath = pdflis[0].absolutePath;
           }
+
+          console.log(this.src.split('.'));
         }
-      );
+      });
     },
-    pdfdele(){
-    this.$router.go(-1)
+    pdfdele() {
+      this.$router.go(-1);
     },
     // 下载
-    down(){
+    down() {
       pdfDwon(this.juegh).then(response => {
         if (response.resultCode == 0) {
           this.msgSuccess('提交成功');
@@ -166,13 +122,13 @@ export default {
       });
     },
     // 判断时间是否在30分钟以内
-    timeta(){
+    timeta() {
       timeu(this.forew.fixedData.id).then(response => {
-        console.log(response)
-        if(response.code == 200){
-          this.shouwe =  true
-        }else{
-          this.shouwe =  false
+        console.log(response);
+        if (response.code == 200) {
+          this.shouwe = true;
+        } else {
+          this.shouwe = false;
         }
         // if (response.resultCode == 0) {
         //   this.msgSuccess('提交成功');
@@ -182,53 +138,49 @@ export default {
       });
     },
     // 未读变已读
-    weideu(){
+    weideu() {
       weit(this.wfor).then(response => {
-        console.log(response)
-        if(response.code == 200){
+        console.log(response);
+        if (response.code == 200) {
           this.msgSuccess('已读成功');
           // this.shouwe =  true
-        }else{
-
+        } else {
           // this.shouwe =  false
         }
-        })
+      });
     },
     // 时间转换
     dateFormat() {
-          var date = new Date();
-              var month = date.getMonth() + 1;
-              var strDate = date.getDate();
-              var hours = date.getHours()
-              var minus = date.getMinutes()
-              var secong = date.getSeconds()
-              if (month >= 1 && month <= 9) {
-                  month = "0" + month;
-              }
-              if (strDate >= 0 && strDate <= 9) {
-                  strDate = "0" + strDate;
-              }
-              if (hours >= 0 && hours <= 9) {
-                  hours = "0" + hours;
-              }
-              if (minus >= 0 && minus <= 9) {
-                  minus = "0" + minus;
-              }
-              if (secong >= 0 && secong <= 9) {
-                  secong = "0" + secong;
-              }
-              var currentDate = date.getFullYear() + "-" + month + "-" + strDate
-                      + " " + hours + ":" + minus + ":" + secong;
-              return currentDate;
-        },
-
-
+      var date = new Date();
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      var hours = date.getHours();
+      var minus = date.getMinutes();
+      var secong = date.getSeconds();
+      if (month >= 1 && month <= 9) {
+        month = '0' + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+        strDate = '0' + strDate;
+      }
+      if (hours >= 0 && hours <= 9) {
+        hours = '0' + hours;
+      }
+      if (minus >= 0 && minus <= 9) {
+        minus = '0' + minus;
+      }
+      if (secong >= 0 && secong <= 9) {
+        secong = '0' + secong;
+      }
+      var currentDate = date.getFullYear() + '-' + month + '-' + strDate + ' ' + hours + ':' + minus + ':' + secong;
+      return currentDate;
+    }
   }
-}
+};
 </script>
 
 <style>
-  .pdf{
-    padding: 30px;
-  }
+.pdf {
+  padding: 30px;
+}
 </style>

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

@@ -7,9 +7,10 @@
 <script>
   export default {
     created() {
-      //this.getList();
-      window.open('http://118.178.139.79:5000/prod-api/boman-report/jmreport/list','_blank');
-          console.log(123);
+      //this.getList();http://192.168.101.110:1234/jmreport/list
+     window.open('http://118.178.139.79:5000/prod-api/boman-report/jmreport/list','_blank');
+      // window.open('http://192.168.101.110:1234/jmreport/list','_blank');
+      console.log(123);
       this.$router.replace('/index')
     },
   };

+ 9 - 6
ruoyi-ui/src/views/system/surface/index.vue

@@ -116,6 +116,7 @@
     addbjectSave,
     getByTableName,
     delMenu,
+    delMenude,
     getObject,
     isech
   } from '@/api/system/table.js'
@@ -166,7 +167,7 @@
           orderBy: 'create_time desc',
           fixedData: {
             condition: {
-
+                   is_del:'N'
             }
           }
         },
@@ -265,7 +266,7 @@
       this.queryParams.table = naem[naem.length - 2]
       console.log( route)
       if(nmaelist == 1){
-        this.queryParams.fixedData.condition.message_situation = nmaelist
+        // this.queryParams.fixedData.condition.message_situation = nmaelist
       }else if(nmaelist == 'shouwen'){
         // this.queryParams.fixedData.condition.receive_user_id = this.queryParams.fixedData.condition.send_user_id
         // this.queryParams.fixedData.condition.send_user_id = undefined
@@ -273,13 +274,13 @@
       }else if(nmaelist == 'shenqingzhong'){
         this.queryParams.fixedData.condition.status = 4
       }else if(nmaelist == 2){
-        this.queryParams.fixedData.condition.message_situation = 3
+        // this.queryParams.fixedData.condition.message_situation = 3
       }
       else if(nmaelist == 3){
-        this.queryParams.fixedData.condition.message_situation = 4
+        // this.queryParams.fixedData.condition.message_situation = 4
       }
       else{
-        this.queryParams.fixedData.condition.message_situation = undefined
+        // this.queryParams.fixedData.condition.message_situation = undefined
       }
 
       // this.queryParams.fixedData.condition.message_situation
@@ -422,8 +423,10 @@
                 cancelButtonText: "取消",
                 type: "warning"
               }).then(function() {
-                return delMenu({
+                return delMenude({
                   table: _this.tabName,
+                  logicDelName:'is_del',
+                  logicDelValue:'Y',
                   idList: id
                 });
               }).then(() => {

+ 15 - 11
ruoyi-ui/src/views/system/tatementsetr/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="app-containergt"  style="padding: 0;">
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
           <el-button
             type="primary"
             plain
@@ -10,7 +10,7 @@
             size="mini"
             @click="handleAdd"
           >添加报表</el-button>
-        </el-col>
+        </el-col> -->
         <el-col :span="1.5">
           <el-button
             type="danger"
@@ -36,14 +36,18 @@
         <el-form-item label="开始时间:" prop="sTime">
           <el-date-picker
             v-model="queryParams.sTime"
-            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss"
+            type="datetime"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="截止时间:" prop="eTime">
           <el-date-picker
             v-model="queryParams.eTime"
-            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+             format="yyyy-MM-dd HH:mm:ss"
+             type="datetime"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
@@ -94,7 +98,7 @@
          <template slot-scope="scope">
            <el-switch
              v-model="scope.row.status"
-             active-value="0"
+             active-value="2"
              inactive-value="1"
              @change="handleStatusChange(scope.row)"
            ></el-switch>
@@ -102,13 +106,13 @@
        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button
+            <!-- el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="handleUpdatety(scope.row)"
               v-hasPermi="['sys_dept:M']"
-            >编辑</el-button>
+            >编辑</el-button> -->
             <el-button
               size="mini"
               type="text"
@@ -139,7 +143,7 @@
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        @pagination="getReportList"
       />
 
       <!-- 添加或修改部门对话框 -->
@@ -495,7 +499,7 @@ export default {
   created() {
     //this.getList();
     this.getReportList();
-    this.getDicts("sys_normal_disable").then(response => {
+    this.getDicts("report_status").then(response => {
       this.statusOptions = response.data;
     });
     this.getTreeselect()
@@ -513,7 +517,7 @@ export default {
     /** 查询报表列表 */
     getReportList() {
       this.loading = true;
-      reportListrt(this.queryParams).then(response => {
+      reportList(this.queryParams).then(response => {
         this.reportList = response.rows
         this.total = response.total;
         this.loading = false;
@@ -848,7 +852,7 @@ export default {
     },
     upImageFn(res, file) {
       if(res.code !== 200){
-        this.msgSuccess('上传失败');
+        this.msgInfo('上传失败');
         return false
       }else{
         this.msgSuccess('上传成功');

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

@@ -27,29 +27,29 @@
           </el-col>
           <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
         </el-row>
-        <el-table ref="dragTable" @row-dblclick="dbSelectedZd" align="center" :data="cloumns" row-key="columnId"
-          :max-height="tableHeight" @selection-change="handleSelectionChange">
+        <el-table ref="dragTable"  @row-dblclick="dbSelectedZd" align="center" :data="cloumns" row-key="columnId"
+          :max-height="tableHeight" @selection-change="handleSelectionChange" style="width: 100%;">
           <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="25%" :show-overflow-tooltip="true" align="center" />
-          <el-table-column label="字段描述" min-width="10%" align="center">
+          <el-table-column label="字段描述" min-width="25%" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.columnComment"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="物理类型" prop="columnType" align="center" min-width="10%" :show-overflow-tooltip="true" />
+          <!-- <el-table-column label="物理类型" prop="columnType" align="center" min-width="10%" :show-overflow-tooltip="true" /> -->
           <el-table-column label="字段显示规则" align="center" prop="mask" min-width="13%" />
           <el-table-column label="排序" min-width="8%" align="center" prop="sort" />
-          <el-table-column label="输入字段" min-width="10%" align="center">
+          <!-- <el-table-column label="输入字段" min-width="10%" align="center">
             <template slot-scope="scope">
               <el-checkbox true-label="Y" false-label="N" v-model="scope.row.isIn"></el-checkbox>
             </template>
-          </el-table-column>
-          <el-table-column label="显示字段" min-width="10%" align="center">
+          </el-table-column> -->
+          <!-- <el-table-column label="显示字段" min-width="10%" align="center">
             <template slot-scope="scope">
               <el-checkbox true-label="Y" false-label="N" v-model="scope.row.isOut"></el-checkbox>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="查询" min-width="8%" align="center">
             <template slot-scope="scope">
               <el-checkbox true-label="1" false-label="0" v-model="scope.row.isQuery"></el-checkbox>
@@ -63,19 +63,19 @@
             </template>
           </el-table-column>
           <el-table-column label="缺省值" min-width="10%" align="center" prop="defaultValue" />
-          <el-table-column label="外键" min-width="10%" align="center" prop="foreignKey">
+          <!-- <el-table-column label="外键" min-width="10%" align="center" prop="foreignKey">
             <template slot-scope="scope">
               <div>
                 {{scope.row.foreignKeyName}}
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="必填" min-width="8%" align="center">
             <template slot-scope="scope">
               <el-checkbox true-label="1" false-label="0" v-model="scope.row.isRequired"></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="显示类型" min-width="12%" align="center">
+          <el-table-column label="显示类型" min-width="20%" align="center">
             <template slot-scope="scope">
               <el-select v-model="scope.row.htmlType">
                 <el-option label="文本框" value="input" />
@@ -92,7 +92,7 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="字典类型" min-width="12%" align="center">
+          <!-- <el-table-column label="字典类型" min-width="12%" align="center">
             <template slot-scope="scope">
               <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
                 <el-option v-for="dict in dictOptions" :key="dict.dictType" :label="dict.dictName" :value="dict.dictType">
@@ -101,7 +101,7 @@
                 </el-option>
               </el-select>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
         <!-- 添加或修改岗位对话框 -->
         <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openZd" width="70vw" append-to-body>