修改经营选承担部门，并可以填工作量，由部门负责人安排项目负责人

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

@@ -2,12 +2,16 @@
  * @Author: ysh
  * @Date: 2024-05-22 11:12:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-04 11:20:46
+ * @LastEditTime: 2024-09-05 14:08:32
 -->
 <template>
   <div>
     <el-row>
       <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="88px">
+        <el-form-item label="合同名称" prop="contractName">
+          <el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
         <el-form-item label="合同编码" prop="contractCode">
           <el-input v-model="queryParams.contractCode" placeholder="请输入合同编码" clearable
             @keyup.enter.native="handleQuery" />
@@ -30,7 +34,7 @@
       <el-table-column label="合同金额" align="center" prop="amount" min-width="100px" />
     </el-table>
     <div style="text-align: right;" class="mt20 mr20">
-      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"
+      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum" :autoScroll="false"
         :page-size="queryParams.pageSize" layout="total, prev, pager, next" :total="total">
       </el-pagination>
     </div>

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

@@ -30,7 +30,7 @@
       <el-table-column label="擅长业务方向" align="center" prop="strength" />
       <el-table-column label="履约能力评价" align="center" prop="fulfill" />
     </el-table>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" :autoScroll="false"
       @pagination="getList" />
     <div>
       已选单位：<el-tag v-for="item in partners" style="margin: 5px;" :key="item.partnerId">{{ item.partnerName }}</el-tag>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-18 17:38:50
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-30 11:25:29
+ * @LastEditTime: 2024-09-05 14:09:31
 -->
 <template>
   <div>
@@ -32,7 +32,7 @@
       <el-table-column label="备注说明" align="center" prop="remark" />
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" :autoScroll="false"
       @pagination="getList" />
     <div>
       已选单位：<el-tag v-for="item in choosePartyA" style="margin: 5px;" :key="item.partyAId">{{ item.partyAName }}</el-tag>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-29 14:31:38
+ * @LastEditTime: 2024-09-05 16:35:08
 -->
 <template>
   <div class="project-wrapper">
@@ -66,6 +66,23 @@
           :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setProjectDocument">
         </FileUpload>
       </el-form-item>
+      <el-form-item label="计划工作量：" prop="taskDocument">
+        <plan-workload ref="planworkRef" :projectId="taskForm.formId"></plan-workload>
+      </el-form-item>
+      <el-form-item label="承担部门：" prop="deptId">
+        <el-select v-model="addForm.deptId" multiple clearable style="width:100%" @change="getDeptLeader">
+          <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
+            v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="部门负责人：" prop="deptLeader">
+        <el-select v-model="addForm.deptLeader" multiple clearable style="width:100%">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="资料提交要求：" prop="projectRequest">
         <el-input v-model="addForm.projectRequest" type="textarea" :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
       </el-form-item>
@@ -104,6 +121,7 @@
 import { parseTime } from "@/utils/ruoyi";
 import { mapGetters } from "vuex";
 import { listProject, getProject, addProject, updateProject, delProject, getProjectNmuber } from "@/api/oa/project/project";
+import { listDept } from '@/api/system/dept'
 import { getUser } from "@/api/system/user";
 import { getUsersDeptLeaderByDept } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
@@ -114,8 +132,9 @@ 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';
+import planWorkload from "./planWorkload.vue";
 export default {
-  components: { chooseContract, ArrangeProject, ChoosePartyA },
+  components: { chooseContract, ArrangeProject, ChoosePartyA, planWorkload },
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   props: {
     disabled: {
@@ -147,6 +166,8 @@ export default {
       },
       projectList: [],
       partyAList: [],
+      deptList: [],
+      deptLeaderList: [],
       total: 0,
       loading: true,
       modifyOpen: false,
@@ -175,6 +196,12 @@ export default {
         partyAId: [{ required: true, message: "请选择甲方单位", trigger: "change" }],
         contactPerson: [{ required: true, message: "请输入联系人", trigger: "blur" }],
         telephone: [{ required: true, message: "请输入联系人联系方式", trigger: "blur" }],
+        deptId: [
+          { required: true, message: "请选择承担部门", trigger: "change" }
+        ],
+        deptLeader: [
+          { required: true, message: "部门负责人不能为空", trigger: "change" }
+        ]
         // projectRequest: [{ required: true, message: "请输入资料提交要求", trigger: "blur" }],
         // taskDocument: [{ required: true, message: "请上传任务书", trigger: "blur" }]
       },
@@ -196,6 +223,7 @@ export default {
     this.registerTime = parseTime(new Date(), '{y}-{m}-{d}')
     this.initProjectForm();
     this.getPartyAList();
+    this.getDeptList();
     this.getContractDataList();
     // this.getList();
   },
@@ -219,6 +247,14 @@ export default {
         this.loading = false;
       });
     },
+    getDeptList() {
+      listDept({
+        deptName: undefined,
+        status: undefined
+      }).then(res => {
+        this.deptList = res.data
+      })
+    },
     async initProjectForm() {
       let datas = await listProject({ projectId: this.taskForm.formId });
       if (datas.rows.length > 0) {
@@ -230,9 +266,29 @@ export default {
         this.registrantUser = this.name;
       }
     },
+    async getDeptLeader(val) {
+      this.deptLeaderList = [];
+      for (let v of val) {
+        let res = await getUsersDeptLeaderByDept({ deptId: Number(v) })
+        this.deptLeaderList.push(res.data.userId);
+      }
+      this.$set(this.addForm, 'deptLeader', this.deptLeaderList);
+      this.addForm.undertakingDept = this.addForm.deptId.join(',');
+    },
     getProjectInfo() {
       getProject(this.taskForm.formId).then(res => {
         this.addForm = res.data;
+        if (this.addForm.undertakingDept != null && this.addForm.undertakingDept != "" && this.addForm.undertakingDept != undefined) {
+          this.addForm.deptId = this.addForm.undertakingDeptName.split(',')
+        }
+        this.$set(this.addForm, 'deptLeader', [])
+        if (this.addForm.undertakingDept) {
+          let arr = (this.addForm.undertakingDept.split(',')).map(Number)
+          this.$set(this.addForm, 'deptId', arr)
+          this.getDeptLeader(arr);
+        } else {
+          this.$set(this.addForm, 'deptId', [])
+        }
       })
     },
     getProjectWorkList() {
@@ -269,8 +325,19 @@ export default {
       }
       this.openContract = false;
     },
+    updatePlanWorkload() {
+      const workList = this.$refs.planworkRef.workList;
+      const projectId = this.taskForm.formId
+      delProjectWork(projectId).then(() => {
+        workList.forEach(work => {
+          work.projectId = projectId;
+          addProjectWork(work);
+        })
+      })
+    },
     // 暂存
     async save() {
+      this.updatePlanWorkload();
       // 新增项目数据
       if (this.formTotal == 0) {
         this.addForm.projectId = this.taskForm.formId;
@@ -283,9 +350,6 @@ export default {
           await addProjectContract(pcobj)
           this.$modal.msgSuccess("合同关联成功");
         }
-        // setTimeout(() => {
-        //   this.$router.go(0);
-        // }, 500);
         this.initProjectForm();
       } else {
         // 修改项目数据
@@ -304,6 +368,7 @@ export default {
       // 获取下一个流程节点
       this.$refs['projectAdd'].validate((vaild) => {
         if (vaild) {
+          this.updatePlanWorkload();
           if (this.formTotal == 0) {
             this.addForm.projectId = this.taskForm.formId;
             addProject(this.addForm).then(response => {

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

@@ -1,14 +1,14 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
- * @LastEditors: wrh
- * @LastEditTime: 2024-08-23 15:59:39
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-05 16:56:04
 -->
 <template>
   <div class="app-container">
     <h2 style="text-align: center;">项目安排</h2>
     <el-form ref="arrangeForm" :model="form" :rules="rules" label-width="120px" :disabled="disabled">
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12" :xs="24">
           <el-form-item label="承担部门：" prop="deptId">
             <el-select v-model="form.deptId" multiple clearable style="width:100%" @change="getDeptLeader">
@@ -27,7 +27,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="20">
         <el-col :span="12" :xs="24">
           <el-form-item label="项目负责人：" prop="projectLeader">

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-07-08 16:16:27
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-05 14:40:00
+ * @LastEditTime: 2024-09-05 16:54:57
 -->
 <template>
   <div class="app-container">
@@ -124,12 +124,16 @@ export default {
       let projectRes = await getProject(this.taskForm.formId)
       if (projectRes.code == 200 && projectRes.data) {
         this.form = projectRes.data
+        if (this.form.undertakingDept) {
+          let arr = (this.form.undertakingDept.split(',')).map(Number)
+          this.getDeptLeader(arr)
+        }
         this.total = 1
         this.getProjectWorkList();
       }
     },
     getProjectWorkList() {
-      listProjectWork({ projectId: this.taskForm.formId }).then(res => {
+      listProjectWork({ pageNum: 1, pageSize: 100, projectId: this.taskForm.formId }).then(res => {
         if (res.rows.length != 0) {
           this.workList = res.rows;
         }
@@ -179,13 +183,6 @@ export default {
     },
     async confirm() {
       this.save();
-      // let resData = await getUsersDeptLeaderByDept({ deptId: 105 });
-      // let approval;
-      // if (resData.data) {
-      //   approval = resData.data.userId;
-      // }
-      let approval = this.form.projectRegistrant;
-      this.$set(this.taskForm.variables, "approval", approval);
       const params = { taskId: this.taskForm.taskId };
       getNextFlowNode(params).then(res => {
         complete(this.taskForm).then(response => {
@@ -193,6 +190,12 @@ export default {
           this.$emit('goBack');
         });
       })
+    },
+    getDeptLeader(val) {
+      let deptId = Number(val[0])
+      getUsersDeptLeaderByDept({ deptId: Number(deptId) }).then(res => {
+        this.$set(this.taskForm.variables, "approval", res.data.userId);
+      })
     }
   },
 }

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-05 10:30:20
+ * @LastEditTime: 2024-09-05 13:55:35
 -->
 <template>
   <div>
@@ -155,7 +155,7 @@ import ChoosePeople from '../budget/components/choosePeople.vue';
 import ChooseCar from '../budget/components/chooseCar.vue';
 import ChooseDevice from "../budget/components/chooseDevice.vue";
 import AchiData from '../inProgress/achiData.vue';
-import actualWork from '@/views/flowable/form/components/actualWork.vue';
+import actualWork from '@/views/flowable/form/projectProcess/actualWork.vue';
 export default {
   components: {
     borrowData,

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

@@ -0,0 +1,132 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-09-05 13:57:44
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-05 14:45:48
+-->
+<template>
+  <div style="width:100%">
+    <table class="table" border="1" style="width:100%">
+      <tr>
+        <td style="width: 180px">工作内容</td>
+        <td>等级或比例尺</td>
+        <td>单位</td>
+        <td>工作量</td>
+        <td style="width: 100px">要求完成时间</td>
+        <td>备注</td>
+      </tr>
+      <tr v-for="(work, index) in workList" :key="index">
+        <td>
+          <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+        </td>
+        <td>
+          <el-select v-model="work.scale" placeholder="请选择" clearable>
+            <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+              :value="dict.label" />
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="work.unit" placeholder="请选择" clearable>
+            <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label" :value="dict.label" />
+          </el-select>
+        </td>
+        <td>
+          <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"
+            placeholder="选择日期">
+          </el-date-picker>
+        </td>
+        <td>
+          <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+        </td>
+        <td>
+          <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>
+
+<script>
+import { listProject, getProject, addProject, updateProject, delProject } from "@/api/oa/project/project";
+import { listProjectWork, addProjectWork, delProjectWork } from "@/api/oa/project/projectWork";
+export default {
+  dicts: ['cmc_scale_grade', 'cmc_unit'],
+  props: {
+    projectId: {
+      type: String,
+      require: true
+    }
+  },
+  data() {
+    return {
+      workList: [{
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      }],
+
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      listProjectWork({ pageNum: 1, pageSize: 100, projectId: this.projectId }).then(res => {
+        if (res.total != 0) {
+          this.workList = res.rows;
+        }
+      })
+    },
+    addWorkList() {
+      this.workList.push({
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      });
+    },
+    deletWorkItem(index) {
+      let arr = this.workList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  /*居中*/
+  margin: 0 auto;
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+}
+.delete-btn {
+  color: #F56C6C;
+  cursor: pointer;
+
+  i {
+    font-size: 25px;
+  }
+}
+</style>