代码格式化

dev
wangpeng 2024-06-14 13:01:08 +08:00
parent 3420e2b965
commit b622567973
23 changed files with 76 additions and 68 deletions

View File

@ -186,7 +186,6 @@ const data = reactive({
const fnGetData = async () => { const fnGetData = async () => {
const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID }); const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID });
data.info = resData.pd; data.info = resData.pd;
console.log(data.info);
data.commitmentList = resData.commitmentList; data.commitmentList = resData.commitmentList;
}; };
fnGetData(); fnGetData();

View File

@ -410,9 +410,7 @@ const rules = {
PRACTITIONER: [ PRACTITIONER: [
{ required: true, message: "请选择从业人员", trigger: "change" }, { required: true, message: "请选择从业人员", trigger: "change" },
], ],
DEPARTMENT_ID: [ DEPARTMENT_ID: [{ required: true, message: "请选择部门", trigger: "change" }],
{ required: true, message: "请选择部门", trigger: "change"}
]
}; };
const data = reactive({ const data = reactive({
@ -504,7 +502,9 @@ const changeCONFIRMINGPERSON = (contactPersonId) => {
const fnGetUnitsList = async () => { const fnGetUnitsList = async () => {
const resData = await getUserPersonTypeListAll({}); const resData = await getUserPersonTypeListAll({});
data.userTypeList = resData.userList; data.userTypeList = resData.userList;
data.userTypeList = data.userTypeList.filter(( item ) => item.APPLY_STATUS === '1') data.userTypeList = data.userTypeList.filter(
(item) => item.APPLY_STATUS === "1"
);
}; };
fnGetUnitsList(); fnGetUnitsList();

View File

@ -177,7 +177,8 @@
<layout-import-file <layout-import-file
v-model:visible="data.importDialogVisible" v-model:visible="data.importDialogVisible"
template-url="/template/truckExcelTemplate.xls" template-url="/template/truckExcelTemplate.xls"
@submit="fnSubmitImport"></layout-import-file> @submit="fnSubmitImport"
></layout-import-file>
</div> </div>
</template> </template>

View File

@ -108,16 +108,16 @@
class="ml-10" class="ml-10"
/> />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "住址"> <el-descriptions-item label="住址">
{{ data.idCard.ID_ADDRESS }} {{ data.idCard.ID_ADDRESS }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "证件号码"> <el-descriptions-item label="证件号码">
{{ data.idCard.ID_NO }} {{ data.idCard.ID_NO }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "签发机关"> <el-descriptions-item label="签发机关">
{{ data.idCard.ID_ORGAN }} {{ data.idCard.ID_ORGAN }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "有效期"> <el-descriptions-item label="有效期">
{{ data.idCard.ID_VALIDITY_START + "至" + data.idCard.ID_VALIDITY_END }} {{ data.idCard.ID_VALIDITY_START + "至" + data.idCard.ID_VALIDITY_END }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@ -133,17 +133,21 @@
class="ml-10" class="ml-10"
/> />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "证件号码"> <el-descriptions-item label="证件号码">
{{ data.drivingLicence.ID_NO }} {{ data.drivingLicence.ID_NO }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "准驾车型"> <el-descriptions-item label="准驾车型">
{{ data.drivingLicence.ALLOW_QUALIFICATION }} {{ data.drivingLicence.ALLOW_QUALIFICATION }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "签发机关"> <el-descriptions-item label="签发机关">
{{ data.drivingLicence.ID_ORGAN }} {{ data.drivingLicence.ID_ORGAN }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "有效期"> <el-descriptions-item label="有效期">
{{ data.drivingLicence.ID_VALIDITY_START + "至" + data.drivingLicence.ID_VALIDITY_END }} {{
data.drivingLicence.ID_VALIDITY_START +
"至" +
data.drivingLicence.ID_VALIDITY_END
}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-divider content-position="left">道路运输从业资格证</el-divider> <el-divider content-position="left">道路运输从业资格证</el-divider>
@ -158,20 +162,24 @@
class="ml-10" class="ml-10"
/> />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "证件号码"> <el-descriptions-item label="证件号码">
{{ data.qualificationCertificate.ID_NO }} {{ data.qualificationCertificate.ID_NO }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "从业资格类别"> <el-descriptions-item label="从业资格类别">
{{ data.qualificationCertificate.ALLOW_QUALIFICATION }} {{ data.qualificationCertificate.ALLOW_QUALIFICATION }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "签发机关"> <el-descriptions-item label="签发机关">
{{ data.qualificationCertificate.ID_ORGAN }} {{ data.qualificationCertificate.ID_ORGAN }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label = "有效期"> <el-descriptions-item label="有效期">
{{ data.qualificationCertificate.ID_VALIDITY_START + "至" + data.qualificationCertificate.ID_VALIDITY_END }} {{
data.qualificationCertificate.ID_VALIDITY_START +
"至" +
data.qualificationCertificate.ID_VALIDITY_END
}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<!-- <div v-for="(item, index) in data.certificateList" :key="index"> <!-- <div v-for="(item, index) in data.certificateList" :key="index">
<el-divider content-position="left"> <el-divider content-position="left">
{{ {{
item.CERTIFICATE_CATEGORY === "1" item.CERTIFICATE_CATEGORY === "1"
@ -291,7 +299,7 @@ const data = reactive({
dispose: "", dispose: "",
idCard: [], idCard: [],
drivingLicence: [], drivingLicence: [],
qualificationCertificate: [] qualificationCertificate: [],
}); });
const fnGetData = async () => { const fnGetData = async () => {
if (!USER_ID) return; if (!USER_ID) return;
@ -321,16 +329,15 @@ const fnGetData = async () => {
item.ALLOW_QUALIFICATION = null; item.ALLOW_QUALIFICATION = null;
} }
}); });
data.certificateList.forEach(( item ) => { data.certificateList.forEach((item) => {
if(item.CERTIFICATE_CATEGORY === '1') { if (item.CERTIFICATE_CATEGORY === "1") {
data.idCard = item; data.idCard = item;
}else if(item.CERTIFICATE_CATEGORY === '2') { } else if (item.CERTIFICATE_CATEGORY === "2") {
data.drivingLicence = item data.drivingLicence = item;
}else if(item.CERTIFICATE_CATEGORY === '3') { } else if (item.CERTIFICATE_CATEGORY === "3") {
data.qualificationCertificate = item data.qualificationCertificate = item;
} }
}) });
console.log("1111",data.certificateList);
if ( if (
data.statusInfo.APPLY_TYPE === "1" || data.statusInfo.APPLY_TYPE === "1" ||
data.statusInfo.APPLY_TYPE === "3" data.statusInfo.APPLY_TYPE === "3"

View File

@ -16,7 +16,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="完成状态" prop="COMPLETIONSTATUS"> <el-form-item label="完成状态" prop="COMPLETIONSTATUS">
<el-select v-model="searchForm.COMPLETIONSTATUS" clearable> <el-select v-model="searchForm.COMPLETIONSTATUS" clearable>
<el-option label="已上传" :value="1" /> <el-option label="已上传" :value="1" />

View File

@ -16,7 +16,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="完成状态" prop="COMPLETIONSTATUS"> <el-form-item label="完成状态" prop="COMPLETIONSTATUS">
<el-select v-model="searchForm.COMPLETIONSTATUS" clearable> <el-select v-model="searchForm.COMPLETIONSTATUS" clearable>
<el-option label="已上传" :value="1" /> <el-option label="已上传" :value="1" />

View File

@ -411,8 +411,8 @@ const form = ref({
}); });
const info = ref({}); const info = ref({});
const fnEditVehicleModel = async () => { const fnEditVehicleModel = async () => {
form.value.NOW_OWNERS = ''; form.value.NOW_OWNERS = "";
form.value.NOW_OWNERS_NUMBER = ''; form.value.NOW_OWNERS_NUMBER = "";
form.value.VEHICLE_PLATE_NUMBER = null; form.value.VEHICLE_PLATE_NUMBER = null;
form.value.VEHICLE = {}; form.value.VEHICLE = {};
if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") { if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") {
@ -424,8 +424,8 @@ const fnEditVehicleModel = async () => {
} }
}; };
const fnGetVehicleInfo = async () => { const fnGetVehicleInfo = async () => {
form.value.NOW_OWNERS = ''; form.value.NOW_OWNERS = "";
form.value.NOW_OWNERS_NUMBER = ''; form.value.NOW_OWNERS_NUMBER = "";
if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") { if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") {
for (let i = 0; i < form.value.OPERATIONVEHICLELIST.length; i++) { for (let i = 0; i < form.value.OPERATIONVEHICLELIST.length; i++) {
if ( if (

View File

@ -556,7 +556,7 @@ const data = reactive({
const fnGetLevels = async () => { const fnGetLevels = async () => {
const { value: degreeOfEducationList } = await layoutFnGetDegreeOfEducation(); const { value: degreeOfEducationList } = await layoutFnGetDegreeOfEducation();
data.degreeOfEducationList = degreeOfEducationList; data.degreeOfEducationList = degreeOfEducationList;
} };
fnGetLevels(); fnGetLevels();
onMounted(() => { onMounted(() => {

View File

@ -570,7 +570,7 @@ onMounted(() => {
const fnGetLevels = async () => { const fnGetLevels = async () => {
const { value: degreeOfEducationList } = await layoutFnGetDegreeOfEducation(); const { value: degreeOfEducationList } = await layoutFnGetDegreeOfEducation();
data.degreeOfEducationList = degreeOfEducationList; data.degreeOfEducationList = degreeOfEducationList;
} };
fnGetLevels(); fnGetLevels();

View File

@ -320,7 +320,7 @@ const getRemiderDate = (val) => {
const getUserList = async () => { const getUserList = async () => {
const resData = await getUserPersonTypeListAll({}); const resData = await getUserPersonTypeListAll({});
data.userList = resData.userList; data.userList = resData.userList;
data.userList = data.userList.filter(( item ) => item.APPLY_STATUS === '1') data.userList = data.userList.filter((item) => item.APPLY_STATUS === "1");
}; };
getUserList(); getUserList();
const getVehicle = async (event) => { const getVehicle = async (event) => {

View File

@ -15,7 +15,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="完成状态" prop="COMPLETIONSTATUS"> <el-form-item label="完成状态" prop="COMPLETIONSTATUS">
<el-select v-model="searchForm.COMPLETIONSTATUS"> <el-select v-model="searchForm.COMPLETIONSTATUS">
<el-option label="已上传" :value="1" /> <el-option label="已上传" :value="1" />
@ -56,7 +56,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="MANAGEMENTAGREEMENTNAME" label="名称" /> <el-table-column prop="MANAGEMENTAGREEMENTNAME" label="名称" />
<!-- <el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="80"> <!-- <el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.COMPLETIONSTATUS === '1'"></el-tag> <el-tag v-if="row.COMPLETIONSTATUS === '1'"></el-tag>
<el-tag v-else-if="row.COMPLETIONSTATUS === '0'">未上传</el-tag> <el-tag v-else-if="row.COMPLETIONSTATUS === '0'">未上传</el-tag>

View File

@ -117,9 +117,7 @@ import {
addViolationRegistrationView, addViolationRegistrationView,
editViolationRegistration, editViolationRegistration,
} from "@/request/violation_registration.js"; } from "@/request/violation_registration.js";
import { import { getAllVehicleList } from "@/request/enterprise_management.js";
getAllVehicleList
} from "@/request/enterprise_management.js"
import { getPractitionerSelectList } from "@/request/user_practitioner.js"; import { getPractitionerSelectList } from "@/request/user_practitioner.js";
const router = useRouter(); const router = useRouter();
@ -159,9 +157,8 @@ onMounted(async () => {
const fnGetAllVehicle = async () => { const fnGetAllVehicle = async () => {
const resData = await getAllVehicleList(); const resData = await getAllVehicleList();
data.vehicleList = resData.varList data.vehicleList = resData.varList;
console.log(data.vehicleList); };
}
fnGetAllVehicle(); fnGetAllVehicle();
const fnGetUnitsList = async () => { const fnGetUnitsList = async () => {
@ -184,7 +181,7 @@ const data = reactive({
PENALTYREGISTRANT: "", PENALTYREGISTRANT: "",
fileList: [], fileList: [],
}, },
vehicleList: [] vehicleList: [],
}); });
const fnSubmit = async () => { const fnSubmit = async () => {

View File

@ -16,7 +16,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="完成状态" prop="COMPLETIONSTATUS"> <el-form-item label="完成状态" prop="COMPLETIONSTATUS">
<el-select v-model="searchForm.COMPLETIONSTATUS" clearable> <el-select v-model="searchForm.COMPLETIONSTATUS" clearable>
<el-option label="已上传" :value="1" /> <el-option label="已上传" :value="1" />

View File

@ -100,8 +100,10 @@ const { visible, form } = useVModels(props, emits);
const rules = { const rules = {
file: [{ required: true, message: "请上传附件", trigger: "change" }], file: [{ required: true, message: "请上传附件", trigger: "change" }],
ACTIVITIESNAME: [{ required: true, message: "请输入名称", trigger: "blur" }], ACTIVITIESNAME: [{ required: true, message: "请输入名称", trigger: "blur" }],
EXPIRYDATE: [{ required: true, message: "请选择到期日期", trigger: "change" }], EXPIRYDATE: [
CYCLE: [{ required: true, message: "请选择周期", trigger: "change"}], { required: true, message: "请选择到期日期", trigger: "change" },
],
CYCLE: [{ required: true, message: "请选择周期", trigger: "change" }],
}; };
const operatingCompany = ref(""); const operatingCompany = ref("");

View File

@ -27,7 +27,7 @@
:size="100" :size="100"
/> />
</el-form-item> </el-form-item>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="到期时间" prop="EXPIRYDATE"> <el-form-item label="到期时间" prop="EXPIRYDATE">
<el-date-picker <el-date-picker
v-model="form.EXPIRYDATE" v-model="form.EXPIRYDATE"

View File

@ -66,7 +66,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="有效状态" prop="VALIDSTATUS" width="80"> <!-- <el-table-column label="有效状态" prop="VALIDSTATUS" width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.VALIDSTATUS === '1'" type="success"></el-tag> <el-tag v-if="row.VALIDSTATUS === '1'" type="success"></el-tag>
<el-tag v-else-if="row.VALIDSTATUS === '0'" type="warning" <el-tag v-else-if="row.VALIDSTATUS === '0'" type="warning"

View File

@ -16,7 +16,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="完成状态" prop="COMPLETIONSTATUS"> <el-form-item label="完成状态" prop="COMPLETIONSTATUS">
<el-select v-model="searchForm.COMPLETIONSTATUS" clearable> <el-select v-model="searchForm.COMPLETIONSTATUS" clearable>
<el-option label="已上传" :value="1" /> <el-option label="已上传" :value="1" />

View File

@ -174,9 +174,7 @@ const rules = {
trigger: "blur", trigger: "blur",
}, },
], ],
PERSON: [ PERSON: [{ required: true, message: "请选择人员", trigger: "change" }],
{ required: true, message: "请选择人员", trigger: "change" },
],
}; };
const router = useRouter(); const router = useRouter();

View File

@ -39,7 +39,10 @@
detailItems.realPersonNum detailItems.realPersonNum
}} }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="会议附件" v-if="detailItems.CONFIRM_MESSAGE_SIGN_ROUTE"> <el-descriptions-item
v-if="detailItems.CONFIRM_MESSAGE_SIGN_ROUTE"
label="会议附件"
>
<a <a
:href="VITE_FILE_URL + detailItems.CONFIRM_MESSAGE_SIGN_ROUTE" :href="VITE_FILE_URL + detailItems.CONFIRM_MESSAGE_SIGN_ROUTE"
target="_blank" target="_blank"
@ -47,7 +50,10 @@
>查看会议附件</a >查看会议附件</a
> >
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="会议视频" v-if="detailItems.VIDEO_SIGN_ROUTE"> <el-descriptions-item
v-if="detailItems.VIDEO_SIGN_ROUTE"
label="会议视频"
>
<video <video
:src="VITE_FILE_URL + detailItems.VIDEO_SIGN_ROUTE" :src="VITE_FILE_URL + detailItems.VIDEO_SIGN_ROUTE"
controls controls
@ -64,9 +70,12 @@
<img <img
v-if="row.USERAVATARPREFIX && row.USERAVATARURL_CONVERT" v-if="row.USERAVATARPREFIX && row.USERAVATARURL_CONVERT"
:src="row.USERAVATARPREFIX + row.USERAVATARURL_CONVERT" :src="row.USERAVATARPREFIX + row.USERAVATARURL_CONVERT"
alt="Avatar" width="100" height="100" /> alt="Avatar"
width="100"
height="100"
/>
<span v-else> <span v-else>
{{ '暂无头像' }} {{ "暂无头像" }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>

View File

@ -103,7 +103,6 @@ const { list, searchForm, pagination, fnGetData, fnResetPagination, tableRef } =
key: "userList", key: "userList",
}); });
const fnInit = async () => { const fnInit = async () => {
await fnResetPagination(); await fnResetPagination();
await nextTick(); await nextTick();

View File

@ -110,7 +110,7 @@
</tr> </tr>
</tbody> </tbody>
<tr> <tr>
<td v-for="(item, index) in totalList" :key="index">{{item}}</td> <td v-for="(item, index) in totalList" :key="index">{{ item }}</td>
</tr> </tr>
</table> </table>
<div v-html="PRINT_STYLE" /> <div v-html="PRINT_STYLE" />

View File

@ -19,10 +19,7 @@
<el-form-item label="文件" prop="file"> <el-form-item label="文件" prop="file">
<layout-upload v-model:file-list="form.file" accept=".pdf" /> <layout-upload v-model:file-list="form.file" accept=".pdf" />
</el-form-item> </el-form-item>
<div <div v-if="form.TEXT_INFO && type === 'edit'" class="tr mb-10">
v-if="form.TEXT_INFO && type === 'edit'"
class="tr mb-10"
>
<el-button type="primary" @click="fnExport">WORD</el-button> <el-button type="primary" @click="fnExport">WORD</el-button>
</div> </div>
<el-form-item label="文件内容" prop="TEXT_INFO"> <el-form-item label="文件内容" prop="TEXT_INFO">

View File

@ -134,7 +134,6 @@
<el-table-column prop="UPLOAD_TIME" label="上传时间" width="150" /> <el-table-column prop="UPLOAD_TIME" label="上传时间" width="150" />
<el-table-column label="操作" width="200"> <el-table-column label="操作" width="200">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
v-if="tabName === 'platform_resource_library'" v-if="tabName === 'platform_resource_library'"
type="primary" type="primary"