diff --git a/pages.json b/pages.json index 35ef9a3..03adf89 100644 --- a/pages.json +++ b/pages.json @@ -190,7 +190,7 @@ } }, { - "path": "pages/Warehouse/purchaseorder", + "path": "pages/procurement/purchaseorder", "style": { "navigationStyle": "custom" } diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue index 0d33768..6002a1d 100644 --- a/pages/procurement/components/carlist.vue +++ b/pages/procurement/components/carlist.vue @@ -36,12 +36,12 @@ 供应商: {{v.suppliersName}}{{v.suppliersName}} - + {{v.purchaseQuantity}} 采购数量 - {{v.kcsl}} + {{v.kcsl?v.kcsl:'0'}} 库存数量 diff --git a/pages/procurement/components/classification.vue b/pages/procurement/components/classification.vue index d173db6..82d6dbd 100644 --- a/pages/procurement/components/classification.vue +++ b/pages/procurement/components/classification.vue @@ -104,7 +104,6 @@ }) const GysList = () => { getGysList().then(res => { - console.log(res) gysarr.value = res.result }) } @@ -127,7 +126,6 @@ case 1: // 购物车 getGwcTreeDataWlnum(obj).then(res => { - console.log(res.result,obj) num.value = res.result.totalSize; }) break; @@ -151,7 +149,6 @@ case 1: // 购物车 getGwcMaterialTreeData({ 'nuId': uni.getStorageSync('nuId') }).then(res => { - console.log(res.result,props.typenum) TreeData.value = res.result; getTreelnum() }) @@ -387,8 +384,7 @@ view { width: 100%; height: 3.8vw; - background: #F5F5F8; - ; + background: #F5F5F8; border-radius: 1.9vw; font-weight: 400; font-size: 1.3vw; diff --git a/pages/procurement/components/purorder.vue b/pages/procurement/components/purorder.vue new file mode 100644 index 0000000..83ad825 --- /dev/null +++ b/pages/procurement/components/purorder.vue @@ -0,0 +1,667 @@ + + + + + diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue index e0aed84..1ec46b0 100644 --- a/pages/procurement/material.vue +++ b/pages/procurement/material.vue @@ -82,7 +82,7 @@ {{carnum>99?'99':carnum}} - + diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue index f3b1991..95abf06 100644 --- a/pages/procurement/materialcar.vue +++ b/pages/procurement/materialcar.vue @@ -20,7 +20,7 @@ 清空 - + 采购 @@ -42,6 +42,7 @@ + @@ -54,6 +55,8 @@ import classification from './components/classification.vue' import defaultr from './components/default.vue' import calculator from './components/calculator.vue' + import purorder from './components/purorder.vue' + import config from '../../uni_modules/vk-uview-ui/libs/config/config.js'; const addflag = ref(false) const ification = ref(false) const caigouobj = ref({}) @@ -92,6 +95,7 @@ InvoicingList.value = []; queryInvo(); } + const addcartory =(e:any)=>{ console.log(e) caigouobj.value = e; @@ -107,6 +111,10 @@ queryInvo(); ification.value = false } + const configr=()=>{ + caigouflag.value = false; + search(1) + } let times = null; const setout = ref(true) const scrolltolower = (t:number) => { @@ -189,7 +197,25 @@ },700) }) } - + const caigouflag = ref(false) + const caigouarr = ref([]) + const caigouclk =()=>{ + let arr = []; + InvoicingList.value.forEach(item=>{ + if(item.flag){ + arr.push(item) + } + }) + caigouarr.value = arr; + if(arr.length==0){ + uni.showToast({ + title:'请选择物料!', + icon:'none' + }) + return + } + caigouflag.value = true; + } \ No newline at end of file diff --git a/unpackage/dist/cache/.vite/deps/_metadata.json b/unpackage/dist/cache/.vite/deps/_metadata.json index 11b3a6f..d8e2ed1 100644 --- a/unpackage/dist/cache/.vite/deps/_metadata.json +++ b/unpackage/dist/cache/.vite/deps/_metadata.json @@ -1,8 +1,8 @@ { - "hash": "411276bc", - "configHash": "6a46f7c8", + "hash": "9e248234", + "configHash": "17f5f5b6", "lockfileHash": "285de26d", - "browserHash": "e7fc8171", + "browserHash": "f287ed85", "optimized": {}, "chunks": {} } \ No newline at end of file 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 fc534ca..beefd5c 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 };