优化

ruoyi-server/src/main/java/com/ruoyi/server/projectprogress/control/mapper/ProjectProgressControlMapper.java

@@ -58,4 +58,6 @@ public interface ProjectProgressControlMapper
      * @return 结果
      */
     public int deleteProjectProgressControlByControlIds(Long[] controlIds);
+
+    Long getCount();
 }

ruoyi-server/src/main/java/com/ruoyi/server/projectprogress/control/service/impl/ProjectProgressControlServiceImpl.java

@@ -52,6 +52,11 @@ public class ProjectProgressControlServiceImpl implements IProjectProgressContro
     @Override
     public int insertProjectProgressControl(ProjectProgressControl projectProgressControl)
     {
+        Long count = projectProgressControlMapper.getCount();
+        if(projectProgressControl.getProgressId() == null) {
+            projectProgressControl.setProgressId(count + 1);
+        }
+
         return projectProgressControlMapper.insertProjectProgressControl(projectProgressControl);
     }
 

ruoyi-server/src/main/resources/mapper/system/ProjectProgressControlMapper.xml

@@ -33,6 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectProjectProgressControlVo"/>
         where control_id = #{controlId}
     </select>
+    <select id="getCount" resultType="java.lang.Long">
+        select COUNT(*)
+        FROM project_progress_control
+    </select>
 
     <insert id="insertProjectProgressControl" parameterType="ProjectProgressControl" useGeneratedKeys="true" keyProperty="controlId">
         insert into project_progress_control

ruoyi-ui/src/views/projectprogress/control/index.vue

@@ -56,7 +56,7 @@
           v-hasPermi="['projectprogresscontrol:projectprogresscontrol:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -65,7 +65,7 @@
           @click="handleExport"
           v-hasPermi="['projectprogresscontrol:projectprogresscontrol:export']"
         >导出</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -86,13 +86,21 @@
           <dict-tag :options="dict.type.project_proposals_status" :value="scope.row.progressChange"/>
         </template>
       </el-table-column>-->
-      <el-table-column label="是否更改了预计结束日期" align="center" prop="estimatedEndDateChanged" />
+      <el-table-column label="是否更改了预计结束日期" align="center" prop="estimatedEndDateChanged" >
+        <template slot-scope="scope">
+          <span>{{scope.row.estimatedEndDateChanged | getChanged}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="变更后的预计结束日期" align="center" prop="newEstimatedEndDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.newEstimatedEndDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否需要调整后续工作计划" align="center" prop="requiresAdjustment" />
+      <el-table-column label="是否需要调整后续工作计划" align="center" prop="requiresAdjustment" >
+        <template slot-scope="scope">
+          <span>{{scope.row.requiresAdjustment | getRequiresAdjustment}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="需要调整的内容和原因" align="center" prop="adjustmentDescription" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -110,6 +118,12 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['projectprogresscontrol:projectprogresscontrol:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="look(scope.row)"
+          >查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -146,7 +160,10 @@
           <el-input v-model="form.progressChange" placeholder="请输入进度变化" />
         </el-form-item>
         <el-form-item label="是否更改了预计结束日期" prop="estimatedEndDateChanged">
-          <el-input v-model="form.estimatedEndDateChanged" placeholder="请输入是否更改了预计结束日期" />
+          <el-select v-model="queryParams.estimatedEndDateChanged" placeholder="请输入是否更改了预计结束日期" clearable>
+            <el-option label="否" value="0" />
+            <el-option label="是" value="1" />
+          </el-select>
         </el-form-item>
         <el-form-item label="变更后的预计结束日期" prop="newEstimatedEndDate">
           <el-date-picker clearable
@@ -157,7 +174,10 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="是否需要调整后续工作计划" prop="requiresAdjustment">
-          <el-input v-model="form.requiresAdjustment" placeholder="请输入是否需要调整后续工作计划" />
+          <el-select v-model="queryParams.requiresAdjustment" placeholder="请输入是否需要调整后续工作计划" clearable>
+            <el-option label="否" value="0" />
+            <el-option label="是" value="1" />
+          </el-select>
         </el-form-item>
         <el-form-item label="需要调整的内容和原因" prop="adjustmentDescription">
           <el-input v-model="form.adjustmentDescription" type="textarea" placeholder="请输入内容" />
@@ -168,6 +188,49 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!--查看-->
+    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px" disabled=true>
+        <!--        <el-form-item label="项目进程id" prop="progressId">
+                  <el-input v-model="form.progressId" placeholder="请输入项目进程id" />
+                </el-form-item>-->
+        <el-form-item label="录入人" prop="updatedBy">
+          <el-input v-model="form.updatedBy" placeholder="请输入录入人" />
+        </el-form-item>
+        <el-form-item label="录入时间" prop="updateTimestamp">
+          <el-date-picker clearable
+                          v-model="form.updateTimestamp"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择录入时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="说明" prop="updateDescription">
+          <el-input v-model="form.updateDescription" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="进度变化" prop="progressChange">
+          <el-input v-model="form.progressChange" placeholder="请输入进度变化" />
+        </el-form-item>
+        <el-form-item label="是否更改了预计结束日期" prop="estimatedEndDateChanged">
+          <el-input v-model="form.estimatedEndDateChanged" placeholder="请输入是否更改了预计结束日期" />
+        </el-form-item>
+        <el-form-item label="变更后的预计结束日期" prop="newEstimatedEndDate">
+          <el-date-picker clearable
+                          v-model="form.newEstimatedEndDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择变更后的预计结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="是否需要调整后续工作计划" prop="requiresAdjustment">
+          <el-input v-model="form.requiresAdjustment" placeholder="请输入是否需要调整后续工作计划" />
+        </el-form-item>
+        <el-form-item label="需要调整的内容和原因" prop="adjustmentDescription">
+          <el-input v-model="form.adjustmentDescription" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -176,8 +239,28 @@ import { listProjectprogresscontrol, getProjectprogresscontrol, delProjectprogre
 
 export default {
   name: "Projectprogresscontrol",
+  filters: {
+    getChanged(val) {
+      if (val == 1) {
+        return "是";
+      }
+      if (val == 0) {
+        return "否";
+      }
+    },
+    getRequiresAdjustment(val) {
+      if (val == 1) {
+        return "是";
+      }
+      if (val == 0) {
+        return "否";
+      }
+    },
+  },
   data() {
     return {
+      detailOpen: false,
+      detailTitle: '',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -272,6 +355,17 @@ export default {
       this.open = true;
       this.title = "添加项目进度控制";
     },
+    /** 查看 */
+    look(row) {
+      this.reset();
+      const controlId = row.controlId || this.ids
+      getProjectprogresscontrol(controlId).then(response => {
+        this.form = response.data;
+        this.detailOpen = true;
+        this.detailTitle = "查看详情";
+      });
+    },
+
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

ruoyi-ui/src/views/projectprogress/task/index.vue

@@ -49,21 +49,21 @@
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+<!--        <el-button
           type="warning"
           plain
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['projectprogress:projectprogresstask:export']"
-        >导出</el-button>
+        >导出</el-button>-->
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="projectprogresstaskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="taskId" />
+      <el-table-column label="编号" align="center" prop="taskId" />
       <el-table-column label="任务名称" align="center" prop="name" />
       <el-table-column label="任务说明" align="center" prop="description" />
       <el-table-column label="任务状态" align="center" prop="status">
@@ -107,6 +107,12 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['projectprogress:projectprogresstask:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="look(scope.row)"
+          >查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -194,6 +200,75 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!--查看-->
+    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px" disabled=true>
+        <el-form-item label="任务名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入任务名称" />
+        </el-form-item>
+        <el-form-item label="任务说明" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="任务状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in dict.type.project_proposals_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="计划开始时间" prop="plannedStartDate">
+          <el-date-picker clearable
+                          v-model="form.plannedStartDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择计划开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划结束时间" prop="plannedEndDate">
+          <el-date-picker clearable
+                          v-model="form.plannedEndDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择计划结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="实际开始时间" prop="actualStartDate">
+          <el-date-picker clearable
+                          v-model="form.actualStartDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择实际开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="实际结束时间" prop="actualEndDate">
+          <el-date-picker clearable
+                          v-model="form.actualEndDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择实际结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdAt">
+          <el-date-picker clearable
+                          v-model="form.createdAt"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="updatedAt">
+          <el-date-picker clearable
+                          v-model="form.updatedAt"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -205,6 +280,8 @@ export default {
   dicts: ['project_proposals_status'],
   data() {
     return {
+      detailOpen: false,
+      detailTitle: '',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -297,6 +374,15 @@ export default {
       this.title = "添加项目进度明细";
     },
     /** 修改按钮操作 */
+    look(row) {
+      this.reset();
+      const taskId = row.taskId || this.ids
+      getProjectprogresstask(taskId).then(response => {
+        this.form = response.data;
+        this.detailOpen = true;
+        this.detailTitle = "查看详情";
+      });
+    },
     handleUpdate(row) {
       this.reset();
       const taskId = row.taskId || this.ids

ruoyi-ui/src/views/system/project_proposals/index.vue

@@ -90,6 +90,7 @@
     <el-table v-loading="loading" :data="project_proposalsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="${comment}" v-if="false" align="center" prop="id" />
+      <el-table-column label="项目名称" align="center" prop="projectName" />"
       <el-table-column label="项目描述" align="center" prop="projectDescription" />
       <el-table-column label="开始日期" align="center" prop="startDate" width="180">
         <template slot-scope="scope">