Merge remote-tracking branch 'origin/master'

fuliqi

2025-02-20 682c1f8e896aeb336bd291bde4c5db6d7570cc26

 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">
@@ -431,7 +430,8 @@
import {addProject, getProject, updateProject, getProjectCode, editProject} from '@/api/projectEngineering/projectInfo';
import {approvalList} from "@/api/system/dept";
import {getByDept} from "@/api/system/user";
import {getChildList} from "@/api/system/dict/data";
import {getChildList, getDicts} from "@/api/system/dict/data";
import log from "@/views/monitor/job/log";

export default {
  name: 'BasicInfo',
@@ -556,8 +556,13 @@
      }
      if (this.projectForm.projectType) {
        // 根据项目类型查子类型
        getChildList(this.dict.type.sys_project_type.filter(item => item.raw.dictValue === this.projectForm.projectType)[0].raw.dictCode).then(res => {
          this.projectSubTypeList = res.data
        getDicts("sys_project_type").then(res => {
          const projectType = res.data.find(item => item.dictValue === this.projectForm.projectType);
          if (projectType) {
            getChildList(projectType.dictCode).then(res => {
              this.projectSubTypeList = res.data
            })
          }
        })
      }
      this.$emit('updateIsShow', true);
@@ -658,8 +663,13 @@
        }
        if (this.projectForm.projectType) {
          // 根据项目类型查子类型
          getChildList(this.dict.type.sys_project_type.filter(item => item.raw.dictValue === this.projectForm.projectType)[0].raw.dictCode).then(res => {
            this.projectSubTypeList = res.data
          getDicts("sys_project_type").then(res => {
            const projectType = res.data.find(item => item.dictValue === this.projectForm.projectType);
            if (projectType) {
              getChildList(projectType.dictCode).then(res => {
                this.projectSubTypeList = res.data
              })
            }
          })
        }
        this.$emit('updateIsShow', true);