diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index d4a4f70..87c0668 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -673,7 +673,7 @@
-
+
{
// console.log(showvalue.value)
middletarget.value = index;
showvalue.value = InvoicingList.value[index];
showvalue.value.jianhuobtn = false;
+ Invoiscroll.value = (index - 2) * 205;
if (Number(showvalue.value.status) == 0 || (Number(showvalue.value.status) > 0 && Number(showvalue.value.wrksl) > 0)) {
showvalue.value.maxnum = (showvalue.value.rksl == 0 && showvalue.value.wrksl == 0 && showvalue.value.xzsl == 0) ? showvalue.value.purchaseQuantity : showvalue.value.wrksl
showvalue.value.num = showvalue.value.maxnum;
@@ -2646,7 +2648,7 @@
}
.tags-one {
- width: 130rpx;
+ min-width: 130rpx;
height: 60rpx;
display: flex;
justify-content: center;
@@ -2657,6 +2659,7 @@
margin-top: 10rpx;
font-size: 23rpx;
color: #555555;
+ padding: 0 0.5vw;
}
}
@@ -3149,7 +3152,7 @@
padding: 0 90rpx;
.photowall-title {
- margin-top: 80rpx;
+ margin-top: 50rpx;
display: flex;
justify-content: space-between;
width: 100%;
@@ -3173,11 +3176,10 @@
width: 110%;
height: 67vh;
display: flex;
- margin-top: 40rpx;
-
+ margin-top: 20rpx;
.photowall-other-one {
width: 28.5%;
- height: 400rpx;
+ height: 430rpx;
margin-right: 3vw;
margin-bottom: 3%;
border-radius: 30rpx;
diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue
index e85e9c9..bc17d21 100644
--- a/pages/procurement/components/carlist.vue
+++ b/pages/procurement/components/carlist.vue
@@ -29,7 +29,9 @@
规格型号: {{v.wlSpecificationModel}}
- 采购单价: ¥{{Number(v.referenceUnitPrice).toFixed(2) }}
+ 采购单价: ¥{{Number(v.unitPrice).toFixed(2) }}
+ 采购单价: ¥{{Number(v.twoUnitPrice).toFixed(2) }}
+ 采购单价: ¥{{Number(v.oneUnitPrice).toFixed(2) }}
采购单位: {{v.wlUnits}}
diff --git a/pages/procurement/components/classification.vue b/pages/procurement/components/classification.vue
index f4fa0fb..ac0b37b 100644
--- a/pages/procurement/components/classification.vue
+++ b/pages/procurement/components/classification.vue
@@ -56,7 +56,7 @@
- 重置
+ 重置
确定 ({{num>99?'99+':num}}件物料)
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index 7d34a41..fbe1037 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -81,9 +81,6 @@
const status = ref('loading')
const open = ref(0)
onShow(()=>{
- nextTick(()=>{
- chongzhi();
- })
queryInvo()
})
const classication = ref>()
@@ -106,6 +103,7 @@
item.zk = false;
item.scrollleft = 0;
})
+ console.log(res.result.records)
InvoicingList.value.push(...res.result.records);
status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
setout.value = (res.result.total == InvoicingList.value.length ? false : true)
diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue
index d2b2e48..02b939a 100644
--- a/pages/procurement/purchaseorder.vue
+++ b/pages/procurement/purchaseorder.vue
@@ -184,7 +184,7 @@
-
+
{{ showvalue?.typeId_dictText }}
-
+
+ {{showvalue.medicationId_dictText}}
+
@@ -581,9 +581,11 @@
cgdId: "",
isWaring: 0
}
+ const Invoitop = ref(0)
const clickmiddle = (index : number) => {
middletarget.value = index;
showvalue.value = InvoicingList.value[index];
+ Invoitop.value = Math.floor(index/3) * 105;
Object.assign(form, mobanform)
form.pageSize = -1;
}
@@ -1087,7 +1089,7 @@
}
.tags-one {
- width: 130rpx;
+ min-width: 130rpx;
height: 60rpx;
display: flex;
justify-content: center;
@@ -1098,6 +1100,7 @@
margin-top: 20rpx;
font-size: 25rpx;
color: #555555;
+ padding: 0 0.5vw;
}
}
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 12310ff..04100f2 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/unpackage/dist/dev/.nvue/pages/camera.js
@@ -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 {
camera as default
};
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index dd59bdc..c959abe 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -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 {
fullcamera as default
};