Merge remote-tracking branch 'origin/master'

fuliqi

2025-02-20 682c1f8e896aeb336bd291bde4c5db6d7570cc26

 src/views/projectEngineering/projectLibrary/index.vue

@@ -224,6 +224,14 @@
            <template v-if="item.slotName === 'projectType'">
              <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
            </template>
<!--            &lt;!&ndash; projectSubType插槽 &ndash;&gt;-->
<!--            <template v-if="item.slotName === 'projectSubType'">-->
<!--              {{ getProjectSubType(scope.row.projectType, scope.row.projectSubType) }}-->
<!--            </template>-->
            <!-- constructionNature插槽 -->
            <template v-if="item.slotName === 'constructionNature'">
              <dict-tag :options="dict.type.construction_nature" :value="scope.row.constructionNature"/>
            </template>
            <!-- investType插槽 -->
            <template v-if="item.slotName === 'investType'">
              <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
@@ -251,7 +259,7 @@
        <template slot-scope="scope">
          <el-tooltip class="item" effect="dark" content="审核" placement="top">
            <el-button
              v-if="scope.row.auditRole && $route.query.projectCategory==='6'"
              v-if="scope.row.auditRole && $route.query.projectCategory==='6' && scope.row.usedStatus === 1"
              size="medium"
              type="text"
              icon="el-icon-circle-check"
@@ -317,11 +325,12 @@
import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';
import Cookies from "js-cookie";
import {getChildList} from "@/api/system/dict/data";

export default {
  dicts: ['sys_administrative_divisions', 'sys_investment_type', 'sys_project_phases',
    'sys_funding_type', 'sys_association_status', 'sys_project_status', 'sys_project_code',
    'sys_project_tags', 'sys_key_categories', 'sys_project_type','sys_used_status'],
    'sys_project_tags', 'sys_key_categories', 'sys_project_type','sys_used_status', 'construction_nature'],
  name: "ProjectInfo",
  components: {
    FileDialog
@@ -423,6 +432,24 @@
    this.removeStore();
  },
  methods: {
    // async getProjectSubType(projectType, projectSubType) {
    //   if (!projectType || !projectSubType) {
    //     return ''
    //   }
    //   let value = '';
    //   // 根据项目类型查子类型
    //   const projectTypeItem = this.dict.type.sys_project_type.find(item => item.raw.dictValue === projectType);
    //   if (projectTypeItem) {
    //     const res = await getChildList(projectTypeItem.raw.dictCode);
    //     const target = res.data.filter(item => item.dictValue === projectSubType);
    //     if (target && target.length > 0) {
    //       value = target[0].dictLabel;
    //       console.log(value);
    //     }
    //   }
    //   console.log("拿到值了", value);
    //   return value;
    // },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.removeStore();