新增申请表单组件，修改项目流转中借款申请的显示和跳转

oa-ui/src/router/index.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-25 17:35:52
+ * @LastEditTime: 2024-04-26 17:07:38
  */
 /*
  * @Author: ysh
@@ -231,6 +231,20 @@ export const constantRoutes = [
         name: 'addBudget',
         meta: { title: '新增预算', icon: '' }
 
+      }
+    ]
+  },
+  {
+    path: '/applyForm/borrow',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/flowable/task/todo/applyForm/borrowIndex'),
+        name: 'borrow',
+        meta: { title: '借款申请', icon: '' }
+
       }
     ]
   }

oa-ui/src/views/flowable/form/borrow/borrowData.vue

@@ -2,17 +2,87 @@
  * @Author: ysh
  * @Date: 2024-04-25 17:17:53
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-25 17:50:04
+ * @LastEditTime: 2024-04-26 17:20:15
 -->
 <template>
-  <div>
-
+  <div class="mt20">
+    <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus" @click="addBorrowFlow">新增借款</el-button>
+    <el-table :data="borrowList" style="width: 100%">
+      <el-table-column type="index" label="序号" width="50" />
+      <el-table-column label="申请状态" width="100">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.lendTime == null ? 'warning' : 'success'">
+            {{ scope.row.lendTime == null ? '审批中' : '已完成' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="borrowUsage" label="申请类型" width="100">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.borrowUsage === '0' ? 'primary' : 'info'">{{ scope.row.borrowUsage === '0' ?
+      '项目借款' : '非项目借款' }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="applyAmount" label="申请金额" />
+      <el-table-column prop="managerAmount" label="核准金额" />
+      <el-table-column prop="applierUser.nickName" label="申请人" />
+      <el-table-column prop="dept.deptName" label="申请部门" width="110" />
+      <el-table-column prop="applyDate" label="申请时间" width="110" />
+      <el-table-column prop="deptComment" label="部门审核意见" show-overflow-tooltip width="100">
+        <template slot-scope="scope">
+          {{ scope.deptComment == null ? '待审' : scope.deptComment }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="managerComment" label="分管审核意见" show-overflow-tooltip width="100">
+        <template slot-scope="scope">
+          {{ scope.managerComment == null ? '待审' : scope.managerComment }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="zjlComment" label="总经理审核意见" show-overflow-tooltip width="120">
+        <template slot-scope="scope">
+          {{ scope.zjlComment == null ? '待审' : scope.zjlComment }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="deptComment" label="财务经办人" show-overflow-tooltip width="100">
+      </el-table-column>
+      <el-table-column prop="lendTime" label="支付时间">
+      </el-table-column>
+      <el-table-column label="操作" fixed="right">
+        <template slot-scope="scope">
+          <el-button icon="el-icon-view" type="text" size="mini" @click="handleLook(scope.row)">查看明细</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog title="借款明细" :visible.sync="open" append-to-body>
+      <el-table :data="detailList" style="width: 100%">
+        <el-table-column type="index" label="序号" width="50" />
+        <el-table-column prop="borrowItem" label="借款项目" />
+        <el-table-column prop="unit" label="单位" />
+        <el-table-column prop="price" label="单价" />
+        <el-table-column prop="quantity" label="数量" />
+        <el-table-column prop="applyAmount" label="金额" />
+        <el-table-column prop="xmAmount" label="项目部校核金额" />
+        <el-table-column prop="managerAmount" label="分管校核金额" />
+      </el-table>
+      <el-form inline class="mt20">
+        <el-form-item label="申请金额：">
+          {{ clickRow.applyAmount }}
+        </el-form-item>
+        <el-form-item label="校准金额：" style="margin-left:20px;">
+          {{ clickRow.managerAmount == null ? 0 : clickRow.managerAmount }}
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
 import { getBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
+import { listDefinition } from "@/api/flowable/definition";
+import { getNextFlowNodeByStart } from "@/api/flowable/todo";
+import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
+import { todoList } from "@/api/flowable/todo";
+import { Snowflake } from '@/utils/snowFlake.js'
 export default {
   props: {
     taskForm: {
@@ -20,16 +90,92 @@ export default {
       required: true
     }
   },
-  mounted(){
+  data() {
+    return {
+      borrowList: [],
+      detailList: [],
+      definitionList: [], //流程列表
+      clickRow: {},
+      open: false,
+    }
+  },
+  mounted() {
     this.getBorrowData()
+    this.listDefinition();
   },
   methods: {
     getBorrowData() {
-      listBorrow({projectId:this.taskForm.formId}).then(res => {
-        
-        console.log(res);
+      listBorrow({ projectId: this.taskForm.formId }).then(res => {
+        if (res.code == 200) {
+          this.borrowList = res.rows
+          console.log(res);
+        }
       })
-    }
+    },
+    getBorrowDetailData(borrowId) {
+      getBorrowDetail(borrowId).then(res => {
+        if (res.data.length != 0) {
+          this.detailList = res.data
+          console.log(res);
+        }
+      });
+    },
+    handleLook(row) {
+      this.open = true
+      this.clickRow = row
+      this.getBorrowDetailData(row.borrowId);
+    },
+    addBorrowFlow() {
+      let row = this.definitionList[0];
+      let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
+        let data = res.data
+        const variables = {};
+        const formData = {};
+        formData.formId = formId
+        if (row.id) {
+          variables.variables = formData;
+          // 启动流程并将表单数据加入流程变量
+          definitionStart(row.id, JSON.stringify(variables)).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            let procInstanceId = res.data;
+            todoList({
+              pageNum: 1,
+              pageSize: 99999999,
+              processInsId: procInstanceId
+            }).then(toDoRes => {
+              let records = toDoRes.data.records;
+              if (records.length == 1) {
+                records = records[0]
+              }
+              this.$router.push({
+                path: '/applyForm/borrow',
+                query: {
+                  procInsId: records.procInsId,
+                  executionId: records.executionId,
+                  deployId: records.deployId,
+                  taskId: records.taskId,
+                  taskName: records.taskName,
+                  startUser: records.startUserName + '-' + records.startDeptName,
+                  formId: formData.formId,
+                  procDefName: records.procDefName
+                }
+              })
+            })
+          })
+        }
+      })
+    },
+    listDefinition() {
+      listDefinition({
+        pageNum: 1,
+        pageSize: 9999,
+        name: '借款审批'
+      }).then(response => {
+        this.definitionList = response.data.records;
+        console.log(this.definitionList);
+      });
+    },
   }
 }
 </script>

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

@@ -171,7 +171,6 @@ export default {
   methods: {
     initBudgetForm() {
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
-        console.log(res);
         this.budgetForm = res.rows[0];
         getBudgetDevice(this.budgetForm.budgetId).then(res => {
           this.chooseDevice = res.data;

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-25 14:15:08
+ * @LastEditTime: 2024-04-26 16:55:34
 -->
 
 <template>
@@ -10,12 +10,30 @@
     <!-- 项目登记 -->
     <h2 style="text-align: center">项目登记</h2>
     <el-form :model="addForm" :rules="rules" label-width="100px" :disabled="disabled">
-      <el-form-item label="项目编号：" prop="projectNumber">
-        <el-input v-model="addForm.projectNumber"></el-input>
-      </el-form-item>
-      <el-form-item label="项目名称：" prop="projectName">
-        <el-input v-model="addForm.projectName"></el-input>
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编号：" prop="projectNumber">
+            <el-input v-model="addForm.projectNumber"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="合同编码：">
+            <el-input v-model="contractCode"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12"><el-form-item label="项目名称：" prop="projectName">
+            <el-input v-model="addForm.projectName"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="合同编号：">
+            <el-input v-model="contractNumber"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-form-item label="项目类型：" prop="projectType">
         <el-input v-model="addForm.projectType"></el-input>
       </el-form-item>
@@ -72,7 +90,8 @@
                 :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
             </td>
             <td>
-              <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletWorkItem(index)"></el-button>
+              <el-button type="danger" icon="el-icon-minus" size="mini" circle
+                @click="deletWorkItem(index)"></el-button>
             </td>
           </tr>
         </table>
@@ -85,7 +104,8 @@
       <el-row>
         <el-col :span="6" :xs="24" :offset="12">
           <el-form-item label="项目登记人：" prop="registrantUser">
-            <span class="auditor"> {{ addForm.projectRegistrantUser ? addForm.projectRegistrantUser.nickName : registrantUser }} </span>
+            <span class="auditor"> {{ addForm.projectRegistrantUser ? addForm.projectRegistrantUser.nickName :
+      registrantUser }} </span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -110,6 +130,8 @@ import { getUser } from "@/api/system/user";
 import { getUsersDeptLeaderByDept } from "@/api/system/post";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
 import { getProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
+import { listProjectContract, addProjectContract, get } from "@/api/oa/contract/projectContract";
+import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 export default {
   props: {
     disabled: {
@@ -144,6 +166,8 @@ export default {
         registerTime: undefined,
         projectRegistrant: "",
       },
+      contractCode: "",
+      contractNumber: "",
       rules: {
         projectNumber: [{ required: true, message: "请输入项目编号", trigger: "blur" }],
         projectName: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
@@ -159,7 +183,7 @@ export default {
         },
       ],
       restaurants: [{ value: "中国电建集团成都勘测设计研究院有限公司勘测设计分公司" }],
-      registrantUser:''
+      registrantUser: ''
     };
   },
   created() {
@@ -171,9 +195,12 @@ export default {
       this.addForm.projectRegistrant = this.userId;
       this.registrantUser = this.name;
     }
+
+    this.getContractDataList();
     // this.getList();
   },
-  mounted() { },
+  mounted() {
+  },
   methods: {
     // 查询项目列表
     getList() {
@@ -202,9 +229,31 @@ export default {
         this.workList = res.data;
       })
     },
+    getContractDataList() {
+      listProjectContract({ projectId: this.taskForm.formId }).then(res => {
+        if (res.rows) {
+          for (let row of res.rows) {
+            getContract(row.contractId).then(res => {
+              if (res.data) {
+                if (this.contractCode != '') {
+                  this.contractCode = this.contractCode + '、' + res.data.contractCode;
+                } else {
+                  this.contractCode = res.data.contractCode;
+                }
+                if (this.contractNumber != '') {
+                  this.contractNumber = this.contractNumber + '、' + res.data.contractNumber;
+                } else {
+                  this.contractNumber = res.data.contractNumber;
+                }
+                console.log(res);
+              }
+            })
+          }
+        }
+      })
+    },
     confirmAddForm() {
       this.addForm.projectId = this.taskForm.formId;
-      console.log(this.addForm);
       for (let work of this.workList) {
         work.projectId = this.taskForm.formId;
         addProjectWork(work);
@@ -267,6 +316,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/styles/element-reset.scss";
+
 .project-wrapper {
   padding: 25px;
 }

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

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-24 10:09:13
+ * @LastEditTime: 2024-04-26 16:58:04
 -->
 <template>
   <div class="app-container">
     <h2 style="text-align: center;">项目安排</h2>
     <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="12" :xs="24">
           <el-form-item label="承担部门：" prop="undertakingDept">
             <el-select v-model="form.deptId" multiple clearable style="width:100%" @change="getDeptLeader">
@@ -19,7 +19,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" :xs="24">
-          <el-form-item label="部门负责人" prop="deptLeader">
+          <el-form-item label="部门负责人：" prop="deptLeader">
             <el-select v-model="form.deptLeader" multiple clearable style="width:100%">
               <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
               </el-option>
@@ -27,9 +27,9 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="12" :xs="24">
-          <el-form-item label="项目负责人" prop="projectLeader">
+          <el-form-item label="项目负责人：" prop="projectLeader">
             <el-tag effect="plain" type="warning" style="margin-right: 10px;"
               v-if="form.projectLeader != '' && form.projectLeader != undefined">{{
                 form.projectLeaderName }}</el-tag>
@@ -37,8 +37,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" :xs="24">
-          <el-form-item label="现场负责人" prop="siteLeader">
-            <el-select v-model="form.siteLeader" filterable clearable style="width:400px">
+          <el-form-item label="现场负责人：" prop="siteLeader">
+            <el-select v-model="form.siteLeader" filterable clearable style="width:100%">
               <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
                 v-if="item.nickName != 'admin'">
               </el-option>

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

@@ -55,7 +55,6 @@ export default {
     initBudget() {
       let projectId = this.taskForm.formId;
       listBudget({ projectId }).then(res => {
-        console.log(res);
         if (res.total != 0) {
           this.haveBudget = true;
           this.budgetId = res.rows[0].budgetId;
@@ -64,8 +63,6 @@ export default {
               this.workList = res.data;
             }
             getBudgetSettle(this.budgetId).then(res => {
-
-              console.log(res);
             });
           });
         }

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

@@ -265,10 +265,8 @@ export default {
     },
     // 暂存数据
     preserve() {
-      console.log(this.oldProgressList);
       if (this.oldProgressList.length != 0) {
         delProjectProgress([this.taskForm.formId]).then(res => {
-          console.log(res);
           for (let progress of this.progressList) {
             progress.projectId = this.taskForm.formId;
             addProjectProgress(progress);

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

@@ -128,7 +128,6 @@ export default {
     if(this.taskName !='' && this.taskName != undefined &&this.taskName != null){
       this.activeName = this.taskName;
     }
-    console.log(this.taskName);
     this.getList();
     this.getDeptList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
@@ -192,7 +191,6 @@ export default {
     handleChangeDept(deptId) {
       this.peopleForm.userId = '';
       listUser({ pageSize: 999999, deptId }).then(res => {
-        console.log(res);
         this.peopleForm.userList = res.rows
       })
     },

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

@@ -155,7 +155,6 @@ export default {
     /** 查询cmc技术交底列表 */
     initForm() {
       getTechnical(this.taskForm.formId).then((res) => {
-        console.log(res);
         if (res.data) {
           this.haveTechnical = true;
           this.form = res.data;

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

@@ -1767,7 +1767,6 @@ export default {
         const params = { taskId: this.taskForm.taskId }
         getNextFlowNode(params).then(res => {
           if (this.taskName == '员工填报') {
-            console.log(this.tableForm);
             getProject(this.tableForm.projectId).then(res => {
               if (res.data)
                 this.$set(this.taskForm.variables, "approval", res.data.projectLeader);

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

@@ -838,7 +838,6 @@ export default {
           }
         }
         this.tableForm = data;
-        console.log(this.tableForm);
       })
     },
     formatForm() {

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

@@ -174,7 +174,6 @@ export default {
     },
     /** 流程流转记录 */
     handleFlowRecord(row) {
-      console.log(row);
       getProcessVariables(row.taskId).then(res => {
         this.$router.push({
           path: '/flowable/task/finished/detail/index',

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

@@ -234,7 +234,6 @@ export default {
     },
     /** 表单配置信息 */
     handleDetail(row){
-      console.log(row);
       if(row.formId == 3172){
         this.moreFormOpen = true;
         this.formTitle = "自定义表单";

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

@@ -381,7 +381,6 @@ export default {
     // 表单信息
     handleFlowNote(row) {
       getProcessVariables(row.taskId).then(res => {
-        console.log(res);
         if (res.data) {
           this.passingParam = row
           this.passingParam.formId = res.data.formId
@@ -435,7 +434,6 @@ export default {
     },
     // 子流程不可以删除
     beDeleted(row) {
-      console.log(row);
       if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.finishTime != null) {
         return true
       } else {

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

@@ -42,7 +42,6 @@ export default {
   },
   watch: {
     definitionList(newval, oldval) {
-      console.log(newval);
       this.initTree();
     },
   },
@@ -92,7 +91,6 @@ export default {
       }
     },
     handleNodeClick(data) {
-      console.log(data);
       this.clickNode = data
     },
     confirm(){

oa-ui/src/views/flowable/task/myProcess/send/rowDetail.vue

@@ -103,7 +103,6 @@ export default {
       const params = { procInsId: this.rows.procInsId, deployId: this.rows.deployId }
       flowRecord(params).then(res => {
         that.flowRecordList = res.data.flowList;
-        console.log(that.flowRecordList);
         this.loading = false
       }).catch(res => {
 

oa-ui/src/views/flowable/task/todo/applyForm/borrowIndex.vue

@@ -0,0 +1,23 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-26 17:01:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-26 17:12:03
+-->
+<template>
+  <div class="app-container">
+    <nav-header></nav-header>
+  </div>
+</template>
+
+<script>
+import navHeader from './components/header.vue'
+export default {
+  components: {
+    navHeader
+  },
+  
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/flowable/task/todo/applyForm/components/header.vue

@@ -0,0 +1,90 @@
+<template>
+  <div slot="header" class="clearfix">
+    <span class="el-icon-document">任务标题：{{ this.$route.meta.title }}</span>
+    <el-tag style="margin-left:10px">发起人:{{ startUser }}</el-tag>
+    <el-tag>任务节点:{{ taskName }}</el-tag>
+  </div>
+</template>
+
+<script>
+import { flowRecord } from "@/api/flowable/finished";
+import { getProcessVariables, flowXmlAndNode, definitionStart } from "@/api/flowable/definition";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
+export default {
+  props: {
+
+  },
+  data() {
+    return {
+      taskForm: {
+        returnTaskShow: false, // 是否展示回退表单
+        delegateTaskShow: false, // 是否展示回退表单
+        defaultTaskShow: true, // 默认处理
+        comment: "", // 意见内容
+        procInsId: "", // 流程实例编号
+        instanceId: "", // 流程实例编号
+        deployId: "",  // 流程定义编号
+        taskId: "",// 流程任务编号
+        procDefId: "",  // 流程编号
+        targetKey: "",
+        variables: {
+          variables: {}
+        },
+      },
+      startUser: null, // 发起人信息,
+      taskName: null, // 任务节点
+      flowRecordList:[]
+    }
+  },
+  created() {
+    if (this.$route.query) {
+      this.taskName = this.$route.query.taskName;
+      this.startUser = this.$route.query.startUser;
+      this.taskForm.deployId = this.$route.query.deployId;
+      this.taskForm.taskId = this.$route.query.taskId;
+      this.taskForm.procInsId = this.$route.query.procInsId;
+      this.taskForm.executionId = this.$route.query.executionId;
+      this.taskForm.instanceId = this.$route.query.procInsId;
+      this.taskForm.formId = this.$route.query.formId;
+      this.taskForm.procDefName = this.$route.query.procDefName;
+      // 流程任务获取变量信息
+      if (this.taskForm.taskId) {
+        this.processVariables(this.taskForm.taskId)
+        this.getFlowTaskForm(this.taskForm.taskId)
+      }
+      this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
+    }
+  },
+  methods: {
+    /** 获取流程变量内容 */
+    processVariables(taskId) {
+      if (taskId) {
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
+        getProcessVariables(taskId).then(res => {
+        });
+      }
+    },
+    /** 流程节点表单 */
+    getFlowTaskForm(taskId) {
+      if (taskId) {
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
+        flowTaskForm({ taskId: taskId }).then(res => {
+          this.taskForm.variables = res.data.formData;
+        });
+      }
+    },
+    /** 流程流转记录 */
+    getFlowRecordList(procInsId, deployId) {
+      const that = this
+      const params = { procInsId: procInsId, deployId: deployId }
+      flowRecord(params).then(res => {
+        that.flowRecordList = res.data.flowList;
+      }).catch(res => {
+        this.goBack();
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-01-03 09:23:11
+ * @LastEditors: 
+ * @LastEditTime: 2024-04-26 15:14:20
+-->
 <template>
   <div class="app-container">
     <el-card class="box-card">

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

@@ -508,7 +508,6 @@ export default {
         this.activeStep += 1;
         this.calculateThatCost();
       } else if (this.activeStep == 3) {
-        console.log(this.budgetForm);
         this.addBudgetForm(this.budgetForm);
         this.activeStep += 1;
       } else {

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

@@ -157,7 +157,6 @@ export default {
   methods: {
     initBudgetForm() {
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.projectId }).then(res => {
-        console.log(res);
         this.budgetForm = res.rows[0];
       });
       list

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

@@ -136,7 +136,6 @@ export default {
     }
   },
   created() {
-    console.log(this.budgetForm);
     this.userLen = this.budgetForm.chooseUser.length + 1;
     this.carLen = this.budgetForm.chooseCar.length + 1;
     this.deviceLen = this.budgetForm.chooseDevice.length + 1;

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

@@ -79,7 +79,6 @@ export default {
     },
     getNameList(){
       listDeviceName().then(res=>{
-        console.log(res);
         this.nameList = res.data
       })
     },

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

@@ -205,7 +205,6 @@ export default {
   },
   mounted() {
     this.getSettleSum();
-    console.log(this.budgetForm)
 
   },
   methods: {

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

@@ -281,7 +281,6 @@ export default {
       this.loading = true;
       listBudget(this.queryParams).then(response => {
         this.budgetList = response.rows;
-        console.log(this.budgetList);
         this.total = response.total;
         this.loading = false;
       });
@@ -357,7 +356,6 @@ export default {
     // 详情按钮
     handleDetails(row) {
       this.detailsOpen = true;
-      console.log(row);
       this.title = row.project.projectNumber + "预算详情";
     },
     /** 提交按钮 */

oa-ui/src/views/oa/car/expense.vue

@@ -212,7 +212,6 @@ export default {
   created() {
     if (this.$route.query) {
       getCar(this.$route.query.carId).then(res => {
-        console.log(res);
         this.carInfo = res.data;
       })
       this.getList();
@@ -227,7 +226,6 @@ export default {
     getList() {
       this.queryParams.carId = this.$route.query.carId
       listCarExpense(this.queryParams).then(res => {
-        console.log(res);
         this.expenseList = res.rows;
         this.total = res.total;
       })

oa-ui/src/views/oa/car/index.vue

@@ -250,7 +250,6 @@ export default {
     },
     // 新增明细按钮
     handleAddDetail(row) {
-      console.log(row);
       this.$router.push({
         path: '/car/expense',
         query: {

oa-ui/src/views/oa/device/approval.vue

@@ -274,7 +274,6 @@ export default {
   created() {
     if (this.$route.query) {
       getDevice(this.$route.query.deviceId).then(res => {
-        console.log(res);
         this.deviceInfo = res.data;
       })
       this.getList();
@@ -289,7 +288,6 @@ export default {
     getList() {
       this.queryParams.devices = this.$route.query.deviceId
       listDeviceApproval(this.queryParams).then(res => {
-        console.log(res);
         this.approvalList = res.rows;
         this.total = res.total;
       })

oa-ui/src/views/oa/device/index.vue

@@ -281,7 +281,6 @@ export default {
     },
     // 新增明细按钮
     handleAddDetail(row) {
-      console.log(row);
       this.$router.push({
         path: '/device/approval',
         query: {

oa-ui/src/views/oa/project/index.vue

@@ -313,7 +313,6 @@ export default {
       let formData = new FormData();
       let form = JSON.stringify(this.addForm);
       formData.append("form", form);
-      console.log(this.title);
       if (this.title == '新增项目')
         submitProject(formData).then(response => {
           this.$modal.msgSuccess("新增成功");
@@ -335,7 +334,6 @@ export default {
     handleChangeDept(deptId) {
       this.peopleForm.userId = '';
       listUser({ pageSize: 999999, deptId }).then(res => {
-        console.log(res);
         this.peopleForm.userList = res.rows
       })
     },

oa-ui/src/views/oa/staff/index.vue

@@ -520,7 +520,6 @@ export default {
     },
     // 查看人员详情按钮
     handleView(row) {
-      console.log(row);
       this.formatLevel(row.postLevel, row.salaryLevel, this.dict.type.sys_user_postlevel, this.dict.type.sys_user_salarylevel);
       this.formatCrtificates(this.dict.type.sys_user_certificates, row.certificates)
       this.$router.push({
@@ -654,7 +653,6 @@ export default {
       if (val != null && val != undefined && val != "") {
         let valArr = val.split(',');
         let outCrtificates = []
-        console.log(valArr);
         for (let i of valArr) {
           outCrtificates.push(arr[i].label)
         }

oa-ui/src/views/oa/staff/info.vue

@@ -122,7 +122,6 @@ export default {
   methods: {
     getUserInfo(id) {
       getUser(id).then(res => {
-        console.log(res);
         this.postOptions = res.posts;
         if (res.data) {
           this.form = res.data;

oa-ui/src/views/oa/staff/projectInfo.vue

@@ -72,14 +72,11 @@ export default {
   },
   methods: {
     handleChange(val) {
-      console.log(val);
     },
     getListByProjectLeader() {
-      console.log(this.$route.query.userId);
       let projectLeader = this.$route.query.userId;
       getListByProjectLeader({ projectLeader: projectLeader }).then(res => {
         this.tableData = res.data
-        console.log(this.tableData);
       });
     }
   }

oa-ui/src/views/oa/tender/index.vue

@@ -450,7 +450,6 @@ export default {
   },
   created() {
     this.getList();
-    console.log(this.$store.state.app.device);
     if (this.$store.state.app.device == 'mobile') {
       this.dialogProperty.column = 1
       this.dialogProperty.dialogWidth = '90%'