代码格式化

车辆颜色改为车牌颜色
自编号改为编号
dev
wangpeng 2024-04-23 22:17:15 +08:00
parent 629e17a48f
commit 202edf8c8e
30 changed files with 128 additions and 90 deletions

View File

@ -2,7 +2,7 @@ import { post, upload } from "@/request/axios.js";
export const getVehicleColor = (params) =>
post("/dictionaries/getVehicleColor", {
// 获取车颜色
// 获取车颜色
loading: false,
...params,
});

View File

@ -2,7 +2,7 @@ import { post, upload } from "@/request/axios.js";
import {
getLevels,
getLevelsByObject,
getLevelsByParentId
getLevelsByParentId,
} from "@/request/data_dictionary.js";
import { ref } from "vue";

View File

@ -9,7 +9,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="问询内容" prop="INQUIRYCONTENT">
<el-input v-model="searchForm.INQUIRYCONTENT"
<el-input
v-model="searchForm.INQUIRYCONTENT"
placeholder="请输入问询内容"
/>
</el-form-item>

View File

@ -6,7 +6,7 @@
<el-divider content-position="left">基本信息</el-divider>
</el-col>
<el-col :span="12">
<el-form-item label="编号" prop="NUM">
<el-form-item label="编号" prop="NUM">
<el-input
v-model="form.NUM"
maxlength="50"

View File

@ -18,7 +18,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="编号" prop="NUM">
<el-form-item label="编号" prop="NUM">
<el-input v-model="searchForm.NUM" clearable />
</el-form-item>
</el-col>
@ -60,7 +60,7 @@
{{ serialNumber(pagination, $index) }}
</template>
</el-table-column>
<el-table-column prop="NUM" label="编号"/>
<el-table-column prop="NUM" label="编号" />
<el-table-column prop="PLATE_NUMBER" label="车牌号" width="200" />
<el-table-column prop="CONTACTS" label="联系人" width="150" />
<el-table-column prop="CONTACT_PHONE" label="联系电话" width="150" />

View File

@ -383,7 +383,7 @@ const rules = {
{ validator: isPlateNumberRepetition, trigger: "blur" },
],
VEHICLE_COLOR: [
{ required: true, message: "车颜色不能为空", trigger: "change" },
{ required: true, message: "车颜色不能为空", trigger: "change" },
],
FRAMES_NUMBER: [
{ required: true, message: "车架号不能为空", trigger: "change" },

View File

@ -380,7 +380,7 @@ const rules = {
{ validator: isPlateNumberRepetition, trigger: "blur" },
],
VEHICLE_COLOR: [
{ required: true, message: "车颜色不能为空", trigger: "change" },
{ required: true, message: "车颜色不能为空", trigger: "change" },
],
FRAMES_NUMBER: [
{ required: true, message: "车架号不能为空", trigger: "change" },

View File

@ -383,7 +383,7 @@ const getRemiderDate = (val) => {
};
const getVehicle = async (event) => {
form.value.PLATE_NUMBER = ''
form.value.PLATE_NUMBER = "";
const resData = await getTrailerList({ TRAFFIC_TYPE: event });
data.vehicleList = resData.list;
form.value.VEHICLE = "";
@ -398,8 +398,8 @@ const getVehicle = async (event) => {
};
const fnBusChange = async (event) => {
if (!INSPECTANNUALLY_ID) {
form.value.CAR_OWNERS = ''
form.value.TELEPHONE = ''
form.value.CAR_OWNERS = "";
form.value.TELEPHONE = "";
}
const resData = await getTrailerList({ ID: event });
data.busInfo = resData.list[0];

View File

@ -371,7 +371,7 @@ const rules = {
REMINDER_DATE: [{ required: true, message: "请输入", trigger: "blur" }],
};
const getVehicle = async (event) => {
form.value.PLATE_NUMBER = ''
form.value.PLATE_NUMBER = "";
const model = "insure";
const resData = await getTrailerList2({ TRAFFIC_TYPE: event, model });
data.vehicleList = resData.list;
@ -387,8 +387,8 @@ const getVehicle = async (event) => {
};
const fnBusChange = async (event) => {
if (!INSURE_ID) {
form.value.CAR_OWNERS = ''
form.value.TELEPHONE = ''
form.value.CAR_OWNERS = "";
form.value.TELEPHONE = "";
}
const resData = await getTrailerList2({ ID: event });
data.busInfo = resData.list[0];

View File

@ -396,7 +396,6 @@ const fnBusChange = async (event) => {
}
const resData = await getTrailerListMaintenance({ ID: event });
data.busInfo = resData.list[0];
console.log(resData);
if (form.value.CAR_OWNERS === "") {
form.value.CAR_OWNERS = data.busInfo.CAR_OWNERS;
}

View File

@ -13,9 +13,11 @@
prop="OCCUPATIONALNAME"
label-width="120px"
>
<el-input v-model="searchForm.OCCUPATIONALNAME"
<el-input
v-model="searchForm.OCCUPATIONALNAME"
placeholder="请输入职业危害告知书"
clearable />
clearable
/>
</el-form-item>
</el-col>
<el-col :span="6">
@ -58,11 +60,17 @@
{{ serialNumber(pagination, $index) }}
</template>
</el-table-column>
<el-table-column prop="NEWOCCUPATIONALNAME" label="用户名称" width="100"/>
<el-table-column
prop="NEWOCCUPATIONALNAME"
label="用户名称"
width="100"
/>
<el-table-column prop="OCCUPATIONALNAME" label="职业危害告知书" />
<el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="100">
<template #default="{ row }">
<el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"></el-tag>
<el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"
>已上传</el-tag
>
<el-tag v-else type="warning">未上传</el-tag>
</template>
</el-table-column>

View File

@ -9,7 +9,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="名称" prop="MANAGEMENTAGREEMENTNAME">
<el-input v-model="searchForm.MANAGEMENTAGREEMENTNAME"
<el-input
v-model="searchForm.MANAGEMENTAGREEMENTNAME"
placeholder="请输入名称"
/>
</el-form-item>

View File

@ -9,7 +9,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="名称" prop="ACTIVITIESNAME">
<el-input v-model="searchForm.ACTIVITIESNAME"
<el-input
v-model="searchForm.ACTIVITIESNAME"
placeholder="请输入名称"
/>
</el-form-item>
@ -57,14 +58,20 @@
<el-table-column prop="ACTIVITIESNAME" label="名称" width="250" />
<el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="250">
<template #default="{ row }">
<el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"></el-tag>
<el-tag v-else-if="row.COMPLETIONSTATUS === '0'" type="warning">未上传</el-tag>
<el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"
>已上传</el-tag
>
<el-tag v-else-if="row.COMPLETIONSTATUS === '0'" type="warning"
>未上传</el-tag
>
</template>
</el-table-column>
<el-table-column label="有效状态" prop="VALIDSTATUS">
<template #default="{ row }">
<el-tag v-if="row.VALIDSTATUS === '1'" type="success"></el-tag>
<el-tag v-else-if="row.VALIDSTATUS === '0'" type="warning">未生效</el-tag>
<el-tag v-else-if="row.VALIDSTATUS === '0'" type="warning"
>未生效</el-tag
>
</template>
</el-table-column>
<!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->

View File

@ -9,7 +9,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="名称" prop="MANUALNAME">
<el-input v-model="searchForm.MANUALNAME"
<el-input
v-model="searchForm.MANUALNAME"
placeholder="请输入名称"
/>
</el-form-item>
@ -57,14 +58,20 @@
<el-table-column prop="MANUALNAME" label="名称" width="250" />
<el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="250">
<template #default="{ row }">
<el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"></el-tag>
<el-tag v-else-if="row.COMPLETIONSTATUS === '0'" type="warning">未上传</el-tag>
<el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"
>已上传</el-tag
>
<el-tag v-else-if="row.COMPLETIONSTATUS === '0'" type="warning"
>未上传</el-tag
>
</template>
</el-table-column>
<el-table-column label="有效状态" prop="VALIDSTATUS">
<template #default="{ row }">
<el-tag v-if="row.VALIDSTATUS === '1'" type="success"></el-tag>
<el-tag v-else-if="row.VALIDSTATUS === '0'" type="warning">未生效</el-tag>
<el-tag v-else-if="row.VALIDSTATUS === '0'" type="warning"
>未生效</el-tag
>
</template>
</el-table-column>
<!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->

View File

@ -9,7 +9,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="从业人员" prop="PRACTITIONER">
<el-input v-model="searchForm.PRACTITIONER"
<el-input
v-model="searchForm.PRACTITIONER"
placeholder="请输入从业人员"
/>
</el-form-item>
@ -157,8 +158,7 @@ const relatedClassificationList = ref(null);
onMounted(async () => {
const data = await layoutFnGetSIGNEDSTATUSClassification();
relatedClassificationList.value = data.value.list
console.log(relatedClassificationList.value);
relatedClassificationList.value = data.value.list;
if (data && data.value && data.value.zTreeNodes) {
relatedClassificationList.value = JSON.parse(data.value.zTreeNodes);
}

View File

@ -9,9 +9,11 @@
<el-row>
<el-col :span="6">
<el-form-item label="会议标题" prop="MEETING_TITLE">
<el-input v-model="searchForm.MEETING_TITLE"
<el-input
v-model="searchForm.MEETING_TITLE"
placeholder="请输入会议标题"
clearable />
clearable
/>
</el-form-item>
</el-col>
<el-col :span="6">
@ -61,9 +63,15 @@
<!-- <el-tag v-else></el-tag>-->
<!-- </template>-->
<template #default="{ row }">
<el-tag v-if="row.MEETING_STATUS === '0'" type="success"></el-tag>
<el-tag v-else-if="row.MEETING_STATUS === '1'" type="warning">进行中</el-tag>
<el-tag v-else-if="row.MEETING_STATUS === '2'" type="error">已结束</el-tag>
<el-tag v-if="row.MEETING_STATUS === '0'" type="success"
>未开始</el-tag
>
<el-tag v-else-if="row.MEETING_STATUS === '1'" type="warning"
>进行中</el-tag
>
<el-tag v-else-if="row.MEETING_STATUS === '2'" type="error"
>已结束</el-tag
>
</template>
</el-table-column>
<el-table-column prop="MEETING_DATE" label="会议时间" width="200" />

View File

@ -108,7 +108,7 @@
<script setup>
import {
addSecurityNotice,
layoutFnGetMicrosoftSecurityEstate
layoutFnGetMicrosoftSecurityEstate,
} from "@/request/safety_production_related.js";
import { reactive, ref } from "vue";
import LayoutUpload from "@/components/upload/index.vue";
@ -136,8 +136,6 @@ const rules = {
const relatedClassificationTempList =
await layoutFnGetMicrosoftSecurityEstate();
console.log(relatedClassificationTempList);
const router = useRouter();
const data = reactive({
form: {

View File

@ -9,9 +9,11 @@
<el-row>
<el-col :span="6">
<el-form-item label="通知标题" prop="TITLE">
<el-input v-model="searchForm.TITLE"
<el-input
v-model="searchForm.TITLE"
placeholder="请输入通知标题"
clearable />
clearable
/>
</el-form-item>
</el-col>
<el-col :span="6">

View File

@ -13,9 +13,11 @@
prop="RESPONSIBILITYNAME"
label-width="120px"
>
<el-input v-model="searchForm.RESPONSIBILITYNAME"
<el-input
v-model="searchForm.RESPONSIBILITYNAME"
placeholder="请输入岗位安全责任书"
clearable />
clearable
/>
</el-form-item>
</el-col>
<el-col :span="6">
@ -59,13 +61,12 @@
</template>
</el-table-column>
<el-table-column prop="NEWCONTRACTNAME" label="用户名称" width="100" />
<el-table-column
prop="RESPONSIBILITYNAME"
label="岗位安全责任书"
/>
<el-table-column prop="RESPONSIBILITYNAME" label="岗位安全责任书" />
<el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="100">
<template #default="{ row }">
<el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"></el-tag>
<el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"
>已上传</el-tag
>
<el-tag v-else type="warning">未上传</el-tag>
</template>
</el-table-column>

View File

@ -9,9 +9,11 @@
<el-row>
<el-col :span="6">
<el-form-item label="承诺书名称" prop="COMMITMENTNAME">
<el-input v-model="searchForm.COMMITMENTNAME"
<el-input
v-model="searchForm.COMMITMENTNAME"
placeholder="请输入承诺书名称"
clearable />
clearable
/>
</el-form-item>
</el-col>
<el-col :span="6">
@ -62,7 +64,9 @@
<el-table-column prop="COMMITMENTNAME" label="承诺书名称" />
<el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="100">
<template #default="{ row }">
<el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"></el-tag>
<el-tag v-if="row.COMPLETIONSTATUS === '1'" type="success"
>已上传</el-tag
>
<el-tag v-else type="warning">未上传</el-tag>
</template>
</el-table-column>

View File

@ -9,7 +9,8 @@
<el-row>
<el-col :span="5">
<el-form-item label="计划名称" prop="KEYWORDS">
<el-input v-model="searchForm.KEYWORDS"
<el-input
v-model="searchForm.KEYWORDS"
placeholder="请输入计划名称"
/>
</el-form-item>

View File

@ -9,7 +9,8 @@
<el-row>
<el-col :span="5">
<el-form-item label="计划名称" prop="KEYWORDS">
<el-input v-model="searchForm.KEYWORDS"
<el-input
v-model="searchForm.KEYWORDS"
placeholder="请输入计划名称"
/>
</el-form-item>