From d1be4bc2e4bc0daff8b3cc100432400cce7b2591 Mon Sep 17 00:00:00 2001
From: chen <2280784283@qq.com>
Date: Wed, 10 Jul 2024 16:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=91=A8=E8=AE=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../departmentWeekly/DepartmentWeeklyEdit.vue | 61 ++-----------------
 .../departmentWeekly/DepartmentWeeklyList.vue | 12 +++-
 .../src/server/projectManagements/index.js    |  1 +
 3 files changed, 17 insertions(+), 57 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
index d4c6576..7ff8eca 100644
--- a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
+++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
@@ -4,74 +4,23 @@
     <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-select class="form-input" filterable placeholder="请选择" v-model="formModel.projectNo" :disabled="true">
+              </el-select>
             </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-select class="form-input" filterable placeholder="请选择" v-model="formModel.projectName" :disabled="true">
+              </el-select>
             </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"
@@ -399,7 +348,7 @@ export default {
             }
           }
           this.isSave = false
-          Api.ProjectManagements.addWeekly(data.projectWeeklyAddReq).then(result => {
+          Api.ProjectManagements.deptDepartmentWeekly(data.projectWeeklyAddReq).then(result => {
             this.isSave = true
             if (result.status === 0) {
               this.$message.info(result.data)
diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
index 6273249..b2abf59 100644
--- a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
+++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
@@ -29,6 +29,11 @@
       label="下周计划"
       >
     </el-table-column>
+    <el-table-column
+      prop="week"
+      label="周数"
+    >
+    </el-table-column>
     <el-table-column label="操作">
       <template slot-scope="scope">
       <el-button type="text" size="mini" @click="showById(scope.row.id)">查看工作量</el-button>
@@ -51,7 +56,7 @@
         <div>
           <el-table :data="workLoadInfo">
             <el-table-column
-              prop="userId"
+              prop="person_name"
               label="姓名"
             >
             </el-table-column>
@@ -60,6 +65,11 @@
               label="工作量(人日)"
             >
             </el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" size="mini" @click="updateById(scope.row.id)">修改</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <span slot="footer" class="dialog-footer">
diff --git a/kehui-oa-front/src/server/projectManagements/index.js b/kehui-oa-front/src/server/projectManagements/index.js
index c143ba9..17bdd99 100644
--- a/kehui-oa-front/src/server/projectManagements/index.js
+++ b/kehui-oa-front/src/server/projectManagements/index.js
@@ -63,4 +63,5 @@ export default {
    * */
   getDepartmentWeekly: (param) => Ax('post', '/api/project/departmentWeekly', param),
   getWorkLoad: (id) => Ax('get', `/api/project/departmentWeekly/showById/${id}`, id),
+  deptDepartmentWeekly: (param) => Ax('post', '/api/project/departmentWeekly/update', param)
 }