From a41626cc22a50024ce5847e83fcc76fa238f5bba Mon Sep 17 00:00:00 2001
From: lshwy817 <lshwy817@163.com>
Date: Fri, 17 Feb 2023 17:31:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/yo-common/PublicApplyPageList/index.vue | 7 ++++++-
.../src/views/yo-common/PublicFundApply/index.vue | 14 ++++++++++----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/WebSite/src/views/yo-common/PublicApplyPageList/index.vue b/WebSite/src/views/yo-common/PublicApplyPageList/index.vue
index c603b8eb..d361b1e3 100644
--- a/WebSite/src/views/yo-common/PublicApplyPageList/index.vue
+++ b/WebSite/src/views/yo-common/PublicApplyPageList/index.vue
@@ -105,6 +105,7 @@ export default {
components: { PageQuery },
emits: ['switch-page', 'get-page-list'],
setup(props, context) {
+ console.log('2322', props);
onMounted(() => {
queryDeptPage();
});
@@ -188,12 +189,16 @@ export default {
ElMessage.success('椹冲洖鎴愬姛');
};
const batchExportHandler = () => {
+ console.log(route.path);
const params = {
planType: props.planType,
pageIndex: data.pageNO,
pageSize: data.pageSize,
- ...data.queryForm
+ year: data.queryForm.year
};
+ if (route.path == '/i/approval/public/FinanceApproval') {
+ params.exportRange = 1
+ }
// ElMessage.success('瀵煎嚭鎴愬姛');
ProjectLibrary.exportProjectPlan(params);
};
diff --git a/WebSite/src/views/yo-common/PublicFundApply/index.vue b/WebSite/src/views/yo-common/PublicFundApply/index.vue
index 7ad5eef3..7d4a7616 100644
--- a/WebSite/src/views/yo-common/PublicFundApply/index.vue
+++ b/WebSite/src/views/yo-common/PublicFundApply/index.vue
@@ -1200,7 +1200,7 @@ export default {
data.applyInfo.note.twoProjectCode = row.twoProjectCode;
data.applyInfo.note.twoProjectName = row.twoProjectName;
data.applyInfo.note.twoProjectId = row.twoProjectId;
- data.applyInfo.projectName = row.budgetName;
+ // data.applyInfo.projectName = row.budgetName;
data.applyInfo.projectCode = row.budgetCode;
data.applyInfo.projectTypeId = row.twoProjectId;
data.applyInfo.projectTypeName = row.twoProjectName;
@@ -1263,7 +1263,9 @@ export default {
if (length > 0) {
let applyInfo = JSON.parse(JSON.stringify(val));
applyInfo.note && (applyInfo.note = JSON.parse(applyInfo.note));
- applyInfo.note.contactsPeo = store.state.subject.user.name;
+ // applyInfo.note.contactsPeo = window.sessionStorage.getItem(
+ // 'userName'
+ // );
applyInfo.planSubjectList.forEach(item => {
item.otherJson = item.otherJson ? JSON.parse(item.otherJson) : {};
if (item.subjectDetailList) {
@@ -1318,8 +1320,11 @@ export default {
data.applyInfo.projectLeaderId = leader.id;
data.applyInfo.projectLeaderName = leader.name;
data.applyInfo.projectLeaderCode = leader.code;
- data.applyInfo.contactsPeo = store.state.subject.user.name;
- data.applyInfo.note.contactsPeo = store.state.subject.user.name;
+ // data.applyInfo.contactsPeo = store.state.subject.user.name;
+ // data.applyInfo.note.contactsPeo = store.state.subject.user.name;
+ data.applyInfo.note.contactsPeo = window.sessionStorage.getItem(
+ 'userName'
+ );
selectLoadmore(leader.name);
}
},
@@ -1411,6 +1416,7 @@ export default {
const init = async () => {
await getApplyDept();
queryDailyFund();
+ // const getUserName = Api.getUserName()
// const leader = store.state.subject.leader;
// await selectLoadmore(leader.name);
// data.applyInfo.projectLeaderId = leader.id;
--
GitLab
From a7b70ff32e1217e952bc461f8cafc79505c863d6 Mon Sep 17 00:00:00 2001
From: lshwy817 <lshwy817@163.com>
Date: Fri, 17 Mar 2023 15:48:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WebSite/src/api/projectLibrary.js | 12 +++
.../main/project-library/fundCardNo/index.vue | 89 ++++++++++++++++++-
2 files changed, 97 insertions(+), 4 deletions(-)
diff --git a/WebSite/src/api/projectLibrary.js b/WebSite/src/api/projectLibrary.js
index 0c3303a5..5f5e3f95 100644
--- a/WebSite/src/api/projectLibrary.js
+++ b/WebSite/src/api/projectLibrary.js
@@ -1067,5 +1067,17 @@ class ProjectLibrary extends Base {
static queryProjectPlanStateOut(data) {
return request.post(`/projectPlan/queryProjectPlanStateOut`, data);
}
+ // 椤圭洰绫诲瀷鑾峰彇鏍哥畻妯℃澘鍚嶇О
+ static queryTemplateCode() {
+ return request.post(`/budgetInfo/queryTemplateCode`);
+ }
+ // 鍏宠仈缁忚垂鍗″彿-淇濆瓨/淇敼鏍哥畻妯℃澘缁忚垂缂栧彿
+ static saveProjectTypeModel(data) {
+ return request.post(`/budgetInfo/saveProjectTypeModel`, data);
+ }
+ // 鍏宠仈缁忚垂鍗″彿-鑾峰彇缁忚垂缂栧彿
+ static getFundCodeList() {
+ return request.post(`/projectPlan/getFundCodeList`);
+ }
}
export default ProjectLibrary;
diff --git a/WebSite/src/views/main/project-library/fundCardNo/index.vue b/WebSite/src/views/main/project-library/fundCardNo/index.vue
index ee131025..712914d7 100644
--- a/WebSite/src/views/main/project-library/fundCardNo/index.vue
+++ b/WebSite/src/views/main/project-library/fundCardNo/index.vue
@@ -114,6 +114,28 @@
></el-input>
</template>
</el-table-column>
+ <el-table-column
+ label="鏍哥畻妯℃澘缂栧彿"
+ prop="model"
+ width="200"
+ >
+ <template #default="scope">
+ <el-select
+ filterable
+ clearable
+ v-model="scope.row.model"
+ placeholder="璇烽€夋嫨鏍哥畻妯℃澘缂栧彿"
+ @change="onSaveModel(scope.row)"
+ >
+ <el-option
+ v-for="item in codeList"
+ :key="item.templateCode"
+ :label="`${item.templateCode}[${item.templateName}]`"
+ :value="item.templateCode"
+ ></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
<el-table-column
label="缁忚垂缂栧彿"
prop="funCode"
@@ -121,11 +143,26 @@
v-if="env != 'sd' && env != 'dx'&&env != 'czzx'"
>
<template #default="scope">
- <el-input
+
+ <el-select
+ filterable
+ clearable
+ v-model="scope.row.funCode"
+ placeholder="璇烽€夋嫨缁忚垂缂栧彿"
+ @blur="onSave(scope.row)"
+ >
+ <el-option
+ v-for="item in jfbhList"
+ :key="item.fundCode"
+ :label="`${item.fundCode}[${item.fundName}]`"
+ :value="item.fundCode"
+ ></el-option>
+ </el-select>
+ <!-- <el-input
@blur="onSave(scope.row)"
v-model="scope.row.funCode"
placeholder="璇疯緭鍏ョ粡璐圭紪鍙�"
- ></el-input>
+ ></el-input> -->
</template>
</el-table-column>
<!-- <el-table-column label="椤圭洰鍒嗙被" prop="projectPlanTypeName" v-if="env == 'yy'" /> -->
@@ -161,6 +198,7 @@ export default {
queryList();
queryDeptPage();
getProjectPlanTypeList();
+ queryTemplateCode();
});
const state = reactive({
deptList: [],
@@ -178,7 +216,9 @@ export default {
total: 0,
tableData: [],
// env: 'yy',
- projectPlanTypeList: []
+ projectPlanTypeList: [],
+ codeList: [],
+ jfbhList: []
});
const queryList = () => {
if (state.checkInfo.year) {
@@ -189,6 +229,12 @@ export default {
state.total = res.total;
});
};
+ const queryTemplateCode = () => {
+ ProjectLibrary.queryTemplateCode('').then(res => {
+ state.codeList = res.data;
+ console.log(res);
+ });
+ };
// const setTime = () => {
// state.checkInfo.year = Moment(state.checkInfo.year).format('YYYY');
// };
@@ -199,6 +245,9 @@ export default {
state.deptList = res.data;
}
);
+ ProjectLibrary.getFundCodeList().then(res => {
+ state.jfbhList = res.data;
+ });
};
// 淇濆瓨
const onSave = row => {
@@ -263,6 +312,36 @@ export default {
});
}
};
+ const onSaveModel = row => {
+ console.log(row);
+ let objdata = {};
+ if (row.projectTypeId) {
+ objdata = {
+ year: row.year,
+ projectTypeId: row.projectTypeId,
+ projectPlanBookId: row.id,
+ model: row.model
+ };
+ } else {
+ objdata = {
+ // year: row.year,
+ // projectTypeId: row.projectTypeId,
+ projectPlanBookId: row.id,
+ model: row.model
+ };
+ }
+
+ ProjectLibrary.saveProjectTypeModel(objdata).then(res => {
+ console.log(res);
+ if (row.projectTypeId) {
+ ElMessage.success('淇濆瓨鎴愬姛');
+ queryList();
+ } else {
+ ElMessage.success('淇敼鎴愬姛');
+ queryList();
+ }
+ });
+ };
return {
...toRefs(state),
// setTime,
@@ -271,7 +350,9 @@ export default {
moneyFormat,
queryList,
onSave,
- getProjectPlanTypeList
+ getProjectPlanTypeList,
+ queryTemplateCode,
+ onSaveModel
};
}
};
--
GitLab