forked from integrated_whb/integrated_whb_vue
BUG 优化
parent
3171a705a0
commit
edc013140f
|
@ -15,3 +15,6 @@ export const infoCommitmentView = (params) =>
|
||||||
|
|
||||||
export const deleteCommitmentView = (params) =>
|
export const deleteCommitmentView = (params) =>
|
||||||
post("/commitment/delete", params); // 删除 承诺书
|
post("/commitment/delete", params); // 删除 承诺书
|
||||||
|
|
||||||
|
export const getSafetyCommitmentEdit = (params) =>
|
||||||
|
post("/commitment/safetyCommitment", params); // 承诺书列表
|
||||||
|
|
|
@ -14,3 +14,7 @@ export const infoResponsibilityView = (params) =>
|
||||||
|
|
||||||
export const deleteResponsibilityView = (params) =>
|
export const deleteResponsibilityView = (params) =>
|
||||||
post("/responsibility/delete", params); // 删除 岗位安全责任书
|
post("/responsibility/delete", params); // 删除 岗位安全责任书
|
||||||
|
|
||||||
|
|
||||||
|
export const getSafetyResponsibilityEdit = (params) =>
|
||||||
|
upload("/responsibility/getSafetyResponsibilityEdit", params); // 详情 岗位安全责任书
|
||||||
|
|
|
@ -98,6 +98,9 @@ const rules = {
|
||||||
CONTRACTNAME: [
|
CONTRACTNAME: [
|
||||||
{ required: true, message: "请输入合同名称", trigger: "blur" },
|
{ required: true, message: "请输入合同名称", trigger: "blur" },
|
||||||
],
|
],
|
||||||
|
EXPIRYDATE: [
|
||||||
|
{ required: true, message: "请选择到期时间", trigger: "change" },
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
const formRef = ref(null);
|
const formRef = ref(null);
|
||||||
|
|
|
@ -101,6 +101,7 @@ const { visible, form } = useVModels(props, emits);
|
||||||
const rules = {
|
const rules = {
|
||||||
file: [{ required: true, message: "请上传附件", trigger: "change" }],
|
file: [{ required: true, message: "请上传附件", trigger: "change" }],
|
||||||
SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }],
|
SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }],
|
||||||
|
EXPIRYDATE: [{ required: true, message: "请选择到期时间", trigger: "change" }],
|
||||||
};
|
};
|
||||||
|
|
||||||
const operatingCompany = ref("");
|
const operatingCompany = ref("");
|
||||||
|
|
|
@ -124,7 +124,6 @@ const info = ref({});
|
||||||
const getData = async () => {
|
const getData = async () => {
|
||||||
const resData = await findByIdAssignedManageInfo({ ASSIGNED_ID });
|
const resData = await findByIdAssignedManageInfo({ ASSIGNED_ID });
|
||||||
info.value = resData.pd;
|
info.value = resData.pd;
|
||||||
console.log("-=-=",info.value);
|
|
||||||
info.value.NOW_VEHICLE_OPERATION_CERTIFICATE = addingPrefixToFile(
|
info.value.NOW_VEHICLE_OPERATION_CERTIFICATE = addingPrefixToFile(
|
||||||
resData.nowVehicleOperationCertificateImgs
|
resData.nowVehicleOperationCertificateImgs
|
||||||
);
|
);
|
||||||
|
|
|
@ -238,6 +238,7 @@ const data = reactive({
|
||||||
});
|
});
|
||||||
const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
|
const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
|
||||||
useListData(getOperationsList);
|
useListData(getOperationsList);
|
||||||
|
|
||||||
const fnGetDataTransfer = () => {
|
const fnGetDataTransfer = () => {
|
||||||
fnGetData({
|
fnGetData({
|
||||||
PLATE_NUMBER: searchForm.value.PLATE_NUMBER,
|
PLATE_NUMBER: searchForm.value.PLATE_NUMBER,
|
||||||
|
|
|
@ -104,6 +104,9 @@ const rules = {
|
||||||
OCCUPATIONALNAME: [
|
OCCUPATIONALNAME: [
|
||||||
{ required: true, message: "请输入职业危害告知书名称", trigger: "blur" },
|
{ required: true, message: "请输入职业危害告知书名称", trigger: "blur" },
|
||||||
],
|
],
|
||||||
|
EXPIRYDATE: [
|
||||||
|
{ required: true, message: "请选择到期时间", trigger: "change" },
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
const formRef = ref(null);
|
const formRef = ref(null);
|
||||||
|
|
|
@ -89,6 +89,7 @@ const { visible, form } = useVModels(props, emits);
|
||||||
const rules = {
|
const rules = {
|
||||||
file: [{ required: true, message: "请上传附件", trigger: "change" }],
|
file: [{ required: true, message: "请上传附件", trigger: "change" }],
|
||||||
SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }],
|
SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }],
|
||||||
|
EXPIRYDATE: [{ required: true, message: "请选择到期时间", trigger: "change" }],
|
||||||
};
|
};
|
||||||
|
|
||||||
const operatingCompany = ref("");
|
const operatingCompany = ref("");
|
||||||
|
|
|
@ -88,6 +88,7 @@ const { visible, form } = useVModels(props, emits);
|
||||||
const rules = {
|
const rules = {
|
||||||
file: [{ required: true, message: "请上传附件", trigger: "change" }],
|
file: [{ required: true, message: "请上传附件", trigger: "change" }],
|
||||||
SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }],
|
SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }],
|
||||||
|
EXPIRYDATE: [{ required: true, message: "请选择到期时间", trigger: "change" }],
|
||||||
};
|
};
|
||||||
|
|
||||||
const formRef = ref(null);
|
const formRef = ref(null);
|
||||||
|
|
|
@ -103,9 +103,12 @@ const rules = {
|
||||||
file: [
|
file: [
|
||||||
{ required: true, message: "请上传岗位安全责任书", trigger: "change" },
|
{ required: true, message: "请上传岗位安全责任书", trigger: "change" },
|
||||||
],
|
],
|
||||||
CONTRACTNAME: [
|
RESPONSIBILITYNAME: [
|
||||||
{ required: true, message: "请输入岗位安全责任书名称", trigger: "blur" },
|
{ required: true, message: "请输入岗位安全责任书名称", trigger: "blur" },
|
||||||
],
|
],
|
||||||
|
EXPIRYDATE: [
|
||||||
|
{ required: true, message: "请选择到期时间", trigger: "change" },
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
const formRef = ref(null);
|
const formRef = ref(null);
|
||||||
|
|
|
@ -111,8 +111,8 @@ import Add from "@/views/safety_responsibility/components/add.vue";
|
||||||
import LayoutPdf from "@/components/pdf/index.vue";
|
import LayoutPdf from "@/components/pdf/index.vue";
|
||||||
import {
|
import {
|
||||||
deleteResponsibilityView,
|
deleteResponsibilityView,
|
||||||
getSafetyResponsibilityList,
|
|
||||||
getSafetyResponsibilityUserList,
|
getSafetyResponsibilityUserList,
|
||||||
|
getSafetyResponsibilityEdit,
|
||||||
} from "@/request/traffic_safety_responsibility.js";
|
} from "@/request/traffic_safety_responsibility.js";
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
@ -155,7 +155,7 @@ const fnAddOrEdit = async (
|
||||||
data.addOrEditDialog.type = type;
|
data.addOrEditDialog.type = type;
|
||||||
data.addOrEditDialog.form = {};
|
data.addOrEditDialog.form = {};
|
||||||
if (type === "edit" && SAFETYRESPONSIBILITY_ID) {
|
if (type === "edit" && SAFETYRESPONSIBILITY_ID) {
|
||||||
const resData = await getSafetyResponsibilityList({
|
const resData = await getSafetyResponsibilityEdit({
|
||||||
SAFETYRESPONSIBILITY_ID,
|
SAFETYRESPONSIBILITY_ID,
|
||||||
});
|
});
|
||||||
if (resData && resData.varList && resData.varList.length > 0) {
|
if (resData && resData.varList && resData.varList.length > 0) {
|
||||||
|
|
|
@ -106,6 +106,9 @@ const rules = {
|
||||||
COMMITMENTNAME: [
|
COMMITMENTNAME: [
|
||||||
{ required: true, message: "请输入承诺书名称", trigger: "blur" },
|
{ required: true, message: "请输入承诺书名称", trigger: "blur" },
|
||||||
],
|
],
|
||||||
|
EXPIRYDATE: [
|
||||||
|
{ required: true, message: "请选择到期时间", trigger: "change" },
|
||||||
|
]
|
||||||
};
|
};
|
||||||
const formRef = ref(null);
|
const formRef = ref(null);
|
||||||
const fnClose = () => {
|
const fnClose = () => {
|
||||||
|
|
|
@ -105,7 +105,7 @@
|
||||||
import { useRoute } from "vue-router";
|
import { useRoute } from "vue-router";
|
||||||
import {
|
import {
|
||||||
deleteCommitmentView,
|
deleteCommitmentView,
|
||||||
getSafetyCommitmentList,
|
getSafetyCommitmentEdit,
|
||||||
getSafetyCommitmentUserList,
|
getSafetyCommitmentUserList,
|
||||||
} from "@/request/traffic_safety_commitment.js";
|
} from "@/request/traffic_safety_commitment.js";
|
||||||
import useListData from "@/assets/js/useListData.js";
|
import useListData from "@/assets/js/useListData.js";
|
||||||
|
@ -114,9 +114,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
|
||||||
import { nextTick, reactive, ref } from "vue";
|
import { nextTick, reactive, ref } from "vue";
|
||||||
import Add from "@/views/security_commitment/components/add.vue";
|
import Add from "@/views/security_commitment/components/add.vue";
|
||||||
import LayoutPdf from "@/components/pdf/index.vue";
|
import LayoutPdf from "@/components/pdf/index.vue";
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
|
||||||
const { list, pagination, fnGetData, fnResetPagination } = useListData(
|
const { list, pagination, fnGetData, fnResetPagination } = useListData(
|
||||||
getSafetyCommitmentUserList,
|
getSafetyCommitmentUserList,
|
||||||
{
|
{
|
||||||
|
@ -152,7 +150,7 @@ const fnAddOrEdit = async (SECURITYCOMMITMENT_ID = "",USER_ID = "",type = "add")
|
||||||
data.addOrEditDialog.visible = true;
|
data.addOrEditDialog.visible = true;
|
||||||
data.addOrEditDialog.type = type;
|
data.addOrEditDialog.type = type;
|
||||||
if (type === "edit" && SECURITYCOMMITMENT_ID && USER_ID) {
|
if (type === "edit" && SECURITYCOMMITMENT_ID && USER_ID) {
|
||||||
const resData = await getSafetyCommitmentList({
|
const resData = await getSafetyCommitmentEdit({
|
||||||
SECURITYCOMMITMENT_ID,
|
SECURITYCOMMITMENT_ID,
|
||||||
USER_ID,
|
USER_ID,
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue