diff --git a/WebSite/src/components/AmountInputBox/index.vue b/WebSite/src/components/AmountInputBox/index.vue
index 95345dadba01f2c30255a8b64c6f34ea241bc357..e30e9353768d37420f998f93512154519c081c81 100644
--- a/WebSite/src/components/AmountInputBox/index.vue
+++ b/WebSite/src/components/AmountInputBox/index.vue
@@ -91,7 +91,7 @@ const props = defineProps({
maxLength: {
type: Number,
default() {
- return 9;
+ return 11;
}
}
});
diff --git a/WebSite/src/views/main/basicSetting/projectLibrary/components/Detail.vue b/WebSite/src/views/main/basicSetting/projectLibrary/components/Detail.vue
index 1b46732de52789f1bd9815c976a94fcda4bb015c..ba5b2223bb691904e43688aaa389c9c851e0c8ce 100644
--- a/WebSite/src/views/main/basicSetting/projectLibrary/components/Detail.vue
+++ b/WebSite/src/views/main/basicSetting/projectLibrary/components/Detail.vue
@@ -368,6 +368,10 @@ export default {
state.ruleForm.endDate = Moment(state.ruleForm.endDate).format(
'YYYY-MM-DD HH:mm:ss.SSS'
);
+ if (state.ruleForm.id === state.ruleForm.parentBudgetId) {
+ ElMessage.error('"涓婄骇椤圭洰"涓嶈兘涓洪」鐩湰韬紝璇烽噸鏂伴€夋嫨');
+ return;
+ }
ProjectLibrary.createBudgetInfo(state.ruleForm).then(res => {
console.log('res', res);
if (state.ruleForm.id) {
diff --git a/WebSite/src/views/main/basicSetting/projectLibrary/index.vue b/WebSite/src/views/main/basicSetting/projectLibrary/index.vue
index 4105db385202fbe3badd07594d5f81bca42852a2..1322ba9cf4647d6ba761cc62ed44622ed3ee9d74 100644
--- a/WebSite/src/views/main/basicSetting/projectLibrary/index.vue
+++ b/WebSite/src/views/main/basicSetting/projectLibrary/index.vue
@@ -64,7 +64,8 @@ export default {
children: 'children',
label: 'budgetName'
},
- editInfo: null
+ editInfo: null,
+ disableId: null
});
const handleNodeClick = data => {
state.parentObj = {
@@ -90,9 +91,21 @@ export default {
// });
} else {
state.editInfo = index;
+ // state.disableId = index.id;
+ // getName(state.treeData, state.disableId);
}
}
};
+ // 閫掑綊閫氳繃parentId鎷夸笂绾ч儴闂╪ame
+ // const getName = (data, id) => {
+ // data.forEach(item => {
+ // if (item.id === id) {
+ // item.disabled = true;
+ // } else if (item.children && item.children.length > 0) {
+ // getName(item.children, id);
+ // }
+ // });
+ // };
const loadTree = () => {
queryBudgetInfoTree();
};
@@ -100,6 +113,7 @@ export default {
const queryBudgetInfoTree = async () => {
const res = await ProjectLibrary.queryBudgetInfoTree({});
state.treeData = res.data;
+ state.treeData[0].disabled = true;
if (state.treeData && state.treeData.length > 0) {
tree.value.setCurrentKey(res.data[0].id);
state.parentObj = {
@@ -123,6 +137,7 @@ export default {
switchPage,
filterNode,
child,
+ // getName,
queryBudgetInfoTree,
tree,
loadTree
diff --git a/WebSite/src/views/main/basicSetting/subjectsSetting/components/Detail.vue b/WebSite/src/views/main/basicSetting/subjectsSetting/components/Detail.vue
index c0692b60db2986681c1963afca341829968ad675..ff1baeda6e6ed77fd76db79e61338e4526b79bc3 100644
--- a/WebSite/src/views/main/basicSetting/subjectsSetting/components/Detail.vue
+++ b/WebSite/src/views/main/basicSetting/subjectsSetting/components/Detail.vue
@@ -156,6 +156,8 @@ export default {
id: null,
fundName: '',
fundCode: '',
+ fundParentId: '',
+ fundParentName: '',
extendFormId: '',
functionDeptJson: [],
fundDescribe: ''
@@ -172,6 +174,10 @@ export default {
} else {
state.ruleForm.functionDeptJson = JSON.stringify(state.deptSelect);
}
+ if (state.ruleForm.id === state.ruleForm.fundParentId) {
+ ElMessage.error('"涓婄骇椤圭洰"涓嶈兘涓洪」鐩湰韬紝璇烽噸鏂伴€夋嫨');
+ return;
+ }
ProjectLibrary.createFund(state.ruleForm).then(res => {
console.log('res', res);
if (state.ruleForm.id) {
diff --git a/WebSite/src/views/main/performance-library/components/Detail.vue b/WebSite/src/views/main/performance-library/components/Detail.vue
index 575204882f949d0b0c16f69da2849c84cd23e4d2..d474fe9e5425fb2404bb3fa6b230a53d2f950ebc 100644
--- a/WebSite/src/views/main/performance-library/components/Detail.vue
+++ b/WebSite/src/views/main/performance-library/components/Detail.vue
@@ -96,6 +96,10 @@ export default {
cxt.emit('switchPage', 'List', '1');
};
const handleSave = () => {
+ if (state.ruleForm.id === state.ruleForm.parent) {
+ ElMessage.error('"涓婄骇椤圭洰"涓嶈兘涓洪」鐩湰韬紝璇烽噸鏂伴€夋嫨');
+ return;
+ }
ProjectLibrary.saveProjectTarget(state.ruleForm).then(res => {
console.log('res', res);
if (state.ruleForm.id) {
diff --git a/WebSite/src/views/yo-common/IncomeApply/index.vue b/WebSite/src/views/yo-common/IncomeApply/index.vue
index 416556431b0d88ed933bc67843bdd6dcfd84117c..23d563efe90ce955b859e7e434cd4aee7620b239 100644
--- a/WebSite/src/views/yo-common/IncomeApply/index.vue
+++ b/WebSite/src/views/yo-common/IncomeApply/index.vue
@@ -23,6 +23,7 @@
@handleSave="handleSave"
@handleSubmit="handleSubmit"
@handleReturn="handleReturn"
+ @handleCancel="handleCancel"
/>
<div class="mt-20">
<div v-if="incomeType == 'JIAOYU'">
@@ -683,6 +684,9 @@ export default {
const downloadFile = id => {
ProjectLibrary.downloadTempImport({ id: id });
};
+ const handleCancel = () => {
+ context.emit('handleCancel');
+ };
const init = () => {
getTypeList();
getDept();
@@ -697,6 +701,7 @@ export default {
handleSubmit,
deleteFile,
downloadFile,
+ handleCancel,
uploadHandler,
handleReturn,
toThousands,
diff --git a/WebSite/src/views/yo-common/PeopleFundApply/index.vue b/WebSite/src/views/yo-common/PeopleFundApply/index.vue
index 0ba573b7db24a678c4b0347beefe4ecffa3a0d5b..b5e4f558cbab838e7ee52c45dbefaac27687365f 100644
--- a/WebSite/src/views/yo-common/PeopleFundApply/index.vue
+++ b/WebSite/src/views/yo-common/PeopleFundApply/index.vue
@@ -7,6 +7,7 @@
@handleSave="handleSave"
@handleSubmit="handleSubmit"
@handleReturn="handleReturn"
+ @handleCancel="handleCancel"
></Flow>
</el-card>
<h2>{{ year }}骞翠汉鍛樼粡璐规槑缁嗚〃</h2>
@@ -143,12 +144,16 @@ export default {
const handleReturn = flowOutput => {
context.emit('handleReturn', flowOutput, props.row[0].id);
};
+ const handleCancel = () => {
+ context.emit('handleCancel');
+ };
return {
...toRefs(data),
handleBack,
handleSave,
handleSubmit,
- handleReturn
+ handleReturn,
+ handleCancel
};
}
};
diff --git a/WebSite/src/views/yo-common/ProjectFundApply/index.vue b/WebSite/src/views/yo-common/ProjectFundApply/index.vue
index 3414bac9debaeba09a59eb3a139da1c8eb9f4ec4..f14a4f5be413d7eb2c4d8bef66a18ff9e401514f 100644
--- a/WebSite/src/views/yo-common/ProjectFundApply/index.vue
+++ b/WebSite/src/views/yo-common/ProjectFundApply/index.vue
@@ -43,6 +43,7 @@
@handleSave="handleSave"
@handleSubmit="handleSubmit"
@handleReturn="handleReturn"
+ @handleCancel="handleCancel"
></Flow>
</el-card>
</div>
@@ -475,20 +476,48 @@
v-model="selectProjectTypeDialog"
>
<el-table :data="projectTypeList" border stripe>
- <el-table-column
- label="涓€绾ч」鐩悕绉�"
- prop="budgetName"
- ></el-table-column>
- <el-table-column
- label="涓€绾ч」鐩紪鍙�"
- prop="budgetCode"
- ></el-table-column>
- <el-table-column label="褰掑彛閮ㄩ棬"></el-table-column>
+ <el-table-column label="涓€绾ч」鐩悕绉�" prop="budgetName">
+ <template #default="scope">
+ <el-popover
+ effect="light"
+ trigger="hover"
+ placement="top"
+ :content="scope.row.remark"
+ >
+ <template #reference>
+ <p>{{ scope.row.budgetName }}</p>
+ </template>
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column label="涓€绾ч」鐩紪鍙�" prop="budgetCode">
+ <template #default="scope">
+ <el-popover
+ effect="light"
+ trigger="hover"
+ placement="top"
+ :content="scope.row.remark"
+ >
+ <template #reference>
+ <p>{{ scope.row.budgetCode }}</p>
+ </template>
+ </el-popover>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔">
<template #default="scope">
- <el-button type="primary" @click="selectProjectType(scope.row)"
- >閫夋嫨</el-button
+ <el-popover
+ effect="light"
+ trigger="hover"
+ placement="top"
+ :content="scope.row.remark"
>
+ <template #reference>
+ <el-button type="primary" @click="selectProjectType(scope.row)"
+ >閫夋嫨</el-button
+ >
+ </template>
+ </el-popover>
</template>
</el-table-column>
</el-table>
@@ -566,7 +595,7 @@ export default {
}
});
const handleCancel = () => {
- context.emit('handleCancel', data.applyInfo);
+ context.emit('handleCancel');
};
//娴佺▼閫昏緫浠ｇ爜
const handleBack = () => {
diff --git a/WebSite/src/views/yo-dept-bz/first/PeopleFundApply/components/List.vue b/WebSite/src/views/yo-dept-bz/first/PeopleFundApply/components/List.vue
index 0dd878e4b1df4f7b08076660ed7e48aa7b270c6b..5add2f644f2c207783fcc13c3795461c26dd3ea5 100644
--- a/WebSite/src/views/yo-dept-bz/first/PeopleFundApply/components/List.vue
+++ b/WebSite/src/views/yo-dept-bz/first/PeopleFundApply/components/List.vue
@@ -78,7 +78,7 @@ export default {
// { prop: 'projectLeaderName', label: '璐熻矗浜哄悕绉�' },
// { prop: 'projectLeaderCode', label: '璐熻矗浜虹紪鍙�' },
{ prop: 'totalMoney', label: '鐢虫姤閲戦' },
- { prop: 'state', label: '瀹℃牳鐘舵€�' },
+ { prop: 'state', label: '瀹℃牳鐘舵€�' }
],
primaryKey: 'id'
});
@@ -86,7 +86,7 @@ export default {
Api.getPersonList({
pageIndex: data.pageNO,
pageSize: data.pageSize,
- year: data.year,
+ year: data.year
// planType: 'YISHANG'
}).then(res => {
data.tableData = res.data;
diff --git a/WebSite/src/views/yo-dept-bz/first/ProjectFundApply/components/List.vue b/WebSite/src/views/yo-dept-bz/first/ProjectFundApply/components/List.vue
index 6c6cab901b6fba1a756bd7fc9a4d77d4c61d0c77..62913f3c44fc8b65a11f1f523e0f100684856850 100644
--- a/WebSite/src/views/yo-dept-bz/first/ProjectFundApply/components/List.vue
+++ b/WebSite/src/views/yo-dept-bz/first/ProjectFundApply/components/List.vue
@@ -84,13 +84,14 @@ export default {
selectedList: [],
tableConfig: [
{ prop: 'year', label: '骞翠唤' },
+ { prop: 'projectType', label: '椤圭洰绫诲瀷' },
{ prop: 'projectName', label: '椤圭洰鍚嶇О' },
{ prop: 'departmentName', label: '閮ㄩ棬鍚嶇О' },
{ prop: 'departmentCode', label: '閮ㄩ棬缂栧彿' },
{ prop: 'projectLeaderName', label: '璐熻矗浜哄悕绉�' },
{ prop: 'projectLeaderCode', label: '璐熻矗浜虹紪鍙�' },
- { prop: 'totalMoney', label: '鐢虫姤閲戦'},
- { prop: 'state', label: '瀹℃牳鐘舵€�' },
+ { prop: 'totalMoney', label: '鐢虫姤閲戦' },
+ { prop: 'state', label: '瀹℃牳鐘舵€�' }
],
primaryKey: 'id'
});
diff --git a/WebSite/src/views/yo-dept-bz/second/SecondPeopleFundApply/components/List.vue b/WebSite/src/views/yo-dept-bz/second/SecondPeopleFundApply/components/List.vue
index a0b7a42a8b421492db1d577f43b69191ca633900..489de960f84b8a3ff7c88886eb3df2b442c10b5f 100644
--- a/WebSite/src/views/yo-dept-bz/second/SecondPeopleFundApply/components/List.vue
+++ b/WebSite/src/views/yo-dept-bz/second/SecondPeopleFundApply/components/List.vue
@@ -64,8 +64,8 @@ export default {
pageNO: 1,
pageSize: 10,
total: 0,
- select:{
- year: window.sessionStorage.getItem('year'),
+ select: {
+ year: window.sessionStorage.getItem('year')
},
selectedList: [],
tableConfig: [
@@ -75,6 +75,7 @@ export default {
{ prop: 'departmentCode', label: '閮ㄩ棬缂栧彿' },
// { prop: 'projectLeaderName', label: '璐熻矗浜哄悕绉�' },
// { prop: 'projectLeaderCode', label: '璐熻矗浜虹紪鍙�' },
+ { prop: 'totalMoney', label: '鐢虫姤閲戦' },
{ prop: 'secondQuotaMoney', label: '鏍稿畾閲戦' },
{ prop: 'state', label: '瀹℃牳鐘舵€�' }
],
@@ -92,12 +93,17 @@ export default {
});
};
const navToDetail = row => {
- context.emit('switch-page', 'Detail', row.state == '寰呮彁浜�' ? true : false, row);
+ context.emit(
+ 'switch-page',
+ 'Detail',
+ row.state == '寰呮彁浜�' ? true : false,
+ row
+ );
};
const pageInfoChange = val => {
data.pageNo = val.page;
data.pageSize = val.limit;
- getPersonList()
+ getPersonList();
};
const createPeopleApply = () => {
context.emit('switch-page', 'Detail', true);
diff --git a/WebSite/src/views/yo-dept-bz/second/SecondProjectFundApply/components/List.vue b/WebSite/src/views/yo-dept-bz/second/SecondProjectFundApply/components/List.vue
index 1d7845a4f2e9f9b8350465d70b941cd997691568..5ee16120db645bc03b739d35896474b8ed62ac06 100644
--- a/WebSite/src/views/yo-dept-bz/second/SecondProjectFundApply/components/List.vue
+++ b/WebSite/src/views/yo-dept-bz/second/SecondProjectFundApply/components/List.vue
@@ -79,6 +79,7 @@ export default {
{ prop: 'departmentCode', label: '閮ㄩ棬缂栧彿' },
{ prop: 'projectLeaderName', label: '璐熻矗浜哄悕绉�' },
{ prop: 'projectLeaderCode', label: '璐熻矗浜虹紪鍙�' },
+ { prop: 'totalMoney', label: '鐢虫姤閲戦' },
{ prop: 'secondQuotaMoney', label: '鏍稿畾閲戦' },
{ prop: 'state', label: '瀹℃牳鐘舵€�' }
],
@@ -97,9 +98,14 @@ export default {
};
const addHandler = () => {
context.emit('switch-page', 'Detail', true);
- }
+ };
const navToDetail = row => {
- context.emit('switch-page', 'Detail', row.state == '寰呮彁浜�' ? true : false, row);
+ context.emit(
+ 'switch-page',
+ 'Detail',
+ row.state == '寰呮彁浜�' ? true : false,
+ row
+ );
};
const pageInfoChange = val => {
data.pageSize = val.limit;
diff --git a/WebSite/src/views/yo-dept-bz/second/SecondPuplicFundApply/components/List.vue b/WebSite/src/views/yo-dept-bz/second/SecondPuplicFundApply/components/List.vue
index e7e3b7dabd0633329ca1f34f2d1edcf9397c2f47..74a3a93a68fca2c17655b9b5b6dc171e64d87b69 100644
--- a/WebSite/src/views/yo-dept-bz/second/SecondPuplicFundApply/components/List.vue
+++ b/WebSite/src/views/yo-dept-bz/second/SecondPuplicFundApply/components/List.vue
@@ -81,6 +81,7 @@ export default {
{ prop: 'departmentCode', label: '閮ㄩ棬缂栧彿' },
{ prop: 'projectLeaderName', label: '璐熻矗浜哄悕绉�' },
{ prop: 'projectLeaderCode', label: '璐熻矗浜虹紪鍙�' },
+ { prop: 'totalMoney', label: '鐢虫姤閲戦' },
{ prop: 'secondQuotaMoney', label: '鏍稿畾閲戦' },
{ prop: 'state', label: '瀹℃牳鐘舵€�' }
],
diff --git a/WebSite/src/views/yo-dept-sp/financial-monitoring/daily-public/index.vue b/WebSite/src/views/yo-dept-sp/financial-monitoring/daily-public/index.vue
index 6875e5d3a0a7d4e8c59dfe8bb974c49260ec9107..0955409760c26d8de387c301ab73ba857eb55b5d 100644
--- a/WebSite/src/views/yo-dept-sp/financial-monitoring/daily-public/index.vue
+++ b/WebSite/src/views/yo-dept-sp/financial-monitoring/daily-public/index.vue
@@ -13,7 +13,7 @@
<script>
import List from '@/views/yo-dept-sp/financial-monitoring/daily-public/components/List';
-import Detail from '@/views/yo-dept-sp/financial-monitoring/daily-public/components/Detail';
+import Detail from '@/views/yo-common/PublicApplyPageList/detail.vue';
import { reactive, toRefs } from 'vue';
export default {
name: 'ProjectCheck',