工作汇报，翻页

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -5,11 +5,11 @@
         <div class="flex-align-center">
           <el-button style="margin:0 0 10px 10px" size="small" type="primary" :disabled="data.STATUS !== '新建'" v-if="type !== 'confirmdate'" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
         </div>
-        <Table 
+        <Table
           height="calc(100vh - 500px)"
-          ref="multipleTable" 
-          :layout="tablecols" 
-          :data="tableData" 
+          ref="multipleTable"
+          :layout="tablecols"
+          :data="tableData"
           :custom="true" :checkbox="true" fixedName="rowno orderRowno itemname itemno erpitemno model" redirect="left">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'qty'">
@@ -123,15 +123,25 @@
       </el-table-column>
     </el-table> -->
     <div style="margin-top:16px;text-align:right">
-      <el-pagination
+<!--      <el-pagination
         background
         small
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :current-page="currentPage"
+        :current-page="param.content.pageNumber"
         :page-size="param.content.pageSize"
         layout="total, prev, pager, next, jumper"
         :total="total">
+      </el-pagination>-->
+      <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="param.content.pageNumber"
+          :page-sizes="[100, 50, 100, 200]"
+          :page-size="100"
+          layout="total,sizes, prev, pager, next, jumper"
+          :total="total">
       </el-pagination>
     </div>
       </el-col>
@@ -187,16 +197,16 @@ export default {
       this.total = res.total
       this.currentPage = res.pageNumber
       console.log(res.data);
-      
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.params.content.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.params.content.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     async deleteOrderProduct (row) {
@@ -285,7 +295,7 @@ export default {
       })
       this.$emit('onSuccess')
       res.code === 1?fn():""
-      
+
     },
     // tableCellStyle({ row, column, rowIndex, columnIndex }) {
     //   console.log(row.taskColor, "-->row.taskColor");
@@ -309,4 +319,4 @@ export default {
 /* /deep/.el-table__fixed .el-table__row {
   color: red !important;
 } */
-</style>
+</style>

src/HDrpManagement/workReport/modules/reportSet/components/add.vue

@@ -21,44 +21,86 @@
                 </el-col>
               </el-row>
             </div>
-            <div class="report-people">
-              <div class="report-people_header">
-                <div class="normal-title" style="font-size:14px;margin-right:10px">汇报人员</div>
-                <addPeople @selectPeople="selectPeopleFun" v-model="form.hrids"></addPeople>
-              </div>
-              <el-form-item label-width="20px" prop="hrids">
-              <el-table
-                ref="table"
-                :data="selectPeople"
-                style="width: 100%"
-                size="mini"
-                v-model="form.hrids"
-                border>
-                <el-table-column
-                  prop="hrcode"
-                  label="编号">
-                </el-table-column>
-                <el-table-column
-                  prop="name"
-                  label="姓名">
-                </el-table-column>
-                <el-table-column
-                  prop="depname"
-                  label="部门">
-                </el-table-column>
-                <el-table-column
-                  prop="position"
-                  label="职位">
-                </el-table-column>
-                <el-table-column
-                  label="操作">
-                  <template slot-scope="scope">
-                    <el-button type="text" size="mini" @click="delSelecrPeople(scope.row)">删 除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-              </el-form-item>
-            </div>
+            <el-row>
+              <el-col :span="24">
+                <div class="report-people" >
+                  <div class="report-people_header">
+                    <div class="normal-title" style="font-size:14px;margin-right:10px">汇报人员</div>
+                    <addPeople @selectPeople="selectPeopleFun" v-model="form.hrids"></addPeople>
+                  </div>
+                  <el-form-item label-width="20px" prop="hrids">
+                    <el-table
+                        ref="table"
+                        :data="selectPeople"
+                        style="width: 100%"
+                        size="mini"
+                        v-model="form.hrids"
+                        border>
+                      <el-table-column
+                          prop="hrcode"
+                          label="编号">
+                      </el-table-column>
+                      <el-table-column
+                          prop="name"
+                          label="姓名">
+                      </el-table-column>
+                      <el-table-column
+                          prop="depname"
+                          label="部门">
+                      </el-table-column>
+                      <el-table-column
+                          prop="position"
+                          label="职位">
+                      </el-table-column>
+                      <el-table-column
+                          label="操作">
+                        <template slot-scope="scope">
+                          <el-button type="text" size="mini" @click="delSelecrPeople(scope.row)">删 除</el-button>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </el-form-item>
+                </div>
+              </el-col>
+<!--              <el-col :span="12">
+                <div class="report-people" >
+                  <div class="report-people_header">
+                    <div class="normal-title" style="font-size:14px;margin-right:10px">汇报部门</div>
+                    <addDepartment @selectPeople="selectPeopleFun" v-model="form.hrids"></addDepartment>
+                  </div>
+                  <el-form-item label-width="20px" prop="hrids">
+                    <el-table
+                        ref="table"
+                        :data="selectPeople"
+                        style="width: 100%"
+                        size="mini"
+                        v-model="form.hrids"
+                        border>
+                      <el-table-column
+                          prop="hrcode"
+                          label="编号">
+                      </el-table-column>
+                      <el-table-column
+                          prop="depname"
+                          label="部门">
+                      </el-table-column>
+                      <el-table-column
+                          prop="上级部门"
+                          label="职位">
+                      </el-table-column>
+                      <el-table-column
+                          label="操作">
+                        <template slot-scope="scope">
+                          <el-button type="text" size="mini" @click="delSelecrPeople(scope.row)">删 除</el-button>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </el-form-item>
+                </div>
+              </el-col>-->
+            </el-row>
+
+
             <div class="report-people">
               <div class="report-people_header">
                 <div class="normal-title" style="font-size:14px;margin-right:10px">汇报内容预设</div>
@@ -127,7 +169,7 @@
                   </el-select>
                 </el-form-item>
               </div>
-            </div> 
+            </div>
           </el-form>
       </div>
       <div class="fixed__btn__panel">
@@ -135,7 +177,7 @@
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
-    
+
   </div>
 </template>
 
@@ -143,10 +185,11 @@
 import selectTeam from './teamSelect'
 import addPeople from './addPeople'
 import addOption from './addOption'
+import addDepartment from './addDepartment'
 export default {
   name: "add",
   props:[],
-  components:{selectTeam,addPeople,addOption},
+  components:{selectTeam,addPeople,addOption,addDepartment},
   data(){
     return {
       dialog:false,
@@ -164,6 +207,7 @@ export default {
         ],
         "reporttohrids": [
         ],
+        "departmentids": []
       },
       rules:{
         reportname:[
@@ -341,4 +385,4 @@ export default {
   margin-left: 10px;
   vertical-align: bottom;
 }
-</style>
+</style>

src/HDrpManagement/workReport/modules/reportSet/components/addDepartment.vue

@@ -0,0 +1,89 @@
+<template>
+  <div>
+    <el-button size="mini" type="primary" @click="addBtn">添 加</el-button>
+    <el-drawer title="添加人员" append-to-body :show-close="false" :visible.sync="dialog" size="1000px">
+      <div slot="title" style="font-size: 15px">
+        添加人员
+      </div>
+
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import selectTable from '@/components/selectTable/index'
+export default {
+  name: "addDepartment",
+  props:['data'],
+  components:{selectTable},
+  data(){
+    return {
+      dialog:false,
+      list:[],
+      tablecols:[],
+      result:[],
+      params: {
+        "id": "20230619103402",
+        "content": {
+          "sys_workreportmodelid": '',
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          }
+        },
+      },
+      total:0,
+    }
+  },
+  methods:{
+    addBtn () {
+      this.dialog = true
+      this.listData()
+    },
+    async listData () {
+      this.params.content.sys_workreportmodelid = this.data ? this.data.sys_workreportmodelid : 0
+      let res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total = res.total
+      console.log(this.list);
+    },
+    onSubmit(){
+      this.$emit('selectPeople',this.selectPeople)
+      this.dialog = false
+    },
+    async allData () {
+      let param = JSON.parse(JSON.stringify(this.params))
+      param.content.pageSize = 9999999
+      let res = await this.$api.requested(param)
+      this.$confirm(`总共有${res.total}位员工,是否选中`,'提示',{
+        confirmButtonText:'确定',
+        cancelButtonText:'取消',
+        type:'warning'
+      }).then(() => {
+        if (res.data.length) this.$emit('selectPeople',res.data)
+        this.dialog = false
+      })
+    },
+    selectChange (data) {
+      this.selectPeople = data
+    },
+    upDateData (data) {
+      this.selectPeople = data
+    },
+    handleCurrentChange (val) {
+      this.params.content.pageNumber = val
+      this.listData()
+    }
+
+  },
+  created () {
+    this.listData()
+    this.tablecols = this.tool.tabelCol(this.$route.name).reportDepmentTable.tablecols.splice(0,3)
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/workReport/modules/reportSet/components/edit.vue

@@ -139,7 +139,7 @@
                   </el-select>
                 </el-form-item>
               </div>
-            </div> 
+            </div>
           </el-form>
       </div>
       <div class="fixed__btn__panel">
@@ -147,7 +147,7 @@
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
-    
+
   </div>
 </template>
 
@@ -177,6 +177,7 @@ export default {
         ],
         "reporttohrids": [
         ],
+        "departmentids": []
       },
       rules:{
         reportname:[
@@ -375,7 +376,7 @@ export default {
               "type": 2, //汇报人员,汇报对象
               "hrids": result
           },
-      }) 
+      })
       this.tool.showMessage(res,() => {
         this.getDetail()
         this.$refs.team.dialogFormVisible = false
@@ -400,7 +401,7 @@ export default {
     }
   },
   created () {
-    
+
   }
 }
 </script>
@@ -442,4 +443,4 @@ export default {
   margin-left: 10px;
   vertical-align: bottom;
 }
-</style>
+</style>