Merge remote-tracking branch 'origin/master'

xiangpei

2025-02-20 66bc37c7b134e10bb64830e56c3add71731fea33

Merge remote-tracking branch 'origin/master'

 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">