BUG 优化

dev
xiepeng 2024-04-10 16:53:36 +08:00
parent 30c65501a6
commit ae3cba5fb8
15 changed files with 100 additions and 105 deletions

View File

@ -139,6 +139,7 @@ export const REMIND_DAYS = [
{ ID: "2", NAME: "90天", NUM: "90" }, { ID: "2", NAME: "90天", NUM: "90" },
]; ];
// export const MAINTENANCE_LEVEL_LIST = [ // export const MAINTENANCE_LEVEL_LIST = [
// //维保等级 // //维保等级
// {ID:'1',NAME:'一级维保'}, // {ID:'1',NAME:'一级维保'},

View File

@ -29,7 +29,7 @@ export const getLevelsCorp = (params) =>
}); });
// 获取数据字典 // 获取数据字典
export const getLevelsByParentId = (params) => export const getLevelsByParentId = (params) =>
post("/dictionaries/listDictToParId", { post("/dictionaries/getLevels", {
loading: false, loading: false,
...params, ...params,
}); });

View File

@ -29,7 +29,7 @@ export const issueSecurityNotice = (params) =>
// 通知等级 // 通知等级
export const layoutFnGetNotificationsClassification = async () => { export const layoutFnGetNotificationsClassification = async () => {
const resData = await getLevelsByParentId({ const resData = await getLevelsByParentId({
parentId: "aaecb47d95524b84904809671e48a777", DICTIONARIES_ID: "aaaecb47d95524b84904809671e48a656",
}); });
return ref(resData); return ref(resData);
}; };

View File

@ -4,7 +4,7 @@ import { post, upload } from "@/request/axios.js";
export const layoutFnGetScrapType = async () => { export const layoutFnGetScrapType = async () => {
const resData = await getLevelsByParentId({ const resData = await getLevelsByParentId({
parentId: "78452f4ec77e4d98ae8cdd9c3386ae0c", DICTIONARIES_ID: "78452f4ec77e4d98ae8cdd9c3386ae0c",
}); });
return ref(resData); return ref(resData);
}; };

View File

@ -87,19 +87,19 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="NUM" label="编号" width="150" /> <el-table-column prop="NUM" label="编号" width="150" />
<el-table-column prop="PLATE_NUMBER" label="车牌号" width="150" /> <el-table-column prop="PLATE_NUMBER" label="车牌号" width="100" />
<el-table-column prop="CAR_OWNERS" label="车主业户" width="150" /> <el-table-column prop="CAR_OWNERS" label="车主业户" width="100" />
<el-table-column prop="TELEPHONE" label="联系电话" width="150" /> <el-table-column prop="TELEPHONE" label="联系电话" width="100" />
<el-table-column <el-table-column
prop="NETWORK_ACCESS_COMPANY" prop="NETWORK_ACCESS_COMPANY"
label="入网公司" label="入网公司"
width="150" width="150"
/> />
<el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" /> <el-table-column prop="PROCESSING_DATE" label="办理日期" width="120" />
<el-table-column prop="DUE_DATE" label="到期日期" width="150" /> <el-table-column prop="DUE_DATE" label="到期日期" width="120" />
<el-table-column prop="REGISTRANT" label="登记人" width="150" /> <el-table-column prop="REGISTRANT" label="登记人" width="140" />
<!--<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="90">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.REMINDER_STATUS === '1'" type="success" <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
>开启</el-tag >开启</el-tag
@ -109,7 +109,7 @@
> >
</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="90">
<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" type="success"
>未到期</el-tag >未到期</el-tag
@ -122,7 +122,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150"> <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="90">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.ARCHIVES_TYPE === '1'" type="error"></el-tag> <el-tag v-if="row.ARCHIVES_TYPE === '1'" type="error"></el-tag>
<el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success" <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
@ -133,9 +133,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CREATTIME" label="创建时间" width="150" /> <el-table-column label="操作" width="242">
<el-table-column prop="OPERATTIME" label="修改时间" width="150" />
<el-table-column label="操作" width="250">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
type="primary" type="primary"

View File

@ -123,7 +123,7 @@
<el-table-column prop="CAR_OWNERS" label="车主业户" width="100" /> <el-table-column prop="CAR_OWNERS" label="车主业户" width="100" />
<el-table-column prop="TELEPHONE" label="联系电话" width="100" /> <el-table-column prop="TELEPHONE" label="联系电话" width="100" />
<el-table-column prop="PROCESSING_DATE" label="办理日期" width="100" /> <el-table-column prop="PROCESSING_DATE" label="办理日期" width="100" />
<el-table-column prop="NAME" label="年检周期" width="100" /> <el-table-column prop="NAME" label="年检周期" width="92" />
<el-table-column prop="DUE_DATE" label="到期日期" width="100" /> <el-table-column prop="DUE_DATE" label="到期日期" width="100" />
<el-table-column prop="REGISTRANT" label="登记人" width="100" /> <el-table-column prop="REGISTRANT" label="登记人" width="100" />
<!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>--> <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->

View File

@ -119,34 +119,34 @@
{{ serialNumber(pagination, $index) }} {{ serialNumber(pagination, $index) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="NUM" label="编号" width="150" /> <el-table-column prop="NUM" label="编号" width="100" />
<el-table-column prop="VEHICLE_MODEL" label="运营车型" width="150"> <el-table-column prop="VEHICLE_MODEL" label="运营车型" width="100">
<template #default="{ row }"> <template #default="{ row }">
{{ {{
translationStatus(row.VEHICLE_MODEL, OPERATING_VEHICLE_TYPE_LIST) translationStatus(row.VEHICLE_MODEL, OPERATING_VEHICLE_TYPE_LIST)
}} }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="PLATE_NUMBER" label="车牌号" width="150" /> <el-table-column prop="PLATE_NUMBER" label="车牌号" width="100" />
<el-table-column prop="CAR_OWNERS" label="车主业户" width="150" /> <el-table-column prop="CAR_OWNERS" label="车主业户" width="100" />
<el-table-column prop="TELEPHONE" label="联系电话" width="150" /> <el-table-column prop="TELEPHONE" label="联系电话" width="100" />
<el-table-column <el-table-column
prop="PROCESSING_DATE_YEAR" prop="PROCESSING_DATE_YEAR"
label="保险年份" label="保险年份"
width="150" width="80"
/> />
<el-table-column <el-table-column
prop="INSURANCE_COVERAGE" prop="INSURANCE_COVERAGE"
label="保险项目" label="保险项目"
width="150" width="100"
/> />
<el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" /> <el-table-column prop="PROCESSING_DATE" label="办理日期" width="100" />
<el-table-column prop="EFFECTIVE_DATE" label="生效日期" width="150" /> <el-table-column prop="EFFECTIVE_DATE" label="生效日期" width="100" />
<el-table-column prop="DUE_DATE" label="到期日期" width="150" /> <el-table-column prop="DUE_DATE" label="到期日期" width="100" />
<el-table-column prop="REGISTRANT" label="登记人" width="150" /> <el-table-column prop="REGISTRANT" label="登记人" width="100" />
<!--<el-table-column prop="NULLL" label="经营类型" width="150"/>--> <!--<el-table-column prop="NULLL" label="经营类型" width="150"/>-->
<!--<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="80">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.REMINDER_STATUS === '1'" type="success" <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
>开启</el-tag >开启</el-tag
@ -156,7 +156,7 @@
> >
</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="80">
<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" type="success"
>未到期</el-tag >未到期</el-tag
@ -169,8 +169,8 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CREATTIME" label="创建时间" width="150" /> <!-- <el-table-column prop="CREATTIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" width="150" />-->
<el-table-column label="操作" width="250"> <el-table-column label="操作" width="250">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button

View File

@ -87,26 +87,26 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="NUM" label="编号" width="150" /> <el-table-column prop="NUM" label="编号" width="150" />
<el-table-column prop="PLATE_NUMBER" label="车牌号" width="150" /> <el-table-column prop="PLATE_NUMBER" label="车牌号" width="100" />
<el-table-column prop="CAR_OWNERS" label="车主业户" width="150" /> <el-table-column prop="CAR_OWNERS" label="车主业户" width="100" />
<el-table-column prop="TELEPHONE" label="联系电话" width="150" /> <el-table-column prop="TELEPHONE" label="联系电话" width="100" />
<el-table-column prop="MAINTENANCE_LEVEL" label="维保等级" width="150"> <el-table-column prop="MAINTENANCE_LEVEL" label="维保等级" width="100">
<template #default="{ row }"> <template #default="{ row }">
{{ {{
translationStatus(row.MAINTENANCE_LEVEL, MAINTENANCE_LEVEL_LIST) translationStatus(row.MAINTENANCE_LEVEL, MAINTENANCE_LEVEL_LIST)
}} }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" /> <el-table-column prop="PROCESSING_DATE" label="办理日期" width="120" />
<el-table-column prop="MAINTENANCE_CYCLE" label="维保周期" width="150"> <el-table-column prop="MAINTENANCE_CYCLE" label="维保周期" width="80">
<template #default="{ row }"> <template #default="{ row }">
{{ row.MAINTENANCE_CYCLE + "天" }} {{ row.MAINTENANCE_CYCLE + "天" }}
</template> </template>
</el-table-column> </el-table-column>
<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="100" />
<!--<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="80">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.REMINDER_STATUS === '1'" type="success" <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
>开启</el-tag >开启</el-tag
@ -116,7 +116,7 @@
> >
</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="80">
<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" type="success"
>未到期</el-tag >未到期</el-tag
@ -129,7 +129,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150"> <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error"></el-tag> <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error"></el-tag>
<el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success" <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
@ -140,8 +140,6 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CREATTIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" />
<el-table-column label="操作" width="250"> <el-table-column label="操作" width="250">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button

View File

@ -109,22 +109,22 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="OPERATIONS_ID" label="编号" width="150" />--> <!-- <el-table-column prop="OPERATIONS_ID" label="编号" width="150" />-->
<el-table-column prop="VEHICLE_MODEL" label="运营车型" width="150"> <el-table-column prop="VEHICLE_MODEL" label="运营车型" width="95">
<template #default="{ row }"> <template #default="{ row }">
{{ {{
translationStatus(row.VEHICLE_MODEL, OPERATING_VEHICLE_TYPE_LIST) translationStatus(row.VEHICLE_MODEL, OPERATING_VEHICLE_TYPE_LIST)
}} }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="PLATE_NUMBER" label="车牌号" width="150" /> <el-table-column prop="PLATE_NUMBER" label="车牌号" width="95" />
<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="142" />
<el-table-column prop="CYCLE_NAME" label="运营周期" width="150" /> <el-table-column prop="CYCLE_NAME" label="运营周期" width="80" />
<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"/>-->
<el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150"> <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.REMINDER_STATUS === '1'" type="success" <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
>开启 >开启
@ -134,7 +134,7 @@
</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="80">
<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" type="success"
>未到期 >未到期
@ -147,7 +147,7 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150"> <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error"></el-tag> <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error"></el-tag>
<el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success" <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
@ -158,8 +158,8 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CREATTIME" label="创建时间" width="150" />
<el-table-column label="操作" width="250"> <el-table-column label="操作" width="240">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
type="primary" type="primary"

View File

@ -19,10 +19,10 @@
@change="fnEditVehicleModel" @change="fnEditVehicleModel"
> >
<el-option <el-option
v-for="item in getScrapVehicleModeList" v-for="item in SCRAP_VEHICLE_MODEL"
:key="item.BIANMA" :key="item.BIANMA"
:label="item.name" :label="item.NAME"
:value="item.name" :value="item.NAME"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -186,7 +186,7 @@
</template> </template>
<script setup> <script setup>
import { onMounted, ref } from "vue"; import { ref } from "vue";
import { import {
setScrapManageAdd, setScrapManageAdd,
setScrapManageEdit, setScrapManageEdit,
@ -211,12 +211,9 @@ const router = useRouter();
const getAllOperationVehicleList = await getScrapOperationVehicleList(); const getAllOperationVehicleList = await getScrapOperationVehicleList();
const getAllFrailerList = await getScrapFreightTrailerList(); const getAllFrailerList = await getScrapFreightTrailerList();
const getScrapVehicleModeList = ref(null);
onMounted(async () => { const VEHICLE_MODEL = await layoutFnGetScrapType();
const data = await layoutFnGetScrapType();
getScrapVehicleModeList.value = JSON.parse(data.value.zTreeNodes);
});
const SCRAP_ID = route.query.SCRAP_ID; const SCRAP_ID = route.query.SCRAP_ID;
const rules = { const rules = {
@ -396,6 +393,7 @@ const fnSubmit = debounce(
}, },
{ atBegin: true } { atBegin: true }
); );
const SCRAP_VEHICLE_MODEL = VEHICLE_MODEL.value.list
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>

View File

@ -26,9 +26,9 @@
> >
<el-option <el-option
v-for="item in relatedClassificationList" v-for="item in relatedClassificationList"
:key="item.BIANMA" :key="item.ID"
:label="item.NAME" :label="item.NAME"
:value="item.BIANMA" :value="item.NAME"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -98,7 +98,7 @@
</div> </div>
<select-person <select-person
v-model:visible="data.SelectPersonDialogVisible" v-model:visible="data.SelectPersonDialogVisible"
:list-data="data.listAll" :selection-data="data.listAll"
@submit="fnSelectPersonSubmit" @submit="fnSelectPersonSubmit"
@submitall="fnSelectAllRiskSubmit" @submitall="fnSelectAllRiskSubmit"
/> />
@ -133,12 +133,9 @@ const rules = {
}, },
], ],
}; };
const relatedClassificationTempList = const relatedClassificationTempList = await layoutFnGetNotificationsClassification();
await layoutFnGetNotificationsClassification();
const relatedClassificationList = [];
JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => {
relatedClassificationList.push({ name: e.id, BIANMA: e.name });
});
const router = useRouter(); const router = useRouter();
const data = reactive({ const data = reactive({
form: { form: {
@ -152,6 +149,7 @@ const data = reactive({
allStatus: 0, // allStatus: 0, //
REPLYSTATUS: "", REPLYSTATUS: "",
}, },
SelectPersonDialogVisible: false,
}); });
const fnSubmit = async () => { const fnSubmit = async () => {
@ -204,6 +202,7 @@ const fnSelectAllRiskSubmit = (allData) => {
data.form.allStatus = 1; data.form.allStatus = 1;
data.form.PERSON = "已全部选择"; data.form.PERSON = "已全部选择";
}; };
const relatedClassificationList = relatedClassificationTempList.value.list;
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>

View File

@ -78,7 +78,7 @@ const props = defineProps({
required: true, required: true,
default: false, default: false,
}, },
listData: { selectionData: {
type: Array, type: Array,
required: true, required: true,
default: () => [], default: () => [],
@ -105,6 +105,9 @@ const stop = watch(
() => props.visible, () => props.visible,
(value) => { (value) => {
if (value) { if (value) {
props.selectionData.forEach((row) => {
tableRef.value.toggleRowSelection(row, undefined);
});
fnResetPagination(); fnResetPagination();
stop && stop(); stop && stop();
} }

View File

@ -28,7 +28,7 @@
v-for="item in relatedClassificationList" v-for="item in relatedClassificationList"
:key="item.BIANMA" :key="item.BIANMA"
:label="item.NAME" :label="item.NAME"
:value="item.BIANMA" :value="item.NAME"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -45,7 +45,7 @@
<el-button <el-button
class="ml-10" class="ml-10"
type="primary" type="primary"
@click="data.SelectPersonDialogVisible = true" @click="data.dialog.SelectPersonDialogVisible = true"
> >
选择 选择
</el-button> </el-button>
@ -97,8 +97,8 @@
<el-button type="primary" @click="fnSubmit"> </el-button> <el-button type="primary" @click="fnSubmit"> </el-button>
</div> </div>
<select-person <select-person
v-model:visible="data.SelectPersonDialogVisible" v-model:visible="data.dialog.SelectPersonDialogVisible"
:list-data="data.listAll" :selection-data="data.dialog.selectionData"
@submit="fnSelectPersonSubmit" @submit="fnSelectPersonSubmit"
@submitall="fnSelectAllRiskSubmit" @submitall="fnSelectAllRiskSubmit"
/> />
@ -141,23 +141,23 @@ const rules = {
}; };
const relatedClassificationTempList = const relatedClassificationTempList =
await layoutFnGetNotificationsClassification(); await layoutFnGetNotificationsClassification();
const relatedClassificationList = [];
JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => {
relatedClassificationList.push({ name: e.id, BIANMA: e.name });
});
const router = useRouter(); const router = useRouter();
const data = reactive({ const data = reactive({
form: { form: {
TITLE: "", TITLE: "",
CORPINFO_ID: "", CORPINFO_ID: "",
LEVEL: "", LEVEL: "",
PERSON: "", PERSON: [],
fileList: [], fileList: [],
videoList: [], videoList: [],
NOTIFICATIONCONTENT: "", NOTIFICATIONCONTENT: "",
allStatus: 0, // allStatus: 0, //
REPLYSTATUS: "", REPLYSTATUS: "",
}, },
dialog: {
SelectPersonDialogVisible: false,
selectionData: [],
},
}); });
const fnSubmit = async () => { const fnSubmit = async () => {
@ -211,7 +211,7 @@ const fnGetData = async () => {
if (!NOTIFICATION_ID) return; if (!NOTIFICATION_ID) return;
const resData = await getSecurityNoticeInfo({ NOTIFICATION_ID }); const resData = await getSecurityNoticeInfo({ NOTIFICATION_ID });
data.form = resData.pd; data.form = resData.pd;
data.form.PERSON = resData.names[0].NAME; data.dialog.selectionData = resData.pd.PERSON_ID?.split(",");
data.form.fileList = addingPrefixToFile([ data.form.fileList = addingPrefixToFile([
{ {
FILEPATH: data.form.ATTACHMENT_ROUTE, FILEPATH: data.form.ATTACHMENT_ROUTE,
@ -222,8 +222,11 @@ const fnGetData = async () => {
FILEPATH: data.form.VIDEO_ROUTE, FILEPATH: data.form.VIDEO_ROUTE,
}, },
]); ]);
const names = resData.pd.names;
data.form.PERSON = names.map((item) => item.NAME).join(",");
}; };
fnGetData(); fnGetData();
const relatedClassificationList = relatedClassificationTempList.value.list;
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>

View File

@ -28,8 +28,8 @@
<el-option <el-option
v-for="item in relatedClassificationList" v-for="item in relatedClassificationList"
:key="item.BIANMA" :key="item.BIANMA"
:label="item.name" :label="item.NAME"
:value="item.BIANMA" :value="item.NAME"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -61,34 +61,30 @@
<el-table-column prop="TITLE" label="通知标题" width="400" /> <el-table-column prop="TITLE" label="通知标题" width="400" />
<el-table-column label="通知等级" width="200"> <el-table-column label="通知等级" width="200">
<template #default="{ row }"> <template #default="{ row }">
<el-tag>{{ row.LEVEL }}</el-tag> <el-tag v-if="row.LEVEL === '紧急通知'" type="error">{{
row.LEVEL
}}</el-tag>
<el-tag v-if="row.LEVEL === '一般通知'">{{ row.LEVEL }}</el-tag>
<el-tag v-if="row.LEVEL === '重要通知'" type="warning">{{
row.LEVEL
}}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="POSTSTATUS" label="发布状态" width="200"> <el-table-column prop="POSTSTATUS" label="发布状态" width="200">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.POSTSTATUS === '0'" type="warning " <el-tag v-if="row.POSTSTATUS === '0'" type="warning"></el-tag>
>待发布</el-tag
>
<el-tag v-else type="success">已发布</el-tag> <el-tag v-else type="success">已发布</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="回复情况" width="150"> <el-table-column label="回复情况" width="150">
<template #default="{ row }"> <template #default="{ row }">
{{ {{ row.COUNT_REPLY + "/" + row.TOTALREADDETAIL + "人" }}
row.REPLYSTATUSNUM
? row.REPLYSTATUSNUM + "/" + row.TOTALREADDETAIL + "人"
: "0/" + row.TOTALREADDETAIL + "人"
}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="签收情况" width="150"> <el-table-column label="签收情况" width="150">
<template #default="{ row }"> <template #default="{ row }">
{{ {{ row.COUNT_SIGNING + "/" + row.TOTALREADDETAIL + "人" }}
row.SIGNEDSTATUSNUM
? row.SIGNEDSTATUSNUM + "/" + row.TOTALREADDETAIL + "人"
: "0/" + row.TOTALREADDETAIL + "人"
}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CREATETIME" label="创建时间" width="200" /> <el-table-column prop="CREATETIME" label="创建时间" width="200" />
@ -169,7 +165,7 @@
<script setup> <script setup>
import { serialNumber } from "@/assets/js/utils"; import { serialNumber } from "@/assets/js/utils";
import useListData from "@/assets/js/useListData.js"; import useListData from "@/assets/js/useListData.js";
import { onMounted, ref } from "vue"; import { ref } from "vue";
import { import {
getSecurityNoticeList, getSecurityNoticeList,
layoutFnGetNotificationsClassification, layoutFnGetNotificationsClassification,
@ -192,6 +188,10 @@ const fnResetPaginationTransfer = () => {
DEPTIDS: searchForm.value.DEPTIDS?.join(","), DEPTIDS: searchForm.value.DEPTIDS?.join(","),
}); });
}; };
const relatedClassificationTempList =
await layoutFnGetNotificationsClassification();
const fnBatchDelete = debounce( const fnBatchDelete = debounce(
1000, 1000,
async () => { async () => {
@ -211,7 +211,6 @@ const fnBatchDelete = debounce(
}, },
{ atBegin: true } { atBegin: true }
); );
const relatedClassificationList = ref(null);
// //
const deleteItem = async (value) => { const deleteItem = async (value) => {
@ -231,11 +230,7 @@ const issueItem = async (value) => {
ElMessage.success("发布成功"); ElMessage.success("发布成功");
fnGetData(); fnGetData();
}; };
const relatedClassificationList = relatedClassificationTempList.value.list;
onMounted(async () => {
const data = await layoutFnGetNotificationsClassification();
relatedClassificationList.value = JSON.parse(data.value.zTreeNodes);
});
</script> </script>
<style scoped></style> <style scoped></style>

View File

@ -83,7 +83,7 @@ const detailItems = ref({
const fnGetData = async () => { const fnGetData = async () => {
const response = await getSecurityNoticeInfo({ NOTIFICATION_ID }); const response = await getSecurityNoticeInfo({ NOTIFICATION_ID });
detailItems.value = response.pd; detailItems.value = response.pd;
console.log("detail",detailItems); console.log("detail",response);
}; };
fnGetData(); fnGetData();
</script> </script>