Merge branch 'dev'

zxl

2025-03-25 6ae0fcef149ddbe614746023a58a3885b3ac4bde

 src/views/projectManage/plan/planInfoCheck.vue

@@ -7,7 +7,6 @@
        <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">
@@ -17,17 +16,31 @@
                </el-table-column>
                <el-table-column prop="taskName" label="事项名称" width="500" align="center">
                  <template #default="scope">
                    <el-input type="textarea" v-model="scope.row.title" placeholder="请输入" rows="3" readonly />
                    <el-input type="textarea" v-model="scope.row.title" placeholder="请输入" rows="3" :readonly="scope.row.planStatus !== 1" />
                  </template>
                </el-table-column>
                <el-table-column prop="startTime" label="计划开始时间" width="160" align="center" >
                  <template #default="scope">
                    <el-date-picker v-model="scope.row.startTime" type="date" placeholder="选择日期" size="small" style="width: 130px" :readonly="projectInfoData.managerFlag"/>
                    <el-date-picker
                      v-model="scope.row.startTime"
                      type="date"
                      placeholder="选择日期"
                      value-format="yyyy-MM-dd HH:mm:ss"
                      size="medium"
                      style="width: 130px"
                      :readonly="projectInfoData.managerFlag"/>
                  </template>
                </el-table-column>
                <el-table-column prop="endTime" label="计划完成时间" width="160" align="center" >
                  <template #default="scope">
                    <el-date-picker v-model="scope.row.endTime" type="date" placeholder="选择日期" size="small" style="width: 130px" :readonly="projectInfoData.managerFlag"  />
                    <el-date-picker
                      v-model="scope.row.endTime"
                      type="date"
                      placeholder="选择日期"
                      value-format="yyyy-MM-dd HH:mm:ss"
                      size="medium"
                      style="width: 130px"
                      :readonly="projectInfoData.managerFlag"  />
                  </template>
                </el-table-column>
                <el-table-column :label="planInfoData.planTimeFlag === 0 ? '月度' : planInfoData.planTimeFlag === 1 ? '季度' : '年度' " align="center">
@@ -45,12 +58,24 @@
                      <div v-if="scope.row.planStatus === 0"></div>
                      <!-- 状态为已驳回 -->
                      <div v-if="scope.row.planStatus === 1">
                        <el-button size="small" @click="handleResubmit(scope.row)">重新上报</el-button>
                        <el-button size="small" type="danger" @click="handleReset(scope.$index)">重置</el-button>
                        <el-button
                          size="medium"
                          type="text"
                          icon="el-icon-upload2"
                          @click="handleResubmit(scope.row)">重新上报</el-button>
                        <el-button
                          size="medium"
                          type="text"
                          icon="el-icon-refresh-left"
                          @click="handleReset(scope.$index)">重置</el-button>
                      </div>
                      <!-- 状态为已通过 -->
                      <div v-if="scope.row.planStatus === 2">
                        <el-button size="small" @click="handleDelay(scope.$index)">延期</el-button>
                        <el-button
                          size="medium"
                          type="text"
                          icon="el-icon-edit"
                          @click="handleDelay(scope.$index)">延期</el-button>
                      </div>
                    </template>
                  </el-table-column>
@@ -89,7 +114,7 @@
                        v-model="scope.row.departmentExamine"
                        :disabled="scope.row.planStatus === 2 || scope.row.planStatus === 1"
                        placeholder="请选择"
                        size="small"
                        size="medium"
                        clearable>
                        <el-option label="同意" :value="0"></el-option>
                        <el-option label="驳回" :value="1"></el-option>
@@ -130,7 +155,7 @@
                        v-model="scope.row.manageExamine"
                        :disabled="scope.row.planStatus === 2 || scope.row.planStatus === 1"
                        placeholder="请选择"
                        size="small"
                        size="medium"
                        clearable>
                        <el-option label="同意" :value="0"></el-option>
                        <el-option label="驳回" :value="1"></el-option>
@@ -167,18 +192,22 @@
                  <template #default="scope">
                    <div v-if="!projectInfoData.managerFlag">
                      <el-button
                        size="small"
                        size="medium"
                        type="text"
                        icon="el-icon-reply"
                        @click="handleReply(scope.$index)"
                        :disabled="scope.row.planStatus === 0">回复</el-button>
                      <el-button
                        size="small"
                        type="danger"
                        size="medium"
                        type="text"
                        icon="el-icon-refresh-left"
                        @click="handleReset(scope.$index)"
                        :disabled="scope.row.planStatus === 0">重置</el-button>
                    </div>
                    <div v-if="projectInfoData.managerFlag">
                      <el-button
                        size="small"
                        size="medium"
                        type="text"
                        @click="handleExamine(scope.$index)"
                        v-if="scope.row.planStatus === 0">审核</el-button>
                    </div>
@@ -266,8 +295,8 @@
    // 获取传递过来的项目计划详情
    getPlanRecordData() {
      // 从查询参数中获取数据
      this.planInfoData = this.$route.query.data
      this.projectInfoData = this.$route.query.projectInfoData
      this.projectInfoData = JSON.parse(this.$route.query.projectInfoData)
      this.planInfoData = JSON.parse(this.$route.query.data)
      this.search();
    },
    // 获取项目计划项
@@ -327,15 +356,6 @@
      this.tableData[index].startTime = '';
      this.tableData[index].endTime = '';
    },
    /** 返回项目计划记录 */
    handlePlanRecord() {
      this.$router.replace({
        path: '/projectManage/planRecord',
        query: {
          data: this.projectInfoData
        }
      })
    }
  },
  created() {
    this.getPlanRecordData();