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

Merge pull request 'refactor(plan): 将年度计划相关文案统一修改为项目计划' (#1104) from master into prod

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1104
This commit is contained in:
odjbin
2025-08-06 14:08:49 +00:00
parent b16893955d 827978f7bd
commit 831f017482
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/project-demand/summary/index.js
View File

@@ -71,7 +71,7 @@ export const uploadCollectAttachment= (data) => {
data: data
});
};
// 年度计划
// 项目计划
export const addPlan= (data) => {
return request({
url: '/workflow/annual/plan',

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

@@ -188,8 +188,8 @@
@cancelOrClear="carbonCopyUserPickerOk"/>
<div class="oper-page-btn" v-perm="['annual:plan:approve']" v-if="data.state==='4'">
<el-button type="danger" @click="handleRejectPlan">驳回年度计划</el-button>
<el-button color="#DED0B2" @click="handleAgreePlan">通过年度计划</el-button>
<el-button type="danger" @click="handleRejectPlan">驳回项目计划</el-button>
<el-button color="#DED0B2" @click="handleAgreePlan">通过项目计划</el-button>
</div>
</div>
</template>

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

@@ -3,9 +3,9 @@
<el-form :model="formData" style="margin-top: 18px">
<el-row>
<el-col :span="6">
<el-form-item label="年度计划名称" prop="annualPlanName">
<el-form-item label="项目计划名称" prop="annualPlanName">
<div v-if="isEdit">
<el-input v-model="formData.annualPlanName" placeholder="请输入年度计划名称" clearable>
<el-input v-model="formData.annualPlanName" placeholder="请输入项目计划名称" clearable>
</el-input>
<el-button color="#DED0B2" style="margin-left: 10px" @click="editName">提交</el-button>
</div>
@@ -22,7 +22,7 @@
<div class="query-btn">
<el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
<el-popover :visible="editVisible" placement="top" :width="160">
<p>点击编辑可以修改年度计划名称！</p>
<p>点击编辑可以修改项目计划名称！</p>
<div style="text-align: right; margin: 0">
<el-button size="small" color="#DED0B2" @click="editVisible = false">
确认
@@ -37,7 +37,7 @@
</div>
<el-table ref="table" :data="formData.projectList" border :header-cell-style="{background:'#f5f7fa'}">
<el-table-column label="四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表" align="center">
<el-table-column label="四川省国有资产经营投资管理有限责任公司科技创新项目计划表" align="center">
<template #default="scope">
<el-table-column type="index" label="序号" align="center" width="60"/>
<el-table-column prop="projectName" label="项目名称" align="center" width="100"/>
@@ -193,7 +193,7 @@ const exportTable = () => {
if (!$table) {
$table = $e
}
exportExcel($table, (5 + (Object.keys(formData.value.projectList[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表", 2)
exportExcel($table, (5 + (Object.keys(formData.value.projectList[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目计划表", 2)
}
const editName = () => {
let param = {

8
src/views/plan/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<div >
<!-- <baseTitle title="年度计划" style="margin-left: -15px;margin-bottom: -2px"></baseTitle>-->
<!-- <baseTitle title="项目计划" style="margin-left: -15px;margin-bottom: -2px"></baseTitle>-->
<fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px;margin-bottom: -18px"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
</div>
@@ -15,11 +15,11 @@ const router = useRouter()
const route = useRoute()
const searchConfig = ref([
{
label: '年度计划名称',
label: '项目计划名称',
prop: 'annualPlanName',
component: 'el-input',
props: {
placeholder: '请输入年度计划名称',
placeholder: '请输入项目计划名称',
clearable: true
},
}
@@ -42,7 +42,7 @@ const tableConfig = reactive({
},
{
prop: 'annualPlanName',
label: '年度计划名称',
label: '项目计划名称',
align: 'center'
},
{

2
src/views/project-demand/summary/index.vue
View File

@@ -385,7 +385,7 @@ const tableConfig = reactive({
params: {},
btns: [
{name: '新增上报', key: 'add', color: '#DED0B2', auth: auths.report},
{name: '创建年度计划', key: 'export', color: '#DED0B2', auth: auths.planAdd},
{name: '创建项目计划', key: 'export', color: '#DED0B2', auth: auths.planAdd},
// {name: '经费预算生成', key: 'preMonty', auth: ''},
]
})

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

@@ -182,8 +182,8 @@
</div>
</el-form>
<div class="oper-page-btn" v-perm="['annual:plan:approve']" v-if="data.state==='4'">
<el-button type="danger" @click="handleRejectPlan">驳回年度计划</el-button>
<el-button color="#DED0B2" @click="handleAgreePlan">通过年度计划</el-button>
<el-button type="danger" @click="handleRejectPlan">驳回项目计划</el-button>
<el-button color="#DED0B2" @click="handleAgreePlan">通过项目计划</el-button>
</div>
</div>
</template>

4
src/views/workflow/common/OperationRender.vue
View File

@@ -136,7 +136,7 @@ const init = () => {
timeline.value = {
color: '#f78f5f',
icon: 'MoreFilled',
context: '年度计划审批中'
context: '项目计划审批中'
}
}
break
@@ -159,7 +159,7 @@ const init = () => {
timeline.value = {
color: '#0bbd87',
icon: 'CircleCheckFilled',
context: '年度计划审批通过'
context: '项目计划审批通过'
}
break
default: