项目详情新增项目实际完成工作量

oa-ui/src/views/flowable/form/projectProcess/actualWork.vue

@@ -10,7 +10,7 @@
         <td>等级或比例尺</td>
         <td>单位</td>
         <td>工作量</td>
-        <td style="width: 100px">要求完成时间</td>
+        <td style="width: 100px">实际完成时间</td>
         <td>备注</td>
         <td>操作</td>
       </tr>
@@ -34,7 +34,7 @@
           <el-input v-model="work.workload" clearable></el-input>
         </td>
         <td>
-          <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+          <el-date-picker style="width: 140px" v-model="work.finishTime" value-format="yyyy-MM-dd" type="date"
             placeholder="选择日期">
           </el-date-picker>
         </td>

oa-ui/src/views/oa/project/info.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
     <div class="header">
-      <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack" v-show="needReturn">返回</el-button>
+      <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack"
+        v-show="needReturn">返回</el-button>
       <el-button type="success" plain @click="printOpen = true" class="print" icon="el-icon-printer">打印任务通知单</el-button>
       <h1>{{ '【' + project.projectNumber + '】' + project.projectName }}</h1>
       <el-button icon="el-icon-search" type="primary" class="records" @click="clickRecords">流转记录</el-button>
@@ -134,7 +135,7 @@
                 <el-table :data="workList">
                   <el-table-column type="index" width="50" />
                   <el-table-column label="工作内容" prop="content" />
-                  <el-table-column label="比例尺" prop="scale" />
+                  <el-table-column label="等级或比例尺" prop="scale" />
                   <el-table-column label="单位" prop="unit" />
                   <el-table-column label="工作量" prop="workload" />
                   <el-table-column label="要求完成时间" prop="deadline" />
@@ -279,7 +280,7 @@
                 <el-input disabled type="textarea" v-model="projectComment.jyComment"></el-input>
                 <div class="sign mt10">
                   <div class="mr20">签名：<span class="auditor">{{ projectComment.jyUser ? projectComment.jyUser.nickName :
-        ''
+          ''
                       }}</span>
                   </div>
                   <div class="ml20"><span>审核时间：{{ projectComment.jyApprovalTime }}</span></div>
@@ -295,7 +296,7 @@
                 <el-input disabled type="textarea" v-model="projectComment.manageComment"></el-input>
                 <div class="sign mt10">
                   <div class="mr20">签名：<span class="auditor">{{ projectComment.managerUser ?
-        projectComment.managerUser.nickName : '' }}</span>
+          projectComment.managerUser.nickName : '' }}</span>
                   </div>
                   <div class="ml20"><span>审核时间：{{ projectComment.manageApprovalTime }}</span></div>
                 </div>
@@ -346,7 +347,7 @@
               </template>
               <el-select v-model="devices" multiple disabled style="width:100%">
                 <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
-        + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+          + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
                 </el-option>
               </el-select>
             </el-descriptions-item>
@@ -409,6 +410,27 @@
                 </el-table>
               </div>
             </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="date" />
+                实际完成工作量
+              </template>
+              <div>
+                <el-table :data="actualList">
+                  <el-table-column label="序号" type="index" width="50" />
+                  <el-table-column label="工作内容" prop="content" />
+                  <el-table-column label="等级或比例尺" prop="scale" />
+                  <el-table-column label="单位" prop="unit" />
+                  <el-table-column label="工作量" prop="workload" />
+                  <el-table-column label="实际完成时间" prop="deadline">
+                    <template slot-scope="scope">
+                      <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="备注" prop="remark" />
+                </el-table>
+              </div>
+            </el-descriptions-item>
             <el-descriptions-item :span="2">
               <template slot="label">
                 <svg-icon slot="prefix" icon-class="form" />
@@ -524,6 +546,7 @@ import { getProject, updateProject } from "@/api/oa/project/project";
 import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectComment, getProjectComment } from "@/api/oa/project/projectComment";
 import { listProjectProgress, getProjectProgress } from "@/api/oa/project/projectProgress";
+import { listProjectWorkload } from '@/api/oa/project/projectWorkload'
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract } from "@/api/oa/contract/contract";
 import { listDevice } from "@/api/oa/device/device";
@@ -563,6 +586,7 @@ export default {
       this.getProjectCommentList(projectId);
       this.getContractDataList(projectId);
       this.getProjectProgressList(projectId);
+      this.getActualList(projectId);
       this.getProjectChangeList(projectId);
     } else {
       this.goBack();
@@ -580,6 +604,7 @@ export default {
       workList: [],
       deptLeaderList: [],
       progressList: [],
+      actualList: [],
       contractCode: "",
       contractNumber: "",
       openBudget: false,
@@ -678,6 +703,13 @@ export default {
         }
       });
     },
+    getActualList(projectId) {
+      listProjectWorkload({ pageNum: 1, pageSize: 100, projectId: projectId }).then(res => {
+        if (res.total > 0) {
+          this.actualList = res.rows;
+        }
+      })
+    },
     // 获取项目相关合同编号
     getContractDataList(projectId) {
       listProjectContract({ projectId }).then(res => {