diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
new file mode 100644
index 0000000..d4c6576
--- /dev/null
+++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
@@ -0,0 +1,448 @@
+<template>
+  <div id="content-container" :class="{'expand-right': expandRight}">
+    <!--Page Title-->
+    <div id="page-title">
+      <h1 class="page-header text-overflow">个人周报填报</h1>
+    </div>
+    <!--End page title-->
+
+    <!--Breadcrumb-->
+    <!--<ol class="breadcrumb">-->
+    <!--<li><a href="#">Home</a></li>-->
+    <!--<li><a href="#">Layouts</a></li>-->
+    <!--<li class="active">Demo</li>-->
+    <!--</ol>-->
+    <!--End breadcrumb-->
+
+    <!--Page content-->
+    <div class="page-content">
+      <div class="panel">
+        <div class="panel-body">
+          <el-form :model="formModel" label-width="100px" ref="formName">
+            <el-form-item label="部门" prop="deptId">
+              <el-select class="form-input" filterable placeholder="请选择" v-model="formModel.deptId" :disabled="true">
+                <el-option
+                  v-for="subItem in orgOptions"
+                  :key="subItem.model"
+                  :label="subItem.label"
+                  :value="subItem.model"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="姓名" prop="userId">
+              <el-select class="form-input" filterable placeholder="请选择" :disabled="true"
+                         v-model="formModel.userInfoId">
+                <el-option
+                  v-for="subItem in userInfoOption"
+                  :key="subItem.model"
+                  :label="subItem.label"
+                  :value="subItem.model"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="项目编号" prop="projectNo">
+              <el-input
+                class="form-input"
+                placeholder="请输入内容"
+                v-model="formModel.projectNo"
+              >
+              </el-input>
+            </el-form-item>
+
+            <!--            :rules="[-->
+            <!--            {projectName: true, message: '项目名称不能为空'}]"-->
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input
+                class="form-input"
+                placeholder="请输入内容"
+                v-model="formModel.projectName"
+              >
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="工作量(人日)" prop="workload">
+              <el-input
+                class="form-input"
+                placeholder="请输入内容"
+                v-model.number="formModel.workload"
+                @change="moneyChange"
+              >
+              </el-input>
+            </el-form-item>
+            <el-form-item label="本周进展" prop="thisWeek">
+              <el-input
+                class="form-input"
+                placeholder="请输入内容"
+                v-model="formModel.thisWeek"
+              >
+              </el-input>
+            </el-form-item>
+            <el-form-item label="下周计划" prop="nextWeek">
+              <el-input
+                class="form-input"
+                placeholder="请输入内容"
+                v-model="formModel.nextWeek"
+              >
+              </el-input>
+            </el-form-item>
+            <!--              </div>-->
+            <el-form-item>
+              <div style="float: right">
+                <el-button @click="cancel()" type="default">取消</el-button>
+                <el-button @click="save('formName')" type="primary" :disabled="!isSave">修改</el-button>
+              </div>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+    </div>
+    <!--End Page content-->
+  </div>
+</template>
+
+<script>
+import DataForm from '../../../components/form/DataForm.vue'
+import DataTable from '../../../components/DataTable.vue'
+import Api from '../../../server/index'
+import app from '../../../assets/js/common/app.js'
+import {baseUrl} from '../../../config/env.js'
+import verifyButton from '../../../components/verifyButton.vue'
+import FlowRecordTable from '../../../components/FlowRecordTable.vue'
+
+export default {
+  beforeRouteEnter (to, from, next) {
+    next(function (vm) {
+      global.getMenuIndex(vm)
+    })
+  },
+  data () {
+    return {
+      ext: {},
+      thisWeek: '',
+      nextWeek: '',
+      userId: '',
+      workload: '',
+      projectName: '',
+      money: '',
+      projectNo: '',
+      expandRight: false,
+      app: app,
+      reimburseId: '',
+      actionUrl: `${baseUrl}/api/common/file-upload`,     // 上传路径
+      baseUrl: baseUrl,
+      formModel: {
+        userInfoId: '',
+        witness: '',
+        deptId: '',
+        reimburseCategory: '',   // 报销种类
+        reason: '',         // 报销事由
+        selectBudgetCategoryId: [],   // 预算种类
+        reimburseDetail: [
+          {
+            time: '',
+            money: '',
+            moneyDetail: '',
+            total: 0,
+            hasBill: '',     // 是否有发票
+            fileList: [],     // 文件列表
+          }
+        ],  // 报销详情
+        activie: 0
+      },
+      formWitnessData: [],   // 证明人数据源
+      orgOptions: [],
+      userInfoOption: [],
+      reimburseCategoryData: app.reimbursement,    // 报销种类
+      budgetCategory: [],    // 预算种类层级
+      reimburseIndex: 0,   // 点击哪个报销明细做个标记
+      // 审批相关
+      rewriteAgreeVerify: false, //是否要重写同意审批事件
+      rewriteRejectVerify: false, //是否要重写驳回审批事件
+      rewriteDestroyVerify: false, //是否要重写作废审批事件
+      flowId: '',
+      taskId: '',
+      checkOrVerify: false, //标识是查看详情还是审批
+      isSave: true,
+      isEdit: false,
+      canEditReimburseCategory: false, //标识是否能改报销分类
+      canEditBudgetCategory: false, //标识是否能改预算类别
+      isVerify: false,
+      isNotVerifyReady: false     // 是否未审核
+    }
+  },
+  created () {
+    this.taskId = this.$route.params.taskId
+    if (this.$route.name === 'ExpenseClaimApplyEdit') {
+      this.isEdit = true
+      this.flowId = this.$route.params.id
+      console.log('路由ID为', this.$route.params.id)
+      this.checkOrVerify = true
+    } else if (this.$route.name === 'ExpenseClaimApplyVerify') {
+      this.isVerify = true
+      this.flowId = this.$route.params.verifyId
+      this.checkOrVerify = false
+      this.isNotVerifyReady = this.$route.query.isNotVerifyReady === 'Y'
+    } else if (this.$route.name === 'ExpenseClaimApplyArchive') {
+      this.flowId = this.$route.params.id
+      this.checkOrVerify = true
+    } else {
+      this.flowId = this.$route.params.id
+      this.checkOrVerify = true
+    }
+    this.init()
+    this.getBudgetCategory()
+  },
+  methods: {
+    init () {
+      this.reimburseId = this.$route.params.id
+      this.getWeekly()
+
+    },
+    getWeekly () {
+      let ProjectWeekly = {
+        id: this.reimburseId
+      }
+      Api.ProjectManagements.getWeekly(ProjectWeekly).then(result => {
+        this.tableRowsData = []
+        this.pageLoading = false
+        if (result.status === 0) {
+          console.log('获取信息', result)
+          let dataList = result.data.ls[0]
+          this.formModel = dataList
+          this.formModel.userInfoId = dataList.ext.userName
+          this.formModel.deptId = dataList.ext.deptName
+        }
+      })
+    },
+    //判断是否能修改报销分类和预算类别（财务专员在审批中能修改）
+    judgeEditAuth (canEdit) {
+      if (this.isNotVerifyReady === true) {
+        if (this.$route.name === 'ExpenseClaimApplyVerify') {
+          this.canEditBudgetCategory = canEdit
+          this.rewriteAgreeVerify = canEdit
+          this.rewriteRejectVerify = canEdit
+          this.rewriteDestroyVerify = canEdit
+          if (this.formModel.reimburseCategory !== 'medical') {
+            this.canEditReimburseCategory = canEdit
+            //其他类型的报销不能改为医疗保险
+            let destData = []
+            this.reimburseCategoryData.forEach((category, index) => {
+              destData.push(
+                {
+                  label: category.label,
+                  model: category.model,
+                  disabled: category.model === 'medical',
+                }
+              )
+            })
+            this.reimburseCategoryData = destData
+          }
+          this.isEdit = false
+        } else {
+          this.isEdit = canEdit
+        }
+      }
+    },
+    getBudgetCategory () {
+      Api.Common.getBudgetCategory().then(result => {
+        if (result.status === 0) {
+          this.budgetCategory = this.assembleOrgData(result.data)
+        } else {
+          this.$message.error(`${result.msg}`)
+        }
+      })
+    },
+    //请求所有人员
+    getAllPeople () {
+      // Api.PersonnelManagement.personListNew(1, 10000).then((result) => {
+      //   if (result.status === 0) {
+      //     for (let i = 0; i < result.data.ls.length; i++) {
+      //       let people = result.data.ls[i]
+      //       this.formWitnessData.push({
+      //         model: people.id,
+      //         label: people.personName,
+      //         disabled: people.id === this.formModel.userInfoId
+      //       })
+      //     }
+      //   } else {
+      //     this.$message.error(`${result.msg}`)
+      //   }
+      // })
+      let params = {
+        path: {
+          id: 0
+        }
+      }
+      Api.Administration.getPeers(params).then((result) => {
+        console.log('查询所有')
+        console.log('查询所有人员的方法')
+        if (result.status === 0) {
+          // this.formModel.deptId=this.assembleOrgData(result.data)
+          this.orgOptions = this.assembleOrgData(result.data)
+          // this.formModel.userId=this.assembleOrgData(result.data)
+          // this.userInfoOption=this.assembleOrgData(result.data)
+          console.log('deptId', this.formModel.deptId)
+          console.log('orgOptions', this.orgOptions)
+          console.log('userId', this.formModel.userId)
+          console.log('userInfoOption', this.userInfoOption)
+          //执行部门所有下拉数据
+          // this.formPermissionsData = this.assembleOrgData(result.data)
+          //任务执行人下拉回显
+          // this.formProjectManagerData = this.assembleOrgData(result.data)
+          // this.formPeopleData = this.assembleOrgData(result.data)
+          // this.formProjectAdmin = this.assembleOrgData(result.data)
+          // this.formMainLeader = this.assembleOrgData(result.data)
+          // this.formBranchLeader = this.assembleOrgData(result.data)
+        } else {
+          this.$message.error(result.msg)
+        }
+      })
+    },
+    //递归组装部门级联选择器数据源
+    assembleOrgData (source) {
+      let dest = []
+      for (let i = 0; i < source.length; i++) {
+        let org = {
+          value: source[i].id,
+          parentId: source[i].parentId,
+          label: source[i].name,
+          depth: source[i].depth
+        }
+        if (source[i].childList && source[i].childList.length > 0) {
+          org['children'] = this.assembleOrgData(source[i].childList)
+        }
+        dest.push(org)
+      }
+      return dest
+    },
+    addFile () {
+      this.formModel.reimburseDetail.push({
+        time: '',
+        money: '',
+        moneyDetail: '',
+        hasBill: '',     // 是否有发票
+        fileList: []     // 文件列表
+      })
+    },
+    deleteFile (index) {
+      if (this.formModel.reimburseDetail.length === 1) {
+        this.$message.warning('报销明细不能为空！')
+        return false
+      }
+      this.formModel.reimburseDetail.splice(index, 1)
+    },
+    // 上传附件
+    handleFileRemove (file, fileList) {
+      console.log(fileList)
+      setTimeout(() => {
+        this.formModel.reimburseDetail[this.reimburseIndex].fileList = []
+
+        for (let i = 0; i < fileList.length; i++) {
+          this.formModel.reimburseDetail[this.reimburseIndex].fileList.push({
+            name: fileList[i].name,
+            url: fileList[i].url
+          })
+        }
+      }, 10)
+    },
+    handleFileSuccess (res, file, fileList) {
+      if (res.status === 0) {
+        this.formModel.reimburseDetail[this.reimburseIndex].fileList.push({
+          name: file.name,
+          url: file.response.data.url
+        })
+      } else {
+        this.$message.error(`${res.msg}`)
+      }
+      console.log(this.formModel.reimburseDetail[this.reimburseIndex].fileList)
+    },
+    reimburseClick (index) {
+      this.reimburseIndex = index
+      console.log(index)
+    },
+    //重写同意审批按钮事件
+    agreeFlowVerify (comment) {
+      this.save('formName', 'commit', comment)
+    },
+    //重写驳回审批按钮事件
+    rejectFlowVerify (comment) {
+      this.save('formName', 'back', comment)
+    },
+    //重写作废审批按钮事件
+    destroyFlowVerify (comment) {
+      this.save('formName', 'end', comment)
+    },
+    cancel () {
+      this.$router.go(-1)
+    },
+    save (formName) {
+      console.log('formName', formName)
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let data = {
+            projectWeeklyAddReq: {
+              projectWeekly: {
+                id: this.$route.params.id,
+                thisWeek: this.formModel.thisWeek,
+                nextWeek: this.formModel.nextWeek,
+                workload: this.formModel.workload
+              },
+              ext: {
+                projectName: this.formModel.projectName,
+                projectNo: this.formModel.projectNo,
+                deptName: this.formModel.deptId,
+                userName: this.formModel.userInfoId
+              }
+            }
+          }
+          this.isSave = false
+          Api.ProjectManagements.addWeekly(data.projectWeeklyAddReq).then(result => {
+            this.isSave = true
+            if (result.status === 0) {
+              this.$message.info(result.data)
+              this.$router.push({name: 'DepartmentWeeklyList'})
+            } else {
+              this.$message.error(result.data)
+            }
+          })
+          console.log(data)
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+
+    },
+    moneyChange () {
+      let total = 0
+      for (let i = 0; i < this.formModel.reimburseDetail.length; i++) {
+        if (this.formModel.reimburseDetail[i].money === '' || !this.formModel.reimburseDetail[i].money) {
+          total += 0
+        } else {
+          total += Number(this.formModel.reimburseDetail[i].money)
+        }
+      }
+      this.formModel.total = total.toFixed(2)
+    }
+  },
+  components: {
+    DataTable, DataForm, verifyButton, FlowRecordTable
+  }
+}
+</script>
+
+<style scoped lang="less" rel="stylesheet/less">
+.expand-right {
+  @media (min-width: 768px) {
+    padding-left: 0 !important;
+  }
+}
+
+.page-content {
+  padding: 15px;
+}
+
+</style>
diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
index a0083c0..6273249 100644
--- a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
+++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
@@ -1,28 +1,4 @@
-<!--<template>
-  <div id="content-container" :class="{'expand-right': expandRight}">
-    <page-loading :show="pageLoading"></page-loading>
-    &lt;!&ndash;Page Title&ndash;&gt;
-    <div id="page-title">
-      <h1 class="page-header text-overflow">部门周报填报</h1>
-    </div>
-    <div class="page-content">
-      <data-table
-        :totalColumnsData="tableColumnsData"
-        :rowsData="tableRowsData"
-        :showSingleOperation="tableShowSingleOperation"
-        :showMultipleOperation="false"
-        :canFolded="true"
-        :showPageCtr="true"
-        :totalPage="tableTotalPage"
-        :currentPage="pageNo"
-        @selectPage="tableSelectPage"
-        @singleEdit="tableSingleEdit"
-        @singleCheck="tableSingleCheck"
-      >
-      </data-table>
-    </div>
-  </div>
-</template>-->
+
 <template>
   <div id="content-container" :class="{'expand-right': expandRight}">
     <page-loading :show="pageLoading"></page-loading>
@@ -54,8 +30,10 @@
       >
     </el-table-column>
     <el-table-column label="操作">
+      <template slot-scope="scope">
       <el-button type="text" size="mini" @click="showById(scope.row.id)">查看工作量</el-button>
       <el-button type="text" size="mini" @click="updateById(scope.row.id)">修改</el-button>
+      </template>
     </el-table-column>
   </el-table>
 
@@ -69,8 +47,7 @@
         layout="sizes, prev, pager, next, jumper, ->, total, slot"
       />
 <!--      查看每人工作量(人日)-->
-      <el-dialog title="查看每人工作量" :visible.sync="formDataInfo" width="35%">
-        <h3>每人工作量(人日)</h3>
+      <el-dialog title="查看每人工作量" :visible.sync="formDataInfo" width="60%">
         <div>
           <el-table :data="workLoadInfo">
             <el-table-column
@@ -120,11 +97,12 @@
           showCheck: true,
         },
         dataList: [],
-        workLoadInfo: [],
+        workLoadInfo: [], // 用户名和工作量信息
         formDataInfo: false,
         // 分页
         pageNo: 1, // 默认页码
         pageSize: 10, // 每页记录数
+        total: null,
         tableTotalPage: 1,
         tableColumnsData: [],
         tableRowsData: [],
@@ -146,12 +124,13 @@
           pageSize: this.pageSize
         }
         // this.pageLoading = true;
-        Api.ProjectManagements.getWeekly(projectWeeklyFindReq).then(result=>{
+        Api.ProjectManagements.getDepartmentWeekly(projectWeeklyFindReq).then(result=>{
           this.tableRowsData = [];
           this.pageLoading = false;
           console.log("周报填报列表",result)
           if (result.status === 0) {
             this.dataList = result.data.ls;
+            this.total = result.data.total;
             for (let i=0; i<this.dataList.length; i++) {
               this.tableRowsData.push({
                 projectNo: this.dataList[i].projectNo,
@@ -203,12 +182,6 @@
         this.pageNo = param;
         this.init();
       },
-      tableSingleCheck (index){
-        this.$router.push({
-          name: "ExpenseClaimApplyCheck",
-          params: {id: this.tableRowsData[index].id}
-        })
-      },
       showById (id) {
         Api.ProjectManagements.getWorkLoad(id).then(
           response => {
@@ -218,13 +191,12 @@
           }
         )
       },
-      tableSingleEdit (index) {
+      updateById (id) {
         this.$router.push({
-          name: "ExpenseClaimApplyEdit",
-          params: {id: this.tableRowsData[index].id}
+          name: "DepartmentWeeklyEdit",
+          params: {id}
         })
-      }
-    },
+      }},
     components: {
       PageLoading, DataTable, DataForm
     }
diff --git a/kehui-oa-front/src/router/index.js b/kehui-oa-front/src/router/index.js
index f1263eb..03b9a29 100644
--- a/kehui-oa-front/src/router/index.js
+++ b/kehui-oa-front/src/router/index.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 import {setItem} from '../config/mUtils.js'
+import DepartmentWeeklyDetail from "../pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit";
 
 // import Nav from '../components/nav/nav.vue'
 
@@ -323,6 +324,7 @@ const ProjectBudgetApplyAdd = r => require.ensure([], () => r(require('../pages/
 const ProjectBudgetApplyDetail = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue')), 'ProjectBudgetApplyDetail')
 // 部门周报
 const DepartmentWeeklyList = r => require.ensure([], () => r(require('../pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue')), 'DepartmentWeeklyList')
+const DepartmentWeeklyEdit = r => require.ensure([], () => r(require('../pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue')), 'DepartmentWeeklyEdit')
 //财务管理
 const ExpenseReceipteManagement = r => require.ensure([], () => r(require('../pages/financialManagement/expenseReceipteManagement/ExpenseReceipteManagement.vue')), 'ExpenseReceipteManagement')
 const ExpenseReceipteDetail = r => require.ensure([], () => r(require('../pages/financialManagement/expenseReceipteManagement/ExpenseReceipteDetail.vue')), 'ExpenseReceipteDetail')
@@ -2339,6 +2341,16 @@ export default new Router({
             module: 'project'
           }
         },
+        {
+          // 项目管理-->部门项目周报修改
+          name: 'DepartmentWeeklyEdit',
+          path: '/project/managements/departmentWeekly/department/Weekly/edit/:id',
+          component: DepartmentWeeklyEdit,
+          meta: {
+            info: 'WeeklyManagements',
+            module: 'project'
+          }
+        },
         //
         // {
         //   //项目管理-->项目立项
diff --git a/kehui-oa-front/src/server/projectManagements/index.js b/kehui-oa-front/src/server/projectManagements/index.js
index d142147..ab910cb 100644
--- a/kehui-oa-front/src/server/projectManagements/index.js
+++ b/kehui-oa-front/src/server/projectManagements/index.js
@@ -53,6 +53,10 @@ export default {
   getBudget:(param) => Ax('post', '/api/project/weekly/budget', param),
   addBudget:(param) => Ax('post', '/api/project/weekly/budget/add', param),
   delBudget:(param) => Ax('delete', '/api/project/weekly/budget/del', param),
+  /**
+   * 部门周报填报管理
+   *
+   * */
   getDepartmentWeekly: (param) => Ax('post', '/api/project/departmentWeekly', param),
-  getWorkLoad: (id) => Ax('get', `/api/project/departmentWeekly/showById/${id}`, id)
+  getWorkLoad: (id) => Ax('get', `/api/project/departmentWeekly/showById/${id}`, id),
 }