diff --git a/pages/NursingNew/component/doctorask/doctorask.vue b/pages/NursingNew/component/doctorask/doctorask.vue
index bfc6c24..882cdc0 100644
--- a/pages/NursingNew/component/doctorask/doctorask.vue
+++ b/pages/NursingNew/component/doctorask/doctorask.vue
@@ -183,7 +183,7 @@
-
+
@@ -193,6 +193,8 @@
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent } from 'vue';
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from './api/api.js'
+ import defaultr from '../nurse/component/default.vue'
+
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
const form = reactive({
@@ -220,6 +222,7 @@
}
const firstgetqueryCgdList = () => {
queryOrderList(form).then(res => {
+ console.log("没数据啊",res)
plsbuy.value.push(...res.result.records);
status.value = res.result.total == plsbuy.value.length ? 'nomore' : 'loadmore';
if(form.pageNo==1){
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 87aaff2..cafa397 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -121,7 +121,7 @@
{{v.directiveName?.substring(0,4)}}
{{v.directiveName?.substring(4,12)}}
-
+
@@ -390,6 +390,7 @@
}
const shtab = (e)=>{
fwzlindex.value = e;
+
if(e==0){
fwzlarr.value = zlarr.value?.hlList
}
@@ -400,6 +401,7 @@
fwzlarr.value = zlarr.value?.hqList
}
fwzldex.value = -1
+ console.log("数据呢啊",fwzlarr.value)
// console.log(zlarr.value,serverUrl.value)
}
const zldex = (e) =>{
@@ -570,6 +572,7 @@
const getmenu = () => {
queryPadPageList().then((res => {
leftMenuArray.value = res.result.records;
+ console.log("数据呢",res.result.records)
filteredMenu(0).forEach((element : any, index : number) => {
if (element.nuId === uni.getStorageSync('NUall').nuId) {
menutarget.value = index;
diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue
index 0489aa5..de31767 100644
--- a/pages/NursingNew/component/leftcontent/serveswipe.vue
+++ b/pages/NursingNew/component/leftcontent/serveswipe.vue
@@ -317,6 +317,7 @@
const autoplay = ref(false)
const severcards = ref>()
const init = (e) => {
+ console.log("啥啊",e)
firstgetqueryCgdList(e);
setTimeout(() => {
severcards.value.firstgetqueryCgdList()
@@ -523,6 +524,7 @@
return result;
}
const clickLeftMenu = (index : any, item : object) => {
+ // console.log("/////")
queryOrderInfoList({ mainId: item.id }).then(res => {
if (res.result.length > 0) {
res.result.forEach((item, i) => {
@@ -536,8 +538,9 @@
// const indexmessage = ref({});
const firstgetqueryCgdList = (nuId) => {
form.nuId = nuId;
+ // console.log("wtf")
queryOrderList(form).then(res => {
- console.log(`这啥啊啊啊啊啊`,form , res.result.records)
+ console.log(`这啥啊啊啊啊啊`,form, res)
if (res.result.records.length > 0) {
res.result.records.forEach((item, l) => {
item.flag = false;
diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css
index 4379cdb..d83f4d6 100644
--- a/pages/NursingNew/component/nurse/index.css
+++ b/pages/NursingNew/component/nurse/index.css
@@ -1268,7 +1268,7 @@
.instant {
width: 33%;
- height: 155rpx;
+ height: 142rpx;
display: flex;
justify-content: center;
align-items: center;
@@ -1296,8 +1296,8 @@
}
.instant-icon {
- width: 62rpx;
- height: 62rpx;
+ width: 70rpx;
+ height: 70rpx;
/* 性能关键 */
will-change: transform;
transform-origin: 50% 52%;
diff --git a/pages/NursingNew/component/nurse/newindex.vue b/pages/NursingNew/component/nurse/newindex.vue
index cb1a656..5ae21c0 100644
--- a/pages/NursingNew/component/nurse/newindex.vue
+++ b/pages/NursingNew/component/nurse/newindex.vue
@@ -1666,10 +1666,10 @@
const emotionTagList = ref([]);
const bodyTagList = ref([]);
const geteverything = () => {
-
+
if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
-
+
timearr.value = Array.from({ length: 24 }, (_, hour) => ({
positioning: hour.toString(),
children: minuteArr.map(time => ({
@@ -1681,6 +1681,7 @@
timearr.value[res.positioning].children[res.positioningLong] = res;
})
bottomItems.value = res.result.instantList
+ // console.log("zzzz",res.result.serviceList)
if (!res.result.instantList.length) {
deleteshake.value = false
}
@@ -1705,6 +1706,7 @@
onMounted(() => {
savePackagelist.value = uni.getStorageSync('Packagelist') || []
+ // console.log("0000", savePackagelist.value)
let res = uni.getStorageSync('saveTree0')
let goodArray = []
myArray.forEach((element : any) => {
@@ -1716,6 +1718,7 @@
})
})
secondtemp.value = goodArray
+
let data0 = res.result.fwzl
// console.log("0000", data0)
if (data0) {
@@ -2233,7 +2236,10 @@
lastClick.value = now
}
function shortText(str : string, number : number) {
- return str.length > number ? str.slice(0, number) + '.' : str
+ if(str){
+ return str.length > number ? str.slice(0, number) + '.' : str
+ }
+
}
function padZero(str : string) {
return str.length === 1 ? '0' + str : str
diff --git a/pages/NursingNew/component/pleasetake/common/nomessage.vue b/pages/NursingNew/component/pleasetake/common/nomessage.vue
index c03b47f..f4a71bb 100644
--- a/pages/NursingNew/component/pleasetake/common/nomessage.vue
+++ b/pages/NursingNew/component/pleasetake/common/nomessage.vue
@@ -24,10 +24,11 @@
\ No newline at end of file
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 412b073..b29e495 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -64,7 +64,7 @@
{{v.ljkcsl}}
+ style="position: absolute;width: 10vw;height: 10vw;left: 0%;">
@@ -105,7 +105,7 @@
:status="status" @crk="crk">
-
+
@@ -114,7 +114,7 @@
-
+
@@ -155,7 +155,7 @@
import addall from './components/addall.vue'
import defaultr from './components/default.vue'
const tx = ref(false)
-
+ const emit = defineEmits(['changepages'])
const backmoreopen = ref(false)
@@ -204,25 +204,38 @@
type: Boolean
},
});
- // onMounted(()=>{
- // form.pageNo = 1;
- // warn.pageNo = 1;
- // Material.value = [];
- // InvoicingList.value = [];
- // moredex.value = 0;
- // shoppcar();
- // getWaringMaterial()
- // nextTick(() => {
- // chongzhi()
- // })
- // setTimeout(()=>{
- // timeout.value = true
- // },500)
- // transition.value = false;
- // setTimeout(() => {
- // transition.value = true;
- // }, 50)
- // })
+ const queryInvo = () => {
+ queryInvoicingList(form).then(res => {
+ console.log(res)
+ res.result.records.forEach(item => {
+ item.zk = false;
+ item.scrollleft = 0;
+ })
+ InvoicingList.value.push(...res.result.records);
+ status.value = (res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore')
+ setout2.value = (res.result.total == InvoicingList.value.length ? false : true)
+ })
+ }
+ onMounted(()=>{
+ // gwcsx()
+ form.pageNo = 1;
+ warn.pageNo = 1;
+ Material.value = [];
+ InvoicingList.value = [];
+ moredex.value = 0;
+ shoppcar();
+ getWaringMaterial()
+ nextTick(() => {
+ chongzhi()
+ })
+ setTimeout(()=>{
+ timeout.value = true
+ },500)
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
+ })
watch(
() => props.isShow,
(newVal, oldVal) => {
@@ -387,21 +400,10 @@
InvoicingList.value = [];
queryInvo();
}
- const queryInvo = () => {
- queryInvoicingList(form).then(res => {
- console.log(res)
- res.result.records.forEach(item => {
- item.zk = false;
- item.scrollleft = 0;
- })
- InvoicingList.value.push(...res.result.records);
- status.value = (res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore')
- setout2.value = (res.result.total == InvoicingList.value.length ? false : true)
- })
- }
+
const addcartory = (e : any) => {
// e把index覆盖了导致index永远是0
- console.log("我要测试",e)
+ // console.log("我要测试",e)
if(!e.suppliers_dictText || !e.suppliers){
openerror.value = true;
errmsg.value = `此物料暂无供应商，请联系管理员`
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index ff93a0b..84bafd6 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -3,7 +3,7 @@
-
+
@@ -16,9 +16,8 @@
筛选
-
+ v-if="form.categoryId!=''||form.wlParamInfo!=''||form.suppliers!=''">
+
重置
@@ -37,28 +36,29 @@
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue
index 7fdb492..f71feb6 100644
--- a/pages/procurement/purchaseorder.vue
+++ b/pages/procurement/purchaseorder.vue
@@ -7,8 +7,11 @@
placeholder="采购单号/采购日期/供应商" @confirm="search()" />
-
+
+
+