Merge remote-tracking branch 'origin/master'

fuliqi

2024-11-29 b768760591c0761bdcc3eda9f85dafa11c072444

Merge remote-tracking branch 'origin/master'

 src/api/projectManage/progress/index.js

@@ -50,6 +50,15 @@
  })
}

// 审批
export function examine(data) {
  return request({
    url: '/api/project-plan-progress-report/examine',
    method: 'post',
    data: data
  })
}

// 保存竣工报告、情况说明附件
export function saveProjectProgressFileLists(data) {
  return request({

 src/views/projectManage/plan/planInfo.vue

@@ -77,7 +77,7 @@
import { getPlanInfoData, addPlanInfo, savePlanInfo } from "@/api/projectPlan/index";

export default {
  name: "PlanInfo",
  name: "planInfo",
  data() {
    return {
      loading: true,

 src/views/projectManage/plan/planInfoCheck.vue

@@ -7,6 +7,7 @@
        <el-card shadow="hover">
          <el-row :gutter="20">
            <el-col :span="24" class="mb-4">
              <el-button type="primary" size="small" @click="handlePlanRecord" style="float: right; margin-bottom: 10px; margin-left: 10px">返回</el-button>
              <!--项目计划项-->
              <el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px">
                <el-table-column prop="index" label="序号" width="50" align="center">
@@ -160,7 +161,7 @@
import { getPlanInfoData, delayPlanInfo, getDepartmentApproval, getPlanLog, replyExamine, saveExamine } from "@/api/projectPlan/index";

export default {
  name: "PlanInfoCheck",
  name: "planInfoCheck",
  data() {
    return {
      loading: true,
@@ -255,7 +256,7 @@
    },
    /** 返回项目计划记录 */
    handlePlanRecord() {
      this.$router.push({
      this.$router.replace({
        path: '/projectManage/planRecord',
        query: {
          data: this.projectInfoData

 src/views/projectManage/progress/progressRecord.vue

@@ -153,6 +153,7 @@
                <el-select v-if="projectInfoData.managerFlag" v-model="progressReportData.departmentExamine" placeholder="请选择" size="small" clearable>
                  <el-option label="同意" :value="0"></el-option>
                  <el-option label="驳回" :value="1"></el-option>
                  <el-option label="请选择" :value="null"></el-option>
                </el-select>
              </el-form-item>
              <el-form-item label="上级批复：" :label-width="formLabelWidth">
@@ -166,6 +167,7 @@
              <el-form-item label="主管部门审核：" :label-width="formLabelWidth">
                <el-input v-if="!projectInfoData.managerFlag" :value="progressReportData.manageExamine === 0 ? '同意' : progressReportData.manageExamine === 1 ? '驳回' : '未审核'" readonly />
                <el-select v-if="projectInfoData.managerFlag" v-model="progressReportData.manageExamine" placeholder="请选择" size="small" clearable>
                  <el-option label="请选择" :value="null"></el-option>
                  <el-option label="同意" :value="0"></el-option>
                  <el-option label="驳回" :value="1"></el-option>
                </el-select>
@@ -181,7 +183,7 @@
            </el-form>
            <div slot="footer" class="dialog-footer">
              <el-button type="primary" @click="handleRecordSubmit" v-if="!checkFlag && !projectInfoData.managerFlag">上 报</el-button>
              <el-button type="primary" @click="handleRecordSubmit" v-if="projectInfoData.managerFlag">审 批</el-button>
              <el-button type="primary" @click="handleExamine" v-if="projectInfoData.managerFlag">审 批</el-button>
              <el-button @click="handleCancel">取 消</el-button>
            </div>
          </el-dialog>
@@ -192,11 +194,11 @@
</template>

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

export default {
  name: "ProgressRecord",
  name: "progressRecord",
  computed: {
    progressRecord() {
      return progressRecord
@@ -258,7 +260,6 @@
      this.dialogFormVisible = true;
      getProgressReport(row.id).then(res => {
        this.progressReportData = res.data;
        console.log(this.progressReportData)
      })
    },
    // 上报提交
@@ -269,6 +270,14 @@
        this.search();
      })
    },
    // 审批
    handleExamine() {
      examine(this.progressReportData).then(res => {
        this.dialogFormVisible = false;
        this.$message.success('审批成功');
        this.search();
      })
    },
    // 查看进度
    handleCheckProgress(row) {
      this.dialogFormVisible = true;