diff --git a/ruoyi-server/src/main/java/com/ruoyi/server/projectprogress/control/mapper/ProjectProgressControlMapper.java b/ruoyi-server/src/main/java/com/ruoyi/server/projectprogress/control/mapper/ProjectProgressControlMapper.java
index ff1fc6d..8d3b1db 100644
--- a/ruoyi-server/src/main/java/com/ruoyi/server/projectprogress/control/mapper/ProjectProgressControlMapper.java
+++ b/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();
}
diff --git a/ruoyi-server/src/main/java/com/ruoyi/server/projectprogress/control/service/impl/ProjectProgressControlServiceImpl.java b/ruoyi-server/src/main/java/com/ruoyi/server/projectprogress/control/service/impl/ProjectProgressControlServiceImpl.java
index 7142eaa..bc4f880 100644
--- a/ruoyi-server/src/main/java/com/ruoyi/server/projectprogress/control/service/impl/ProjectProgressControlServiceImpl.java
+++ b/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);
}
diff --git a/ruoyi-server/src/main/resources/mapper/system/ProjectProgressControlMapper.xml b/ruoyi-server/src/main/resources/mapper/system/ProjectProgressControlMapper.xml
index adcaf73..a038fa0 100644
--- a/ruoyi-server/src/main/resources/mapper/system/ProjectProgressControlMapper.xml
+++ b/ruoyi-server/src/main/resources/mapper/system/ProjectProgressControlMapper.xml
@@ -33,6 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where control_id = #{controlId}
+
insert into project_progress_control
diff --git a/ruoyi-ui/src/views/projectprogress/control/index.vue b/ruoyi-ui/src/views/projectprogress/control/index.vue
index 9eecb48..f7b6287 100644
--- a/ruoyi-ui/src/views/projectprogress/control/index.vue
+++ b/ruoyi-ui/src/views/projectprogress/control/index.vue
@@ -56,7 +56,7 @@
v-hasPermi="['projectprogresscontrol:projectprogresscontrol:remove']"
>删除
-
+
@@ -86,13 +86,21 @@
-->
-
+
+
+ {{scope.row.estimatedEndDateChanged | getChanged}}
+
+
{{ parseTime(scope.row.newEstimatedEndDate, '{y}-{m}-{d}') }}
-
+
+
+ {{scope.row.requiresAdjustment | getRequiresAdjustment}}
+
+
@@ -110,6 +118,12 @@
@click="handleDelete(scope.row)"
v-hasPermi="['projectprogresscontrol:projectprogresscontrol:remove']"
>删除
+ 查看
@@ -146,7 +160,10 @@
-
+
+
+
+
-
+
+
+
+
@@ -168,6 +188,49 @@
取 消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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();
diff --git a/ruoyi-ui/src/views/projectprogress/task/index.vue b/ruoyi-ui/src/views/projectprogress/task/index.vue
index 6e98a5b..27bcd05 100644
--- a/ruoyi-ui/src/views/projectprogress/task/index.vue
+++ b/ruoyi-ui/src/views/projectprogress/task/index.vue
@@ -49,21 +49,21 @@
>删除
- 导出
+ >导出-->
-
+
@@ -107,6 +107,12 @@
@click="handleDelete(scope.row)"
v-hasPermi="['projectprogress:projectprogresstask:remove']"
>删除
+ 查看
@@ -194,6 +200,75 @@
取 消
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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
diff --git a/ruoyi-ui/src/views/system/project_proposals/index.vue b/ruoyi-ui/src/views/system/project_proposals/index.vue
index 0e65e2f..ba00ada 100644
--- a/ruoyi-ui/src/views/system/project_proposals/index.vue
+++ b/ruoyi-ui/src/views/system/project_proposals/index.vue
@@ -90,6 +90,7 @@
+ "