guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'pet' into dev

hyx_2024-9-25_tongbu
huangyuxuan 2024-09-06 11:44:41 +08:00
parent 2b54822d58 e6020b5976
commit d0390f864f
11 changed files with 116 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/views/corpInfo/user/components/edit.vue
View File

@ -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'

8
src/views/corpInfo/user/components/list.vue
View File

@ -48,9 +48,11 @@
<el-button v-waves v-if="LOGIN_USER === 'f0c2c728c85446b0b96a370f5f8da38f'" class="filter-item" type="warning" icon="el-icon-bottom-right" size="mini" @click="resetPassword">
一键密码重置
</el-button>
<el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">
导入
</el-button>
<!--导入功能未同步人员中台，暂时屏蔽-->
<!--plain @click="dialogFormDaoru = true"-->
<!-- <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" >-->
<!-- 导入-->
<!-- </el-button>-->
<el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel">
导出
</el-button>

10
src/views/corpInfo/userCenter/components/list.vue
View File

@ -48,9 +48,10 @@
<el-button v-waves v-if="LOGIN_USER === 'f0c2c728c85446b0b96a370f5f8da38f'" class="filter-item" type="warning" icon="el-icon-bottom-right" size="mini" @click="resetPassword">
一键密码重置
</el-button>
<el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">
导入
</el-button>
<!--暂时取消导入功能-->
<!-- <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">-->
<!-- 导入-->
<!-- </el-button>-->
<el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel">
导出
</el-button>
@ -94,7 +95,8 @@
</template>
<el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
<el-button v-show="del && row.ISMAIN=='0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.USER_ID, row.NAME, row.ISPUSH)">删除</el-button>
<el-button v-if="row.ISPUSH == '0' | row.ISPUSH == undefined" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>
<!--暂时隐藏推送功能-->
<!-- <el-button v-if="row.ISPUSH == '0' | row.ISPUSH == undefined" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>-->
</template>
</el-table-column>
</el-table>

2
src/views/safetyenvironmental/archive/components/accept.vue
View File

@ -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,

2
src/views/safetyenvironmental/archive/components/assign.vue
View File

@ -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

2
src/views/safetyenvironmental/archive/components/info.vue
View File

@ -243,7 +243,7 @@ export default {
getData() {
return new Promise((resolve) => {
requestFN(
'/safetyenvironmental/goShow',
'/safetyenvironmental/V2/goShow',
{
INSPECTION_ID: this.$parent.INSPECTION_ID
}

2
src/views/safetyenvironmental/hidden/components/assign.vue
View File

@ -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

2
src/views/safetyenvironmental/inspected/components/list.vue
View File

@ -330,7 +330,7 @@ export default {
hiddenCount(INSPECTION_ID) {
this.listLoading = true
requestFN(
'/safetyenvironmentalexplain/hiddencount',
'/safetyenvironmental/V2/hiddencount',
{
INSPECTION_ID: INSPECTION_ID
}

66
src/views/safetyenvironmental/inspection/components/add.vue
View File

@ -13,6 +13,16 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="是否为相关方" prop="IS_XGF">
<el-radio-group id="IS_XGF" ref="IS_XGF" v-model="form.IS_XGF" @change="getXgfTreeData">
<el-radio :label="'1'" >是</el-radio>
<el-radio :label="'0'" >否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="被检查单位" prop="INSPECTED_DEPARTMENT_ID">
@ -86,7 +96,7 @@
<el-col :span="11">
<el-form-item label="检查人员" prop="INSPECTION_USER_ID">
<el-select v-model="item.INSPECTION_USER_ID" clearable placeholder="请选择检查人员" @change="changeHiddenUserList">
<el-option v-for="data in INSPECTOR_List[index]" :key="data.USER_ID" :label="data.NAME" :value="data.USER_ID" />
<el-option v-for="data in INSPECTED_SITEUSER_List" :key="data.USER_ID" :label="data.NAME" :value="data.USER_ID" />
</el-select>
</el-form-item>
</el-col>
@ -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) => {

2
src/views/safetyenvironmental/inspection/components/info.vue
View File

@ -306,7 +306,7 @@ export default {
getData() {
return new Promise((resolve) => {
requestFN(
'/safetyenvironmental/goShow',
'/safetyenvironmental/V2/goShow',
{
INSPECTION_ID: this.$parent.INSPECTION_ID
}

4
src/views/safetyenvironmental/inspection/components/list.vue
View File

@ -357,7 +357,7 @@ export default {
getList() {
this.listLoading = true
requestFN(
'/safetyenvironmental/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
'/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '&currentPage=' + 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'