diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue
index 4fa0299..d0fdf92 100644
--- a/pages/NursingNew/component/pleasetake/common/carditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/carditem.vue
@@ -10,9 +10,8 @@
v-show="!isemity" enable-back-to-top>
-
+
+
@@ -87,7 +86,7 @@
-
+
请领记录
@@ -98,7 +97,8 @@
{{v.zhiDingId?'取消置顶':'置 顶'}}
-
+
+
@@ -197,6 +197,22 @@
scrollLeft.value = e.detail.scrollLeft
// console.log(e.detail.scrollLeft)
}
+ const startX = ref(0)
+ const openwhitchindex = ref(-1)
+ const ts = (e) => {
+ startX.value = e.touches[0].clientX;
+ }
+ const canmove = (e : any, index : number) => {
+ const moveX = e.touches[0].clientX
+ const diff = moveX - startX.value
+ // diff 为负值就是向左滑
+ if (diff < -40) { // 👉 60px 阈值,随便改
+ openwhitchindex.value = index
+ }
+ if (diff > 40) { // 👉 60px 阈值,随便改
+ openwhitchindex.value = -1
+ }
+ }
\ No newline at end of file
diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue
index 7e78df0..be6ce75 100644
--- a/pages/login/newanimationpage.vue
+++ b/pages/login/newanimationpage.vue
@@ -158,7 +158,7 @@
onShow(() => {
setTimeout(() => {
playall.value = true;
- }, 300)
+ }, 500)
zyupgrade.value?.check_update();
queryPadPageList().then((res => {
@@ -371,9 +371,9 @@
const ceshijump = () => {
// ceshiopen.value = true
- // uni.navigateTo({
- // url:"/pages/login/ceshi"
- // })
+ uni.navigateTo({
+ url:"/pages/login/ceshi"
+ })
// console.log("wtf")
// try {
// const Intent = plus.android.importClass('android.content.Intent')
diff --git a/pages/procurement/components/Inventory.vue b/pages/procurement/components/Inventory.vue
index 8f49df1..74fe81c 100644
--- a/pages/procurement/components/Inventory.vue
+++ b/pages/procurement/components/Inventory.vue
@@ -4,68 +4,77 @@
全部库存预警
-
-
-
-
-
-
-
- {{v.categoryId_dictText}}
- {{v.typeId_dictText}}
- {{v.medicationId_dictText}}
-
-
-
-
- {{v.materialName}}{{v.materialNo}}
-
-
- 规格型号: {{v.specificationModel}}
-
-
- 采购单价:111111111111111
- ¥{{v.oneUnitPrice?Number(v.oneUnitPrice).toFixed(2):""}}
- 采购单位: {{ v.oneUnit}}
- 采购单价:
- ¥{{v.twoUnitPrice?Number(v.twoUnitPrice).toFixed(2):""}}
- 采购单位: {{ v.twoUnit}}
- 采购单价:
- ¥{{v.referenceUnitPrice?Number(v.referenceUnitPrice).toFixed(2):""}}
- 采购单位: {{ v.materialUnits}}
-
-
-
- {{v.kcsl}}
- 库存数量
+
+
+
+
+
+
+
+
+
+
+ {{v.categoryId_dictText}}
+ {{v.typeId_dictText}}
+ {{v.medicationId_dictText}}
+
-
- {{v.upperLimit}}
- 物料上限 ↑
+
+
+ {{v.materialName}}{{v.materialNo}}
+
+
+ 规格型号:
+ {{v.specificationModel}}
+
+
+ 采购单价:
+ ¥{{v.oneUnitPrice?Number(v.oneUnitPrice).toFixed(2):""}}
+ 采购单位: {{ v.oneUnit}}
+ 采购单价:
+ ¥{{v.twoUnitPrice?Number(v.twoUnitPrice).toFixed(2):""}}
+ 采购单位: {{ v.twoUnit}}
+ 采购单价:
+ ¥{{v.referenceUnitPrice?Number(v.referenceUnitPrice).toFixed(2):""}}
+ 采购单位: {{ v.materialUnits}}
+
+
+
+ {{v.kcsl}}
+ 库存数量
+
+
+ {{v.upperLimit}}
+ 物料上限 ↑
+
+
+ {{v.lowerLimit}}
+ ↓ 物料下限
+
+
-
- {{v.lowerLimit}}
- ↓ 物料下限
+
+ 已添加
+
+
+
+ 出入库
+
+
+ 加购物车
+
+
+
+
-
- 已添加
-
-
-
- 出入库
-
-
- 加购物车
-
-
-
-
+
@@ -76,7 +85,7 @@
\ No newline at end of file
diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index b05c269..c7bf5fd 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -154,7 +154,7 @@
watch(
() => props.show,
() => {
- console.log(props.caigouobj)
+ // console.log(props.caigouobj)
if (props.show) {
let a = [
{
@@ -197,7 +197,7 @@
let n = [];
let id = [];
gysarr.value = [];
- console.log("为啥报错", props.caigouobj)
+ // console.log("为啥报错", props.caigouobj)
n = props.caigouobj.suppliers_dictText?.split(/[, ]+/);
id = props.caigouobj.suppliers?.split(/[, ]+/);
n.forEach((item, i) => {
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index e8ec737..2cc813a 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -1,4 +1,527 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{v.categoryId_dictText}}
+ {{v.typeId_dictText}}
+ {{v.medicationId_dictText}}
+
+
+
+
+ {{v.materialName}}
+
+
+ 物料编码: {{v.materialNo}}
+
+
+ 规格型号: {{v.specificationModel}}
+
+
+ 采购单价: ¥{{Number(v.oneUnitPrice).toFixed(2) }}
+
+ 采购单价: ¥{{Number(v.twoUnitPrice).toFixed(2) }}
+
+ 采购单价:
+ ¥{{ Number(v.referenceUnitPrice).toFixed(2)}}
+
+
+
+ 采购单位: {{ v.oneUnit}}
+ 采购单位: {{ v.twoUnit}}
+ 采购单位: {{ v.materialUnits}}
+
+
+
+ {{v.kcsl}}
+ 库存数量
+
+
+ {{v.upperLimit}}
+ 物料上限 ↑
+
+
+ {{v.lowerLimit}}
+ ↓ 物料下限
+
+
+
+
+ 已添加
+
+
+
+
+
+
+ 出入库
+
+
+ 加购物车
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue
index eed067c..fe5fb6d 100644
--- a/pages/procurement/components/carlist.vue
+++ b/pages/procurement/components/carlist.vue
@@ -5,99 +5,106 @@
enable-back-to-top>
-
-
-
-
-
+
+
+
+
+
+
-
- 规格编号: {{v.wlMaterialNo}}
-
-
- 规格型号: {{v.wlSpecificationModel}}
-
-
- 采购单价:
- ¥{{Number(v.unitPrice).toFixed(2) }}
- 采购单价: ¥{{Number(v.twoUnitPrice).toFixed(2) }}
- 采购单价: ¥{{Number(v.oneUnitPrice).toFixed(2) }}
-
-
-
- 采购单位: {{v.wlUnits}}
-
-
-
-
-
-
-
- {{v.kcsl?v.kcsl:'0'}}
- 库存数量
-
-
-
+ :scroll-left="v.scrollleft" @scroll="scroll" -->
+
+
+
+
-
- {{v.wlUpperLimit}}
- 物料上限 ↑
-
-
-
-
- {{v.wlLowerLimit}}
- ↓ 物料下限
+
+ {{v.categoryId_dictText}}
+ {{v.typeId_dictText}}
+ {{v.medicationId_dictText}}
-
- 供应商: {{v.suppliersName}}
-
-
-
-
-
-
-
-
- {{v.purchaseQuantity}}
-
-
- 采购数量
-
-
-
- 编辑
-
+
- 删除
+ {{v.wlName}}
+
+
+
+ 规格编号: {{v.wlMaterialNo}}
+
+
+ 规格型号: {{v.wlSpecificationModel}}
+
+
+ 采购单价:
+ ¥{{Number(v.unitPrice).toFixed(2) }}
+ 采购单价:
+ ¥{{Number(v.twoUnitPrice).toFixed(2) }}
+ 采购单价:
+ ¥{{Number(v.oneUnitPrice).toFixed(2) }}
+
+
+
+ 采购单位: {{v.wlUnits}}
+
+
+
+
+
+
+
+ {{v.kcsl?v.kcsl:'0'}}
+ 库存数量
+
+
+
+
+
+ {{v.wlUpperLimit}}
+ 物料上限 ↑
+
+
+
+
+
+ {{v.wlLowerLimit}}
+ ↓ 物料下限
+
+
+
+ 供应商: {{v.suppliersName}}
+
+
+
+
+
+
+
+
+ {{v.purchaseQuantity}}
+
+
+ 采购数量
+
+
+
+ 编辑
+
+
+ 删除
+
-
+
{
+
+ openwhitchindex.value = openwhitchindex.value === i ? -1 : i;
+
+
- if (v.zk == true) {
- v.zk = false;
- v.scrollleft = 0
- } else {
- v.zk = true;
- v.scrollleft = 150;
- }
- solleft(v, i)
+ // if (v.zk == true) {
+ // v.zk = false;
+ // v.scrollleft = 0
+ // } else {
+ // v.zk = true;
+ // v.scrollleft = 150;
+ // }
+ // solleft(v, i)
}
const pageX = ref(0);
@@ -202,6 +213,22 @@
// scrollLeft.value = e.detail.scrollLeft
// console.log(e.detail.scrollLeft)
}
+ const startX = ref(0)
+ const openwhitchindex = ref(-1)
+ const ts = (e) => {
+ startX.value = e.touches[0].clientX;
+ }
+ const canmove = (e : any, index : number) => {
+ const moveX = e.touches[0].clientX
+ const diff = moveX - startX.value
+ // diff 为负值就是向左滑
+ if (diff < -40) { // 👉 60px 阈值,随便改
+ openwhitchindex.value = index
+ }
+ if (diff > 40) { // 👉 60px 阈值,随便改
+ openwhitchindex.value = -1
+ }
+ }