给本周进展和下周计划改为文本域

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

@@ -32,7 +32,7 @@
                 placeholder="请输入内容"
                 v-model="formAll.ls[0].thisWeek"
                 type="textarea"
-                row="7"
+                :rows="5"
               >
               </el-input>
             </el-form-item>
@@ -42,7 +42,7 @@
                 placeholder="请输入内容"
                 v-model="formAll.ls[0].nextWeek"
                 type="textarea"
-                row="7"
+                :rows="5"
               >
               </el-input>
             </el-form-item>

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

@@ -318,15 +318,12 @@
       },
       isAdminDisabled (rowId) {
         const rowData = this.dataList.find(item => item.id === rowId);
-        console.log("rowData=:", rowData);
+          if (this.formAll.userId !== rowData.ext.draftManId &&
-        if (rowId === rowData.id) {
+            this.formAll.userId !== rowData.ext.projectManagerData) {
-          if (this.formAll.userId !== rowData.draftManId &&
+            return false
-            this.formAll.userId !== rowData.projectManagerData) {
+          } else {
-            return false;
+            return true
           }
-        } else {
-          return true
-        }
       },
       updateWorkload (id) {
         this.$router.push({

kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue

@@ -121,6 +121,8 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formModel.thisWeek"
+                type="textarea"
+                :rows="5"
               >
               </el-input>
             </el-form-item>
@@ -129,6 +131,8 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formModel.nextWeek"
+                type="textarea"
+                :rows="5"
               >
               </el-input>
             </el-form-item>

kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue

@@ -36,6 +36,8 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formAll.ls[0].thisWeek"
+                type="textarea"
+                :rows="5"
               >
               </el-input>
             </el-form-item>
@@ -44,6 +46,8 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formAll.ls[0].nextWeek"
+                type="textarea"
+                :rows="5"
               >
               </el-input>
             </el-form-item>

kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue

@@ -60,7 +60,7 @@
         <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>
           </template>
         </el-table-column>
       </el-table>