Merge remote-tracking branch 'origin/master'

xiangpei

2024-11-26 7b618c81e16cd7e8870eb36d6f0090a1658db525

 src/views/projectEngineering/projectLibrary/index.vue

@@ -44,34 +44,24 @@
            <el-button icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
            <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
          </el-form-item>
          <el-popover :visible="popoverValue" :width="500" placement="bottom">
            <template #reference>
              <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" @click="handlePopover"
                         size="small">
                更多筛查条件
                <span style="margin-left: 5px">
                  <el-icon v-if="!popoverValue" class="el-icon-arrow-down"></el-icon>
                  <el-icon v-else-if="popoverValue" class="el-icon-arrow-up"></el-icon>
                </span>
              </el-button>
            </template>
          <el-popover :value="popoverValue" trigger="click" :width="700" placement="bottom">
            <span>筛选条件</span>
            <el-form ref="moreQueryParamsRef" label-width="68px" label-position="right" :model="queryParams">
              <el-row>
                <el-col :span="12">
                  <el-form-item label="项目类型">
                    <el-select v-model="queryParams.projectType" clearable placeholder="请选择" class="select-option"
                    <el-select v-model="queryParams.projectType" clearable placeholder="请选择" class="select-option" @change="handleQuery"
                               size="small">
                      <el-option v-for="items in sys_project_type" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                      <el-option v-for="item in dict.type.sys_project_type" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="重点分类">
                    <el-select v-model="queryParams.importanceType" clearable placeholder="请选择" class="select-option">
                      <el-option v-for="items in sys_key_categories" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                    <el-select v-model="queryParams.importanceType" clearable placeholder="请选择" class="select-option" @change="handleQuery">
                      <el-option v-for="item in dict.type.sys_key_categories" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
@@ -79,18 +69,18 @@
              <el-row>
                <el-col :span="12">
                  <el-form-item label="项目标签">
                    <el-select v-model="queryParams.tag" clearable placeholder="请选择" class="select-option">
                      <el-option v-for="items in sys_project_tags" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                    <el-select v-model="queryParams.tag" clearable placeholder="请选择" class="select-option" @change="handleQuery">
                      <el-option v-for="item in dict.type.sys_project_tags" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="项目状态">
                    <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable
                    <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable @change="handleQuery"
                               placeholder="请选择" class="select-option">
                      <el-option v-for="items in sys_project_status" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                      <el-option v-for="item in dict.type.sys_project_status" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
@@ -98,17 +88,17 @@
              <el-row>
                <el-col :span="12">
                  <el-form-item label="项目码">
                    <el-select v-model="queryParams.projectColorCode" clearable placeholder="请选择" class="select-option">
                      <el-option v-for="items in sys_project_code" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                    <el-select v-model="queryParams.projectColorCode" clearable placeholder="请选择" class="select-option" @change="handleQuery">
                      <el-option v-for="item in dict.type.sys_project_code" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="关联状态">
                    <el-select v-model="queryParams.assignmentStatus" clearable placeholder="请选择" class="select-option">
                      <el-option v-for="items in sys_association_status" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                    <el-select v-model="queryParams.assignmentStatus" clearable placeholder="请选择" class="select-option" @change="handleQuery">
                      <el-option v-for="item in dict.type.sys_association_status" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
@@ -116,17 +106,17 @@
              <el-row>
                <el-col :span="12">
                  <el-form-item label="资金类型">
                    <el-select v-model="queryParams.investmentType" clearable placeholder="请选择" class="select-option">
                      <el-option v-for="items in sys_funding_type" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                    <el-select v-model="queryParams.investmentType" clearable placeholder="请选择" class="select-option" @change="handleQuery">
                      <el-option v-for="item in dict.type.sys_funding_type" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="项目阶段">
                    <el-select v-model="queryParams.projectPhase" clearable placeholder="请选择" class="select-option">
                      <el-option v-for="items in sys_project_phases" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                    <el-select v-model="queryParams.projectPhase" clearable placeholder="请选择" class="select-option" @change="handleQuery">
                      <el-option v-for="item in dict.type.sys_project_phases" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
@@ -134,30 +124,30 @@
              <el-row>
                <el-col :span="12">
                  <el-form-item label="投资类别">
                    <el-select v-model="queryParams.investType" clearable placeholder="请选择" class="select-option">
                      <el-option v-for="items in sys_investment_type" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                    <el-select v-model="queryParams.investType" clearable placeholder="请选择" class="select-option" @change="handleQuery">
                      <el-option v-for="item in dict.type.sys_investment_type" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="行政区划">
                    <el-select v-model="queryParams.area" clearable placeholder="请选择" class="select-option">
                      <el-option v-for="items in sys_administrative_divisions" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                    <el-select v-model="queryParams.area" clearable placeholder="请选择" class="select-option" @change="handleQuery">
                      <el-option v-for="item in dict.type.sys_administrative_divisions" :key="item.value" :label="item.label"
                                 :value="item.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
              </el-row>
              <el-row style="text-align: center">
                <el-col :span="24">
                  <el-form-item label-width="0">
                    <el-button type="primary" @click="handleQuery">确 认</el-button>
                    <el-button @click="closePopover">取 消</el-button>
                  </el-form-item>
                </el-col>
              </el-row>
            </el-form>
            <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff"  slot="reference"
                       size="small">
              更多筛查条件
              <span style="margin-left: 5px">
                  <el-icon v-if="!popoverValue" class="el-icon-arrow-down"></el-icon>
                  <el-icon v-else-if="popoverValue" class="el-icon-arrow-up"></el-icon>
                </span>
            </el-button>
          </el-popover>
        </div>
        <div class="right-section">
@@ -200,42 +190,38 @@
      :show-overflow-tooltip="true">
      <el-table-column type="selection" width="55" align="center"/>
      <!-- 动态列 -->
        <el-table-column
          v-for="item in columns"
          :key="item.id"
          v-if="item.visible"
          :prop="item.id"
          :label="item.label"
          :min-width="item.minWidth"
        >
          <template slot-scope="scope">
            <!-- 使用具名插槽 -->
            <template v-if="item.slotName">
              <!-- projectStatus插槽 -->
              <template v-if="item.slotName === 'projectStatus'">
                <el-text class="mx-1">{{ '自定义样式' }}</el-text>
              </template>
              <!-- projectColorCode插槽 -->
              <template v-if="item.slotName === 'projectColorCode'">
                <el-text class="mx-1 has-dot">{{ '自定义样式' }}<span class="dot" style="margin-left: 5px"></span></el-text>
              </template>
              <!-- projectType插槽 -->
              <template v-if="item.slotName === 'projectType'">
                <el-text class="mx-1">{{ '自定义样式' }}</el-text>
              </template>
              <!-- investType插槽 -->
              <template v-if="item.slotName === 'investType'">
                <el-text class="mx-1">{{ '自定义样式' }}</el-text>
              </template>
              <!-- planStartTime插槽 -->
              <template v-if="item.slotName === 'planStartTime'">
                {{ '自定义样式' }}
              </template>
      <el-table-column
        v-for="item in columns"
        :key="item.id"
        v-if="item.visible"
        :prop="item.id"
        :label="item.label"
        :min-width="item.minWidth"
      >
        <template slot-scope="scope">
          <!-- 使用具名插槽 -->
          <template v-if="item.slotName">
            <!-- projectStatus插槽 -->
            <template v-if="item.slotName === 'projectStatus'">
              <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
            </template>
            <!-- 默认显示 -->
            <span v-else>{{ scope.row[item.id] }}</span>
            <!-- projectColorCode插槽 -->
            <template v-if="item.slotName === 'projectColorCode'">
              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
            </template>
            <!-- projectType插槽 -->
            <template v-if="item.slotName === 'projectType'">
              <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
            </template>
            <!-- investType插槽 -->
            <template v-if="item.slotName === 'investType'">
              <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
            </template>
          </template>
        </el-table-column>
          <!-- 默认显示 -->
          <span v-else>{{ scope.row[item.id] }}</span>
        </template>
      </el-table-column>

      <!-- 操作列 -->
      <el-table-column label="操作" width="140" align="center" >
@@ -286,10 +272,13 @@

<script>
import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectInfo";
import {current, currentRest} from './list';
import FileDialog from '../component/FileDialog';
import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';

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'],
  name: "projectInfo",
  components: {
    FileDialog
@@ -378,6 +367,10 @@
    this.getList();
  },
  methods: {
    // 新增页面
    add() {
      this.$router.push({ path: '/projectEngineering/project/projectDetails' });
    },
    // 重置排序的方法
    handleResetSort() {
      this.defaultColumns = currentRest.map((item, index) => {
@@ -392,6 +385,8 @@
        item.serialNumber = index + 1
        return item;
      });
      //强制table渲染
      this.tableKey = this.tableKey +1;
    },
    // 更新列的方法
    handleUpdateColumns(row) {
@@ -425,11 +420,10 @@
      this.tableLoading = false;
    },
    handlePopover() {
      this.popoverValue.value = !this.popoverValue.value;
      this.popoverValue = true;
    },
    closePopover() {

      this.popoverValue.value = false;
      this.popoverValue = false;
    },
    /** 查询项目管理基础信息列表 */
    getList() {
@@ -565,7 +559,7 @@
</script>
<style lang="scss" scoped>
.select-option {
  width: 140px;
  width: 100%;
}

.slot {