From b742f08de1c57de12d76fdbbd1c9a05c9120467f Mon Sep 17 00:00:00 2001 From: wangweidong <850489345@qq.com> Date: Mon, 2 Feb 2026 15:52:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/public/severcard.vue | 4 +- manifest.json | 9 +- .../component/leftcontent/serveswipe.vue | 77 +- .../component/leftcontent/sxy-Timeing.vue | 1 + pages/Warehouse/index/component/index.vue | 750 +----------------- pages/procurement/components/calculator.vue | 1 + pages/procurement/components/carditem.vue | 176 ++-- pages/procurement/components/tanchuang.vue | 8 +- pages/procurement/material.vue | 24 +- 9 files changed, 190 insertions(+), 860 deletions(-) diff --git a/component/public/severcard.vue b/component/public/severcard.vue index b069db0..633eb3c 100644 --- a/component/public/severcard.vue +++ b/component/public/severcard.vue @@ -1,5 +1,5 @@ @@ -452,6 +153,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch,reactive } from 'vue'; import { queryPadPageList } from '@/pages/watch/api/lunpan.js' import { queryWorkOrderList,queryCountByType,queryAll } from '@/pages/NursingNew/component/api.js' + import serveswipe from '@/pages/NursingNew/component/leftcontent/serveswipe.vue'; import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder,generateInstant} from '@/pages/NursingNew/component/doctorask/api/api.js' const jszlshow = ref(false) const props = defineProps({ @@ -461,6 +163,10 @@ }, }); + const serves = ref>(); + const inits = (e) =>{ + serves.value.init(e); + } const zdxzdex = ref(0) const zdxzarr = ref(0) @@ -506,65 +212,8 @@ } } } - const zhixingsub = ()=>{ - zxzd.value = zdxzdex.value - if(zdxzdex.value==1){ - zdcont.value = "确认转单执行？" - } - if(zdxzdex.value==2){ - zdcont.value = "确认协助执行？" - } - } const zxzd = ref(0); const zdcont = ref(''); - const tijiaozx = ()=>{ - if(zxzd.value == 1){ - let s = {} - zdxzarr.value.forEach((item,i)=>{ - if(item.flag){ - s = item; - } - }) - let obj = { - mainId:indexmessage.value.mainId, - employeeId:s.id, - employeeName:s.name - } - let nuId = uni.getStorageSync('nuId'); - transferOrder(obj).then(res=>{ - if(res.success){ - firstgetqueryCgdList(nuId); - flag.value = false; - zxzd.value = 0; - zdxzdex.value = 0; - } - }) - } - if(zxzd.value == 2){ - let userinfo = uni.getStorageSync('userInfo') - let id = userinfo.id+','; - let name = userinfo.realname+','; - zdxzarr.value.forEach((item,i)=>{ - if(item.flag){ - id+=item.id+',' - name+=item.name+',' - } - }) - let obj = { - mainId:indexmessage.value.mainId, - employeeId:id, - employeeName:name - } - assistOrder(obj).then(res=>{ - if(res.success){ - firstgetqueryCgdList(form.nuId) - flag.value = false; - zxzd.value = 0; - zdxzdex.value = 0; - } - }) - } - } const indexmessage = ref({}); const serverUrl = ref(uni.getStorageSync('imagebase') ) @@ -577,243 +226,19 @@ nuId:uni.getStorageSync('nuId'), workType:5 }) - const plsbuy = ref([]) - const firstgetqueryCgdList = (nuId) => { - form.nuId = nuId; - queryOrderList(form).then(res => { - if(res.result.records.length>0){ - indexmessage.value = res.result.records[0]; - }else{ - indexmessage.value = {}; - } - }) - } - const clickLeftMenu = (index : any, item : object) => { - queryOrderInfoList({ mainId: item.id }).then(res => { - if(res.result.length>0){ - indexmessage.value = res.result[0] - }else{ - indexmessage.value = {}; - } - }) - } const open = ref(0) const donghuaopo = ref(false); const topbuttontarget = ref(0); const ilanarr = ref([]); const listobj = ref({}); - const ysptp = (v,i,r) =>{ - // v.manuallyPicPath - if(r == 1&&v.manuallyPicPath){ - ilanarr.value = v.manuallyPicPath.split(","); - ilanarr.value = ilanarr.value.filter(item => item !== ''); - }else if(r == 2&&v.manuallyMp4Path){ - ilanarr.value = v.manuallyMp4Path.split(","); - ilanarr.value = ilanarr.value.filter(item => item !== ''); - }else if(r == 3&&v.tplinkPath){ - ilanarr.value = v.tplinkPath.split(","); - ilanarr.value = ilanarr.value.filter(item => item !== ''); - } - else{ - ilanarr.value = []; - } - - listobj.value = v; - topbuttontarget.value = r; - donghuaopo.value = true; - } - const uplod = (v) => { - if(topbuttontarget.value==1){ - uni.chooseImage({ - count: 1, //默认9 - sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有 - sourceType: ['camera'], //从相册选择 - success: (e) => { - let ar = JSON.stringify(e.tempFilePaths) - uni.compressImage({ - src: JSON.parse(ar)[0], - quality: 60, - success: res => { - sxdupld(res.tempFilePath) - // v.picPatharr.push(res.tempFilePath); - } - }) - } - }); - }else{ - uni.chooseVideo({ - sourceType: ['camera' ], - success: (e)=> { - uni.compressVideo({ - src: e.tempFilePath, - quality: 'medium', - success: res => { - sxdupld(res.tempFilePath) - // v.picPatharr.push(res.tempFilePath); - } - }) - // sxdupld(res.tempFilePath ) - } - }); - } - - } - const sxdupld = (e) => { - let now = new Date(); - let year = now.getFullYear(); - let month = now.getMonth() + 1; - uni.uploadFile({ - url: uni.getStorageSync('serverUrl') + '/sys/common/upload', - filePath: e, - name: 'file', - fileType:topbuttontarget.value==2?'video':'image', - formData: { - biz: year + '/' + month + (topbuttontarget.value==1?'/fwxm/manuallyPicPath':'/fwxm/manuallyMp4Path') - }, - header: { - 'X-Access-Token': uni.getStorageSync('token') - }, - success: res => { - const data = JSON.parse(res.data); - ilanarr.value.push(data.message) - }, - fail: () => { - uni.showToast({ title: '上传失败', icon: 'none' }) - } - }) - } - const submit = ()=>{ - let sub = ""; - ilanarr.value.forEach(item=>{ - sub+=item+',' - }) - if(topbuttontarget.value == 1){ - editSubPicPath({id:listobj.value.id,manuallyPicPath:sub}).then(res=>{ - if(res.success){ - topbuttontarget.value = 0; - donghuaopo.value = false; - firstgetqueryCgdList(form.nuId) - } - }) - }else{ - editSubMp4({id:listobj.value.id,manuallyMp4Path:sub}).then(res=>{ - if(res.success){ - topbuttontarget.value = 0; - donghuaopo.value = false; - firstgetqueryCgdList(form.nuId) - } - }) - } - } - const previewImage = (v, i, arr) => { - if(topbuttontarget.value == 1){ - let u = [] - arr.forEach(e => { - u.push(serverUrl.value + e) - }) - uni.previewImage({ - current: i, - urls: u, - showmenu: false, - longPressActions: { - itemList: [], - } - }) - } - } const videoContext = ref(null) - const play = (e,i)=>{ - videoContext.value = uni.createVideoContext('myVideo'+i); - videoContext.value.play() - } const pici = ref(0); - const del = (v,i) =>{ - pici.value = i; - } - const del1=()=>{ - ilanarr.value.splice(pici.value,1); - open.value = 0 - } - // - const openerror = ref(false); const errmsg = ref('') - const errmsgclk = (e,k)=>{ - if(k==1){ - if(indexmessage.value?.izStart=='Y'){ - switch (e){ - case 0: - if(indexmessage.value?.serviceContent==''){return} - errmsg.value = indexmessage.value?.serviceContent - break; - case 1: - if(indexmessage.value?.mp3File==''){return} - errmsg.value = indexmessage.value?.mp3File - break; - case 2: - if(indexmessage.value?.mp4File==''){return} - errmsg.value = indexmessage.value?.mp4File - break; - - default: - break; - } - openerror.value = true; - } - }else{ - if(indexmessage.value?.izStart=='Y'){ - - switch (e){ - case 3: - ysptp(indexmessage.value,0,1) - break; - case 4: - ysptp(indexmessage.value,0,2) - break; - - default: - break; - } - } - - } - } const severcards = ref>() - const start = (v) =>{ - if(v.izStart!='N'){return} - startOrder({id:v.id}).then(res=>{ - if(res.success){ - v.izStart = "Y"; - severcards.value.firstgetqueryCgdList() - }else{ - - - } - }) - } - const end = (v)=>{ - if(indexmessage.value.izStart=='Y'&& indexmessage.value.izFinish=='N'){ - open.value=3; - } - } - const ends = ()=>{ - - endOrder({id:indexmessage.value.id}).then(res=>{ - if(res.success){ - open.value=0; - severcards.value.firstgetqueryCgdList() - firstgetqueryCgdList(uni.getStorageSync('nuId')) - }else{ - - } - }) - - } - const leftMenuArray = ref([]); - const openleft = ref(false) const menutarget = ref(0) const emit = defineEmits(['swip']) @@ -825,8 +250,7 @@ uni.setStorageSync('nuName', data.nuName); uni.setStorageSync('elderId', data?.elderInfo ? data.elderInfo?.id : null); uni.setStorageSync('NUall', data); - severcards.value.firstgetqueryCgdList() - firstgetqueryCgdList(data.nuId); + inits(data.nuId) emit('swip'); hlylhq(data.nuId ) zlfunc(data.nuId ) @@ -906,61 +330,7 @@ return `${base}/${prefix}${idx}.${ext}` }) } - const rightMenu = ref([ - // { - // url: "/static/index/newindex/rightmenu/0.png", - // name: '重点追踪' - // }, - { - url: "/static/index/newindex/rightmenu/1.png", - name: '转单执行' - }, - { - url: "/static/index/newindex/rightmenu/2.png", - name: '协助执行' - }, - ]) - - const leftArray = ref(genPaths( - '/static/index/newindex/leftmenu', - 'left', - 5, // 张数 - 'png', - 0, // 起始索引 - false // 不补零 - )) - const huliArray = ref(genPaths( - '/static/index/newindex/huli', - 'care', - 9, // 张数 - 'png', - 0, // 起始索引 - false // 不补零 - )) - const base = genPaths( - '/static/index/newindex/curve', - 'curve_', - 9, - 'png', - 1, - false - ) - const blueArray = ref([ - ...base, - ...[...base].reverse() // 先拷贝一份再反转，避免修改原 base - ]) - const basesmall = genPaths( - '/static/index/newindex/curve', - 'breathe_', - 9, - 'png', - 1, - false - ) - const bluesmallArray = ref([ - ...basesmall, - ...[...basesmall].reverse() // 先拷贝一份再反转，避免修改原 base - ]) + // 使用watch监听isShow变化 @@ -1021,6 +391,7 @@ transition.value = true; }, 50) }) + const leftMenuArray = ref([]) const filteredMenu = (index : number) => { return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index); } @@ -1109,7 +480,7 @@ height: 430rpx; margin-right: 3vw; margin-bottom: 0%; - border-radius: 30rpx; + border-radius: 1.6vw; display:flex; position: relative; video{ @@ -1126,11 +497,10 @@ transition: opacity 1s ease; margin-top: 25rpx; .right-time{ - // margin-top: 10rpx; width: 100%; height: 15vh; background-color: #fff; - border-radius: 4vh; + border-radius: 1.6vw; display: flex; flex-direction: column; justify-content: center; @@ -1154,7 +524,7 @@ width: 100%; height: 35vh; background-color: #fff; - border-radius: 4vh; + border-radius: 1.6vw; margin-top: 25rpx; .top-title { @@ -1221,7 +591,7 @@ width: 100%; height: 38vh; background-color: #fff; - border-radius: 3vh; + border-radius: 1.6vw; padding-top: 1vh; display: flex; flex-direction: column; @@ -1281,6 +651,8 @@ position: relative; font-size: 28rpx; margin-top: 25rpx; + width: 105%; + left: -1vw; } .date { @@ -1291,112 +663,22 @@ - .photo-father { - width: 100%; - height: 1100rpx; - display: flex; - flex-direction: column; - align-items: center; - position: relative; - margin-top: 0rpx; - } - .juzhong { - position: absolute; - top: 0%; - left: 50%; - transform: translate(-50%, -20%); - // 禁止动画阻挡逻辑 - z-index: 1; - } - .weight-time { - font-weight: 800; - font-size: 70rpx; - margin-top: 30rpx; - position: relative; - margin-left: -50rpx; - } - .big-img { - margin-top: 40rpx; - margin-bottom: 40rpx; - width: 450rpx; - height: 450rpx; - z-index: 10; - } - .server-name { - font-size: 35rpx; - margin-right: 10rpx; - font-weight: 600; - } - .server-number { - font-size: 30rpx; - margin-right: 10rpx; - margin-top: 25rpx; - color: #666666; - } - .server-bgc { - width: 160rpx; - height: 50rpx; - display: flex; - justify-content: center; - align-items: center; - position: relative; - } - .bgc-img { - width: 100%; - height: 100%; - position: absolute; - top: 0; - left: 0; - } - .bgc-font { - color: #fff; - z-index: 1; - } - - .states-father { - display: flex; - margin: 0 20rpx; - } - - .start-button { - width: 100%; - height: 100%; - background: linear-gradient(to bottom, #009DEF, #0076FF); - display: flex; - justify-content: center; - align-items: center; - border-radius: 40rpx; - color: #fff; - font-size: 30rpx; - - } - - .end-button { - width: 100%; - height: 100%; - background: linear-gradient(to bottom, #FFFFFF, #C8D0D9); - display: flex; - justify-content: center; - align-items: center; - border-radius: 40rpx; - font-size: 30rpx; - } .title-card-right { position: absolute; right: 0; top: 0; width: 10vw; height: 9.4vw; - border-radius: 2vw; + border-radius: 1.6vw; background-color: #E4EBF4; padding: 1.6vw; margin-right: 1.5vw; diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue index 0b053b8..2c65514 100644 --- a/pages/procurement/components/calculator.vue +++ b/pages/procurement/components/calculator.vue @@ -152,6 +152,7 @@ watch( ()=>props.show, ()=>{ + console.log(props.caigouobj) if(props.show){ let a = [ { diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue index 6e5024c..b94e07a 100644 --- a/pages/procurement/components/carditem.vue +++ b/pages/procurement/components/carditem.vue @@ -21,20 +21,25 @@ - {{v.materialName}}{{v.materialNo}} + {{v.materialName}} + + + 物料编码: {{v.materialNo}} 规格型号: {{v.specificationModel}} 采购单价: ￥{{Number(v.oneUnitPrice).toFixed(2) }} - 采购单位: {{ v.oneUnit}} 采购单价: ￥{{Number(v.twoUnitPrice).toFixed(2) }} - 采购单位: {{ v.twoUnit}} 采购单价: ￥{{ Number(v.referenceUnitPrice).toFixed(2)}} - 采购单位: {{ v.materialUnits}} + 采购单位: {{ v.oneUnit}} + 采购单位: {{ v.twoUnit}} + 采购单位: {{ v.materialUnits}} + + {{v.kcsl}} 库存数量 @@ -176,14 +181,14 @@ } .fler { width: 44vw; - height: 15.6vw; + height: 22.3vw; } } .carditem { width: 44vw; - height: 14.5vw; - background: rgba(255, 255, 255, 0.4); + height: 21.2vw; + background: rgba(255, 255, 255, 1); border-radius: 1.6vw; position: relative; margin-bottom: 1.1vw; @@ -202,7 +207,7 @@ right: -14vw; >view { - width: 7vw; + width: 5.7vw; height: 100%; font-weight: 400; font-size: 1.5vw; @@ -242,13 +247,13 @@ .add { width: 4.5vw; - height: 14.5vw; - display: inline-flex; + height: 100%; + position: absolute; + display: flex; justify-content: center; align-items: center; - position: relative; - top: -2vw; - + top: 0vw; + right:1.2vw; >view { width: 4.5vw; height: 1.8vw; @@ -263,7 +268,7 @@ align-items: center; position: absolute; top: 0.8vw; - right: 0vw; + right:1.6vw; } image { @@ -276,72 +281,18 @@ width: 25vw; height: 100%; padding: 1vw; - display: inline-block; + position: absolute; + left:15vw; + top: 0; >view { - margin-top: 0.25vw; - - &:nth-child(4) { - width: 100%; - height: 3.4vw; - display: flex; - justify-content: space-between; - >view { - width: 33.3%; - height: 100%; - display: flex; - flex-direction: column; - position: relative; - margin-top:1vw; - - &:nth-child(1) { - width: 30%; - align-items: left; - } - - &:nth-child(2) { - width: 40%; - align-items: center; - } - - &:nth-child(3) { - width: 30%; - text-align: right; - align-items: right; - } - - &:nth-child(2)::after { - content: ''; - position: absolute; - right: 0; - width: 100%; - height: 2.2vw; - border-left: 1px solid #C9C9C9; - border-right: 1px solid #C9C9C9; - top: 0.6vw; - } - - text { - &:nth-child(1) { - font-weight: bold; - font-size: 1.7vw; - color: #555555; - } - - &:nth-child(2) { - font-weight: 400; - font-size: 1.1vw; - color: #999999; - } - } - } - } - &:nth-child(2), - &:nth-child(3) { + &:nth-child(3), + &:nth-child(4), + &:nth-child(5){ display: flex; justify-content: space-between; - + margin-top: 0.25vw; text { font-weight: 400; font-size: 1.4vw; @@ -355,12 +306,12 @@ justify-content: space-between; align-items: center; height: 2vw; - + margin-top: 1vw; >view { width: 19vw; height: 2vw; font-weight: bold; - font-size: 1.6vw; + font-size:1.8vw; color: #222222; text-overflow: ellipsis; overflow: hidden; @@ -375,18 +326,77 @@ } } } + >.wlsy{ + width: 100%; + height: 3.4vw; + display: flex; + justify-content: space-between; + margin-top: 0.5vw; + >view { + width: 33.3%; + height: 100%; + display: flex; + flex-direction: column; + position: relative; + margin-top:1vw; + + &:nth-child(1) { + width: 30%; + align-items: left; + } + + &:nth-child(2) { + width: 40%; + align-items: center; + } + + &:nth-child(3) { + width: 30%; + text-align: right; + align-items: right; + } + + &:nth-child(2)::after { + content: ''; + position: absolute; + right: 0; + width: 100%; + height: 2.2vw; + border-left: 1px solid #C9C9C9; + border-right: 1px solid #C9C9C9; + top: 0.6vw; + } + + text { + &:nth-child(1) { + font-weight: bold; + font-size: 1.8vw; + color: #555555; + } + + &:nth-child(2) { + font-weight: 400; + font-size: 1.2vw; + color: #999999; + } + } + } + } } // .spleft{ // margin-left: -15vw !important; // } .speitem { - width: 13vw; + width: 14.8vw; height: 100%; - display: inline-flex; + position: absolute; + display:flex; flex-direction: column; - position: relative; - top: -2vw; + top: 0; + left: 0; + justify-content: center; + align-items: center; .cardp { width: 12.5vw; @@ -421,8 +431,8 @@ } } .imghs{ - width: 9vw; - height: 8vw; + width: 12vw; + height: 12vw; margin: 0.8vw auto 0.25vw; padding: 0.2vw; background: #fff; diff --git a/pages/procurement/components/tanchuang.vue b/pages/procurement/components/tanchuang.vue index db520aa..3e0171a 100644 --- a/pages/procurement/components/tanchuang.vue +++ b/pages/procurement/components/tanchuang.vue @@ -5,9 +5,9 @@ - {{ font }} + {{ font }} - 取消 + 取消 确定 @@ -27,6 +27,8 @@ type: String, default: '' }, + fontsize:'', + close:true }, methods: { @@ -49,7 +51,7 @@ bottom: 0; margin: auto; padding: 2.8vw; - z-index: 9120000000000000000000000000000000000000000000000000000000; + z-index: 9120 ; >view { &:nth-child(4) { diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue index f0d3dc8..3db29af 100644 --- a/pages/procurement/material.vue +++ b/pages/procurement/material.vue @@ -342,6 +342,7 @@ } const queryInvo = () => { queryInvoicingList(form).then(res => { + console.log(res) res.result.records.forEach(item => { item.zk = false; item.scrollleft = 0; @@ -548,14 +549,14 @@ .kcyj { width: 100%; - height: 10vw; + height: 11vw; display: flex; margin-top: 1vw; position: relative; .kaprght { width: 32vw; - height: 10vw; + height: 10.9vw; margin-left: 0.6vw; position: absolute; right: 0; @@ -713,8 +714,8 @@ .kjlt { width: 3.2vw; - height: 10vw; - background: rgba(255, 255, 255, 0.5); + height: 10.9vw; + background: rgba(255, 255, 255, 1); border-radius: 1.1vw; writing-mode: vertical-rl; align-items: center; @@ -742,7 +743,7 @@ justify-content: center; letter-spacing: 3px; width: 3.2vw; - height: 10vw; + height: 10.9vw; position: absolute; top: 0; border-radius: 1.1vw; @@ -787,7 +788,7 @@ .kcscrol { width: 54.4vw; - height: 10vw; + height: 10.9vw; white-space: nowrap; margin-left: 0.6vw; position: relative; @@ -796,8 +797,8 @@ .yjbox { display: inline-block; width: 14vw; - height: 10vw; - background: rgba(255, 255, 255, 0.4); + height: 10.9vw; + background: rgba(255, 255, 255, 1); border-radius: 1.1vw; margin-right: 0.6vw; position: relative; @@ -863,16 +864,17 @@ border-radius: 1.6vw; display: flex; align-items: center; - margin-top: 0.7vw; + margin-top: 0.4vw; position: relative; .ipt { display: flex; align-items: center; width: 24.2vw; - background: #E2E4E9; border-radius: 1.65vw; height: 3.3vw; + background: #FFFFFF; + border: 1px solid #D2D2D2; image { width: 2.2vw; @@ -932,7 +934,7 @@ width: 7.3vw; height: 3.3vw; margin: 0 0 0 0.7vw; - background: rgba(255, 255, 255, 0.6); + background: rgba(255, 255, 255, 1); border: 1px solid #D9DADC; color: #555555;