提交

ruoyi-ui/src/api/system/config.js

@@ -70,9 +70,17 @@ export function listIndexfou(data) {
     data: data
   })
 }
+// export function listIndextanl(data) {
+//   return request({
+//     url: '/boman-web-core/p/cs/table/getByTableName',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
 export function listIndextanl(data) {
   return request({
-    url: '/boman-web-core/p/cs/table/getByTableName',
+    url: '/boman-web-core/p/cs/getObject',
     method: 'post',
     data: data
   })
@@ -94,6 +102,14 @@ export function delConfig(id) {
   })
 }
 
+export function delIndexnabd(data) {
+  return request({
+    url: 'boman-web-core/p/cs/objectDelete',
+    method: 'POST',
+    data
+  })
+}
+
 // 清理参数缓存
 export function clearCache() {
   return request({
@@ -101,3 +117,10 @@ export function clearCache() {
     method: 'delete'
   })
 }
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}

ruoyi-ui/src/views/index.vue

@@ -7,7 +7,7 @@
           <p class="index_headetab">
             <span :class="[num == index ? ' spanto' : '']" v-for="(item,index) in editableTabs" :key="index" @click="tabSbu(item.dictValue)">{{item.dictLabel}}</span>
           </p>
-                <div >
+                <div style="height: 80%;">
                   <ul class="index_headerUl">
                     <li v-for="(item,index) in configList" :key="index">
                         <img src="../assets/images/icon_list_sj.png" alt="">
@@ -30,18 +30,15 @@
                 </div>
         </div>
         <!-- 列表 -->
-          <el-col :sm="24" :lg="24"  style="margin-top: 20px;">
-               <div class="index_heade index_headeNav">
+          <!-- <el-col :sm="24" :lg="24"  style="margin-top: 20px;" >
+               <div class="index_heade index_headeNav" v-show="true">
                  <img src="../assets/images/icon_more.png" alt="" class="index_headerImg">
                  <p class="index_headetab">
                    <span :class="[numlist == index ? ' spanto' : '']" v-for="(item,index) in attendance" :key="index" @click="tabList(index)">{{item}} <p class="tab_i">3</p></span></span>
                  </p>
-                 <!-- <el-tabs v-model="activeName" @tab-click="handleClick" > -->
-                     <!-- <el-tab-pane  name="first">
-                        <span slot="label" class="index_heseviewed"><p class="tab_i">3</p> 我的行程</span> -->
+
                          <div v-if="num == 0">
                            <el-table :data="tableDataalid" style="width: 100%;margin-top: 10px;"  :stripe="true"   >
-                                   <!-- <el-table-column type="selection" width="55" align="center" /> -->
                                   <el-table-column label="序号" align="center" prop="noticeId" width="60" height="53" max-height="53" />
                                   <el-table-column
                                     label="申请人"
@@ -57,7 +54,6 @@
 
                                     width="70"
                                   />
-                                  <!-- :formatter="typeFormat" -->
                                   <el-table-column
                                     label="请假类型"
                                     align="center"
@@ -65,13 +61,8 @@
 
                                     width="75"
                                   />
-                                  <!-- :formatter="statusFormat" -->
                                   <el-table-column label="请假事由" align="center" prop="createBy" width="100"  :show-overflow-tooltip="true"/>
                                   <el-table-column label="请假时间" align="center" prop="date" width="150"/>
-                                    <!-- <template slot-scope="scope">
-                                      <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-                                    </template> -->
-                                  <!-- </el-table-column> -->
                                   <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                                     <template slot-scope="scope">
                                       <el-button
@@ -108,7 +99,7 @@
                            </div>
                          </div>
                </div>
-          </el-col>
+          </el-col> -->
         <!-- </el-row> -->
         <!-- 公司概况 -->
         <el-col :sm="24" :lg="24">
@@ -119,10 +110,11 @@
             </p>
             <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
                  <el-tab-pane label="用户管理" name="first"> -->
-                   <div >
-                     <h3 style="text-align: center;">{{tieku}}</h3>
-                     <!-- {{getLisprofileone[0].info_title}} -->
-                                      <p class="index_profilep" > {{comg}}	</p>
+                   <div style="height: 67%;">
+                        <div style="height: 80%;">
+                          <h3 style="text-align: center;">{{tieku}}</h3>
+                                        <p class="index_profilep" > {{comg}}	</p>
+                        </div>
                                       <!-- {{getLisprofileone[0].info_content}} -->
                                       <div class="index_haderPagin">
                                         <el-pagination
@@ -178,14 +170,19 @@
                 <span @click="memoere"><i class="el-icon-date"></i>创建备忘录</span>
               </p>
               <ul >
-                <li v-for="(item,index) in getmemorandum" :key="index">
+                <li v-for="(item,index) in getmemorandum" :key="index" @click="index_deledetfe(item.id)">
                   <p>{{item.memorandum_title}}
                   </p>
-                  <span>{{item.remind_time}}</span>
+                  <div class="index_navspande">
+                    <span>
+                    {{item.remind_time}}
+                    </span>
+                    <img src="../assets/images/deletety.png" alt="">
+                  </div>
                 </li>
 
               </ul>
-              <img src="../assets/images/icon_more.png" alt="">
+              <img src="../assets/images/icon_more.png" alt="" class="imjud">
 <!--              <el-calendar v-model="value">
               </el-calendar> -->
 
@@ -207,16 +204,6 @@
                              <el-table stripe v-loading="loading" :data="postList.rows" @selection-change="handleSelectionChange">
                                <el-table-column :label="item.columnComment" align="center" :prop="item.columnName" v-for="(item,index) in postList.tableHeadList" :key="index" />
                              </el-table>
-                          	<!-- <tr class="tr_one">
-                          		<th style=" text-align: center;" v-for="(item,index) in tableDataalid" :key="index">{{item.columnComment}}</th>
-                          	</tr>
-                          		<tr v-for="(item,index) in getLisaillie" :key="index" :class=" [index%2  ==0 ? 'two_tr two_trtwo':'two_tr']" @click="chakn(item)">
-                          			<td style=" text-align: center;" >{{ item.contacts_name }}</td>
-                          			<td style="text-align: center;">{{ item.dept_id  }}</td>
-                          			<td style=" text-align: center;" >{{ item.phone }}</td>
-                          			<td style=" text-align: center;" >{{ item.is_del == 1? '删除' :  '未删除'}}</td>
-                          			<td style="text-align: center; " >{{ item.remark}}</td>
-                          		</tr> -->
                            </div>
                           <div class="index_haderPagin index_haderPaginfoiu">
                             <el-pagination
@@ -244,7 +231,7 @@
            <el-form ref="form" :model="form" :rules="rules" label-width="160px" class="from_index">
              <el-row>
                <el-col :span="24" >
-                <dynamic-forms   :ref="item.columnName" :config="form.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.columns" :key='index' />
+                <dynamic-forms   :ref="item.columnName" :config="form.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.showData" :key='index' />
                </el-col>
              </el-row>
            </el-form>
@@ -266,7 +253,7 @@
 </template>
 
 <script>
-import { listIndex, listIndextwo, listIndextherr, listIndexfou, listIndextanl, getConfig, delConfig, addConfig, addConfigindex, updateConfig, clearCache } from "@/api/system/config";
+import { listIndex, getUserProfile, listIndextwo, listIndextherr, listIndexfou, listIndextanl, getConfig, delConfig, addConfig, addConfigindex, updateConfig, clearCache, delIndexnabd } from "@/api/system/config";
 import Editor from '@/components/Editor';
 export default {
   name: "index",
@@ -297,9 +284,12 @@ export default {
         orderBy:'create_time desc',
         pageNo:1,
         pageSize:6,
-        condition:{
-          notice_type:1
+        fixedData:{
+          condition:{
+            notice_type:1
+          }
         }
+
       },
       queryParamstab:{
         table:'sys_notice',
@@ -316,9 +306,12 @@ export default {
         orderBy:'create_time desc',
         pageNo:1,
         pageSize:1,
-        condition:{
-          notice_type:1
+        fixedData:{
+          condition:{
+            info_type:1
+          }
         }
+
       },
       // 日历
       queryParamscalendar:{
@@ -326,6 +319,11 @@ export default {
         orderBy:'create_time desc',
         pageNo:1,
         pageSize:10,
+        fixedData:{
+          condition:{
+            create_by:''
+          }
+        }
       },
       // 备忘录
       queryParamstabmemorandum:{
@@ -333,6 +331,11 @@ export default {
         orderBy:'create_time desc',
         pageNo:1,
         pageSize:6,
+        fixedData:{
+          condition:{
+            create_by:''
+          }
+        }
       },
       // 通讯录
       queryParamsail:{
@@ -376,12 +379,19 @@ export default {
       //日历弹框
       calendaradd:{
         table:'sys_schedule',
-        isUi:false
+        isUi:false,
+        fixedData:{
+          id:-1
+        }
+
       },
       //备忘录弹框
       calendaraddmer:{
         table:'sys_memorandum',
-        isUi:false
+        isUi:false,
+        fixedData:{
+          id:-1
+        }
       },
       // input
       inputList:[],
@@ -406,24 +416,35 @@ export default {
       truew:[],
       fales:[],
       postList:{},
-      arr:'2,2,3,3,4,4'
+      arr:'2,2,3,3,4,4',
+      // 删除参数
+      deledlid:{
+        table:'sys_memorandum',
+        idList:[],
+        user: {
+          oldPassword: undefined,
+          newPassword: undefined,
+          confirmPassword: undefined
+        },
+      }
     };
   },
 
   created() {
+    // console.log(this.user)
     this.unique(this.arr)
-    this.getLisalendar()//日历
     this.getList()
     this.getListtab()
     this.getLiser()
     this.getLisprofile()
-    this.getLismemorandum()  //备忘录
+    // 用户信息
+    this.getUser()
+    // this.getLismemorandum()  //备忘录
     this.getLisail()//通讯录
     this.getLisailtwo()
 
   },
   computed: {
-
      // 时间高亮的数组
      brightDate () {
        // let ary = []
@@ -445,9 +466,7 @@ export default {
            // that.ary = that.calendarData[i].all_date
            // console.log(that.calendarData[i].all_date.join(','),754)
          }
-         // console.log(that.calendarData[i].all_date,754)
        }
-       // console.log( that.rjtu,7545)
        console.log(that.ary)
        return that.ary
      }
@@ -570,8 +589,13 @@ export default {
     //数据  第一部分列表
     getList() {
       this.loading = true;
+      this.configList = []
       listIndex(this.queryParams).then(response => {
-          this.configList = response.data.rows;
+          if(response.data.rows !== null){
+            this.configList = response.data.rows;
+          }else {
+            this.configList.push({notice_title: "暂无数据"});
+          }
           console.log(this.configList)
           this.total = response.data.total;
           this.loading = false;
@@ -595,8 +619,14 @@ export default {
       listIndex(this.queryParamstabprofile).then(response => {
           if(response.data !== undefined){
             this.getLisprofileone = response.data.rows;
-            this.tieku = this.getLisprofileone[0].info_title
-            this.comg = this.getLisprofileone[0].info_content
+            if(response.data.rows !== null){
+              this.tieku = this.getLisprofileone[0].info_title
+              this.comg = this.getLisprofileone[0].info_content
+            }else {
+              this.tieku = '暂无数据'
+              this.comg = '暂无数据'
+            }
+
             console.log(this.getLisprofileone[0].info_title,98)
             this.totalprofile = response.data.total;
           }
@@ -607,6 +637,7 @@ export default {
     //数据  日历数据列表
     getLisalendar() {
       this.loading = true;
+      this.queryParamscalendar.fixedData.condition.create_by = this.user.userName
       listIndex(this.queryParamscalendar).then(response => {
           if(response.data !== undefined){
             this.calendarData = response.data.rows;
@@ -619,9 +650,15 @@ export default {
     //数据  备忘录数据列表
     getLismemorandum() {
       this.loading = true;
+      this.getmemorandum = []
+      this.queryParamstabmemorandum.fixedData.condition.create_by = this.user.userName
       listIndex(this.queryParamstabmemorandum).then(response => {
           if(response.data !== undefined){
-            this.getmemorandum = response.data.rows;
+            if(response.data.rows !== null){
+              this.getmemorandum = response.data.rows;
+            }else{
+              this.getmemorandum.push({memorandum_title:'暂无数据'})
+            }
             console.log(this.getmemorandum,98765)
           }
           this.loading = false;
@@ -671,6 +708,9 @@ export default {
          if(response.data !== undefined){
            this.tableDataalid = response.data.tableHeadList;
            this.postList = response.data
+           this.postList.rows.filter(route => {
+             route.dept_id = route.dept_id.value
+           })
            console.log(this.tableDataalid,67)
            this.totalprofile = response.data.total;
          }
@@ -685,18 +725,6 @@ export default {
      listIndextanl(this.calendaradd).then(response => {
          if(response.data !== undefined){
            this.queryData = response.data
-           this.queryData.columns.filter(route => {
-             // console.log(route)
-             if(route.htmlType == "input" || route.htmlType == 'textarea'){
-               this.inputList.push(route)
-             }else if(route.htmlType == "select"){
-               this.selectList.push(route)
-             }else if(route.htmlType == "datetime"){
-               this.dataList.push(route)
-             }else if(route.htmlType == "editor"){
-               this.editorList.push(route)
-             }
-         })
         // console.log(this.selectList)
 
          }
@@ -711,20 +739,7 @@ export default {
      listIndextanl(this.calendaraddmer).then(response => {
          if(response.data !== undefined){
            this.queryData = response.data
-           this.queryData.columns.filter(route => {
-             // console.log(route)
-             if(route.htmlType == "input" || route.htmlType == 'textarea'){
-               this.inputList.push(route)
-             }else if(route.htmlType == "select"){
-               this.selectList.push(route)
-             }else if(route.htmlType == "datetime"){
-               this.dataList.push(route)
-             }else if(route.htmlType == "editor"){
-               this.editorList.push(route)
-             }
-         })
         // console.log(this.selectList)
-
          }
          this.loading = false;
        }
@@ -766,7 +781,7 @@ export default {
     tabSbu(index){
       console.log(index)
      this.num = index - 1
-     this.queryParams.condition.notice_type = index
+     this.queryParams.fixedData.condition.notice_type = index
      this.getList()
     },
     // 第二部分tab点击numlist
@@ -776,7 +791,7 @@ export default {
     // 第三部分tab点击
     tabSbuprofile(index){
       this.numprofile = index - 1
-      this.queryParamstabprofile.condition.notice_type = index
+      this.queryParamstabprofile.fixedData.condition.info_type = index
       this.getLisprofile()
     },
     // 表单重置
@@ -799,7 +814,7 @@ export default {
       }
       this.getLisalendaraddd()
       this.open = true;
-      this.title = "添加日历";
+      this.title = "添加日程";
     },
     /** 提交按钮操作 */
     handleQuery() {
@@ -859,6 +874,25 @@ export default {
      this.title = "添加备忘录";
      this.getLisalendaradddmer()
     },
+    // 备忘录删除
+    index_deledetfe(id){
+      var that =  this
+      that.deledlid.idList = []
+      that.deledlid.idList.push(id)
+
+     this.$confirm('是否确认删除名称为"' + id + '"的数据项?', "警告", {
+         confirmButtonText: "确定",
+         cancelButtonText: "取消",
+         type: "warning"
+       }).then(function() {
+         return delIndexnabd(that.deledlid);
+       }).then(() => {
+         this.getLismemorandum();
+         this.msgSuccess("删除成功");
+         // this.$router.go(-1)
+       })
+    },
+
     handleSelectionChange() {
 
     },
@@ -876,6 +910,14 @@ export default {
      // const res = new Map();
      // console.log(arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1)))
      // return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
+    },
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data;
+        this.getLisalendar()
+        this.getLismemorandum()
+       console.log(this.user,97653)
+      });
     }
   },
 };
@@ -1025,6 +1067,7 @@ export default {
       width: 100%;
       padding: 0;
       margin: 0;
+      height: 85%;
       li{
         margin: 0;
         display: flex;
@@ -1152,6 +1195,7 @@ export default {
     margin-bottom: 20px;
     height: 316px;
     .index_profilep{
+
       font-size: 12px;
       font-family: PingFang SC;
       font-weight: bold;
@@ -1184,7 +1228,7 @@ export default {
       left: 0;
       bottom: -96px;
     }
-    img{
+    .imjud{
       width: 23px;
       height: 6px;
       position: absolute;
@@ -1206,12 +1250,25 @@ export default {
           line-height: 36px;
           flex: 1;
         }
-        span{
-          font-size: 12px;
-          font-family: PingFang SC;
-          font-weight: 400;
-          color: #343434;
-          line-height: 36px;
+        .index_navspande{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          span{
+            font-size: 12px;
+            font-family: PingFang SC;
+            font-weight: 400;
+            color: #343434;
+            line-height: 36px;
+            flex: 1;
+          }
+          img{
+            width: 16px;
+            height: 16px;
+            margin-left: 5px;
+            cursor: pointer;
+          }
+
         }
 
       }
@@ -1230,6 +1287,7 @@ export default {
     }
     .index_memoranduMailnav{
       padding: 0 20px;
+      height: 90%;
     }
     .index_navTimeimg{
       height: 47px;
@@ -1248,6 +1306,7 @@ export default {
 // table
 .tab_tol{
   // display: flex;
+  height: 80%;
   .tr_one{
     display: flex;
     justify-content: space-around;

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

@@ -140,7 +140,7 @@
              }
            }
          }
-         this.queryParams.image = JSON.stringify(this.queryParams.image)   
+         this.queryParams.image = JSON.stringify(this.queryParams.image)
          this.queryParams.file = JSON.stringify(this.queryParams.file)
          console.log(this.queryParams)
          if(this.queryParams.pageNum !== undefined){