Merge remote-tracking branch 'origin/master'

xiangpei

2024-11-25 1b6b793c2576bf92ba589b821bd160d8386fe91a

 src/views/projectEngineering/projectLibrary/index.vue

@@ -1,6 +1,7 @@
<template>
  <div class="app-container">
    <el-form  :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryParamsRef" size="small" :inline="true" v-show="showSearch"
             label-width="68px">
      <div class="slot">
        <div class="left-section">
          <el-form-item label="项目名称" prop="projectName">
@@ -40,12 +41,13 @@
            </el-date-picker>
          </el-form-item>
          <el-form-item>
            <el-button icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
            <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">
              <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>
@@ -54,106 +56,117 @@
              </el-button>
            </template>
            <span>筛选条件</span>
            <!-- 表单内容 -->
<!--            <el-form ref="queryFormRef" :inline="true" :model="queryForm" class="demo-form-inline">-->
<!--              <el-row>-->
<!--                <el-col :span="12">-->
<!--                  <el-form-item label="项目类型">-->
<!--                    <el-select v-model="queryForm.projectType" clearable placeholder="请选择" style="width: 140px">-->
<!--                      <el-option v-for="items in sys_project_type" :key="items.value" :label="items.label" :value="items.value" />-->
<!--                    </el-select>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--                <el-col :span="12">-->
<!--                  <el-form-item label="重点分类">-->
<!--                    <el-select v-model="queryForm.importanceType" clearable placeholder="请选择" style="width: 140px">-->
<!--                      <el-option v-for="items in sys_key_categories" :key="items.value" :label="items.label" :value="items.value" />-->
<!--                    </el-select>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--              </el-row>-->
<!--              <el-row>-->
<!--                <el-col :span="12">-->
<!--                  <el-form-item label="项目标签">-->
<!--                    <el-select v-model="queryForm.tag" clearable placeholder="请选择" style="width: 140px">-->
<!--                      <el-option v-for="items in sys_project_tags" :key="items.value" :label="items.label" :value="items.value" />-->
<!--                    </el-select>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--                <el-col :span="12">-->
<!--                  <el-form-item label="项目状态">-->
<!--                    <el-select v-model="queryForm.projectStatus" :disabled="isProjectCategory" clearable placeholder="请选择" style="width: 140px">-->
<!--                      <el-option v-for="items in sys_project_status" :key="items.value" :label="items.label" :value="items.value" />-->
<!--                    </el-select>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--              </el-row>-->
<!--              <el-row>-->
<!--                <el-col :span="12">-->
<!--                  <el-form-item label="项目码">-->
<!--                    <el-select v-model="queryForm.projectColorCode" clearable placeholder="请选择" style="width: 140px">-->
<!--                      <el-option v-for="items in sys_project_code" :key="items.value" :label="items.label" :value="items.value" />-->
<!--                    </el-select>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--                <el-col :span="12">-->
<!--                  <el-form-item label="关联状态">-->
<!--                    <el-select v-model="queryForm.assignmentStatus" clearable placeholder="请选择" style="width: 140px">-->
<!--                      <el-option v-for="items in sys_association_status" :key="items.value" :label="items.label" :value="items.value" />-->
<!--                    </el-select>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--              </el-row>-->
<!--              <el-row>-->
<!--                <el-col :span="12">-->
<!--                  <el-form-item label="资金类型">-->
<!--                    <el-select v-model="queryForm.investmentType" clearable placeholder="请选择" style="width: 140px">-->
<!--                      <el-option v-for="items in sys_funding_type" :key="items.value" :label="items.label" :value="items.value" />-->
<!--                    </el-select>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--                <el-col :span="12">-->
<!--                  <el-form-item label="项目阶段">-->
<!--                    <el-select v-model="queryForm.projectPhase" clearable placeholder="请选择" style="width: 140px">-->
<!--                      <el-option v-for="items in sys_project_phases" :key="items.value" :label="items.label" :value="items.value" />-->
<!--                    </el-select>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--              </el-row>-->
<!--              <el-row>-->
<!--                <el-col :span="12">-->
<!--                  <el-form-item label="投资类别">-->
<!--                    <el-select v-model="queryForm.investType" clearable placeholder="请选择" style="width: 140px">-->
<!--                      <el-option v-for="items in sys_investment_type" :key="items.value" :label="items.label" :value="items.value" />-->
<!--                    </el-select>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--                <el-col :span="12">-->
<!--                  <el-form-item label="行政区划">-->
<!--                    <el-select v-model="queryForm.area" clearable placeholder="请选择" style="width: 140px">-->
<!--                      <el-option v-for="items in sys_administrative_divisions" :key="items.value" :label="items.label" :value="items.value" />-->
<!--                    </el-select>-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--              </el-row>-->
<!--              <el-row style="text-align: center">-->
<!--                <el-col :span="24">-->
<!--                  <el-form-item>-->
<!--&lt;!&ndash;                    <el-button type="primary" @click="handleQueryFrom">确 认</el-button>&ndash;&gt;-->
<!--&lt;!&ndash;                    <el-button @click="closePopover">取 消</el-button>&ndash;&gt;-->
<!--                  </el-form-item>-->
<!--                </el-col>-->
<!--              </el-row>-->
<!--            </el-form>-->
            <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"
                               size="small">
                      <el-option v-for="items in sys_project_type" :key="items.value" :label="items.label"
                                 :value="items.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>
                  </el-form-item>
                </el-col>
              </el-row>
              <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>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="项目状态">
                    <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable
                               placeholder="请选择" class="select-option">
                      <el-option v-for="items in sys_project_status" :key="items.value" :label="items.label"
                                 :value="items.value"/>
                    </el-select>
                  </el-form-item>
                </el-col>
              </el-row>
              <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>
                  </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>
                  </el-form-item>
                </el-col>
              </el-row>
              <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>
                  </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>
                  </el-form-item>
                </el-col>
              </el-row>
              <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>
                  </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>
                  </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-popover>
        </div>
        <div class="right-section">
          <div>
            <el-button  @click="handleExport" size="small" >
            <el-button @click="handleExport" size="small">
              <svg-icon icon-class="exportIcon" style="margin-right: 8px"/>
              导出数据
            </el-button>
            <el-button :disabled="isReserve" @click="handleImport" size="small" >
            <el-button :disabled="isReserve" @click="handleImport" size="small">
              <svg-icon icon-class="importIcon" style="margin-right: 8px"/>
              导入数据
            </el-button>
@@ -165,17 +178,26 @@
          </div>
          <VisibilityToolbar
            v-model:showSearch="showSearch"
            :columns="columnList"
            :columns="columns"
            @queryTable="handleQuery"
          ></VisibilityToolbar>
<!--            @update:columns="handleUpdateColumns"-->
<!--            @update:sort="handleUpdateSort"-->
<!--            @update:resetSort="handleResetSort"-->
          <!--            @update:columns="handleUpdateColumns"-->
          <!--            @update:sort="handleUpdateSort"-->
          <!--            @update:resetSort="handleResetSort"-->
        </div>
      </div>
    </el-form>

    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
    <el-table
      style="margin-top: 20px"
      v-loading="loading"
      :data="projectInfoList"
      @selection-change="handleSelectionChange"
      height="60vh"
      :show-overflow-tooltip="true">
      <el-table-column type="selection" width="55" align="center"/>

      <!-- 动态列 -->
      <template v-for="item in columns">
        <el-table-column
          v-if="item.visible"
@@ -184,45 +206,62 @@
          v-bind="item"
          :min-width="item.minWidth"
        >
          <template slot-scope="scope" v-if="item.slotName">
            <slot :name="item.slotName" :scope="scope"></slot>
          <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>
            </template>
            <!-- 默认显示 -->
            <span v-else>{{ scope.row[item.id] }}</span>
          </template>
        </el-table-column>
      </template>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

      <!-- 操作列 -->
      <el-table-column label="操作" width="140" align="center" >
        <template slot-scope="scope">
          <el-button
            size="mini"
            size="medium"
            type="text"
            icon="el-icon-view"
            @click="handleDetail(scope.row)"
          >
          </el-button>
          <el-button
            size="medium"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['code:info:edit']"
          >修改</el-button>
          >
          </el-button>
          <el-button
            size="mini"
            size="medium"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['code:info:remove']"
          >删除</el-button>
          >
          </el-button>
        </template>
      </el-table-column>

      <template #projectStatus="{ scope }">
        <el-text class="mx-1">{{ getProjectStatus(scope.row) }}</el-text>
      </template>
      <template #projectColorCode="{ scope }">
        <el-text class="mx-1 has-dot">{{ '绿' }}<span class="dot" style="margin-left: 5px"></span></el-text>
      </template>
      <template #projectType="{ scope }">
        <el-text class="mx-1">{{ getProjectType(scope.row) }}</el-text>
      </template>
      <template #investType="{ scope }">
        <el-text class="mx-1">{{ getInvesType(scope.row) }}</el-text>
      </template>
      <template #planStartTime="{ scope }">
        {{ scope.row.planStartTime ? scope.row.planStartTime.split('-')[0] + '年' : '' }}
      </template>
    </el-table>

    <pagination
@@ -233,19 +272,29 @@
      @pagination="getList"
    />

    <FileDialog
      :fileDialogVisible.sync="fileDialogVisible"
      :isImportOrExport="isImportOrExport"
      @fileDialogCancel="fileDialogCancel"
      :currentColumns="columns"
    />
  </div>
</template>

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

export default {
  name: "projectInfo",
  components: {
    FileDialog
  },
  data() {
    return {
      //控制显隐的表单
      columnList: [],
      isImportOrExport: false,
      fileDialogVisible: false,
      //是否需要新增按钮(储蓄项目需要)
      isReserve: false,
      //表头
@@ -265,58 +314,40 @@
      // 总条数
      total: 0,
      // 项目管理基础信息表格数据
      infoList: [],
      projectInfoList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      timeRange:[],
      timeRange: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        projectName: null,
        projectCode: null,
        content: null,
        projectType: null,
        projectStatus: null,
        fundType: null,
        investType: null,
        projectPhase: null,
        tag: null,
        competentDepartment: null,
        areaCode: null,
        managementCentralization: null,
        projectApprovalType: null,
        investmentCatalogue: null,
        importanceType: null,
        year: null,
        yearInvestAmount: null,
        createProjectTime: null,
        planStartTime: null,
        planCompleteTime: null,
        winUnit: null,
        winAmount: null,
        winTime: null,
        projectAddress: null,
        longitude: null,
        latitude: null,
        projectOwnerUnit: null,
        projectContactPerson: null,
        contact: null,
        gmtCreateTime: null,
        gmtUpdateTime: null,
        deleted: null
      },
      moreQueryParams: {
        projectType: '', // 项目类型
        importanceType: '', // 重点分类
        projectStatus: '', // 项目状态
        projectColorCode: '', // 项目码
        investmentType: '', // 资金类型
        projectPhase: '', // 项目阶段
        investType: '', // 投资类别
        area: '', // 行政区划
        assignmentStatus: '', //关联状态
        tag: '' //项目标签
      },
      // 表单参数
      form: {},
      // 表单校验
      rules: {
        projectName: [
          { required: true, message: "项目名称不能为空", trigger: "blur" }
          {required: true, message: "项目名称不能为空", trigger: "blur"}
        ],
        projectStatus: [
          { required: true, message: "项目状态  (0未开工，1已开工，2已竣工，3暂停)不能为空", trigger: "change" }
          {required: true, message: "项目状态  (0未开工，1已开工，2已竣工，3暂停)不能为空", trigger: "change"}
        ],
      }
    };
@@ -328,17 +359,32 @@
      item.serialNumber = index + 1;
      return item;
    });
      this.getList();
    this.getList();
  },
  methods: {
    // 关闭文件处理弹框的方法
    fileDialogCancel() {
      this.tableLoading = true;
      this.fileDialogVisible = false;
      // this.getList();
      this.tableLoading = false;
    },
    handlePopover() {
      this.popoverValue.value = !this.popoverValue.value;
    },
    closePopover() {

      this.popoverValue.value = false;
    },
    /** 查询项目管理基础信息列表 */
    getList() {
      this.loading = true;
      // listInfo(this.queryParams).then(response => {
      //   this.infoList = response.rows;
      //   this.total = response.total;
      // });
        this.loading = false;
      console.log("查询")
      listInfo(this.queryParams).then(response => {
        this.projectInfoList = response.data;
        this.total = response.total;
      });
      this.loading = false;
    },
    // 取消按钮
    cancel() {
@@ -399,7 +445,7 @@
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.single = selection.length !== 1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
@@ -441,12 +487,18 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除项目管理基础信息编号为"' + ids + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认删除项目管理基础信息编号为"' + ids + '"的数据项？').then(function () {
        return delInfo(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
      }).catch(() => {
      });
    },
    /** 导入按钮操作 */
    handleImport() {
      this.isImportOrExport = false;
      this.fileDialogVisible = true;
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -458,6 +510,10 @@
};
</script>
<style lang="scss" scoped>
.select-option {
  width: 140px;
}

.slot {
  display: flex;
}
@@ -469,6 +525,7 @@
.right-section {
  display: flex;
  margin-left: auto;

  .add-btn {
    margin: 0 10px;
  }