新增工作填报表单

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-09 15:00:11
+ * @LastEditTime: 2024-08-16 15:04:21
  */
 import request from '@/utils/request'
 
@@ -90,29 +90,35 @@ const apiEndpoints = [
       '/oa/brandPayment/:id'
     ]
   },
+  {
+    procDefName: '工作填报',
+    apiUrl: [
+      '/oa/declare/:id'
+    ]
+  },
 ]
 
 // 编写一个方法来处理删除请求，并同时发送所有API请求  
-export async function deleteResources(procDefName, id) {  
+export async function deleteResources(procDefName, id) {
   // 查找对应的API端点  
-  const endpoint = apiEndpoints.find(endpoint => endpoint.procDefName === procDefName);  
-  if (!endpoint) {  
-    throw new Error(`No API endpoints found for process definition: ${procDefName}`);  
-  }  
-    
+  const endpoint = apiEndpoints.find(endpoint => endpoint.procDefName === procDefName);
+  if (!endpoint) {
+    throw new Error(`No API endpoints found for process definition: ${procDefName}`);
+  }
+
   // 构建所有请求的Promise数组  
-  const deletePromises = endpoint.apiUrl.map(apiUrl => {  
+  const deletePromises = endpoint.apiUrl.map(apiUrl => {
     // 替换URL中的:id占位符  
-    const url = apiUrl.replace(':id', id);  
+    const url = apiUrl.replace(':id', id);
     // 发送DELETE请求并返回Promise  
-    return request.delete(url)  
-  });  
-    
+    return request.delete(url)
+  });
+
   // 等待所有请求完成  
-  try {  
-    return await Promise.all(deletePromises);  
-    console.log('删除完成！');  
-  } catch (error) {  
-    console.error('One or more deletion requests failed:', error);  
-  }  
+  try {
+    return await Promise.all(deletePromises);
+    console.log('删除完成！');
+  } catch (error) {
+    console.error('One or more deletion requests failed:', error);
+  }
 } 

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
- * @LastEditors: wrh
- * @LastEditTime: 2024-08-06 17:28:23
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-16 15:26:43
 -->
 <template>
   <div>
@@ -33,6 +33,7 @@
     <deposit-form :key="'deposit'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '保证金审批'"></deposit-form>
     <device-form :key="'device'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :formDisabled="true" v-else-if="taskForm.procDefName == '设备审批'"></device-form>
     <change-form :key="'change'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '项目变更'"></change-form>
+    <declare :key="'work'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :formDisabled="true" v-else-if="taskForm.procDefName == '工作填报'"></declare>
   </div>
 </template>
 
@@ -60,6 +61,8 @@ import BrandForm from '../business/brandForm.vue';
 import DepositForm from '../finance/depositForm.vue';
 import DeviceForm from '../oa/deviceForm.vue';
 import changeForm from "../changeForm.vue";
+import workFilling from "../work/declareForm.vue";
+import declare from "../work/declareForm.vue";
 export default {
   props: {
     passingParam: {
@@ -94,7 +97,8 @@ export default {
     BrandForm,
     DepositForm,
     DeviceForm,
-    changeForm
+    changeForm,
+    declare
   },
   data() {
     return {

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

@@ -44,6 +44,8 @@
       @goBack="goBack"></settle-other>
     <change-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目变更'"
       @goBack="goBack"></change-form>
+    <declare-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '工作填报'"
+      @goBack="goBack"></declare-form>
   </div>
 </template>
 
@@ -72,6 +74,7 @@ import archiveForm from '@/views/flowable/form/archiveForm.vue';
 import settleForm from '@/views/flowable/form/settleForm.vue';
 import settleOther from '@/views/flowable/form/settleOther.vue';
 import changeForm from '@/views/flowable/form/changeForm.vue';
+import declareForm from '../work/declareForm.vue';
 export default {
   components: {
     ScTable,
@@ -97,7 +100,8 @@ export default {
     archiveForm,
     settleForm,
     settleOther,
-    changeForm
+    changeForm,
+    declareForm
   },
   props: {
     taskForm: {

oa-ui/src/views/flowable/form/work/declareForm.vue

@@ -0,0 +1,340 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-08-16 09:16:36
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-16 16:24:17
+-->
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="isFlow ? 18 : 24" :xs="24">
+        <h2 class="text-center">项目工作填报表</h2>
+        <el-divider></el-divider>
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="formDisabled">
+          <el-form-item label="项目名称：" prop="projectId">
+            <el-button icon="el-icon-plus" type="primary" @click="prOpen = true" size="mini"
+              v-if="taskName == '工作填报'">选择项目</el-button>
+            <el-descriptions border v-if="form.projectId" style="margin-top: 10px" :column="2">
+              <el-descriptions-item label="项目编号">
+                {{ chooseProject.projectNumber }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目名称">
+                {{ chooseProject.projectName }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目负责人">
+                {{ getUserName(chooseProject.projectLeader) }}
+              </el-descriptions-item>
+              <el-descriptions-item label="甲方单位">
+                {{ chooseProject.partyA ? chooseProject.partyA.partyAName : '' }}
+              </el-descriptions-item>
+              <el-descriptions-item label="联系人">
+                {{ chooseProject.contactPerson }}
+              </el-descriptions-item>
+              <el-descriptions-item label="联系电话">
+                {{ chooseProject.telephone }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目类型">
+                {{ chooseProject.projectType }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目级别">
+                {{ chooseProject.projectLevel == "0" ? " 一般项目" : "重大项目" }}
+              </el-descriptions-item>
+              <el-descriptions-item label="承担部门">
+                {{ chooseProject.undertakingDeptName }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目登记人">
+                {{ chooseProject.projectRegistrantUser ? chooseProject.projectRegistrantUser.nickName : "" }}
+              </el-descriptions-item>
+            </el-descriptions>
+          </el-form-item>
+          <el-form-item label="工作类别：" prop="workType">
+            <el-select v-model="form.workType" @change="getWorkItemList(form.workType)" :style="{ width: '100%' }"
+              :disabled="taskName != '工作填报'">
+              <el-option v-for="item in workTypeList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工作细项：" prop="workItem">
+            <el-select v-model="form.workItem" :style="{ width: '100%' }" :disabled="taskName != '工作填报'">
+              <el-option v-for="item in workItemList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="具体内容：" prop="workContent">
+            <el-input type="textarea" v-model="form.workContent" :autosize="{ minRows: 4, maxRows: 10 }"
+              :disabled="taskName != '工作填报'"></el-input>
+          </el-form-item>
+          <el-form-item label="工天：" prop="workLoad">
+            <el-input-number v-model="form.workLoad" @change="countMoney()"
+              :disabled="taskName != '工作填报'"></el-input-number>
+          </el-form-item>
+          <el-row class="text-center">
+            <el-col :span="8" :offset="8">
+              <p>填报人：<span class="auditor">{{ getUserName(form.userId) }}</span></p>
+            </el-col>
+            <el-col :span="8">
+              <p>填报日期：{{ parseTime(form.submitTime, "{y}-{m}-{d}") }}</p>
+            </el-col>
+          </el-row>
+          <el-form-item label="工天单价：" prop="price" v-if="taskName != '工作填报'">
+            <el-tag>{{ form.price }}元 /人天</el-tag>
+          </el-form-item>
+          <el-form-item label="系数：" prop="coefficient" v-if="taskName != '工作填报'">
+            <el-input-number :controls="false" v-model="form.coefficient" @blur="countMoney()"
+              :disabled="taskName == '填报人确认'"></el-input-number>
+          </el-form-item>
+          <el-form-item label="预估绩效：" v-if="taskName != '工作填报'">
+            <span class="auditor">{{ money }}（元）</span>
+          </el-form-item>
+        </el-form>
+        <el-row class="text-center mt20" v-if="!formDisabled">
+          <el-button type="warning" @click="save" v-if="taskName != '填报人确认'">保 存</el-button>
+          <el-button type="primary" @click="submitForm" v-if="taskName == '工作填报'">提 交</el-button>
+          <el-button type="success" @click="approveForm"
+            v-if="taskName != '工作填报' && taskName != '填报人确认'">审核通过</el-button>
+          <el-button type="primary" @click="confirmForm" v-if="taskName == '填报人确认'">确 认</el-button>
+        </el-row>
+      </el-col>
+      <el-col :span="6" :xs="24" v-if="isFlow">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-dialog title="选择项目" :visible.sync="prOpen" width="70%" append-to-body>
+      <choose-project @chooseProject="confirmProject"></choose-project>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import flow from '@/views/flowable/task/todo/detail/flow';
+import { flowXmlAndNode } from "@/api/flowable/definition";
+import { getWorkTypeList, getWorkItemList } from '@/api/oa/price/price'
+import { listDeclare, getDeclare, addDeclare, updateDeclare } from '@/api/oa/declare/declare';
+import { listProject, getProject } from "@/api/oa/project/project";
+import { mapState } from 'vuex';
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import chooseProject from '../components/chooseProject.vue';
+import { parseTime } from "@/utils/ruoyi";
+import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from "@/api/system/post.js";
+export default {
+  components: {
+    flow,
+    chooseProject
+  },
+  computed: {
+    ...mapState({
+      device: state => state.app.device,
+    })
+  },
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    },
+    isFlow: {
+      type: Boolean,
+      default: true
+    },
+    formDisabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  created() {
+    this.getWorkTypeList();
+    this.initForm();
+    if (this.device == 'mobile') {
+      this.isFlow = false
+    }
+    if (this.isFlow) {
+      flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+        this.flowData = res.data;
+      })
+    }
+  },
+  data() {
+    return {
+      flowData: {},
+      form: {
+        workLoad: 1,
+        coefficient: 1,
+        price: 216,
+        userId: undefined,
+        submitTime: undefined,
+      },
+      rules: {
+        projectId: [
+          { required: true, trigger: "blur", message: "请选择项目" },
+        ],
+        workType: [
+          { required: true, trigger: "change", message: "请选择工作类别" },
+        ],
+        workItem: [
+          { required: true, trigger: "change", message: "请选择工作细项" },
+        ],
+        workContent: [
+          { required: true, trigger: "blur", message: "请填写具体内容" },
+        ]
+      },
+      prOpen: false,
+      chooseProject: {},
+      workTypeList: [],
+      workItemList: [],
+      hasForm: false,
+      money: 0
+    }
+  },
+  methods: {
+    initForm() {
+      if (this.taskName == '工作填报') {
+        this.$set(this.form, 'userId', this.$store.state.user.id)
+        this.form.submitTime = parseTime(new Date(), "{y}-{m}-{d}")
+      }
+      getDeclare(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.form = res.data;
+          this.form.price = 216;
+          this.hasForm = true;
+          this.countMoney();
+          getProject(res.data.projectId).then(res => {
+            if (res.data) {
+              this.chooseProject = res.data
+            }
+          })
+          this.getWorkItemList(this.form.workType);
+        }
+      })
+    },
+    async save() {
+      if (this.hasForm) {
+        let updateRes = await updateDeclare(this.form);
+      } else {
+        this.form.formId = this.taskForm.formId;
+        let addRes = await addDeclare(this.form);
+        this.$router.go(0)
+      }
+      this.$message.success('保存成功');
+    },
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (!this.chooseProject.projectLeader) {
+            this.$message.error('该项目未指定项目负责人，无法提交。')
+            return
+          }
+          this.$confirm('是否确认提交表单？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            if (this.hasForm) {
+              updateDeclare(this.form);
+            } else {
+              this.form.formId = this.taskForm.formId;
+              addDeclare(this.form);
+            }
+            const params = { taskId: this.taskForm.taskId };
+            let approval = this.chooseProject.projectLeader;
+            getNextFlowNode(params).then(() => {
+              this.$set(this.taskForm.variables, "approval", approval);
+              this.handleComplete(this.taskForm);
+            })
+          })
+        } else {
+          this.$message.error('请完善必填项');
+        }
+      })
+    },
+    async approveForm() {
+      updateDeclare(this.form);
+      const params = { taskId: this.taskForm.taskId };
+      if (this.taskName == '项目负责人审核') {
+        let resData = await getUsersDeptLeader({ userId: this.form.userId });
+        if (resData.data) {
+          this.$set(this.taskForm.variables, "approval", resData.data.userId);
+          getNextFlowNode(params).then(() => {
+            this.handleComplete(this.taskForm);
+          })
+        }
+      } else if (this.taskName == '部门负责人审核') {
+        this.$set(this.taskForm.variables, "approval", this.form.userId);
+        getNextFlowNode(params).then(() => {
+          this.handleComplete(this.taskForm);
+        })
+      }
+    },
+    confirmForm() {
+      const params = { taskId: this.taskForm.taskId };
+      getNextFlowNode(params).then(() => {
+        this.handleComplete(this.taskForm);
+      })
+    },
+    handleComplete(taskForm) {
+      complete(taskForm).then(response => {
+        this.$modal.msgSuccess(response.msg);
+        this.$emit('goBack');
+      })
+    },
+    countMoney() {
+      let result = parseFloat(this.form.price * this.form.workLoad * this.form.coefficient)
+      this.money = result.toFixed(2)
+    },
+    confirmProject(val) {
+      if (val.length != 1) {
+        this.$message.error("项目只能选择一个！");
+        return;
+      }
+      this.chooseProject = val[0]
+      this.$set(this.form, 'projectId', val[0].projectId)
+      this.prOpen = false;
+      this.$refs.form.validateField('projectId');
+    },
+    /* 获取工作类别 */
+    getWorkTypeList() {
+      getWorkTypeList().then(res => {
+        if (res) {
+          this.workTypeList = this.setArray(res);
+        }
+      });
+    },
+    /* 获取工作项目 */
+    getWorkItemList(workType) {
+      getWorkItemList({ workType: workType }).then(res => {
+        if (res) {
+          let workItemList = this.setArray(res);
+          this.workItemList = workItemList;
+        }
+      })
+    },
+    // 数组去重，并格式化为label、value形式
+    setArray(arr) {
+      if (arr != [] && arr != undefined) {
+        let datalist = [...new Set(arr)];
+        let list = [];
+        for (let i of datalist) {
+          let obj = new Object();
+          obj.label = i;
+          obj.value = i;
+          list.push(obj);
+        }
+        return list;
+      } else {
+        return [];
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-07 14:12:06
+ * @LastEditTime: 2024-08-16 09:18:46
 -->
 <template>
   <div class="app-container">
@@ -481,7 +481,7 @@ export default {
         || (this.taskForm.procDefName == '项目预算' && this.taskName != '预算审核') || this.taskForm.procDefName == '借款审批' || this.taskForm.procDefName == '安全交底' ||
         this.taskForm.procDefName == '技术交底' || this.taskForm.procDefName == '技术方案' || this.taskForm.procDefName == '承接合同评审' || this.taskForm.procDefName == '分包合同评审'
         || this.taskForm.procDefName == '品牌项目支付' || this.taskForm.procDefName == '保证金审批' || this.taskForm.procDefName == '成果归档' || this.taskForm.procDefName == '项目结算'
-        || this.taskForm.procDefName == '项目变更' || this.taskForm.procDefName == '其他结算') {
+        || this.taskForm.procDefName == '项目变更' || this.taskForm.procDefName == '其他结算' ||this.taskForm.procDefName == '工作填报') {
         return false
       } else {
         return true