diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 3ef1396..8f4e844 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -309,7 +309,6 @@ export default {
}
},
setShowModel(model) {
- console.log("test===========================")
this.$store.dispatch('permission/setShowModel', model)
},
toggleSideBar() {
diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue
index eda6399..2ed7592 100644
--- a/src/views/corpInfo/user/components/edit.vue
+++ b/src/views/corpInfo/user/components/edit.vue
@@ -798,12 +798,12 @@ export default {
{ validator: hasUser, trigger: 'blur' }
],
EMAIL: [
- { required: true, message: '请输入邮箱', trigger: 'blur' },
+ { required: false, message: '请输入邮箱', trigger: 'blur' },
{
pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/,
message: '请输入正确的邮箱'
- },
- { validator: hasEmail, trigger: 'blur' }
+ }
+ // { validator: hasEmail, trigger: 'blur' }
],
PERSON_TYPE: [{ required: true, message: '请选择人员类型', trigger: 'change' }],
ROLE_NAME: [{ required: true, message: '请选择角色组', trigger: 'change' }],
diff --git a/src/views/safetyenvironmental/inspection/components/add.vue b/src/views/safetyenvironmental/inspection/components/add.vue
index 37b6a8e..eccae03 100644
--- a/src/views/safetyenvironmental/inspection/components/add.vue
+++ b/src/views/safetyenvironmental/inspection/components/add.vue
@@ -13,6 +13,16 @@
+
+
+
+
+ 是
+ 否
+
+
+
+
@@ -86,7 +96,7 @@
-
+
@@ -421,7 +431,8 @@ export default {
CONFIRM_MESSAGE_SIGN: '',
CONFIRM_MESSAGE_TIME: '',
situationList: [{ INSPECTION_SITUATION_ID: '', SITUATION: '' }], // 检查情况
- hiddenList: [{ ...this.hiddenForm }] // 隐患信息集合
+ hiddenList: [{ ...this.hiddenForm }], // 隐患信息集合
+ IS_XGF: '' // 是否相关方
},
hiddenCurIndex: -1,
hdFile: [], // 隐患附件
@@ -519,7 +530,7 @@ export default {
this.INSPECTED_SITEUSER_List = []
}
if (newVal != null && newVal != '') {
- this.getUserList(newVal)
+ this.getXgfUserList(newVal)
}
},
immediate: false
@@ -587,8 +598,9 @@ export default {
this.INSPECTOR_List.push([])
},
updateInspecteDept(DEPARTMENT_ID, i) {
- this.form.inspectorList[i].INSPECTION_USER_ID = ''
- this.getInspectorList(DEPARTMENT_ID, i)
+ // this.form.inspectorList[i].INSPECTION_USER_ID = ''
+ // this.getInspectorList(DEPARTMENT_ID, i)
+ this.getXgfUserList(DEPARTMENT_ID)
},
// 获取人员列表
getInspectorList(DEPARTMENT_ID, i) {
@@ -1039,6 +1051,50 @@ export default {
})
})
},
+ // 获取相关方被检查单位数据
+ getXgfTreeData(value) {
+ console.info(value)
+ if (value == '1') {
+ requestFN(
+ '/department/getXgfListTree',
+ {}
+ ).then((data) => {
+ this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+ this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+ }).catch((e) => {
+ })
+ } else {
+ requestFN(
+ '/department/listTree',
+ {}
+ ).then((data) => {
+ this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+ this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+ }).catch((e) => {
+ })
+ }
+ },
+ // 获取相关方被检查单位现场负责人
+ getXgfUserList(DEPARTMENT_ID) {
+ console.info(this.form.IS_XGF)
+ if (this.form.IS_XGF == '1') {
+ requestFN(
+ '/user/xgfListAll',
+ { DEPARTMENT_ID: DEPARTMENT_ID }
+ ).then((data) => {
+ this.INSPECTED_SITEUSER_List = data.userList
+ }).catch((e) => {
+ })
+ } else {
+ requestFN(
+ '/user/listAll',
+ { DEPARTMENT_ID: DEPARTMENT_ID }
+ ).then((data) => {
+ this.INSPECTED_SITEUSER_List = data.userList
+ }).catch((e) => {
+ })
+ }
+ },
// 获取隐患部位 下拉树
getHiddenReginTreeList() {
return new Promise((resolve) => {