yangjun
/
hldy_app_mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

This commit is contained in:
Teng 2025-12-09 17:02:37 +08:00
parent 60fc092827 a2e634674c
commit f3b69d648f
10 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/NursingNew/component/pleasetake/common/carditem.vue
View File

@ -20,11 +20,11 @@
</view> </view>
<view class="msitem guodu" > <view class="msitem guodu" >
<view> <view>
<view>{{v.materialName}}</view> <view>{{v?.materialName}}</view>
</view> </view>
<view> <view>
<text style="white-space: nowrap;"> 规格型号: </text> <text style="white-space: nowrap;"> 规格型号: </text>
<view>{{v.specificationModel}}</view> <view>{{v?.specificationModel}}</view>
</view> </view>
<view> <view>
<view> <view>

8
pages/NursingNew/component/pleasetake/common/medetails.vue
View File

@ -12,15 +12,15 @@
</view> </view>
</view> </view>
<view class="youcont"> <view class="youcont">
<view>{{objtake.materialName}}</view> <view>{{objtake?.materialName}}</view>
<view> <view>
<view> <view>
物料编码 物料编码
<text>{{objtake.materialNo}}</text> <text>{{objtake?.materialNo}}</text>
</view> </view>
<view> <view>
规格型号 规格型号
<text style="white-space: nowrap;">{{objtake.specificationModel}}</text> <text style="white-space: nowrap;">{{objtake?.specificationModel}}</text>
</view> </view>
</view> </view>
<view> <view>
@ -30,7 +30,7 @@
</view> </view>
<view> <view>
请领单位 请领单位
<text>{{objtake.materialUnits}}</text> <text>{{objtake?.materialUnits}}</text>
</view> </view>
<view> <view>
累计请领 累计请领

8
pages/NursingNew/component/pleasetake/common/takeing.vue
View File

@ -12,21 +12,21 @@
<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/> <image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
</view> </view>
<view class="youcont"> <view class="youcont">
<view>{{objtake.materialName}}</view> <view>{{objtake?.materialName}}</view>
<view> <view>
<view> <view>
物料编码 物料编码
<text>{{objtake.materialNo}}</text> <text>{{objtake?.materialNo}}</text>
</view> </view>
<view> <view>
请购单位 请购单位
<text>{{objtake.materialUnits}}</text> <text>{{objtake?.materialUnits}}</text>
</view> </view>
</view> </view>
<view> <view>
<view> <view>
规格型号 规格型号
<text style="white-space: nowrap;">{{objtake.specificationModel}}</text> <text style="white-space: nowrap;">{{objtake?.specificationModel}}</text>
</view> </view>
</view> </view>
</view> </view>

3
pages/NursingNew/component/pleasetake/component/requestform.vue
View File

@ -221,8 +221,7 @@
import defaultr from '../common/default.vue' import defaultr from '../common/default.vue'
const props = defineProps({ const props = defineProps({
isShow: { isShow: {
type: Boolean, type: Boolean
required: true,
}, },
}); });
const tagsarray = ref(["全部", "待出库", "已出库", "已收货 ", "已作废"]) const tagsarray = ref(["全部", "待出库", "已出库", "已收货 ", "已作废"])

3
pages/NursingNew/component/pleasetake/component/returnorder.vue
View File

@ -170,8 +170,7 @@
import submits from '../common/submits.vue' import submits from '../common/submits.vue'
const props = defineProps({ const props = defineProps({
isShow: { isShow: {
type: Boolean, type: Boolean
required: true,
}, },
}); });
const openerror = ref(false) const openerror = ref(false)

36
pages/NursingNew/component/pleasetake/component/takehomep.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view> <view v-if="isShow">
<view class="buttons-father"> <view class="buttons-father">
<view class="boxtwo"> <view class="boxtwo">
<view class="ipt"> <view class="ipt">
@ -79,6 +79,30 @@
typeId:'', typeId:'',
medicationId:'' medicationId:''
}) })
const props = defineProps({
isShow: {
type: Boolean
},
});
const transition = ref(false);
watch(
() => props.isShow,
(newVal, oldVal) => {
form.pageNo = 1;
listarr.value = [];
config()
wuliao()
if (!oldVal && newVal) {
transition.value = false;
setTimeout(() => {
transition.value = true;
}, 50)
} else {
transition.value = false;
}
}
)
const takeshow = ref(false) const takeshow = ref(false)
const ification = ref(false) const ification = ref(false)
const detaishow = ref(false) const detaishow = ref(false)
@ -89,10 +113,6 @@
const openerror = ref(false) const openerror = ref(false)
const errmsg = ref('') const errmsg = ref('')
const classication = ref<InstanceType<typeof ChildComponent>>() const classication = ref<InstanceType<typeof ChildComponent>>()
onMounted(()=>{
config()
wuliao()
})
const addMaterial = ref([]) const addMaterial = ref([])
const wuliao = () =>{ const wuliao = () =>{
let obj = { let obj = {
@ -100,7 +120,7 @@
elderId:form.elderId elderId:form.elderId
} }
queryGwcInfo(obj).then(res=>{ queryGwcInfo(obj).then(res=>{
// console.log(res,obj) console.log(res)
addMaterial.value = res.result addMaterial.value = res.result
}) })
} }
@ -108,6 +128,8 @@
const status = ref('loadmore') const status = ref('loadmore')
const config = ()=>{ const config = ()=>{
queryInvoicingList(form).then(res=>{ queryInvoicingList(form).then(res=>{
console.log(res)
console.log(form)
res.result.records.forEach(item=>{ res.result.records.forEach(item=>{
item.zk = false; item.zk = false;
item.scrollleft = 0; item.scrollleft = 0;
@ -148,10 +170,8 @@
subshow.value = true; subshow.value = true;
} }
const adddel = (v)=>{ const adddel = (v)=>{
console.log(v)
listarr.value.forEach(item=>{ listarr.value.forEach(item=>{
if(item.wlId == v.wlId){ if(item.wlId == v.wlId){
console.log(item)
objtake.value = item objtake.value = item
} }
}) })

10
pages/NursingNew/component/pleasetake/takehome.vue
View File

@ -14,7 +14,7 @@
<view v-if="hometype>0" @click="hometype=0">返回</view> <view v-if="hometype>0" @click="hometype=0">返回</view>
</view> </view>
</view> </view>
<takehomep v-if="!hometype" @changePageNumber="changehometype" ></takehomep> <takehomep :isShow="hometype==0" @changePageNumber="changehometype" ></takehomep>
<requestformView :isShow="hometype==1" /> <requestformView :isShow="hometype==1" />
<returnorder :isShow="hometype==2" /> <returnorder :isShow="hometype==2" />
</view> </view>
@ -28,14 +28,16 @@
import takehomep from './component/takehomep.vue' import takehomep from './component/takehomep.vue'
import returnorder from './component/returnorder.vue' import returnorder from './component/returnorder.vue'
const hometype = ref(0) const hometype = ref(-1)
const transition = ref(false); const transition = ref(false);
const props = defineProps({ const props = defineProps({
isShow: { isShow: {
type: Boolean, type: Boolean
required: true,
}, },
}); });
onMounted(()=>{
hometype.value = 0;
})
watch( watch(
() => props.isShow, () => props.isShow,
(newVal, oldVal) => { (newVal, oldVal) => {

1
pages/procurement/materialcar.vue
View File

@ -241,6 +241,7 @@
adfangdou.value = true; adfangdou.value = true;
}) })
} }
const caigouflag = ref(false) const caigouflag = ref(false)
const caigouarr = ref([]) const caigouarr = ref([])
const generatedOrder = ref([]) const generatedOrder = ref([])

2
unpackage/dist/dev/.nvue/pages/camera.js vendored
View File

@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
) )
]); ]);
} }
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]); const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
export { export {
camera as default camera as default
}; };

2
unpackage/dist/dev/.nvue/pages/fullcamera.js vendored
View File

@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
) )
]); ]);
} }
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]); const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
export { export {
fullcamera as default fullcamera as default
}; };