Merge branch 'dev'

zxl

2025-03-25 6ae0fcef149ddbe614746023a58a3885b3ac4bde

 src/views/projectManage/progress/progressRecord.vue

@@ -32,13 +32,35 @@
                    <el-table-column fixed="right" label="操作" align="center">
                      <template slot-scope="scope">
                        <div v-if="!projectInfoData.managerFlag">
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus === 0" @click="handleProgressReport(scope.row)">进度上报</el-button>
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus === 2" @click="handleReportAgain(scope.row)">重新上报</el-button>
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus !== 0" @click="handleCheckProgress(scope.row)">查看</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            v-if="scope.row.progressStatus === 0"
                            @click="handleProgressReport(scope.row)">进度上报</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            v-if="scope.row.progressStatus === 2"
                            @click="handleReportAgain(scope.row)">重新上报</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            icon="el-icon-view"
                            v-if="scope.row.progressStatus !== 0"
                            @click="handleCheckProgress(scope.row)">查看</el-button>
                        </div>
                        <div v-if="projectInfoData.managerFlag">
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus === 1" @click="handleOpenExamine(scope.row)">审核</el-button>
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus === 2 || scope.row.progressStatus === 3" @click="handleCheckProgress(scope.row)">查看</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            v-if="scope.row.progressStatus === 1"
                            @click="handleOpenExamine(scope.row)">审核</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            icon="el-icon-view"
                            v-if="scope.row.progressStatus === 2 || scope.row.progressStatus === 3"
                            @click="handleCheckProgress(scope.row)">查看</el-button>
                        </div>
                      </template>
                    </el-table-column>
@@ -67,12 +89,29 @@
                    <el-table-column fixed="right" label="操作" align="center">
                      <template slot-scope="scope">
                        <div v-if="!projectInfoData.managerFlag">
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus === 0" @click="handleProgressReport(scope.row)">进度上报</el-button>
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus === 2" @click="handleReportAgain(scope.row)">重新上报</el-button>
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus !== 0" @click="handleCheckProgress(scope.row)">查看</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            v-if="scope.row.progressStatus === 0"
                            @click="handleProgressReport(scope.row)">进度上报</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            v-if="scope.row.progressStatus === 2"
                            @click="handleReportAgain(scope.row)">重新上报</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            icon="el-icon-view"
                            v-if="scope.row.progressStatus !== 0"
                            @click="handleCheckProgress(scope.row)">查看</el-button>
                        </div>
                        <div v-if="projectInfoData.managerFlag">
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus === 1" @click="handleOpenExamine(scope.row)">审核</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            v-if="scope.row.progressStatus === 1"
                            @click="handleOpenExamine(scope.row)">审核</el-button>
                        </div>
                      </template>
                    </el-table-column>
@@ -101,12 +140,29 @@
                    <el-table-column fixed="right" label="操作" align="center">
                      <template slot-scope="scope">
                        <div v-if="!projectInfoData.managerFlag">
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus === 0" @click="handleProgressReport(scope.row)">进度上报</el-button>
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus === 2" @click="handleReportAgain(scope.row)">重新上报</el-button>
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus !== 0" @click="handleCheckProgress(scope.row)">查看</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            v-if="scope.row.progressStatus === 0"
                            @click="handleProgressReport(scope.row)">进度上报</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            v-if="scope.row.progressStatus === 2"
                            @click="handleReportAgain(scope.row)">重新上报</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            icon="el-icon-view"
                            v-if="scope.row.progressStatus !== 0"
                            @click="handleCheckProgress(scope.row)">查看</el-button>
                        </div>
                        <div v-if="projectInfoData.managerFlag">
                          <el-button type="primary" size="small" v-if="scope.row.progressStatus === 1" @click="handleOpenExamine(scope.row)">审核</el-button>
                          <el-button
                            type="text"
                            size="medium"
                            v-if="scope.row.progressStatus === 1"
                            @click="handleOpenExamine(scope.row)">审核</el-button>
                        </div>
                      </template>
                    </el-table-column>
@@ -135,152 +191,163 @@
            </div>
          </el-row>

          <el-dialog :title=" dialogFlag === 1 ? '进度查看' : '进度上报' " :visible.sync="dialogFormVisible" custom-class="custom-dialog" :close-on-click-modal="false" @close="handleCancel">
          <el-dialog
            :title=" dialogFlag === 1 ? '进度查看' : '进度上报' "
            :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 />
              </el-form-item>
              <el-form-item label="计划事项：" :label-width="formLabelWidth">
                <el-input v-model="progressReportData.title" readonly />
              </el-form-item>
              <el-form-item label="计划时间：" :label-width="formLabelWidth">
                <el-date-picker v-model="progressReportData.startTime" type="date" placeholder="选择日期" size="small" style="width: 130px" readonly/>
                至
                <el-date-picker v-model="progressReportData.endTime" type="date" placeholder="选择日期" size="small" style="width: 130px" readonly/>
              </el-form-item>
              <el-form-item label="实际完成时间：" :label-width="formLabelWidth">
                <el-date-picker
                  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"/>
                至
                <el-date-picker
                  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"/>
              </el-form-item>
              <el-form-item label="进度情况：" :label-width="formLabelWidth">
                <el-input
                  type="textarea"
                  v-model="progressReportData.progressStatusStr"
                  placeholder="请输入" rows="3"
                  :readonly="projectInfoData.managerFlag || dialogFlag !== 0" />
              </el-form-item>
              <el-form-item 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="projectInfoData.managerFlag || dialogFlag !== 0" />
              </el-form-item>
              <el-form-item label="上级审核：" :label-width="formLabelWidth">
                <div v-if="!projectInfoData.managerFlag">
                  <el-input
                    :value="progressReportData.departmentExamine === 0 ? '同意' : progressReportData.departmentExamine === 1 ? '驳回' : '未审核'"
                    readonly />
                </div>
                <div v-if="projectInfoData.managerFlag">
                  <el-select
                    v-model="progressReportData.departmentExamine"
                    placeholder="请选择"
                    size="small"
                    :disabled="progressReportData.progressStatusInt === 2 || progressReportData.progressStatusInt === 3"
                    clearable>
                    <el-option label="同意" :value="0"></el-option>
                    <el-option label="驳回" :value="1"></el-option>
                    <el-option label="请选择" :value="null"></el-option>
                  </el-select>
                </div>
              </el-form-item>
              <el-form-item label="上级批复：" :label-width="formLabelWidth">
                <div v-if="!projectInfoData.managerFlag">
                  <el-input v-model="progressReportData.departmentApproval" readonly />
                </div>
                <div v-if="projectInfoData.managerFlag">
                  <el-input
                    v-model="progressReportData.departmentApproval"
                    :readonly="progressReportData.progressStatusInt === 2 || progressReportData.progressStatusInt === 3"/>
                </div>
              </el-form-item>
              <el-form-item label="上级批复回复：" :label-width="formLabelWidth">
                <div v-if="!projectInfoData.managerFlag">
                  <el-input
                    type="textarea"
                    v-model="progressReportData.departmentApprovalReply"
                    :readonly="dialogFlag === 0 || progressReportData.progressStatusInt === 1"
                    placeholder="请输入"
                    rows="3" />
                </div>
                <div v-if="projectInfoData.managerFlag">
                  <el-input
                    type="textarea"
                    v-model="progressReportData.departmentApprovalReply"
                    placeholder="请输入"
                    rows="3"
                    readonly/>
                </div>
              </el-form-item>
              <el-form-item label="主管部门审核：" :label-width="formLabelWidth">
                <div v-if="!projectInfoData.managerFlag">
                  <el-input
                    :value="progressReportData.manageExamine === 0 ? '同意' : progressReportData.manageExamine === 1 ? '驳回' : '未审核'"
                    readonly />
                </div>
                <div v-if="projectInfoData.managerFlag">
                  <el-select
                    v-model="progressReportData.manageExamine"
                    placeholder="请选择"
                    size="small"
                    :disabled="progressReportData.progressStatusInt === 2 || progressReportData.progressStatusInt === 3"
                    clearable>
                    <el-option label="请选择" :value="null"></el-option>
                    <el-option label="同意" :value="0"></el-option>
                    <el-option label="驳回" :value="1"></el-option>
                  </el-select>
                </div>
              </el-form-item>
              <el-form-item label="主管部门批复：" :label-width="formLabelWidth">
                <div v-if="!projectInfoData.managerFlag">
                  <el-input
                    v-model="progressReportData.manageApproval"
                    readonly />
                </div>
                <div v-if="projectInfoData.managerFlag">
                  <el-input
                    :readonly="progressReportData.progressStatusInt === 2 || progressReportData.progressStatusInt === 3"
                    v-model="progressReportData.manageApproval" />
                </div>
              </el-form-item>
              <el-form-item label="主管部门批复回复：" :label-width="formLabelWidth">
                <div v-if="!projectInfoData.managerFlag">
                  <el-input
                    type="textarea"
                    v-model="progressReportData.manageApprovalReply"
                    :readonly="dialogFlag === 0 || progressReportData.progressStatusInt === 1"
                    placeholder="请输入"
                    rows="3" />
                </div>
                <div v-if="projectInfoData.managerFlag">
                  <el-input
                    type="textarea"
                    v-model="progressReportData.manageApprovalReply"
                    placeholder="请输入"
                    rows="3"
                    readonly/>
                </div>
              </el-form-item>
              <el-row>
                <el-col :span="12">
                  <el-form-item label="报告期：" :label-width="formLabelWidth">
                    <el-input :value="progressReportData.planTime + (progressReportData.planTimeFlag === 0 ? '月度' : progressReportData.planTimeFlag === 1 ? '季度' : '年度')" readonly />
                  </el-form-item>
                  <el-form-item label="计划事项：" :label-width="formLabelWidth">
                    <el-input v-model="progressReportData.title" readonly />
                  </el-form-item>
                  <el-form-item label="计划时间：" :label-width="formLabelWidth">
                    <el-date-picker v-model="progressReportData.startTime" type="date" placeholder="选择日期" size="medium" style="width: 130px" readonly/>
                    至
                    <el-date-picker v-model="progressReportData.endTime" type="date" placeholder="选择日期" size="medium" style="width: 130px" readonly/>
                  </el-form-item>
                  <el-form-item label="实际完成时间：" :label-width="formLabelWidth">
                    <el-date-picker
                      v-model="progressReportData.actualStartTime"
                      type="date"
                      placeholder="选择日期"
                      value-format="yyyy-MM-dd HH:mm:ss"
                      size="medium"
                      style="width: 130px"
                      :readonly="projectInfoData.managerFlag || dialogFlag !== 0"/>
                    至
                    <el-date-picker
                      v-model="progressReportData.actualEndTime"
                      type="date"
                      placeholder="选择日期"
                      value-format="yyyy-MM-dd HH:mm:ss"
                      size="medium"
                      style="width: 130px"
                      :readonly="projectInfoData.managerFlag || dialogFlag !== 0"/>
                  </el-form-item>
                  <el-form-item label="进度情况：" :label-width="formLabelWidth">
                    <el-input
                      type="textarea"
                      v-model="progressReportData.progressStatusStr"
                      placeholder="请输入" rows="3"
                      :readonly="projectInfoData.managerFlag || dialogFlag !== 0" />
                  </el-form-item>
                  <el-form-item 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="projectInfoData.managerFlag || dialogFlag !== 0" />
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="上级审核：" :label-width="formLabelWidth">
                    <div v-if="!projectInfoData.managerFlag">
                      <el-input
                        :value="progressReportData.departmentExamine === 0 ? '同意' : progressReportData.departmentExamine === 1 ? '驳回' : '未审核'"
                        readonly />
                    </div>
                    <div v-if="projectInfoData.managerFlag">
                      <el-select
                        v-model="progressReportData.departmentExamine"
                        placeholder="请选择"
                        size="medium"
                        :disabled="progressReportData.progressStatusInt === 2 || progressReportData.progressStatusInt === 3"
                        clearable>
                        <el-option label="同意" :value="0"></el-option>
                        <el-option label="驳回" :value="1"></el-option>
                        <el-option label="请选择" :value="null"></el-option>
                      </el-select>
                    </div>
                  </el-form-item>
                  <el-form-item label="上级批复：" :label-width="formLabelWidth">
                    <div v-if="!projectInfoData.managerFlag">
                      <el-input v-model="progressReportData.departmentApproval" readonly />
                    </div>
                    <div v-if="projectInfoData.managerFlag">
                      <el-input
                        v-model="progressReportData.departmentApproval"
                        :readonly="progressReportData.progressStatusInt === 2 || progressReportData.progressStatusInt === 3"/>
                    </div>
                  </el-form-item>
                  <el-form-item label="上级批复回复：" :label-width="formLabelWidth">
                    <div v-if="!projectInfoData.managerFlag">
                      <el-input
                        type="textarea"
                        v-model="progressReportData.departmentApprovalReply"
                        :readonly="dialogFlag === 0 || progressReportData.progressStatusInt === 1"
                        placeholder="请输入"
                        rows="3" />
                    </div>
                    <div v-if="projectInfoData.managerFlag">
                      <el-input
                        type="textarea"
                        v-model="progressReportData.departmentApprovalReply"
                        placeholder="请输入"
                        rows="3"
                        readonly/>
                    </div>
                  </el-form-item>
                  <el-form-item label="主管部门审核：" :label-width="formLabelWidth">
                    <div v-if="!projectInfoData.managerFlag">
                      <el-input
                        :value="progressReportData.manageExamine === 0 ? '同意' : progressReportData.manageExamine === 1 ? '驳回' : '未审核'"
                        readonly />
                    </div>
                    <div v-if="projectInfoData.managerFlag">
                      <el-select
                        v-model="progressReportData.manageExamine"
                        placeholder="请选择"
                        size="medium"
                        :disabled="progressReportData.progressStatusInt === 2 || progressReportData.progressStatusInt === 3"
                        clearable>
                        <el-option label="请选择" :value="null"></el-option>
                        <el-option label="同意" :value="0"></el-option>
                        <el-option label="驳回" :value="1"></el-option>
                      </el-select>
                    </div>
                  </el-form-item>
                  <el-form-item label="主管部门批复：" :label-width="formLabelWidth">
                    <div v-if="!projectInfoData.managerFlag">
                      <el-input
                        v-model="progressReportData.manageApproval"
                        readonly />
                    </div>
                    <div v-if="projectInfoData.managerFlag">
                      <el-input
                        :readonly="progressReportData.progressStatusInt === 2 || progressReportData.progressStatusInt === 3"
                        v-model="progressReportData.manageApproval" />
                    </div>
                  </el-form-item>
                  <el-form-item label="主管部门批复回复：" :label-width="formLabelWidth">
                    <div v-if="!projectInfoData.managerFlag">
                      <el-input
                        type="textarea"
                        v-model="progressReportData.manageApprovalReply"
                        :readonly="dialogFlag === 0 || progressReportData.progressStatusInt === 1"
                        placeholder="请输入"
                        rows="3" />
                    </div>
                    <div v-if="projectInfoData.managerFlag">
                      <el-input
                        type="textarea"
                        v-model="progressReportData.manageApprovalReply"
                        placeholder="请输入"
                        rows="3"
                        readonly/>
                    </div>
                  </el-form-item>
                </el-col>
              </el-row>
            </el-form>
            <div slot="footer" class="dialog-footer">
              <div v-if="!projectInfoData.managerFlag">
@@ -455,7 +522,7 @@
}

.custom-dialog {
  max-height: 70vh; /* 设置最大高度 */
  max-height: 60vh; /* 设置最大高度 */
  overflow-y: auto; /* 允许垂直滚动 */
}
</style>