修改预算

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

@@ -1,388 +1,390 @@
-<!--
- * @Author: ysh
- * @Date: 2024-06-21 18:51:51
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-04-21 09:34:14
--->
-<template>
-  <div class="app-container">
-    <h2 class="text-center">项目直接生产成本预算表</h2>
-    <p style="text-align: center">编制人：{{ $store.getters.name }}</p>
-    <el-divider></el-divider>
-    <div class="mt20 mb20" v-if="showAlter">
-      <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
-        <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
-      </el-alert>
-    </div>
-    <el-descriptions title="项目信息" labelClassName="mylabel">
-      <el-descriptions-item label="项目编号">{{
-        project.projectNumber
-      }}</el-descriptions-item>
-      <el-descriptions-item label="项目名称">{{
-        project.projectName
-      }}</el-descriptions-item>
-      <el-descriptions-item label="项目负责人">{{
-        getUserName(project.projectLeader)
-      }}</el-descriptions-item>
-      <el-descriptions-item label="项目类型">{{
-        project.projectType
-      }}</el-descriptions-item>
-      <el-descriptions-item label="承担部门">{{
-        getDeptNames(project.undertakingDept)
-      }}</el-descriptions-item>
-      <el-descriptions-item label="甲方单位">{{
-        project.partyA ? project.partyA.partyAName : ""
-      }}</el-descriptions-item>
-    </el-descriptions>
-    <el-divider><b>间接成本</b></el-divider>
-    <!-- 选择人员 -->
-    <people-table ref="peopleRef" :budgetId="budgetForm.budgetId" @chooseUser="getChooseUser"
-      @staffCost="getStaffCost"></people-table>
-    <!-- 选择车辆 -->
-    <car-table ref="carRef" :budgetId="budgetForm.budgetId" @chooseCar="getChooseCar" @carCost="getCarCost"></car-table>
-    <!-- 选择设备 -->
-    <device-table ref="deviceRef" :budgetId="budgetForm.budgetId" @chooseDevice="getChooseDevice"
-      @deviceCost="getDeviceCost"></device-table>
-    <!-- 分割线 -->
-    <el-divider><b>直接成本</b></el-divider>
-    <!-- 预结算 -->
-    <money-table ref="moneyRef" :projectId="this.taskForm.formId" :budgetId="budgetForm.budgetId"
-      @settleExpense="getSettleExpense" @contentList="getContentList"></money-table>
-    <!-- 其他成本 -->
-    <other-table ref="otherRef" @otherCost="getOtherCost" :budgetForm="budgetForm"></other-table>
-    <!-- 预算备注 -->
-    <el-form :model="budgetForm" style="padding: 20px 100px 0">
-      <el-form-item label="预算表单备注" label-width="100px">
-        <el-input type="textarea" v-model="budgetForm.remark" placeholder="请输入预算备注" :rows="4"></el-input>
-      </el-form-item>
-      <el-form-item label="附件上传" label-width="100px">
-        <FileUpload v-if="budgetForm.document == null || budgetForm.document == ''" :disabled="taskName != '预算编制'"
-          :limit="1" :filePathName="'预算编制/附件上传'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
-          @input="getDocumentPath"></FileUpload>
-        <div v-if="budgetForm.document">
-          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + budgetForm.document}`)">
-            {{ getFileName(budgetForm.document) }}
-          </el-link>
-          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + budgetForm.document}`"
-            :underline="false" target="_blank">
-            <span class="el-icon-download">下载文件</span>
-          </el-link>
-          <FileUpload v-if="taskName == '预算编制'" :limit="1" :filePathName="'预算编制/附件上传'"
-            :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getDocumentPath"></FileUpload>
-        </div>
-      </el-form-item>
-    </el-form>
-    <!-- 统计 -->
-    <div class="text-center">
-      <el-tag class="ml10 mr10" type="success">间接成本：{{ isNaN(budgetForm.fixCost) ? 0 : budgetForm.fixCost }}</el-tag>
-      <el-tag class="ml10 mr10">直接成本：{{
-        isNaN(budgetForm.directExpense) ? 0 : budgetForm.directExpense
-      }}</el-tag>
-      <el-tag class="ml10 mr10" type="danger">预算总成本：{{
-        isNaN(budgetForm.totalBudget) ? 0 : budgetForm.totalBudget
-      }}</el-tag>
-    </div>
-    <div class="mt20 text-center" style="color: #909399; font-size: 12px">
-      tips:预览表单，请先保存之后刷新再查看
-    </div>
-    <el-divider></el-divider>
-    <div style="text-align: center">
-      <el-button type="warning" @click="preserve()">保存</el-button>
-      <el-button type="success" @click="viewForm()">预览表单</el-button>
-      <el-button type="primary" @click="submitNextFlow" v-if="taskName != '预算批准'">提交下一个流程</el-button>
-      <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
-    </div>
-    <el-dialog title="表单预览" :visible.sync="viewOpen" width="70%" append-to-body>
-      <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="$emit('goBack')"></budget-info>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { Snowflake } from "@/utils/snowFlake.js";
-import { getProject } from "@/api/oa/project/project";
-import {
-  listBudget,
-  addBudget,
-  updateBudget,
-  delBudget,
-} from "@/api/oa/budget/budget.js";
-import { listBudgetCar, addBudgetCar, delBudgetCar } from "@/api/oa/budget/budgetCar.js";
-import {
-  listBudgetStaff,
-  addBudgetStaff,
-  delBudgetStaff,
-} from "@/api/oa/budget/budgetStaff.js";
-import {
-  listBudgetDevice,
-  addBudgetDevice,
-  delBudgetDevice,
-} from "@/api/oa/budget/budgetDevice.js";
-import {
-  listBudgetSettle,
-  addBudgetSettle,
-  delBudgetSettle,
-} from "@/api/oa/budget/budgetSettle.js";
-import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from "@/api/system/post";
-import { complete, getNextFlowNode } from "@/api/flowable/todo";
-import budgetInfo from "./budgetInfo.vue";
-import ReturnComment from "@/views/flowable/form/components/flowBtn/returnComment.vue";
-import ReturnBtn from "@/views/flowable/form/components/flowBtn/returnBtn.vue";
-import CarTable from "./carTable.vue";
-import MoneyTable from "./moneyTable.vue";
-import PeopleTable from "./staffTable.vue";
-import DeviceTable from "./deviceTable.vue";
-import OtherTable from "./otherTable.vue";
-export default {
-  components: {
-    ReturnComment,
-    ReturnBtn,
-    PeopleTable,
-    CarTable,
-    DeviceTable,
-    MoneyTable,
-    OtherTable,
-    budgetInfo,
-  },
-  data() {
-    return {
-      baseUrl: process.env.VUE_APP_BASE_API,
-      budgetForm: {
-        budgetId: new Snowflake(1n, 1n, 0n).nextId().toString(),
-        projectId: "",
-        fixCost: 0,
-        directExpense: 0,
-        totalBudget: 0,
-      },
-      flag: false,
-      project: {},
-      showAlter: true,
-      returnOpen: false,
-      viewOpen: false,
-    };
-  },
-  props: {
-    taskForm: {
-      type: Object,
-      require: true,
-    },
-    taskName: {
-      type: String,
-      require: true,
-    },
-  },
-  watch: {
-    budgetForm: {
-      handler(newVal) {
-        if (newVal) {
-          this.getFixCost();
-          this.getDirectExpense();
-          this.getTotalBudget();
-        }
-      },
-      immediate: true, // 立即生效
-      deep: true, //监听对象或数组的时候，要用到深度监听
-    },
-  },
-  created() {
-    this.getProjectInfo();
-    this.initBudgetForm();
-  },
-  methods: {
-    initBudgetForm() {
-      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(
-        res => {
-          if (res.rows[0] && res.rows[0].budgetId) {
-            this.flag = true;
-            this.budgetForm = res.rows[0];
-            this.budgetId = res.rows[0].budgetId;
-          } else {
-            this.flag = false;
-            this.budgetForm.projectId = this.taskForm.formId;
-          }
-        }
-      );
-    },
-    getProjectInfo() {
-      getProject(this.taskForm.formId).then(response => {
-        this.project = response.data;
-      });
-    },
-    // 保存
-    preserve() {
-      if (!this.flag) {
-        this.addBudgetForm(this.budgetForm);
-        this.flag = true;
-      } else {
-        this.updateBudgetForm(this.budgetForm);
-      }
-      this.$message.success("保存成功");
-    },
-    viewForm() {
-      this.viewOpen = true;
-    },
-    // 提交下一个流程
-    async submitNextFlow() {
-      if (this.taskName == "预算编制") {
-        this.preserve();
-      }
-      const params = { taskId: this.taskForm.taskId };
-      const deptIdsStr = this.project.undertakingDept;
-      const deptIdsArr = deptIdsStr.split(",").map(Number);
-      let approvalList = [];
-      for (let deptId of deptIdsArr) {
-        let res = await getUsersManageLeaderByDept({ deptId });
-        if (res.code == 200 && res.data) {
-          res.data.forEach(element => {
-            approvalList.push(element.userId);
-          });
-        }
-      }
-      this.$set(this.taskForm.variables, "approvalList", approvalList); //得到各部门的分管领导列表
-      // 提交到下一个流程
-      getNextFlowNode(params).then(res => {
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.$emit("goBack");
-        });
-      });
-    },
-    addBudgetForm(form) {
-      addBudget(form);
-      for (let user of form.chooseUser) {
-        user.budgetId = form.budgetId;
-        addBudgetStaff(user);
-      }
-      for (let car of form.chooseCar) {
-        car.budgetId = form.budgetId;
-        addBudgetCar(car);
-      }
-      for (let device of form.chooseDevice) {
-        device.budgetId = form.budgetId;
-        addBudgetDevice(device);
-      }
-      for (let work of form.contentList) {
-        work.budgetId = form.budgetId;
-        addBudgetSettle(work).then(res => {
-          this.$message.success("预算添加成功");
-        });
-      }
-    },
-    updateBudgetForm(form) {
-      updateBudget(form);
-      delBudgetStaff(form.budgetId).then(res => {
-        for (let user of form.chooseUser) {
-          user.budgetId = form.budgetId;
-          addBudgetStaff(user);
-        }
-      });
-      delBudgetCar(form.budgetId).then(res => {
-        for (let car of form.chooseCar) {
-          car.budgetId = form.budgetId;
-          addBudgetCar(car);
-        }
-      });
-      delBudgetDevice(form.budgetId).then(res => {
-        for (let device of form.chooseDevice) {
-          device.budgetId = form.budgetId;
-          addBudgetDevice(device);
-        }
-      });
-      delBudgetSettle(form.budgetId).then(res => {
-        for (let work of form.contentList) {
-          work.budgetId = form.budgetId;
-          addBudgetSettle(work);
-        }
-        this.$message.success("预算添加成功");
-      });
-    },
-    getChooseUser(val) {
-      this.$set(this.budgetForm, "chooseUser", val);
-    },
-    getStaffCost(val) {
-      this.$set(this.budgetForm, "staffCost", val);
-    },
-    getChooseCar(val) {
-      this.$set(this.budgetForm, "chooseCar", val);
-    },
-    getCarCost(val) {
-      this.$set(this.budgetForm, "carCost", val);
-    },
-    getChooseDevice(val) {
-      this.$set(this.budgetForm, "chooseDevice", val);
-    },
-    getDeviceCost(val) {
-      this.$set(this.budgetForm, "deviceCost", val);
-    },
-    getContentList(val) {
-      this.$set(this.budgetForm, "contentList", val);
-    },
-    getSettleExpense(val) {
-      this.$set(this.budgetForm, "settleExpense", val);
-    },
-    getOtherCost(val) {
-      this.$set(this.budgetForm, "outExpense", val.outExpense);
-      this.$set(this.budgetForm, "rentExpense", val.rentExpense);
-      this.$set(this.budgetForm, "otherExpense", val.otherExpense);
-      this.$set(this.budgetForm, "taxExpense", val.taxExpense);
-      this.$set(this.budgetForm, "businessExpense", val.businessExpense);
-    },
-    getFixCost() {
-      const staffCost = this.safeNumber(this.budgetForm.staffCost);
-      const carCost = this.safeNumber(this.budgetForm.carCost);
-      const deviceCost = this.safeNumber(this.budgetForm.deviceCost);
-      const total = staffCost + carCost + deviceCost;
-      this.budgetForm.fixCost = total.toFixed(2);
-    },
-    safeNumber(value) {
-      const num = Number(value);
-      return isNaN(num) ? 0 : num;
-    },
-    // 获取直接成本
-    getDirectExpense() {
-      const settleExpense = this.safeNumber(this.budgetForm.settleExpense);
-      const outExpense = this.safeNumber(this.budgetForm.outExpense);
-      const rentExpense = this.safeNumber(this.budgetForm.rentExpense);
-      const taxExpense = this.safeNumber(this.budgetForm.taxExpense);
-      const businessExpense = this.safeNumber(this.budgetForm.businessExpense);
-      const otherExpense = this.safeNumber(this.budgetForm.otherExpense);
-      const sum =
-        settleExpense +
-        outExpense +
-        rentExpense +
-        taxExpense +
-        businessExpense +
-        otherExpense;
-      this.budgetForm.directExpense = sum.toFixed(2);
-    },
-    getTotalBudget() {
-      this.budgetForm.totalBudget = (
-        Number(this.budgetForm.fixCost) + Number(this.budgetForm.directExpense)
-      ).toFixed(2);
-    },
-    isReturn(val) {
-      this.showAlter = val;
-    },
-    commentByRole() {
-      if (this.taskName == "分管审核") {
-        return this.form.managerComment;
-      } else if (this.taskName == "总经理审批") {
-        return this.form.gmComment;
-      }
-    },
-    getDocumentPath(val) {
-      let arr = val.split('/upload')
-      this.budgetForm.document = arr[1]
-      if (val == "") {
-        this.budgetForm.document = ""
-      }
-    }
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.mylabel {
-  font-weight: bold;
-}
-</style>
+<!--
+ * @Author: ysh
+ * @Date: 2024-06-21 18:51:51
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-09 17:29:35
+-->
+<template>
+  <div class="app-container">
+    <h2 class="text-center">项目直接生产成本预算表</h2>
+    <p style="text-align: center">编制人：{{ $store.getters.name }}</p>
+    <el-divider></el-divider>
+    <div class="mt20 mb20" v-if="showAlter">
+      <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+        <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+      </el-alert>
+    </div>
+    <el-descriptions title="项目信息" labelClassName="mylabel">
+      <el-descriptions-item label="项目编号">{{
+        project.projectNumber
+        }}</el-descriptions-item>
+      <el-descriptions-item label="项目名称">{{
+        project.projectName
+        }}</el-descriptions-item>
+      <el-descriptions-item label="项目负责人">{{
+        getUserName(project.projectLeader)
+        }}</el-descriptions-item>
+      <el-descriptions-item label="项目类型">{{
+        project.projectType
+        }}</el-descriptions-item>
+      <el-descriptions-item label="承担部门">{{
+        getDeptNames(project.undertakingDept)
+        }}</el-descriptions-item>
+      <el-descriptions-item label="甲方单位">{{
+        project.partyA ? project.partyA.partyAName : ""
+        }}</el-descriptions-item>
+    </el-descriptions>
+    <!-- <el-divider><b>间接成本</b></el-divider> -->
+    <!-- 预结算 -->
+    <money-table ref="moneyRef" :projectId="this.taskForm.formId" :budgetId="budgetForm.budgetId"
+      @settleExpense="getSettleExpense" @contentList="getContentList"></money-table>
+    <!-- 选择人员 -->
+    <people-table ref="peopleRef" :budgetId="budgetForm.budgetId" :innerSettleLimit="innerSettleLimit"
+      @chooseUser="getChooseUser" @staffCost="getStaffCost"
+      @innerSettleExceeded="handleInnerSettleExceeded"></people-table>
+    <!-- 选择车辆 -->
+    <car-table ref="carRef" :budgetId="budgetForm.budgetId" @chooseCar="getChooseCar" @carCost="getCarCost"></car-table>
+    <!-- 选择设备 -->
+    <device-table ref="deviceRef" :budgetId="budgetForm.budgetId" @chooseDevice="getChooseDevice"
+      @deviceCost="getDeviceCost"></device-table>
+    <!-- 分割线 -->
+    <!-- <el-divider><b>直接成本</b></el-divider> -->
+    <!-- 现场开支 -->
+    <site-expenses :outer-users="outerUsers" @expensesList="getExpensesList"></site-expenses>
+    <!-- 经营填写 -->
+
+    <!-- 其他成本 -->
+    <other-table ref="otherRef" @otherCost="getOtherCost" :budgetForm="budgetForm"></other-table>
+    <!-- 预算备注 -->
+    <el-form :model="budgetForm" style="padding: 20px 100px 0">
+      <el-form-item label="预算表单备注" label-width="100px">
+        <el-input type="textarea" v-model="budgetForm.remark" placeholder="请输入预算备注" :rows="4"></el-input>
+      </el-form-item>
+      <el-form-item label="附件上传" label-width="100px">
+        <FileUpload v-if="budgetForm.document == null || budgetForm.document == ''" :disabled="taskName != '预算编制'"
+          :limit="1" :filePathName="'预算编制/附件上传'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
+          @input="getDocumentPath"></FileUpload>
+        <div v-if="budgetForm.document">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + budgetForm.document}`)">
+            {{ getFileName(budgetForm.document) }}
+          </el-link>
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + budgetForm.document}`"
+            :underline="false" target="_blank">
+            <span class="el-icon-download">下载文件</span>
+          </el-link>
+          <FileUpload v-if="taskName == '预算编制'" :limit="1" :filePathName="'预算编制/附件上传'"
+            :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getDocumentPath"></FileUpload>
+        </div>
+      </el-form-item>
+    </el-form>
+    <!-- 统计 -->
+    <div class="text-center">
+      <el-tag class="ml10 mr10" type="success">间接成本：{{ isNaN(budgetForm.fixCost) ? 0 : budgetForm.fixCost }}</el-tag>
+      <el-tag class="ml10 mr10">直接成本：{{
+        isNaN(budgetForm.directExpense) ? 0 : budgetForm.directExpense
+        }}</el-tag>
+      <el-tag class="ml10 mr10" type="danger">预算总成本：{{
+        isNaN(budgetForm.totalBudget) ? 0 : budgetForm.totalBudget
+        }}</el-tag>
+    </div>
+    <div class="mt20 text-center" style="color: #909399; font-size: 12px">
+      tips:预览表单，请先保存之后刷新再查看
+    </div>
+    <el-divider></el-divider>
+    <div style="text-align: center">
+      <el-button type="warning" @click="preserve()">保存</el-button>
+      <el-button type="success" @click="viewForm()">预览表单</el-button>
+      <el-button type="primary" @click="submitNextFlow" v-if="taskName != '预算批准'">提交下一个流程</el-button>
+      <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
+    </div>
+    <el-dialog title="表单预览" :visible.sync="viewOpen" width="70%" append-to-body>
+      <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="$emit('goBack')"></budget-info>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { Snowflake } from "@/utils/snowFlake.js";
+import { getProject } from "@/api/oa/project/project";
+import { listBudget, addBudget, updateBudget, delBudget } from "@/api/oa/budget/budget.js";
+import { listBudgetCar, addBudgetCar, delBudgetCar } from "@/api/oa/budget/budgetCar.js";
+import { listBudgetStaff, addBudgetStaff, delBudgetStaff } from "@/api/oa/budget/budgetStaff.js";
+import { listBudgetDevice, addBudgetDevice, delBudgetDevice } from "@/api/oa/budget/budgetDevice.js";
+import { listBudgetSettle, addBudgetSettle, delBudgetSettle } from "@/api/oa/budget/budgetSettle.js";
+import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from "@/api/system/post";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import budgetInfo from "./budgetInfo.vue";
+import ReturnComment from "@/views/flowable/form/components/flowBtn/returnComment.vue";
+import ReturnBtn from "@/views/flowable/form/components/flowBtn/returnBtn.vue";
+import CarTable from "./carTable.vue";
+import MoneyTable from "./moneyTable.vue";
+import PeopleTable from "./staffTable.vue";
+import DeviceTable from "./deviceTable.vue";
+import OtherTable from "./otherTable.vue";
+import SiteExpenses from "./siteExpenses.vue";
+export default {
+  components: {
+    ReturnComment,
+    ReturnBtn,
+    PeopleTable,
+    CarTable,
+    DeviceTable,
+    MoneyTable,
+    OtherTable,
+    budgetInfo,
+    SiteExpenses
+  },
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      budgetForm: {
+        budgetId: new Snowflake(1n, 1n, 0n).nextId().toString(),
+        projectId: "",
+        fixCost: 0,
+        directExpense: 0,
+        totalBudget: 0,
+      },
+      flag: false,
+      project: {},
+      showAlter: true,
+      returnOpen: false,
+      viewOpen: false,
+      innerSettleLimit: 0, // 内业预算绩效合计限制
+      outerUsers: [], // 存储外业人员
+    };
+  },
+  props: {
+    taskForm: {
+      type: Object,
+      require: true,
+    },
+    taskName: {
+      type: String,
+      require: true,
+    },
+  },
+  watch: {
+    budgetForm: {
+      handler(newVal) {
+        if (newVal) {
+          this.getFixCost();
+          this.getDirectExpense();
+          this.getTotalBudget();
+        }
+      },
+      immediate: true, // 立即生效
+      deep: true, //监听对象或数组的时候，要用到深度监听
+    },
+  },
+  created() {
+    this.getProjectInfo();
+    this.initBudgetForm();
+  },
+  methods: {
+    initBudgetForm() {
+      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(
+        res => {
+          if (res.rows[0] && res.rows[0].budgetId) {
+            this.flag = true;
+            this.budgetForm = res.rows[0];
+            this.budgetId = res.rows[0].budgetId;
+          } else {
+            this.flag = false;
+            this.budgetForm.projectId = this.taskForm.formId;
+          }
+        }
+      );
+    },
+    getProjectInfo() {
+      getProject(this.taskForm.formId).then(response => {
+        this.project = response.data;
+      });
+    },
+    // 保存
+    preserve() {
+      console.log(this.budgetForm)
+      return
+      if (!this.flag) {
+        this.addBudgetForm(this.budgetForm);
+        this.flag = true;
+      } else {
+        this.updateBudgetForm(this.budgetForm);
+      }
+      this.$message.success("保存成功");
+    },
+    viewForm() {
+      this.viewOpen = true;
+    },
+    // 提交下一个流程
+    async submitNextFlow() {
+      if (this.taskName == "预算编制") {
+        this.preserve();
+      }
+      const params = { taskId: this.taskForm.taskId };
+      const deptIdsStr = this.project.undertakingDept;
+      const deptIdsArr = deptIdsStr.split(",").map(Number);
+      let approvalList = [];
+      for (let deptId of deptIdsArr) {
+        let res = await getUsersManageLeaderByDept({ deptId });
+        if (res.code == 200 && res.data) {
+          res.data.forEach(element => {
+            approvalList.push(element.userId);
+          });
+        }
+      }
+      this.$set(this.taskForm.variables, "approvalList", approvalList); //得到各部门的分管领导列表
+      // 提交到下一个流程
+      getNextFlowNode(params).then(res => {
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit("goBack");
+        });
+      });
+    },
+    addBudgetForm(form) {
+      addBudget(form);
+      for (let user of form.chooseUser) {
+        user.budgetId = form.budgetId;
+        addBudgetStaff(user);
+      }
+      for (let car of form.chooseCar) {
+        car.budgetId = form.budgetId;
+        addBudgetCar(car);
+      }
+      for (let device of form.chooseDevice) {
+        device.budgetId = form.budgetId;
+        addBudgetDevice(device);
+      }
+      for (let work of form.contentList) {
+        work.budgetId = form.budgetId;
+        addBudgetSettle(work).then(res => {
+          this.$message.success("预算添加成功");
+        });
+      }
+    },
+    updateBudgetForm(form) {
+      updateBudget(form);
+      delBudgetStaff(form.budgetId).then(res => {
+        for (let user of form.chooseUser) {
+          user.budgetId = form.budgetId;
+          addBudgetStaff(user);
+        }
+      });
+      delBudgetCar(form.budgetId).then(res => {
+        for (let car of form.chooseCar) {
+          car.budgetId = form.budgetId;
+          addBudgetCar(car);
+        }
+      });
+      delBudgetDevice(form.budgetId).then(res => {
+        for (let device of form.chooseDevice) {
+          device.budgetId = form.budgetId;
+          addBudgetDevice(device);
+        }
+      });
+      delBudgetSettle(form.budgetId).then(res => {
+        for (let work of form.contentList) {
+          work.budgetId = form.budgetId;
+          addBudgetSettle(work);
+        }
+        this.$message.success("预算添加成功");
+      });
+    },
+    getChooseUser(val) {
+      this.$set(this.budgetForm, "chooseUser", val);
+      // 从选择的人员中筛选出外业人员
+      this.outerUsers = val.filter(user => user.type === '外业');
+    },
+    getStaffCost(val) {
+      this.$set(this.budgetForm, "staffCost", val);
+    },
+    getChooseCar(val) {
+      this.$set(this.budgetForm, "chooseCar", val);
+    },
+    getCarCost(val) {
+      this.$set(this.budgetForm, "carCost", val);
+    },
+    getChooseDevice(val) {
+      this.$set(this.budgetForm, "chooseDevice", val);
+    },
+    getExpensesList(val) {
+      this.$set(this.budgetForm, "expensesList", val);
+    },
+    getDeviceCost(val) {
+      this.$set(this.budgetForm, "deviceCost", val);
+    },
+    getContentList(val) {
+      this.$set(this.budgetForm, "contentList", val);
+    },
+    getSettleExpense(val) {
+      this.innerSettleLimit = val;
+    },
+    handleInnerSettleExceeded(data) {
+      // this.$message.error(`内业预算绩效总额(${data.current.toFixed(2)})超出限制(${data.limit})`);
+    },
+    getOtherCost(val) {
+      this.$set(this.budgetForm, "outExpense", val.outExpense);
+      this.$set(this.budgetForm, "letterExpense", val.letterExpense);
+      this.$set(this.budgetForm, "winExpense", val.winExpense);
+      this.$set(this.budgetForm, "taxExpense", val.taxExpense);
+      this.$set(this.budgetForm, "travelExpense", val.travelExpense);
+    },
+    getFixCost() {
+      const staffCost = this.safeNumber(this.budgetForm.staffCost);
+      const carCost = this.safeNumber(this.budgetForm.carCost);
+      const deviceCost = this.safeNumber(this.budgetForm.deviceCost);
+      const total = staffCost + carCost + deviceCost;
+      this.budgetForm.fixCost = total.toFixed(2);
+    },
+    safeNumber(value) {
+      const num = Number(value);
+      return isNaN(num) ? 0 : num;
+    },
+    // 获取直接成本
+    getDirectExpense() {
+      const settleExpense = this.safeNumber(this.budgetForm.settleExpense);
+      const outExpense = this.safeNumber(this.budgetForm.outExpense);
+      const letterExpense = this.safeNumber(this.budgetForm.letterExpense);
+      const taxExpense = this.safeNumber(this.budgetForm.taxExpense);
+      const winExpense = this.safeNumber(this.budgetForm.winExpense);
+      const travelExpense = this.safeNumber(this.budgetForm.travelExpense);
+      const sum =
+        settleExpense +
+        outExpense +
+        letterExpense +
+        taxExpense +
+        winExpense +
+        travelExpense;
+      this.budgetForm.directExpense = sum.toFixed(2);
+    },
+    getTotalBudget() {
+      this.budgetForm.totalBudget = (
+        Number(this.budgetForm.fixCost) + Number(this.budgetForm.directExpense)
+      ).toFixed(2);
+    },
+    isReturn(val) {
+      this.showAlter = val;
+    },
+    commentByRole() {
+      if (this.taskName == "分管审核") {
+        return this.form.managerComment;
+      } else if (this.taskName == "总经理审批") {
+        return this.form.gmComment;
+      }
+    },
+    getDocumentPath(val) {
+      let arr = val.split('/upload')
+      this.budgetForm.document = arr[1]
+      if (val == "") {
+        this.budgetForm.document = ""
+      }
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.mylabel {
+  font-weight: bold;
+}
+</style>

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

@@ -1,40 +1,40 @@
-<!--
- * @Author: ysh
- * @Date: 2024-04-08 16:08:33
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-16 09:20:14
--->
-<template>
-  <div>
-    <add-budget :taskName="taskName" :taskForm="taskForm" @goBack="goBack" v-if="taskName == '预算编制'"></add-budget>
-    <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="goBack" v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'"></budget-info>
-  </div>
-</template>
-
-<script>
-import AddBudget from '@/views/flowable/form/budget/addBudget.vue';
-import BudgetInfo from './budgetInfo.vue';
-export default {
-  props: {
-    taskName: {
-      type: String,
-      require: true
-    },
-    taskForm: {
-      type: Object,
-      require: true
-    }
-  },
-  components: {
-    AddBudget,
-    BudgetInfo
-  },
-  methods: {
-    goBack() {
-      this.$emit('goBack')
-    }
-  }
-}
-</script>
-
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-08 16:08:33
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-16 09:20:14
+-->
+<template>
+  <div>
+    <add-budget :taskName="taskName" :taskForm="taskForm" @goBack="goBack" v-if="taskName == '预算编制'"></add-budget>
+    <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="goBack" v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'"></budget-info>
+  </div>
+</template>
+
+<script>
+import AddBudget from '@/views/flowable/form/budget/addBudget.vue';
+import BudgetInfo from './budgetInfo.vue';
+export default {
+  props: {
+    taskName: {
+      type: String,
+      require: true
+    },
+    taskForm: {
+      type: Object,
+      require: true
+    }
+  },
+  components: {
+    AddBudget,
+    BudgetInfo
+  },
+  methods: {
+    goBack() {
+      this.$emit('goBack')
+    }
+  }
+}
+</script>
+
 <style lang="scss" scoped></style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-04-21 09:47:55
+ * @LastEditTime: 2025-04-24 10:55:22
 -->
 <template>
   <div class="main">
@@ -282,7 +282,7 @@
         <el-descriptions-item label="备注" :span="1">
           {{ budgetForm.businessRemark }}
         </el-descriptions-item>
-        <el-descriptions-item label="预算附件" :span="3">
+        <el-descriptions-item label="预算附件" :span="3" v-if="budgetForm.document">
           <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + budgetForm.document}`)">
             {{ getFileName(budgetForm.document) }}
           </el-link>

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

@@ -13,46 +13,26 @@
       <el-form-item v-if="chooseCar.length != 0">
         <table border="1">
           <tr>
-            <td :colspan="9" class="head">车辆成本预算</td>
+            <td :colspan="4" class="head">车辆成本预算</td>
           </tr>
           <tr>
             <td style="width: 120px">车牌号</td>
-            <td style="width: 100px">油耗（元/km）</td>
-            <td style="width: 100px">保险（元/天）</td>
-            <td style="width: 100px">维修（元/天）</td>
             <td style="width: 110px">折旧成本（天）</td>
-            <td style="width: 100px">总里程</td>
             <td style="width: 110px">预算天数</td>
-            <td style="width: 110px">过路费</td>
             <td style="width: 100px">总额</td>
           </tr>
           <tr v-for="car in chooseCar" :key="car.carId">
             <td>{{ car.licensePlate + car.brand }}</td>
-            <td>
-              {{ car.fuel }}
-            </td>
-            <td>
-              {{ car.insurance }}
-            </td>
-            <td>
-              {{ car.maintenance }}
-            </td>
             <td>
               {{ car.dayCost }}
             </td>
             <td>
-              <el-input v-model="car.distance" placeholder="请输入总里程" @blur="calculateCarTotal(car)"></el-input>
-            </td>
-            <td>
-              <el-input v-model="car.days" placeholder="请输入天数" @blur="calculateCarTotal(car)"></el-input>
-            </td>
-            <td>
-              <el-input v-model="car.toll" placeholder="请输入过路费" @blur="calculateCarTotal(car)"></el-input>
+              <el-input-number  :controls="false" v-model="car.days" placeholder="请输入天数" @blur="calculateCarTotal(car)"></el-input-number>
             </td>
             <td class="carCost">{{ car.expense }}</td>
           </tr>
           <tr>
-            <td colspan="8">车辆成本合计</td>
+            <td colspan="3">车辆成本合计</td>
             <td>{{ form.carCost }}</td>
           </tr>
         </table>
@@ -137,10 +117,9 @@ export default {
       this.recalculateCost(val, 'expense', 'carCost');
     },
     calculateCarTotal(car) {
-      let total1 = Number(car.fuel) * Number(car.distance);
-      let total2 = (Number(car.insurance) + Number(car.maintenance) + Number(car.dayCost)) * Number(car.days);
-      let sum = (total1 + total2 + Number(car.toll)).toFixed(2);
-      this.$set(car, "depreciation", total2.toFixed(2));
+      let total = Number(car.dayCost) * Number(car.days);
+      let sum = total.toFixed(2);
+      this.$set(car, "depreciation", car.dayCost);
       this.$set(car, "expense", sum);
       this.getCost("expense", "carCost", this.chooseCar);
     },
@@ -186,6 +165,7 @@ table {
     background-color: #e7f6f3;
     font-family: '微软雅黑';
     font-size: 18;
+    font-weight: bold;
   }
 }
 </style>

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

@@ -19,7 +19,7 @@
             <td style="width: 120px">设备名称</td>
             <td style="width: 120px">规格型号</td>
             <td style="width: 120px">品牌</td>
-            <td>折旧成本（天）</td>
+            <td style="width: 120px">折旧成本（天）</td>
             <td style="width: 100px">预算天数</td>
             <td style="width: 100px">总额</td>
           </tr>
@@ -165,6 +165,7 @@ table {
     background-color: #e7f6f3;
     font-family: '微软雅黑';
     font-size: 18;
+    font-weight: bold;
   }
 }
 </style>

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

@@ -43,7 +43,7 @@
       <el-form-item>
         <table border="1">
           <tr class="head">
-            <td colspan="11">项目预结算</td>
+            <td colspan="11">内业预算绩效</td>
           </tr>
           <tr class="content-head">
             <td style="width: 100px;">工作简述</td>
@@ -135,7 +135,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="10">预结算合计</td>
+            <td colspan="10">内业预算绩效合计</td>
             <td colspan="1">{{ Number(settle).toFixed(2) }}</td>
           </tr>
         </table>
@@ -455,6 +455,7 @@ table {
     background-color: #e7f6f3;
     font-family: '微软雅黑';
     font-size: 18;
+    font-weight: bold;
   }
 }
 </style>

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

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2024-12-11 17:21:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-23 14:05:03
+ * @LastEditTime: 2025-05-06 17:15:03
 -->
 <template>
   <div>
-    <el-form :model="form">
-      <el-form-item>
+    <el-form :model="form" style="padding: 20px 100px 0">
+      <el-form-item label="经营相关:">
         <table border="1">
           <tr class="head">
             <td>内容</td>
@@ -25,9 +25,9 @@
             </td>
           </tr>
           <tr>
-            <td>车船租赁</td>
+            <td>保函费用</td>
             <td>
-              <el-input-number :controls="false" style="width:100%;" v-model="form.rentExpense"
+              <el-input-number :controls="false" style="width:100%;" v-model="form.letterExpense"
                 @blur="computedDirectExpense()"></el-input-number>
             </td>
             <td>
@@ -35,9 +35,9 @@
             </td>
           </tr>
           <tr>
-            <td>其他费用</td>
+            <td>中标服务费</td>
             <td>
-              <el-input-number :controls="false" style="width:100%;" v-model="form.otherExpense"
+              <el-input-number :controls="false" style="width:100%;" v-model="form.winExpense"
                 @blur="computedDirectExpense()"></el-input-number>
             </td>
             <td>
@@ -45,7 +45,7 @@
             </td>
           </tr>
           <tr>
-            <td>税费成本</td>
+            <td>税费</td>
             <td>
               <el-input-number :controls="false" style="width:100%;" v-model="form.taxExpense"
                 @blur="computedDirectExpense()"></el-input-number>
@@ -55,9 +55,9 @@
             </td>
           </tr>
           <tr>
-            <td>经营管理费用</td>
+            <td>管理出差</td>
             <td>
-              <el-input-number :controls="false" style="width:100%;" v-model="form.businessExpense"
+              <el-input-number :controls="false" style="width:100%;" v-model="form.travelExpense"
                 @blur="computedDirectExpense()"></el-input-number>
             </td>
             <td>
@@ -83,10 +83,10 @@ export default {
     return {
       form: {
         outExpense: 0,
-        rentExpense: 0,
-        otherExpense: 0,
+        letterExpense: 0,
+        winExpense: 0,
         taxExpense: 0,
-        businessExpense: 0
+        travelExpense: 0,
       }
     }
   },
@@ -108,10 +108,10 @@ export default {
     initTable(val) {
       this.form = val;
       this.form.outExpense == undefined ? this.form.outExpense = 0 : this.form.outExpense
-      this.form.rentExpense == undefined ? this.form.rentExpense = 0 : this.form.rentExpense
-      this.form.otherExpense == undefined ? this.form.otherExpense = 0 : this.form.otherExpense
+      this.form.letterExpense == undefined ? this.form.letterExpense = 0 : this.form.letterExpense
+      this.form.winExpense == undefined ? this.form.winExpense = 0 : this.form.winExpense
       this.form.taxExpense == undefined ? this.form.taxExpense = 0 : this.form.taxExpense
-      this.form.businessExpense == undefined ? this.form.businessExpense = 0 : this.form.businessExpense
+      this.form.travelExpense == undefined ? this.form.travelExpense = 0 : this.form.travelExpense
     },
     safeNumber(value) {
       const num = Number(value);

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

@@ -1,76 +1,183 @@
 <template>
   <div class="app-container">
     <el-form ref="form" :model="form" style="padding: 20px 100px 0">
-      <!-- 选择人员 -->
-      <el-form-item label="选择人员：">
-        <span v-if="chooseUser.length != 0">
-          <el-tag effect="plain" type="success" v-for="item in chooseUser" style="margin: 5px; font-size: 14px"
+      <!-- 选择内业人员 -->
+      <el-form-item label="选择内业人员：">
+        <span v-if="innerUsers.length != 0">
+          <el-tag effect="plain" type="success" v-for="item in innerUsers" style="margin: 5px; font-size: 14px"
             :key="item.userId">
             {{ item.nickName }}
           </el-tag>
         </span>
-        <el-button type="success" plain icon="el-icon-plus" @click="openPeople = true" size="mini">选择</el-button>
+        <el-button type="success" plain icon="el-icon-plus" @click="openPeople('inner')" size="mini">选择</el-button>
       </el-form-item>
-      <div class="mb20" style="color:#E23D28;font-size:12px;">
+
+      <!-- <div class="mb20" style="color:#E23D28;font-size:12px;">
         tips:人员成本=(基础工资+岗位工资)/21.75，固定工资中的年功工资暂忽略不计，绩效工资计入直接成本，津贴补贴、五险一金扣除暂未考虑
-      </div>
-      <el-form-item v-if="chooseUser.length != 0">
+      </div> -->
+
+      <!-- 内业人员表格 -->
+      <el-form-item v-if="innerUsers.length != 0">
         <table border="1">
           <tr>
-            <td :colspan="5" class="head">表1：人员成本预算</td>
+            <td :colspan="8" class="head">内业人员成本预算</td>
           </tr>
           <tr>
             <td style="width: 50px">序号</td>
             <td style="width: 80px">姓名</td>
             <td style="width: 100px">部门</td>
+            <td style="width: 100px">人员成本（天）</td>
             <td style="width: 100px">预算天数</td>
+            <td style="width: 100px">预算绩效</td>
+            <td style="width: 100px">金额</td>
+            <td style="width: 100px">备注</td>
+          </tr>
+          <tr v-for="user, index in innerUsers" :key="user.userId">
+            <td>{{ index + 1 }}</td>
+            <td>{{ user.nickName }}</td>
+            <td>{{ user.dept ? user.dept.deptName : user.deptName }}</td>
+            <td>
+              {{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}
+            </td>
+            <td>
+              <el-input-number :controls="false" v-model="user.days" placeholder="请输入天数"
+                @blur="calculateUserTotal(user)"></el-input-number>
+            </td>
+            <td>
+              <el-input-number :controls="false" v-model="user.performance" placeholder="请输入预算绩效"
+                @blur="calculateUserTotal(user)"></el-input-number>
+              <el-button type="text" @click="openCalculatePerformance(user)">计算绩效</el-button>
+            </td>
+            <td class="staffCost">{{ user.amount }}</td>
+            <td>
+              <el-input v-model="user.remark" type="textarea"></el-input>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="4">合计</td>
+            <td>{{ form.innerDays }}</td>
+            <td>{{ form.innerSettle }}</td>
+            <td>{{ form.innerStaffCost }}</td>
+          </tr>
+        </table>
+      </el-form-item>
+
+
+      <!-- 选择外业人员 -->
+      <el-form-item label="选择外业人员：">
+        <span v-if="outerUsers.length != 0">
+          <el-tag effect="plain" type="success" v-for="item in outerUsers" style="margin: 5px; font-size: 14px"
+            :key="item.userId">
+            {{ item.nickName }}
+          </el-tag>
+        </span>
+        <el-button type="success" plain icon="el-icon-plus" @click="openPeople('outer')" size="mini">选择</el-button>
+      </el-form-item>
+      <!-- 外业人员表格 -->
+      <el-form-item v-if="outerUsers.length != 0">
+        <table border="1">
+          <tr>
+            <td :colspan="9" class="head">外业人员成本预算</td>
+          </tr>
+          <tr>
+            <td style="width: 50px">序号</td>
+            <td style="width: 80px">姓名</td>
+            <td style="width: 100px">部门</td>
+            <td style="width: 100px">人员成本（天）</td>
+            <td style="width: 100px">预算天数</td>
+            <td style="width: 100px">预算系数</td>
+            <td style="width: 100px">预算绩效</td>
             <td style="width: 100px">总额</td>
+            <td style="width: 100px">备注</td>
           </tr>
-          <tr v-for="user, index in chooseUser" :key="user.userId">
+          <tr v-for="user, index in outerUsers" :key="user.userId">
             <td>{{ index + 1 }}</td>
             <td>{{ user.nickName }}</td>
             <td>{{ user.dept ? user.dept.deptName : user.deptName }}</td>
             <td>
-              <el-input v-model="user.days" placeholder="请输入天数" @blur="calculateUserTotal(user)"></el-input>
+              {{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}
+            </td>
+            <td>
+              <el-input-number :controls="false" v-model="user.days" placeholder="请输入天数"
+                @blur="calculateUserTotal(user)"></el-input-number>
+            </td>
+            <td>
+              <el-input-number :controls="false" v-model="user.coefficient" placeholder="请输入系数"
+                @blur="calculateUserTotal(user)"></el-input-number>
+            </td>
+            <td>
+              {{ user.performance }}
+            </td>
+            <td class="staffCost">{{ user.amount }}</td>
+            <td>
+              <el-input v-model="user.remark" type="textarea"></el-input>
             </td>
-            <td class="staffCost">{{ user.staffCost }}</td>
           </tr>
           <tr>
-            <td colspan="4">人员成本合计</td>
-            <td>{{ form.staffCost }}</td>
+            <td colspan="6">合计</td>
+            <td>{{ form.outerSettle }}</td>
+            <td>{{ form.outerStaffCost }}</td>
           </tr>
         </table>
       </el-form-item>
 
+      <!-- 总成本合计 -->
+      <el-form-item v-if="innerUsers.length != 0 || outerUsers.length != 0">
+        <table border="1">
+          <tr>
+            <td colspan="6"><b>人员成本总计</b></td>
+            <td><b>{{ form.staffCost }}</b></td>
+          </tr>
+        </table>
+      </el-form-item>
     </el-form>
 
     <!-- 选择人员对话框 -->
-    <el-dialog title="选择人员" :visible.sync="openPeople" width="700px" append-to-body>
+    <el-dialog :title="currentType === 'inner' ? '选择内业人员' : '选择外业人员'" :visible.sync="isOpenPeople" width="700px"
+      append-to-body>
       <choosePeople @chooseUser="getChooseUser"></choosePeople>
     </el-dialog>
+
+    <!-- 计算绩效对话框 -->
+    <calculate-performance ref="calculatePerformance" @confirm="handlePerformanceConfirm"></calculate-performance>
   </div>
 </template>
 
 <script>
 import { listBudgetStaff, addBudgetStaff, delBudgetStaff } from "@/api/oa/budget/budgetStaff.js";
 import choosePeople from './components/choosePeople.vue';
+import calculatePerformance from './components/calculatePerformance.vue';
 export default {
   components: {
-    choosePeople
+    choosePeople,
+    calculatePerformance
   },
   props: {
     budgetId: {
       type: String,
       default: ''
+    },
+    innerSettleLimit: {
+      type: [Number, String],
+      default: 0
     }
   },
   data() {
     return {
       form: {
-        staffCost: 0
+        staffCost: 0,
+        innerStaffCost: 0,
+        outerStaffCost: 0,
+        innerDays: 0,
+        innerSettle: 0,
+        outerDays: 0,
+        outerSettle: 0
       },
-      chooseUser: [],
-      openPeople: false,
+      innerUsers: [],
+      outerUsers: [],
+      isOpenPeople: false,
+      currentType: '', // 当前选择的类型：inner 或 outer
+      currentUser: null, // 当前操作的用户
     }
   },
   watch: {
@@ -82,12 +189,19 @@ export default {
     budgetId() {
       this.initForm()
     },
-    chooseUser: {
+    innerUsers: {
       handler(newVal) {
-        this.$emit('chooseUser', newVal)
+        this.$emit('chooseUser', [...newVal, ...this.outerUsers])
       },
-      immediate: true, // 立即生效
-      deep: true  //监听对象或数组的时候，要用到深度监听
+      immediate: true,
+      deep: true
+    },
+    outerUsers: {
+      handler(newVal) {
+        this.$emit('chooseUser', [...this.innerUsers, ...newVal])
+      },
+      immediate: true,
+      deep: true
     }
   },
   created() {
@@ -97,8 +211,10 @@ export default {
     initForm() {
       if (this.budgetId != '') {
         listBudgetStaff({ pageSize: 100, budgetId: this.budgetId }).then((res) => {
-          this.chooseUser = res.rows;
-          for (let user of this.chooseUser) {
+          const allUsers = res.rows;
+          this.innerUsers = allUsers.filter(user => user.type === 'inner');
+          this.outerUsers = allUsers.filter(user => user.type === 'outer');
+          for (let user of [...this.innerUsers, ...this.outerUsers]) {
             user.nickName = this.getUserName(user.userId);
             user.deptName = this.getDeptName(user.user.deptId);
           }
@@ -107,47 +223,117 @@ export default {
       }
     },
     initStaffCost() {
-      let staffCost = 0;
-      for (let user of this.chooseUser) {
-        staffCost = staffCost + Number(user.staffCost);
+      this.updateStaffCosts();
+    },
+    updateStaffCosts() {
+      let innerStaffCost = 0;
+      let outerStaffCost = 0;
+      let innerDays = 0;
+      let innerSettle = 0;
+      let outerDays = 0;
+      let outerSettle = 0;
+
+      for (let user of this.innerUsers) {
+        if (user.amount) {
+          innerStaffCost += Number(user.amount);
+        }
+        if (user.days) {
+          innerDays += Number(user.days);
+        }
+        if (user.performance) {
+          innerSettle += Number(user.performance);
+        }
+      }
+
+      for (let user of this.outerUsers) {
+        if (user.amount) {
+          outerStaffCost += Number(user.amount);
+        }
+        if (user.days) {
+          outerDays += Number(user.days);
+        }
+        if (user.performance) {
+          outerSettle += Number(user.performance);
+        }
+      }
+
+      // 验证内业预算绩效是否超过限制
+      if (innerSettle > Number(this.innerSettleLimit)) {
+        this.$message.warning(`内业预算绩效总额(${innerSettle.toFixed(2)})不能超过内业预算绩效合计(${this.innerSettleLimit})`);
+        // 发出警告事件
+        this.$emit('innerSettleExceeded', {
+          current: innerSettle,
+          limit: this.innerSettleLimit
+        });
       }
-      this.form.staffCost = staffCost.toFixed(2)
+
+      this.$set(this.form, 'innerStaffCost', innerStaffCost.toFixed(2));
+      this.$set(this.form, 'outerStaffCost', outerStaffCost.toFixed(2));
+      this.$set(this.form, 'staffCost', (innerStaffCost + outerStaffCost).toFixed(2));
+      this.$set(this.form, 'innerDays', innerDays.toFixed(2));
+      this.$set(this.form, 'innerSettle', innerSettle.toFixed(2));
+      this.$set(this.form, 'outerDays', outerDays.toFixed(2));
+      this.$set(this.form, 'outerSettle', outerSettle.toFixed(2));
     },
     getChooseUser(val) {
       for (let v of val) {
         if (v.deptId === 115) {
           v.salary = { salary: 7898.75 }
         }
+        v.type = this.currentType === 'inner' ? '内业' : '外业';
+        v.days = 0; // 初始化天数为0
+        v.staffCost = 0; // 初始化成本为0
+        v.coefficient = 1; // 初始化系数为1
+        v.otherCoefficient = 1; // 初始化其他系数为1
+      }
+      if (this.currentType === 'inner') {
+        this.innerUsers = val;
+      } else {
+        this.outerUsers = val;
       }
-      this.chooseUser = val;
-      this.openPeople = false;
-      this.recalculateCost(val, 'staffCost', 'staffCost');
+      this.isOpenPeople = false;
+      this.updateStaffCosts();
+    },
+    openPeople(type) {
+      this.currentType = type;
+      this.isOpenPeople = true;
     },
     // 计算单个人员的成本
     calculateUserTotal(user) {
-      let total = parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) * Number(user.days);
+      if (!user.days) {
+        user.days = 0;
+      }
+      if (!user.performance) {
+        user.performance = 0;
+      }
+      if (!user.coefficient) {
+        user.coefficient = 1; // 默认值改为1
+      }
+      let total = 0;
+      if (user.type === '内业') {
+        // 内业人员计算方式不变
+        total = parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) * Number(user.days) + Number(user.performance);
+      } else {
+        // 外业人员计算方式
+        user.performance = 200 * Number(user.days) * Number(user.coefficient) * Number(user.otherCoefficient);
+        total = parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) * Number(user.days) + Number(user.performance);
+      }
+
       if (isNaN(total)) {
         total = 0
       }
-      this.$set(user, "staffCost", total.toFixed(2));
-      this.getCost("staffCost", "staffCost", this.chooseUser);
+      this.$set(user, "amount", total.toFixed(2));
+      this.updateStaffCosts();
     },
-    recalculateCost(arr, name, formName) {
-      let sum = arr.reduce((accumulator, item) => {
-        // 检查 carCost 属性是否存在且为数字（或可转换为数字）  
-        if (item[name] != null && !isNaN(Number(item[name]))) {
-          return accumulator + Number(item[name]);
-        }
-        return accumulator;
-      }, 0);
-      this.$set(this.form, formName, sum.toFixed(2));
+    openCalculatePerformance(user) {
+      this.currentUser = user;
+      this.$refs.calculatePerformance.open();
     },
-    getCost(name1, name2, list) {
-      let sum = 0;
-      for (let user of list) {
-        sum = sum + Number(user[name1]);
+    handlePerformanceConfirm(total) {
+      if (this.currentUser) {
+        this.$set(this.currentUser, 'performance', total);
+        this.calculateUserTotal(this.currentUser);
       }
-      this.form[name2] = sum.toFixed(2);
     },
   },
 }
@@ -174,6 +360,7 @@ table {
     background-color: #e7f6f3;
     font-family: '微软雅黑';
     font-size: 18;
+    font-weight: bold;
   }
 }
 </style>

oa-ui/src/views/oa/brand/brandProject.vue

@@ -36,22 +36,22 @@
 
     <el-table v-loading="loading" :data="brandProjectList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="项目进度" align="center"  width="120px">
+      <el-table-column label="项目进度" align="center" width="120px">
         <template slot-scope="scope">
           <el-progress :text-inside="true" :stroke-width="26" :status="formartProjectProgress(scope.row.percentage)"
             :percentage="scope.row.percentage" text-color="#fff"></el-progress>
         </template>
       </el-table-column>
-      <el-table-column label="项目编号" align="center" prop="projectNumber" width="120px"/>
-      <el-table-column label="项目名称" align="center" prop="projectName"/>
-      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName"/>
+      <el-table-column label="项目编号" align="center" prop="projectNumber" width="120px" />
+      <el-table-column label="项目名称" align="center" prop="projectName" />
+      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" />
       <!-- <el-table-column label="甲方单位联系人" align="center" prop="aPerson" />
       <el-table-column label="甲方单位联系电话" align="center" prop="aPhone" /> -->
       <el-table-column label="合作单位" align="center" prop="partner.partnerName" />
       <!-- <el-table-column label="合作单位联系人" align="center" prop="contactPerson" />
       <el-table-column label="合作单位联系电话" align="center" prop="telephone" /> -->
       <el-table-column label="项目工期" align="center" prop="duration" />
-      <el-table-column label="合同金额" align="center" prop="amount"  width="100px"/>
+      <el-table-column label="合同金额" align="center" prop="amount" width="100px" />
       <!-- <el-table-column label="项目概况" align="center" prop="content" /> -->
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -167,7 +167,9 @@
               合同金额
             </template>
             <el-form-item prop="amount">
-              <el-input v-model="form.amount" placeholder="请输入合同金额" />
+              <el-input v-model="form.amount" placeholder="请输入合同金额">
+                <template slot="append">元</template>
+              </el-input>
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item :span="2">
@@ -468,7 +470,7 @@ export default {
         listBrandPayment({ brandId }).then(result => {
           this.paymentList = result.rows
         })
-      }else{
+      } else {
         this.paymentList = []
         this.approvalDocument = ''
       }

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

@@ -2,13 +2,8 @@
   <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="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入培训名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>      
+        <el-input v-model="queryParams.name" placeholder="请输入培训名称" clearable @keyup.enter.native="handleQuery" />
+      </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>
@@ -17,46 +12,20 @@
 
     <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:train:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:train: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:train:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:train: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:train:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:train: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:train:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:train:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -81,31 +50,16 @@
       </el-table-column>
       <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:train:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:train:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:train:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:train: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"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改培训记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -126,19 +80,12 @@
           <el-input type="textarea" :rows="4" v-model="form.participates" placeholder="请输入参培人员" />
         </el-form-item>
         <el-form-item label="开始时间" prop="beginDate">
-          <el-date-picker clearable
-            v-model="form.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.beginDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择开始时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endDate">
-          <el-date-picker clearable
-            v-model="form.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择结束时间">
+          <el-date-picker clearable v-model="form.endDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择结束时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -239,7 +186,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.trainId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -281,12 +228,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const trainIds = row.trainId || this.ids;
-      this.$modal.confirm('是否确认删除培训记录编号为"' + trainIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除培训记录编号为"' + trainIds + '"的数据项？').then(function () {
         return delTrain(trainIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -1,179 +1,20 @@
 <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="员工id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入员工id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="基础工资" prop="baseSalary">
-        <el-input
-          v-model="queryParams.baseSalary"
-          placeholder="请输入基础工资"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工龄工资" prop="yearSalary">
-        <el-input
-          v-model="queryParams.yearSalary"
-          placeholder="请输入工龄工资"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="岗位工资" prop="postSalary">
-        <el-input
-          v-model="queryParams.postSalary"
-          placeholder="请输入岗位工资"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="绩效工资" prop="performanceSalary">
-        <el-input
-          v-model="queryParams.performanceSalary"
-          placeholder="请输入绩效工资"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="注册测绘师" prop="certificatesSubsidy">
-        <el-input
-          v-model="queryParams.certificatesSubsidy"
-          placeholder="请输入注册测绘师"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="过节补贴" prop="festivalSubsidy">
-        <el-input
-          v-model="queryParams.festivalSubsidy"
-          placeholder="请输入过节补贴"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="稳岗补贴" prop="postStableSubsidy">
-        <el-input
-          v-model="queryParams.postStableSubsidy"
-          placeholder="请输入稳岗补贴"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="高温补贴" prop="highTemperatureSubsidy">
-        <el-input
-          v-model="queryParams.highTemperatureSubsidy"
-          placeholder="请输入高温补贴"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="考勤扣款" prop="attendanceDeduct">
-        <el-input
-          v-model="queryParams.attendanceDeduct"
-          placeholder="请输入考勤扣款"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="应发小计" prop="payableWage">
-        <el-input
-          v-model="queryParams.payableWage"
-          placeholder="请输入应发小计"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="公积金" prop="houseFund">
-        <el-input
-          v-model="queryParams.houseFund"
-          placeholder="请输入公积金"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="养老保险" prop="endowmentInsurance">
-        <el-input
-          v-model="queryParams.endowmentInsurance"
-          placeholder="请输入养老保险"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="失业保险" prop="unemploymentInsurance">
-        <el-input
-          v-model="queryParams.unemploymentInsurance"
-          placeholder="请输入失业保险"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="医疗保险" prop="medicalInsurance">
-        <el-input
-          v-model="queryParams.medicalInsurance"
-          placeholder="请输入医疗保险"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="水韵物管费" prop="propertyFee">
-        <el-input
-          v-model="queryParams.propertyFee"
-          placeholder="请输入水韵物管费"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="扣款小计" prop="deductTotal">
-        <el-input
-          v-model="queryParams.deductTotal"
-          placeholder="请输入扣款小计"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="社保单位部分" prop="socialSecurityUnit">
-        <el-input
-          v-model="queryParams.socialSecurityUnit"
-          placeholder="请输入社保单位部分"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="个税" prop="individualIncomeTax">
-        <el-input
-          v-model="queryParams.individualIncomeTax"
-          placeholder="请输入个税"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="实发工资" prop="paidWage">
-        <el-input
-          v-model="queryParams.paidWage"
-          placeholder="请输入实发工资"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="姓名" prop="userId">
+        <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="发放日期" prop="payDay">
-        <el-date-picker clearable
-          v-model="queryParams.payDay"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.payDay" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择发放日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="发放月份" prop="payMonth">
-        <el-date-picker clearable
-          v-model="queryParams.payMonth"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.payMonth" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择发放月份">
         </el-date-picker>
       </el-form-item>
@@ -184,56 +25,36 @@
     </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:wage:add']"
-        >新增</el-button>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:wage: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:wage:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:wage: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:wage:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:wage: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:wage:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:wage:export']">导出</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+          v-hasPermi="['oa:wage:export']">导入</el-button>
       </el-col>
+    
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="wageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工资id" align="center" prop="wageId" />
-      <el-table-column label="员工id" align="center" prop="userId" />
-      <el-table-column label="基础工资" align="center" prop="baseSalary" />
+      <el-table-column label="姓名" align="center" prop="userId">
+
+      </el-table-column>
+      <!-- <el-table-column label="基础工资" align="center" prop="baseSalary" />
       <el-table-column label="工龄工资" align="center" prop="yearSalary" />
       <el-table-column label="岗位工资" align="center" prop="postSalary" />
       <el-table-column label="绩效工资" align="center" prop="performanceSalary" />
@@ -242,16 +63,16 @@
       <el-table-column label="稳岗补贴" align="center" prop="postStableSubsidy" />
       <el-table-column label="高温补贴" align="center" prop="highTemperatureSubsidy" />
       <el-table-column label="考勤扣款" align="center" prop="attendanceDeduct" />
-      <el-table-column label="应发小计" align="center" prop="payableWage" />
+      <el-table-column label="应发小计" align="center" prop="payableWage" /> -->
       <el-table-column label="公积金" align="center" prop="houseFund" />
-      <el-table-column label="养老保险" align="center" prop="endowmentInsurance" />
+      <!-- <el-table-column label="养老保险" align="center" prop="endowmentInsurance" />
       <el-table-column label="失业保险" align="center" prop="unemploymentInsurance" />
       <el-table-column label="医疗保险" align="center" prop="medicalInsurance" />
       <el-table-column label="水韵物管费" align="center" prop="propertyFee" />
-      <el-table-column label="扣款小计" align="center" prop="deductTotal" />
+      <el-table-column label="扣款小计" align="center" prop="deductTotal" /> -->
       <el-table-column label="社保单位部分" align="center" prop="socialSecurityUnit" />
-      <el-table-column label="个税" align="center" prop="individualIncomeTax" />
-      <el-table-column label="实发工资" align="center" prop="paidWage" />
+      <!-- <el-table-column label="个税" align="center" prop="individualIncomeTax" />
+      <el-table-column label="实发工资" align="center" prop="paidWage" /> -->
       <el-table-column label="发放日期" align="center" prop="payDay" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.payDay, '{y}-{m}-{d}') }}</span>
@@ -264,31 +85,16 @@
       </el-table-column>
       <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:wage:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:wage:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:wage:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:wage: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"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改员工工资对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -354,19 +160,11 @@
           <el-input v-model="form.paidWage" placeholder="请输入实发工资" />
         </el-form-item>
         <el-form-item label="发放日期" prop="payDay">
-          <el-date-picker clearable
-            v-model="form.payDay"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择发放日期">
+          <el-date-picker clearable v-model="form.payDay" type="date" value-format="yyyy-MM-dd" placeholder="请选择发放日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="发放月份" prop="payMonth">
-          <el-date-picker clearable
-            v-model="form.payMonth"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择发放月份">
+          <el-date-picker clearable v-model="form.payMonth" type="date" value-format="yyyy-MM-dd" placeholder="请选择发放月份">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -497,7 +295,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.wageId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -539,18 +337,21 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const wageIds = row.wageId || this.ids;
-      this.$modal.confirm('是否确认删除员工工资编号为"' + wageIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除员工工资编号为"' + wageIds + '"的数据项？').then(function () {
         return delWage(wageIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download('oa/wage/export', {
         ...this.queryParams
       }, `wage_${new Date().getTime()}.xlsx`)
+    },
+    handleImport() {
+
     }
   }
 };