From 6d38bbb9e7e9bf1a0756bb875dcff6b3e5c810c7 Mon Sep 17 00:00:00 2001 From: wangchao01 <wangchao@seaskysh.com> Date: Wed, 14 Jul 2021 09:37:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E5=8F=8A=E6=96=B0=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/AmountInputBox/index.vue | 2 +- .../projectLibrary/components/Detail.vue | 4 ++ .../basicSetting/projectLibrary/index.vue | 17 +++++- .../subjectsSetting/components/Detail.vue | 6 +++ .../performance-library/components/Detail.vue | 4 ++ .../src/views/yo-common/IncomeApply/index.vue | 5 ++ .../views/yo-common/PeopleFundApply/index.vue | 7 ++- .../yo-common/ProjectFundApply/index.vue | 53 ++++++++++++++----- .../first/PeopleFundApply/components/List.vue | 4 +- .../ProjectFundApply/components/List.vue | 5 +- .../SecondPeopleFundApply/components/List.vue | 14 +++-- .../components/List.vue | 10 +++- .../SecondPuplicFundApply/components/List.vue | 1 + .../daily-public/index.vue | 2 +- 14 files changed, 108 insertions(+), 26 deletions(-) diff --git a/WebSite/src/components/AmountInputBox/index.vue b/WebSite/src/components/AmountInputBox/index.vue index 95345dad..e30e9353 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 1b46732d..ba5b2223 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 4105db38..1322ba9c 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 c0692b60..ff1baeda 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 57520488..d474fe9e 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 41655643..23d563ef 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 0ba573b7..b5e4f558 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 3414bac9..f14a4f5b 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'); }; //娴佺▼閫昏緫浠g爜 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 0dd878e4..5add2f64 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 6c6cab90..62913f3c 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 a0b7a42a..489de960 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 1d7845a4..5ee16120 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 e7e3b7da..74a3a93a 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 6875e5d3..09554097 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', -- GitLab