修改经营审核、分管审核

oa-ui/src/store/index.js

@@ -7,6 +7,7 @@ import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
 import getters from './getters'
+import projectProcess from './modules/projectProcess'
 
 Vue.use(Vuex)
 
@@ -17,7 +18,8 @@ const store = new Vuex.Store({
     user,
     tagsView,
     permission,
-    settings
+    settings,
+    projectProcess
   },
   getters
 })

oa-ui/src/store/modules/projectProcess.js

@@ -0,0 +1,15 @@
+const projectProcess = {
+  state: {
+    underDeptId: [],
+    underLeaderId: []
+  },
+  mutations: {
+    SET_UNDERDEPTID: (state, underDeptId) => {
+      state.underDeptId = underDeptId
+    },
+    SET_UNDERLEADERID: (state, underLeaderId) => {
+      state.underLeaderId = underLeaderId
+    }
+  }
+}
+export default projectProcess

oa-ui/src/utils/ruoyi.js

@@ -88,7 +88,7 @@ export function selectDictLabel(datas, value) {
 
 // 回显数据字典（字符串、数组）
 export function selectDictLabels(datas, value, separator) {
-  if (value === undefined || value.length ===0) {
+  if (value === undefined || value.length === 0) {
     return "";
   }
   if (Array.isArray(value)) {
@@ -231,3 +231,19 @@ export function tansParams(params) {
 export function blobValidate(data) {
   return data.type !== 'application/json'
 }
+
+export function 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 [];
+  }
+}

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-10 14:08:00
+ * @LastEditTime: 2024-04-11 14:13:45
 -->
 
 <template>
@@ -41,7 +41,7 @@
       <el-form-item label="项目概况：">
         <table border="1">
           <tr>
-            <td style="width: 250px">工作内容</td>
+            <td style="width: 180px">工作内容</td>
             <td>等级或比例尺</td>
             <td>单位</td>
             <td>工作量</td>
@@ -50,7 +50,7 @@
           </tr>
           <tr v-for="(work, index) in workList" :key="index">
             <td>
-              <el-input v-model="work.content" type="textarea" autosize clearable></el-input>
+              <el-input v-model="work.content" type="textarea"  clearable :autosize="{ minRows: 4, maxRows: 10}"></el-input>
             </td>
             <td>
               <el-input v-model="work.scale" clearable></el-input>
@@ -67,7 +67,7 @@
               </el-date-picker>
             </td>
             <td>
-              <el-input v-model="work.remark" type="textarea" autosize clearable></el-input>
+              <el-input v-model="work.remark" type="textarea"  clearable :autosize="{ minRows: 4, maxRows: 10}"></el-input>
             </td>
             <td>
               <el-button type="danger" icon="el-icon-minus" size="mini" circle

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-08 14:11:02
+ * @LastEditTime: 2024-04-11 16:24:28
 -->
 <template>
   <div class="app-container">
@@ -199,7 +199,7 @@ export default {
           this.$set(this.taskForm.variables, "approval", userId);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack')
+            this.$emit('goBack');
           });
         })
       })

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-10 17:59:08
+ * @LastEditTime: 2024-04-11 17:03:10
 -->
 <template>
   <div class="app-container">
@@ -13,7 +13,7 @@
         </el-input>
       </el-form-item>
       <el-form-item label="审核人：">
-        <span class="auditor">{{ form.jyApprover }}</span>
+        <span class="auditor">{{ form.jyApproverName }}</span>
       </el-form-item>
       <el-form-item label="审核时间：">
         {{ form.jyApprovalTime }}
@@ -30,9 +30,11 @@ 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"
+import { listProject, getProject, addProject, updateProject, delProject, submitProject, modifyProject } from "@/api/oa/project/project";
+import { getUsersManageLeaderByDept } from '@/api/system/post'
 export default {
   computed: {
-    ...mapGetters(['name']),
+    ...mapGetters(['name', 'userId']),
   },
   props: {
     disabled: {
@@ -43,58 +45,84 @@ export default {
       type: Object,
       required: true,
     },
+    taskName: {
+      type: String,
+      required: true,
+    }
   },
   data() {
     return {
       form: {
         jyApprover: '',
+        jyApproverName: '',
         jyApprovalTime: ''
       },
       rules: {
         jyComment: [{ required: true, message: "请输入审核意见", trigger: "blur" }]
       },
-      jyComment: "",
-      jyApprovalTime: ""
+      jyApprovalTime: "",
+      managerList: []
     }
   },
   created() {
-    this.initForm();
+    if (this.$route.query.taskName != '项目登记' && this.$route.query.taskName != '项目安排') {
+      this.initForm();
+    }
+  },
+  mounted() {
+    if (this.$route.query.taskName != '项目登记' && this.$route.query.taskName != '项目安排') {
+      this.getDeptManageLeader()
+    }
   },
   methods: {
     initForm() {
-      console.log(this.taskForm);
       getProjectComment(this.taskForm.formId).then(res => {
         if (res.data) {
           this.form = res.data
+          if (this.form.jyUser) {
+            this.form.jyApproverName = this.form.jyUser.nickName
+          }
         } else {
           if (this.taskName == '经营审核') {
-            this.form.jyApprover = this.name;
+            this.form.jyApproverName = this.name;
+            this.form.jyApprover = this.userId;
             this.form.jyApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
-            console.log(this.form);
           } else {
             this.form.jyApprover = '';
             this.form.jyApprovalTime = '';
           }
-
-          console.log(this.form);
+        }
+      })
+    },
+    getDeptManageLeader() {
+      getProject(this.$route.query.formId).then(res => {
+        let deptId = res.data.undertakingDept.split(',');
+        this.$store.commit('SET_UNDERDEPTID', deptId);
+        for (let d of deptId) {
+          getUsersManageLeaderByDept({ deptId: Number(d) }).then(resopnse => {
+            if (resopnse.data) {
+              this.managerList.push(resopnse.data.userId)
+            }
+          })
         }
       })
     },
     confirm() {
+      this.form.projectId = this.taskForm.formId
+      addProjectComment({ projectId: this.taskForm.formId, jyComment: this.form.jyComment })
       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");
-        //   });
-        // });
+        this.managerList.push(10)
+        this.managerList.push(7)
+        this.managerList = Array.from(new Set(this.managerList));
+        this.$set(this.taskForm.variables, "approvalList", this.managerList);
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit("goBack");
+        });
       });
     },
-
   },
 }
 </script>

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

@@ -17,13 +17,15 @@
             <arrangeProject :taskForm="taskForm" :disabled="taskName != '项目安排'" @goBack="goBack"></arrangeProject>
           </el-tab-pane>
           <el-tab-pane label="项目预算" name="项目预算">
-            
+
           </el-tab-pane>
           <el-tab-pane label="经营审核" name="经营审核">
-            <business-review :taskForm="taskForm" :taskName="taskName" :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>
+            <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>
@@ -102,7 +104,7 @@ export default {
         deadline: '',
         remark: ''
       }],
-      flowData: {}
+      flowData: {},
     }
   },
   created() {

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

@@ -2,18 +2,18 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-10 17:56:58
+ * @LastEditTime: 2024-04-11 17:25:29
 -->
 <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-form-item label="审核意见：" prop="manageComment">
+        <el-input type="textarea" :rows="4" placeholder="请输入审核意见" v-model="form.manageComment">
         </el-input>
       </el-form-item>
       <el-form-item label="审核人：">
-        <span class="auditor">{{ form.manageApprover }}</span>
+        <span class="auditor">{{ form.manageApproverName }}</span>
       </el-form-item>
       <el-form-item label="审核时间：">
         {{ form.manageApprovalTime }}
@@ -29,10 +29,11 @@
 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"
+import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
+import { getUsersDeptLeaderByDept } from '@/api/system/post'
 export default {
   computed: {
-    ...mapGetters(['name']),
+    ...mapGetters(['name', 'userId']),
   },
   props: {
     disabled: {
@@ -52,49 +53,76 @@ export default {
     return {
       form: {
         manageApprover: '',
+        manageApproverName: '',
         manageApprovalTime: ''
       },
       rules: {
-        jyComment: [{ required: true, message: "请输入审核意见", trigger: "blur" }]
+        manageComment: [{ required: true, message: "请输入审核意见", trigger: "blur" }]
       },
-      jyComment: "",
-      manageApprovalTime: ""
+      deptLeaderList: []
     }
   },
   created() {
-    this.initForm();
+    if (this.$route.query.taskName != '项目登记' && this.$route.query.taskName != '项目安排') {
+      this.initForm();
+    }
+  },
+  watch: {
+    underDeptId(newVal, oldVal) {
+      console.log(newVal);
+      this.getDeptLeader(newVal)
+    }
+  },
+  computed: {
+    underDeptId() {
+      return this.$store.state.projectProcess.underDeptId;
+    }
   },
   methods: {
     initForm() {
-      console.log(this.taskForm);
       getProjectComment(this.taskForm.formId).then(res => {
         if (res.data) {
           this.form = res.data
+          if (this.taskName == '分管审核') {
+            this.form.manageApprover = this.$store.state.user.userId;
+            this.form.manageApproverName = this.$store.state.user.name;
+            this.form.manageApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
+          } else {
+            if (res.data.managerUser)
+              this.form.manageApproverName = res.data.managerUser.nickName
+          }
         } else {
           if (this.taskName == '分管审核') {
-            this.form.manageApprover = this.name;
+            this.form.manageApprover = this.$store.state.user.userId;
+            this.form.manageApproverName = this.$store.state.user.name;
             this.form.manageApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
-            console.log(this.form);
           } else {
             this.form.manageApprover = '';
             this.form.manageApprovalTime = '';
           }
-
         }
       })
     },
+    getDeptLeader(val) {
+      this.deptLeaderList = [];
+      for (let v of val) {
+        getUsersDeptLeaderByDept({ deptId: Number(v) }).then(res => {
+          this.deptLeaderList.push(res.data.userId);
+          this.$store.commit('SET_UNDERLEADERID', this.deptLeaderList)
+        })
+      }
+    },
     confirm() {
+      this.form.projectId = this.taskForm.formId
+      updateProjectComment({ projectId: this.taskForm.formId, manageComment: this.form.manageComment })
       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");
-        //   });
-        // });
+        this.$set(this.taskForm.variables, "approvalList", this.deptLeaderList);
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit("goBack");
+        });
       });
     },
 

oa-ui/src/views/flowable/form/safeForm.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
-    <el-row>
+    <el-row :gutter="20">
       <el-col :span="18" :xs="24">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
           <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '安全交底'">
             <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目编号" disabled style="width: 300px" />
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
@@ -21,7 +21,7 @@
             </el-descriptions>
           </el-form-item>
           <el-form-item label="接受交底人" prop="disclosureAccepter">
-            <el-select v-model="form.disclosureAccepter" filterable clearable style="width:120px"
+            <el-select v-model="form.disclosureAccepter" filterable clearable style="width:220px"
               :disabled="taskName != '安全交底'">
               <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
                 v-if="item.nickName != 'admin'">
@@ -29,16 +29,16 @@
             </el-select>
           </el-form-item>
           <el-form-item label="环境管理要求" prop="environmentComment" :disabled="taskName != '安全交底'">
-            <el-input v-model="form.environmentComment" placeholder="请输入环境管理要求" type="textarea"/>
+            <el-input v-model="form.environmentComment" placeholder="请输入环境管理要求" type="textarea" :autosize="{ minRows: 8 }"/> 
           </el-form-item>
           <el-form-item label="安全生产与职业健康要求" prop="outsideComment" :disabled="taskName != '安全交底'">
-            <el-input v-model="form.outsideComment" placeholder="请输入安全生产与职业健康要求" type="textarea"/>
+            <el-input v-model="form.outsideComment" placeholder="请输入安全生产与职业健康要求" type="textarea" :autosize="{ minRows: 8 }"/>
           </el-form-item>
           <el-form-item label="信息安全管理要求" prop="insideComment" :disabled="taskName != '安全交底'">
-            <el-input v-model="form.insideComment" placeholder="请输入信息安全管理要求" type="textarea"/>
+            <el-input v-model="form.insideComment" placeholder="请输入信息安全管理要求" type="textarea" :autosize="{ minRows: 8 }"/>
           </el-form-item>
           <el-form-item label="安全交底意见" prop="disclosureComment" :disabled="taskName != '安全交底'">
-            <el-input v-model="form.disclosureComment" placeholder="请输入安全交底意见" />
+            <el-input v-model="form.disclosureComment" placeholder="请输入安全交底意见" type="textarea" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-form-item label="安全交底人" prop="disclosurer">
             {{ form.disclosurerUser ? form.disclosurerUser.nickName : form.user.nickName }}

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-10 15:33:40
+ * @LastEditTime: 2024-04-11 10:25:37
 -->
 <template>
   <div>
@@ -727,9 +727,7 @@ export default {
       }
       for (let work of form.workList) {
         work.budgetId = form.budgetId;
-        addBudgetSettle(work).then(res => {
-          this.$modal.msgSuccess("预算表生成成功");
-        });
+        addBudgetSettle(work)
       }
     },
     calculateThatCost() {

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

@@ -91,7 +91,11 @@
               {{ work.workload }}
             </td>
             <td>
-              <el-input v-model="work.coefficient" placeholder="请输入系数" @blur="getTotal(work)"></el-input>
+              <el-input-number v-model="work.coefficient"  
+              :controls="false" :precision="2" :step="0.01" :max="10" @blur="getTotal(work)"
+              style="width:60px;">
+              </el-input-number>
+              <!-- <el-input v-model="work.coefficient" placeholder="请输入系数" @blur="getTotal(work)"></el-input> -->
             </td>
             <td class="workTotal">
               {{ work.settle }}
@@ -244,6 +248,7 @@ export default {
           this.setValue(work, 'price', res.data.price)
           this.setValue(work, 'coefficient', 1)
           if (work.workload != undefined || work.workload != '') {
+
             this.getTotal(work);
           }
         }
@@ -264,7 +269,6 @@ 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 = {}