Niko
/
shuili_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复问题

master
xzt 1 month ago
parent
0243d5bee6
commit
18d457924a
3 changed files with 197 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 92
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/mainProject.vue
  2. 100
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/sourceFunds.vue
  3. 26
      jwtech-admin-page/src/views/project/detailDesign/index.vue

92
jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/mainProject.vue
View File

@ -130,7 +130,17 @@
</el-descriptions-item> -->
<el-descriptions-item>
<template slot="label"> 中央资金（万元） </template>
<template slot="label">
中央资金（万元）
<el-tooltip
class="item"
effect="dark"
content="含中央预算内拨款、中央财政水利专项资金、中央水利建设基金、重大水利工程建设基金、中央土地出让收益、中央自筹资产、中央其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
{{ this.proMsg.centralArrangedFunds }}
</el-descriptions-item>
<el-descriptions-item>
@ -138,7 +148,17 @@
{{ this.proMsg.centralArrangedFundsRate }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 省级资金（万元） </template>
<template slot="label">
省级资金（万元）
<el-tooltip
class="item"
effect="dark"
content="含省级财政水利资金、省级水利建设基金、省级银行贷款、省级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
{{ this.proMsg.provincialFunding }}
</el-descriptions-item>
<el-descriptions-item>
@ -146,7 +166,17 @@
{{ this.proMsg.provincialFundingRate }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 地市资金（万元） </template>
<template slot="label">
地市资金（万元）
<el-tooltip
class="item"
effect="dark"
content="含地市级政府投资、地市级银行贷款、地市级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
{{ this.proMsg.cityLevelFunds }}
</el-descriptions-item>
<el-descriptions-item>
@ -154,7 +184,17 @@
{{ this.proMsg.cityLevelFundsRate }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 区县资金（万元） </template>
<template slot="label">
区县资金（万元）
<el-tooltip
class="item"
effect="dark"
content="含县级政府投资、县级银行贷款、县级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
{{ this.proMsg.countyLevelFunds }}
</el-descriptions-item>
<el-descriptions-item>
@ -634,6 +674,17 @@
</el-col>
<el-col :span="12">
<el-form-item label="中央资金" prop="centralArrangedFunds">
<template slot="label">
中央资金
<el-tooltip
class="item"
effect="dark"
content="含中央预算内拨款、中央财政水利专项资金、中央水利建设基金、重大水利工程建设基金、中央土地出让收益、中央自筹资产、中央其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input
v-model="form.centralArrangedFunds"
placeholder="请输入中央资金"
@ -655,6 +706,17 @@
</el-col>
<el-col :span="12">
<el-form-item label="省级资金" prop="provincialFunding">
<template slot="label">
省级资金
<el-tooltip
class="item"
effect="dark"
content="含省级财政水利资金、省级水利建设基金、省级银行贷款、省级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input
v-model="form.provincialFunding"
placeholder="请输入省级资金"
@ -676,6 +738,17 @@
</el-col>
<el-col :span="12">
<el-form-item label="地市资金" prop="cityLevelFunds">
<template slot="label">
地市资金
<el-tooltip
class="item"
effect="dark"
content="含地市级政府投资、地市级银行贷款、地市级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input
v-model="form.cityLevelFunds"
placeholder="请输入地市资金"
@ -697,6 +770,17 @@
</el-col>
<el-col :span="12">
<el-form-item label="区县资金" prop="countyLevelFunds">
<template slot="label">
区县资金
<el-tooltip
class="item"
effect="dark"
content="含县级政府投资、县级银行贷款、县级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input
v-model="form.countyLevelFunds"
placeholder="请输入区县资金"

100
jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/sourceFunds.vue
View File

@ -298,27 +298,75 @@
align="right"
prop="centralArrangedFunds"
min-width="150"
/>
>
<template slot="header" slot-scope="scope">
中央资金（万元）
<el-tooltip
class="item"
effect="dark"
content="含中央预算内拨款、中央财政水利专项资金、中央水利建设基金、重大水利工程建设基金、中央土地出让收益、中央自筹资产、中央其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
label="省级资金（万元）"
align="right"
prop="provincialFunding"
min-width="150"
/>
>
<template slot="header" slot-scope="scope">
省级资金（万元）
<el-tooltip
class="item"
effect="dark"
content="含省级财政水利资金、省级水利建设基金、省级银行贷款、省级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
label="地市级资金（万元）"
align="right"
prop="cityLevelFunds"
min-width="150"
/>
>
<template slot="header" slot-scope="scope">
地市级资金（万元）
<el-tooltip
class="item"
effect="dark"
content="含地市级政府投资、地市级银行贷款、地市级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
label="县级资金（万元）"
align="right"
prop="countyLevelFunds"
min-width="150"
/>
>
<template slot="header" slot-scope="scope">
区县资金（万元）
<el-tooltip
class="item"
effect="dark"
content="含县级政府投资、县级银行贷款、县级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
label="乡镇及群众自筹和其他投资（万元）"
@ -398,6 +446,17 @@
</el-col>
<el-col :span="12">
<el-form-item label="中央资金" prop="centralArrangedFunds">
<template slot="label">
中央资金
<el-tooltip
class="item"
effect="dark"
content="含中央预算内拨款、中央财政水利专项资金、中央水利建设基金、重大水利工程建设基金、中央土地出让收益、中央自筹资产、中央其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input
v-model="form.centralArrangedFunds"
placeholder="请输入中央资金"
@ -410,6 +469,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="省级资金" prop="provincialFunding">
<template slot="label">
省级资金
<el-tooltip
class="item"
effect="dark"
content="含省级财政水利资金、省级水利建设基金、省级银行贷款、省级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input
v-model="form.provincialFunding"
placeholder="请输入省级资金"
@ -420,6 +490,17 @@
</el-col>
<el-col :span="12">
<el-form-item label="地市级资金" prop="cityLevelFunds">
<template slot="label">
地市资金
<el-tooltip
class="item"
effect="dark"
content="含地市级政府投资、地市级银行贷款、地市级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input
v-model="form.cityLevelFunds"
placeholder="请输入地市级资金"
@ -432,6 +513,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="县级资金" prop="countyLevelFunds">
<template slot="label">
区县资金
<el-tooltip
class="item"
effect="dark"
content="含县级政府投资、县级银行贷款、县级其他资金"
placement="top-start"
>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input
v-model="form.countyLevelFunds"
placeholder="请输入县级资金"

26
jwtech-admin-page/src/views/project/detailDesign/index.vue
View File

@ -17,7 +17,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['earlyStage:feasibility:add']"
v-hasPermi="['earlyStage:detailDesign:add']"
>新增</el-button
>
<el-button
@ -26,7 +26,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['earlyStage:proDesign:edit']"
v-hasPermi="['earlyStage:detailDesign:edit']"
>修改</el-button
>
<el-button
@ -35,7 +35,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['earlyStage:proDesign:remove']"
v-hasPermi="['earlyStage:detailDesign:remove']"
>删除</el-button
>
<right-toolbar
@ -105,7 +105,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['earlyStage:feasibility:add']"
v-hasPermi="['earlyStage:detailDesign:add']"
>新增</el-button
>
</el-col>
@ -116,7 +116,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['earlyStage:proDesign:edit']"
v-hasPermi="['earlyStage:detailDesign:edit']"
>修改</el-button
>
</el-col>
@ -127,7 +127,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['earlyStage:proDesign:remove']"
v-hasPermi="['earlyStage:detailDesign:remove']"
>删除</el-button
>
</el-col>
@ -267,7 +267,7 @@
type="text"
icon="el-icon-view"
@click="viewInfo(scope.row)"
v-hasPermi="['earlyStage:proDesign:view']"
v-hasPermi="['earlyStage:detailDesign:view']"
>查看</el-button
>
<el-button
@ -275,7 +275,7 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['earlyStage:proDesign:edit']"
v-hasPermi="['earlyStage:detailDesign:edit']"
>修改</el-button
>
<el-button
@ -283,7 +283,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['earlyStage:proDesign:remove']"
v-hasPermi="['earlyStage:detailDesign:remove']"
>删除</el-button
>
</template>
@ -362,7 +362,7 @@
</el-row>
<el-row>
<!-- 无建议书审批时 -->
<el-col :span="12" v-if="form.isApproval == '0'">
<el-col :span="12">
<el-form-item label="项目类型" prop="projectType">
<div style="margin-bottom: 10px">
<el-radio v-model="radio" label="zd" @input="changeisMajor()"
@ -387,7 +387,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目种类" prop="projectKind" v-if="form.isApproval == '0'">
<el-form-item label="项目种类" prop="projectKind">
<el-select
v-model="form.projectKind"
placeholder="请选择项目种类"
@ -407,7 +407,7 @@
</el-row>
<!-- 无建议书审批时，选择行政区划 -->
<el-col :span="12" v-if="form.isApproval == '0'">
<el-col :span="12">
<el-form-item label="行政区划" prop="adcd">
<el-cascader
:options="areasOptions"
@ -422,7 +422,7 @@
</el-cascader>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.isApproval == '0'">
<el-col :span="12">
<el-form-item label="项目编码" prop="projectCode">
<el-input
v-model="form.projectCode"

Write Preview
Loading…
Cancel
Save