From e57e645d24a89adb3391be16f6948b292183fa04 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 11 二月 2025 14:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index 4c29669..8cacff2 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -9,7 +9,7 @@
</el-col>
<el-col :span="6">
<el-form-item class="item" label="椤圭洰浠ｇ爜" label-width="100px" prop="projectCode">
- <el-input v-model.trim="projectForm.projectCode" class="item" clearable disabled maxlength="255"
+ <el-input v-model.trim="projectForm.projectCode" class="item" clearable maxlength="255"
placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
@@ -54,10 +54,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="椤圭洰闃舵" label-width="100px" prop="fundsType" style="width: 100%">
- <el-input v-model.trim="projectForm.projectPhase" class="item" clearable disabled maxlength="255"
- placeholder="璇疯緭鍏�"/>
- </el-form-item>
+<!-- <el-form-item label="椤圭洰闃舵" label-width="100px" prop="fundsType" style="width: 100%">-->
+<!-- <el-input v-model.trim="projectForm.projectPhase" class="item" clearable disabled maxlength="255"-->
+<!-- placeholder="璇疯緭鍏�"/>-->
+<!-- </el-form-item>-->
</el-col>
</el-row>
<el-row :gutter="20">
@@ -78,11 +78,17 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="projectOwnerUnit" style="width: 100%">
- <el-input v-model.trim="projectForm.projectOwnerUnit" class="item" clearable maxlength="255"
- placeholder="璇疯緭鍏�"/>
- </el-form-item>
+ <el-form-item label="椤圭洰闃舵" label-width="100px" prop="fundsType" style="width: 100%">
+ <el-input v-model.trim="projectForm.projectPhase" class="item" clearable disabled maxlength="255"
+ placeholder="璇疯緭鍏�"/>
+ </el-form-item>
</el-col>
+<!-- <el-col :span="6">-->
+<!-- <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="projectOwnerUnit" style="width: 100%">-->
+<!-- <el-input v-model.trim="projectForm.projectOwnerUnit" class="item" clearable maxlength="255"-->
+<!-- placeholder="璇疯緭鍏�"/>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
</el-row>
<el-row :gutter="20">
<el-col :span="6">
@@ -368,7 +374,7 @@
engineeringIdList: [],
content: '',
contact: '',
- projectOwnerUnit: '',
+ projectOwnerUnit: null,
planStartTime: '',
planCompleteTime: '',
projectContactPerson: '',
@@ -378,6 +384,7 @@
yearInvestAmount: '',
competentDepartmentList: [],
managementCentralizationList: [],
+ remark: ''
},
subclass: '',
largeCategory: '',
@@ -421,7 +428,7 @@
if (this.projectForm.id) {
this.getProjectInfo(this.projectForm.id);
} else {
- this.getProjectCodeApi();
+ // this.getProjectCodeApi();
this.$emit('updateIsShow', true);
}
// this.handleLoadMore(1);
--
Gitblit v1.8.0