odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix : 新增分摊/上传费用输入框显示问题' (#447) from dd into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/447
This commit is contained in:
odjbin
2024-06-30 13:28:56 +00:00
parent 51d2e8357b 47a5cd3338
commit cae3746a7b
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/expense-management/share/add.vue
View File

@@ -21,7 +21,7 @@
</el-form-item>
</el-col>
<el-table v-if="showTable" :data="formData.tableData" style="width: 100%">
<el-table-column prop="projectId" label="项目名称" width="230">
<el-table-column prop="projectId" label="项目名称" min-width="230">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.projectId?'1':rules.projectId">
<el-select v-model="scope.row.projectId" placeholder="请选择项目名称" clearable>
@@ -36,7 +36,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="researchPersonnelId" label="研发人员" width="230">
<el-table-column prop="researchPersonnelId" label="研发人员" min-width="180">
<template #default="scope">
<el-form-item prop="researchPersonnelId">
{{ scope.row.researchPersonnel }}
@@ -46,56 +46,56 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="wagesPayable" label="应发工资" width="175">
<el-table-column prop="wagesPayable" label="应发工资" min-width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.wagesPayable?'1':rules.wagesPayable">
<el-input-number v-model="scope.row.wagesPayable" placeholder="请输入应发工资" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="performance" label="绩效" width="175">
<el-table-column prop="performance" label="绩效" min-width="175">
<template #default="scope">
<el-form-item prop="time">
<el-input-number v-model="scope.row.performance" placeholder="请输入绩效" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="reserveFund" label="公积金" width="175">
<el-table-column prop="reserveFund" label="公积金" min-width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.reserveFund?'1':rules.reserveFund">
<el-input-number v-model="scope.row.reserveFund" placeholder="请输入公积金" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="socialSecurity" label="社保" width="175">
<el-table-column prop="socialSecurity" label="社保" min-width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.socialSecurity?'1':rules.socialSecurity">
<el-input-number v-model="scope.row.socialSecurity" placeholder="请输入社保" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="annuity" label="年金" width="175">
<el-table-column prop="annuity" label="年金" min-width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.annuity?'1':rules.annuity">
<el-input-number v-model="scope.row.annuity" placeholder="请输入年金" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="workday" label="工作日(天)" width="175">
<el-table-column prop="workday" label="工作日(天)" min-width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.workday?'1':rules.workday">
<el-input-number v-model="scope.row.workday" placeholder="请输入工作日" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="researchDuration" label="研发时长(天)" width="175">
<el-table-column prop="researchDuration" label="研发时长(天)" min-width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.researchDuration?'1':rules.researchDuration">
<el-input-number v-model="scope.row.researchDuration" placeholder="请输入研发时长" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="oper" label="操作">
<el-table-column prop="oper" label="操作" min-width="130">
<template #default="scope">
<el-button type="primary" @click="handleCopy(scope.row)" link style="font-size: 18px">复制</el-button>
<el-button type="primary" @click="handleDelete(scope.$index)" link style="font-size: 18px">删除</el-button>

10
src/views/project-management/implementation/uploadFee.vue
View File

@@ -3,7 +3,7 @@
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<el-form :model="tableForm" ref="form" class="query-form">
<el-table :data="tableForm.tableData">
<el-table-column prop="time" label="时间" width="180">
<el-table-column prop="time" label="时间" min-width="180">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.time?'1':rules.time">
<el-date-picker
@@ -17,7 +17,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="projectCost" label="项目费用" width="220">
<el-table-column prop="projectCost" label="项目费用" min-width="220">
<template #default="scope">
<el-form-item prop="projectCost" :rules="scope.row.projectCost?'1':rules.projectCost">
<el-select v-model="scope.row.projectCost" placeholder="请选择费用性质" clearable filterable>
@@ -31,7 +31,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="researchStage" label="研发阶段" width="220">
<el-table-column prop="researchStage" label="研发阶段" min-width="220">
<template #default="scope">
<el-form-item prop="researchStage" :rules="scope.row.researchStage?'1':rules.researchStage">
<el-select v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable filterable>
@@ -45,7 +45,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="digest" label="摘要" width="220">
<el-table-column prop="digest" label="摘要" min-width="220">
<template #default="scope">
<el-form-item prop="digest" :rules="scope.row.digest?'1':rules.digest">
<el-input v-model="scope.row.digest" placeholder="请输入摘要" clearable>
@@ -53,7 +53,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="afterTax" label="税后余额(元)" width="220">
<el-table-column prop="afterTax" label="税后余额(元)" min-width="220">
<template #default="scope">
<el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
<el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">