Compare commits

..

No commits in common. "43b92877218452af7471a6d215e253544c7ed81b" and "57dfe8f8c50bd4acf15913026a0c2935dfbb5c53" have entirely different histories.

7 changed files with 80 additions and 116 deletions

View File

@ -5,12 +5,6 @@
<el-descriptions-item label="姓名"> <el-descriptions-item label="姓名">
{{ data.info.NAME }} {{ data.info.NAME }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="手机号">
{{ data.info.PHONE }}
</el-descriptions-item>
<el-descriptions-item label="出生年月">
{{ data.info.DATE_OF_BIRTH }}
</el-descriptions-item>
<el-descriptions-item label="人员类型"> <el-descriptions-item label="人员类型">
{{ data.info.PERSONNEL_TYPE_NAME }} {{ data.info.PERSONNEL_TYPE_NAME }}
</el-descriptions-item> </el-descriptions-item>
@ -47,15 +41,6 @@
<el-descriptions-item label="参加工作时间"> <el-descriptions-item label="参加工作时间">
{{ data.info.WORKING_DATE }} {{ data.info.WORKING_DATE }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="部门排序">
{{ data.info.SORT }}
</el-descriptions-item>
<el-descriptions-item label="邮箱">
{{ data.info.EMAIL }}
</el-descriptions-item>
<el-descriptions-item label="备注">
{{ data.info.BZ }}
</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">
@ -68,40 +53,6 @@
}} }}
</el-divider> </el-divider>
<el-descriptions :column="2" border> <el-descriptions :column="2" border>
<template>
<el-descriptions-item
:label="
item.CERTIFICATE_CATEGORY === '1'
? '身份证(正面)'
: item.CERTIFICATE_CATEGORY === '2'
? '驾驶证'
: '道路运输从业资格证'
"
:span="item.CERTIFICATE_CATEGORY === '1' ? 1 : 2"
>
<img
v-viewer
v-if="item.ID_PHOTO_FRONT !== null"
:src="item.ID_PHOTO_FRONT"
width="100"
height="100"
class="ml-10"
/>
</el-descriptions-item>
<el-descriptions-item
v-if="item.CERTIFICATE_CATEGORY === '1'"
label="身份证(背面)"
>
<img
v-viewer
v-if="item.ID_PHOTO_BACK !== null"
:src="item.ID_PHOTO_BACK"
width="100"
height="100"
class="ml-10"
/>
</el-descriptions-item>
</template>
<el-descriptions-item <el-descriptions-item
:label=" :label="
item.CERTIFICATE_CATEGORY === '1' item.CERTIFICATE_CATEGORY === '1'
@ -187,14 +138,6 @@ const fnGetData = async () => {
} }
}); });
data.certificateList = resData.certificateList; data.certificateList = resData.certificateList;
data.certificateList.forEach((item) => {
if(!item.ID_PHOTO_FRONT || item.ID_PHOTO_FRONT.includes("undefined")) {
item.ID_PHOTO_FRONT = null
}
if(!item.ID_PHOTO_BACK) {
item.ID_PHOTO_BACK = null
}
});
}; };
fnGetData(); fnGetData();
</script> </script>

View File

@ -164,13 +164,40 @@
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
v-if="buttonJurisdiction.del" v-if="expandedRows[row.INSPECTANNUALLY_ID]"
type="danger" type="danger"
text text
link link
@click="fnDelete(row.INSPECTANNUALLY_ID)" @click="fnDelete(row.INSPECTANNUALLY_ID)"
>删除
</el-button>
<el-button
v-if="
expandedRows[row.INSPECTANNUALLY_ID] &&
row.REMINDER_STATUS === '0'
"
type="primary"
text
link
@click="fnStatusChange(row.INSPECTANNUALLY_ID, '1')"
>开启</el-button
> >
删除 <el-button
v-if="
expandedRows[row.INSPECTANNUALLY_ID] &&
row.REMINDER_STATUS === '1'
"
type="primary"
text
link
@click="fnStatusChange(row.INSPECTANNUALLY_ID, '0')"
>关闭
</el-button>
<el-button
type="primary"
@click="toggleExpand(row.INSPECTANNUALLY_ID)"
>
{{ expandedRows[row.INSPECTANNUALLY_ID] ? "收起" : "更多" }}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -203,6 +230,7 @@ import useListData from "@/assets/js/useListData.js";
import { import {
getInspectAnnuallyList, getInspectAnnuallyList,
setInspectAnnuallyDelete, setInspectAnnuallyDelete,
setInspectAnnuallyEdit2,
} from "@/request/mechanical_files.js"; } from "@/request/mechanical_files.js";
import { reactive } from "vue"; import { reactive } from "vue";
import { debounce } from "throttle-debounce"; import { debounce } from "throttle-debounce";
@ -246,6 +274,18 @@ const fnResetPaginationTransfer = () => {
REMINDER_STATUS: searchForm.value.REMINDER_STATUS, REMINDER_STATUS: searchForm.value.REMINDER_STATUS,
}); });
}; };
// 使
const expandedRows = reactive({}); //
//
function toggleExpand(rowId) {
if (expandedRows[rowId] === undefined) {
expandedRows[rowId] = true; //
} else {
expandedRows[rowId] = !expandedRows[rowId]; //
}
}
const fnDelete = debounce( const fnDelete = debounce(
1000, 1000,
async (INSPECTANNUALLY_ID) => { async (INSPECTANNUALLY_ID) => {
@ -256,6 +296,19 @@ const fnDelete = debounce(
}, },
{ atBegin: true } { atBegin: true }
); );
const fnStatusChange = debounce(
1000,
async (INSPECTANNUALLY_ID, REMINDER_STATUS) => {
const msg = REMINDER_STATUS === "0" ? "关闭" : "开启";
await ElMessageBox.confirm("确定要" + msg + "提醒吗?", {
type: "warning",
});
await setInspectAnnuallyEdit2({ INSPECTANNUALLY_ID, REMINDER_STATUS });
ElMessage.success(msg + "成功");
fnResetPaginationTransfer();
},
{ atBegin: true }
);
const buttonJurisdiction = await useButtonJurisdiction("hidden"); const buttonJurisdiction = await useButtonJurisdiction("hidden");
const fnImportDialogChangeShow = () => { const fnImportDialogChangeShow = () => {

View File

@ -137,12 +137,8 @@
<!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>--> <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
<el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150"> <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.REMINDER_STATUS === '1'" type="success" <el-tag v-if="row.REMINDER_STATUS === '1'"></el-tag>
>开启</el-tag <el-tag v-else-if="row.REMINDER_STATUS === '0'">关闭</el-tag>
>
<el-tag v-else-if="row.REMINDER_STATUS === '0'" type="info"
>关闭</el-tag
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150"> <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">

View File

@ -108,38 +108,22 @@
<!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>--> <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
<el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150"> <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.REMINDER_STATUS === '1'" type="success" <el-tag v-if="row.REMINDER_STATUS === '1'"></el-tag>
>开启</el-tag <el-tag v-else-if="row.REMINDER_STATUS === '0'">关闭</el-tag>
>
<el-tag v-else-if="row.REMINDER_STATUS === '0'" type="info"
>关闭</el-tag
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150"> <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.DUE_DATE_TYPE === 1" type="success" <el-tag v-if="row.DUE_DATE_TYPE === 1"></el-tag>
>未到期</el-tag <el-tag v-else-if="row.DUE_DATE_TYPE === 0">已到期</el-tag>
> <el-tag v-else-if="row.DUE_DATE_TYPE === 2">即将到期</el-tag>
<el-tag v-else-if="row.DUE_DATE_TYPE === 0" type="error"
>已到期</el-tag
>
<el-tag v-else-if="row.DUE_DATE_TYPE === 2" type="info"
>即将到期</el-tag
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150"> <el-table-column prop="NEW_ARCHIVES_TYPE" label="车辆状态" width="150">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error" <el-tag v-if="row.NEW_ARCHIVES_TYPE === '1'"></el-tag>
>报废</el-tag <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '0'">正常</el-tag>
> <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '2'">过户</el-tag>
<el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
>正常</el-tag
>
<el-tag v-else-if="row.ARCHIVES_TYPE === '1'" type="info"
>过户</el-tag
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CREATTIME" label="创建时间" width="150" /> <el-table-column prop="CREATTIME" label="创建时间" width="150" />

View File

@ -19,7 +19,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="运营车辆" prop="VEHICLE"> <el-form-item label="运营车辆" prop="VEHICLE">
<el-select v-model="form.PLATE_NUMBER" @change="getBusInfo"> <el-select v-model="form.VEHICLE" @change="getBusInfo">
<el-option <el-option
v-for="item in data.vehicleList" v-for="item in data.vehicleList"
:key="item.ID" :key="item.ID"
@ -250,7 +250,6 @@ const OPERATIONS_ID = route.query.OPERATIONS_ID;
const annualInspectionCycleList = await layoutFnGetAnnualInspectionCycle(); const annualInspectionCycleList = await layoutFnGetAnnualInspectionCycle();
const formRef = ref(null); const formRef = ref(null);
const form = ref({ const form = ref({
PLATE_NUMBER: "",
VEHICLE_MODEL: "", VEHICLE_MODEL: "",
VEHICLE: "", VEHICLE: "",
NUM: "", NUM: "",

View File

@ -110,7 +110,7 @@
<el-table-column prop="CAR_OWNERS" label="车主业户" width="150" /> <el-table-column prop="CAR_OWNERS" label="车主业户" width="150" />
<el-table-column prop="TELEPHONE" label="联系电话" width="150" /> <el-table-column prop="TELEPHONE" label="联系电话" width="150" />
<el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" /> <el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" />
<el-table-column prop="NAME" label="运营周期" width="150" /> <el-table-column prop="CYCLE_NAME" label="运营周期" width="150" />
<el-table-column prop="DUE_DATE" label="到期日期" width="150" /> <el-table-column prop="DUE_DATE" label="到期日期" width="150" />
<el-table-column prop="REGISTRANT" label="登记人" width="150" /> <el-table-column prop="REGISTRANT" label="登记人" width="150" />
<!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>--> <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
@ -119,35 +119,25 @@
<!-- <span v-if="row.REMINDER_STATUS === '1'"></span>--> <!-- <span v-if="row.REMINDER_STATUS === '1'"></span>-->
<!-- <span v-else-if="row.REMINDER_STATUS === '0'">关闭</span>--> <!-- <span v-else-if="row.REMINDER_STATUS === '0'">关闭</span>-->
<el-tag v-if="row.REMINDER_STATUS === '1'" type="success" <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
>开启 >开启</el-tag
</el-tag> >
<el-tag v-else-if="row.REMINDER_STATUS === '0'" type="info" <el-tag v-else-if="row.REMINDER_STATUS === '0'" type="info"
>关闭 >关闭</el-tag
</el-tag> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150"> <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.DUE_DATE_TYPE === 1" type="success" <span v-if="row.DUE_DATE_TYPE === 1"></span>
>未到期 <span v-else-if="row.DUE_DATE_TYPE === 0">已到期</span>
</el-tag> <span v-else-if="row.DUE_DATE_TYPE === 2">即将到期</span>
<el-tag v-else-if="row.DUE_DATE_TYPE === 0" type="error"
>已到期
</el-tag>
<el-tag v-else-if="row.DUE_DATE_TYPE === 2" type="info"
>即将到期
</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150"> <el-table-column prop="NEW_ARCHIVES_TYPE" label="车辆状态" width="150">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error"> </el-tag> <el-tag v-if="row.NEW_ARCHIVES_TYPE === '1'"></el-tag>
<el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success" <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '0'">正常</el-tag>
>正常 <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '2'">过户</el-tag>
</el-tag>
<el-tag v-else-if="row.ARCHIVES_TYPE === '1'" type="info"
>过户
</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CREATTIME" label="创建时间" width="150" /> <el-table-column prop="CREATTIME" label="创建时间" width="150" />
@ -247,7 +237,6 @@ import {
REMINDER_STATUS_LIST, REMINDER_STATUS_LIST,
} from "@/assets/js/constant.js"; } from "@/assets/js/constant.js";
console.log("-=-=-==", await getOperationsList());
const router = useRouter(); const router = useRouter();
const data = reactive({ const data = reactive({
exportExcelDialog: { exportExcelDialog: {

View File

@ -24,7 +24,7 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="人员性别" prop="SEX"> <el-form-item label="人员性别" prop="SEX">
<el-select v-model="data.form.GENDER" placeholder="请选择人员性别"> <el-select v-model="data.form.SEX" placeholder="请选择人员性别">
<el-option label="男" :value="'1'" /> <el-option label="男" :value="'1'" />
<el-option label="女" :value="'0'" /> <el-option label="女" :value="'0'" />
</el-select> </el-select>