diff --git a/pages.json b/pages.json index 8163748..97bb9b2 100644 --- a/pages.json +++ b/pages.json @@ -184,6 +184,13 @@ }, { "path" : "pages/procurement/material" + }, + { + "path" : "pages/procurement/materialcar", + "style" : + { + "navigationBarTitleText" : "" + } } // { diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue index 1841c0d..ab7fe7a 100644 --- a/pages/procurement/components/calculator.vue +++ b/pages/procurement/components/calculator.vue @@ -108,7 +108,9 @@ n.forEach((item,i)=>{ gysarr.value.push({'name':item,'id':id[i]}) }) - } + }else{ + gysflag.value = false; + } }) const gysid = (e:number)=>{ gysidnum.value = e; diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue index de97690..ff86bbe 100644 --- a/pages/procurement/components/carditem.vue +++ b/pages/procurement/components/carditem.vue @@ -103,7 +103,7 @@ emit('addcar', caigouobj.value,obj) } - const addcar = (v : any) => { + const addcar = (v : any,i:number) => { caigouobj.value = v; caigouobj.value.index = i; caigouobj.value.yj = false; diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue new file mode 100644 index 0000000..60b2f02 --- /dev/null +++ b/pages/procurement/components/carlist.vue @@ -0,0 +1,427 @@ + + + + + \ No newline at end of file diff --git a/pages/procurement/components/details.vue b/pages/procurement/components/details.vue new file mode 100644 index 0000000..8a258de --- /dev/null +++ b/pages/procurement/components/details.vue @@ -0,0 +1,415 @@ + + + + + diff --git a/pages/procurement/components/inboundoutbound.vue b/pages/procurement/components/inboundoutbound.vue new file mode 100644 index 0000000..277a143 --- /dev/null +++ b/pages/procurement/components/inboundoutbound.vue @@ -0,0 +1,268 @@ + + + + + diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue index 2589d2e..393b61a 100644 --- a/pages/procurement/material.vue +++ b/pages/procurement/material.vue @@ -13,6 +13,10 @@ 筛选 + + + 返回 + @@ -20,7 +24,7 @@ - + {{v.materialName}} 已添加 @@ -73,7 +77,7 @@ - + {{carnum>99?'99':carnum}} @@ -93,6 +97,12 @@ + + + + + + @@ -104,11 +114,14 @@ import classification from './components/classification.vue' import Inventory from './components/Inventory.vue' import carditem from './components/carditem.vue' + import detail from './components/details.vue' + import inboundoutbound from './components/inboundoutbound.vue' const qb = ref(false) const addflag = ref(false) const ification = ref(false) const Invenshow = ref(false) - + const detailsshow = ref(false) + const crkflag = ref(true) const InvoicingList = ref([]); const caigouobj = ref({}) @@ -291,6 +304,41 @@ },700) }) } + // 双击事件 + const forthmenuIndex = ref(0); + const lastTap = ref(0) + // 双击的最大间隔(ms),可根据体验调整 + const DOUBLE_TAP_DELAY = 300; + const setout = ref(null) + const clickaddcar = (v : any,i:number) => { + const now = Date.now() + forthmenuIndex.value = i + if (now - lastTap.value < DOUBLE_TAP_DELAY) { + // 双击成立 + clearTimeout(setout.value) + if(v.isAdd==1){ + return + }else{ + caigouobj.value = v; + caigouobj.value.index = i; + caigouobj.value.yj = true; + addcartory(caigouobj.value) + } + // 重置,避免多次触发 + lastTap.value = 0 + } else { + setout.value = setTimeout(()=>{ + caigouobj.value = v; + caigouobj.value.index = i; + caigouobj.value.yj = true; + detailsshow.value = true; + console.log('11111111') + },DOUBLE_TAP_DELAY) + // 记录本次时间,等待下次点击 + lastTap.value = now + } + } + + \ No newline at end of file diff --git a/pages/procurement/next-swipe-action/next-swipe-action.vue b/pages/procurement/next-swipe-action/next-swipe-action.vue deleted file mode 100644 index c09b8cc..0000000 --- a/pages/procurement/next-swipe-action/next-swipe-action.vue +++ /dev/null @@ -1,180 +0,0 @@ - - - - - \ No newline at end of file diff --git a/static/index/procurement/bk.png b/static/index/procurement/bk.png new file mode 100644 index 0000000..e70d9f2 Binary files /dev/null and b/static/index/procurement/bk.png differ diff --git a/static/index/procurement/del1.png b/static/index/procurement/del1.png new file mode 100644 index 0000000..5445166 Binary files /dev/null and b/static/index/procurement/del1.png differ diff --git a/static/index/procurement/procure01.png b/static/index/procurement/procure01.png new file mode 100644 index 0000000..83f5774 Binary files /dev/null and b/static/index/procurement/procure01.png differ