diff --git a/common/http/config.ts b/common/http/config.ts index 2a613a0..3778f11 100644 --- a/common/http/config.ts +++ b/common/http/config.ts @@ -9,9 +9,9 @@ export default { //本地服务 - // base_scm: 'http://192.168.1.23:7002', + // base_scm: 'http://192.168.1.222:7002/', // base_auth:'https://oauth.goodsilk.cn/api',//登录 - // base_mes:'http://192.168.1.23:7002/mes',//面料 - // base_process:'http://192.168.1.23:7002/mes',//工艺 + // base_mes:'https://scm.goodsilk.cn/mes',//面料 + // base_process:'https://scm.goodsilk.cn/mes',//工艺 } \ No newline at end of file diff --git a/pages.json b/pages.json index 144774f..af95dbe 100644 --- a/pages.json +++ b/pages.json @@ -401,6 +401,18 @@ "bounce": "none" } } + }, + { + "path" : "pages/whiteEmbryo/listSearch", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } } ], "globalStyle": { diff --git a/pages/index/index.vue b/pages/index/index.vue index c4ff2dd..6527ff7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -12,6 +12,11 @@ import { getAction } from '../../common/http'; import { showFailToast } from 'vant'; const ListData =ref([ + { + path: '../whiteEmbryo/listSearch', + name: '白胚库存列表', + type:'', + }, { path: '../maintenance/processOldzmd', name: '工艺维护', diff --git a/pages/whiteEmbryo/listSearch.vue b/pages/whiteEmbryo/listSearch.vue new file mode 100644 index 0000000..f55a9b1 --- /dev/null +++ b/pages/whiteEmbryo/listSearch.vue @@ -0,0 +1,159 @@ + + + + \ No newline at end of file diff --git a/pages/whiteEmbryo/w-list.vue b/pages/whiteEmbryo/w-list.vue index b455524..0204c51 100644 --- a/pages/whiteEmbryo/w-list.vue +++ b/pages/whiteEmbryo/w-list.vue @@ -65,7 +65,9 @@ } getAction('/rawFabric/search',param).then((res:any)=>{ if(res.code===200){ - list.value = res.data.record + res.data.record.forEach((l:any)=>{ + list.value.push(l) + }) total.value = res.data.total loading.value = false; finished.value = false diff --git a/pages/whiteEmbryo/w-warehousing.vue b/pages/whiteEmbryo/w-warehousing.vue index 3e7a9ea..541c19d 100644 --- a/pages/whiteEmbryo/w-warehousing.vue +++ b/pages/whiteEmbryo/w-warehousing.vue @@ -85,6 +85,23 @@ const handleOpen = () =>{ popuList.value=djList.value.map(l=>({text:l.level,value:l.level})) } } +const searchVal = ref() +const selectValue = ref() +const searchPop = () =>{ + if (timer.value) { + clearTimeout(timer.value) + } + timer.value = setTimeout(() => { + getSeach() + }, 800) +} +function getSeach(){ + let reg = new RegExp(searchVal.value) + let a=popuList.value.find((l:any)=>reg.test(l.text)) + if(a){ + selectValue.value=[a.text] + } +} const onSubmit = () =>{ postAction('/rawFabric',form.value).then((res:any)=>{ @@ -100,8 +117,7 @@ const onSubmit = () =>{ const onClickLeft = () =>{ window.history.back() } -const onClickRight=()=>{ -} + const chooseDate = ()=>{ show.value=true } @@ -261,6 +277,7 @@ const totalMeter = computed(()=>{ }) return [ms.toFixed(1),ps] }) +