修改预算审核

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-08 16:08:33
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-10 16:16:04
+ * @LastEditTime: 2024-05-27 15:13:37
 -->
 <template>
   <div>

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-23 11:21:44
+ * @LastEditTime: 2024-05-27 15:25:58
 -->
 <template>
   <div class="main">
     <h2 style="text-align: center">项目直接生产成本预算表</h2>
-    <p style="text-align: right;padding-right:80px;">编制人：{{ budgetForm.compilerUser? budgetForm.compilerUser.nickName: '' }}</p>
+    <p style="text-align: center;">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
     <table border="1" class="table">
       <tr>
         <td style="width: 100px;">项目名称</td>
@@ -140,6 +140,9 @@
         <td colspan="1" class="head">{{ contract.contractId ? contract.amount : '' }}</td>
       </tr>
     </table>
+    <el-row v-if="taskName == '预算审核'" class="text-center mt20 mb20">
+      <el-button type="success" size="mini" @click="confirmSucess">审批通过</el-button>
+    </el-row>
   </div>
 </template>
 
@@ -153,6 +156,9 @@ import { listProjectWork } from "@/api/oa/project/projectWork";
 import { mapGetters } from 'vuex';
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
+import { getUser } from '@/api/system/user'
+import { getUsersManageLeader } from "@/api/system/post";
 export default {
   computed: {
     ...mapGetters(["name", "userId"]),
@@ -161,6 +167,9 @@ export default {
     taskForm: {
       type: Object,
       require: true
+    },
+    taskName: {
+      type: String,
     }
   },
   data() {
@@ -240,6 +249,19 @@ export default {
         this.workContentList = res.rows;
       })
     },
+    confirmSucess() {
+      const params = { taskId: this.taskForm.taskId };
+      getNextFlowNode(params).then(res => {
+        getUsersManageLeader({ userId: this.budgetForm.compiler }).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>

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

@@ -42,11 +42,19 @@
       <el-button type="primary" @click="$emit('getPrice', work)">确定</el-button>
       <el-button @click="$emit('cancel')">取消</el-button>
     </el-row>
+    <div class="mt20">
+      <el-alert :closable="false" title="系数备注" type="success">
+        <h2 v-html="priceRemark"></h2>
+      </el-alert>
+      
+    </div>
+
   </div>
 </template>
 
 <script>
 import { getWorkTypeList, getWorkItemList, getSubItemList, getScaleGradeList, getUnitPrice, getPrice } from '@/api/oa/price/price'
+import { getPriceRemarkByWorkType } from '@/api/oa/price/price'
 export default {
   props: {
     row: {
@@ -57,6 +65,11 @@ export default {
   watch: {
     row(val) {
       this.getPriceById()
+    },
+    'work.workType'(val) {
+      getPriceRemarkByWorkType({ workType: val }).then(res => {
+        this.priceRemark = res.msg
+      })
     }
   },
   data() {
@@ -66,7 +79,8 @@ export default {
         workTypeList: [],
         workItemList: [],
         scaleGradeList: []
-      }
+      },
+      priceRemark: ""
     }
   },
   mounted() {
@@ -95,6 +109,9 @@ export default {
               let scaleGradeList = this.setArray(res);
               this.workSelect.scaleGradeList = scaleGradeList;
             })
+            getPriceRemarkByWorkType({ workType: res.data.workType }).then(res => {
+              this.priceRemark = res.msg
+            })
           }
         })
       } else {
@@ -184,4 +201,8 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.remark {
+  color: #409EFF;
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-24 11:49:20
+ * @LastEditTime: 2024-05-27 09:34:12
 -->
 <template>
   <div>
@@ -23,8 +23,7 @@
           <div v-if="participates.length == 0" style="color:#F56C6C">tips:请选择参与人员</div>
         </el-form-item>
         <el-form-item label="驾驶员：">
-          <el-tooltip :disabled="form.drivers.length == 0" class="item" effect="dark"
-            content="直接获取用车申请中的驾驶员,若无驾驶员,则需要先提交项目的用车申请" placement="top-end">
+          <el-tooltip class="item" effect="dark" content="直接获取用车申请中的驾驶员,若无驾驶员,则需要先提交项目的用车申请" placement="top-end">
             <el-select v-model="form.drivers" multiple disabled style="width:90%">
               <el-option v-for="item in userList" :label="item.nickName" :value="item.userId" :key="item.userId">
               </el-option>
@@ -34,8 +33,7 @@
           <el-button class="ml10" @click="openDriver = true" type="primary" size="mini" icon="el-icon-plus"></el-button> -->
         </el-form-item>
         <el-form-item label="使用车辆：">
-          <el-tooltip :disabled="form.cars.length == 0" class="item" effect="dark"
-            content="直接获取用车申请中的车辆,若无车辆,则需要先提交项目的用车申请" placement="top-end">
+          <el-tooltip class="item" effect="dark" content="直接获取用车申请中的车辆,若无车辆,则需要先提交项目的用车申请" placement="top-end">
             <el-select v-model="form.cars" multiple disabled style="width:90%">
               <el-option v-for="item in carList" :label="item.licensePlate + item.brand" :value="item.carId"
                 :key="item.carId">
@@ -176,7 +174,7 @@ export default {
         licensePlate: "",
         drivers: [],
         cars: [],
-        participates:[],
+        participates: [],
         staff: "",
         entryTime: "",
         exitTime: "",
@@ -339,29 +337,28 @@ export default {
       })
     },
     submitNextFlow() {
-      this.preserve();
-      const params = { taskId: this.taskForm.taskId };
-      // this.$confirm('结束后流程不可再修改，请问是否确定结束？', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //   }).then(() => {
-
-      //   }).catch(() => { });
-      // 获取下一个流程节点
-      getNextFlowNode(params).then(res => {
-        getProject(this.taskForm.formId).then(res => {
-          if (res.data) {
-            this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-            this.$set(this.taskForm.variables, "archiveInitiator", res.data.projectLeader);
-            this.$set(this.taskForm.variables, "settleInitiator", res.data.projectLeader);
-            complete(this.taskForm).then(response => {
-              this.$modal.msgSuccess(response.msg);
-              this.$emit('goBack');
-            });
-          }
+      this.$confirm('项目结束后不可再修改，请问是否确定结束？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.preserve();
+        const params = { taskId: this.taskForm.taskId };// 获取下一个流程节点
+        getNextFlowNode(params).then(res => {
+          getProject(this.taskForm.formId).then(res => {
+            if (res.data) {
+              this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+              this.$set(this.taskForm.variables, "archiveInitiator", res.data.projectLeader);
+              this.$set(this.taskForm.variables, "settleInitiator", res.data.projectLeader);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack');
+              });
+            }
+          })
         })
-      })
+      }).catch(() => { });
+
     },
   },
 };

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-22 18:18:31
+ * @LastEditTime: 2024-05-27 14:08:00
 -->
 <template>
   <div class="app-container">

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-05-10 15:14:21
+ * @LastEditTime: 2024-05-27 14:54:08
 -->
 <template>
   <div class="app-container">
@@ -478,7 +478,7 @@ export default {
     // 是否显示审批通过
     isShowApprove() {
       if (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.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 == '项目结算') {
         return false

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

@@ -25,7 +25,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="todoList" border @selection-change="handleSelectionChange">
+    <el-table v-if="dataShow" v-loading="loading" :data="todoList" border @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
       <!-- <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" /> -->
       <el-table-column label="流程名称" align="center" prop="procDefName" />
@@ -56,17 +56,9 @@
 </template>
 
 <script>
-import {
-  todoList,
-  complete,
-  returnList,
-  returnTask,
-  rejectTask,
-  getDeployment,
-  delDeployment,
-  exportDeployment
-} from "@/api/flowable/todo";
+import { todoList, complete, returnList, returnTask, rejectTask, getDeployment, delDeployment, exportDeployment } from "@/api/flowable/todo";
 import { getProcessVariables } from "@/api/flowable/definition"
+import { getProject, addProject, delProject } from "@/api/oa/project/project";
 export default {
   name: "Deploy",
   components: {},
@@ -100,7 +92,8 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {},
+      dataShow: true,
     };
   },
   created() {
@@ -116,6 +109,23 @@ export default {
         this.loading = false;
       });
     },
+    getProjectInfo(row) {
+      getProcessVariables(row.taskId).then(res => {
+        if (res.data) {
+          getProject(res.data.formId).then(result => {
+            if (res.data) {
+              let name = result.data.projectNumber +'-' + result.data.projectName
+              this.todoList.map(item => {
+                if (item.taskId == row.taskId) {
+                 this.$set(item,'project',name)
+                }
+              })
+              console.log(this.todoList);
+            }
+          })
+        }
+      })
+    },
     // 跳转到处理页面
     handleProcess(row) {
       let path = this.getRoutePath(row);