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

bug优化

dev
WenShiJun 2024-03-28 18:36:17 +08:00
parent 5cfc44479c
commit 0369b0a784
17 changed files with 264 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/request/enterprise_management.js
View File

@ -55,6 +55,9 @@ export const getElectronicFenceView = (params) =>
post("/electronicfence/goEdit", params); // 电子围栏区域详情 post("/electronicfence/goEdit", params); // 电子围栏区域详情
export const getFreightTrailerList = (params) => export const getFreightTrailerList = (params) =>
post("/freightTrailer/list", params); // 货运挂车列表 post("/freightTrailer/list", params); // 货运挂车列表
export const setFreightTrailerImport = (params) =>
upload("/freightTrailer/readExcel", params); // 货运挂车导入
export const getFreightTrailerView = (params) => export const getFreightTrailerView = (params) =>
post("/freightTrailer/goEdit", params); // 货运挂车查看 post("/freightTrailer/goEdit", params); // 货运挂车查看
export const setFreightTrailerAdd = (params) => export const setFreightTrailerAdd = (params) =>

6
src/views/driving_inspections/driving_commitment/index.vue
View File

@ -35,14 +35,14 @@
{{ serialNumber(pagination, $index) }} {{ serialNumber(pagination, $index) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="INQUIRYCONTENT" label="问询内容" width="330" /> <el-table-column prop="INQUIRYCONTENT" label="问询内容" width="800" />
<el-table-column <el-table-column
prop="INQUIRYCONCLUSION" prop="INQUIRYCONCLUSION"
label="问询结果" label="问询结果"
width="230" width="230"
/> />
<el-table-column prop="CREATTIME" label="创建时间" width="130" /> <el-table-column prop="CREATTIME" label="创建时间" width="200" />
<el-table-column prop="OPERATTIME" label="修改时间" width="130" /> <el-table-column prop="OPERATTIME" label="修改时间" width="200" />
<el-table-column label="操作"> <el-table-column label="操作">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button

10
src/views/enterprise_management/basics_info_management/freight_trailer/index.vue
View File

@ -71,7 +71,11 @@
width="150" width="150"
/> />
<el-table-column prop="DUE_DATE" label="到期日期" width="200" /> <el-table-column prop="DUE_DATE" label="到期日期" width="200" />
<el-table-column prop="DEPARTMENT_NAME" label="归属部门" width="150" /> <el-table-column label="归属部门" width="150">
<template #default="{ row }">
{{ row.DEPARTMENT_NAME || row.BELONGING_DEPT || "" }}
</template>
</el-table-column>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
@ -141,10 +145,10 @@ import useListData from "@/assets/js/useListData.js";
import { import {
getFreightTrailerList, getFreightTrailerList,
setFreightTrailerDelete, setFreightTrailerDelete,
setFreightTrailerImport,
} from "@/request/enterprise_management.js"; } from "@/request/enterprise_management.js";
import { debounce } from "throttle-debounce"; import { debounce } from "throttle-debounce";
import { ElMessageBox, ElMessage } from "element-plus"; import { ElMessageBox, ElMessage } from "element-plus";
import { setRiskPointImport } from "@/request/risk_control.js";
import LayoutImportFile from "@/components/import_file/index.vue"; import LayoutImportFile from "@/components/import_file/index.vue";
import { reactive } from "vue"; import { reactive } from "vue";
const router = useRouter(); const router = useRouter();
@ -173,7 +177,7 @@ const fnImportDialogChangeShow = () => {
data.importDialogVisible = !data.importDialogVisible; data.importDialogVisible = !data.importDialogVisible;
}; };
const fnSubmitImport = async (formData) => { const fnSubmitImport = async (formData) => {
const resData = await setRiskPointImport(formData); const resData = await setFreightTrailerImport(formData);
if (resData.resultStr) { if (resData.resultStr) {
ElMessage({ ElMessage({
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,

275
src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
View File

@ -1,143 +1,143 @@
<template> <template>
<layout-card> <layout-card>
<div id="printContainer"> <div id="printContainer">
<el-divider content-position="left">基本信息</el-divider> <el-divider content-position="left">基本信息</el-divider>
<el-descriptions border> <el-descriptions border>
<el-descriptions-item label="编号"> <el-descriptions-item label="编号">
{{ info.GOODSSELFNUMBER }} {{ info.GOODSSELFNUMBER }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="车牌号"> <el-descriptions-item label="车牌号">
{{ info.PLATE_NUMBER }} {{ info.PLATE_NUMBER }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="车辆颜色"> <el-descriptions-item label="车辆颜色">
{{ info.VEHICLE_COLOR }} {{ info.VEHICLE_COLOR }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="车架号"> <el-descriptions-item label="车架号">
{{ info.FRAMES_NUMBER }} {{ info.FRAMES_NUMBER }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="发动机号"> <el-descriptions-item label="发动机号">
{{ info.ENGINE_NUMBER }} {{ info.ENGINE_NUMBER }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="营运证号"> <el-descriptions-item label="营运证号">
{{ info.OPERATING_CERTIFICATE }} {{ info.OPERATING_CERTIFICATE }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="归属部门"> <el-descriptions-item label="归属部门">
{{ info.BELONGING_DEPARTMENT }} {{ info.BELONGING_DEPARTMENT }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="车辆类型"> <el-descriptions-item label="车辆类型">
{{ info.VEHICLE_TYPE }} {{ info.VEHICLE_TYPE }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="初登日期"> <el-descriptions-item label="初登日期">
{{ info.FIRSTSHOW_DATE }} {{ info.FIRSTSHOW_DATE }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="发证日期"> <el-descriptions-item label="发证日期">
{{ info.CERTIFICATE_DATE }} {{ info.CERTIFICATE_DATE }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="到期日期"> <el-descriptions-item label="到期日期">
{{ info.EXPIRE_DATE }} {{ info.EXPIRE_DATE }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="车主/业主"> <el-descriptions-item label="车主/业主">
{{ info.VEHICLEOWNER }} {{ info.VEHICLEOWNER }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="车主电话"> <el-descriptions-item label="车主电话">
{{ info.VEHICLEOWNER_NUMBER }} {{ info.VEHICLEOWNER_NUMBER }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="车主住址"> <el-descriptions-item label="车主住址">
{{ info.VEHICLEOWNER_ADDRESS }} {{ info.VEHICLEOWNER_ADDRESS }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="联系人"> <el-descriptions-item label="联系人">
{{ info.CONTACT }} {{ info.CONTACT }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="联系电话"> <el-descriptions-item label="联系电话">
{{ info.CONTACT_NUMBER }} {{ info.CONTACT_NUMBER }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="家庭住址"> <el-descriptions-item label="家庭住址">
{{ info.HOME_ADDRESS }} {{ info.HOME_ADDRESS }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="实际住址"> <el-descriptions-item label="实际住址">
{{ info.PHYSICAL_ADDRESS }} {{ info.PHYSICAL_ADDRESS }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="车载设备"> <el-descriptions-item label="车载设备">
{{ info.VEHICLE_EQUIPMENT }} {{ info.VEHICLE_EQUIPMENT }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="运输类别"> <el-descriptions-item label="运输类别">
{{ info.TRANSPORT_TYPE }} {{ info.TRANSPORT_TYPE }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-divider content-position="left">详细信息</el-divider> <el-divider content-position="left">详细信息</el-divider>
<el-descriptions border> <el-descriptions border>
<el-descriptions-item label="车辆品牌"> <el-descriptions-item label="车辆品牌">
{{ info.VEHICLE_BRAND }} {{ info.VEHICLE_BRAND }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="车辆型号"> <el-descriptions-item label="车辆型号">
{{ info.VEHICLE_MODEL }} {{ info.VEHICLE_MODEL }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="燃料类型"> <el-descriptions-item label="燃料类型">
{{ info.FUEL_TYPE }} {{ info.FUEL_TYPE }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="排放标准"> <el-descriptions-item label="排放标准">
{{ info.EMISSION_STANDARD }} {{ info.EMISSION_STANDARD }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="核定总质量"> <el-descriptions-item label="核定总质量">
{{ info.VOUCH_TOTALMASS }} {{ info.VOUCH_TOTALMASS }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="核定载质量"> <el-descriptions-item label="核定载质量">
{{ info.VOUCH_PAYLOAD }} {{ info.VOUCH_PAYLOAD }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="准牵引质量"> <el-descriptions-item label="准牵引质量">
{{ info.RACTIONMASS_QUALITY }} {{ info.RACTIONMASS_QUALITY }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="核定载人数"> <el-descriptions-item label="核定载人数">
{{ info.VOUCH_NUMBERLOAD }} {{ info.VOUCH_NUMBERLOAD }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="1" border> <el-descriptions :column="1" border>
<el-descriptions-item label="备注"> <el-descriptions-item label="备注">
{{ info.REMARK }} {{ info.REMARK }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-divider content-position="left">相关照片</el-divider> <el-divider content-position="left">相关照片</el-divider>
<el-descriptions :column="3" border> <el-descriptions :column="3" border>
<el-descriptions-item label="车头照片"> <el-descriptions-item label="车头照片">
<img <img
v-for="item in info.HEADSTOCK_PHOTO" v-for="item in info.HEADSTOCK_PHOTO"
:key="item.FILEPATH" :key="item.FILEPATH"
v-viewer v-viewer
:src="item.url" :src="item.url"
width="100" width="100"
height="100" height="100"
alt="" alt=""
class="ml-10" class="ml-10"
/> />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="行驶证照片"> <el-descriptions-item label="行驶证照片">
<img <img
v-for="item in info.DRIVINGLICENSE_PHOTO" v-for="item in info.DRIVINGLICENSE_PHOTO"
:key="item.FILEPATH" :key="item.FILEPATH"
v-viewer v-viewer
:src="item.url" :src="item.url"
width="100" width="100"
height="100" height="100"
alt="" alt=""
class="ml-10" class="ml-10"
/> />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="营运证照片"> <el-descriptions-item label="营运证照片">
<img <img
v-for="item in info.OPERATING_CERTIFICATE_PHOTO" v-for="item in info.OPERATING_CERTIFICATE_PHOTO"
:key="item.FILEPATH" :key="item.FILEPATH"
v-viewer v-viewer
:src="item.url" :src="item.url"
width="100" width="100"
height="100" height="100"
alt="" alt=""
class="ml-10" class="ml-10"
/> />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="车辆资料"> <el-descriptions-item label="车辆资料">
{{ info.VEHICLE_MATERIAL }} {{ info.VEHICLE_MATERIAL }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
<div class="mt-10 tc"> <div class="mt-10 tc">
<el-button v-print="'#printContainer'" type="primary">打印</el-button> <el-button v-print="'#printContainer'" type="primary">打印</el-button>
@ -158,7 +158,6 @@ const info = ref({});
const fnGetData = async () => { const fnGetData = async () => {
if (!OPERATING_ID) return; if (!OPERATING_ID) return;
const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID }); const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID });
console.log("-=-=-=-",resData);
info.value = resData.pd; info.value = resData.pd;
info.value.HEADSTOCK_PHOTO = addingPrefixToFile(resData.headstockphoto); info.value.HEADSTOCK_PHOTO = addingPrefixToFile(resData.headstockphoto);
info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile( info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile(

4
src/views/mechanical_files/taxation_manage/index.vue
View File

@ -185,8 +185,6 @@
<script setup> <script setup>
import { serialNumber } from "@/assets/js/utils.js"; import { serialNumber } from "@/assets/js/utils.js";
import useListData from "@/assets/js/useListData.js"; import useListData from "@/assets/js/useListData.js";
import { layoutFnGetRemindStatus } from "@/assets/js/taxation_manage.js";
import {
import { import {
getTaxationManageList, getTaxationManageList,
setTaxatonManageDelete, setTaxatonManageDelete,
@ -195,7 +193,7 @@ import { useRouter } from "vue-router";
import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js"; import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
import { debounce } from "throttle-debounce"; import { debounce } from "throttle-debounce";
import { ElMessage, ElMessageBox } from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
import { EXPIRE_STATUS, REMINDER_STATUS } from "@/assets/js/constant.js"; import { REMINDER_STATUS } from "@/assets/js/constant.js";
const router = useRouter(); const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination } = const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getTaxationManageList, {}); useListData(getTaxationManageList, {});

31
src/views/production_course_regulate/entrench_thing_grant/add.vue
View File

@ -88,35 +88,44 @@ const router = useRouter();
const PROTECTIVEEQUIPMENT_ID = route.query.PROTECTIVEEQUIPMENT_ID; const PROTECTIVEEQUIPMENT_ID = route.query.PROTECTIVEEQUIPMENT_ID;
const rules = { const rules = {
MANAGING_ENTERPRISE: [ PERSON_NAME: [
{ required: true, message: "经营企业不能为空", trigger: "blur" }, { required: true, message: "人员名称不能为空", trigger: "blur" },
], ],
GLOVE: [ GLOVE: [
{ pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" }, { required: true, message: "手套数量不能为空", trigger: "blur" },
{ pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
], ],
MASK: [ MASK: [
{ pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" }, { required: true, message: "口罩数量不能为空", trigger: "blur" },
{ pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
], ],
OVERALL: [ OVERALL: [
{ pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" }, { required: true, message: "工作服数量不能为空", trigger: "blur" },
{ pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
], ],
FOOTWARE: [ FOOTWARE: [
{ pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" }, { required: true, message: "工作鞋数量不能为空", trigger: "blur" },
{ pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
], ],
WINTER_COAT: [ WINTER_COAT: [
{ pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" }, { required: true, message: "防寒服数量不能为空", trigger: "blur" },
{ pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
], ],
RAINCOAT: [ RAINCOAT: [
{ pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" }, { required: true, message: "雨衣数量不能为空", trigger: "blur" },
{ pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
], ],
GOGGLES: [ GOGGLES: [
{ pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" }, { required: true, message: "护目镜数量不能为空", trigger: "blur" },
{ pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
], ],
AID_KIT: [ AID_KIT: [
{ pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" }, { required: true, message: "急救药箱数量不能为空", trigger: "blur" },
{ pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
], ],
HELMET: [ HELMET: [
{ pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" }, { required: true, message: "安全帽数量不能为空", trigger: "blur" },
{ pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
], ],
}; };

4
src/views/production_course_regulate/firefighting_equipment_facility/add.vue
View File

@ -191,9 +191,9 @@ const fnSubmit = debounce(
}, },
{ atBegin: true } { atBegin: true }
); );
const fnUploadImage = async (HIDDEN_ID, FFILE, TYPE) => { const fnUploadImage = async (currentEquipmentFacilityId, FFILE, TYPE) => {
const formData = new FormData(); const formData = new FormData();
formData.append("FOREIGN_KEY", HIDDEN_ID); formData.append("FOREIGN_KEY", currentEquipmentFacilityId);
formData.append("TYPE", TYPE); formData.append("TYPE", TYPE);
formData.append("FFILE", FFILE); formData.append("FFILE", FFILE);
await setUploadImg(formData); await setUploadImg(formData);

9
src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue
View File

@ -22,7 +22,11 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-divider content-position="left">保养记录</el-divider> <el-divider content-position="left">保养记录</el-divider>
<layout-table :data="list" :show-pagination="false"> <layout-table
:data="list"
:show-pagination="false"
@submit.prevent="fnResetPagination"
>
<el-table-column type="index" label="序号" align="center" /> <el-table-column type="index" label="序号" align="center" />
<el-table-column prop="MAINTAIN_DATE" label="保养时间" /> <el-table-column prop="MAINTAIN_DATE" label="保养时间" />
<el-table-column prop="MAINTAIN_CONDITION" label="保养情况" /> <el-table-column prop="MAINTAIN_CONDITION" label="保养情况" />
@ -95,7 +99,7 @@ const getData = async () => {
data.value = pd; data.value = pd;
}; };
getData(); getData();
const { list } = useListData(getMaintainFindFirefightingId, { const { list, fnResetPagination } = useListData(getMaintainFindFirefightingId, {
otherParams: { FIREFIGHTINGFACILITY_ID }, otherParams: { FIREFIGHTINGFACILITY_ID },
usePagination: false, usePagination: false,
}); });
@ -106,6 +110,7 @@ const fnDelete = debounce(
await ElMessageBox.confirm("确定要删除吗？", { type: "warning" }); await ElMessageBox.confirm("确定要删除吗？", { type: "warning" });
await setFirefightingMaintainDelete({ FIREFIGHTINGMAINTAIN_ID }); await setFirefightingMaintainDelete({ FIREFIGHTINGMAINTAIN_ID });
ElMessage.success("删除成功"); ElMessage.success("删除成功");
fnResetPagination();
}, },
{ atBegin: true } { atBegin: true }
); );

80
src/views/production_course_regulate/firefighting_equipment_facility/view.vue
View File

@ -1,35 +1,50 @@
<template> <template>
<layout-card> <layout-card>
<div id="printContainer"> <div id="printContainer">
<el-divider content-position="left">基本信息</el-divider> <el-divider content-position="left">基本信息</el-divider>
<el-descriptions border> <el-descriptions border>
<el-descriptions-item label="设施编号"> <el-descriptions-item label="设施编号">
{{ data.FACILITY_NUMBER }} {{ data.FACILITY_NUMBER }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="登记时间"> <el-descriptions-item label="设施名称">
{{ data.REGISTRATION_TIME }} {{ data.FACILITY_NAME }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="设施单位"> <el-descriptions-item label="登记时间">
{{ data.FACILITY_UNIT }} {{ data.REGISTRATION_TIME }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="设施数量"> <el-descriptions-item label="设施单位">
{{ data.FACILITY_COUNT }} {{ data.FACILITY_UNIT }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="设施位置"> <el-descriptions-item label="设施数量">
{{ data.FACILITY_LOCALTION }} {{ data.FACILITY_COUNT }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="设施负责人"> <el-descriptions-item label="设施位置">
{{ data.FACILITY_PRINCIPAL }} {{ data.FACILITY_LOCALTION }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> <el-descriptions-item label="设施负责人">
<el-divider content-position="left">保养记录</el-divider> {{ data.FACILITY_PRINCIPAL }}
<layout-table :data="list" :show-pagination="false"> </el-descriptions-item>
<el-table-column type="index" label="序号" align="center" /> <el-descriptions-item label="设施设备">
<el-table-column prop="MAINTAIN_DATE" label="保养时间" /> <img
<el-table-column prop="MAINTAIN_CONDITION" label="保养情况" /> v-for="item in data.Images"
<el-table-column prop="MAINTAIN_PERSON" label="保养人" /> :key="item.FILEPATH"
<el-table-column prop="REMARK" label="备注" /> v-viewer
</layout-table> :src="item.url"
width="100"
height="100"
alt=""
class="ml-10"
/>
</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">保养记录</el-divider>
<layout-table :data="list" :show-pagination="false">
<el-table-column type="index" label="序号" align="center" />
<el-table-column prop="MAINTAIN_DATE" label="保养时间" />
<el-table-column prop="MAINTAIN_CONDITION" label="保养情况" />
<el-table-column prop="MAINTAIN_PERSON" label="保养人" />
<el-table-column prop="REMARK" label="备注" />
</layout-table>
</div> </div>
<div class="mt-10 tc"> <div class="mt-10 tc">
<el-button v-print="'#printContainer'" type="primary">打印</el-button> <el-button v-print="'#printContainer'" type="primary">打印</el-button>
@ -47,14 +62,17 @@ import { useRoute } from "vue-router";
import { ref } from "vue"; import { ref } from "vue";
import useListData from "@/assets/js/useListData.js"; import useListData from "@/assets/js/useListData.js";
import { PRINT_STYLE } from "@/assets/js/constant.js"; import { PRINT_STYLE } from "@/assets/js/constant.js";
import { addingPrefixToFile } from "@/assets/js/utils.js";
const route = useRoute(); const route = useRoute();
const { FIREFIGHTINGFACILITY_ID } = route.query; const { FIREFIGHTINGFACILITY_ID } = route.query;
const data = ref({}); const data = ref({});
const getData = async () => { const getData = async () => {
const { pd } = await getFirefightingEquipmentFacilityView({ const response = await getFirefightingEquipmentFacilityView({
FIREFIGHTINGFACILITY_ID, FIREFIGHTINGFACILITY_ID,
}); });
data.value = pd; data.value = response.pd;
data.value.Images = addingPrefixToFile(response.firefightingequipmentImg);
}; };
getData(); getData();
const { list } = useListData(getMaintainFindFirefightingId, { const { list } = useListData(getMaintainFindFirefightingId, {

3
src/views/production_course_regulate/management_agreement/components/add.vue
View File

@ -90,6 +90,9 @@ const emits = defineEmits(["update:visible", "update:form", "get-data"]);
const { visible, form } = useVModels(props, emits); const { visible, form } = useVModels(props, emits);
const rules = { const rules = {
file: [{ required: true, message: "请上传附件", trigger: "change" }], file: [{ required: true, message: "请上传附件", trigger: "change" }],
EXPIRYDATE: [
{ required: true, message: "请选择到期时间", trigger: "change" },
],
MANAGEMENTAGREEMENTNAME: [ MANAGEMENTAGREEMENTNAME: [
{ required: true, message: "请输入名称", trigger: "blur" }, { required: true, message: "请输入名称", trigger: "blur" },
], ],

2
src/views/production_course_regulate/reported_incident_dispose/index.vue
View File

@ -65,7 +65,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="REPORTPERSON" label="上报人" width="150" /> <el-table-column prop="REPORTPERSON" label="上报人" width="150" />
<el-table-column prop="DISPOSE_STATUS" label="处理状态" width="150" /> <el-table-column prop="DISPOSE_STATUS" label="处理状态" width="150" />
<el-table-column prop="REPORTED_CONTENT" label="上报内容" width="300" /> <el-table-column prop="REPORTED_CONTENT" label="上报内容" width="600" />
<el-table-column prop="DISPOSE_RESULT" label="处理结果" width="150" /> <el-table-column prop="DISPOSE_RESULT" label="处理结果" width="150" />
<el-table-column prop="REPORTED_TIME" label="上报时间" width="180" /> <el-table-column prop="REPORTED_TIME" label="上报时间" width="180" />
<el-table-column prop="DISPOSE_DATE" label="处理时间" width="180" /> <el-table-column prop="DISPOSE_DATE" label="处理时间" width="180" />

13
src/views/production_course_regulate/violation_registration/add.vue
View File

@ -6,7 +6,9 @@
:rules="rules" :rules="rules"
label-width="175px" label-width="175px"
> >
<el-divider content-position="left">添加</el-divider> <el-divider content-position="left">{{
isEditMode ? "编辑" : "添加"
}}</el-divider>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="从业人员" prop="USER_ID"> <el-form-item label="从业人员" prop="USER_ID">
@ -115,6 +117,7 @@ import { useRouter, useRoute } from "vue-router";
import { import {
addViolationRegistrationView, addViolationRegistrationView,
editViolationRegistration, editViolationRegistration,
infoViolationRegistration,
} from "@/request/violation_registration.js"; } from "@/request/violation_registration.js";
const formRef = ref(null); const formRef = ref(null);
@ -143,9 +146,13 @@ const route = useRoute();
const isEditMode = ref(false); const isEditMode = ref(false);
const registrationId = ref(""); const registrationId = ref("");
onMounted(() => { onMounted(async () => {
isEditMode.value = route.query.mode === "edit"; isEditMode.value = route.query.mode === "edit";
registrationId.value = route.query.registrationId || ""; registrationId.value = route.query.REGISTRATION_ID || "";
const resData = await infoViolationRegistration({
REGISTRATION_ID: registrationId.value,
});
console.log(resData, "11111111111111");
}); });
const router = useRouter(); const router = useRouter();

4
src/views/production_course_regulate/violation_registration/index.vue
View File

@ -139,12 +139,12 @@ const data = reactive({
info: {}, info: {},
}, },
}); });
const fnAddOrEdit = (registrationId) => { const fnAddOrEdit = async (REGISTRATION_ID) => {
router.push({ router.push({
path: "/production_course_regulate/violation_registration/add", path: "/production_course_regulate/violation_registration/add",
query: { query: {
mode: "edit", mode: "edit",
registrationId, REGISTRATION_ID,
}, },
}); });
}; };

10
src/views/safety_culture/safety_activities/index.vue
View File

@ -150,11 +150,17 @@ const fnAddOrEdit = async (ACTIVITIES_ID = "", type = "add") => {
data.addOrEditDialog.visible = true; data.addOrEditDialog.visible = true;
data.addOrEditDialog.type = type; data.addOrEditDialog.type = type;
if (type === "edit" && ACTIVITIES_ID) { if (type === "edit" && ACTIVITIES_ID) {
data.addOrEditDialog.form.ACTIVITIES_ID = ACTIVITIES_ID; const resData = await infoActivitiesView({ ACTIVITIES_ID });
if (resData && resData.pd) {
data.addOrEditDialog.form = {
...resData.pd,
OPERATINGCOMPANY: resData.pd.CORP_NAME,
EXPIRYDATE: resData.pd.EXPIRYDATE,
};
}
} else { } else {
data.addOrEditDialog.form = {}; data.addOrEditDialog.form = {};
} }
await nextTick(); await nextTick();
}; };

11
src/views/safety_culture/safety_manual/index.vue
View File

@ -141,15 +141,22 @@ const data = reactive({
info: {}, info: {},
}, },
}); });
const fnAddOrEdit = async (MANUAL_ID = "", type = "add") => { const fnAddOrEdit = async (MANUAL_ID = "", type = "add") => {
data.addOrEditDialog.visible = true; data.addOrEditDialog.visible = true;
data.addOrEditDialog.type = type; data.addOrEditDialog.type = type;
if (type === "edit" && MANUAL_ID) { if (type === "edit" && MANUAL_ID) {
data.addOrEditDialog.form.MANUAL_ID = MANUAL_ID; const resData = await infoManualView({ MANUAL_ID });
if (resData && resData.pd) {
data.addOrEditDialog.form = {
...resData.pd,
OPERATINGCOMPANY: resData.pd.CORP_NAME,
EXPIRYDATE: resData.pd.EXPIRYDATE,
};
}
} else { } else {
data.addOrEditDialog.form = {}; data.addOrEditDialog.form = {};
} }
await nextTick(); await nextTick();
}; };

2
src/views/safety_production_related/safety_meeting/details.vue
View File

@ -60,7 +60,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="从业人员" prop="NAME" /> <el-table-column label="从业人员" prop="NAME" />
<el-table-column label="从业类型" prop="PRACTITIONER_TYPE" /> <el-table-column label="从业类型" prop="DICTIONARIES_NAME" />
<el-table-column label="联系电话" prop="USERNAME" /> <el-table-column label="联系电话" prop="USERNAME" />
<el-table-column label="参会状态" prop="ATTENDANCE_STATUS"> <el-table-column label="参会状态" prop="ATTENDANCE_STATUS">
<template #default="{ row }"> <template #default="{ row }">

2
src/views/safety_production_related/security_notice/components/select_person.vue
View File

@ -55,7 +55,7 @@
<el-table-column prop="USER_ID" label="用户Id" /> <el-table-column prop="USER_ID" label="用户Id" />
<el-table-column prop="NAME" label="姓名" /> <el-table-column prop="NAME" label="姓名" />
<el-table-column prop="DEPARTMENT_NAME" label="部门" /> <el-table-column prop="DEPARTMENT_NAME" label="部门" />
<el-table-column prop="PRACTITIONERTYPE" label="从业类型" /> <el-table-column prop="PERSONNEL_TYPE_NAME" label="从业类型" />
</layout-table> </layout-table>
<template #footer> <template #footer>
<el-button @click="fnClose">取消</el-button> <el-button @click="fnClose">取消</el-button>