Merge remote-tracking branch 'origin/master'

xiangpei

2024-11-29 69b01c1de544bdaedfa12aaf13600239dabbcb3c

 src/views/projectManage/plan/planInfoCheck.vue

@@ -7,7 +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;">返回</el-button>
              <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">
@@ -112,13 +112,11 @@
                    <el-input type="textarea" v-model="scope.row.manageApprovalReply" placeholder="请输入" rows="3" />
                  </template>
                </el-table-column>
                <el-table-column fixed="right" label="操作" align="center">
                  <template #default="scope" v-if="!projectInfoData.managerFlag">
                    <el-button size="small" @click="handleReply(scope.$index)">回复</el-button>
                    <el-button size="small" type="danger" @click="handleReset(scope.$index)">重置</el-button>
                  </template>
                  <template v-if="projectInfoData.managerFlag" #default="scope">
                    <el-button size="small" @click="handleSave(scope.$index)">保存</el-button>
                <el-table-column fixed="right" label="操作" align="center" width="200">
                  <template #default="scope">
                    <el-button v-show="!projectInfoData.managerFlag" size="small" @click="handleReply(scope.$index)">回复</el-button>
                    <el-button v-show="!projectInfoData.managerFlag" size="small" type="danger" @click="handleReset(scope.$index)">重置</el-button>
                    <el-button v-show="projectInfoData.managerFlag" size="small" @click="handleSave(scope.$index)">保存</el-button>
                  </template>
                </el-table-column>
              </el-table>
@@ -163,7 +161,7 @@
import { getPlanInfoData, delayPlanInfo, getDepartmentApproval, getPlanLog, replyExamine, saveExamine } from "@/api/projectPlan/index";

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