diff --git a/src/request/enterprise_safety_production.js b/src/request/enterprise_safety_production.js
index 03bd3b8..af79ebd 100644
--- a/src/request/enterprise_safety_production.js
+++ b/src/request/enterprise_safety_production.js
@@ -3,11 +3,14 @@ import { post, upload } from "@/request/axios.js";
export const getEnterpriseSafetyProductionList = (params) =>
post("/enterprisesafetyproduction/list", params); // 企业安全生产值班记录列表
-export const setEnterpriseSafetyProductEdit = (params) =>
+export const getEnterpriseSafetyProductEdit = (params) =>
upload("/enterprisesafetyproduction/goEdit", params); // 修改企业安全生产值班记录
export const setEnterpriseSafetyProductAdd = (params) =>
upload("/enterprisesafetyproduction/add", params); // 新增企业安全生产值班记录
+export const setEnterpriseSafetyProductEdit = (params) =>
+ upload("/enterprisesafetyproduction/edit", params); // 新增企业安全生产值班记录
+
export const setEnterpriseSafetyProductDelete = (params) =>
upload("/enterprisesafetyproduction/delete", params); // 新增企业安全生产值班记录
diff --git a/src/request/mechanical_files.js b/src/request/mechanical_files.js
index 665b2fd..6852fc0 100644
--- a/src/request/mechanical_files.js
+++ b/src/request/mechanical_files.js
@@ -20,11 +20,13 @@ export const setInsureAdd = (params) => post("/insure/add", params); // 保险
export const setInsureEdit = (params) => post("/insure/edit", params); // 保险管理修改
export const setInsureDelete = (params) => post("/insure/delete", params); // 保险管理删除
export const setInsureEdit2 = (params) => post("/insure/edit2", params); // 保险管理修改开启关闭
+export const getTrailerList2 = (params) => post("/insure/vehicleList", params);
export const getOperationsList = (params) => post("/operations/list", params); // 运营管理列表
export const getOperationsView = (params) => post("/operations/goEdit", params); // 运营管理查看
export const setOperationsAdd = (params) => post("/operations/add", params); // 运营管理新增
export const setOperationsEdit = (params) => post("/operations/edit", params); // 运营管理修改
+export const getOperationTrailerList = (params) => post("/operations/vehicleList", params);
export const setOperationsDelete = (params) =>
post("/operations/delete", params); // 运营管理删除
export const setOperationsEdit2 = (params) => post("/operations/edit2", params); // 运营管理修改开启关闭
@@ -39,9 +41,13 @@ export const setMaintenanceDelete = (params) =>
export const setMaintenanceEdit2 = (params) =>
post("/maintenance/edit2", params); // 维保管理修改开启关闭
+export const getTrailerListMaintenance = (params) => post("/maintenance/vehicleList", params);
+
export const getBeidouList = (params) => post("/beidou/list", params); // 维保管理列表
export const getBeidouView = (params) => post("/beidou/goEdit", params); // 维保管理查看
export const setBeidouAdd = (params) => post("/beidou/add", params); // 维保管理新增
export const setBeidouEdit = (params) => post("/beidou/edit", params); // 维保管理修改
export const setBeidouDelete = (params) => post("/beidou/delete", params); // 维保管理删除
export const setBeidouEdit2 = (params) => post("/beidou/edit2", params); // 维保管理修改开启关闭
+
+export const getTrailerListCompass = (params) => post("/beidou/vehicleList", params);
diff --git a/src/request/operation_vehicle.js b/src/request/operation_vehicle.js
index 0135d46..3a88346 100644
--- a/src/request/operation_vehicle.js
+++ b/src/request/operation_vehicle.js
@@ -100,6 +100,9 @@ export const editOperatingVehicleInfo = (params) =>
export const getOperationVehicleInfo = (params) =>
post("/operatingvehicles/findById", params); // 根据Id获取运营车辆信息
+export const setOperationsScrapStatus = (params) =>
+ post("/operatingvehicles/setOperationsScrapStatus", params); // 根据Id获取运营车辆信息
+
export const findByPlateNumber = (params) =>
post("/operatingvehicles/findByPlateNumber", params); // 根据Id获取运营车辆信息
diff --git a/src/views/mechanical_files/assigned_manage/add.vue b/src/views/mechanical_files/assigned_manage/add.vue
index a37ad81..d3233ff 100644
--- a/src/views/mechanical_files/assigned_manage/add.vue
+++ b/src/views/mechanical_files/assigned_manage/add.vue
@@ -277,7 +277,7 @@ import {
getFreightTrailerView,
} from "@/request/enterprise_management.js";
import {
- findByIdOperatingVehicleInfo,
+ findByIdOperatingVehicleInfo
} from "@/request/operation_vehicle.js";
import LayoutUpload from "@/components/upload/index.vue";
import { debounce } from "throttle-debounce";
@@ -308,7 +308,6 @@ const freightVehicleList = await getAssignedFreightTrailerList();
const assignedWayList = await layoutFnGetAssignedWay();
const operationList = await getAssignedOperationVehicleList();
-
const rules = {
ASSIGNED_VEHICLE_MODEL: [
{ required: true, message: "过户车型不能为空", trigger: "change" },
@@ -344,9 +343,6 @@ const rules = {
NOW_OWNERS: [
{ required: true, message: "请输入现车主/业主", trigger: "blur" },
],
- NOW_PLATE_NUMBER: [
- { required: true, message: "请输入现车牌号", trigger: "blur" },
- ]
};
const formRef = ref(null);
const form = ref({
diff --git a/src/views/mechanical_files/beidou/add.vue b/src/views/mechanical_files/beidou/add.vue
index f9079ef..ceed5e0 100644
--- a/src/views/mechanical_files/beidou/add.vue
+++ b/src/views/mechanical_files/beidou/add.vue
@@ -134,7 +134,7 @@
-
+
-
+
{
if (form.value.DUE_DATE) {
// 计算提醒日期
const reminderDateStr = subtractDaysFromDate(form.value.DUE_DATE, val);
+ console.log(reminderDateStr);
const reminderDate = new Date(reminderDateStr);
const today = new Date();
@@ -325,7 +326,7 @@ const getRemiderDate = (val) => {
}
};
const getVehicle = async (event) => {
- const resData = await getTrailerList({ TRAFFIC_TYPE: event });
+ const resData = await getTrailerListCompass({ TRAFFIC_TYPE: event });
data.vehicleList = resData.list;
form.value.VEHICLE = "";
data.busInfo.DRIVING_LICENSE_IMG = [];
@@ -339,7 +340,7 @@ const getVehicle = async (event) => {
};
getVehicle("1");
const fnBusChange = async (event) => {
- const resData = await getTrailerList({ ID: event });
+ const resData = await getTrailerListCompass({ ID: event });
data.busInfo = resData.list[0];
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile(
resData.drivingLicenseImgs
diff --git a/src/views/mechanical_files/beidou/edit.vue b/src/views/mechanical_files/beidou/edit.vue
index f6cb323..864a3a6 100644
--- a/src/views/mechanical_files/beidou/edit.vue
+++ b/src/views/mechanical_files/beidou/edit.vue
@@ -134,7 +134,7 @@
-
+
-
+
{{ info.DUE_DATE }}
-
+
{{ info.ACTUAL_COLLECTION }}
-
+
{{ info.ALL_FEES }}
diff --git a/src/views/mechanical_files/inspect_annually/add.vue b/src/views/mechanical_files/inspect_annually/add.vue
index cee55ba..2ac001c 100644
--- a/src/views/mechanical_files/inspect_annually/add.vue
+++ b/src/views/mechanical_files/inspect_annually/add.vue
@@ -155,7 +155,7 @@
-
+
-
+
{
};
const getRemiderDate = (val) => {
if (val) {
- console.log("REMINDER_DAYS",form.value.REMINDER_DAYS);
if (form.value.DUE_DATE) {
// 计算提醒日期
const reminderDateStr = subtractDaysFromDate(form.value.DUE_DATE, val);
diff --git a/src/views/mechanical_files/inspect_annually/edit.vue b/src/views/mechanical_files/inspect_annually/edit.vue
index 1f65567..328d554 100644
--- a/src/views/mechanical_files/inspect_annually/edit.vue
+++ b/src/views/mechanical_files/inspect_annually/edit.vue
@@ -22,7 +22,7 @@
@@ -153,7 +153,7 @@
-
+
-
+
- {{ data.busInfo.VEHICLE_MODEL }}
+ {{ info.VEHICLE_TYPE }}
- {{ data.busInfo.VEHICLE_BRAND }}
+ {{ info.VEHICLE_BRAND }}
{{ data.busInfo.CAR_OWNERS }}
@@ -36,24 +36,43 @@
年检信息
+
+ {{ info.CAR_OWNERS }}
+
+
+ {{ info.TELEPHONE }}
+
{{ info.PROCESSING_DATE }}
{{ info.ANNUAL_INSPECTION_CYCLE_NAME }}
-
+
{{ info.INSPECTFEES }}
+
+ {{ info.ACTUAL_COLLECTION }}
+
{{ info.DUE_DATE }}
+
+ {{ info.REMINDER_DAYS }}
+
+
+ {{ info.REMINDER_DATE }}
+
{{ info.ADDRESS }}
{{ info.REGISTRANT }}
+
+ 开启
+ 关闭
+
-
+
-
+
{
- const resData = await getTrailerList({ TRAFFIC_TYPE: event });
+ const model = "insure"
+ const resData = await getTrailerList2({ TRAFFIC_TYPE: event, model });
data.vehicleList = resData.list;
form.value.VEHICLE = "";
data.busInfo.DRIVING_LICENSE_IMG = [];
@@ -371,7 +373,7 @@ const getVehicle = async (event) => {
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile([]);
};
const fnBusChange = async (event) => {
- const resData = await getTrailerList({ ID: event });
+ const resData = await getTrailerList2({ ID: event });
data.busInfo = resData.list[0];
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile(
resData.drivingLicenseImgs
diff --git a/src/views/mechanical_files/insure/edit.vue b/src/views/mechanical_files/insure/edit.vue
index e58012c..d79add6 100644
--- a/src/views/mechanical_files/insure/edit.vue
+++ b/src/views/mechanical_files/insure/edit.vue
@@ -169,12 +169,12 @@
-
+
-
+
即将到期
-
diff --git a/src/views/mechanical_files/insure/view.vue b/src/views/mechanical_files/insure/view.vue
index 04abd28..926cf52 100644
--- a/src/views/mechanical_files/insure/view.vue
+++ b/src/views/mechanical_files/insure/view.vue
@@ -17,21 +17,27 @@
{{ data.busInfo.TRAILER_TYPE }}
-
+
{{ data.busInfo.CAR_OWNERS }}
+
+ {{ data.busInfo.CAR_OWNERS_TEL }}
+
{{ data.busInfo.CAR_OWNERS_TEL }}
{{ data.busInfo.INITIAL_REGISTRATION_DATE }}
+
+ {{ data.busInfo.COMPANY_AREA}}
+
年检信息
@@ -39,7 +45,8 @@
{{ info.REGISTRANT }}
- {{ info.INSURANCE_COMPANY_NAME }}
+ 太平洋保险
+ 中国人寿
{{ info.INSURANCE_COVERAGE }}
@@ -56,13 +63,13 @@
{{ info.EFFECTIVE_DATE }}
-
+
{{ info.DUE_DATE }}
-
+
{{ info.ALL_FEES }}
-
+
{{ info.ACTUAL_COLLECTION }}
{
const resData = await getTrailerList({ ID: event });
data.busInfo = resData.list[0];
diff --git a/src/views/mechanical_files/maintenance/add.vue b/src/views/mechanical_files/maintenance/add.vue
index e7804f2..e33b22d 100644
--- a/src/views/mechanical_files/maintenance/add.vue
+++ b/src/views/mechanical_files/maintenance/add.vue
@@ -254,7 +254,7 @@ import {
getMaintenanceView,
setMaintenanceAdd,
setMaintenanceEdit,
- getTrailerList,
+ getTrailerListMaintenance,
} from "@/request/mechanical_files.js";
import { MAINTENANCE_LEVEL_LIST, REMIND_DAYS } from "@/assets/js/constant.js";
import { setUploadImg } from "@/request/api.js";
@@ -359,7 +359,7 @@ const getRemiderDate = (val) => {
};
const getVehicle = async (event) => {
- const resData = await getTrailerList({ TRAFFIC_TYPE: event });
+ const resData = await getTrailerListMaintenance({ TRAFFIC_TYPE: event });
data.vehicleList = resData.list;
form.value.VEHICLE = "";
data.busInfo.DRIVING_LICENSE_IMG = [];
@@ -373,7 +373,7 @@ const getVehicle = async (event) => {
};
getVehicle("1");
const fnBusChange = async (event) => {
- const resData = await getTrailerList({ ID: event });
+ const resData = await getTrailerListMaintenance({ ID: event });
data.busInfo = resData.list[0];
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile(
resData.drivingLicenseImgs
diff --git a/src/views/mechanical_files/operations/add.vue b/src/views/mechanical_files/operations/add.vue
index 9eaf8e9..79db9aa 100644
--- a/src/views/mechanical_files/operations/add.vue
+++ b/src/views/mechanical_files/operations/add.vue
@@ -229,6 +229,7 @@ import {
setOperationsAdd,
setOperationsEdit,
getTrailerList,
+ getOperationTrailerList,
} from "@/request/mechanical_files.js";
import { OPERATING_VEHICLE_TYPE_LIST, REMIND_DAYS } from "@/assets/js/constant.js";
import { layoutFnGetAnnualInspectionCycle } from "@/assets/js/data_dictionary.js";
@@ -334,7 +335,7 @@ const getRemiderDate = (val) => {
}
};
const getVehicle = async (event) => {
- const resData = await getTrailerList({ TRAFFIC_TYPE: event });
+ const resData = await getOperationTrailerList({ TRAFFIC_TYPE: event });
data.vehicleList = resData.list;
form.value.VEHICLE = "";
data.busInfo.DRIVING_LICENSE_IMG = [];
@@ -347,7 +348,7 @@ const getVehicle = async (event) => {
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile([]);
};
const fnBusChange = async (event) => {
- const resData = await getTrailerList({ ID: event });
+ const resData = await getOperationTrailerList({ ID: event });
data.busInfo = resData.list[0];
data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile(
resData.drivingLicenseImgs
diff --git a/src/views/mechanical_files/operations/index.vue b/src/views/mechanical_files/operations/index.vue
index b473dcc..c94283f 100644
--- a/src/views/mechanical_files/operations/index.vue
+++ b/src/views/mechanical_files/operations/index.vue
@@ -141,7 +141,6 @@
-
{
+ isEditMode.value = route.query.mode === "edit";
+ ACCIDENTINVESTIGATION_ID.value = route.query.ACCIDENTINVESTIGATION_ID || "";
+ if (isEditMode.value) {
+ Object.keys(rules).forEach((key) => {
+ rules[key] = []; // 清空每项校验规则
+ });
+ }
+});
+
+const fnGetData = async () => {
+ const ACCIDENTINVESTIGATION_ID = route.query.ACCIDENTINVESTIGATION_ID
+ if (!ACCIDENTINVESTIGATION_ID) return;
+ const resData = await infoAccidentInvestigation({ ACCIDENTINVESTIGATION_ID });
+ data.form = resData.pd;
+
+};
+fnGetData();
+
const router = useRouter();
const fnGetUnitsList = async () => {
const resData = await getUserListAll({});
diff --git a/src/views/mechanical_files/scrap_manage/add.vue b/src/views/mechanical_files/scrap_manage/add.vue
index 409ea3f..d01c72d 100644
--- a/src/views/mechanical_files/scrap_manage/add.vue
+++ b/src/views/mechanical_files/scrap_manage/add.vue
@@ -192,13 +192,14 @@ import {
setScrapManageEdit,
layoutFnGetScrapType,
getScrapOperationVehicleList,
- getScrapFreightTrailerList
+ getScrapFreightTrailerList,
} from "@/request/scrap_manage.js";
import {
getFreightTrailerView,
} from "@/request/enterprise_management.js";
import {
getOperationVehicleInfo,
+ setOperationsScrapStatus
} from "@/request/operation_vehicle.js";
import LayoutUpload from "@/components/upload/index.vue";
import { debounce } from "throttle-debounce";
@@ -297,6 +298,7 @@ const fnGetVehicleInfo = async () => {
form.value.SCRAP_VEHICLE
) {
const OPERATING_ID = form.value.OPERATIONVEHICLELIST[i].OPERATING_ID;
+ await setOperationsScrapStatus({OPERATING_ID})
const resData = await getOperationVehicleInfo({ OPERATING_ID });
info.value = resData.pd;
form.value.VEHICLE.VEHICLEOWNER = info.value.VEHICLEOWNER;
diff --git a/src/views/mechanical_files/taxation_manage/add.vue b/src/views/mechanical_files/taxation_manage/add.vue
index e2e3850..0663734 100644
--- a/src/views/mechanical_files/taxation_manage/add.vue
+++ b/src/views/mechanical_files/taxation_manage/add.vue
@@ -335,6 +335,9 @@ const fnGetExpireDate = async () => {
let day = date.getDate();
day = day < 10 ? "0" + day : day;
form.value.EXPIRE_DATE = year + "-" + month + "-" + day;
+ if(form.value.TRANSACTION_DATA === null) {
+ form.value.EXPIRE_DATE = null
+ }
}
fnGetReminderData()
};
@@ -349,6 +352,9 @@ const fnGetReminderData = async () => {
let day = date.getDate();
day = day < 10 ? "0" + day : day;
form.value.REMINDER_DATA = year + "-" + month + "-" + day;
+ if(form.value.TRANSACTION_DATA === null) {
+ form.value.REMINDER_DATA = null
+ }
}
};
const fnGetTrailerInfo = async () => {
diff --git a/src/views/production_course_regulate/enterprise_safety_production_shift/add.vue b/src/views/production_course_regulate/enterprise_safety_production_shift/add.vue
index f9e2112..91d1386 100644
--- a/src/views/production_course_regulate/enterprise_safety_production_shift/add.vue
+++ b/src/views/production_course_regulate/enterprise_safety_production_shift/add.vue
@@ -93,11 +93,11 @@ const rules = {
WATCHLEAD: [{ required: true, message: "值班领导不能为空", trigger: "blur" }],
WATCH_TELEPHONE: [
{ required: true, message: "请输入", trigger: "blur" },
- { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
+ { min: 11, max: 11, message: "请输入11位座机号码", trigger: "blur" },
{
pattern:
- /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/,
- message: "请输入正确的手机号码",
+ /^(\d{3,4}-)?\d{7,8}$/,
+ message: "请输入正确的座机号码",
},
],
WATCH_PHONE: [
diff --git a/src/views/production_course_regulate/enterprise_safety_production_shift/edit.vue b/src/views/production_course_regulate/enterprise_safety_production_shift/edit.vue
index bb7d57a..7393df4 100644
--- a/src/views/production_course_regulate/enterprise_safety_production_shift/edit.vue
+++ b/src/views/production_course_regulate/enterprise_safety_production_shift/edit.vue
@@ -68,7 +68,7 @@
import { ref } from "vue";
import {
setEnterpriseSafetyProductEdit,
- setEnterpriseSafetyProductAdd,
+ getEnterpriseSafetyProductEdit
} from "@/request/enterprise_safety_production.js";
import { debounce } from "throttle-debounce";
import useFormValidate from "@/assets/js/useFormValidate.js";
@@ -88,11 +88,11 @@ const rules = {
WATCHLEAD: [{ required: true, message: "值班领导不能为空", trigger: "blur" }],
WATCH_TELEPHONE: [
{ required: true, message: "请输入", trigger: "blur" },
- { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
+ { min: 11, max: 11, message: "请输入11位座机号码", trigger: "blur" },
{
pattern:
- /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/,
- message: "请输入正确的手机号码",
+ /^(\d{3,4}-)?\d{7,8}$/,
+ message: "请输入正确的座机号码",
},
],
WATCH_PHONE: [
@@ -122,7 +122,7 @@ const form = ref({
});
const fnGetData = async () => {
if (!SAFETYPRODUCTION_ID) return;
- const resData = await setEnterpriseSafetyProductEdit({ SAFETYPRODUCTION_ID });
+ const resData = await getEnterpriseSafetyProductEdit({ SAFETYPRODUCTION_ID });
form.value = resData.pd;
};
fnGetData();
@@ -130,7 +130,7 @@ const fnSubmit = debounce(
1000,
async () => {
await useFormValidate(formRef);
- await setEnterpriseSafetyProductAdd({ ...form.value });
+ await setEnterpriseSafetyProductEdit({ ...form.value });
ElMessage.success("提交成功");
router.back();
},
diff --git a/src/views/production_course_regulate/production_equipment_facility/maintain.vue b/src/views/production_course_regulate/production_equipment_facility/maintain.vue
index a64969d..d42cc97 100644
--- a/src/views/production_course_regulate/production_equipment_facility/maintain.vue
+++ b/src/views/production_course_regulate/production_equipment_facility/maintain.vue
@@ -3,29 +3,47 @@
基本信息
- {{ data.FACILITY_NAME }}
+ {{ info.FACILITY_NAME }}
- {{ data.FACILITY_NUMBER }}
+ {{ info.FACILITY_NUMBER }}
- {{ data.FACILITY_UNIT }}
+ {{ info.FACILITY_UNIT }}
- {{ data.FACILITY_COUNT }}
+ {{ info.FACILITY_COUNT }}
- {{ data.FACILITY_LOCALTION }}
+ {{ info.FACILITY_LOCALTION }}
- {{ data.FACILITY_PRINCIPAL }}
+ {{ info.FACILITY_PRINCIPAL }}
- {{ data.REGISTRATION_TIME }}
+ {{ info.REGISTRATION_TIME }}
+
+
+ {{ info.FACILITY_REMARK }}
+
+
+ ![]()
保养记录
-
+
@@ -87,18 +105,22 @@ import useListData from "@/assets/js/useListData.js";
import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
import { debounce } from "throttle-debounce";
import { ElMessage, ElMessageBox } from "element-plus";
+import { addingPrefixToFile } from "@/assets/js/utils.js";
const route = useRoute();
const router = useRouter();
const { PRODUCTIONFACILITY_ID } = route.query;
-const data = ref({});
+const info = ref({});
const getData = async () => {
- const { pd } = await getProductionEquipmentFacilityView({
+ const resData = await getProductionEquipmentFacilityView({
PRODUCTIONFACILITY_ID,
});
- data.value = pd;
+ info.value = resData.pd;
+ info.value.EQUIPMENT_FACILITY = addingPrefixToFile(
+ resData.equipmentFacility
+ );
};
getData();
-const { list } = useListData(getMaintainFindProductionEquipmentFacilityId, {
+const { list, fnResetPagination } = useListData(getMaintainFindProductionEquipmentFacilityId, {
otherParams: { PRODUCTIONFACILITY_ID },
usePagination: false,
});
@@ -109,6 +131,7 @@ const fnDelete = debounce(
await ElMessageBox.confirm("确定要删除吗？", { type: "warning" });
await setMaintainDelete({ MAINTAIN_ID });
ElMessage.success("删除成功");
+ fnResetPagination()
},
{ atBegin: true }
);
diff --git a/src/views/production_course_regulate/production_equipment_facility/maintainedit.vue b/src/views/production_course_regulate/production_equipment_facility/maintainedit.vue
index 836058a..80d7e6d 100644
--- a/src/views/production_course_regulate/production_equipment_facility/maintainedit.vue
+++ b/src/views/production_course_regulate/production_equipment_facility/maintainedit.vue
@@ -80,27 +80,16 @@ import { setUploadImg } from "@/request/api.js";
const route = useRoute();
const router = useRouter();
const { MAINTAIN_ID } = route.query;
+
const rules = {
- FACILITY_NUMBER: [
- { required: true, message: "设施编号不能为空", trigger: "blur" },
+ MAINTAIN_DATE: [
+ { required: true, message: "保养时间不能为空", trigger: "blur" },
],
- FACILITY_NAME: [
- { required: true, message: "设施名称不能为空", trigger: "blur" },
+ MAINTAIN_CONDITION: [
+ { required: true, message: "保养情况不能为空", trigger: "blur" },
],
- FACILITY_UNIT: [
- { required: true, message: "设施单位不能为空", trigger: "blur" },
- ],
- FACILITY_COUNT: [
- { required: true, message: "设施数量不能为空", trigger: "blur" },
- ],
- FACILITY_LOCALTION: [
- { required: true, message: "设施位置不能为空", trigger: "blur" },
- ],
- FACILITY_PRINCIPAL: [
- { required: true, message: "设施负责人不能为空", trigger: "blur" },
- ],
- REGISTRATION_TIME: [
- { required: true, message: "登记时间不能为空", trigger: "change" },
+ MAINTAIN_PERSON: [
+ { required: true, message: "保养人不能为空", trigger: "blur" },
],
};
const formRef = ref(null);
diff --git a/src/views/production_course_regulate/production_equipment_facility/view.vue b/src/views/production_course_regulate/production_equipment_facility/view.vue
index 0d1c175..d4357b5 100644
--- a/src/views/production_course_regulate/production_equipment_facility/view.vue
+++ b/src/views/production_course_regulate/production_equipment_facility/view.vue
@@ -4,25 +4,40 @@
基本信息
- {{ data.FACILITY_NAME }}
+ {{ info.FACILITY_NAME }}
- {{ data.FACILITY_NUMBER }}
+ {{ info.FACILITY_NUMBER }}
- {{ data.FACILITY_UNIT }}
+ {{ info.FACILITY_UNIT }}
- {{ data.FACILITY_COUNT }}
+ {{ info.FACILITY_COUNT }}
- {{ data.FACILITY_LOCALTION }}
+ {{ info.FACILITY_LOCALTION }}
- {{ data.FACILITY_PRINCIPAL }}
+ {{ info.FACILITY_PRINCIPAL }}
- {{ data.REGISTRATION_TIME }}
+ {{ info.REGISTRATION_TIME }}
+
+
+ {{ info.FACILITY_REMARK }}
+
+
+ ![]()
保养记录
@@ -50,14 +65,18 @@ import { useRoute } from "vue-router";
import { ref } from "vue";
import useListData from "@/assets/js/useListData.js";
import { PRINT_STYLE } from "@/assets/js/constant.js";
+import { addingPrefixToFile } from "@/assets/js/utils.js";
const route = useRoute();
const { PRODUCTIONFACILITY_ID } = route.query;
-const data = ref({});
+const info = ref({});
const getData = async () => {
- const { pd } = await getProductionEquipmentFacilityView({
+ const resData = await getProductionEquipmentFacilityView({
PRODUCTIONFACILITY_ID,
});
- data.value = pd;
+ info.value = resData.pd;
+ info.value.EQUIPMENT_FACILITY = addingPrefixToFile(
+ resData.equipmentFacility
+ );
};
getData();
const { list } = useListData(getMaintainFindProductionEquipmentFacilityId, {
diff --git a/src/views/production_course_regulate/reported_incident_dispose/index.vue b/src/views/production_course_regulate/reported_incident_dispose/index.vue
index ae95c31..90e0738 100644
--- a/src/views/production_course_regulate/reported_incident_dispose/index.vue
+++ b/src/views/production_course_regulate/reported_incident_dispose/index.vue
@@ -31,9 +31,9 @@
-
+
{
await useFormValidate(formRef);
diff --git a/src/views/production_course_regulate/violation_registration/edit.vue b/src/views/production_course_regulate/violation_registration/edit.vue
new file mode 100644
index 0000000..d01c848
--- /dev/null
+++ b/src/views/production_course_regulate/violation_registration/edit.vue
@@ -0,0 +1,201 @@
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
diff --git a/src/views/production_course_regulate/violation_registration/index.vue b/src/views/production_course_regulate/violation_registration/index.vue
index 027c52d..36da2f4 100644
--- a/src/views/production_course_regulate/violation_registration/index.vue
+++ b/src/views/production_course_regulate/violation_registration/index.vue
@@ -73,9 +73,14 @@
type="primary"
text
link
- @click="fnAddOrEdit(row.REGISTRATION_ID)"
+ @click="
+ router.push({
+ path: '/production_course_regulate/violation_registration/edit',
+ query: { REGISTRATION_ID: row.REGISTRATION_ID },
+ })
+ "
>
- 编辑
+ 修改
{
- router.push({
- path: "/production_course_regulate/violation_registration/add",
- query: {
- mode: "edit",
- REGISTRATION_ID,
- },
- });
-};
+
// 删除事件
const deleteItem = async (value) => {
await ElMessageBox.confirm(`确定要删除吗？`, {
diff --git a/src/views/safety_production_related/security_notice/add.vue b/src/views/safety_production_related/security_notice/add.vue
index 888309b..db61530 100644
--- a/src/views/safety_production_related/security_notice/add.vue
+++ b/src/views/safety_production_related/security_notice/add.vue
@@ -126,9 +126,7 @@ const rules = {
TITLE: [{ required: true, message: "请输入通知标题", trigger: "blur" }],
LEVEL: [{ required: true, message: "请选择通知等级", trigger: "blur" }],
PERSON: [{ required: true, message: "请选择通知人员", trigger: "blur" }],
- NOTIFICATIONCONTENT: [
- { required: true, message: "请输入通知内容", trigger: "blur" },
- ],
+ NOTIFICATIONCONTENT: [{ required: true, message: "请输入通知内容", trigger: "blur" }],
};
const relatedClassificationTempList =
await layoutFnGetNotificationsClassification();
diff --git a/src/views/safety_production_related/security_notice/components/select_person.vue b/src/views/safety_production_related/security_notice/components/select_person.vue
index 21e400a..3fb84ce 100644
--- a/src/views/safety_production_related/security_notice/components/select_person.vue
+++ b/src/views/safety_production_related/security_notice/components/select_person.vue
@@ -97,6 +97,9 @@ const { list, searchForm, pagination, fnGetData, fnResetPagination, tableRef } =
clearSelection: false,
});
+
+
+
const stop = watch(
() => props.visible,
(value) => {