wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity

代码格式化

dev
wangpeng 2024-05-23 16:37:30 +08:00
parent 6c6086a63d
commit 328200bfa6
4 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/request/operation_vehicle.js
View File

@ -100,7 +100,6 @@ export const editOperatingVehicleInfo = (params) =>
export const getOperationVehicleAll = (params) => export const getOperationVehicleAll = (params) =>
upload("/operatingvehicles/operationvehicleList", params); // 修改运营车辆 upload("/operatingvehicles/operationvehicleList", params); // 修改运营车辆
export const getOperationVehicleInfo = (params) => export const getOperationVehicleInfo = (params) =>
post("/operatingvehicles/findById", params); // 根据Id获取运营车辆信息 post("/operatingvehicles/findById", params); // 根据Id获取运营车辆信息

2
src/views/driving_inspections/driving_log/drivingLog_info.vue
View File

@ -117,7 +117,7 @@
<el-tag v-if="item2.STATUS === '0'">合格</el-tag> <el-tag v-if="item2.STATUS === '0'">合格</el-tag>
<el-tag v-else>不合格</el-tag> <el-tag v-else>不合格</el-tag>
</td> </td>
<td> {{item2.REMARK}} </td> <td>{{ item2.REMARK }}</td>
</tr> </tr>
<tr> <tr>
<td class="title">检查人</td> <td class="title">检查人</td>

43
src/views/enterprise_management/user_practitioner/details.vue
View File

@ -1,15 +1,28 @@
<template> <template>
<layout-card> <layout-card>
<div v-if="data.statusInfo.APPLY_TYPE !== '0' && data.statusInfo.APPLY_STATUS !== '0'"> <div
v-if="
data.statusInfo.APPLY_TYPE !== '0' &&
data.statusInfo.APPLY_STATUS !== '0'
"
>
<el-divider content-position="left"> <el-divider content-position="left">
{{data.statusInfo.REVIEW_RESULT === "-1" ? "打回" : "通过"}}详情 {{ data.statusInfo.REVIEW_RESULT === "-1" ? "打回" : "通过" }}详情
</el-divider> </el-divider>
<el-descriptions :column="3" border> <el-descriptions :column="3" border>
<el-descriptions-item label="申请类别"> <el-descriptions-item label="申请类别">
<template v-if="data.statusInfo.APPLY_TYPE === '1'">入职申请</template> <template v-if="data.statusInfo.APPLY_TYPE === '1'"
<template v-else-if="data.statusInfo.APPLY_TYPE === '2'">企业入职</template> >入职申请</template
<template v-else-if="data.statusInfo.APPLY_TYPE === '3'">离职申请</template> >
<template v-else-if="data.statusInfo.APPLY_TYPE === '4'">企业解聘</template> <template v-else-if="data.statusInfo.APPLY_TYPE === '2'"
>企业入职</template
>
<template v-else-if="data.statusInfo.APPLY_TYPE === '3'"
>离职申请</template
>
<template v-else-if="data.statusInfo.APPLY_TYPE === '4'"
>企业解聘</template
>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="备注"> <el-descriptions-item label="备注">
{{ data.statusInfo.REVIEW_COMMENTS }} {{ data.statusInfo.REVIEW_COMMENTS }}
@ -190,7 +203,7 @@ const data = reactive({
info: {}, info: {},
certificateList: [], certificateList: [],
statusInfo: {}, statusInfo: {},
dispose: "" dispose: "",
}); });
const fnGetData = async () => { const fnGetData = async () => {
if (!USER_ID) return; if (!USER_ID) return;
@ -213,14 +226,20 @@ const fnGetData = async () => {
} }
}); });
data.certificateList.forEach((item) => { data.certificateList.forEach((item) => {
if(!item.ALLOW_QUALIFICATION || item.ALLOW_QUALIFICATION.includes("null")) { if (
!item.ALLOW_QUALIFICATION ||
item.ALLOW_QUALIFICATION.includes("null")
) {
item.ALLOW_QUALIFICATION = null; item.ALLOW_QUALIFICATION = null;
} }
}); });
if (data.statusInfo.APPLY_TYPE === "1" || data.statusInfo.APPLY_TYPE === '3') { if (
data.dispose = '审核时间'; data.statusInfo.APPLY_TYPE === "1" ||
}else{ data.statusInfo.APPLY_TYPE === "3"
data.dispose = '确认时间'; ) {
data.dispose = "审核时间";
} else {
data.dispose = "确认时间";
} }
}; };
fnGetData(); fnGetData();

12
src/views/enterprise_management/user_practitioner/edit.vue
View File

@ -743,14 +743,14 @@ const fnHasEmail = async (rule, value, callback) => {
if (value) { if (value) {
const result = await getVerifyDuplicateEmail({ const result = await getVerifyDuplicateEmail({
EMAIL: value, EMAIL: value,
PHONE: data.form.PHONE PHONE: data.form.PHONE,
}); });
if(USER_ID) { if (USER_ID) {
if(result.pd) { if (result.pd) {
if(result.pd.EMAIL === value && result.pd.PHONE === data.form.PHONE) { if (result.pd.EMAIL === value && result.pd.PHONE === data.form.PHONE) {
callback(); callback();
}else callback(new Error("邮箱重复")) } else callback(new Error("邮箱重复"));
}else callback(); } else callback();
} }
} else { } else {
callback(); callback();