登记项目选择甲方单位，项目增加牵头、参与部门，内业、外业负责人

oa-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -35,7 +35,7 @@ public class RyTask
         if (!file.exists()) {
             file.mkdir();
         }
-        String sqlName = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        String sqlName = new SimpleDateFormat("yyyyMMdd").format(new Date());
         File datafile = new File(file + File.separator + sqlName + ".sql");
         if (datafile.exists()) {
             System.out.println(sqlName + "文件名已存在，请更换");

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -157,6 +157,18 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目提交要求")
     private String projectRequest;
 
+    /** 内业负责人 */
+    private String inLeader;
+
+    /** 外业负责人 */
+    private String outLeader;
+
+    /** 牵头部门 */
+    private String leadDept;
+
+    /** 参与部门 */
+    private String joinDept;
+
     private SysUser projectLeaderUser;
 
     private SysUser technicalDirectorUser;
@@ -516,6 +528,42 @@ public class CmcProject extends BaseEntity
     {
         return projectRequest;
     }
+    public void setInLeader(String inLeader)
+    {
+        this.inLeader = inLeader;
+    }
+
+    public String getInLeader()
+    {
+        return inLeader;
+    }
+    public void setOutLeader(String outLeader)
+    {
+        this.outLeader = outLeader;
+    }
+
+    public String getOutLeader()
+    {
+        return outLeader;
+    }
+    public void setLeadDept(String leadDept)
+    {
+        this.leadDept = leadDept;
+    }
+
+    public String getLeadDept()
+    {
+        return leadDept;
+    }
+    public void setJoinDept(String joinDept)
+    {
+        this.joinDept = joinDept;
+    }
+
+    public String getJoinDept()
+    {
+        return joinDept;
+    }
 
     @Override
     public String toString() {

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

@@ -38,6 +38,10 @@
         <result property="participates"    column="participates"    />
         <result property="taskDocument"    column="task_document"    />
         <result property="projectRequest"    column="project_request"    />
+        <result property="inLeader"    column="in_leader"    />
+        <result property="outLeader"    column="out_leader"    />
+        <result property="leadDept"    column="lead_dept"    />
+        <result property="joinDept"    column="join_dept"    />
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
         <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
@@ -74,7 +78,7 @@
         select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a_id, pa.party_a_name, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time,
                p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, tp.technical_director, u2.nick_name as director_nick_name, tp.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
-               p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request, tp.technical_designer, u3.nick_name as design_nick_name from cmc_project as p
+               p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request, tp.technical_designer, u3.nick_name as design_nick_name, p.in_leader, p.out_leader, p.lead_dept, p.join_dept from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical_plan as tp on tp.project_id = p.project_id
@@ -227,6 +231,10 @@
             <if test="participates != null">participates = #{participates},</if>
             <if test="taskDocument != null">task_document = #{taskDocument},</if>
             <if test="projectRequest != null">project_request = #{projectRequest},</if>
+            <if test="inLeader != null">in_leader = #{inLeader},</if>
+            <if test="outLeader != null">out_leader = #{outLeader},</if>
+            <if test="leadDept != null">lead_dept = #{leadDept},</if>
+            <if test="joinDept != null">join_dept = #{joinDept},</if>
         </trim>
         where project_id = #{projectId}
     </update>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-05 16:28:56
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-13 13:57:33
 -->
 <template>
   <div class="app-container">
@@ -1218,6 +1218,7 @@ export default {
         return this.$message.error('请选择一个甲方单位')
       }
       if (val) {
+        this.getPartyAList();
         this.$set(this.form, 'partyAId', val[0].partyAId)
       }
     },

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-30 17:43:08
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-13 13:56:20
 -->
 <template>
   <div class="project-wrapper">
@@ -36,11 +36,14 @@
       <el-form-item label="合同编号：">
         <el-input v-model="chooseContractInfo.contractNumber" disabled></el-input>
       </el-form-item>
-      <el-form-item label="甲方单位：" prop="partyAId">
-        <el-select allow-create v-model="addForm.partyAId" filterable placeholder="请选择" style="width: 100%;" clearable>
-          <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
+      <el-form-item label="甲方单位" prop="partyAId">
+        <el-select v-model="addForm.partyAId" filterable placeholder="请选择" disabled style="width: 100%;">
+          <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName"
+            :value="item.partyAId" :disabled="disabled">
           </el-option>
         </el-select>
+        <el-button type="primary" @click="partyAOpen = true" size="mini"
+          v-if="$route.query.taskName == '项目登记'" >选择单位</el-button>
       </el-form-item>
       <el-form-item label="联系人：" prop="contactPerson">
         <el-input v-model="addForm.contactPerson"></el-input>
@@ -90,6 +93,10 @@
     <el-dialog title="选择合同" :visible.sync="openContract" width="70%" append-to-body>
       <choose-contract @choose="setContract" @close="openContract = false"></choose-contract>
     </el-dialog>
+    
+    <el-dialog title="选择甲方单位" :visible.sync="partyAOpen" width="70%" append-to-body>
+      <choose-party-a @confirm="confirmPartyA"></choose-party-a>
+    </el-dialog>
   </div>
 </template>
 
@@ -105,9 +112,10 @@ import { listProjectContract, addProjectContract } from "@/api/oa/contract/proje
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { listPartyA } from "@/api/oa/partyA/partyA";
 import chooseContract from '../components/chooseContract.vue';
+import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
 import ArrangeProject from './arrangeProject.vue';
 export default {
-  components: { chooseContract, ArrangeProject },
+  components: { chooseContract, ArrangeProject, ChoosePartyA },
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   props: {
     disabled: {
@@ -142,6 +150,7 @@ export default {
       total: 0,
       loading: true,
       modifyOpen: false,
+      partyAOpen: false,
       addForm: {
         registerTime: undefined,
         projectRegistrant: "",
@@ -313,6 +322,16 @@ export default {
       })
 
     },
+    confirmPartyA(val) {
+      this.partyAOpen = false
+      if (val && val.length > 1) {
+        return this.$message.error('请选择一个甲方单位')
+      }
+      if (val) {
+        this.getPartyAList();
+        this.$set(this.addForm, 'partyAId', val[0].partyAId)
+      }
+    },
     // 查询业主单位列表
     getPartyAList() {
       this.loading = true

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

@@ -602,8 +602,10 @@ export default {
           if (this.project.projectLeader == this.$store.state.user.id) {
             this.isProjectLeader = true;
           }
-          let deptArr = this.project.undertakingDept.split(',');
-          let undertakingDept = []
+          let deptArr =  [];
+          if (this.project.undertakingDept && this.project.undertakingDept.trim() !== '') {
+            deptArr = (this.project.undertakingDept.split(',')).map(Number)
+          }
           for (let dept of deptArr) {
             getUsersDeptLeaderByDept({ deptId: Number(dept) }).then(res => {
               this.deptLeaderList.push(res.data.nickName);