From be935300089c97ea7477edd6e888a43ab244c44f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 十二月 2024 09:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/index.vue | 9 ++--
src/assets/styles/index.scss | 4 ++
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 4 +
src/layout/components/AppMain.vue | 4 +-
src/views/projectEngineering/abnormalProject/index.vue | 2
src/views/projectEngineering/projectLibrary/projectDetails.vue | 83 +++++++++++++++++++++++------------------
src/views/projectProcess/index.vue | 2
7 files changed, 62 insertions(+), 46 deletions(-)
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 61bf7ef..074c329 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -139,6 +139,10 @@
//main-container鍏ㄥ眬鏍峰紡
.app-container {
padding: 20px;
+ height: calc(100vh - 96px);
+ display: flex;
+ flex-direction: column;
+ box-sizing: border-box;
}
// search闈㈡澘鏍峰紡
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index a25c562..9366fa8 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -29,7 +29,7 @@
<style lang="scss" scoped>
.app-main {
/* 50= navbar 50 */
- min-height: calc(100vh - 50px);
+ // min-height: calc(100vh - 50px);
width: 100%;
position: relative;
overflow: hidden;
@@ -42,7 +42,7 @@
.hasTagsView {
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
- min-height: calc(100vh - 84px);
+ min-height: calc(100vh - 96px);
}
.fixed-header + .app-main {
diff --git a/src/views/projectEngineering/abnormalProject/index.vue b/src/views/projectEngineering/abnormalProject/index.vue
index 3e8245b..4118f26 100644
--- a/src/views/projectEngineering/abnormalProject/index.vue
+++ b/src/views/projectEngineering/abnormalProject/index.vue
@@ -182,7 +182,7 @@
v-loading="loading"
:data="projectInfoList"
@selection-change="handleSelectionChange"
- height="60vh"
+ height="100%"
sortable="custom"
:show-overflow-tooltip="true">
<el-table-column type="selection" width="55" align="center"/>
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index 7b6c23b..0dade99 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -304,6 +304,7 @@
import {approvalList} from "@/api/system/dept";
export default {
+ name: 'BasicInfo',
dicts: ['sys_funding_type', 'sys_investment_type', 'sys_project_type', 'sys_project_status', 'sys_competent_department'
, 'sys_administrative_divisions', 'sys_centralized_management', 'sys_approval_type', 'sys_key_categories', 'sys_annual_plan'],
components: {
@@ -428,9 +429,10 @@
this.approvalList = res.data;
});
},
- submit() {
+ submit(usedStatus) {
this.$refs["projectForm"].validate(valid => {
if (valid) {
+ this.projectForm.usedStatus = usedStatus;
if (this.projectForm.id) {
updateProject(this.projectForm).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 0cb0ff6..f21bbdb 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -196,13 +196,14 @@
v-loading="loading"
:data="projectInfoList"
@selection-change="handleSelectionChange"
- height="60vh"
+ height="100%"
sortable="custom"
:show-overflow-tooltip="true">
<el-table-column type="selection" width="55" align="center"/>
<!-- 鍔ㄦ�佸垪 -->
<el-table-column
v-for="item in columns"
+ :key="item.id"
v-if="item.visible"
:prop="item.id"
:label="item.label"
@@ -274,7 +275,7 @@
<pagination
v-show="total>0"
:total="total"
- :page.sync="queryParams.pageNum"
+ :page.sync="queryParams.currentPage"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
@@ -338,7 +339,7 @@
timeRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- pageNum: 1,
+ currentPage: 1,
pageSize: 10,
projectName: null,
projectCode: null,
@@ -532,7 +533,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.queryParams.pageNum = 1;
+ this.queryParams.currentPage = 1;
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
diff --git a/src/views/projectEngineering/projectLibrary/projectDetails.vue b/src/views/projectEngineering/projectLibrary/projectDetails.vue
index 6494775..46e1b6b 100644
--- a/src/views/projectEngineering/projectLibrary/projectDetails.vue
+++ b/src/views/projectEngineering/projectLibrary/projectDetails.vue
@@ -1,5 +1,5 @@
<template>
- <el-card class="card-container" >
+ <el-card class="card-container">
<div class="flex-container mb-4">
<el-tabs v-model="currentTab" @tab-click="handleClick" v-show="isShow">
<el-tab-pane
@@ -24,7 +24,16 @@
class="full-width custom-height"
/>
<div v-if="!disabled" class="button-container">
- <el-button class="save-button" type="primary" @click="submit">淇濆瓨</el-button>
+ <el-button
+ v-if="componentName.name == 'BasicInfo'"
+ class="save-button"
+ type="primary"
+ @click="submit(0)"
+ >鑽夌</el-button
+ >
+ <el-button class="save-button" type="primary" @click="submit(1)"
+ >淇濆瓨</el-button
+ >
<el-button class="reset-button" @click="reset">閲嶇疆</el-button>
<!-- <el-button v-else class="cancel-button" @click="cancel">鍙栨秷</el-button> -->
</div>
@@ -32,53 +41,53 @@
</template>
<script>
-import BasicInfo from '@/views/projectEngineering/projectLibrary/component/BasicInfo';
-import InvestInfo from '@/views/projectEngineering/projectLibrary/component/InvestInfo';
-import InvestmentFunds from '@/views/projectEngineering/projectLibrary/component/investmentFunds';
-import LegalPerson from '@/views/projectEngineering/projectLibrary/component/legalPerson';
-import PolicyInfo from '@/views/projectEngineering/projectLibrary/component/PolicyInfo';
-import DocumentsInfo from '@/views/projectEngineering/projectLibrary/component/DocumentsInfo';
+import BasicInfo from "@/views/projectEngineering/projectLibrary/component/BasicInfo";
+import InvestInfo from "@/views/projectEngineering/projectLibrary/component/InvestInfo";
+import InvestmentFunds from "@/views/projectEngineering/projectLibrary/component/investmentFunds";
+import LegalPerson from "@/views/projectEngineering/projectLibrary/component/legalPerson";
+import PolicyInfo from "@/views/projectEngineering/projectLibrary/component/PolicyInfo";
+import DocumentsInfo from "@/views/projectEngineering/projectLibrary/component/DocumentsInfo";
export default {
- name: 'ProjectDetails',
+ name: "ProjectDetails",
data() {
return {
isShow: false,
- currentTab: '椤圭洰绠＄悊鍩虹淇℃伅',
+ currentTab: "椤圭洰绠＄悊鍩虹淇℃伅",
disabled: false,
- projectForm:{},
+ projectForm: {},
componentName: BasicInfo,
TABS_DATA: [
{
- label: '椤圭洰绠＄悊鍩虹淇℃伅',
- value: '椤圭洰绠＄悊鍩虹淇℃伅',
- componentName: BasicInfo
+ label: "椤圭洰绠＄悊鍩虹淇℃伅",
+ value: "椤圭洰绠＄悊鍩虹淇℃伅",
+ componentName: BasicInfo,
},
{
- label: '鎶曡祫绠＄悊鍩虹淇℃伅',
- value: '鎶曡祫绠＄悊鍩虹淇℃伅',
- componentName: InvestInfo
+ label: "鎶曡祫绠＄悊鍩虹淇℃伅",
+ value: "鎶曡祫绠＄悊鍩虹淇℃伅",
+ componentName: InvestInfo,
},
{
- label: '椤圭洰鎶曡祫鍙婅祫閲戞潵婧�',
- value: '椤圭洰鎶曡祫鍙婅祫閲戞潵婧�',
- componentName: InvestmentFunds
+ label: "椤圭洰鎶曡祫鍙婅祫閲戞潵婧�",
+ value: "椤圭洰鎶曡祫鍙婅祫閲戞潵婧�",
+ componentName: InvestmentFunds,
},
{
- label: '椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅',
- value: '椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅',
- componentName: LegalPerson
+ label: "椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅",
+ value: "椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅",
+ componentName: LegalPerson,
},
{
- label: '鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌',
- value: '鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌',
- componentName: PolicyInfo
+ label: "鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌",
+ value: "鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌",
+ componentName: PolicyInfo,
},
{
- label: '鐩稿叧鏂囦功',
- value: '鐩稿叧鏂囦功',
- componentName: DocumentsInfo
- }
+ label: "鐩稿叧鏂囦功",
+ value: "鐩稿叧鏂囦功",
+ componentName: DocumentsInfo,
+ },
],
childRef: null,
};
@@ -88,29 +97,29 @@
this.isShow = newValue;
},
handleClick(tabTarget) {
- this.componentName = this.TABS_DATA[tabTarget.index].componentName;
+ this.componentName = this.TABS_DATA[tabTarget.index].componentName;
+
},
changeTable(index) {
this.componentName = this.TABS_DATA[index].componentName;
this.currentTab = this.TABS_DATA[index].value;
},
- submit() {
- this.$refs.childRef.submit();
+ submit(usedStatus) {
+ this.$refs.childRef.submit(usedStatus);
},
reset() {
this.$refs.childRef.reset();
},
},
mounted() {
- if(this.$route.query.disabled){
- this.disabled = true
+ if (this.$route.query.disabled) {
+ this.disabled = true;
}
- }
+ },
};
</script>
<style scoped>
-
::v-deep .el-tabs__nav-wrap::after {
background-color: rgba(0, 0, 0, 0) !important;
}
diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index 675c7bb..969ae34 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -185,7 +185,7 @@
v-loading="loading"
:data="projectInfoList"
@selection-change="handleSelectionChange"
- height="60vh"
+ height="100%"
sortable="custom"
:show-overflow-tooltip="true">
<el-table-column type="selection" width="55" align="center"/>
--
Gitblit v1.8.0