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

Merge pull request 'fix : 细节优化' (#516) from dd into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/516
This commit is contained in:
odjbin
2024-07-10 08:57:20 +00:00
parent 7836450a10 71b9065f29
commit 17994928bf
8 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/DetailComponent/SummaryDetail.vue
View File

@@ -109,7 +109,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="经济概算(元)" prop="economicEstimate">
<el-form-item label="经济预算(元)" prop="economicEstimate">
<span>{{ toThousands(localFormData.economicEstimate) }}</span>
</el-form-item>
</el-col>

2
src/views/plan/detail.vue
View File

@@ -119,7 +119,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>

4
src/views/project-demand/requirement/add.vue
View File

@@ -28,6 +28,7 @@
type="date"
placeholder="需求上报截止时间"
value-format="YYYY-MM-DD"
:disabled-date="disabledDate"
/>
</el-config-provider>
</el-form-item>
@@ -217,6 +218,9 @@ const tableConfig = reactive({
}
]
})
const disabledDate = (time) => {
return time.getTime() < Date.now() - 8.64e7//不能选择之后的数据
}
const handleExpend = () => {
showMoreCompany.value = !showMoreCompany.value;
showExpendClass(showMoreCompany.value)

16
src/views/project-demand/summary/add.vue
View File

@@ -185,32 +185,32 @@
</el-col>
<el-col :span="8">
<el-form-item label="发明专利(项)" prop="inventionPatent" label-width="125">
<el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利" :controls="false"/>
<el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实用性新型专利(项)" prop="newPatent" label-width="145">
<el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利" :controls="false"/>
<el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="软件著作权(项)" prop="softwareCopyright" label-width="135">
<el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权" :controls="false"/>
<el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="著作权(项)" prop="copyright" label-width="125">
<el-input-number v-model="formData.copyright" placeholder="请输入著作权" :controls="false"/>
<el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="其他(项)" prop="other" label-width="145">
<el-input-number v-model="formData.other" placeholder="请输入其他" :controls="false"/>
<el-input-number v-model="formData.other" placeholder="请输入其他数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="经济概算(元)" prop="economicEstimate" label-width="135">
<el-input-number v-model="formData.economicEstimate" placeholder="请输入经济概算" :controls="false"/>
<el-form-item label="经济预算(元)" prop="economicEstimate" label-width="135">
<el-input-number v-model="formData.economicEstimate" placeholder="请输入经济预算数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="16" v-if="formData.isSpecialFund">
@@ -312,7 +312,7 @@ const rules = reactive({
softwareCopyright: [{required: true, message: '请输入软件著作权', trigger: 'blur'}],
copyright: [{required: true, message: '请输入著作权', trigger: 'blur'}],
other: [{required: true, message: '请输入其他', trigger: 'blur'}],
economicEstimate: [{required: true, message: '请输入经济概算', trigger: 'blur'}],
economicEstimate: [{required: true, message: '请输入经济预算', trigger: 'blur'}],
specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}],
serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}],
contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}]

2
src/views/project-management/filing/index.vue
View File

@@ -193,7 +193,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '经济概算(元)',
label: '经济预算(元)',
align: 'center',
currentRender:({row})=>{
return <span>{toThousands(row.economicEstimate)}</span>

2
src/views/project-management/implementation/index.vue
View File

@@ -209,7 +209,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '经济概算(元)',
label: '经济预算(元)',
align: 'center',
currentRender:({row})=>{
return <span>{toThousands(row.economicEstimate)}</span>

2
src/views/project-management/initiation/index.vue
View File

@@ -190,7 +190,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '经济概算(元)',
label: '经济预算(元)',
align: 'center',
currentRender:({row})=>{
return <span>{toThousands(row.economicEstimate)}</span>

2
src/views/project-management/mobledetail/SummaryDetailMoblie.vue
View File

@@ -106,7 +106,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="经济概算(元)" prop="economicEstimate">
<el-form-item label="经济预算(元)" prop="economicEstimate">
<span>{{ toThousands(localFormData.economicEstimate) }}</span>
</el-form-item>
</el-col>