From 3e85b7e7b3ef8dbb6c9381433f2d327678c9017b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
<7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sat, 12 Aug 2023 21:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/project/surProject/index.vue | 32 +-
.../views/project/surProjectSpecial/index.vue | 155 ++++----
.../surProjectSpecialDrawer.vue | 355 ++++++++++++++++++
.../SurProjectWorkSpecialController.java | 21 ++
.../project/domain/SurProjectWorkSpecial.java | 19 +
.../SurProjectWorkSpecialServiceImpl.java | 1 +
.../project/SurProjectWorkSpecialMapper.xml | 28 +-
7 files changed, 523 insertions(+), 88 deletions(-)
create mode 100644 ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue
diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue
index c5bb8773..0755a4d2 100644
--- a/ruoyi-ui/src/views/project/surProject/index.vue
+++ b/ruoyi-ui/src/views/project/surProject/index.vue
@@ -198,17 +198,25 @@
进度管理
修改项目
项目人员
-
- 更多
+
+ 更多操作
季度考核管理
计划节点管理
+ 安全隐患排查
+ 质量隐患排查
专项培训
+ v-hasPermi="['work:workTrain:list']">项目专项培训
应急演练
+ v-hasPermi="['work:emergencyDrill:list']">项目应急演练
+ 项目特种人员
+ 项目出勤记录
删除项目
@@ -461,6 +469,10 @@
size="50%"
:visible.sync="emergencyDrillDrawerVisible"
:form-data="formData">
+
@@ -473,11 +485,12 @@ import AssessDrawer from '../surProjectQuarterlyAssess/assessDrawer.vue'
import buildNodeDrawer from '../surBuildNode/buildNodeDrawer.vue'
import workTrainDrawer from '../../work/workTrain/workTrainDrawer.vue'
import emergencyDrillDrawer from '../../work/emergencyDrill/emergencyDrillDrawer.vue'
+import surProjectSpecialDrawer from '../surProjectSpecial/surProjectSpecialDrawer.vue'
export default {
name: "SurProject",
components:{
- ProjectScheduleDlg,projectUserInfoDrawer,BaiduMap,AssessDrawer,buildNodeDrawer,workTrainDrawer,emergencyDrillDrawer
+ ProjectScheduleDlg,projectUserInfoDrawer,BaiduMap,AssessDrawer,buildNodeDrawer,workTrainDrawer,emergencyDrillDrawer,surProjectSpecialDrawer
},
dicts: ['sys_check_state','sur_project_xmjd', 'project_build_type', 'sys_common_isdel', 'project_category','project_level','sur_project_weight'],
data() {
@@ -485,6 +498,7 @@ export default {
projectUserInfoDrawerVisible: false,
workTrainDrawerVisible: false,
emergencyDrillDrawerVisible: false,
+ projectSpecialDrawerVisible: false,
// 遮罩层
loading: true,
// 选中数组
@@ -693,6 +707,9 @@ export default {
case "handleEmergencyDrill":
this.handleEmergencyDrill(row);
break;
+ case "handleProjectSpecial":
+ this.handleProjectSpecial(row);
+ break;
default:
break;
}
@@ -790,6 +807,11 @@ export default {
this.formData.projectId = row.id;
this.formData.projectName = row.projectName;
this.emergencyDrillDrawerVisible = true;
+ },
+ handleProjectSpecial(row){
+ this.formData.projectId = row.id;
+ this.formData.projectName = row.projectName;
+ this.projectSpecialDrawerVisible = true;
}
}
};
diff --git a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
index a79bef5b..40b4162d 100644
--- a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
@@ -1,31 +1,23 @@
-
+
-
-
-
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
搜索
@@ -63,7 +44,7 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
{{ parseTime(scope.row.credentialExpirationTime, '{y}-{m}-{d}') }}
-
-
-
-
-
@@ -165,23 +142,24 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
@@ -228,7 +196,7 @@ import { listSurProjectSpecial, getSurProjectSpecial, delSurProjectSpecial, addS
export default {
name: "SurProjectSpecial",
- dicts: ['sys_yes_no', 'sys_common_isdel'],
+ dicts: ['sys_yes_no', 'sys_user_sex'],
data() {
return {
// 遮罩层
@@ -261,18 +229,50 @@ export default {
isCredential: null,
credentialExpirationTime: null,
isDel: null,
+ projectDeptId: null
},
+ depts:null,
+ credential: false,
// 表单参数
form: {},
// 表单校验
rules: {
+ name: [
+ { required: true, message: "请输入人员姓名", trigger: "blur" },
+ { maxlength: 20, message: "人员姓名最多20字符", trigger: "blur" }
+ ],
+ sex: [
+ { required: true, message: "请选择人员性别", trigger: "blur" }
+ ],
+ isCredential: [
+ { required: true, message: "请选择是否有证书", trigger: "blur" }
+ ],
+ credentialNumber: [
+ { required: false, message: "请输入证书编号", trigger: "blur" },
+ { maxlength: 50, message: "证书编号最多50字符", trigger: "blur" }
+ ],
+ credentialExpirationTime: [
+ { required: true, message: "请选择证书过期时间", trigger: "blur" }
+ ],
+ remark: [
+ { required: false, message: "请输入备注", trigger: "blur" },
+ { maxlength: 200, message: "备注最多200字符", trigger: "blur" }
+ ]
}
};
},
created() {
this.getList();
+ this.$api.publics.getZgsDeptList().then(d=>{
+ this.depts=d?.data||[];
+ })
},
methods: {
+ // 是否有证书
+ credentialChange(ev){
+ debugger
+ console.log(ev.value);
+ },
/** 查询项目特种人员列表 */
getList() {
this.loading = true;
@@ -343,6 +343,11 @@ export default {
const id = row.id || this.ids
getSurProjectSpecial(id).then(response => {
this.form = response.data;
+ if(this.form.isCredential=="Y"){
+ this.credential = true;
+ }else{
+ this.credential = false;
+ }
this.open = true;
this.title = "修改项目特种人员";
});
diff --git a/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue b/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue
new file mode 100644
index 00000000..b77131b5
--- /dev/null
+++ b/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue
@@ -0,0 +1,355 @@
+
+
+
+
+
+ 添加
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.credentialExpirationTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+