diff --git a/pages.json b/pages.json index be9a03f..6801d3a 100644 --- a/pages.json +++ b/pages.json @@ -415,6 +415,20 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/supplierindex/material", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/supplierindex/mtdetails", + "style" : + { + "navigationBarTitleText" : "" + } } ], "globalStyle": { diff --git a/pages/addoldman/oldIDcard.vue b/pages/addoldman/oldIDcard.vue index bec3063..5ca0c23 100644 --- a/pages/addoldman/oldIDcard.vue +++ b/pages/addoldman/oldIDcard.vue @@ -386,6 +386,7 @@ textArray[6] = father.issueAuthority; textArray[7] = father.validPeriod; backImge.value = filePath; + savephoto(filePath, 1); }else{ textArray[7] = ""; uni.showToast({ diff --git a/pages/addstaff/all.vue b/pages/addstaff/all.vue index 9fc245c..4301f9c 100644 --- a/pages/addstaff/all.vue +++ b/pages/addstaff/all.vue @@ -19,7 +19,7 @@ - + i 驳回原因：{{alldata.auditContent}} diff --git a/pages/addstaff/successpush.vue b/pages/addstaff/successpush.vue index ae7dced..20d5076 100644 --- a/pages/addstaff/successpush.vue +++ b/pages/addstaff/successpush.vue @@ -12,7 +12,7 @@ - {{ uni.getStorageSync('isstaffchange') ? '尊敬的用户，您好！您的个人信息已提交' : '尊敬的用户，您的员工入驻申请已提交成功' }}, + {{ uni.getStorageSync('isstaffchange') ? '尊敬的用户，您好！您的个人信息变更已提交' : '尊敬的用户，您的员工入驻申请已提交成功' }}, {{ uni.getStorageSync('isstaffchange')?`请等待机构审核`:`欢迎加入护理单元大家庭` }} ！ diff --git a/pages/oldmanindex/all.vue b/pages/oldmanindex/all.vue index d7acfc0..0dd605c 100644 --- a/pages/oldmanindex/all.vue +++ b/pages/oldmanindex/all.vue @@ -6,28 +6,12 @@ - {{targetpage.value==0?"监护人信息":'长者信息'}} + {{targetpage==0?"监护人信息":'长者信息'}} - i @@ -46,7 +30,7 @@ - + 人像面 @@ -63,9 +47,9 @@ + @click="openLook(textArray1[index])"> {{item}} - {{textArray[index] ? textArray[index] : "无" }} + {{textArray1[index] ? textArray1[index] : "无" }} @@ -79,33 +63,10 @@ --> - 长者信息 - - @@ -274,26 +235,29 @@ if (data.content) { contentred.value = data.content } - textArray[0] = data.name; - textArray[1] = data.sex; - textArray[2] = data.idCard; - textArray[3] = data.national; - textArray[4] = data.dateOfBirth; - textArray[5] = data.houseAddress; - textArray[6] = data.issuingAuthority; - textArray[7] = `${data.startTime}-${swapLongTerm(data.endTime)}`; - - textArray1[0] = data.guardianName; - textArray1[1] = data.guardianPhone; - textArray1[2] = data.guardianIdCard; - textArray1[3] = data.guardianHomeAddress; - textArray1[4] = data.guardianWorkUnit; - headImge1.value = `${media_base_url}${data.guardianIdCardPositive}`; - console.log(data) - - fontphoto.value = data.idCardPositive - endphoto.value = data.idCardNegative - specialImge.value = data.idCardPositive + console.log(targetpage.value) + if(targetpage.value==1){ + textArray[0] = data.name; + textArray[1] = data.sex; + textArray[2] = data.idCard; + textArray[3] = data.national; + textArray[4] = data.dateOfBirth; + textArray[5] = data.houseAddress; + textArray[6] = data.issuingAuthority; + textArray[7] = `${data.startTime}-${swapLongTerm(data.endTime)}`; + fontphoto.value = data.idCardPositive + endphoto.value = data.idCardNegative + specialImge.value = data.idCardPositive + }else{ + console.log(123) + textArray1[0] = data.guardianName; + textArray1[1] = data.guardianPhone; + textArray1[2] = data.guardianIdCard; + textArray1[3] = data.guardianHomeAddress; + textArray1[4] = data.guardianWorkUnit; + headImge1.value = `${media_base_url}${data.guardianIdCardPositive}`; + } + console.log(textArray1,11111111111) getManyDictItems( `medical_insurance_type&dictCodeList=syb_reimbursement_type&dictCodeList=zgyb_reimbursement_type&dictCodeList=jmyb_reimbursement_type` ).then((res => { diff --git a/pages/supplierindex/api.js b/pages/supplierindex/api.js index 0c72d24..6c0252e 100644 --- a/pages/supplierindex/api.js +++ b/pages/supplierindex/api.js @@ -98,4 +98,18 @@ export function upRead(data){ method: 'post', data, }) -} \ No newline at end of file +} +export function getSuppliersWlInfo(data){ + return request({ + url: `/api/suppliers/getSuppliersWlInfo`, + method: 'get', + data, + }) +} +export function editSuppliersWlInfo(data){ + return request({ + url: `/api/suppliers/editSuppliersWlInfo`, + method: 'post', + data, + }) +} \ No newline at end of file diff --git a/pages/supplierindex/index.vue b/pages/supplierindex/index.vue index d430ec4..d2045bb 100644 --- a/pages/supplierindex/index.vue +++ b/pages/supplierindex/index.vue @@ -196,9 +196,9 @@ --> - + + {{item.suppliersName}} - - {{menuArray[which]?.departName}} - - --> + @@ -487,6 +488,9 @@ } const clickButton = (item, index) => { if (index === 0) { + uni.navigateTo({ + url:'/pages/supplierindex/material?id='+item.suppliersId + }) // getSupInfoByOpenId(item.orgCode).then(res => { // if (res.success) { // uni.navigateTo({ @@ -502,6 +506,12 @@ show.value = true } } + const jumpt = (res) => { + if (res.length>20) { + content.value = res; + show.value = true + } + } onShow(() => { loadingData(); isRead().then(res => { @@ -529,6 +539,17 @@ + \ No newline at end of file diff --git a/pages/supplierindex/mtdetails.vue b/pages/supplierindex/mtdetails.vue new file mode 100644 index 0000000..742ad2f --- /dev/null +++ b/pages/supplierindex/mtdetails.vue @@ -0,0 +1,190 @@ + + + + + + \ No newline at end of file diff --git a/pages/supplierindex/workjoin.vue b/pages/supplierindex/workjoin.vue index 034a835..bb8779f 100644 --- a/pages/supplierindex/workjoin.vue +++ b/pages/supplierindex/workjoin.vue @@ -33,15 +33,15 @@ - {{item.departName}} + {{item.suppliersName}} - {{ item.orgLeader }} | + {{ item.personInCharge }} | - {{ item.orgLeaderPhone }} + {{ item.contactNumber }} @@ -49,19 +49,19 @@ src="https://www.focusnu.com/media/directive/index/ruzhu/time.png" /> {{item.createTime}} - - 待审核 + + 审核中 - + 审核通过 - + 审核驳回 - - 待审核 + + 审核中 - + 审核驳回 @@ -576,6 +576,7 @@