From 736bee70713084a8d1cca1ed0253d8e177a0d967 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 24 二月 2025 20:47:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'

---
 src/views/projectEngineering/projectLibrary/component/BasicInfo.vue |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index 58ff1e8..0358f9c 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -43,10 +43,19 @@
               </el-form-item>
             </el-col>
           </el-row>
+
+
+
           <el-row :gutter="20">
             <el-col :span="6">
-              <el-form-item label="璧勯噾绫诲瀷" label-width="100px" prop="fundType" style="width: 100%">
-                <el-select v-model="projectForm.fundType" clearable placeholder="璇烽�夋嫨" style="width: 100%">
+              <el-form-item label="璧勯噾绫诲瀷" label-width="100px"  style="width: 100%">
+                <el-select
+                  v-model="projectForm.fundTypeList"
+                  clearable
+                  :multiple="true"
+                  placeholder="璇烽�夋嫨"
+                  style="width: 100%"
+                  collapse-tags>
                   <el-option v-for="item in dict.type.sys_funding_type" :key="item.value" :label="item.label"
                              :value="item.value"/>
                 </el-select>
@@ -230,16 +239,22 @@
             <el-col :span="6">
               <el-form-item label="閲嶇偣鍒嗙被" label-width="100px" style="width: 100%">
                 <el-select
-                  v-model="projectForm.importanceType"
+                  v-model="projectForm.importanceTypeList"
                   clearable
+                  :multiple="true"
                   placeholder="璇烽�夋嫨"
                   style="width: 100%"
+                  collapse-tags
                 >
                   <el-option v-for="item in dict.type.sys_key_categories" :key="item.value" :label="item.label"
                              :value="item.value"/>
                 </el-select>
               </el-form-item>
             </el-col>
+
+
+
+
           </el-row>
           <el-row :gutter="20">
             <el-col :span="6">
@@ -493,9 +508,9 @@
         projectType: '',
         projectSubType: '',
         projectStatus: 'pendding',
-        fundType: '',
+        fundTypeList: [], //璧勯噾绫诲瀷
         investType: '',
-        importanceType: '',
+        importanceTypeList: [], //閲嶇偣鍒嗙被
         projectPhase: '鍌ㄥ瑙勫垝闃舵',
         tag: '',
         competentDepartment: '',
@@ -753,6 +768,7 @@
     },
 
     submit(usedStatus) {
+      console.log((this.projectForm));
       this.$refs["projectForm"].validate(valid => {
         if (valid) {
           this.projectForm.usedStatus = usedStatus;

--
Gitblit v1.8.0