bug
luohairen
2024-12-10 b87174cde67aaa8420ea492af9b79fcc9a692036
bug
6个文件已修改
339 ■■■■■ 已修改文件
src/views/projectManage/plan/index.vue 128 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/projectManage/plan/planInfo.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/projectManage/plan/planInfoCheck.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/projectManage/plan/planRecord.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/projectManage/progress/index.vue 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/projectManage/progress/progressRecord.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/projectManage/plan/index.vue
@@ -23,30 +23,22 @@
          <el-option label="未上报" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="审批状态" prop="reportStatus">
        <el-select placeholder="请选择状态" clearable>
          <el-option label="已审批" value="0"></el-option>
          <el-option label="未审批" value="1"></el-option>
      <el-form-item label="年度" prop="reportStatus">
        <el-select v-model="queryParams.yearStatus" @change="handleQuery" placeholder="请选择年度" clearable>
          <el-option label="已上报" value="0"></el-option>
          <el-option label="未上报" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="项目年限" prop="reportStatus">
        <el-select placeholder="下拉选择" clearable>
          <el-option label="2024" value="2024"></el-option>
          <el-option label="2025" value="2025"></el-option>
      <el-form-item label="季度" prop="reportStatus">
        <el-select v-model="queryParams.seasonStatus" @change="handleQuery" placeholder="请选择季度" clearable>
          <el-option label="已上报" value="0"></el-option>
          <el-option label="未上报" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="项目月度" prop="reportStatus">
        <el-select placeholder="下拉选择" clearable>
          <el-option label="1月度" value="1"></el-option>
          <el-option label="2月度" value="2"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="项目季度" prop="reportStatus">
        <el-select placeholder="下拉选择" clearable>
          <el-option label="1季度" value="1"></el-option>
          <el-option label="2季度" value="2"></el-option>
          <el-option label="3季度" value="3"></el-option>
          <el-option label="4季度" value="4"></el-option>
      <el-form-item label="月度" prop="reportStatus">
        <el-select v-model="queryParams.monthStatus" @change="handleQuery" placeholder="请选择月度" clearable>
          <el-option label="已上报" value="0"></el-option>
          <el-option label="未上报" value="1"></el-option>
        </el-select>
      </el-form-item>
    </el-form>
@@ -56,16 +48,7 @@
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          icon="el-icon-search"
          size="mini"
          @click="handleQuery"
        >查询</el-button>
@@ -74,7 +57,7 @@
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          icon="el-icon-refresh"
          size="mini"
          @click="handleReset"
        >重置</el-button>
@@ -91,32 +74,14 @@
          {{ scope.row.reportStatus === 0 ? '已上报' : '未上报' }}
        </template>
      </el-table-column>
      <el-table-column label="项目码" align="center" prop="" />
      <el-table-column label="项目码" align="center" prop="projectColorCode">
        <template slot-scope="scope">
          <el-tag type="success" v-if="scope.row.projectColorCode === 'green'">绿</el-tag>
        </template>
      </el-table-column>
      <el-table-column label="项目代码" align="center" prop="projectCode" />
      <el-table-column label="项目类型" align="center" prop="projectType" >
        <template slot-scope="scope">
          {{
            scope.row.projectType === 0 ? '房屋建筑' :
              scope.row.projectType === 1 ? '城市基础设施' :
                scope.row.projectType === 2 ? '交通运输' :
                  scope.row.projectType === 3 ? '水利' :
                    scope.row.projectType === 4 ? '能源' :
                      scope.row.projectType === 5 ? '非煤矿山' :
                        scope.row.projectType === 6 ? '其他' : '未知'
          }}
        </template>
      </el-table-column>
      <el-table-column label="项目阶段" align="center" prop="projectPhase" >
        <template slot-scope="scope">
          {{
            scope.row.projectPhase === 0 ? '储备规划阶段' :
              scope.row.projectPhase === 1 ? '项目前期阶段' :
                scope.row.projectPhase === 2 ? '实施阶段' :
                  scope.row.projectPhase === 3 ? '竣工投用阶段' :
                    '未知'
          }}
        </template>
      </el-table-column>
      <el-table-column label="项目类型" align="center" prop="projectType" />
      <el-table-column label="项目阶段" align="center" prop="projectPhase" />
      <el-table-column label="月度" align="center" prop="monthStatus" >
        <template slot-scope="scope">
          {{ scope.row.monthStatus === 0 ? '已上报' : '未上报' }}
@@ -132,24 +97,14 @@
          {{ scope.row.yearStatus === 0 ? '已上报' : '未上报' }}
        </template>
      </el-table-column>
      <el-table-column label="项目状态" align="center" prop="projectStatus" >
        <template slot-scope="scope">
          {{
            scope.row.projectStatus === 0 ? '未开工' :
              scope.row.projectStatus === 1 ? '已开工' :
                scope.row.projectStatus === 2 ? '已竣工' :
                  scope.row.projectStatus === 3 ? '暂停' :
                    '未知状态'
          }}
        </template>
      </el-table-column>
      <el-table-column label="项目状态" align="center" prop="projectStatus" />
      <el-table-column label="投资类别" align="center" prop="investType" >
        <template slot-scope="scope">
          {{
            scope.row.investType === 0 ? '企业投资' :
              scope.row.investType === 1 ? '政府投资' :
                scope.row.investType === 2 ? '外商投资' :
                  scope.row.investType === 3 ? '境外投资' :
            scope.row.investType === 'enterprise_investment' ? '企业投资' :
              scope.row.investType === 'government_investment' ? '政府投资' :
                scope.row.investType === 'foreign_investment' ? '外商投资' :
                  scope.row.investType === 'abroad_investment' ? '境外投资' :
                    '未知类型'
          }}
        </template>
@@ -161,19 +116,7 @@
            type="text"
            icon="el-icon-edit"
            @click="handlePlanRecord(scope.row)"
          >查看</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
          >删除</el-button>
          >编辑</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -181,7 +124,7 @@
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :page.sync="queryParams.currentPage"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
@@ -217,7 +160,7 @@
      open: false,
      // 查询参数
      queryParams: {
        pageNum: 1,
        currentPage: 1,
        pageSize: 10,
      },
      // 表单参数
@@ -297,10 +240,21 @@
        this.$router.push({
          path: '/projectManage/planRecord',
          query: {
            data: row
            id: row.id,
            projectName: row.projectName,
            projectCode: row.projectCode,
            managerFlag: row.managerFlag
          }
        })
      })
    },
    /** 重置按钮 */
    handleReset() {
      this.queryParams = {
        currentPage: 1,
        pageSize: 10,
      }
      this.getList();
    }
  }
};
src/views/projectManage/plan/planInfo.vue
@@ -101,7 +101,9 @@
      }
    }
  },
  created() {
    this.getProjectInfoData();
  },
  methods: {
    // 页面加载
    search() {
@@ -111,7 +113,12 @@
    getProjectInfoData() {
      // 从查询参数中获取数据
      this.projectInfoData = this.$route.query.projectInfoData
      this.planInfoData = this.$route.query.data
      this.planInfoData.id = this.$route.query.id;
      this.planInfoData.projectName = this.$route.query.projectName;
      this.planInfoData.projectCode = this.$route.query.projectCode;
      this.planInfoData.planTime = this.$route.query.planTime;
      this.planInfoData.planTimeFlag = this.$route.query.planTimeFlag;
      this.planInfoData.managerFlag = this.$route.query.managerFlag;
      this.search();
    },
    // 获取项目计划项
@@ -179,9 +186,6 @@
        }
      })
    }
  },
  created() {
    this.getProjectInfoData();
  },
};
</script>
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">
@@ -22,12 +21,26 @@
                </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="small"
                      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="small"
                      style="width: 130px"
                      :readonly="projectInfoData.managerFlag"  />
                  </template>
                </el-table-column>
                <el-table-column :label="planInfoData.planTimeFlag === 0 ? '月度' : planInfoData.planTimeFlag === 1 ? '季度' : '年度' " align="center">
@@ -266,8 +279,13 @@
    // 获取传递过来的项目计划详情
    getPlanRecordData() {
      // 从查询参数中获取数据
      this.planInfoData = this.$route.query.data
      this.projectInfoData = this.$route.query.projectInfoData
      this.planInfoData.id = this.$route.query.id;
      this.planInfoData.projectName = this.$route.query.projectName;
      this.planInfoData.projectCode = this.$route.query.projectCode;
      this.planInfoData.planTime = this.$route.query.planTime;
      this.planInfoData.planTimeFlag = this.$route.query.planTimeFlag;
      this.planInfoData.managerFlag = this.$route.query.managerFlag;
      this.search();
    },
    // 获取项目计划项
src/views/projectManage/plan/planRecord.vue
@@ -126,16 +126,22 @@
      yearRecords: [],
    }
  },
  created() {
    this.getProjectInfoData();
  },
  methods: {
    // 页面加载
    search() {
      this.getPlanRecordData(this.projectInfoData.id);
      console.log(this.projectInfoData);
    },
    // 获取传递过来的项目计划详情
    getProjectInfoData() {
      // 从查询参数中获取数据
      this.projectInfoData = this.$route.query.data
      this.projectInfoData.id = this.$route.query.id;
      this.projectInfoData.projectName = this.$route.query.projectName;
      this.projectInfoData.projectCode = this.$route.query.projectCode;
      this.projectInfoData.managerFlag = this.$route.query.managerFlag;
      // 获取项目计划记录数据
      this.search();
    },
    // 获取项目计划记录数据
@@ -207,7 +213,12 @@
      this.$router.push({
        path: '/projectManage/planInfo',
        query: {
          data: row,
          id: row.id,
          projectName: row.projectName,
          projectCode: row.projectCode,
          planTime: row.planTime,
          planTimeFlag: row.planTimeFlag,
          managerFlag: row.managerFlag,
          projectInfoData: this.projectInfoData
        }
      })
@@ -223,14 +234,16 @@
      this.$router.push({
        path: '/projectManage/planInfoCheck',
        query: {
          data: row,
          id: row.id,
          projectName: row.projectName,
          projectCode: row.projectCode,
          planTime: row.planTime,
          planTimeFlag: row.planTimeFlag,
          managerFlag: row.managerFlag,
          projectInfoData: this.projectInfoData
        }
      })
    }
  },
  created() {
    this.getProjectInfoData();
  },
};
</script>
src/views/projectManage/progress/index.vue
@@ -23,30 +23,22 @@
          <el-option label="未上报" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="审批状态" prop="reportStatus">
        <el-select placeholder="请选择状态" clearable>
          <el-option label="已审批" value="0"></el-option>
          <el-option label="未审批" value="1"></el-option>
      <el-form-item label="年度" prop="reportStatus">
        <el-select v-model="queryParams.yearStatus" @change="handleQuery" placeholder="请选择年度" clearable>
          <el-option label="已上报" value="0"></el-option>
          <el-option label="未上报" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="项目年限" prop="reportStatus">
        <el-select placeholder="下拉选择" clearable>
          <el-option label="2024" value="2024"></el-option>
          <el-option label="2025" value="2025"></el-option>
      <el-form-item label="季度" prop="reportStatus">
        <el-select v-model="queryParams.seasonStatus" @change="handleQuery" placeholder="请选择季度" clearable>
          <el-option label="已上报" value="0"></el-option>
          <el-option label="未上报" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="项目月度" prop="reportStatus">
        <el-select placeholder="下拉选择" clearable>
          <el-option label="1月度" value="1"></el-option>
          <el-option label="2月度" value="2"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="项目季度" prop="reportStatus">
        <el-select placeholder="下拉选择" clearable>
          <el-option label="1季度" value="1"></el-option>
          <el-option label="2季度" value="2"></el-option>
          <el-option label="3季度" value="3"></el-option>
          <el-option label="4季度" value="4"></el-option>
      <el-form-item label="月度" prop="reportStatus">
        <el-select v-model="queryParams.monthStatus" @change="handleQuery" placeholder="请选择月度" clearable>
          <el-option label="已上报" value="0"></el-option>
          <el-option label="未上报" value="1"></el-option>
        </el-select>
      </el-form-item>
    </el-form>
@@ -56,16 +48,7 @@
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          icon="el-icon-search"
          size="mini"
          @click="handleQuery"
        >查询</el-button>
@@ -74,7 +57,7 @@
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          icon="el-icon-refresh"
          size="mini"
          @click="handleReset"
        >重置</el-button>
@@ -91,32 +74,14 @@
          {{ scope.row.reportStatus === 0 ? '已上报' : '未上报' }}
        </template>
      </el-table-column>
      <el-table-column label="项目码" align="center" prop="" />
      <el-table-column label="项目码" align="center" prop="projectColorCode">
        <template slot-scope="scope">
          <el-tag type="success" v-if="scope.row.projectColorCode === 'green'">绿</el-tag>
        </template>
      </el-table-column>
      <el-table-column label="项目代码" align="center" prop="projectCode" />
      <el-table-column label="项目类型" align="center" prop="projectType" >
        <template slot-scope="scope">
          {{
            scope.row.projectType === 0 ? '房屋建筑' :
              scope.row.projectType === 1 ? '城市基础设施' :
                scope.row.projectType === 2 ? '交通运输' :
                  scope.row.projectType === 3 ? '水利' :
                    scope.row.projectType === 4 ? '能源' :
                      scope.row.projectType === 5 ? '非煤矿山' :
                        scope.row.projectType === 6 ? '其他' : '未知'
          }}
        </template>
      </el-table-column>
      <el-table-column label="项目阶段" align="center" prop="projectPhase" >
        <template slot-scope="scope">
          {{
            scope.row.projectPhase === 0 ? '储备规划阶段' :
              scope.row.projectPhase === 1 ? '项目前期阶段' :
                scope.row.projectPhase === 2 ? '实施阶段' :
                  scope.row.projectPhase === 3 ? '竣工投用阶段' :
                    '未知'
          }}
        </template>
      </el-table-column>
      <el-table-column label="项目类型" align="center" prop="projectType" />
      <el-table-column label="项目阶段" align="center" prop="projectPhase" />
      <el-table-column label="月度" align="center" prop="monthStatus" >
        <template slot-scope="scope">
          {{ scope.row.monthStatus === 0 ? '已上报' : '未上报' }}
@@ -132,24 +97,14 @@
          {{ scope.row.yearStatus === 0 ? '已上报' : '未上报' }}
        </template>
      </el-table-column>
      <el-table-column label="项目状态" align="center" prop="projectStatus" >
        <template slot-scope="scope">
          {{
            scope.row.projectStatus === 0 ? '未开工' :
              scope.row.projectStatus === 1 ? '已开工' :
                scope.row.projectStatus === 2 ? '已竣工' :
                  scope.row.projectStatus === 3 ? '暂停' :
                    '未知状态'
          }}
        </template>
      </el-table-column>
      <el-table-column label="项目状态" align="center" prop="projectStatus" />
      <el-table-column label="投资类别" align="center" prop="investType" >
        <template slot-scope="scope">
          {{
            scope.row.investType === 0 ? '企业投资' :
              scope.row.investType === 1 ? '政府投资' :
                scope.row.investType === 2 ? '外商投资' :
                  scope.row.investType === 3 ? '境外投资' :
            scope.row.investType === 'enterprise_investment' ? '企业投资' :
              scope.row.investType === 'government_investment' ? '政府投资' :
                scope.row.investType === 'foreign_investment' ? '外商投资' :
                  scope.row.investType === 'abroad_investment' ? '境外投资' :
                    '未知类型'
          }}
        </template>
@@ -161,19 +116,7 @@
            type="text"
            icon="el-icon-edit"
            @click="handlePlanRecord(scope.row)"
          >查看</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
          >删除</el-button>
          >编辑</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -181,7 +124,7 @@
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :page.sync="queryParams.currentPage"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
@@ -215,7 +158,7 @@
      open: false,
      // 查询参数
      queryParams: {
        pageNum: 1,
        currentPage: 1,
        pageSize: 10,
      },
      // 表单参数
@@ -296,10 +239,22 @@
        this.$router.push({
          path: '/projectManage/progressRecord',
          query: {
            data: row
            data: JSON.stringify(row),
            // id: row.id,
            // projectName: row.projectName,
            // projectCode: row.projectCode,
            // managerFlag: row.managerFlag
          }
        })
      })
    },
    /** 重置按钮 */
    handleReset() {
      this.queryParams = {
        currentPage: 1,
        pageSize: 10,
      }
      this.getList();
    }
  }
};
src/views/projectManage/progress/progressRecord.vue
@@ -153,6 +153,7 @@
                  v-model="progressReportData.actualStartTime"
                  type="date"
                  placeholder="选择日期"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  size="small"
                  style="width: 130px"
                  :readonly="projectInfoData.managerFlag || dialogFlag !== 0"/>
@@ -161,6 +162,7 @@
                  v-model="progressReportData.actualEndTime"
                  type="date"
                  placeholder="选择日期"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  size="small"
                  style="width: 130px"
                  :readonly="projectInfoData.managerFlag || dialogFlag !== 0"/>
@@ -339,15 +341,19 @@
      accept: ['pdf','jpg','mp4'],
    }
  },
  created() {
    this.getProjectInfoData()
  },
  methods: {
    search() {
      this.getProjectProgressForm(this.projectInfoData.id);
      this.getProgressInfoList(this.projectInfoData.id);
      this.progressReportData = {};
    },
    // 获取传递过来的项目计划详情
    getProjectInfoData() {
      // 从查询参数中获取数据
        this.projectInfoData = this.$route.query.data;
        this.projectInfoData = JSON.parse(this.$route.query.data);
        this.search();
    },
    getProjectProgressForm(id) {
@@ -391,7 +397,7 @@
    // 回复
    handleReply() {
      reply(this.progressReportData).then(res => {
        // this.dialogFormVisible = false;
        this.dialogFormVisible = false;
        this.$message.success('回复成功');
        this.search();
      })
@@ -425,6 +431,7 @@
      this.dialogFormVisible = false;
      this.isShowReplyBtn = true;
      this.dialogFlag = 0;
      this.progressReportData = {};
    },
    // 保存
    handleSave() {
@@ -436,9 +443,7 @@
        })
    }
  },
  created() {
    this.getProjectInfoData()
  },
};
</script>