diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue index 9fe2b7e..ac55d66 100644 --- a/pages/NursingNew/component/index.vue +++ b/pages/NursingNew/component/index.vue @@ -193,7 +193,7 @@ - {{ item.nuName.length>6?item.nuName.substring(0,6)+'.':item.nuName }} + {{ item.nuName.length>6?item.nuName.substring(0,7)+'.':item.nuName }} {{ item.elderInfo?.name?`入住`:`空闲` }} @@ -234,9 +234,9 @@ - - + + @@ -399,22 +399,27 @@ const menutarget = ref(0) const emit = defineEmits(['swip', "gospecial"]) const clickmenu = (index : number) => { - let data = null; - menutarget.value = index - if (props.kf == '0') { - data = filteredMenu('izHldy')[index] + let data: any = {}; + menutarget.value = index; + data = leftMenuArray.value[index] + // if (props.kf == '0') { + // data = filteredMenu('izHldy')[index] - } else { - data = filteredMenu('izKf')[index]; + // } else { + // data = filteredMenu('izKf')[index]; + // } + scrollTop.value = (index - 3) * 58; + console.log("看看数据对不对",data.nuId) + if(data.nuId){ + uni.setStorageSync('nuId', data.nuId); + uni.setStorageSync('nuName', data.nuName); + uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null); + uni.setStorageSync('NUall', data); + inits(data.nuId) + hlylhq(data.nuId, data.elderInfo?.id) + emit('swip') } - uni.setStorageSync('nuId', data.nuId); - uni.setStorageSync('nuName', data.nuName); - uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null); - uni.setStorageSync('NUall', data); - inits(data.nuId) - hlylhq(data.nuId, data.elderInfo?.id) - emit('swip') - scrollTop.value = (index - 1) * 58 + } const hldyobj = ref({}) const hlylhq = (nuId, elderId) => { @@ -688,31 +693,31 @@ const jszlshow = ref(false) - const emotionTagList = ref([]); - const bodyTagList = ref([]); - const zzbqshow = ref(false) - const geteverything = () => { - if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) { - emotionTagList.value = []; - bodyTagList.value = []; - zzbqshow.value = true; - getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => { - // console.log("东西呢", res) - res.result.emotionTagList.forEach(item => { - if (item.izSelected == 'Y') { - emotionTagList.value.push(item) - } - }) - res.result.bodyTagList.forEach(item => { - if (item.izSelected == 'Y') { - bodyTagList.value.push(item) - } - }) - // emotionTagList.value = res.result.emotionTagList; - // bodyTagList.value = res.result.bodyTagList; - }) - } - } + // const emotionTagList = ref([]); + // const bodyTagList = ref([]); + // const zzbqshow = ref(false) + // const geteverything = () => { + // if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) { + // emotionTagList.value = []; + // bodyTagList.value = []; + // zzbqshow.value = true; + // getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => { + // // console.log("东西呢", res) + // res.result.emotionTagList.forEach(item => { + // if (item.izSelected == 'Y') { + // emotionTagList.value.push(item) + // } + // }) + // res.result.bodyTagList.forEach(item => { + // if (item.izSelected == 'Y') { + // bodyTagList.value.push(item) + // } + // }) + // // emotionTagList.value = res.result.emotionTagList; + // // bodyTagList.value = res.result.bodyTagList; + // }) + // } + // } function getStatusDesc(type) { switch (type) { case '稳定': @@ -779,16 +784,16 @@ const inits = (e) => { serves.value.init(e); } - const tagtarget = ref(-1); - const detail = ref("") - const leftnumber = ref(2.2) - const clicktag = (item, index) => { - tagtarget.value = index; - detail.value = getStatusDesc(item.tagName) - leftnumber.value = getleft(index); - // bodyTagList.value = []; - // emotionTagList.value = []; - } + // const tagtarget = ref(-1); + // const detail = ref("") + // const leftnumber = ref(2.2) + // const clicktag = (item, index) => { + // tagtarget.value = index; + // detail.value = getStatusDesc(item.tagName) + // leftnumber.value = getleft(index); + // // bodyTagList.value = []; + // // emotionTagList.value = []; + // } onMounted(() => { transition.value = false; setTimeout(() => { @@ -848,22 +853,22 @@ } } - .zzbqsmall { - width: 23vw; - // height: 6vw; - background: #FFFFFF; - box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136, 148, 167, 0.19); - border-radius: 1.2vw; - right: -2vw; - top: 15vw; - position: absolute; - z-index: 200; - display: flex; - // padding: 1.6vw 1.6vw 0; - padding: 1vw 2vw; - color: black; - font-size: 1vw; - } + // .zzbqsmall { + // width: 23vw; + // // height: 6vw; + // background: #FFFFFF; + // box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136, 148, 167, 0.19); + // border-radius: 1.2vw; + // right: -2vw; + // top: 15vw; + // position: absolute; + // z-index: 200; + // display: flex; + // // padding: 1.6vw 1.6vw 0; + // padding: 1vw 2vw; + // color: black; + // font-size: 1vw; + // } .index-content-right { width: 23vw; @@ -912,7 +917,7 @@ .right-top { margin-top: 1vw; width: 100%; - height: 22vw; + height: 47.2vw; background-color: #fff; border-radius: 1.6vw; @@ -930,7 +935,7 @@ .top-list { width: 100%; - height: 26vh; + height: 68vh; margin-top: 1vw; .list-view { @@ -996,40 +1001,40 @@ } - .right-bottom { - margin-top: 2vh; - width: 100%; - height: 24vw; - background-color: #fff; - border-radius: 3vh; - padding-top: 1vh; - display: flex; - flex-direction: column; - align-items: center; + // .right-bottom { + // margin-top: 2vh; + // width: 100%; + // height: 24vw; + // background-color: red; + // border-radius: 3vh; + // padding-top: 1vh; + // display: flex; + // flex-direction: column; + // align-items: center; - .bottom-title { + // .bottom-title { - width: 100%; - padding: 0 8%; - display: flex; - justify-content: space-between; + // width: 100%; + // padding: 0 8%; + // display: flex; + // justify-content: space-between; - .bottom-carmera { - margin-top: 0.7vw; - width: 3vw; - height: 3vw; - } - } + // .bottom-carmera { + // margin-top: 0.7vw; + // width: 3vw; + // height: 3vw; + // } + // } - .big-older { - margin-top: 0.9vw; - margin-bottom: 0.3vw; - width: 8.5vw; - height: 8.5vw; - border: 1rpx solid #DCDCDC; - border-radius: 50%; - } - } + // .big-older { + // margin-top: 0.9vw; + // margin-bottom: 0.3vw; + // width: 8.5vw; + // height: 8.5vw; + // border: 1rpx solid #DCDCDC; + // border-radius: 50%; + // } + // } .index-content-other { width: 67vw; @@ -1516,66 +1521,66 @@ // top: 2.7vw !important; } - .zzbq { - width: 23vw; - height: 11vw; - background: #FFFFFF; - box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136, 148, 167, 0.19); - border-radius: 1.6vw; - right: -2vw; - top: 4vw; - position: absolute; - z-index: 200; - display: flex; - padding: 1.6vw 1.6vw 0; - overflow: hidden; + // .zzbq { + // width: 23vw; + // height: 11vw; + // background: #FFFFFF; + // box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136, 148, 167, 0.19); + // border-radius: 1.6vw; + // right: -2vw; + // top: 4vw; + // position: absolute; + // z-index: 200; + // display: flex; + // padding: 1.6vw 1.6vw 0; + // overflow: hidden; - .carfd { - width: 11.5vw; - height: 100%; + // .carfd { + // width: 11.5vw; + // height: 100%; - .tg { - width: 100%; - display: flex; - justify-content: space-around; - margin-top: 1vw; + // .tg { + // width: 100%; + // display: flex; + // justify-content: space-around; + // margin-top: 1vw; - view { - width: 3vw; - display: flex; - flex-direction: column; - align-items: center; + // view { + // width: 3vw; + // display: flex; + // flex-direction: column; + // align-items: center; - image { - width: 2.2vw; - height: 2.2vw; - } + // image { + // width: 2.2vw; + // height: 2.2vw; + // } - text { - font-weight: 400; - font-size: 1vw; - color: #666666; - margin-top: 0.2vw; - } - } - } + // text { + // font-weight: 400; + // font-size: 1vw; + // color: #666666; + // margin-top: 0.2vw; + // } + // } + // } - .tittop { - height: 2vw; - font-weight: 400; - font-size: 34rpx; - color: #333333; - display: flex; - align-items: center; + // .tittop { + // height: 2vw; + // font-weight: 400; + // font-size: 34rpx; + // color: #333333; + // display: flex; + // align-items: center; - view { - width: 0.4vw; - height: 1.2vw; - background: #017DE9; - border-radius: 0.2vw; - margin-right: 0.8vw; - } - } - } - } + // view { + // width: 0.4vw; + // height: 1.2vw; + // background: #017DE9; + // border-radius: 0.2vw; + // margin-right: 0.8vw; + // } + // } + // } + // } \ No newline at end of file diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue index 386cfdf..30514ce 100644 --- a/pages/NursingNew/index.vue +++ b/pages/NursingNew/index.vue @@ -285,7 +285,7 @@ menuIndexshow.value = true }, 50) userInfo.value = uni.getStorageSync('userInfo'); - console.log("!!!!!",`https://www.focusnu.com/media/`+userInfo.value.avatar) + // console.log("!!!!!",`https://www.focusnu.com/media/`+userInfo.value.avatar) }); const nomesssageshow = () => { diff --git a/pages/procure/api/api.js b/pages/procure/api/api.js index 3f51d1b..1fa6410 100644 --- a/pages/procure/api/api.js +++ b/pages/procure/api/api.js @@ -4,11 +4,32 @@ import request from '@/request/index.js' // 查询采购单列表 export const queryCgdList = (params) => { return request({ - url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryCgdList?nuId=${uni.getStorageSync('nuId')}&pageNo=${params.pageNo}&pageSize=10`, + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryCgdList?nuId=${uni.getStorageSync('nuId')}&pageNo=${params.pageNo}&pageSize=10&cgdParamInfo=${params.cgdParamInfo}&status=${params.status}&ids=${params.ids}`, method: 'get', - // data: params, }) } +// 查询供应商列表 +export const getGysList = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGysList`, + method: 'get', + }) +} +// 查询物料分类树 +export const getMaterialTreeData = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData?nuId=${uni.getStorageSync('nuId')}&izEnabled=Y`, + method: 'get', + }) +} +// 采购单物料筛选查询数量 +export const getCgdListNum = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdListNum?nuId=${uni.getStorageSync('nuId')}&gysId=${params.gysId}&typeId=${params.typeId}&status=`, + method: 'get', + }) +} + // // 盘点接口 // export const savePddInfo = (params) => { // return request({ diff --git a/pages/procure/component/selectbox.vue b/pages/procure/component/selectbox.vue new file mode 100644 index 0000000..6d23b22 --- /dev/null +++ b/pages/procure/component/selectbox.vue @@ -0,0 +1,405 @@ + + + + + \ No newline at end of file diff --git a/pages/procure/procure.vue b/pages/procure/procure.vue index 931e604..51ab177 100644 --- a/pages/procure/procure.vue +++ b/pages/procure/procure.vue @@ -4,24 +4,21 @@ style="transition: opacity 1s ease;padding: 1.1vw;"> - - - - + + + - + - {{ item }} + {{ item.label }} @@ -82,7 +79,7 @@ 采购 - [ 梁嘉豪 ] + [ {{ v.qgBy }} ] @@ -105,8 +102,9 @@ {{ v?.cgdType=='9' ?`已作废`:`拣货` }} - - 2026.03.03 + + [{{ v.jhBy }}] @@ -114,21 +112,19 @@ {{ v.wjTime?.slice(0,10).replace(/-/g, '.') }} - + - - 完结 - - 2026.03.03 + + [{{ v.wjBy }}] @@ -180,6 +176,7 @@ + @@ -191,18 +188,32 @@ import procurement from './component/procurement.vue'; import carlist from './component/carlist.vue'; import caigoudan from './component/caigoudan.vue'; - import { queryCgdList } from './api/api.js' + import { queryCgdList } from './api/api.js'; + import selectbox from './component/selectbox.vue' + + + + interface InputValue { + pageNo : number + cgdParamInfo : string + status : number|string + ids : string + } // 入参 - const inputValue = ref({ + const inputValue = ref({ pageNo: 1, + cgdParamInfo: "", + status: "", + ids: "" }) // 初始化卡片 const getCardArray = () => { inputValue.value.pageNo = 1; addlock.value = false + // console.log("看看入参", inputValue.value) queryCgdList(inputValue.value).then((res : any) => { - console.log("看看卡片列表", res.result.records) + console.log("看看卡片列表", res) plsbuy.value = res.result.records if (res.result.records.length != 10) { addlock.value = true @@ -212,10 +223,13 @@ // 添加锁,节流 const addlock = ref(false) // 添加卡片 - const scrolltolower = () => { + const plsbuytolower = () => { + if (!addlock.value) { inputValue.value.pageNo++ - queryCgdList(inputValue).then((res : any) => { + // console.log("触发了吗",inputValue.value) + queryCgdList(inputValue.value).then((res : any) => { + // console.log("触发了吗",res.result.records) plsbuy.value.push(...res.result.records) if (res.result.records.length != 10) { addlock.value = true @@ -228,7 +242,13 @@ const lefttarget = ref(-1) - const tagsarray = ref(["全部", "待确认", "待完结", "待付款", "已完成"]) + const tagsarray = [ + { label: '全部', value: '' }, + { label: '待确认', value: 0 }, + { label: '待完结', value: 1 }, + { label: '待付款', value: 2 }, + { label: '已完成', value: 3 } + ] const selectType = ref(0) @@ -253,7 +273,9 @@ return } selectType.value = index - leftscrolltop.value = 0.01 + inputValue.value.status = tagsarray[selectType.value].value; + getCardArray() + leftscrolltop.value = 0.0001 setTimeout(() => { leftscrolltop.value = 0 }, 50) @@ -274,28 +296,29 @@ } else { transition.value = false; } - console.log(transition.value) + // console.log(transition.value) } ) - const search = () => { } - const plzinfo = reactive({ - nuId: uni.getStorageSync('nuId'), - pageNo: 1, - pageSize: 30, - canpull: true, - cgdParamInfo: "" - }) - const setout = ref(true) - let times = null - const plsbuytolower = () => { - if (!setout.value) { return } - plzinfo.pageNo++; - // getqueryCgdList() - setout.value = false - times = setTimeout(() => { - setout.value = true - }, 500) - } + // const search = () => { } + // const plzinfo = reactive({ + // nuId: uni.getStorageSync('nuId'), + // pageNo: 1, + // pageSize: 30, + // canpull: true, + // cgdParamInfo: "", + + // }) + // const setout = ref(true) + // let times = null + // const plsbuytolower = () => { + // if (!setout.value) { return } + // plzinfo.pageNo++; + // // getqueryCgdList() + // setout.value = false + // times = setTimeout(() => { + // setout.value = true + // }, 500) + // } const plsbuy = ref([]) const basePath = '/static/index/procurement/' // 图片公共路径 const imgNormal = basePath + 'sh.png' @@ -314,6 +337,16 @@ busy.value = false }, 300) } + const isselect = ref(false); + const openselect = () => { + isselect.value = true + } + const saveids = ref("") + const sure = (ids : string) => { + isselect.value=false + inputValue.value.ids = ids + getCardArray() + } onLoad(() => { getCardArray() }) @@ -331,7 +364,7 @@ .left-selecttype { margin-top: 8rpx; - width: 98%; + width: 100%; height: 85rpx; border-radius: 40rpx; background-color: #FFFFFF; @@ -390,7 +423,7 @@ .contain-left { height: 100vh; - min-width: 28vw; + min-width: 30vw; overflow: hidden; // background-color: green; @@ -419,7 +452,7 @@ } .title-input { - width: 19vw; + width: 21vw; height: 5.1vh; background-color: #fff; font-size: 27.5rpx; @@ -596,9 +629,13 @@ text-overflow: ellipsis; white-space: nowrap; font-size: 25rpx; - .notoomuch{ - width: 30rpx; - background-color: red; + + .notoomuch { + width: 200rpx; + // background-color: red; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } } } @@ -692,4 +729,13 @@ justify-content: center; align-items: center; } + + .title-input-img { + width: 35rpx; + height: 35rpx; + position: absolute; + right: 190rpx; + top: 47%; + transform: translateY(-50%); + } \ No newline at end of file diff --git a/request/index.js b/request/index.js index 2c775a4..37d633f 100644 --- a/request/index.js +++ b/request/index.js @@ -1,6 +1,6 @@ // 全局请求封装 -export const base_url = 'https://www.focusnu.com/opeapi' -// export const base_url = 'http://192.168.2.18:8081/opeapi/' +// export const base_url = 'https://www.focusnu.com/opeapi' +export const base_url = 'http://192.168.2.18:8081/opeapi/' // const base_url = 'http://192.168.2.55:8081/opeapi' export const media_url = 'https://www.focusnu.com/media/' // 请求超出时间