diff --git a/src/views/rightsComfort/MyComfort.vue b/src/views/rightsComfort/MyComfort.vue index 819dd33..22804ad 100644 --- a/src/views/rightsComfort/MyComfort.vue +++ b/src/views/rightsComfort/MyComfort.vue @@ -353,6 +353,9 @@ {{ item.empNo }} + +   {{item.parentDepartShortName}}   {{item.departShortName}} + @@ -826,7 +829,7 @@ import { listPolice } from "@/api/system/police"; import { listRightPersonByDepartId } from "@/api/system/rightPerson"; import { secondList } from "@/api/system/depart"; -import { getDictLable, getGenderFromIdCode } from "@/utils/util"; +import { getDictLable, getGenderFromIdCode,extractInfoFromID } from "@/utils/util"; import feedback from "@/utils/feedback"; import useCatchStore from "@/stores/modules/catch"; @@ -887,7 +890,7 @@ function reset() { getTodos(); getDones(); } - +console.log('dict.bank',dict.bank) function search() { getTodos(); getDones(); @@ -904,6 +907,7 @@ onMounted(() => { const show = ref(false); const formData = ref({ + bankCard:'长沙银行', applyDate: moment().format("YYYY-MM-DD"), }); const formRef = ref(null); @@ -997,6 +1001,7 @@ async function querySearch(queryString, cb) { current: 1, name: queryString, }); + console.log('data',data.records) cb(data.records); } @@ -1004,6 +1009,13 @@ function handleSelect(item) { formData.value.empNo = item.empNo; formData.value.idCode = item.idCode; formData.value.mobile = item.mobile; + formData.value.departId=item.orgId; + if(formData.value?.idCode){ + console.log('formData.value.idCode,',formData.value.idCode ) + let {birthDate,gender,age}= extractInfoFromID(formData.value.idCode); + formData.value.sex=gender; + formData.value.birthday = birthDate; + } } watch( diff --git a/src/views/superviseReport/superviseReport.vue b/src/views/superviseReport/superviseReport.vue index 0478192..515e20a 100644 --- a/src/views/superviseReport/superviseReport.vue +++ b/src/views/superviseReport/superviseReport.vue @@ -149,6 +149,15 @@ function onUploadSuccess(file) { + + + + +