Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-30 08ab4ebee26bb6c275b68c350bfa93ae770d6fee

 applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue

@@ -10,10 +10,10 @@
        <el-table class="gd-table" :data="tableList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="46" />
          <el-table-column label="序号" type="index" width="60"></el-table-column>
          <el-table-column prop="operatingIncome" label="营业收入" align="center"></el-table-column>
          <el-table-column prop="totalCost" label="综合总成本费用" align="center"></el-table-column>
          <el-table-column prop="netProfit" label="净利润" align="center"></el-table-column>
          <el-table-column prop="financialIrr" label="财务内部收益率" align="center"></el-table-column>
          <el-table-column prop="operatingIncome" label="营业收入(元)" align="center"></el-table-column>
          <el-table-column prop="totalCost" label="综合总成本费用(元)" align="center"></el-table-column>
          <el-table-column prop="netProfit" label="净利润(元)" align="center"></el-table-column>
          <el-table-column prop="financialIrr" label="财务内部收益率(%)" align="center"></el-table-column>
          <el-table-column prop="marketSpace" label="市场空间" align="center" show-overflow-tooltip></el-table-column>
          <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
          <el-table-column prop="nickName" label="创建人" align="center"></el-table-column>
@@ -35,33 +35,33 @@
      :close-on-click-modal="false" :destroy-on-close="true" @close="handleClose">
      <el-form class="gd-dialog-form" ref="ruleFormRef" :model="editParams" :rules="rules" label-width="140px">
        <el-row>
          <el-col span="12">
            <el-form-item label="营业收入" prop="operatingIncome">
            <el-col :span="12">
            <el-form-item label="营业收入(元)" prop="operatingIncome">
              <el-input class="gd-input" v-model="editParams.operatingIncome" />
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="综合总成本费用" prop="totalCost">
          <el-col :span="12">
            <el-form-item label="综合总成本费用(元)" prop="totalCost">
              <el-input class="gd-input" v-model="editParams.totalCost" />
            </el-form-item>
          </el-col>
        </el-row>

        <el-row>
          <el-col span="12">
            <el-form-item label="净利润" prop="netProfit">
          <el-col :span="12">
            <el-form-item label="净利润(元)" prop="netProfit">
              <el-input class="gd-input" v-model="editParams.netProfit" />
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="财务内部收益率" prop="financialIrr">
         <el-col :span="12">
            <el-form-item label="财务内部收益率(%)" prop="financialIrr">
              <el-input class="gd-input" v-model="editParams.financialIrr" />
            </el-form-item>
          </el-col>
        </el-row>

        <el-row>
          <el-col span="12">
          <el-col :span="12">
            <el-form-item label="市场空间" prop="marketSpace">
              <el-input class="gd-input" v-model="editParams.marketSpace" />
            </el-form-item>
@@ -81,6 +81,8 @@
<script setup>
import { ElMessage, ElMessageBox, ElLoading } from 'element-plus'
import { operatingIncomePage, operatingIncomeUpdate, operatingIncomeAdd, operatingIncomeBatchDelete } from './operatingIncomeApi'

import { fieldRules } from '@ztzf/utils'

let titleTxt = ref('新增')
const total = ref(0)
@@ -104,9 +106,10 @@
  financialIrr: '',
  marketSpace: '',
})

const rules = reactive({
  operatingIncome: [
    { required: true, message: '请输入营业收入', trigger: 'blur' },
    { required: true, message: '请输入', trigger: 'blur' },
    {
      validator: (rule, value, callback) => {
        if (!/^\d+(\.\d+)?$/.test(value)) {
@@ -119,7 +122,7 @@
    }
  ],
  totalCost: [
    { required: true, message: '请输入综合总成本费用', trigger: 'blur' },
    { required: true, message: '请输入', trigger: 'blur' },
    {
      validator: (rule, value, callback) => {
        if (!/^\d+(\.\d+)?$/.test(value)) {
@@ -132,7 +135,7 @@
    }
  ],
  netProfit: [
    { required: true, message: '请输入净利润', trigger: 'blur' },
    { required: true, message: '请输入', trigger: 'blur' },
    {
      validator: (rule, value, callback) => {
        if (!/^\d+(\.\d+)?$/.test(value)) {
@@ -145,7 +148,7 @@
    }
  ],
  financialIrr: [
    { required: true, message: '请输入财务内部收益率', trigger: 'blur' },
    { required: true, message: '请输入', trigger: 'blur' },
    {
      validator: (rule, value, callback) => {
        if (!/^\d+(\.\d+)?$/.test(value)) {
@@ -158,7 +161,7 @@
    }
  ],
  marketSpace: [
    { required: true, message: '请输入市场空间', trigger: 'blur' },
    { required: true, message: '请输入', trigger: 'blur' },
  ],
})

@@ -191,7 +194,7 @@
    confirmButtonClass: 'gd-confirm-button',
    cancelButtonClass: 'gd-confirm-cancel-button',
  })
  const ids = row ? row.id : selectedIds.value
  const ids = row ? [row.id] : selectedIds.value
  await operatingIncomeBatchDelete(ids)
  ElMessage.success('删除成功')
  selectedIds.value = []