Merge remote-tracking branch 'origin/master'

luohairen

2024-11-27 f67241a72e48a90cbcca28acbc2ce9aaffdfa43d

 src/views/projectEngineering/projectLibrary/index.vue

@@ -203,23 +203,19 @@
          <template v-if="item.slotName">
            <!-- projectStatus插槽 -->
            <template v-if="item.slotName === 'projectStatus'">
              <div class="mx-1">{{ '自定义样式' }}</div>
              <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
            </template>
            <!-- projectColorCode插槽 -->
            <template v-if="item.slotName === 'projectColorCode'">
              <div class="mx-1 has-dot">{{ '自定义样式' }}<span class="dot" style="margin-left: 5px"></span></div>
              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
            </template>
            <!-- projectType插槽 -->
            <template v-if="item.slotName === 'projectType'">
              <div class="mx-1">{{ '自定义样式' }}</div>
              <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
            </template>
            <!-- investType插槽 -->
            <template v-if="item.slotName === 'investType'">
              <div class="mx-1">{{ '自定义样式' }}</div>
            </template>
            <!-- planStartTime插槽 -->
            <template v-if="item.slotName === 'planStartTime'">
              {{ '自定义样式' }}
              <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
            </template>
          </template>
          <!-- 默认显示 -->
@@ -277,7 +273,7 @@
<script>
import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectInfo";
import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
import FileDialog from '@/views/projectEngineering/component/FileDialog';
import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';

export default {
  dicts: ['sys_administrative_divisions', 'sys_investment_type', 'sys_project_phases',
@@ -371,6 +367,10 @@
    this.getList();
  },
  methods: {
    // 新增页面
    add() {
      this.$router.push({ path: '/projectEngineering/project/projectDetails' });
    },
    // 重置排序的方法
    handleResetSort() {
      this.defaultColumns = currentRest.map((item, index) => {
@@ -385,6 +385,8 @@
        item.serialNumber = index + 1
        return item;
      });
      //强制table渲染
      this.tableKey = this.tableKey +1;
    },
    // 更新列的方法
    handleUpdateColumns(row) {