1.部门周报页面的修改

2.修改页面的本周进展改为文本域

kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue

@@ -31,6 +31,8 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formAll.ls[0].thisWeek"
+                type="textarea"
+                row="7"
               >
               </el-input>
             </el-form-item>
@@ -39,6 +41,8 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formAll.ls[0].nextWeek"
+                type="textarea"
+                row="7"
               >
               </el-input>
             </el-form-item>

kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue

@@ -38,11 +38,17 @@
       prop="thisWeek"
       label="本周进展"
     >
+      <template slot-scope="{ row }">
+        <div style="white-space: pre-wrap;">{{ row.thisWeek }}</div>
+      </template>
     </el-table-column>
     <el-table-column
       prop="nextWeek"
       label="下周计划"
       >
+      <template slot-scope="{ row }">
+        <div style="white-space: pre-wrap;">{{ row.nextWeek }}</div>
+      </template>
     </el-table-column>
     <el-table-column
       prop="week"
@@ -52,9 +58,10 @@
     <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>
+      <el-button type="text" size="mini" @click="updateById(scope.row.id)">查看</el-button>
         <el-button v-if="isButtonDisabled(scope.row.id)" type="text" size="mini" disabled>已汇总</el-button>
-        <el-button v-else type="text" size="mini" @click="summary(scope.row)">汇总</el-button>
+        <el-button v-else-if="isAdminDisabled(scope.row)" type="text" size="mini" @click="summary(scope.row)">汇总</el-button>
+        <el-button v-else type="text" size="mini" disabled>汇总</el-button>
       </template>
     </el-table-column>
   </el-table>
@@ -130,6 +137,7 @@
           projectName: '',
           week: ''
         },
+        formAll: [],
         dataList: [],
         workLoadInfo: [], // 用户名和工作量信息
         ext: [],
@@ -172,6 +180,7 @@
           this.pageLoading = false;
           console.log("周报填报列表",result)
           if (result.status === 0) {
+            this.formAll = result.data;
             this.dataList = result.data.ls;
             this.total = result.data.total;
             for (let i=0; i<this.dataList.length; i++) {
@@ -181,7 +190,8 @@
                 userName: this.dataList[i].userName,
                 workload: this.dataList[i].workload,
                 thisWeek: this.dataList[i].thisWeek,
-                nextWeek: this.dataList[i].nextWeek
+                nextWeek: this.dataList[i].nextWeek,
+                ids: this.dataList[i].id
               })
             }
             console.log("tableRowsData",this.tableRowsData)
@@ -304,6 +314,16 @@
       isButtonDisabled (id) {
         return this.disabledButtons.includes(id);
       },
+      isAdminDisabled (row) {
+        if (row.id === this.ids) {
+          if (this.formAll.userId !== this.formAll.ls[0].ext.draftManId &&
+            this.formAll.userId !== this.formAll.ls[0].ext.projectManagerData) {
+            return true;
+          }
+        } else {
+          return false
+        }
+      },
       updateWorkload (id) {
         this.$router.push({
           name: "DepartmentWorkloadEdit",

kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue

@@ -101,7 +101,8 @@ export default {
               week: dataList[i].week,
               budget: dataList[i].budget,
               execute: dataList[i].execute,
-              implementationRate: dataList[i].implementationRate
+              implementationRate: dataList[i].implementationRate,
+              updatedAt: dataList[i].updatedAt
             })
           }
         }
@@ -188,6 +189,11 @@ export default {
           label: '预算执行率',
           prop: 'implementationRate',
           show: true
+        },
+        {
+          label: '修改时间',
+          prop: 'updatedAt',
+          show: true
         }
       ]
     },