Merge remote-tracking branch 'origin/master'

luohairen

2024-12-04 6f68dbce42bc7329e3e32a6959995a3a21843cc7

Merge remote-tracking branch 'origin/master'

 src/api/projectProcess/projectProcess.js

@@ -48,6 +48,13 @@
export function getProjectProcessTodo(query) {
  return request({
    url: '/project-process/to_do_task',
    method: 'get',
    params: query
  })
}
export function getDetailByProcessInsId(query) {
  return request({
    url: '/project-process/detail-by-process_ins_id',
    method: 'get',
    params: query
  })

 src/views/components/noticeTable.vue

@@ -24,7 +24,7 @@
      :header-cell-style="{
        background: '#F5F7FC',
        color: '#454B5E',
        fontSize: '12px',
                fontSize: '12px'
      }"
      height="280"
      max-height="280"
@@ -76,7 +76,7 @@
  </div>
</template>
<script>
import { getProjectProcessTodo } from "@/api/projectProcess/projectProcess.js";
import { getProjectProcessTodo, getDetailByProcessInsId } from "@/api/projectProcess/projectProcess.js";
import { getProjectPlanToDoList } from "@/api/projectPlan";
export default {
  data() {
@@ -140,8 +140,8 @@
    countExceptionProjectData: Object,
  },
  created() {
    (this.currentTab = "process"),
      (this.currentTableHeaders = this.processTableHeaders);
        this.currentTab = "process";
        this.currentTableHeaders = this.processTableHeaders;
    this.getList();
  },
  methods: {
@@ -163,8 +163,19 @@
        }
      }
    },
    handleDetail(row) {
        async handleDetail(row) {
      if (this.currentTab == "process") {
                const resp = await getDetailByProcessInsId({ processDefId: row.processDefId, processInsId: row.processInsId });
                if (resp.code === 200 && resp.data.length > 0) {
                    const projectProcess = resp.data[0]
                    this.$router.push({
                        path: '/projectFlow/detail',
                        query: {
                            projectId: projectProcess.projectId,
                            processDefId: row.processDefId
                        }
                    })
                }
      } else {
        row.id = row.planId;
        this.$router.push({
@@ -175,8 +186,19 @@
        });
      }
    },
    handleUpdate(row) {
        async handleUpdate(row) {
      if (this.currentTab == "process") {
                const resp = await getDetailByProcessInsId({ processDefId: row.processDefId, processInsId: row.processInsId });
                if (resp.code === 200 && resp.data.length > 0) {
                    const projectProcess = resp.data[0]
                    this.$router.push({
                        path: '/projectFlow/detail',
                        query: {
                            projectId: projectProcess.projectId,
                            processDefId: row.processDefId
                        }
                    })
                }
      } else {
        row.id = row.planId;
        this.$router.push({

 src/views/projectEngineering/projectLibrary/component/FileDialog.vue

@@ -37,9 +37,9 @@
        </div>
        <div v-else-if="isImportOrExport" class="dialog-content">
          <el-button class="export-button" @click="handleDownloadTargetList">导出目标列表内容</el-button>
          <el-button class="export-button">导出所有列表内容</el-button>
          <el-button class="export-button">导出目标项目详情</el-button>
          <el-button class="export-button">导出所有项目详情</el-button>
          <el-button class="export-button" @click="handleDownloadAllList">导出所有列表内容</el-button>
          <el-button class="export-button" @click="handleDownloadDetailList">导出目标项目详情</el-button>
          <el-button class="export-button" @click="handleDownloadAllList">导出所有项目详情</el-button>
        </div>
      </template>
      <template slot="footer">
@@ -54,8 +54,6 @@
</template>

<script>
import { globalHeaders } from '@/utils/request';
import {getToken} from "@/utils/auth";

export default {
  name: 'FileDialog',
@@ -73,7 +71,13 @@
      default: function () {
        return [];
      }
    },
    dataIdList: {
      type: Array,
      default: function () {
        return [];
    }
    },
  },
  data() {
    return {
@@ -125,6 +129,20 @@
      this.download('project/info/export', {
          ...this.queryParams
        }, `项目库${new Date().getTime()}.xlsx`)
    },
    handleDownloadAllList() {
      this.queryParams.fieldList = this.currentColumns;
      this.queryParams.requireFile = false;
      this.download('project/info/export', {
        ...this.queryParams
      }, `项目库${new Date().getTime()}.xlsx`)
    },
    handleDownloadDetailList() {
      this.queryParams.dataIdList = this.dataIdList
      this.queryParams.requireFile = true;
      this.download('project/info/export', {
        ...this.queryParams
      }, `项目库${new Date().getTime()}.zip`)
    }
  },
  mounted() {

 src/views/projectEngineering/projectLibrary/index.vue

@@ -284,6 +284,7 @@
      :isImportOrExport="isImportOrExport"
      @fileDialogCancel="fileDialogCancel"
      :currentColumns="columns"
      :dataIdList="ids"
    />
  </div>
</template>