完善项目实际工作量

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectWorkloadMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcProjectWorkloadVo">
-        select workload_id, project_id, content, scale, unit, workload, finish_time, remark from cmc_project_work
+        select workload_id, project_id, content, scale, unit, workload, finish_time, remark from cmc_project_workload
     </sql>
 
     <select id="selectCmcProjectWorkloadList" parameterType="CmcProjectWorkload" resultMap="CmcProjectWorkloadResult">
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertCmcProjectWorkload" parameterType="CmcProjectWorkload">
-        insert into cmc_project_work
+        insert into cmc_project_workload
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="workloadId != null">workload_id,</if>
             <if test="projectId != null">project_id,</if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateCmcProjectWorkload" parameterType="CmcProjectWorkload">
-        update cmc_project_work
+        update cmc_project_workload
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="content != null">content = #{content},</if>
@@ -76,11 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteCmcProjectWorkloadByProjectId" parameterType="String">
-        delete from cmc_project_work where project_id = #{projectId}
+        delete from cmc_project_workload where project_id = #{projectId}
     </delete>
 
     <delete id="deleteCmcProjectWorkloadByProjectIds" parameterType="String">
-        delete from cmc_project_work where project_id in
+        delete from cmc_project_workload where project_id in
         <foreach item="projectId" collection="array" open="(" separator="," close=")">
             #{projectId}
         </foreach>

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-04 17:29:54
+ * @LastEditTime: 2024-09-05 10:39:05
 -->
 <template>
   <div class="app-container">
@@ -817,7 +817,6 @@ export default {
       this.workList = this.$refs.workTableRef.workList;
       this.paymentList = this.$refs.paymentRef.paymentList;
       if (this.formTotal != 0) {
-        console.log(this.form.partnerId);
         if (this.form.partnerId && this.form.partnerId instanceof Array)
           this.form.partnerId = this.form.partnerId.join(',')
         updateSubContract(this.form).then(response => {
@@ -1031,24 +1030,6 @@ export default {
     },
     confirmProject(val) {
       this.open = false
-      // if (val.length > 1) {
-      //   this.$message.error('请选择一个项目');
-      //   return;
-      // }
-      // if (val.length === 1) {
-      //   this.chooseProject = val[0];
-      //   this.isSelect = true;
-      //   this.form.projectId = val[0].projectId;
-
-      //   this.fetchContracts(this.form.projectId)
-      //     .then(contractData => {
-      //       this.processContractData(contractData);
-      //     })
-      //     .catch(error => {
-      //       console.error('获取合同列表时出错:', error);
-      //       this.$message.error('获取合同列表时出错');
-      //     });
-      // }
       if (val) {
         this.chooseProjectList = val;
         this.isSelect = true

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

@@ -42,12 +42,13 @@
           <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
         </td>
         <td>
-          <el-button type="text" style="color:#F56C6C" size="mini" @click="deletWorkItem(index)">删除行</el-button>
+          <div class="delete-btn" @click="deletWorkItem(index)">
+            <i class="el-icon-circle-close"></i>
+          </div>
         </td>
       </tr>
     </table>
     <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addWorkList"></el-button>
-
   </div>
 </template>
 
@@ -74,7 +75,7 @@ export default {
     }
   },
   created() {
-
+    this.getList();
   },
   methods: {
     getList() {
@@ -84,7 +85,9 @@ export default {
         projectId: this.projectId
       }
       listProjectWorkload(queryParams).then(res => {
-
+        if (res.total > 0) {
+          this.workList = res.rows;
+        }
       })
     },
     addWorkList() {
@@ -127,4 +130,13 @@ table {
 .title {
   background-color: #f5f7fa;
 }
+
+.delete-btn {
+  color: #F56C6C;
+  cursor: pointer;
+
+  i {
+    font-size: 25px;
+  }
+}
 </style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:54
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-04 17:06:39
+ * @LastEditTime: 2024-09-05 10:30:20
 -->
 <template>
   <div>
@@ -88,17 +88,18 @@
                 <el-input v-model="progress.situation" type="textarea"></el-input>
               </td>
               <td>
-                <el-button type="text" icon="el-icon-delete" style="color:#F56C6C" size="mini"
-                  @click="deleProgressItem(index)">删除行</el-button>
+                <div class="delete-btn" @click="deleProgressItem(index)">
+                  <i class="el-icon-circle-close"></i>
+                </div>
               </td>
             </tr>
           </table>
           <el-button icon="el-icon-plus" size="mini" @click="addProgressList()" type="primary" plain></el-button>
         </el-form-item>
         <el-divider></el-divider>
-        <actual-work :projectId="taskForm.formId"></actual-work>
+        <actual-work ref="actualRef" :projectId="taskForm.formId"></actual-work>
       </el-form>
-        <el-divider></el-divider>
+      <el-divider></el-divider>
       <div class="headers">
         项目借款
         <div class="line"></div>
@@ -140,6 +141,7 @@ import { mapGetters } from "vuex";
 import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
 import { listProjectProgress, getProjectProgress, addProjectProgress, delProjectProgress } from "@/api/oa/project/projectProgress";
+import { listProjectWorkload, getProjectWorkload, addProjectWorkload, updateProjectWorkload, delProjectWorkload } from '@/api/oa/project/projectWorkload'
 import { getProject, updateProject } from "@/api/oa/project/project";
 import { getCar } from "@/api/oa/car/car";
 import { listCarApproval, getCarApproval } from '@/api/oa/car/carApproval';
@@ -348,6 +350,7 @@ export default {
           addProjectProgress(progress);
         }
       }
+      this.updateActualWorkList();
       this.form.projectId = this.taskForm.formId;
       this.form.cars = this.form.cars.length != 0 ? this.form.cars.join(',') : null;
       this.form.drivers = this.form.drivers.length != 0 ? this.form.drivers.join(',') : null;
@@ -368,6 +371,18 @@ export default {
         }
       });
     },
+    updateActualWorkList() {
+      const list = this.$refs.actualRef.workList;
+      const projectId = this.taskForm.formId
+      delProjectWorkload(projectId).then(async () => {
+        if (list.length > 0) {
+          for (let l of list) {
+            l.projectId = projectId
+            await addProjectWorkload(l)
+          }
+        }
+      })
+    },
     // 查询车辆列表
     getCarList() {
       listCar({ pageSize: 9999, pageNum: 1 }).then(res => {
@@ -447,6 +462,15 @@ table {
   background-color: #f5f7fa;
 }
 
+.delete-btn {
+  color: #F56C6C;
+  cursor: pointer;
+
+  i {
+    font-size: 25px;
+  }
+}
+
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
 }