From 66bc37c7b134e10bb64830e56c3add71731fea33 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 20 二月 2025 16:55:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/projectEngineering/projectLibrary/component/BasicInfo.vue |   37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index 4a1e250..f4b3578 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -58,19 +58,18 @@
             </el-col>
 
             <el-col :span="6">
-              <el-col :span="6">
-                <el-form-item label="寤鸿鎬ц川" label-width="100px" prop="constructionNature" style="width: 100%; min-width: 260px">
-                  <el-select
-                    v-model="projectForm.constructionNature"
-                    clearable
-                    placeholder="璇烽�夋嫨"
-                    style="width: 100%"
-                  >
-                    <el-option v-for="item in dict.type.construction_nature" :key="item.value" :label="item.label"
-                               :value="item.value"/>
-                  </el-select>
-                </el-form-item>
-              </el-col>
+              <el-form-item label="寤鸿鎬ц川" label-width="100px" prop="constructionNature"
+                            style="width: 100%; min-width: 260px">
+                <el-select
+                  v-model="projectForm.constructionNature"
+                  clearable
+                  placeholder="璇烽�夋嫨"
+                  style="width: 100%"
+                >
+                  <el-option v-for="item in dict.type.construction_nature" :key="item.value" :label="item.label"
+                             :value="item.value"/>
+                </el-select>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
@@ -105,12 +104,12 @@
                           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-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">

--
Gitblit v1.8.0