diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index 79d5e99..1787649 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -243,6 +243,14 @@ export default [ component: "hazard_investigation/inventory_management/insurance_coverage", }, + { + path: "/hazard_investigation/inventory_management/add", + meta: { + title: "新增", + activeMenu: "/hazard_investigation/inventory_management", + }, + component: "hazard_investigation/inventory_management/add", + }, ], }, ], diff --git a/src/assets/js/data_dictionary.js b/src/assets/js/data_dictionary.js index 56504f6..a27eb78 100644 --- a/src/assets/js/data_dictionary.js +++ b/src/assets/js/data_dictionary.js @@ -139,6 +139,13 @@ export const layoutFnGetTroubleshootingType = async () => { }); return ref(resData.list); }; +// 排查周期 +export const layoutFnGetTroubleshootingCycle = async () => { + const resData = await getLevels({ + DICTIONARIES_ID: "f60cf0e8315b4993b6d6049dd29f2ba5", + }); + return ref(resData.list); +}; // 清单级别 export const layoutFnGetInventoryLevel = async () => { const resData = await getLevels({ @@ -146,6 +153,13 @@ export const layoutFnGetInventoryLevel = async () => { }); return ref(resData.list); }; +// 任务类型 +export const layoutFnGetTaskType = async () => { + const resData = await getLevels({ + DICTIONARIES_ID: "7a1afe8a5e594b6a9e0cef42bd00f352", + }); + return ref(resData.list); +}; // 职务 export const layoutFnGetDuties = async () => { const resData = await getLevelsCorp({ diff --git a/src/assets/js/utils.js b/src/assets/js/utils.js index 912ac1e..f0a2804 100644 --- a/src/assets/js/utils.js +++ b/src/assets/js/utils.js @@ -99,7 +99,7 @@ export function ArrayDeduplication(arr) { * @param {string} name 去重的key * @return {Array} 去重后的数组 **/ -export function ArrayObjectDeduplication(arr, name) { +export function arrayObjectDeduplication(arr, name) { const obj = {}; arr = arr.reduce(function (previousValue, currentValue) { if (!obj[currentValue[name]]) { @@ -349,10 +349,7 @@ export function idCardGetDateAndGender(idCard) { else MonthDate = Month; if (DayDate < 10) Day = "0" + DayDate; else Day = DayDate; - sex = - org_gender % 2 === 1 - ? "998f8531a6254c2eab5c825fa2d9896f" - : "fdd532d9def447cdb68af3a938f6f05c"; + sex = org_gender % 2 === 1 ? "1" : "0"; date = birthdays.getFullYear() + "-" + MonthDate + "-" + Day; } return { sex, date }; diff --git a/src/components/table/index.vue b/src/components/table/index.vue index 73a1fb0..6e64150 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -138,10 +138,15 @@ const getSelectionRows = () => { const clearSelection = () => { return tableRef.value.clearSelection(); }; -const toggleRowSelection = (id, selected) => { +const toggleRowSelection = (value, selected) => { + if (typeof value === "object") { + tableRef.value.toggleRowSelection(value, selected); + return; + } for (let i = 0; i < props.data.length; i++) { - if (props.data[i][props.rowKey] === id) { + if (props.data[i][props.rowKey] === value) { tableRef.value.toggleRowSelection(props.data[i], selected); + break; } } }; diff --git a/src/request/data_dictionary.js b/src/request/data_dictionary.js index 12a5afd..9345557 100644 --- a/src/request/data_dictionary.js +++ b/src/request/data_dictionary.js @@ -48,3 +48,9 @@ export const getPostListAll = (params) => loading: false, ...params, }); +// 获取用户 +export const getUserListAll = (params) => + post("/user/listAll", { + loading: false, + ...params, + }); diff --git a/src/request/hazard_investigation.js b/src/request/hazard_investigation.js index d44772e..d9e7464 100644 --- a/src/request/hazard_investigation.js +++ b/src/request/hazard_investigation.js @@ -20,3 +20,7 @@ export const setInventoryManagementInsuranceCoverageList = (params) => post("/labelFactory/termList", params); // 清单管理设置包保责任类型选择列表 export const setInventoryManagementInsuranceCoverageSave = (params) => post("/listmanager/saveBaoBaoType", params); // 清单管理设置包保责任类型提交 +export const getInventoryManagementInspectionItems = (params) => + post("/riskcheckitem/itemlistAll", params); // 清单管理检查项列表 +export const getInventoryManagementOtherRiskList = (params) => + post("/riskcheckitem/list", params); // 清单管理选择其他存在风险列表 diff --git a/src/views/enterprise_management/user/add.vue b/src/views/enterprise_management/user/add.vue index 5e0527b..0e8423c 100644 --- a/src/views/enterprise_management/user/add.vue +++ b/src/views/enterprise_management/user/add.vue @@ -59,6 +59,21 @@ + + + + + + + { const fnGetLevels = async () => { const { value: nationList } = await layoutFnGetNation(); data.nationList = nationList; - const { value: sexList } = await layoutFnGetSex(); - data.sexList = sexList; const { value: politicalLandscapeList } = await layoutFnGetPoliticalLandscape(); data.politicalLandscapeList = politicalLandscapeList; diff --git a/src/views/hazard_investigation/inventory_management/add.vue b/src/views/hazard_investigation/inventory_management/add.vue new file mode 100644 index 0000000..775ca07 --- /dev/null +++ b/src/views/hazard_investigation/inventory_management/add.vue @@ -0,0 +1,394 @@ + + + + + diff --git a/src/views/hazard_investigation/inventory_management/components/insurance_coverage_select.vue b/src/views/hazard_investigation/inventory_management/components/insurance_coverage_select.vue index fce7d07..280dc39 100644 --- a/src/views/hazard_investigation/inventory_management/components/insurance_coverage_select.vue +++ b/src/views/hazard_investigation/inventory_management/components/insurance_coverage_select.vue @@ -1,6 +1,6 @@