diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue
index eda6399..7240fca 100644
--- a/src/views/corpInfo/user/components/edit.vue
+++ b/src/views/corpInfo/user/components/edit.vue
@@ -732,27 +732,27 @@ export default {
callback()
})
}
- var hasEmail = (rule, value, callback) => {
- if (value) {
- requestFN(
- '/user/hasEmail',
- {
- EMAIL: value,
- USERNAME: this.form.USERNAME
- }
- ).then((data) => {
- if (data.result == 'success') {
- callback()
- } else {
- callback(new Error('邮箱重复'))
- }
- }).catch((e) => {
-
- })
- } else {
- callback()
- }
- }
+ // var hasEmail = (rule, value, callback) => {
+ // if (value) {
+ // requestFN(
+ // '/user/hasEmail',
+ // {
+ // EMAIL: value,
+ // USERNAME: this.form.USERNAME
+ // }
+ // ).then((data) => {
+ // if (data.result == 'success') {
+ // callback()
+ // } else {
+ // callback(new Error('邮箱重复'))
+ // }
+ // }).catch((e) => {
+ //
+ // })
+ // } else {
+ // callback()
+ // }
+ // }
return {
ISCHECK: false,
dayTime: [],
@@ -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' }],
@@ -811,8 +811,8 @@ export default {
DEPARTMENT_ID: [{ required: true, message: '请选择部门', trigger: 'change' }],
DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
- NATION: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
- SEX: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+ NATION: [{ required: false, trigger: 'blur' }],
+ SEX: [{ required: false, trigger: 'blur' }],
POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }],
@@ -827,7 +827,7 @@ export default {
TITLE: [{ required: true, message: '职称不能为空', trigger: 'blur' }],
DUTIES: [{ required: true, message: '职务不能为空', trigger: 'blur' }],
// /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/
- USER_ID_CARD: [{ required: true, message: '身份证号不能为空', trigger: 'blur' },
+ USER_ID_CARD: [{ required: false, trigger: 'blur' },
{
pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/,
message: '请输入正确的身份证号'
@@ -1055,8 +1055,8 @@ export default {
this.ISCHECK = false
}
} else {
- this.$message.warning('请确认身份证号与手机号后进行校验')
- this.ISCHECK = false
+ // this.$message.warning('请确认身份证号与手机号后进行校验')
+ this.ISCHECK = true
}
},
getScheduleAll() {
@@ -1441,13 +1441,13 @@ export default {
// debugger
// this.uploadImgByZhengshu(this.form.USER_ID) // 保存证书信息
this.$refs.form.validate(valid => {
- if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) {
- this.$message({
- message: '请上传人脸照片',
- type: 'error'
- })
- return false
- }
+ // if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) {
+ // this.$message({
+ // message: '请上传人脸照片',
+ // type: 'error'
+ // })
+ // return false
+ // }
let isUpdateFace = '0'
if (this.$refs.uploadUserAvatar.uploadFiles.length > 0) {
isUpdateFace = '1'
diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue
index 059f7ea..5cf7dbb 100644
--- a/src/views/corpInfo/user/components/list.vue
+++ b/src/views/corpInfo/user/components/list.vue
@@ -48,9 +48,11 @@
一键密码重置
-
- 导入
-
+
+
+
+
+
导出
diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue
index d67d29e..5902be6 100644
--- a/src/views/corpInfo/userCenter/components/list.vue
+++ b/src/views/corpInfo/userCenter/components/list.vue
@@ -48,9 +48,10 @@
一键密码重置
-
- 导入
-
+
+
+
+
导出
@@ -94,7 +95,8 @@
编辑
删除
- 推送
+
+
diff --git a/src/views/safetyenvironmental/archive/components/accept.vue b/src/views/safetyenvironmental/archive/components/accept.vue
index ee6fcf1..a2ec907 100644
--- a/src/views/safetyenvironmental/archive/components/accept.vue
+++ b/src/views/safetyenvironmental/archive/components/accept.vue
@@ -595,7 +595,7 @@ export default {
this.$refs.form.validate(valid => {
if (valid) {
requestFN(
- '/hidden/finalcheck',
+ '/safetyenvironmental/V2/finalcheck',
{
HIDDEN_ID: this.HIDDEN_ID,
FINAL_CHECKDESCR: this.form.FINAL_CHECKDESCR,
diff --git a/src/views/safetyenvironmental/archive/components/assign.vue b/src/views/safetyenvironmental/archive/components/assign.vue
index 8cbbb66..aaceb36 100644
--- a/src/views/safetyenvironmental/archive/components/assign.vue
+++ b/src/views/safetyenvironmental/archive/components/assign.vue
@@ -340,7 +340,7 @@ export default {
})
this.listLoading = true
requestFN(
- '/hidden/assign',
+ '/safetyenvironmental/V2/assign',
{ ...this.form,
HIDDEN_STATUS: this.$parent.HIDDEN_STATUS,
INSPECTION_ID: this.$parent.INSPECTION_ID
diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue
index cdc7b26..c0c30af 100644
--- a/src/views/safetyenvironmental/archive/components/info.vue
+++ b/src/views/safetyenvironmental/archive/components/info.vue
@@ -243,7 +243,7 @@ export default {
getData() {
return new Promise((resolve) => {
requestFN(
- '/safetyenvironmental/goShow',
+ '/safetyenvironmental/V2/goShow',
{
INSPECTION_ID: this.$parent.INSPECTION_ID
}
diff --git a/src/views/safetyenvironmental/hidden/components/assign.vue b/src/views/safetyenvironmental/hidden/components/assign.vue
index 78a49c1..53728ea 100644
--- a/src/views/safetyenvironmental/hidden/components/assign.vue
+++ b/src/views/safetyenvironmental/hidden/components/assign.vue
@@ -436,7 +436,7 @@ export default {
})
this.listLoading = true
requestFN(
- '/hidden/assign',
+ '/safetyenvironmental/V2/assign',
{ ...this.form,
HIDDEN_STATUS: this.$parent.HIDDEN_STATUS,
INSPECTION_ID: this.$parent.INSPECTION_ID
diff --git a/src/views/safetyenvironmental/inspected/components/list.vue b/src/views/safetyenvironmental/inspected/components/list.vue
index 2427552..a2dfef5 100644
--- a/src/views/safetyenvironmental/inspected/components/list.vue
+++ b/src/views/safetyenvironmental/inspected/components/list.vue
@@ -330,7 +330,7 @@ export default {
hiddenCount(INSPECTION_ID) {
this.listLoading = true
requestFN(
- '/safetyenvironmentalexplain/hiddencount',
+ '/safetyenvironmental/V2/hiddencount',
{
INSPECTION_ID: INSPECTION_ID
}
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) => {
diff --git a/src/views/safetyenvironmental/inspection/components/info.vue b/src/views/safetyenvironmental/inspection/components/info.vue
index 2414b31..a0d65fd 100644
--- a/src/views/safetyenvironmental/inspection/components/info.vue
+++ b/src/views/safetyenvironmental/inspection/components/info.vue
@@ -306,7 +306,7 @@ export default {
getData() {
return new Promise((resolve) => {
requestFN(
- '/safetyenvironmental/goShow',
+ '/safetyenvironmental/V2/goShow',
{
INSPECTION_ID: this.$parent.INSPECTION_ID
}
diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue
index 7d38400..01382bb 100644
--- a/src/views/safetyenvironmental/inspection/components/list.vue
+++ b/src/views/safetyenvironmental/inspection/components/list.vue
@@ -357,7 +357,7 @@ export default {
getList() {
this.listLoading = true
requestFN(
- '/safetyenvironmental/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
+ '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
{
...this.search,
INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
@@ -471,7 +471,7 @@ export default {
}).then(() => {
this.listLoading = true
requestFN(
- '/safetyenvironmental/hide',
+ '/safetyenvironmental/V2/hide',
{
INSPECTION_ID: id,
hide: '1'