Merge remote-tracking branch 'origin/master'

jiangping

2024-03-04 c7a022c304c49fa91da1ebae458ccec3c484718a

 company/src/components/enterprise/additionSubtractionApplication.vue

@@ -78,7 +78,7 @@
                <el-table-column
                    prop="currentFee"
                    align="center"
                    label="产生费用(元)">
                    label="已产生费用(元)">
                </el-table-column>
                <el-table-column
                    prop="fee"
@@ -496,7 +496,7 @@
                    this.$message.warning('请选择员工')
                    return
                }
                this.$refs.confirmJobType.open('确认工种', { solutionId: this.form.solutionId })
                this.$refs.confirmJobType.open('确认工种', { solutionId: this.item.newVersionSolutionId })
            },
            // 查询全部方案
            getCompany() {