新增项目生产界面

oa-ui/src/api/oa/project/projectProgress.js

@@ -0,0 +1,50 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-04-07 15:29:32
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-16 10:04:18
+ */
+import request from '@/utils/request'
+
+// 查询cmc项目内容列表
+export function listProjectProgress(query) {
+  return request({
+    url: '/oa/projectProgress/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc项目内容详细
+export function getProjectProgress(projectId) {
+  return request({
+    url: '/oa/projectProgress/' + projectId,
+    method: 'get'
+  })
+}
+
+// 新增cmc项目内容
+export function addProjectProgress(data) {
+  return request({
+    url: '/oa/projectProgress',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc项目内容
+export function updateProjectProgress(data) {
+  return request({
+    url: '/oa/projectProgress',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc项目内容
+export function delProjectProgress(projectId) {
+  return request({
+    url: '/oa/projectProgress/' + projectId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,229 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-08 13:56:14
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-16 11:42:20
+-->
+<template>
+  <div class="app-container">
+    <h2 style="text-align: center;">项目运作情况</h2>
+    <div class="headers">
+      基本作业情况记录
+      <div class="line"></div>
+    </div>
+    <el-form ref="progress" :model="form" :disabled="disabled" label-width="100px">
+      <el-row :gutter="20">
+        <el-col :span="11">
+          <el-form-item label="使用车辆（车牌号）：" label-width="153px">
+
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="驾驶员：">
+
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="参与人员：">
+
+      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="11">
+          <el-form-item label="进场时间：">
+            <el-date-picker type="date" placeholder="选择日期" v-model="form.entryTime"></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="撤场时间：">
+            <el-date-picker type="date" placeholder="选择日期" v-model="form.exitTime"></el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="项目进度：">
+        <table border="1">
+          <tr>
+            <td style="width:80px">序号</td>
+            <td>截止日期</td>
+            <td>累计总进度（%）</td>
+            <td style="width:300px;">情况说明</td>
+          </tr>
+          <tr v-for="(progress, index) in progressList" :key="index">
+            <td>
+              {{ index + 1 }}
+            </td>
+            <td>
+              <el-date-picker type="date" placeholder="选择日期" v-model="progress.date"
+                value-format="yyyy-MM-dd"></el-date-picker>
+            </td>
+            <td>
+              <el-input-number v-model="progress.percentage" :controls="false" style="width:120px;"></el-input-number>%
+            </td>
+            <td>
+              <el-input v-model="progress.situation" type="textarea"></el-input>
+            </td>
+            <td>
+              <el-button type="danger" icon="el-icon-minus" size="mini" circle
+                @click="deleProgressItem(index)"></el-button>
+            </td>
+          </tr>
+        </table>
+        <el-button icon="el-icon-plus" size="mini" @click="addProgressList()" type="primary" plain></el-button>
+      </el-form-item>
+    </el-form>
+    <div class="headers">
+      项目借款
+      <div class="line"></div>
+    </div>
+
+    <div class="headers">
+      成果汇交
+      <div class="line"></div>
+    </div>
+    <div class="headers">
+      产值结算（内部）
+      <div class="line"></div>
+    </div>
+    <div slot="footer" class="dialog-footer" style="text-align: center">
+      <el-button @click="preserve()" :disabled="disabled" type="success">保 存</el-button>
+      <el-button type="primary" @click="confirmAddForm" :disabled="disabled">提交下一个流程</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { parseTime } from "@/utils/ruoyi";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
+import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
+import { getUsersDeptLeaderByDept } from '@/api/system/post'
+import { addProjectProgress } from '@/api/oa/project/projectProgress'
+import { Snowflake } from '@/utils/snowFlake.js'
+import { listBudgetCar, getBudgetCar } from "@/api/oa/budget/budgetCar";
+import { listBudgetDevice, getBudgetDevice } from "@/api/oa/budget/budgetDevice";
+import { listBudgetSettle, getBudgetSettle } from "@/api/oa/budget/budgetSettle";
+import { listBudgetStaff, getBudgetStaff } from "@/api/oa/budget/budgetStaff";
+import { listBudget } from "@/api/oa/budget/budget";
+export default {
+  computed: {
+    ...mapGetters(['name', 'userId']),
+  },
+  props: {
+    disabled: {
+      type: Boolean,
+      require: true,
+    },
+    taskForm: {
+      type: Object,
+      required: true,
+    },
+    taskName: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      form: {
+        manageApprover: '',
+        manageApproverName: '',
+        manageApprovalTime: ''
+      },
+      rules: {
+        manageComment: [{ required: true, message: "请输入审核意见", trigger: "blur" }]
+      },
+      progressList: [{
+        date: "",
+        percentage: "",
+        situation: "",
+      }]
+    }
+  },
+  watch: {
+    taskName(newval, oldval) {
+      if (newval == '项目生产') {
+        this.doesItExistBudget(this.taskForm.formId)
+      }
+    }
+  },
+  created() {
+    if (this.taskName == '项目生产') {
+      this.doesItExistBudget(this.taskForm.formId)
+    }
+  },
+  methods: {
+    doesItExistBudget(projectId) {
+      listBudget({ projectId }).then(res => {
+        console.log(res);
+      })
+    },
+    addProgressList() {
+      this.progressList.push({
+        date: "",
+        percentage: "",
+        situation: "",
+      });
+    },
+    deleProgressItem(index) {
+      let arr = this.progressList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    handleAddProgress(form) {
+      addProjectProgress(form)
+    },
+    confirmAddForm() {
+      for (let progress of this.progressList) {
+        progress.projectId = this.taskForm.formId
+        progress.progressId = new Snowflake(1n, 1n, 0n).nextId().toString();
+        console.log(progress.progressId);
+        // addProjectProgress(progress);
+      }
+    },
+    preserve() {
+
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+}
+
+.headers {
+  position: relative;
+  font-weight: bold;
+  font-size: 18px;
+  padding-left: 40px;
+  padding-bottom: 40px;
+
+  .line {
+    position: absolute;
+    left: 22px;
+    top: 5px;
+    width: 5px;
+    height: 14px;
+    border-radius: 10px;
+    background-color: #2893E5;
+  }
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner {
+  color: #121212 !important;
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-12 14:17:01
+ * @LastEditTime: 2024-04-15 09:32:33
 -->
 
 <template>
@@ -37,7 +37,10 @@
             <sc-confirm :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '生产确认'"
               @goBack="goBack"></sc-confirm>
           </el-tab-pane>
-          <el-tab-pane label="项目生产" name="项目生产"></el-tab-pane>
+          <el-tab-pane label="项目生产" name="项目生产">
+            <in-progress :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目生产'"
+              @goBack="goBack"></in-progress>
+          </el-tab-pane>
           <el-tab-pane label="质量检查" name="质量检查"></el-tab-pane>
           <el-tab-pane label="成果归档" name="成果归档"></el-tab-pane>
         </el-tabs>
@@ -66,6 +69,7 @@ import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import ManageReview from './manageReview.vue'
 import ScConfirm from './scConfirm.vue'
+import InProgress from './inProgress.vue'
 export default {
   props: {
     taskName: {
@@ -75,7 +79,7 @@ export default {
       type: Object,
     }
   },
-  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm },
+  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress },
   data() {
     return {
       activeName: '项目登记',

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-12 17:32:47
+ * @LastEditTime: 2024-04-15 10:33:51
 -->
 <template>
   <div class="app-container">
@@ -32,6 +32,7 @@ import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
 import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
+import { getProject } from '@/api/oa/project/project'
 export default {
   computed: {
     ...mapGetters(['name', 'userId']),
@@ -131,7 +132,6 @@ export default {
       }
     },
     sign() {
-      debugger
       this.form.scApprover = this.$store.state.user.id;
       if (this.form.scApproverName != null && this.form.scApproverName != undefined && this.form.scApproverName != '') {
         let sign = this.form.scApproverName + ',' + this.$store.state.user.name;
@@ -147,26 +147,36 @@ export default {
           this.form.projectId = this.taskForm.formId
           debugger
           if (this.form.scApprover == '' || this.form.scApprover == null) {
+            if (this.form.scApproverName != '' && this.form.scApproverName != null){
+              this.form.scApprover = this.$store.state.user.id;
+            }else {
             this.$modal.msgError('请签名');
             return
           }
-          updateProjectComment(this.form)
-          const params = { taskId: this.taskForm.taskId };
-          // 获取下一个流程节点
-          getNextFlowNode(params).then(res => {
-            this.$set(this.taskForm.variables, "approval", this.deptLeaderList);
-            complete(this.taskForm).then(response => {
-              this.$modal.msgSuccess(response.msg);
-              this.$emit("goBack");
-            });
-          });
-        } else {
-          this.$modal.msgError('必填项未写');
-          return false;
+
         }
-      })
+        updateProjectComment(this.form)
+        const params = { taskId: this.taskForm.taskId };
+        // 获取下一个流程节点
+        getNextFlowNode(params).then(res => {
+          getProject(this.taskForm.formId).then(res => {
+            if (res.data) {
+              this.$set(this.taskForm.variables, "approval", res.data.projectLeader);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit("goBack");
+              });
+            }
+          })
 
-    },
+        });
+      } else {
+        this.$modal.msgError('必填项未写');
+        return false;
+      }
+  })
+
+},
 
   },
 }