修改经营审核、分管审核以新增预算

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

@@ -0,0 +1,50 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-04-07 15:29:32
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-10 16:45:53
+ */
+import request from '@/utils/request'
+
+// 查询cmc项目审批列表
+export function listProjectComment(query) {
+  return request({
+    url: '/oa/projectComment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc项目审批详细
+export function getProjectComment(projectId) {
+  return request({
+    url: '/oa/projectComment/' + projectId,
+    method: 'get'
+  })
+}
+
+// 新增cmc项目审批
+export function addProjectComment(data) {
+  return request({
+    url: '/oa/projectComment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc项目审批
+export function updateProjectComment(data) {
+  return request({
+    url: '/oa/projectComment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc项目审批
+export function delProjectComment(projectId) {
+  return request({
+    url: '/oa/projectComment/' + projectId,
+    method: 'delete'
+  })
+}

oa-ui/src/directive/index.js

@@ -1,9 +1,16 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-01-03 09:23:11
+ * @LastEditors: 
+ * @LastEditTime: 2024-04-10 14:33:49
+ */
 import hasRole from './permission/hasRole'
 import hasPermi from './permission/hasPermi'
 import dialogDrag from './dialog/drag'
 import dialogDragWidth from './dialog/dragWidth'
 import dialogDragHeight from './dialog/dragHeight'
 import clipboard from './module/clipboard'
+import numeric from './module/mustNumber'
 
 const install = function(Vue) {
   Vue.directive('hasRole', hasRole)
@@ -12,11 +19,13 @@ const install = function(Vue) {
   Vue.directive('dialogDrag', dialogDrag)
   Vue.directive('dialogDragWidth', dialogDragWidth)
   Vue.directive('dialogDragHeight', dialogDragHeight)
+  Vue.directive('numeric', numeric)
 }
 
 if (window.Vue) {
   window['hasRole'] = hasRole
   window['hasPermi'] = hasPermi
+  window['numeric'] = numeric
   Vue.use(install); // eslint-disable-line
 }
 

oa-ui/src/directive/module/mustNumber.js

@@ -0,0 +1,26 @@
+export default {
+  numeric: {
+    bind(el, binding, vnode) {
+      el.oninput = function (e) {
+        if (!e.isTrusted) return
+
+        // 获取输入框的当前值
+        let value = el.value
+
+        // 移除非数字的字符
+        value = value.replace(/\D/g, '')
+
+        // 如果输入框值为空或者第一个字符是0且不只有0一个字符，则设置为空
+        if (value === '' || (value[0] === '0' && value.length > 1)) {
+          value = ''
+        }
+
+        // 更新输入框的值
+        el.value = value
+      }
+    },
+    unbind(el) {
+      el.oninput = null
+    }
+  }
+}

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-08 13:47:45
+ * @LastEditTime: 2024-04-10 14:08:00
 -->
 
 <template>
@@ -164,7 +164,7 @@ export default {
           remark: "",
         },
       ],
-      restaurants: [{ value: "中国电建集团成都勘测设计研究院有限公司" }],
+      restaurants: [{ value: "中国电建集团成都勘测设计研究院有限公司勘测设计分公司" }],
     };
   },
   created() {

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

@@ -2,20 +2,24 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-09 17:51:14
+ * @LastEditTime: 2024-04-10 17:59:08
 -->
 <template>
   <div class="app-container">
+    <h2 style="text-align:center;">经营审核</h2>
     <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
-      <el-form-item label="审核意见：">
-        <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="jyComment">
+      <el-form-item label="审核意见：" prop="jyComment">
+        <el-input type="textarea" :rows="4" placeholder="请输入审核意见" v-model="form.jyComment">
         </el-input>
       </el-form-item>
       <el-form-item label="审核人：">
-        {{ name }}
+        <span class="auditor">{{ form.jyApprover }}</span>
       </el-form-item>
       <el-form-item label="审核时间：">
-        {{  }}
+        {{ form.jyApprovalTime }}
+      </el-form-item>
+      <el-form-item>
+        <p style="text-align:center;"><el-button type="primary" @click="confirm">确认审核</el-button></p>
       </el-form-item>
     </el-form>
   </div>
@@ -23,6 +27,9 @@
 
 <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 } from "@/api/oa/project/projectComment"
 export default {
   computed: {
     ...mapGetters(['name']),
@@ -39,19 +46,62 @@ export default {
   },
   data() {
     return {
-      form: {},
-      rules: {},
+      form: {
+        jyApprover: '',
+        jyApprovalTime: ''
+      },
+      rules: {
+        jyComment: [{ required: true, message: "请输入审核意见", trigger: "blur" }]
+      },
       jyComment: "",
       jyApprovalTime: ""
     }
   },
   created() {
-    this.jyApprovalTime = 
+    this.initForm();
   },
   methods: {
+    initForm() {
+      console.log(this.taskForm);
+      getProjectComment(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.form = res.data
+        } else {
+          if (this.taskName == '经营审核') {
+            this.form.jyApprover = this.name;
+            this.form.jyApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
+            console.log(this.form);
+          } else {
+            this.form.jyApprover = '';
+            this.form.jyApprovalTime = '';
+          }
+
+          console.log(this.form);
+        }
+      })
+    },
+    confirm() {
+      const params = { taskId: this.taskForm.taskId };
+      // 获取下一个流程节点
+      getNextFlowNode(params).then(res => {
+        // getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
+        //   let userId = res.data.userId;
+        //   this.$set(this.taskForm.variables, "approval", userId);
+        //   complete(this.taskForm).then(response => {
+        //     this.$modal.msgSuccess(response.msg);
+        //     this.$emit("goBack");
+        //   });
+        // });
+      });
+    },
 
   },
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+</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-09 17:45:47
+ * @LastEditTime: 2024-04-10 17:54:14
 -->
 
 <template>
@@ -20,9 +20,11 @@
             
           </el-tab-pane>
           <el-tab-pane label="经营审核" name="经营审核">
-            <business-review :taskForm="taskForm" :disabled="taskName != '经营审核'" @goBack="goBack"></business-review>
+            <business-review :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '经营审核'" @goBack="goBack"></business-review>
+          </el-tab-pane>
+          <el-tab-pane label="分管审核" name="分管审核">
+            <manage-review :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '分管审核'" @goBack="goBack"></manage-review>
           </el-tab-pane>
-          <el-tab-pane label="分管审核" name="分管审核"></el-tab-pane>
           <el-tab-pane label="生产确认" name="生产确认"></el-tab-pane>
           <el-tab-pane label="项目生产" name="项目生产"></el-tab-pane>
           <el-tab-pane label="质量检查" name="质量检查"></el-tab-pane>
@@ -51,6 +53,7 @@ import arrangeProject from "./arrangeProject.vue"
 import businessReview from "./businessReview.vue"
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
+import ManageReview from './manageReview.vue'
 export default {
   props: {
     taskName: {
@@ -60,7 +63,7 @@ export default {
       type: Object,
     }
   },
-  components: { addproject, arrangeProject, businessReview, flow },
+  components: { addproject, arrangeProject, businessReview, flow, ManageReview },
   data() {
     return {
       activeName: '项目登记',

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

@@ -0,0 +1,110 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-08 13:56:14
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-10 17:56:58
+-->
+<template>
+  <div class="app-container">
+    <h2 style="text-align:center;">分管审核</h2>
+    <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
+      <el-form-item label="审核意见：" prop="jyComment">
+        <el-input type="textarea" :rows="4" placeholder="请输入审核意见" v-model="form.jyComment">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="审核人：">
+        <span class="auditor">{{ form.manageApprover }}</span>
+      </el-form-item>
+      <el-form-item label="审核时间：">
+        {{ form.manageApprovalTime }}
+      </el-form-item>
+      <el-form-item>
+        <p style="text-align:center;"><el-button type="primary" @click="confirm">确认审核</el-button></p>
+      </el-form-item>
+    </el-form>
+  </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 } from "@/api/oa/project/projectComment"
+export default {
+  computed: {
+    ...mapGetters(['name']),
+  },
+  props: {
+    disabled: {
+      type: Boolean,
+      require: true,
+    },
+    taskForm: {
+      type: Object,
+      required: true,
+    },
+    taskName: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      form: {
+        manageApprover: '',
+        manageApprovalTime: ''
+      },
+      rules: {
+        jyComment: [{ required: true, message: "请输入审核意见", trigger: "blur" }]
+      },
+      jyComment: "",
+      manageApprovalTime: ""
+    }
+  },
+  created() {
+    this.initForm();
+  },
+  methods: {
+    initForm() {
+      console.log(this.taskForm);
+      getProjectComment(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.form = res.data
+        } else {
+          if (this.taskName == '分管审核') {
+            this.form.manageApprover = this.name;
+            this.form.manageApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
+            console.log(this.form);
+          } else {
+            this.form.manageApprover = '';
+            this.form.manageApprovalTime = '';
+          }
+
+        }
+      })
+    },
+    confirm() {
+      const params = { taskId: this.taskForm.taskId };
+      // 获取下一个流程节点
+      getNextFlowNode(params).then(res => {
+        // getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
+        //   let userId = res.data.userId;
+        //   this.$set(this.taskForm.variables, "approval", userId);
+        //   complete(this.taskForm).then(response => {
+        //     this.$modal.msgSuccess(response.msg);
+        //     this.$emit("goBack");
+        //   });
+        // });
+      });
+    },
+
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+</style>

oa-ui/src/views/oa/budget/addBudget.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-09 17:19:08
+ * @LastEditTime: 2024-04-10 15:33:40
 -->
 <template>
   <div>
@@ -148,6 +148,7 @@
               <table border="1">
                 <tr>
                   <td style="width: 80px">姓名</td>
+                  <td style="width: 100px">部门</td>
                   <td style="width: 100px">岗位工资</td>
                   <td style="width: 110px">人员成本(天)</td>
                   <!-- <td style="width: 100px">进出场单价</td> -->
@@ -156,6 +157,7 @@
                 </tr>
                 <tr v-for="user in chooseUser" :key="user.userId">
                   <td>{{ user.nickName }}</td>
+                  <td>{{ user.dept.deptName }}</td>
                   <td>{{ user.salary.salary }}</td>
                   <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
                   <!-- <td>
@@ -175,7 +177,7 @@
                   <td class="staffCost">{{ user.staffCost }}</td>
                 </tr>
                 <tr>
-                  <td colspan="4">合计</td>
+                  <td colspan="5">合计</td>
                   <td>{{ budgetForm.staffCost }}</td>
                 </tr>
               </table>

oa-ui/src/views/oa/budget/components/budgetTable.vue

@@ -11,17 +11,19 @@
       <tr v-if="userLen != 1">
         <td :rowspan="userLen" class="head">人员</td>
         <td class="head">姓名</td>
+        <td class="head">部门</td>
         <td class="head">岗位工资</td>
         <td class="head">人员成本（天）</td>
-        <td class="head">进出场单价</td>
+        <!-- <td class="head">进出场单价</td> -->
         <td class="head">预算天数</td>
         <td class="head">金额</td>
       </tr>
       <tr v-for="user in budgetForm.chooseUser" :key="'user' + user.userId">
         <td>{{ user.nickName }}</td>
+        <td>{{ user.dept.deptName }}</td>
         <td>{{ user.salary.salary }}</td>
         <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
-        <td>{{ user.inOutPrice }}</td>
+        <!-- <td>{{ user.inOutPrice }}</td> -->
         <td>{{ user.days }}</td>
         <td>{{ user.staffCost }}</td>
       </tr>
@@ -60,7 +62,7 @@
         <td>{{ device.depreciation }}</td>
       </tr>
       <tr>
-        <td colspan="6" class="head">固定成本小计</td>
+        <td colspan="6" class="head">间接成本小计</td>
         <td>{{ budgetForm.fixCost }}</td>
       </tr>
       <tr>
@@ -101,7 +103,7 @@
         <td>{{ budgetForm.directExpense }}</td>
       </tr>
       <tr>
-        <td colspan="6" class="head">总成本=（固定成本+直接成本）*120%</td>
+        <td colspan="6" class="head">总成本=（间接成本+直接成本）*120%</td>
         <td>{{ totalBudget }}</td>
       </tr>
       <!-- <tr>

oa-ui/src/views/oa/budget/components/chooseDevice.vue

@@ -2,14 +2,14 @@
  * @Author: ysh
  * @Date: 2024-03-27 11:10:26
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-09 16:37:57
+ * @LastEditTime: 2024-04-10 14:20:42
 -->
 <template>
   <div>
     <el-form :inline="true">
       <el-form-item label="设备名称：">
-        <el-select v-model="queryParams.name">
-          <el-option v-for="item in nameList" :key="item.value" :label="item.label" :value="item.value">
+        <el-select v-model="queryParams.name" filterable @change="getList" clearable>
+          <el-option v-for="item in nameList" :key="item.name" :label="item.name" :value="item.name">
           </el-option>
         </el-select>
         <!-- <el-input v-model="queryParams.name" clearable></el-input> -->
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import { listDevice } from "@/api/oa/device/device";
+import { listDevice,listDeviceName } from "@/api/oa/device/device";
 export default {
   data() {
     return {
@@ -66,6 +66,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getNameList();
   },
   methods: {
     getList() {
@@ -76,6 +77,12 @@ export default {
         this.loading = false;
       });
     },
+    getNameList(){
+      listDeviceName().then(res=>{
+        console.log(res);
+        this.nameList = res.data
+      })
+    },
     handleSelectionChange(val) {
       this.chooseList = val
     },

oa-ui/src/views/oa/budget/components/chooseMoney.vue

@@ -99,11 +99,21 @@
           </tr>
           <tr>
             <td colspan="8">合计</td>
-            <td>{{ settle }}</td>
+            <td>{{ Number(settle) - Number(inOutPriceSum) }}</td>
           </tr>
         </table>
         <div style="color:red">tips:预结算表中的系数为：困难系统和调整系数相乘的值（1分制）。例如：困难系数1，调整系数0.8，最终系数为0.8</div>
       </el-form-item>
+      <el-form-item label="进出场费用：">
+        <el-input v-numeric v-model="inOutPrice" style="width:200px;" @change="getInoutpriceSum">
+          <template slot="append">人天</template>
+        </el-input>
+        ×
+        <el-input v-numeric v-model="peopleNumber" style="width:200px;" @change="getInoutpriceSum">
+          <template slot="append">数量</template>
+        </el-input>
+        = {{ inOutPriceSum }}
+      </el-form-item>
       <el-form-item label="预结算合计：">
         <el-tag type="danger" style="margin-right:20px;font-size:14px;">¥{{ settle }}</el-tag>
       </el-form-item>
@@ -141,7 +151,10 @@ export default {
         subItemLoading: true,
         scaleGradeLoading: true,
       },
-      settle: 0
+      settle: 0,
+      inOutPrice:0,
+      peopleNumber:0,
+      inOutPriceSum:0
     }
   },
   created() {
@@ -251,11 +264,19 @@ export default {
       for (let work of this.workList) {
         sum = sum + Number(work.settle)
       }
+      debugger
+      sum = sum + this.inOutPriceSum;
       this.settle = sum.toFixed(2);
       let obj = {}
       obj.workList = this.workList;
       obj.settle = this.settle;
-      this.$emit('getSettle', obj)
+      obj.inOutPrice = this.inOutPrice;
+      obj.peopleNumber = this.peopleNumber;
+      this.$emit('getSettle', obj);
+    },
+    getInoutpriceSum(){
+      this.inOutPriceSum = Number(this.inOutPrice) * Number(this.peopleNumber);
+      this.getSettleSum()
     },
     //数组去重
     setArray(arr) {