Merge pull request 'refactor(project-management): 统一经费预算单位' (#1000) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1000
This commit is contained in:
2025-04-24 07:30:38 +00:00
19 changed files with 33 additions and 33 deletions

View File

@@ -1,5 +1,5 @@
<template>
<el-form :model="formData" ref="applyForm" :rules="rules" :label-position="labelPosition" :style="{marginLeft: label==='项目验收附件'?'25px':'5px'}">
<el-form :model="formData" ref="applyForm" :rules="rules" :label-position="labelPosition" :style="{marginLeft: label==='项目验收附件'?'25px': label==='项目立项附件'?'25px':'5px'}">
<el-row>
<!-- <el-col :span="24">-->
<!-- <el-form-item :label="label" prop="attachment" >-->

View File

@@ -5,14 +5,14 @@
<el-row v-if="title==='apply'">
<el-col :span="6">
<!-- label-width="106"-->
<el-form-item label="实际经费预算" prop="actualEconomicEstimate" label-width="111">
<el-form-item label="实际经费预算(元)" prop="actualEconomicEstimate" label-width="130">
<el-input v-model="localFormData.actualEconomicEstimate" placeholder="请输入实际经费预算">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="isSpecialFund">
<!-- label-width="106"-->
<el-form-item label="实际专项资金" prop="specialFundAmount" label-width="121">
<el-col :span="6" >
<!-- label-width="106" v-if="isSpecialFund"-->
<el-form-item label="实际专项资金(元)" prop="specialFundAmount" label-width="140">
<el-input v-model="localFormData.specialFundAmount" placeholder="请输入实际专项资金">
</el-input>
</el-form-item>
@@ -95,7 +95,7 @@
<el-row>
<el-col :span="6" v-if="title==='apply'">
<!-- label-width="106"-->
<el-form-item label="项目负责人" :required="true" prop="" label-width="111">
<el-form-item label="项目负责人" :required="true" prop="" label-width="130">
<el-button style="margin-right: 10px" color="#DED0B2" @click="handleShowProjectChargePersonTable">
{{ projectChargePersonUserList?.length !== 0 ? '更改' : '请选择' }}
</el-button>
@@ -108,7 +108,7 @@
</el-form-item>
</el-col>
<el-col :span="6" v-if="title==='apply'">
<el-form-item label="项目成员" :required="true" prop="" label-width="120"
<el-form-item label="项目成员" :required="true" prop="" label-width="140"
>
<el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowProjectPersonTable">
{{

View File

@@ -279,7 +279,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
@@ -295,7 +295,7 @@ const schema = computed(() => {
)
},
{
label: '实际经费预算',
label: '实际经费预算(元)',
prop: 'actualEconomicEstimate',
colProps: {
span: 6

View File

@@ -204,7 +204,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '预估经费预算',
label: '预估经费预算(元)',
align: 'center',
width: 150,
currentRender:({row})=>{

View File

@@ -137,7 +137,7 @@
<div v-else>--</div>
</template>
</el-table-column>
<el-table-column prop="intellectualProperty" label="预估经费预算" align="center">
<el-table-column prop="intellectualProperty" label="预估经费预算(元)" align="center">
<template #default="scope">
<span>{{ toThousands(scope.row.economicEstimate) }}</span>
</template>

View File

@@ -157,7 +157,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
@@ -172,7 +172,7 @@ const schema = computed(() => {
</div>
)
}, {
label: '实际经费预算',
label: '实际经费预算(元)',
prop: 'actualEconomicEstimate',
colProps: {
span: 6

View File

@@ -281,7 +281,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '预估经费预算',
label: '预估经费预算(元)',
align: 'center',
width: 150,
currentRender:({row})=>{

View File

@@ -168,7 +168,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
@@ -184,7 +184,7 @@ const schema = computed(() => {
)
},
{
label: '实际经费预算',
label: '实际经费预算(元)',
prop: 'actualEconomicEstimate',
colProps: {
span: 6

View File

@@ -163,7 +163,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
@@ -179,7 +179,7 @@ const schema = computed(() => {
)
},
{
label: '实际经费预算',
label: '实际经费预算(元)',
prop: 'actualEconomicEstimate',
colProps: {
span: 6

View File

@@ -177,7 +177,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6

View File

@@ -298,7 +298,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '预估经费预算',
label: '预估经费预算(元)',
align: 'center',
width: 150,
currentRender:({row})=>{

View File

@@ -230,7 +230,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
@@ -245,7 +245,7 @@ const schema = computed(() => {
</div>
)
}, {
label: '实际经费预算',
label: '实际经费预算(元)',
prop: 'actualEconomicEstimate',
colProps: {
span: 6

View File

@@ -170,7 +170,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
@@ -185,7 +185,7 @@ const schema = computed(() => {
</div>
)
},{
label: '实际经费预算',
label: '实际经费预算(元)',
prop: 'actualEconomicEstimate',
colProps: {
span: 6

View File

@@ -145,7 +145,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
@@ -160,7 +160,7 @@ const schema = computed(() => {
</div>
)
}, {
label: '实际经费预算',
label: '实际经费预算(元)',
prop: 'actualEconomicEstimate',
colProps: {
span: 6

View File

@@ -182,7 +182,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6

View File

@@ -253,7 +253,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
@@ -269,7 +269,7 @@ const schema = computed(() => {
)
},
{
label: '实际经费预算',
label: '实际经费预算(元)',
prop: 'actualEconomicEstimate',
colProps: {
span: 6

View File

@@ -279,7 +279,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '预估经费预算',
label: '预估经费预算(元)',
align: 'center',
width: 150,
currentRender:({row})=>{

View File

@@ -260,7 +260,7 @@ const schema = computed(() => {
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 24
@@ -276,7 +276,7 @@ const schema = computed(() => {
)
},
{
label: '实际经费预算',
label: '实际经费预算(元)',
prop: 'actualEconomicEstimate',
colProps: {
span: 24

View File

@@ -167,7 +167,7 @@ const schema = computed(() => {
)
},
{
label: '预估经费预算',
label: '预估经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 24