From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整
---
applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue | 71 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue b/applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue
index 6f42727..4292cb3 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue
@@ -10,10 +10,11 @@
<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="earnForecast" 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>
@@ -31,37 +32,36 @@
v-model:page-size="params.size" layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
</div>
</div>
- <el-dialog class="gd-dialog" append-to-body v-model="isShowEditView" :title="titleTxt" :width="pxToRem(800)"
+ <el-dialog class="gd-dialog" append-to-body v-model="isShowEditView" :title="titleTxt"
: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-form class="gd-dialog-form" ref="ruleFormRef" :model="editParams" :rules="rules" label-width="160px">
<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="earnForecast">
+ <el-input class="gd-input" v-model="editParams.earnForecast" />
+ </el-form-item>
+ </el-col>
+ <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>
@@ -82,6 +82,8 @@
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)
const params = ref({
@@ -101,12 +103,14 @@
operatingIncome: '',
totalCost: '',
netProfit: '',
+ earnForecast: '',
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 +123,7 @@
}
],
totalCost: [
- { required: true, message: '请输入综合总成本费用', trigger: 'blur' },
+ { required: true, message: '请输入', trigger: 'blur' },
{
validator: (rule, value, callback) => {
if (!/^\d+(\.\d+)?$/.test(value)) {
@@ -132,7 +136,20 @@
}
],
netProfit: [
- { required: true, message: '请输入净利润', trigger: 'blur' },
+ { required: true, message: '请输入', trigger: 'blur' },
+ {
+ validator: (rule, value, callback) => {
+ if (!/^\d+(\.\d+)?$/.test(value)) {
+ callback(new Error('请输入有效的数字（整数或小数）'))
+ } else {
+ callback()
+ }
+ },
+ trigger: 'blur'
+ }
+ ],
+ earnForecast: [
+ { required: true, message: '请输入', trigger: 'blur' },
{
validator: (rule, value, callback) => {
if (!/^\d+(\.\d+)?$/.test(value)) {
@@ -145,7 +162,7 @@
}
],
financialIrr: [
- { required: true, message: '请输入财务内部收益率', trigger: 'blur' },
+ { required: true, message: '请输入', trigger: 'blur' },
{
validator: (rule, value, callback) => {
if (!/^\d+(\.\d+)?$/.test(value)) {
@@ -158,7 +175,7 @@
}
],
marketSpace: [
- { required: true, message: '请输入市场空间', trigger: 'blur' },
+ { required: true, message: '请输入', trigger: 'blur' },
],
})
@@ -191,7 +208,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 = []
--
Gitblit v1.9.3