修改引用结构，修改结算

oa-ui/src/assets/datas/publicData.js

@@ -1,6 +1,13 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-04-24 15:07:42
+ * @LastEditors: 
+ * @LastEditTime: 2024-05-10 13:40:14
+ */
 const publicData = {
   partySecretary: 4, //党委书记
   leagueSecretary: 142, //团委书记
+  gm: 7, //总经理
   chairman: 2,//董事长
   pathRoute: [
     {

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-04-30 09:53:32
+ * @LastEditTime: 2024-05-10 16:24:43
  */
 /*
  * @Author: ysh
@@ -227,7 +227,7 @@ export const constantRoutes = [
     children: [
       {
         path: '',
-        component: () => import('@/views/oa/budget/addBudget'),
+        component: () => import('@/views/flowable/form/budget/addBudget.vue'),
         name: 'addBudget',
         meta: { title: '新增预算', icon: '' }
 

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 14:11:34
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-10 14:07:41
 -->
 <template>
   <div>
@@ -55,7 +55,7 @@
                   <td style="width: 100px">单位</td>
                   <td style="width: 100px">工作量</td>
                   <td style="width: 100px">要求完成时间</td>
-                  <td style="width: 100px">备注</td>
+                  <td style="width: 200px">备注</td>
                 </tr>
                 <tr v-for="(work, index) in workList" :key="index">
                   <td>

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-04-08 16:35:39
+ * @LastEditTime: 2024-05-10 16:16:04
 -->
 <template>
   <div>
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import AddBudget from '@/views/oa/budget/addBudget.vue';
+import AddBudget from '@/views/flowable/form/budget/addBudget.vue';
 import BudgetInfo from './budgetInfo.vue';
 export default {
   props: {

oa-ui/src/views/oa/budget/components/budgetForm.vue → oa-ui/src/views/flowable/form/budget/components/budgetForm.vue

@@ -1,168 +1,168 @@
-<!--
- * @Author: ysh
- * @Date: 2024-04-03 16:28:09
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 14:34:29
--->
-<template>
-  <div>
-    <h2 style="text-align: center">项目直接生产成本预算表</h2>
-    <table border="1" class="table">
-      <tr>
-        <td class="head">项目名称</td>
-        <td colspan="3">{{ projectForm.projectName }}</td>
-        <td class="head">项目编号</td>
-        <td colspan="2">{{ projectForm.projectNumber }}</td>
-      </tr>
-      <tr>
-        <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>
-      </tr>
-      <tr v-for="user in chooseUser" :key="'user' + user.userId">
-        <td>{{ user.nickName }}</td>
-        <td>{{ user.salary.salary }}</td>
-        <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
-        <td>{{ user.inOutPrice }}</td>
-        <td>{{ user.days }}</td>
-        <td>{{ user.staffCost }}</td>
-      </tr>
-      <tr>
-        <td :rowspan="carLen" 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="car in chooseCar" :key="'car' + car.carId">
-        <td>{{ car.licensePlate }}</td>
-        <td>{{ car.mileage }}</td>
-        <td>{{ car.distance }}</td>
-        <td>{{ car.dayCost }}</td>
-        <td>{{ car.days }}</td>
-        <td>{{ car.expense }}</td>
-      </tr>
-      <tr>
-        <td :rowspan="deviceLen" 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="device in chooseDevice" :key="'device' + device.deviceId">
-        <td>{{ device.name }}</td>
-        <td>{{ device.series }}</td>
-        <td>{{ device.brand }}</td>
-        <td>{{ device.dayCost }}</td>
-        <td>{{ device.days }}</td>
-        <td>{{ device.depreciation }}</td>
-      </tr>
-      <tr>
-        <td colspan="6" class="head">固定成本小计</td>
-        <td>{{ budgetForm.fixCost }}</td>
-      </tr>
-      <tr>
-        <td :rowspan="workLen" 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="(work, index) in workList" :key="'work' + index">
-        <td>{{ work.content }}</td>
-        <td>{{ work.scale }}</td>
-        <td>{{ work.workload }}</td>
-        <td>{{ work.price }}</td>
-        <td>{{ work.coefficient }}</td>
-        <td>{{ work.settle }}</td>
-      </tr>
-      <tr>
-        <td colspan="5" class="head">外协费用</td>
-        <td>{{ budgetForm.outExpense }}</td>
-      </tr>
-      <tr>
-        <td colspan="5" class="head">商务费用</td>
-        <td>{{ budgetForm.businessExpense }}</td>
-      </tr>
-      <tr>
-        <td colspan="5" class="head">车船租赁</td>
-        <td>{{ budgetForm.rentExpense }}</td>
-      </tr>
-      <tr>
-        <td colspan="5" class="head">其他费用</td>
-        <td>{{ budgetForm.otherExpense }}</td>
-      </tr>
-      <tr>
-        <td colspan="6" class="head">直接成本小计</td>
-        <td>{{ budgetForm.directExpense }}</td>
-      </tr>
-      <tr>
-        <td colspan="6" class="head">总成本=（固定成本+直接成本）*120%</td>
-        <td>{{ budgetForm.totalBudget }}</td>
-      </tr>
-      <!-- <tr>
-        <td class="head">编制人</td>
-        <td colspan="2">{{  }}</td>
-        <td class="head">审核人</td>
-        <td colspan="3"></td>
-      </tr> -->
-    </table>
-  </div>
-</template>
-
-<script>
-import { listBudget } from "@/api/oa/budget/budget";
-import { listBudgetCar } from "@/api/oa/budget/budgetCar";
-import { listBudgetDevice } from "@/api/oa/budget/budgetDevice";
-import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
-import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
-export default {
-  data() {
-    return {
-      projectId: "103",
-      budgetForm: {},
-      projectForm: {},
-      userLen: 1,
-      carLen: 1,
-      deviceLen: 1,
-      workLen: 1,
-      totalBudget: 0,
-      chooseCar: [],
-      chooseDevice: [],
-      chooseUser: [],
-      workList:[]
-    };
-  },
-  created() {
-    this.initBudgetForm();
-    this.userLen = this.chooseUser.length + 1;
-    this.carLen = this.chooseCar.length + 1;
-    this.deviceLen = this.chooseDevice.length + 1;
-    this.workLen = this.workList.length + 5;
-    this.totalBudget = (
-      (Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost)) *
-      1.2
-    ).toFixed(2);
-  },
-  methods: {
-    initBudgetForm() {
-      listBudget({ pageNum: 1, pageSize: 20, projectId: this.projectId }).then(res => {
-        this.budgetForm = res.rows[0];
-      });
-    },
-  
-  },
-};
-</script>
-
-<style lang="scss" scoped></style>
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-03 16:28:09
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-29 14:34:29
+-->
+<template>
+  <div>
+    <h2 style="text-align: center">项目直接生产成本预算表</h2>
+    <table border="1" class="table">
+      <tr>
+        <td class="head">项目名称</td>
+        <td colspan="3">{{ projectForm.projectName }}</td>
+        <td class="head">项目编号</td>
+        <td colspan="2">{{ projectForm.projectNumber }}</td>
+      </tr>
+      <tr>
+        <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>
+      </tr>
+      <tr v-for="user in chooseUser" :key="'user' + user.userId">
+        <td>{{ user.nickName }}</td>
+        <td>{{ user.salary.salary }}</td>
+        <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
+        <td>{{ user.inOutPrice }}</td>
+        <td>{{ user.days }}</td>
+        <td>{{ user.staffCost }}</td>
+      </tr>
+      <tr>
+        <td :rowspan="carLen" 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="car in chooseCar" :key="'car' + car.carId">
+        <td>{{ car.licensePlate }}</td>
+        <td>{{ car.mileage }}</td>
+        <td>{{ car.distance }}</td>
+        <td>{{ car.dayCost }}</td>
+        <td>{{ car.days }}</td>
+        <td>{{ car.expense }}</td>
+      </tr>
+      <tr>
+        <td :rowspan="deviceLen" 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="device in chooseDevice" :key="'device' + device.deviceId">
+        <td>{{ device.name }}</td>
+        <td>{{ device.series }}</td>
+        <td>{{ device.brand }}</td>
+        <td>{{ device.dayCost }}</td>
+        <td>{{ device.days }}</td>
+        <td>{{ device.depreciation }}</td>
+      </tr>
+      <tr>
+        <td colspan="6" class="head">固定成本小计</td>
+        <td>{{ budgetForm.fixCost }}</td>
+      </tr>
+      <tr>
+        <td :rowspan="workLen" 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="(work, index) in workList" :key="'work' + index">
+        <td>{{ work.content }}</td>
+        <td>{{ work.scale }}</td>
+        <td>{{ work.workload }}</td>
+        <td>{{ work.price }}</td>
+        <td>{{ work.coefficient }}</td>
+        <td>{{ work.settle }}</td>
+      </tr>
+      <tr>
+        <td colspan="5" class="head">外协费用</td>
+        <td>{{ budgetForm.outExpense }}</td>
+      </tr>
+      <tr>
+        <td colspan="5" class="head">商务费用</td>
+        <td>{{ budgetForm.businessExpense }}</td>
+      </tr>
+      <tr>
+        <td colspan="5" class="head">车船租赁</td>
+        <td>{{ budgetForm.rentExpense }}</td>
+      </tr>
+      <tr>
+        <td colspan="5" class="head">其他费用</td>
+        <td>{{ budgetForm.otherExpense }}</td>
+      </tr>
+      <tr>
+        <td colspan="6" class="head">直接成本小计</td>
+        <td>{{ budgetForm.directExpense }}</td>
+      </tr>
+      <tr>
+        <td colspan="6" class="head">总成本=（固定成本+直接成本）*120%</td>
+        <td>{{ budgetForm.totalBudget }}</td>
+      </tr>
+      <!-- <tr>
+        <td class="head">编制人</td>
+        <td colspan="2">{{  }}</td>
+        <td class="head">审核人</td>
+        <td colspan="3"></td>
+      </tr> -->
+    </table>
+  </div>
+</template>
+
+<script>
+import { listBudget } from "@/api/oa/budget/budget";
+import { listBudgetCar } from "@/api/oa/budget/budgetCar";
+import { listBudgetDevice } from "@/api/oa/budget/budgetDevice";
+import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
+import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
+export default {
+  data() {
+    return {
+      projectId: "103",
+      budgetForm: {},
+      projectForm: {},
+      userLen: 1,
+      carLen: 1,
+      deviceLen: 1,
+      workLen: 1,
+      totalBudget: 0,
+      chooseCar: [],
+      chooseDevice: [],
+      chooseUser: [],
+      workList:[]
+    };
+  },
+  created() {
+    this.initBudgetForm();
+    this.userLen = this.chooseUser.length + 1;
+    this.carLen = this.chooseCar.length + 1;
+    this.deviceLen = this.chooseDevice.length + 1;
+    this.workLen = this.workList.length + 5;
+    this.totalBudget = (
+      (Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost)) *
+      1.2
+    ).toFixed(2);
+  },
+  methods: {
+    initBudgetForm() {
+      listBudget({ pageNum: 1, pageSize: 20, projectId: this.projectId }).then(res => {
+        this.budgetForm = res.rows[0];
+      });
+    },
+  
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -1,407 +1,407 @@
-<!--
- * @Author: ysh
- * @Date: 2024-03-21 17:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-07 09:34:27
--->
-<template>
-  <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select
-          v-model="queryParams.projectId"
-          filterable
-          placeholder="请选择"
-          clearable
-        >
-          <el-option
-            v-for="item in projectList"
-            :key="item.projectId"
-            :label="item.projectNumber"
-            :value="item.projectId"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:budget:add']"
-          >新增</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:budget:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:budget:remove']"
-          >删除</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:budget:export']"
-          >导出</el-button
-        >
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="budgetList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="预算id" align="center" prop="budgetId" /> -->
-      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
-      <el-table-column
-        label="项目名称"
-        align="center"
-        prop="project.projectName"
-        width="200px"
-      />
-      <el-table-column label="人员成本" align="center" prop="staffCost" />
-      <el-table-column label="车辆成本" align="center" prop="carCost" />
-      <el-table-column label="设备成本" align="center" prop="deviceCost" />
-      <el-table-column label="固定成本" align="center" prop="fixCost" />
-      <el-table-column label="预结算额" align="center" prop="settleExpense" />
-      <el-table-column label="外协费用" align="center" prop="outExpense" />
-      <el-table-column label="商务费用" align="center" prop="businessExpense" />
-      <el-table-column label="车船租赁" align="center" prop="rentExpense" />
-      <el-table-column label="其他费用" align="center" prop="otherExpense" />
-      <el-table-column label="直接成本" align="center" prop="directExpense" />
-      <el-table-column label="预算总额" align="center" prop="totalBudget" />
-      <el-table-column label="编制人" align="center" prop="compilerUser.nickName" />
-      <el-table-column label="审核人" align="center" prop="auditorUser.nickName" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:budget:edit']"
-            >修改</el-button
-          > -->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleDetails(scope.row)"
-            >详情</el-button
-          >
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:budget:remove']"
-            >删除</el-button
-          > -->
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改cmc预算管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="人员成本" prop="staffCost">
-          <el-input v-model="form.staffCost" placeholder="请输入人员成本" />
-        </el-form-item>
-        <el-form-item label="车辆成本" prop="carCost">
-          <el-input v-model="form.carCost" placeholder="请输入车辆成本" />
-        </el-form-item>
-        <el-form-item label="设备成本" prop="deviceCost">
-          <el-input v-model="form.deviceCost" placeholder="请输入设备成本" />
-        </el-form-item>
-        <el-form-item label="固定成本" prop="fixCost">
-          <el-input v-model="form.fixCost" placeholder="请输入固定成本" />
-        </el-form-item>
-        <el-form-item label="预结算额" prop="settleExpense">
-          <el-input v-model="form.settleExpense" placeholder="请输入预结算额" />
-        </el-form-item>
-        <el-form-item label="外协费用" prop="outExpense">
-          <el-input v-model="form.outExpense" placeholder="请输入外协费用" />
-        </el-form-item>
-        <el-form-item label="商务费用" prop="businessExpense">
-          <el-input v-model="form.businessExpense" placeholder="请输入商务费用" />
-        </el-form-item>
-        <el-form-item label="车船租赁" prop="rentExpense">
-          <el-input v-model="form.rentExpense" placeholder="请输入车船租赁" />
-        </el-form-item>
-        <el-form-item label="其他费用" prop="otherExpense">
-          <el-input v-model="form.otherExpense" placeholder="请输入其他费用" />
-        </el-form-item>
-        <el-form-item label="直接成本" prop="directExpense">
-          <el-input v-model="form.directExpense" placeholder="请输入直接成本" />
-        </el-form-item>
-        <el-form-item label="预算总额" prop="totalBudget">
-          <el-input v-model="form.totalBudget" placeholder="请输入预算总额" />
-        </el-form-item>
-        <el-form-item label="编制人" prop="compiler">
-          <el-input v-model="form.compiler" placeholder="请输入编制人" />
-        </el-form-item>
-        <el-form-item label="审核人" prop="auditor">
-          <el-input v-model="form.auditor" placeholder="请输入审核人" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 预算详情 -->
-    <el-dialog :title="title" :visible.sync="detailsOpen" width="1000px" append-to-body>
-      
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  listBudget,
-  getBudget,
-  delBudget,
-  addBudget,
-  submitBudget,
-  updateBudget,
-} from "@/api/oa/budget/budget";
-import { listProject } from "@/api/oa/project/project";
-import budgetTable from './components/budgetTable.vue';
-export default {
-  name: "Budget",
-  components:{ budgetTable }, 
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // cmc预算管理表格数据
-      budgetList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        projectId: null,
-        staffCost: null,
-        carCost: null,
-        deviceCost: null,
-        fixCost: null,
-        settleExpense: null,
-        outExpense: null,
-        businessExpense: null,
-        rentExpense: null,
-        otherExpense: null,
-        directExpense: null,
-        totalBudget: null,
-        compiler: null,
-        auditor: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {},
-      projectList: [],
-      detailsOpen: false,
-    };
-  },
-  created() {
-    this.getList();
-    this.getProjectList();
-  },
-  methods: {
-    /** 查询cmc预算管理列表 */
-    getList() {
-      this.loading = true;
-      listBudget(this.queryParams).then(response => {
-        this.budgetList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    getProjectList() {
-      listProject({
-        pageNum: 1,
-        pageSize: 99999999,
-      }).then(response => {
-        this.projectList = response.rows;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        budgetId: null,
-        projectId: null,
-        staffCost: null,
-        carCost: null,
-        deviceCost: null,
-        fixCost: null,
-        settleExpense: null,
-        outExpense: null,
-        businessExpense: null,
-        rentExpense: null,
-        otherExpense: null,
-        directExpense: null,
-        totalBudget: null,
-        compiler: null,
-        auditor: null,
-        createTime: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.budgetId);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      // this.reset();
-      // this.open = true;
-      // this.title = "添加cmc预算管理";
-      this.$router.push({ path: "/budget/add" });
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const budgetId = row.budgetId || this.ids;
-      getBudget(budgetId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc预算管理";
-      });
-    },
-    // 详情按钮
-    handleDetails(row) {
-      this.detailsOpen = true;
-      this.title = row.project.projectNumber + "预算详情";
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.budgetId != null) {
-            updateBudget(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addBudget(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const budgetIds = row.budgetId || this.ids;
-      this.$modal
-        .confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？')
-        .then(function () {
-          return delBudget(budgetIds);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        "oa/budget/export",
-        {
-          ...this.queryParams,
-        },
-        `budget_${new Date().getTime()}.xlsx`
-      );
-    },
-  },
-};
-</script>
+<!--
+ * @Author: ysh
+ * @Date: 2024-03-21 17:49:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-07 09:34:27
+-->
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="项目编号" prop="projectId">
+        <el-select
+          v-model="queryParams.projectId"
+          filterable
+          placeholder="请选择"
+          clearable
+        >
+          <el-option
+            v-for="item in projectList"
+            :key="item.projectId"
+            :label="item.projectNumber"
+            :value="item.projectId"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:budget:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:budget:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:budget:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:budget:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="budgetList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="预算id" align="center" prop="budgetId" /> -->
+      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
+      <el-table-column
+        label="项目名称"
+        align="center"
+        prop="project.projectName"
+        width="200px"
+      />
+      <el-table-column label="人员成本" align="center" prop="staffCost" />
+      <el-table-column label="车辆成本" align="center" prop="carCost" />
+      <el-table-column label="设备成本" align="center" prop="deviceCost" />
+      <el-table-column label="固定成本" align="center" prop="fixCost" />
+      <el-table-column label="预结算额" align="center" prop="settleExpense" />
+      <el-table-column label="外协费用" align="center" prop="outExpense" />
+      <el-table-column label="商务费用" align="center" prop="businessExpense" />
+      <el-table-column label="车船租赁" align="center" prop="rentExpense" />
+      <el-table-column label="其他费用" align="center" prop="otherExpense" />
+      <el-table-column label="直接成本" align="center" prop="directExpense" />
+      <el-table-column label="预算总额" align="center" prop="totalBudget" />
+      <el-table-column label="编制人" align="center" prop="compilerUser.nickName" />
+      <el-table-column label="审核人" align="center" prop="auditorUser.nickName" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:budget:edit']"
+            >修改</el-button
+          > -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetails(scope.row)"
+            >详情</el-button
+          >
+          <!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:budget:remove']"
+            >删除</el-button
+          > -->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改cmc预算管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目id" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        </el-form-item>
+        <el-form-item label="人员成本" prop="staffCost">
+          <el-input v-model="form.staffCost" placeholder="请输入人员成本" />
+        </el-form-item>
+        <el-form-item label="车辆成本" prop="carCost">
+          <el-input v-model="form.carCost" placeholder="请输入车辆成本" />
+        </el-form-item>
+        <el-form-item label="设备成本" prop="deviceCost">
+          <el-input v-model="form.deviceCost" placeholder="请输入设备成本" />
+        </el-form-item>
+        <el-form-item label="固定成本" prop="fixCost">
+          <el-input v-model="form.fixCost" placeholder="请输入固定成本" />
+        </el-form-item>
+        <el-form-item label="预结算额" prop="settleExpense">
+          <el-input v-model="form.settleExpense" placeholder="请输入预结算额" />
+        </el-form-item>
+        <el-form-item label="外协费用" prop="outExpense">
+          <el-input v-model="form.outExpense" placeholder="请输入外协费用" />
+        </el-form-item>
+        <el-form-item label="商务费用" prop="businessExpense">
+          <el-input v-model="form.businessExpense" placeholder="请输入商务费用" />
+        </el-form-item>
+        <el-form-item label="车船租赁" prop="rentExpense">
+          <el-input v-model="form.rentExpense" placeholder="请输入车船租赁" />
+        </el-form-item>
+        <el-form-item label="其他费用" prop="otherExpense">
+          <el-input v-model="form.otherExpense" placeholder="请输入其他费用" />
+        </el-form-item>
+        <el-form-item label="直接成本" prop="directExpense">
+          <el-input v-model="form.directExpense" placeholder="请输入直接成本" />
+        </el-form-item>
+        <el-form-item label="预算总额" prop="totalBudget">
+          <el-input v-model="form.totalBudget" placeholder="请输入预算总额" />
+        </el-form-item>
+        <el-form-item label="编制人" prop="compiler">
+          <el-input v-model="form.compiler" placeholder="请输入编制人" />
+        </el-form-item>
+        <el-form-item label="审核人" prop="auditor">
+          <el-input v-model="form.auditor" placeholder="请输入审核人" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 预算详情 -->
+    <el-dialog :title="title" :visible.sync="detailsOpen" width="1000px" append-to-body>
+      
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listBudget,
+  getBudget,
+  delBudget,
+  addBudget,
+  submitBudget,
+  updateBudget,
+} from "@/api/oa/budget/budget";
+import { listProject } from "@/api/oa/project/project";
+import budgetTable from './components/budgetTable.vue';
+export default {
+  name: "Budget",
+  components:{ budgetTable }, 
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc预算管理表格数据
+      budgetList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        staffCost: null,
+        carCost: null,
+        deviceCost: null,
+        fixCost: null,
+        settleExpense: null,
+        outExpense: null,
+        businessExpense: null,
+        rentExpense: null,
+        otherExpense: null,
+        directExpense: null,
+        totalBudget: null,
+        compiler: null,
+        auditor: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      projectList: [],
+      detailsOpen: false,
+    };
+  },
+  created() {
+    this.getList();
+    this.getProjectList();
+  },
+  methods: {
+    /** 查询cmc预算管理列表 */
+    getList() {
+      this.loading = true;
+      listBudget(this.queryParams).then(response => {
+        this.budgetList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getProjectList() {
+      listProject({
+        pageNum: 1,
+        pageSize: 99999999,
+      }).then(response => {
+        this.projectList = response.rows;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        budgetId: null,
+        projectId: null,
+        staffCost: null,
+        carCost: null,
+        deviceCost: null,
+        fixCost: null,
+        settleExpense: null,
+        outExpense: null,
+        businessExpense: null,
+        rentExpense: null,
+        otherExpense: null,
+        directExpense: null,
+        totalBudget: null,
+        compiler: null,
+        auditor: null,
+        createTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.budgetId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      // this.reset();
+      // this.open = true;
+      // this.title = "添加cmc预算管理";
+      this.$router.push({ path: "/budget/add" });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const budgetId = row.budgetId || this.ids;
+      getBudget(budgetId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc预算管理";
+      });
+    },
+    // 详情按钮
+    handleDetails(row) {
+      this.detailsOpen = true;
+      this.title = row.project.projectNumber + "预算详情";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.budgetId != null) {
+            updateBudget(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBudget(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const budgetIds = row.budgetId || this.ids;
+      this.$modal
+        .confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？')
+        .then(function () {
+          return delBudget(budgetIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "oa/budget/export",
+        {
+          ...this.queryParams,
+        },
+        `budget_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

oa-ui/src/views/flowable/form/brandForm.vue → oa-ui/src/views/flowable/form/business/brandForm.vue

@@ -1,426 +1,426 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <el-col :span="18" :xs="24">
-        <h2 class="text-center">品牌项目支付审批表</h2>
-        <el-divider></el-divider>
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-          <el-form-item label="品牌项目id" prop="projectId">
-            <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
-              :disabled="taskName != '支付申请'" clearable>
-              <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
-              </el-option>
-            </el-select>
-            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
-              <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-              }}</el-descriptions-item>
-              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
-              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                chooseProject.projectLeaderUser.nickName : ''
-              }}</el-descriptions-item>
-            </el-descriptions>
-          </el-form-item>
-          <el-form-item label="申请支付说明" prop="applyReason">
-            <el-input v-model="form.applyReason" placeholder="请输入申请支付说明" :disabled="taskName != '支付申请'" />
-          </el-form-item>
-          <el-form-item label="审核文件" prop="approvalDocument">
-            <el-input v-model="form.approvalDocument" placeholder="请输入审核文件" :disabled="taskName != '支付申请'" />
-          </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px">
-                <span class="auditor"> {{ form.applierUser ? form.applierUser.nickName : applierUser }} </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px">
-                <span> {{ form.applyTime ? form.applyTime : applyTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-divider></el-divider>
-          <el-form-item label="财务反馈：">
-            <table border="1">
-              <tr>
-                <td>序号</td>
-                <td>到账情况</td>
-                <td>到账时间</td>
-              </tr>
-              <tr v-for="(payment, index) in paymentList" :key="index">
-                <td>
-                  {{ index + 1 }}
-                </td>
-                <td>
-                  <el-input v-model="payment.cwComment" placeholder="请输入到账情况" :disabled="taskName != '财务反馈'" />
-                </td>
-                <td>
-                  <el-date-picker clearable v-model="payment.paymentTime" type="date" value-format="yyyy-MM-dd"
-                    placeholder="请选择到账时间" :disabled="taskName != '财务反馈'">
-                  </el-date-picker>
-                </td>
-                <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletPaymentItem(index)"
-                    :disabled="taskName != '财务反馈'"></el-button>
-                </td>
-              </tr>
-            </table>
-            <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain
-              :disabled="taskName != '财务反馈'"></el-button>
-            <el-row>
-              <el-col :span="6" :xs="24" :offset="12">
-                <el-form-item label="签名：" label-width="120px" v-if="taskName == '财务反馈'">
-                  <span class="auditor"> {{ form.cwUser ? form.cwUser.nickName : cwUser }} </span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="日期：" label-width="120px" v-if="taskName == '财务反馈'">
-                  <span> {{ form.cwTime ? form.cwTime : cwTime }} </span>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form-item>
-        </el-form>
-        <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm" v-if="taskName == '支付申请'">确 定</el-button>
-          <el-button @click="cancel" v-if="taskName == '支付申请'">取 消</el-button>
-          <el-button @click="preserve()" type="warning" v-if="taskName == '财务反馈'">保 存</el-button>
-          <el-button @click="submitForm" type="danger" v-if="taskName == '财务反馈'">保存并结束</el-button>
-        </div>
-      </el-col>
-      <el-col :span="6" :xs="24">
-        <el-card>
-          <h2 style="text-align: center;">流程进度</h2>
-          <div>
-            <flow :flowData="flowData" />
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { parseTime } from "@/utils/ruoyi";
-import { getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept } from '@/api/system/post.js'
-import { listBrandProject, getBrandProject } from "@/api/oa/brand/brandProject";
-import { listBrandPayment, addBrandPayment, delBrandPayment } from "@/api/oa/brand/brandPayment";
-import { listBrand, getBrand, delBrand, addBrand, updateBrand } from "@/api/oa/brand/brand";
-import { complete, getNextFlowNode } from "@/api/flowable/todo";
-import flow from '@/views/flowable/task/todo/detail/flow'
-import { flowXmlAndNode } from "@/api/flowable/definition";
-
-export default {
-  components: {
-    flow
-  },
-  props: {
-    taskName: {
-      type: String,
-      required: true
-    },
-    taskForm: {
-      type: Object,
-      required: true
-    }
-  },
-  name: "Brand",
-  data() {
-    return {
-      applierUser: '',
-      applyTime: undefined,
-      cwUser: '',
-      cwTime: undefined,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // cmc品牌项目支付审批表格数据
-      brandList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        projectId: null,
-        applyReason: null,
-        approvalDocument: null,
-        applier: null,
-        applyTime: null,
-        cwTime: null,
-        cwUserId: null
-      },
-      // 表单参数
-      form: {},
-      paymentList: [
-        {
-          cwComment: '',
-          paymentTime: undefined
-        }
-      ],
-      // 表单校验
-      rules: {
-      },
-      chooseProject: {},
-      isSelect: false,
-      formTotal: 0,
-      flowData: {},
-      projectList: [],
-    };
-  },
-  mounted() {
-    this.initForm();
-  },
-  created() {
-    if (this.taskName == '支付申请') {
-      this.applierUser = this.$store.getters.name;
-      this.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
-    }
-    if (this.taskName == '财务反馈') {
-      this.cwUser = this.$store.getters.name;
-      this.cwTime = parseTime(new Date(), '{y}-{m}-{d}')
-    }
-    this.getProjectList();
-    this.getList();
-    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
-      this.flowData = res.data;
-    })
-  },
-  methods: {
-    // 初始化表单
-    initForm() {
-      getBrand(this.taskForm.formId).then(res => {
-        if (this.isEmptyObject(res.data)) {
-          this.formTotal = 0;
-          this.form.applier = this.$store.getters.userId;
-          this.form.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
-        }
-        else {
-          this.formTotal = 1;
-          this.form = res.data;
-          listBrandPayment({ brandId: this.taskForm.formId }).then(res => {
-            this.oldPaymentList = res.rows;
-            if (res.rows.length > 0)
-              this.paymentList = res.rows;
-          });
-          if (res.data.projectId) {
-            getBrandProject(res.data.projectId).then(response => {
-              this.chooseProject = response.data;
-              this.isSelect = true
-            })
-          }
-          this.loading = false
-        }
-      })
-    },
-    /** 查询cmc品牌项目支付审批列表 */
-    getList() {
-      this.loading = true;
-      listBrand(this.queryParams).then(response => {
-        this.brandList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 查询项目列表
-    getProjectList() {
-      this.loading = true
-      listBrandProject({
-        pageNum: 1,
-        pageSize: 99999999
-      }).then(response => {
-        this.projectList = response.rows;
-      })
-    },
-    // 选择项目
-    handleSelectProject(val) {
-      if (val != "" && val != undefined && val != null) {
-        getBrandProject(val).then(res => {
-          this.chooseProject = res.data;
-          this.isSelect = true;
-        })
-      } else {
-        this.isSelect = false
-      }
-    },
-    isEmptyObject(obj) {
-      for (var key in obj) {
-        if (obj.hasOwnProperty(key)) {
-          return false;
-        }
-      }
-      return true;
-    },
-    addPaymentList() {
-      this.paymentList.push({
-        paymentCondition: "",
-        paymentPercentage: "",
-        paymentAmount: "",
-        paymentTime: undefined,
-        remark: "",
-      });
-    },
-    deletPaymentItem(index) {
-      let arr = this.paymentList;
-      if (arr.length == 1) {
-        return;
-      }
-      if (index >= 0 && index < arr.length) {
-        arr.splice(index, 1);
-      }
-    },
-    // 暂存数据
-    preserve() {
-      if (this.oldPaymentList.length != 0) {
-        delBrandPayment([this.taskForm.formId]).then(res => {
-          for (let payment of this.paymentList) {
-            payment.brandId = this.taskForm.formId;
-            addBrandPayment(payment);
-          }
-        });
-      } else {
-        for (let payment of this.paymentList) {
-          payment.brandId = this.taskForm.formId;
-          addBrandPayment(payment);
-        }
-      }
-      updateBrand(this.form).then(res => {
-        this.$message.success("保存成功");
-      });
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        brandId: null,
-        projectId: null,
-        applyReason: null,
-        approvalDocument: null,
-        applier: null,
-        applyTime: null,
-        cwTime: null,
-        cwUserId: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.brandId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc品牌项目支付审批";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const brandId = row.brandId || this.ids
-      getBrand(brandId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc品牌项目支付审批";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.formTotal != 0) {
-            updateBrand(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-            const params = { taskId: this.taskForm.taskId };
-            getNextFlowNode(params).then(res => {
-              complete(this.taskForm).then(response => {
-                this.$modal.msgSuccess(response.msg);
-                this.$emit('goBack')
-              })
-            })
-          } else {
-            this.form.brandId = this.taskForm.formId;
-            addBrand(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-            const params = { taskId: this.taskForm.taskId };
-            getNextFlowNode(params).then(res => {
-              let approvalList = [];
-              getUsersDeptLeaderByDept({ deptId: 106 }).then(res => {
-                approvalList.push(res.data.userId);
-                getUsersViceDeptLeaderByDept({ deptId: 106 }).then(res1 => {
-                  approvalList.push(res1.data.userId);
-                  this.$set(this.taskForm.variables, "approvalList", approvalList);
-                  complete(this.taskForm).then(response => {
-                    this.$modal.msgSuccess(response.msg);
-                    this.$emit('goBack')
-                  })
-                })
-              });
-            })
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const brandIds = row.brandId || this.ids;
-      this.$modal.confirm('是否确认删除cmc品牌项目支付审批编号为"' + brandIds + '"的数据项？').then(function () {
-        return delBrand(brandIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/brand/export', {
-        ...this.queryParams
-      }, `brand_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
-<style lang="scss" scoped>
-table {
-  /*居中*/
-  margin: 0 auto;
-  /*边框*/
-  /* border: 1px solid black; */
-  text-align: center;
-  border-collapse: collapse;
-  /*设置背景颜色*/
-  /* background-color: #bfa; */
-}
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="18" :xs="24">
+        <h2 class="text-center">品牌项目支付审批表</h2>
+        <el-divider></el-divider>
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-form-item label="品牌项目id" prop="projectId">
+            <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
+              :disabled="taskName != '支付申请'" clearable>
+              <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
+              </el-option>
+            </el-select>
+            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
+              <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
+                chooseProject.projectLeaderUser.nickName : ''
+              }}</el-descriptions-item>
+            </el-descriptions>
+          </el-form-item>
+          <el-form-item label="申请支付说明" prop="applyReason">
+            <el-input v-model="form.applyReason" placeholder="请输入申请支付说明" :disabled="taskName != '支付申请'" />
+          </el-form-item>
+          <el-form-item label="审核文件" prop="approvalDocument">
+            <el-input v-model="form.approvalDocument" placeholder="请输入审核文件" :disabled="taskName != '支付申请'" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名：" label-width="120px">
+                <span class="auditor"> {{ form.applierUser ? form.applierUser.nickName : applierUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px">
+                <span> {{ form.applyTime ? form.applyTime : applyTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <el-form-item label="财务反馈：">
+            <table border="1">
+              <tr>
+                <td>序号</td>
+                <td>到账情况</td>
+                <td>到账时间</td>
+              </tr>
+              <tr v-for="(payment, index) in paymentList" :key="index">
+                <td>
+                  {{ index + 1 }}
+                </td>
+                <td>
+                  <el-input v-model="payment.cwComment" placeholder="请输入到账情况" :disabled="taskName != '财务反馈'" />
+                </td>
+                <td>
+                  <el-date-picker clearable v-model="payment.paymentTime" type="date" value-format="yyyy-MM-dd"
+                    placeholder="请选择到账时间" :disabled="taskName != '财务反馈'">
+                  </el-date-picker>
+                </td>
+                <td>
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletPaymentItem(index)"
+                    :disabled="taskName != '财务反馈'"></el-button>
+                </td>
+              </tr>
+            </table>
+            <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain
+              :disabled="taskName != '财务反馈'"></el-button>
+            <el-row>
+              <el-col :span="6" :xs="24" :offset="12">
+                <el-form-item label="签名：" label-width="120px" v-if="taskName == '财务反馈'">
+                  <span class="auditor"> {{ form.cwUser ? form.cwUser.nickName : cwUser }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px" v-if="taskName == '财务反馈'">
+                  <span> {{ form.cwTime ? form.cwTime : cwTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-form>
+        <div style="text-align: center;">
+          <el-button type="primary" @click="submitForm" v-if="taskName == '支付申请'">确 定</el-button>
+          <el-button @click="cancel" v-if="taskName == '支付申请'">取 消</el-button>
+          <el-button @click="preserve()" type="warning" v-if="taskName == '财务反馈'">保 存</el-button>
+          <el-button @click="submitForm" type="danger" v-if="taskName == '财务反馈'">保存并结束</el-button>
+        </div>
+      </el-col>
+      <el-col :span="6" :xs="24">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { parseTime } from "@/utils/ruoyi";
+import { getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept } from '@/api/system/post.js'
+import { listBrandProject, getBrandProject } from "@/api/oa/brand/brandProject";
+import { listBrandPayment, addBrandPayment, delBrandPayment } from "@/api/oa/brand/brandPayment";
+import { listBrand, getBrand, delBrand, addBrand, updateBrand } from "@/api/oa/brand/brand";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import flow from '@/views/flowable/task/todo/detail/flow'
+import { flowXmlAndNode } from "@/api/flowable/definition";
+
+export default {
+  components: {
+    flow
+  },
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  name: "Brand",
+  data() {
+    return {
+      applierUser: '',
+      applyTime: undefined,
+      cwUser: '',
+      cwTime: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc品牌项目支付审批表格数据
+      brandList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        applyReason: null,
+        approvalDocument: null,
+        applier: null,
+        applyTime: null,
+        cwTime: null,
+        cwUserId: null
+      },
+      // 表单参数
+      form: {},
+      paymentList: [
+        {
+          cwComment: '',
+          paymentTime: undefined
+        }
+      ],
+      // 表单校验
+      rules: {
+      },
+      chooseProject: {},
+      isSelect: false,
+      formTotal: 0,
+      flowData: {},
+      projectList: [],
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  created() {
+    if (this.taskName == '支付申请') {
+      this.applierUser = this.$store.getters.name;
+      this.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '财务反馈') {
+      this.cwUser = this.$store.getters.name;
+      this.cwTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    this.getProjectList();
+    this.getList();
+    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+      this.flowData = res.data;
+    })
+  },
+  methods: {
+    // 初始化表单
+    initForm() {
+      getBrand(this.taskForm.formId).then(res => {
+        if (this.isEmptyObject(res.data)) {
+          this.formTotal = 0;
+          this.form.applier = this.$store.getters.userId;
+          this.form.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
+        }
+        else {
+          this.formTotal = 1;
+          this.form = res.data;
+          listBrandPayment({ brandId: this.taskForm.formId }).then(res => {
+            this.oldPaymentList = res.rows;
+            if (res.rows.length > 0)
+              this.paymentList = res.rows;
+          });
+          if (res.data.projectId) {
+            getBrandProject(res.data.projectId).then(response => {
+              this.chooseProject = response.data;
+              this.isSelect = true
+            })
+          }
+          this.loading = false
+        }
+      })
+    },
+    /** 查询cmc品牌项目支付审批列表 */
+    getList() {
+      this.loading = true;
+      listBrand(this.queryParams).then(response => {
+        this.brandList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 查询项目列表
+    getProjectList() {
+      this.loading = true
+      listBrandProject({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.projectList = response.rows;
+      })
+    },
+    // 选择项目
+    handleSelectProject(val) {
+      if (val != "" && val != undefined && val != null) {
+        getBrandProject(val).then(res => {
+          this.chooseProject = res.data;
+          this.isSelect = true;
+        })
+      } else {
+        this.isSelect = false
+      }
+    },
+    isEmptyObject(obj) {
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          return false;
+        }
+      }
+      return true;
+    },
+    addPaymentList() {
+      this.paymentList.push({
+        paymentCondition: "",
+        paymentPercentage: "",
+        paymentAmount: "",
+        paymentTime: undefined,
+        remark: "",
+      });
+    },
+    deletPaymentItem(index) {
+      let arr = this.paymentList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    // 暂存数据
+    preserve() {
+      if (this.oldPaymentList.length != 0) {
+        delBrandPayment([this.taskForm.formId]).then(res => {
+          for (let payment of this.paymentList) {
+            payment.brandId = this.taskForm.formId;
+            addBrandPayment(payment);
+          }
+        });
+      } else {
+        for (let payment of this.paymentList) {
+          payment.brandId = this.taskForm.formId;
+          addBrandPayment(payment);
+        }
+      }
+      updateBrand(this.form).then(res => {
+        this.$message.success("保存成功");
+      });
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        brandId: null,
+        projectId: null,
+        applyReason: null,
+        approvalDocument: null,
+        applier: null,
+        applyTime: null,
+        cwTime: null,
+        cwUserId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.brandId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc品牌项目支付审批";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const brandId = row.brandId || this.ids
+      getBrand(brandId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc品牌项目支付审批";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.formTotal != 0) {
+            updateBrand(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack')
+              })
+            })
+          } else {
+            this.form.brandId = this.taskForm.formId;
+            addBrand(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              let approvalList = [];
+              getUsersDeptLeaderByDept({ deptId: 106 }).then(res => {
+                approvalList.push(res.data.userId);
+                getUsersViceDeptLeaderByDept({ deptId: 106 }).then(res1 => {
+                  approvalList.push(res1.data.userId);
+                  this.$set(this.taskForm.variables, "approvalList", approvalList);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  })
+                })
+              });
+            })
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const brandIds = row.brandId || this.ids;
+      this.$modal.confirm('是否确认删除cmc品牌项目支付审批编号为"' + brandIds + '"的数据项？').then(function () {
+        return delBrand(brandIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/brand/export', {
+        ...this.queryParams
+      }, `brand_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+table {
+  /*居中*/
+  margin: 0 auto;
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+}
 </style>

oa-ui/src/views/flowable/form/conditionDisplay/index.vue → oa-ui/src/views/flowable/form/components/conditionDisplay.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-07 16:08:23
+ * @LastEditTime: 2024-05-10 16:29:22
 -->
 <template>
   <div>
@@ -17,21 +17,23 @@
     <technical-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"></technical-form>
     <safe-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
     <settle-form :taskForm="taskForm" :taskName="''" :disabled="true" v-else-if="taskForm.procDefName == '项目结算'"></settle-form>
+    <budget-info :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"></budget-info>
   </div>
 </template>
 
 <script>
-import ScTable from "@/views/flowable/form/scTable.vue";
-import JyTable from "@/views/flowable/form/jyTable.vue";
-import ZhTable from "@/views/flowable/form/zhTable.vue";
-import JsTable from "@/views/flowable/form/jsTable.vue";
-import XmTable from "@/views/flowable/form/xmTable.vue";
-import CwTable from "@/views/flowable/form/cwTable.vue";
-import CarForm from '@/views/flowable/form/carForm.vue';
+import ScTable from "@/views/flowable/form/access/scTable.vue";
+import JyTable from "@/views/flowable/form/access/jyTable.vue";
+import ZhTable from "@/views/flowable/form/access/zhTable.vue";
+import JsTable from "@/views/flowable/form/access/jsTable.vue";
+import XmTable from "@/views/flowable/form/access/xmTable.vue";
+import CwTable from "@/views/flowable/form/access/cwTable.vue";
+import CarForm from '@/views/flowable/form/oa/carForm.vue';
 import projectProcess from '@/views/flowable/form/projectProcess/index'
 import TechnicalForm from '@/views/flowable/form/technicalForm.vue';
 import SafeForm from '@/views/flowable/form/safeForm.vue';
 import SettleForm from '@/views/flowable/form/settleForm.vue';
+import BudgetInfo from '../budget/budgetInfo.vue';
 export default {
   props: {
     passingParam: {
@@ -54,7 +56,8 @@ export default {
     projectProcess,
     TechnicalForm,
     SafeForm,
-    SettleForm
+    SettleForm,
+    BudgetInfo
   },
   data() {
     return {

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

@@ -0,0 +1,106 @@
+<template>
+  <div>
+    <sc-table :taskForm="taskForm" :taskName="taskName" v-if="taskForm.procDefName == '生产部门考核'"
+      @goBack="goBack"></sc-table>
+    <jy-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '经营发展部考核'"
+      @goBack="goBack"></jy-table>
+    <js-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '技术质量部考核'"
+      @goBack="goBack"></js-table>
+    <xm-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '项目管理部考核'"
+      @goBack="goBack"></xm-table>
+    <cw-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '财务部考核'"
+      @goBack="goBack"></cw-table>
+    <zh-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '综合事务部考核'"
+      @goBack="goBack"></zh-table>
+    <car-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批'"
+      @goBack="goBack"></car-form>
+    <device-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '设备审批'"
+      @goBack="goBack"></device-form>
+    <project-process :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目流转'"
+      @goBack="goBack"></project-process>
+    <budget-index :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"
+      @goBack="goBack"></budget-index>
+    <borrow-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '借款审批'"
+      @goBack="goBack"></borrow-form>
+    <safe-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"
+      @goBack="goBack"></safe-form>
+    <technical-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"
+      @goBack="goBack"></technical-form>
+    <contract-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '承接合同评审'"
+      @goBack="goBack"></contract-form>
+    <sub-contract :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '分包合同评审'"
+      @goBack="goBack"></sub-contract>
+    <brand-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '品牌项目支付'"
+      @goBack="goBack"></brand-form>
+    <deposit-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '保证金审批'"
+      @goBack="goBack"></deposit-form>
+    <archive-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '成果归档'"
+      @goBack="goBack"></archive-form>
+    <settle-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目结算'"
+      @goBack="goBack"></settle-form>
+  </div>
+</template>
+
+<script>
+import ScTable from "@/views/flowable/form/access/scTable.vue";
+import JyTable from "@/views/flowable/form/access/jyTable.vue";
+import ZhTable from "@/views/flowable/form/access/zhTable.vue";
+import JsTable from "@/views/flowable/form/access/jsTable.vue";
+import XmTable from "@/views/flowable/form/access/xmTable.vue";
+import CwTable from "@/views/flowable/form/access/cwTable.vue";
+import carForm from "@/views/flowable/form/oa/carForm.vue";
+import deviceForm from "@/views/flowable/form/oa/deviceForm";
+import projectProcess from "@/views/flowable/form/projectProcess/index.vue"
+import AddBudget from '@/views/flowable/form/budget/addBudget.vue';
+import safeForm from '@/views/flowable/form/safeForm.vue';
+import technicalForm from '@/views/flowable/form/technicalForm.vue';
+import budgetIndex from '@/views/flowable/form/budget/budget.vue';
+import businessReview from '@/views/flowable/form/projectProcess/businessReview.vue';
+import contractForm from '@/views/flowable/form/business/contractForm.vue';
+import subContract from '@/views/flowable/form/business/subContract.vue';
+import brandForm from '@/views/flowable/form/business/brandForm.vue';
+import depositForm from '@/views/flowable/form/finance/depositForm.vue';
+import borrowForm from '@/views/flowable/form/finance/borrowForm.vue';
+import archiveForm from '@/views/flowable/form/archiveForm.vue';
+import settleForm from '@/views/flowable/form/settleForm.vue';
+export default {
+  components: {
+    ScTable,
+    ZhTable,
+    JsTable,
+    XmTable,
+    CwTable,
+    JyTable,
+    carForm,
+    deviceForm,
+    projectProcess,
+    AddBudget,
+    borrowForm,
+    safeForm,
+    technicalForm,
+    budgetIndex,
+    businessReview,
+    contractForm,
+    subContract,
+    brandForm,
+    depositForm,
+    archiveForm,
+    settleForm
+  },
+  props: {
+    taskForm: {
+      type: Object
+    },
+    taskName: {
+      type: String
+    }
+  },
+  methods:{
+    goBack(){
+      this.$emit('goBack')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -1,144 +1,146 @@
 <template>
   <div>
-    <h2 class="text-center title">生产项目委托管理结算清单</h2>
-    <table border="1">
-      <tr>
-        <td :colspan="2" class="fontbold">项目名称</td>
-        <td :colspan="4">{{ chooseProject.projectName }}</td>
-        <td :colspan="2" class="fontbold">项目编号</td>
-        <td :colspan="2">{{ chooseProject.projectNumber }}</td>
-      </tr>
-      <tr>
-        <td :colspan="2" class="fontbold">承担部门</td>
-        <td :colspan="4">{{ undertakingDept.join('，') }}</td>
-        <td :colspan="2" class="fontbold">项目负责人</td>
-        <td :colspan="2">{{ chooseProject.projectLeaderName }}</td>
-      </tr>
-      <tr>
-        <td :colspan="10" class="header bg">测绘项目完成工作量及费用计算</td>
-      </tr>
-      <tr>
-        <td class="fontbold">序号</td>
-        <td class="fontbold">工作内容</td>
-        <td class="fontbold">比例尺或等级</td>
-        <td class="fontbold">单位</td>
-        <td class="fontbold">工作量</td>
-        <td class="fontbold">地类</td>
-        <td class="fontbold">单价(元)</td>
-        <td class="fontbold">系数</td>
-        <td class="fontbold">结算经费（元）</td>
-        <td class="fontbold">备注</td>
-      </tr>
-      <tr v-for="(work, index) in workList">
-        <td>{{ index + 1 }}</td>
-        <td>{{ work.content }}</td>
-        <td>{{ work.scale }}</td>
-        <td>{{ work.unit }}</td>
-        <td>{{ work.workload }}</td>
-        <td>{{ work.groundType == "0" ? "一般地类" : "复杂地类" }}</td>
-        <td>{{ work.price }}</td>
-        <td>{{ work.coefficient }}</td>
-        <td>{{ work.settle }}</td>
-        <td>{{ work.remark }}</td>
-      </tr>
-      <tr>
-        <td :colspan="4" class="header">结算费用合计</td>
-        <td :colspan="6">{{ settleSum.amount }}</td>
-      </tr>
-      <tr>
-        <td :colspan="10" class="header bg">扣除项小计</td>
-      </tr>
-      <tr>
-        <td class="fontbold">序号</td>
-        <td :colspan="3" class="fontbold">结算内容</td>
-        <td :colspan="3" class="fontbold">结算金额</td>
-        <td :colspan="3" class="fontbold">备注</td>
-      </tr>
-      <tr v-for="(ded, index) of deductionsList">
-        <td>{{ index + 1 }}</td>
-        <td :colspan="3">{{ ded.content }}</td>
-        <td :colspan="3">{{ ded.amount }}</td>
-        <td :colspan="3">{{ ded.remark }}</td>
-      </tr>
-      <tr>
-        <td :colspan="10" class="header bg">部门结算小计</td>
-      </tr>
-      <tr>
-        <td class="fontbold">序号</td>
-        <td :colspan="3" class="fontbold">部门名称</td>
-        <td :colspan="3" class="fontbold">结算金额</td>
-        <td :colspan="3" class="fontbold">备注</td>
-      </tr>
-      <tr v-for="(dept, index) of deptSettleList">
-        <td>{{ index + 1 }}</td>
-        <td :colspan="3">{{ dept.content }}</td>
-        <td :colspan="3">{{ dept.amount }}</td>
-        <td :colspan="3">{{ dept.remark }}</td>
-      </tr>
-      <tr>
-        <td :colspan="4" class="header">实际结算总金额</td>
-        <td :colspan="6">{{ actualSumSettle }}</td>
-      </tr>
-      <tr>
-        <td :colspan="4" class="header">结算说明</td>
-        <td :colspan="6">{{ form.settleComment }}</td>
-      </tr>
-      <tr>
-        <td :colspan="10" class="header bg">审核情况</td>
-      </tr>
-      <tr>
-        <td :colspan="2" class="fontbold">综合事务部(设备领用情况)</td>
-        <td :colspan="4" class="conment-width">{{ form.zhComment }}</td>
-        <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.zhUserName }}</span></td>
-        <td :colspan="2" style="text-align:left;">日期：{{ form.zhTime }}</td>
-      </tr>
-      <tr>
-        <td :colspan="2" class="fontbold">技术质量部(质量及工作量)</td>
-        <td :colspan="4" class="conment-width">{{ form.jsComment }}</td>
-        <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.jsUserName }}</span></td>
-        <td :colspan="2" style="text-align:left;">日期：{{ form.jsTime }}</td>
-      </tr>
-      <tr>
-        <td :colspan="2" class="fontbold">项目管理部(结算)</td>
-        <td :colspan="4" class="conment-width">{{ form.xmComment }}</td>
-        <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.xmUserName }}</span></td>
-        <td :colspan="2" style="text-align:left;">日期：{{ form.xmTime }}</td>
-      </tr>
-      <tr>
-        <td :colspan="2" class="fontbold">项目承担部门(确认)</td>
-        <td :colspan="4" class="conment-width">{{ form.deptComment }}</td>
-        <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.deptUserName }}</span></td>
-        <td :colspan="2" style="text-align:left;">日期：{{ form.deptTime }}</td>
-      </tr>
-      <tr>
-        <td :colspan="2" class="fontbold">经营发展部(校核)</td>
-        <td :colspan="4" class="conment-width">{{ form.jyComment }}</td>
-        <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.jyUserName }}</span></td>
-        <td :colspan="2" style="text-align:left;">日期：{{ form.jyTime }}</td>
-      </tr>
-      <tr>
-        <td :colspan="2" class="fontbold">分管领导(审核)</td>
-        <td :colspan="4" class="conment-width">{{ form.managerComment }}</td>
-        <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.managerUserName }}</span></td>
-        <td :colspan="2" style="text-align:left;">日期：{{ form.managerTime }}</td>
-      </tr>
-      <tr>
-        <td :colspan="2" class="fontbold">总经理(审批)</td>
-        <td :colspan="4" class="conment-width">{{ form.gmComment }}</td>
-        <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.gmUserName }}</span></td>
-        <td :colspan="2" style="text-align:left;">日期：{{ form.gmTime }}</td>
-      </tr>
-    </table>
+    <div id="printArea">
+      <h2 class="text-center title">生产项目委托管理结算清单</h2>
+      <table border="1">
+        <tr>
+          <td :colspan="2" class="fontbold">项目名称</td>
+          <td :colspan="4">{{ chooseProject.projectName }}</td>
+          <td :colspan="2" class="fontbold">项目编号</td>
+          <td :colspan="2">{{ chooseProject.projectNumber }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">承担部门</td>
+          <!-- <td :colspan="4">{{ undertakingDept.join('，') }}</td> -->
+          <td :colspan="4">{{ chooseProject.undertakingDeptName }}</td>
+          <td :colspan="2" class="fontbold">项目负责人</td>
+          <td :colspan="2">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : "" }}</td>
+        </tr>
+        <tr>
+          <td :colspan="10" class="header bg">测绘项目完成工作量及费用计算</td>
+        </tr>
+        <tr>
+          <td class="fontbold">序号</td>
+          <td class="fontbold">工作内容</td>
+          <td class="fontbold">比例尺或等级</td>
+          <td class="fontbold">单位</td>
+          <td class="fontbold">工作量</td>
+          <td class="fontbold">地类</td>
+          <td class="fontbold">单价(元)</td>
+          <td class="fontbold">系数</td>
+          <td class="fontbold">结算经费（元）</td>
+          <td class="fontbold">备注</td>
+        </tr>
+        <tr v-for="(work, index) in workList">
+          <td>{{ index + 1 }}</td>
+          <td>{{ work.content }}</td>
+          <td>{{ work.scale }}</td>
+          <td>{{ work.unit }}</td>
+          <td>{{ work.workload }}</td>
+          <td>{{ work.groundType == "0" ? "一般地类" : "复杂地类" }}</td>
+          <td>{{ work.price }}</td>
+          <td>{{ work.coefficient }}</td>
+          <td>{{ work.settle }}</td>
+          <td>{{ work.remark }}</td>
+        </tr>
+        <tr>
+          <td :colspan="4" class="header">结算费用合计</td>
+          <td :colspan="6">{{ settleSum.amount }}</td>
+        </tr>
+        <tr>
+          <td :colspan="10" class="header bg">扣除项小计</td>
+        </tr>
+        <tr>
+          <td class="fontbold">序号</td>
+          <td :colspan="3" class="fontbold">结算内容</td>
+          <td :colspan="3" class="fontbold">结算金额</td>
+          <td :colspan="3" class="fontbold">备注</td>
+        </tr>
+        <tr v-for="(ded, index) of deductionsList">
+          <td>{{ index + 1 }}</td>
+          <td :colspan="3">{{ ded.content }}</td>
+          <td :colspan="3">{{ ded.amount }}</td>
+          <td :colspan="3">{{ ded.remark }}</td>
+        </tr>
+        <tr>
+          <td :colspan="10" class="header bg">部门结算小计</td>
+        </tr>
+        <tr>
+          <td class="fontbold">序号</td>
+          <td :colspan="3" class="fontbold">部门名称</td>
+          <td :colspan="3" class="fontbold">结算金额</td>
+          <td :colspan="3" class="fontbold">备注</td>
+        </tr>
+        <tr v-for="(dept, index) of deptSettleList">
+          <td>{{ index + 1 }}</td>
+          <td :colspan="3">{{ dept.content }}</td>
+          <td :colspan="3">{{ dept.amount }}</td>
+          <td :colspan="3">{{ dept.remark }}</td>
+        </tr>
+        <tr>
+          <td :colspan="4" class="header">实际结算总金额</td>
+          <td :colspan="6">{{ actualSumSettle }}</td>
+        </tr>
+        <!-- 分页就加入样式 style="page-break-after: always;" -->
+        <tr>
+          <td :colspan="4" class="header">结算说明</td>
+          <td :colspan="6">{{ form.settleComment }}</td>
+        </tr>
+        <tr>
+          <td :colspan="10" class="header bg">审核情况</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">综合事务部(设备领用情况)</td>
+          <td :colspan="4" class="conment-width">{{ form.zhComment }}</td>
+          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.zhUserName }}</span></td>
+          <td :colspan="2" style="text-align:left;">日期：{{ form.zhTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">技术质量部(质量及工作量)</td>
+          <td :colspan="4" class="conment-width">{{ form.jsComment }}</td>
+          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.jsUserName }}</span></td>
+          <td :colspan="2" style="text-align:left;">日期：{{ form.jsTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">项目管理部(结算)</td>
+          <td :colspan="4" class="conment-width">{{ form.xmComment }}</td>
+          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.xmUserName }}</span></td>
+          <td :colspan="2" style="text-align:left;">日期：{{ form.xmTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">项目承担部门(确认)</td>
+          <td :colspan="4" class="conment-width">{{ form.deptComment }}</td>
+          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.deptUserName }}</span></td>
+          <td :colspan="2" style="text-align:left;">日期：{{ form.deptTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">经营发展部(校核)</td>
+          <td :colspan="4" class="conment-width">{{ form.jyComment }}</td>
+          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.jyUserName }}</span></td>
+          <td :colspan="2" style="text-align:left;">日期：{{ form.jyTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">分管领导(审核)</td>
+          <td :colspan="4" class="conment-width">{{ form.managerComment }}</td>
+          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.managerUserName }}</span></td>
+          <td :colspan="2" style="text-align:left;">日期：{{ form.managerTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">总经理(审批)</td>
+          <td :colspan="4" class="conment-width">{{ form.gmComment }}</td>
+          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.gmUserName }}</span></td>
+          <td :colspan="2" style="text-align:left;">日期：{{ form.gmTime }}</td>
+        </tr>
+      </table>
+    </div>
     <div class="text-center mt20">
-      <el-button type="primary">确认打印</el-button>
-      <el-button>取消</el-button>
+      <el-button type="primary" v-print="print">确认打印</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
     </div>
   </div>
 </template>
 
 <script>
-import { getUser } from "@/api/system/user";
-import { getDept } from "@/api/system/dept"
 export default {
   props: {
     form: {
@@ -160,7 +162,24 @@ export default {
       deptSettleList: [],
       deductionsList: [],
       actualSumSettle: '',
-      undertakingDept: []
+      undertakingDept: [],
+      print: {
+        id: 'printArea',
+        popTitle: '结算表单', // 打印配置页上方标题
+        extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
+        preview: false, // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
+        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
+        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
+        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
+        previewBeforeOpenCallback() { }, //预览窗口打开之前的callback（开启预览模式调用）
+        previewOpenCallback() { }, // 预览窗口打开之后的callback（开启预览模式调用）
+        beforeOpenCallback() { }, // 开启打印前的回调事件
+        openCallback() { }, // 调用打印之后的回调事件
+        closeCallback() { }, //关闭打印的回调事件（无法确定点击的是确认还是取消）
+        url: '',
+        standard: '',
+        extraCss: ''
+      }
     }
   },
   mounted() {
@@ -177,21 +196,7 @@ export default {
           this.settleSum = s
         }
       }
-      getUser(this.chooseProject.projectLeader).then(res => {
-        if (res.data) {
-          this.$set(this.chooseProject, 'projectLeaderName', res.data.nickName)
-        }
-      })
-      let deptArr = this.chooseProject.undertakingDept.split(',')
-      for (let dept of deptArr) {
-        getDept(dept).then(res => {
-          console.log(res);
-          if(res.data){
-            this.undertakingDept.push(res.data.deptName);
-          }
-        })
-      }
-
+      this.print.popTitle = this.chooseProject.projectName + '结算表单'
       this.calculateActualSumSettle()
     },
     calculateActualSumSettle() {
@@ -232,6 +237,7 @@ table {
 
 .bg {
   background-color: #eee;
+  -webkit-print-color-adjust: exact;
 }
 
 .title {
@@ -248,4 +254,18 @@ table {
 .conment-width {
   max-width: 200px;
 }
+
+
+@page {
+  size: auto;
+  /* 去除页脚 */ 
+  margin-bottom: 0; 
+  // 横向A4
+  // size:A4 landscape;
+}
+@media print {
+  #print table{
+    width: 100%;
+  }
+}
 </style>

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

@@ -0,0 +1,147 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-05-10 14:45:03
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-10 17:45:25
+-->
+<template>
+  <div class="mt20">
+    <div class="nav-btn">
+      <div>
+        <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus"
+          @click="addSettleFlow">结算申请</el-button>
+      </div>
+      <div>
+        <el-button icon="el-icon-refresh" circle size="mini" @click="getSettleData()"></el-button>
+      </div>
+    </div>
+
+    <el-table :data="dataList" style="width: 100%">
+      <el-table-column type="index" label="序号" width="50" />
+      <el-table-column label="上报人">
+        <template slot-scope="scope">
+          {{ getReporter(scope.row) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="申请时间" prop="reportTime" />
+      <el-table-column label="综合事务部意见" prop="zhComment" />
+      <el-table-column label="技术质量部意见" prop="jsComment" />
+      <el-table-column label="项目管理部意见" prop="xmComment" />
+      <el-table-column label="承担部门意见" prop="deptComment" />
+      <el-table-column label="经营管理部意见" prop="jyComment" />
+      <el-table-column label="分管审核意见" prop="managerComment" />
+      <el-table-column label="总经理意见" prop="gmComment" />
+      <el-table-column label="操作" fixed="right" header-align="center">
+        <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>
+  </div>
+</template>
+
+<script>
+import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
+import { listDefinition } from "@/api/flowable/definition";
+import { getNextFlowNodeByStart } from "@/api/flowable/todo";
+import { definitionStart } from "@/api/flowable/definition";
+import { todoList } from "@/api/flowable/todo";
+import { MessageBox } from 'element-ui'
+import { getUser } from "@/api/system/user";
+import { Snowflake } from '@/utils/snowFlake.js'
+export default {
+  props: {
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      dataList: [],
+      definitionList: [], //流程列表
+    }
+  },
+  mounted() {
+    this.getSettleData();
+    this.listDefinition();
+  },
+  methods: {
+    getSettleData() {
+      listSettle({ projectId: this.taskForm.formId }).then(res => {
+        if (res.code == 200) {
+          this.dataList = res.rows
+        }
+      })
+    },
+    getReporter(row) {
+      getUser(row.reporter).then(res => {
+        return res.data.nickName
+      })
+    },
+    listDefinition() {
+      listDefinition({
+        pageNum: 1,
+        pageSize: 9999,
+        name: '项目结算'
+      }).then(response => {
+        this.definitionList = response.data.records;
+      });
+    },
+    handleLook(row){
+
+    },
+    addSettleFlow() {
+      let row = this.definitionList[0];
+      let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
+        const variables = {};
+        const formData = {};
+        formData.formId = formId;
+        if (row.id) {
+          MessageBox.confirm('是否发起项目结算？', '系统提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
+            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/settleApply',
+                  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,
+                    projectId: this.taskForm.formId
+                  }
+                })
+              })
+            })
+          })
+        }
+      })
+    },
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.nav-btn {
+  display: flex;
+  justify-content: space-between;
+}
+</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-09 11:12:07
+ * @LastEditTime: 2024-05-10 14:45:57
 -->
 <template>
   <div>
@@ -137,8 +137,8 @@ import { listBudget } from "@/api/oa/budget/budget";
 import { getProject, updateProject } from "@/api/oa/project/project";
 import { getCar } from "@/api/oa/car/car";
 import { listUser } from '@/api/system/user';
-import borrowData from '../borrow/borrowData.vue';
-import SettleData from '../settle/settleData.vue';
+import borrowData from '../inProgress/borrowData.vue';
+import SettleData from '../inProgress/settleData.vue';
 export default {
   components: {
     borrowData,

oa-ui/src/views/flowable/form/settle/settleData.vue

@@ -1,69 +0,0 @@
-<template>
-  <div class="mt20">
-    <div class="nav-btn">
-      <div>
-        <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus"
-          @click="addSettleFlow">结算申请</el-button>
-      </div>
-      <div>
-        <el-button icon="el-icon-refresh" circle size="mini" @click="getSettleData()"></el-button>
-      </div>
-    </div>
-
-    <el-table :data="dataList" style="width: 100%">
-      <el-table-column type="index" label="序号" width="50" />
-      <el-table-column label="上报人">
-        <template slot-scope="scope">
-          {{ getReporter(scope.row) }}
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
-import { getUser } from "@/api/system/user";
-export default {
-  props: {
-    taskForm: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      dataList: []
-    }
-  },
-  mounted() {
-    this.getSettleData()
-  },
-  methods: {
-    getSettleData() {
-      listSettle({ projectId: this.taskForm.formId }).then(res => {
-        console.log(res);
-        if (res.code == 200) {
-          this.dataList = res.rows
-        }
-      })
-    },
-    addSettleFlow() {
-
-    },
-    getReporter(row){
-      getUser(row.reporter).then(res=>{
-        console.log(res);
-        return res.data.nickName
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.nav-btn {
-  display: flex;
-  justify-content: space-between;
-}
-</style>

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

@@ -2,13 +2,14 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-10 11:05:25
+ * @LastEditTime: 2024-05-10 17:29:44
 -->
 <template>
   <div class="app-container" v-loading="loading">
     <el-button type="warning" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
     <el-dialog title="结算表格预览" :visible.sync="printOpen" width="65%" append-to-body>
-      <settle-print :form="form" :chooseProject="chooseProject" :workList="settleWorkList" :settleList="oldSettleSumList"></settle-print>
+      <settle-print :form="form" :chooseProject="chooseProject" :workList="settleWorkList"
+        :settleList="oldSettleSumList" @cancel="printOpen = false"></settle-print>
     </el-dialog>
     <el-row :gutter="20">
       <el-col :span="19" :xs="24">
@@ -54,13 +55,13 @@
                 {{ chooseProject.projectType }}
               </el-descriptions-item>
               <el-descriptions-item label="项目级别" label-class-name="my-label">
-                {{ chooseProject.projectLevel }}
+                {{ chooseProject.projectLevel == '0' ? ' 一般项目' : '重大项目' }}
               </el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
-                {{ chooseProject.undertakingDept }}
+                {{ chooseProject.undertakingDeptName }}
               </el-descriptions-item>
               <el-descriptions-item label="项目登记人" label-class-name="my-label">
-                {{ chooseProject.projectRegistrant }}
+                {{ chooseProject.projectRegistrantName }}
               </el-descriptions-item>
             </el-descriptions>
           </el-form-item>
@@ -434,6 +435,7 @@ import { getUser } from "@/api/system/user";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import SettlePrint from './components/settlePrint.vue';
+import { getDept } from "@/api/system/dept"
 export default {
   components: {
     flow,
@@ -520,8 +522,7 @@ export default {
     this.getProjectList(); //获取项目列表
     this.getContractDataList(); //获取合同编码和编号
     this.initForm();
-    if (this.$route.query.projectId) {
-    }
+
     flowXmlAndNode({
       procInsId: this.taskForm.procInsId,
       deployId: this.taskForm.deployId,
@@ -529,7 +530,18 @@ export default {
       this.flowData = res.data;
     });
   },
-  mounted() { },
+  mounted() {
+    if (this.$route.query.projectId) {
+      getProject(this.$route.query.projectId).then(res => {
+        if (res.data) {
+          this.$set(this.form, 'projectId', res.data.projectId)
+          this.handleSelectProject(res.data.projectId)
+        }
+      })
+    } else {
+      this.handleSelectProject(this.form.projectId)
+    }
+  },
   methods: {
     initForm() {
       listSettle({ settleId: this.taskForm.formId }).then(res => {
@@ -638,6 +650,7 @@ export default {
         this.$message.success('保存成功')
       } else {
         this.addSettleFn();
+        this.$message.success('保存成功')
       }
     },
     submitNextFlow() {
@@ -709,6 +722,21 @@ export default {
         getProject(val).then(res => {
           this.chooseProject = res.data;
           this.isSelect = true;
+          getUser(this.chooseProject.projectRegistrant).then(res => {
+            if (res.data) {
+              this.$set(this.chooseProject, 'projectRegistrantName', res.data.nickName)
+            }
+          })
+          let deptArr = this.chooseProject.undertakingDept.split(',')
+          let undertakingDept = []
+          for (let dept of deptArr) {
+            getDept(dept).then(res => {
+              if (res.data) {
+                undertakingDept.push(res.data.deptName);
+                this.$set(this.chooseProject, 'undertakingDeptName', undertakingDept.join(','))
+              }
+            })
+          }
         });
       } else {
         this.isSelect = false;

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

@@ -88,13 +88,13 @@ import { getProcessVariables, flowXmlAndNode } from "@/api/flowable/definition";
 import flow from '@/views/flowable/task/finished/detail/flow'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getAssess, modifyAssess } from '@/api/oa/assess/assess'
-import ScTable from "@/views/flowable/form/scTable.vue";
-import JyTable from "@/views/flowable/form/jyTable.vue";
-import ZhTable from "@/views/flowable/form/zhTable.vue";
-import JsTable from "@/views/flowable/form/jsTable.vue";
-import XmTable from "@/views/flowable/form/xmTable.vue";
-import CwTable from "@/views/flowable/form/cwTable.vue";
-import CarForm from '@/views/flowable/form/carForm.vue';
+import ScTable from "@/views/flowable/form/access/scTable.vue";
+import JyTable from "@/views/flowable/form/access/jyTable.vue";
+import ZhTable from "@/views/flowable/form/access/zhTable.vue";
+import JsTable from "@/views/flowable/form/access/jsTable.vue";
+import XmTable from "@/views/flowable/form/access/xmTable.vue";
+import CwTable from "@/views/flowable/form/access/cwTable.vue";
+import CarForm from '@/views/flowable/form/oa/carForm.vue';
 import projectProcess from '@/views/flowable/form/projectProcess/index'
 import TechnicalForm from '../../../form/technicalForm.vue';
 import SafeForm from '../../../form/safeForm.vue';

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

@@ -138,7 +138,7 @@
 import { listForm, getForm, delForm, addForm, updateForm, exportForm } from "@/api/flowable/form";
 import Editor from '@/components/Editor';
 import Parser from '@/components/parser/Parser'
-import scform from '../../form/scForm.vue'
+import scform from '@/views/flowable/form/access/scForm.vue'
 export default {
   name: "Form",
   components: {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-05-09 10:53:40
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-10 14:57:12
 -->
 <template>
   <div class="app-container">
@@ -134,7 +134,7 @@ import { Snowflake } from '@/utils/snowFlake.js'
 import RowDetail from './send/rowDetail.vue'
 import ProgressTree from './progressTree.vue';
 import { getProcessVariables } from "@/api/flowable/definition";
-import conditionDisplay from '@/views/flowable/form/conditionDisplay/index'
+import conditionDisplay from '@/views/flowable/form/components/conditionDisplay.vue'
 export default {
   name: "Deploy",
   components: {

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

@@ -58,13 +58,13 @@ import { flowFormData } from "@/api/flowable/process";
 import { getNextFlowNodeByStart } from "@/api/flowable/todo";
 import FlowUser from '@/components/flow/User'
 import FlowRole from '@/components/flow/Role'
-import ScForm from '../../../form/scForm.vue';
-import JyForm from '../../../form/jyForm.vue';
-import ZhForm from '../../../form/zhForm.vue';
-import JsForm from '../../../form/jsForm.vue';
-import XmForm from '../../../form/xmForm.vue';
-import CwForm from '../../../form/cwForm.vue';
-import ProjectProcess from '../../../form/projectProcess/index'
+import ScForm from '@/views/flowable/form/access/scForm.vue';
+import JyForm from '@/views/flowable/form/access/jyForm.vue';
+import ZhForm from '@/views/flowable/form/access/zhForm.vue';
+import JsForm from '@/views/flowable/form/access/jsForm.vue';
+import XmForm from '@/views/flowable/form/access/xmForm.vue';
+import CwForm from '@/views/flowable/form/access/cwForm.vue';
+import ProjectProcess from '@/views/flowable/form/projectProcess/index.vue'
 
 export default {
   name: "Record",

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-26 17:01:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-28 14:30:48
+ * @LastEditTime: 2024-05-10 15:36:52
 -->
 <template>
   <div class="app-container">
@@ -16,7 +16,7 @@
 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";
-import BorrowForm from '@/views/flowable/form/borrowForm.vue';
+import BorrowForm from '@/views/flowable/form/finance/borrowForm.vue';
 import navHeader from './components/navHeader.vue'
 export default {
   components: {

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

@@ -17,7 +17,7 @@ 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";
 import navHeader from './components/navHeader.vue'
-import CarForm from '@/views/flowable/form/carForm.vue';
+import CarForm from '@/views/flowable/form/oa/carForm.vue';
 export default {
   components: {
     navHeader,

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-28 15:38:55
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-28 16:34:45
+ * @LastEditTime: 2024-05-10 17:05:41
 -->
 <template>
   <div class="app-container">
@@ -17,7 +17,7 @@ import { flowRecord } from "@/api/flowable/finished";
 import { getProcessVariables, flowXmlAndNode, definitionStart, getFlowViewer } from "@/api/flowable/definition";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
 import navHeader from './components/navHeader.vue'
-import DeviceForm from '@/views/flowable/form/deviceForm.vue';
+import DeviceForm from '@/views/flowable/form/oa/deviceForm.vue';
 export default {
   components: {
     navHeader,
@@ -95,7 +95,6 @@ export default {
     },
     getFlowViewer(procInsId,executionId) {
       getFlowViewer(procInsId,executionId).then(res => {
-        console.log(res.data);
       })
     },
     goBack() {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 15:58:04
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-10 15:14:21
 -->
 <template>
   <div class="app-container">
@@ -16,44 +16,8 @@
       <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
-          <sc-table :taskForm="taskForm" :taskName="taskName" v-if="taskForm.procDefName == '生产部门考核'"
-            @goBack="goBack"></sc-table>
-          <jy-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '经营发展部考核'"
-            @goBack="goBack"></jy-table>
-          <js-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '技术质量部考核'"
-            @goBack="goBack"></js-table>
-          <xm-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '项目管理部考核'"
-            @goBack="goBack"></xm-table>
-          <cw-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '财务部考核'"
-            @goBack="goBack"></cw-table>
-          <zh-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '综合事务部考核'"
-            @goBack="goBack"></zh-table>
-          <car-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批'"
-            @goBack="goBack"></car-form>
-          <device-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '设备审批'"
-            @goBack="goBack"></device-form>
-          <project-process :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目流转'"
-            @goBack="goBack"></project-process>
-          <budget-index :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"
-            @goBack="goBack"></budget-index>
-          <borrow-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '借款审批'"
-            @goBack="goBack"></borrow-form>
-          <safe-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"
-            @goBack="goBack"></safe-form>
-          <technical-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"
-            @goBack="goBack"></technical-form>
-          <contract-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '承接合同评审'"
-            @goBack="goBack"></contract-form>
-          <sub-contract :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '分包合同评审'"
-            @goBack="goBack"></sub-contract>
-          <brand-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '品牌项目支付'"
-            @goBack="goBack"></brand-form>
-          <deposit-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '保证金审批'"
-            @goBack="goBack"></deposit-form>
-          <archive-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '成果归档'"
-            @goBack="goBack"></archive-form>
-          <settle-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目结算'"
-            @goBack="goBack"></settle-form>
+          <!-- 待办表单显示 -->
+          <detail-display :taskForm="taskForm" :taskName="taskName" @goBack="goBack"></detail-display>
           <el-row type="flex" justify="center">
             <!-- <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审批
@@ -191,28 +155,7 @@ import {
 } from "@/api/flowable/todo";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { listUser } from "@/api/system/user";
-import ScTable from "@/views/flowable/form/scTable.vue";
-import JyTable from "@/views/flowable/form/jyTable.vue";
-import ZhTable from "@/views/flowable/form/zhTable.vue";
-import JsTable from "@/views/flowable/form/jsTable.vue";
-import XmTable from "@/views/flowable/form/xmTable.vue";
-import CwTable from "@/views/flowable/form/cwTable.vue";
-import carForm from "@/views/flowable/form/carForm.vue";
-import deviceForm from "@/views/flowable/form/deviceForm";
-import projectProcess from "@/views/flowable/form/projectProcess/index.vue"
-import AddBudget from '@/views/oa/budget/addBudget.vue';
-import borrowForm from '@/views/flowable/form/borrowForm.vue';
-import safeForm from '@/views/flowable/form/safeForm.vue';
-import technicalForm from '@/views/flowable/form/technicalForm.vue';
-import budgetIndex from '@/views/flowable/form/budget/budget.vue';
-import businessReview from '@/views/flowable/form/projectProcess/businessReview.vue';
-import contractForm from '@/views/flowable/form/contractForm.vue';
-import subContract from '@/views/flowable/form/subContract.vue';
-import brandForm from '@/views/flowable/form/brandForm.vue';
-import depositForm from '@/views/flowable/form/depositForm.vue';
-import archiveForm from '@/views/flowable/form/archiveForm.vue';
-import settleForm from '@/views/flowable/form/settleForm.vue';
+import detailDisplay from "@/views/flowable/form/components/detailDisplay.vue";
 
 export default {
   name: "Record",
@@ -221,27 +164,7 @@ export default {
     flow,
     FlowUser,
     FlowRole,
-    ScTable,
-    ZhTable,
-    JsTable,
-    XmTable,
-    CwTable,
-    JyTable,
-    carForm,
-    deviceForm,
-    projectProcess,
-    AddBudget,
-    borrowForm,
-    safeForm,
-    technicalForm,
-    budgetIndex,
-    businessReview,
-    contractForm,
-    subContract,
-    brandForm,
-    depositForm,
-    archiveForm,
-    settleForm
+    detailDisplay
   },
   props: {},
   data() {