yrik 4 жил өмнө
parent
commit
17827efa14

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

@@ -65,7 +65,7 @@ export function listIndex(data) {
 }
 export function listIndexfou(data) {
   return request({
-    url: '/boman-web-core/p/cs/getTableQuery',
+    url: '/boman-web-core/p/cs/queryList',
     method: 'post',
     data: data
   })

+ 46 - 6
ruoyi-ui/src/views/index.vue

@@ -34,7 +34,7 @@
                <div class="index_heade index_headeNav">
                  <img src="../assets/images/icon_more.png" alt="" class="index_headerImg">
                  <p class="index_headetab">
-                   <span :class="[num == index ? ' spanto' : '']" v-for="(item,index) in editableTabs" :key="index" @click="tabSbu(index)">{{item.title}} <p class="tab_i">3</p></span></span>
+                   <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">
@@ -204,7 +204,10 @@
                          </p>
                         <div class="index_memoranduMailnav">
                            <div class="tab_tol">
-                          	<tr class="tr_one">
+                             <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)">
@@ -213,7 +216,7 @@
                           			<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>
+                          		</tr> -->
                            </div>
                           <div class="index_haderPagin index_haderPaginfoiu">
                             <el-pagination
@@ -237,7 +240,7 @@
     </el-row>
     <!-- <el-divider /> -->
   <!-- 添加或修改公告对话框 -->
-  <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="980px" append-to-body>
+  <el-dialog :title="title" :visible.sync="open" width="980px" append-to-body>
            <el-form ref="form" :model="form" :rules="rules" label-width="160px" class="from_index">
              <el-row>
                <el-col :span="24" >
@@ -286,6 +289,7 @@ export default {
        title: "",
        value: new Date(),
        editableTabs: [],
+       attendance:['待我审批','已办理','我的流程','驳回审批'],
        editableTabsteo:[],
        configList:[],
        queryParams:{
@@ -338,6 +342,7 @@ export default {
         pageSize:6,
       },
       num:0,
+      numlist:0,
       numprofile:0,
       dictType:'sys_notice_type',
       // 公司概况
@@ -348,7 +353,10 @@ export default {
       getmemorandum:[],
       //通讯录参数
       aliemg:{
-        table:'sys_memorandum'
+        table:'sys_contacts',
+        orderBy:'create_time desc',
+        pageNo:1,
+        pageSize:6,
       },
       tableDataalid:[],
       getLisaillie:[],
@@ -396,11 +404,14 @@ export default {
       },
       rjtu:[],
       truew:[],
-      fales:[]
+      fales:[],
+      postList:{},
+      arr:'2,2,3,3,4,4'
     };
   },
 
   created() {
+    this.unique(this.arr)
     this.getLisalendar()//日历
     this.getList()
     this.getListtab()
@@ -468,6 +479,12 @@ export default {
                  if(this.truew.length >1){
                     content  = content + ',' + this.calendarData[i].schedule_content
                     // nujeug = content.split(',')
+                    // for(var i = 0 ; i < nujeug.length; i++){
+                    //   if (setre.indexOf(nujeug[i]) === -1) {
+                    //      setre.push(nujeug[i])
+                    //      }
+                    // }
+                    // content = setre.join(',')
                     // setre = [...new set(nujeug)]
                     // conert = setre.join(',')
                  }else{
@@ -653,6 +670,7 @@ export default {
      listIndexfou(this.aliemg).then(response => {
          if(response.data !== undefined){
            this.tableDataalid = response.data.tableHeadList;
+           this.postList = response.data
            console.log(this.tableDataalid,67)
            this.totalprofile = response.data.total;
          }
@@ -751,6 +769,10 @@ export default {
      this.queryParams.condition.notice_type = index
      this.getList()
     },
+    // 第二部分tab点击numlist
+    tabList(index){
+      this.numlist = index
+    },
     // 第三部分tab点击
     tabSbuprofile(index){
       this.numprofile = index - 1
@@ -836,6 +858,24 @@ export default {
      this.open = true;
      this.title = "添加备忘录";
      this.getLisalendaradddmer()
+    },
+    handleSelectionChange() {
+
+    },
+    // 字符串去重
+    unique(arr) {
+      let arfe = []
+      let serfgt = []
+      arfe = arr.split(',')
+      for(var i = 0 ; i < arfe.length; i++){
+         if (serfgt.indexOf(arfe[i]) === -1) {
+            serfgt.push(arfe[i])
+            }
+      }
+      console.log(serfgt.join(','))
+     // 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));
     }
   },
 };

+ 0 - 8
ruoyi-ui/src/views/system/form/index.vue

@@ -26,14 +26,6 @@
               <span :class="[index == numtab ? 'span' : '']">{{item.tableComment}}</span>
             </p>
           </div>
-        <!--  <el-form style="margin-top: 30px;" :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
-            <el-form-item label="岗位编码" prop="postCode" v-for="(item,index) in 2" :key="index">
-              <el-input v-model="queryParams.postCode" placeholder="请输入岗位编码" clearable size="small" @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            </el-form-item>
-          </el-form> -->
           <el-divider></el-divider>
           <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" />