Merge remote-tracking branch 'origin/master'

fuliqi

2024-11-29 d2eaa00bbee1fb2d081a8767d888efe77186cb7e

 src/views/projectManage/progress/progressRecord.vue

@@ -1,8 +1,8 @@
<template>
  <div class="app-container">
    <el-container>
      <el-header v-show="planRecordData && planRecordData.projectName" class="header-title">项目名称：{{ planRecordData.projectName }}</el-header>
      <h4 v-show="planRecordData && planRecordData.projectCode" style="text-align: center">项目代码：{{ planRecordData.projectCode }}</h4>
      <el-header v-show="projectInfoData && projectInfoData.projectName" class="header-title">项目名称：{{ projectInfoData.projectName }}</el-header>
      <h4 v-show="projectInfoData && projectInfoData.projectCode" style="text-align: center">项目代码：{{ projectInfoData.projectCode }}</h4>
      <el-main>
        <el-card shadow="hover">
          <el-row :gutter="20">
@@ -97,35 +97,26 @@
            </el-col>
            <div style="margin-bottom: 10px">
              <h1 style="font-size: 20px; font-weight: bold;">竣工报告</h1>
              <div style="display: flex; justify-content: center; align-items: center;">
                <el-upload
                    class="upload-demo"
                    drag
                    action="https://jsonplaceholder.typicode.com/posts/"
                    multiple>
                  <i class="el-icon-upload"></i>
                  <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                  <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
                </el-upload>
              <div style="display: flex;margin-left: 20px;">
                <file-upload v-model="projectProgressForm.completedReportFileList"
                             :fileType="projectProgressForm.accept"
                             :isShowTip="false"/>
              </div>
            </div>
            <div style="margin-bottom: 10px">
              <h1 style="font-size: 20px; font-weight: bold;">情况说明</h1>
              <div style="display: flex; justify-content: center; align-items: center;">
                <el-upload
                    class="upload-demo"
                    drag
                    action="https://jsonplaceholder.typicode.com/posts/"
                    multiple>
                  <i class="el-icon-upload"></i>
                  <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                  <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
                </el-upload>
              <div style="display: flex;margin-left: 20px;">
                <file-upload v-model="projectProgressForm.situationDescriptionFileList"
                             :fileType="projectProgressForm.accept"
                             :isShowTip="false"/>
              </div>
            </div>
            <div style="display: flex; justify-content: center; align-items: center; margin-top: 20px;">
              <el-button type="primary" @click="handleSave">保 存</el-button>
            </div>
          </el-row>

          <el-dialog :title=" checkFlag ? '进度查看' : '进度上报' " :visible.sync="dialogFormVisible" custom-class="custom-dialog">
          <el-dialog :title=" checkFlag ? '进度查看' : '进度上报' " :visible.sync="dialogFormVisible" custom-class="custom-dialog" :close-on-click-modal="false" @close="handleCancel">
            <el-form :model="progressReportData">
              <el-form-item label="报告期：" :label-width="formLabelWidth">
                <el-input :value="progressReportData.planTime + (progressReportData.planTimeFlag === 0 ? '月度' : progressReportData.planTimeFlag === 1 ? '季度' : '年度')" readonly />
@@ -146,17 +137,10 @@
              <el-form-item label="进度情况：" :label-width="formLabelWidth">
                <el-input type="textarea" v-model="progressReportData.progressStatus" placeholder="请输入" rows="3" :readonly="checkFlag" />
              </el-form-item>
              <el-form-item label="工程进度附件：" :label-width="formLabelWidth">
                <el-upload
                    class="upload-demo"
                    drag
                    action="https://jsonplaceholder.typicode.com/posts/"
                    multiple
                    :disabled="checkFlag" >
                  <i class="el-icon-upload"></i>
                  <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                  <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
                </el-upload>
              <el-form-item prop="fileList" label="工程进度附件：" :label-width="formLabelWidth">
                <file-upload v-model="progressReportData.fileList"
                             :fileType="accept"
                             :isShowTip="false"/>
              </el-form-item>
              <el-form-item label="截止本报告完成投资：" :label-width="formLabelWidth">
                <el-input v-model="progressReportData.actualInvest" type="number" :readonly="checkFlag" />
@@ -182,7 +166,7 @@
            </el-form>
            <div slot="footer" class="dialog-footer">
              <el-button type="primary" @click="handleRecordSubmit" v-if="!checkFlag">上 报</el-button>
              <el-button @click="dialogFormVisible = false">取 消</el-button>
              <el-button @click="handleCancel">取 消</el-button>
            </div>
          </el-dialog>
        </el-card>
@@ -192,14 +176,20 @@
</template>

<script>
import { getProgressInfoList, getProgressReport, recordSubmit } from "@/api/projectManage/progress/index";
import { getProgressInfoList, getProgressReport, recordSubmit, saveProjectProgressFileLists, getProjectProgressForm } from "@/api/projectManage/progress/index";
import progressRecord from "./progressRecord.vue";

export default {
  name: "progressRecord",
  name: "ProgressRecord",
  computed: {
    progressRecord() {
      return progressRecord
    }
  },
  data() {
    return {
      // 接收传递过来的项目计划数据
      planRecordData: {},
      projectInfoData: {},
      monthProgress: [],
      seasonProgress: [],
      yearProgress: [],
@@ -209,20 +199,37 @@
      // 查看显示
      checkFlag: false,
      progressReportData: {},
      formLabelWidth: '150px'
      formLabelWidth: '150px',

      // 竣工报告、情况说明附件
      projectProgressForm: {
        completedReportFileList: [],
        situationDescriptionFileList: [],
        projectReportId: null,
        accept: ['pdf'],
      },

      // 进度上报附件类型
      accept: ['pdf','jpg','mp4'],
    }
  },
  methods: {
    search() {
      this.getPlanRecordData()
      this.getProjectInfoData()
      this.getProjectProgressForm(this.projectInfoData.id);
    },
    // 获取传递过来的项目计划详情
    getPlanRecordData() {
    getProjectInfoData() {
      // 从查询参数中获取数据
      if (this.$route.query.data) {
        this.planRecordData = JSON.parse(this.$route.query.data);
        this.getProgressInfoList(this.planRecordData.id);
        this.projectInfoData = JSON.parse(this.$route.query.data);
        this.getProgressInfoList(this.projectInfoData.id);
      }
    },
    getProjectProgressForm(id) {
      getProjectProgressForm(id).then(res => {
        this.projectProgressForm = res.data;
      })
    },
    // 获取项目进度计划项
    getProgressInfoList(id) {
@@ -254,6 +261,20 @@
      getProgressReport(row.id).then(res => {
        this.progressReportData = res.data;
      })
    },
    // 关闭弹窗
    handleCancel() {
      this.dialogFormVisible = false;
      this.checkFlag = false;
    },
    // 保存
    handleSave() {
      this.projectProgressForm.projectReportId = this.projectInfoData.id;
      // 判断文件不为空
        saveProjectProgressFileLists(this.projectProgressForm).then(res => {
          this.$message.success('保存成功');
          this.search();
        })
    }
  },
  created() {