diff --git a/pages/NursingNew/component/pleasetake/api/api.js b/pages/NursingNew/component/pleasetake/api/api.js
index 200dee6..9b2daf8 100644
--- a/pages/NursingNew/component/pleasetake/api/api.js
+++ b/pages/NursingNew/component/pleasetake/api/api.js
@@ -33,5 +33,19 @@ export const wlzd = (params) => {
data: params,
})
}
+export const queryGwcInfo = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/qld/queryGwcInfo`,
+ method: 'get',
+ data: params,
+ })
+}
+export const addGwc = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/qld/addGwc`,
+ method: 'post',
+ data: params,
+ })
+}
diff --git a/pages/NursingNew/component/pleasetake/common/addwl.vue b/pages/NursingNew/component/pleasetake/common/addwl.vue
index 64ef4fd..e20c30f 100644
--- a/pages/NursingNew/component/pleasetake/common/addwl.vue
+++ b/pages/NursingNew/component/pleasetake/common/addwl.vue
@@ -5,13 +5,14 @@
请领物料
+ scroll-with-animation :scroll-top="scrollleft" @scrolltolower="scrolltolower(1)">
-
- {{v.materialName}}
+ {{v.materialInfo.materialName}}
已添加
+
@@ -31,16 +32,25 @@
diff --git a/pages/NursingNew/component/pleasetake/common/takeing.vue b/pages/NursingNew/component/pleasetake/common/takeing.vue
index d3d7433..c070e9a 100644
--- a/pages/NursingNew/component/pleasetake/common/takeing.vue
+++ b/pages/NursingNew/component/pleasetake/common/takeing.vue
@@ -32,7 +32,7 @@
- 数量 超过库存上限！
+ 数量
@@ -44,7 +44,7 @@
-
+
+
@@ -85,52 +85,42 @@
}
})
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
- const emit = defineEmits([ 'fill' ,'qingling'])
+ const emit = defineEmits([ 'fill' ,'right'])
const showbox = ref(false)
watch(()=>props.show,
()=>{
- console.log(props.objtake)
if(props.show==true){
+ relNumber.value = 1;
+ stringShow.value = toFixed4ByPadStart(relNumber.value)
setTimeout(()=>{
showbox.value = true
},50)
}else{
- showbox.value = false
+ showbox.value = false;
+ isZero.value = false;
}
})
const sx = ref(false)
- const cy=()=>{
- let num = Number(props.caigouobj.upperLimit)-Number(props.caigouobj.kcsl);
- let bl = relNumber.value*type.value.num
- if(bl>num){
- sx.value = true
- }else{
- sx.value = false
- }
- console.log(sx.value,num,bl)
- }
+
const calculatorArray = [1, 2, 3, 4, 5, 6, 7, 8, 9, "AC", 0, "AE"];
const stringShow = ref("0000");
- const relNumber = ref(0);
+ const relNumber = ref(1);
const isZero = ref(false);
const clickKuai = (item : any, index : number) => {
if (item == "AC") {
relNumber.value = 0;
stringShow.value = "0000";
- cy()
return
}
if (item == "AE") {
relNumber.value = Math.trunc(relNumber.value / 10)
stringShow.value = toFixed4ByPadStart(relNumber.value);
- cy()
return
}
if(isZero.value == false){
isZero.value = true;
relNumber.value = item;
stringShow.value = toFixed4ByPadStart(relNumber.value);
- cy()
return
}
if (digitCountByString(relNumber.value) > 3) {
@@ -141,7 +131,6 @@
} else {
relNumber.value = relNumber.value * 10 + item;
}
- cy()
stringShow.value = toFixed4ByPadStart(relNumber.value)
}
}
@@ -159,28 +148,15 @@
}, 120);
}
const jjnum = (e:number)=>{
- let num = Number(props.caigouobj.upperLimit)-Number(props.caigouobj.kcsl);
- let m = Math.floor(num/type.value.num)
- if(m<=relNumber.value&&e==1){relNumber.value = m; return}
+ let num = 9999;
+ if(relNumber.value>=num&&e==1){relNumber.value = num; return}
if(relNumber.value<=1&&e==-1){relNumber.value = 1; return}
relNumber.value+=e;
stringShow.value = toFixed4ByPadStart(relNumber.value)
- cy()
// emit('jjnum',e)
}
const closeIt = () => {
- if(relNumber.value<1){
- uni.showToast({
- title:'采购数量不能为0！',
- icon:'none'
- })
- return
- }
-
- emit('right', relNumber.value,gysarr.value[gysidnum.value],type.value)
- }
- const colse = ()=>{
- emit('colse')
+ emit('right', relNumber.value,props.objtake )
}
function digitCountByString(n) {
const s = Math.abs(n).toString();
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index 634440e..72bdbee 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -43,9 +43,9 @@
-
+
-
+
@@ -76,7 +76,19 @@
const classication = ref>()
onMounted(()=>{
config()
+ wuliao()
})
+ const addMaterial = ref([])
+ const wuliao = () =>{
+ let obj = {
+ nuId:form.nuId,
+ elderId:form.elderId
+ }
+ queryGwcInfo(obj).then(res=>{
+ console.log(res)
+ addMaterial.value = res.result
+ })
+ }
const listarr = ref([])
const status = ref('loadmore')
const config = ()=>{
@@ -88,7 +100,7 @@
})
listarr.value.push(...res.result.records)
status.value = (res.result.total == listarr.value.length ? 'nomore' : 'loadmore')
- console.log(res,status.value,listarr.value.length)
+ console.log( status.value )
})
}
const scrolltolower = ( ) => {
@@ -140,6 +152,27 @@
break;
}
}
+ const right = (e,v) =>{
+ let obj = {
+ kfId:v.id,
+ wlId:v.wlId,
+ qlNum:e,
+ nuId:form.nuId,
+ elderId:form.elderId
+ }
+ addGwc(obj).then(res=>{
+ console.log(res)
+ if(res.success){
+ takeshow.value = false;
+ wuliao();
+ }else{
+ uni.showToast({
+ icon:'none',
+ title:res.message
+ })
+ }
+ })
+ }
const confirm = (e)=>{
form.categoryId = e.categoryId;
form.typeId = e.typeId;