项目合同修改

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectContractController.java

@@ -89,9 +89,9 @@ public class CmcProjectContractController extends BaseController
      * 删除cmc项目合同
      */
     @Log(title = "cmc项目合同", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{projectIds}")
-    public AjaxResult remove(@PathVariable String[] projectIds)
+	@DeleteMapping("/{contractIds}")
+    public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return success(cmcProjectContractService.deleteCmcProjectContractByProjectIds(projectIds));
+        return success(cmcProjectContractService.deleteCmcProjectContractByContractIds(contractIds));
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectContractMapper.java

@@ -54,8 +54,8 @@ public interface CmcProjectContractMapper
     /**
      * 批量删除cmc项目合同
      * 
-     * @param projectIds 需要删除的数据主键集合
+     * @param contractIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcProjectContractByProjectIds(String[] projectIds);
+    public int deleteCmcProjectContractByContractIds(String[] contractIds);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectContractService.java

@@ -46,10 +46,10 @@ public interface ICmcProjectContractService
     /**
      * 批量删除cmc项目合同
      * 
-     * @param projectIds 需要删除的cmc项目合同主键集合
+     * @param contractIds 需要删除的cmc项目合同主键集合
      * @return 结果
      */
-    public int deleteCmcProjectContractByProjectIds(String[] projectIds);
+    public int deleteCmcProjectContractByContractIds(String[] contractIds);
 
     /**
      * 删除cmc项目合同信息

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectContractServiceImpl.java

@@ -70,13 +70,13 @@ public class CmcProjectContractServiceImpl implements ICmcProjectContractService
     /**
      * 批量删除cmc项目合同
      * 
-     * @param projectIds 需要删除的cmc项目合同主键
+     * @param contractIds 需要删除的cmc项目合同主键
      * @return 结果
      */
     @Override
-    public int deleteCmcProjectContractByProjectIds(String[] projectIds)
+    public int deleteCmcProjectContractByContractIds(String[] contractIds)
     {
-        return cmcProjectContractMapper.deleteCmcProjectContractByProjectIds(projectIds);
+        return cmcProjectContractMapper.deleteCmcProjectContractByContractIds(contractIds);
     }
 
     /**

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

@@ -50,10 +50,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from cmc_project_contract where project_id = #{projectId}
     </delete>
 
-    <delete id="deleteCmcProjectContractByProjectIds" parameterType="String">
-        delete from cmc_project_contract where project_id in 
-        <foreach item="projectId" collection="array" open="(" separator="," close=")">
-            #{projectId}
+    <delete id="deleteCmcProjectContractByContractIds" parameterType="String">
+        delete from cmc_project_contract where contract_id in
+        <foreach item="contractId" collection="array" open="(" separator="," close=")">
+            #{contractId}
         </foreach>
     </delete>
 </mapper>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-19 15:32:00
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-14 16:06:57
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-19 15:56:42
 -->
 <template>
   <div class="app-container">
@@ -43,12 +43,12 @@
         <el-row>
           <el-col :span="6" :xs="24" :offset="12">
             <el-form-item label="签名" prop="technicalPlanner">
-              <span class="auditor"> {{ form.planUser ? form.planUser.nickName : planUser }} </span>
+              <span class="auditor"> {{ form.planUser ? form.planUser.nickName : '' }} </span>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="日期：" label-width="120px">
-              <span> {{ form.technicalTime ? form.technicalTime : technicalTime }} </span>
+              <span> {{ form.technicalTime ? form.technicalTime : '' }} </span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -69,12 +69,12 @@
         <el-row>
           <el-col :span="6" :xs="24" :offset="12">
             <el-form-item label="签名" prop="designUser">
-              <span class="auditor"> {{ form.designUser ? form.designUser.nickName : designUser }} </span>
+              <span class="auditor"> {{ form.designUser ? form.designUser.nickName : '' }} </span>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="日期：" label-width="120px">
-              <span> {{ form.technicalUploadTime ? form.technicalUploadTime : technicalUploadTime }} </span>
+              <span> {{ form.technicalUploadTime ? form.technicalUploadTime : '' }} </span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -95,7 +95,7 @@
         <el-row>
           <el-col :span="6" :xs="24" :offset="12">
             <el-form-item label="签名" prop="technicalPlanner">
-              <span class="auditor"> {{ form.planUser ? form.planUser.nickName : planUser }} </span>
+              <span class="auditor"> {{ form.planUser ? form.planUser.nickName : '' }} </span>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -163,6 +163,10 @@ export default {
     },
   },
   watch: {
+    'taskForm.formId'(newval) {
+      this.getUserList();
+      this.initForm();
+    },
     projectNumber(newval) {
       this.$set(this.form, "projectNumber", newval);
     },

oa-ui/src/views/oa/technical/index.vue

@@ -154,18 +154,18 @@
       </div>
     </el-dialog>
     <el-dialog :title="title" :visible.sync="infoOpen" width="70%" append-to-body>
-      <technical-form :taskForm="taskForm" :taskName="''"></technical-form>
+      <technical-tab :taskForm="taskForm"></technical-tab>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
-import technicalForm from '../../flowable/form/technicalForm.vue';
+import technicalTab from '../../flowable/form/projectProcess/technicalTab.vue';
 
 export default {
   name: "Technical",
-  components: { technicalForm, },
+  components: { technicalTab, },
   data() {
     return {
       // 遮罩层