diff --git a/common/http/config.ts b/common/http/config.ts index 3778f11..c45f4b3 100644 --- a/common/http/config.ts +++ b/common/http/config.ts @@ -9,7 +9,7 @@ export default { //本地服务 - // base_scm: 'http://192.168.1.222:7002/', + // base_scm: 'http://192.168.1.222:7002', // base_auth:'https://oauth.goodsilk.cn/api',//登录 // base_mes:'https://scm.goodsilk.cn/mes',//面料 // base_process:'https://scm.goodsilk.cn/mes',//工艺 diff --git a/common/http/interface.ts b/common/http/interface.ts index b9896c0..bd15f4a 100644 --- a/common/http/interface.ts +++ b/common/http/interface.ts @@ -5,6 +5,7 @@ /* */ +import { showToast } from 'vant'; import myconfig from '../http/config' // 封装uni.request方法 @@ -71,10 +72,7 @@ function httpRequest(url : string, method : any, data = {}, headerCustom = {}) { }else if(res.data.code === 7777){ resolve(res.data); }else{ - uni.showToast({ - icon:'error', - title:res.data.msg - }) + showToast(res.data.msg) } }, fail: (err) => { diff --git a/pages.json b/pages.json index af95dbe..6369dd1 100644 --- a/pages.json +++ b/pages.json @@ -413,6 +413,18 @@ "bounce": "none" } } + }, + { + "path" : "pages/whiteEmbryo/warehouse-in-out", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } } ], "globalStyle": { diff --git a/pages/Delivery/Delivery.vue b/pages/Delivery/Delivery.vue index 8f7c15e..97ad436 100644 --- a/pages/Delivery/Delivery.vue +++ b/pages/Delivery/Delivery.vue @@ -542,6 +542,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; diff --git a/pages/colorBlank/colorBlank.vue b/pages/colorBlank/colorBlank.vue index d6fc366..25b2e34 100644 --- a/pages/colorBlank/colorBlank.vue +++ b/pages/colorBlank/colorBlank.vue @@ -539,6 +539,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; @@ -620,6 +625,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; diff --git a/pages/customOrder/customOrder.vue b/pages/customOrder/customOrder.vue index 66f951c..843a168 100644 --- a/pages/customOrder/customOrder.vue +++ b/pages/customOrder/customOrder.vue @@ -124,18 +124,18 @@ form.value.customOrder[typeData.value] = val.selectedOptions[0].value } else if (typeData.value === 'extraOptions') { form.value.orderItems[indexData.value][typeData.value][indexData1.value].value = val.selectedValues[0] - } else if(typeData.value === 'craftFlow'){ - let url='/craftFlows/byName?name='+val.selectedValues[0] - getAction(url).then((res:any)=>{ - if(res.code===200){ - form.value.orderItems[indexData.value].process=JSON.stringify(res.data) + } else if (typeData.value === 'craftFlow') { + let url = '/craftFlows/byName?name=' + val.selectedValues[0] + getAction(url).then((res : any) => { + if (res.code === 200) { + form.value.orderItems[indexData.value].process = JSON.stringify(res.data) form.value.orderItems[indexData.value][typeData.value] = val.selectedValues[0] - }else{ + } else { showToast('请重新选择工艺流程!') form.value.orderItems[indexData.value][typeData.value] = '' } }) - } else{ + } else { form.value.customOrder[typeData.value] = val.selectedValues[0] } showPickerCancel() @@ -154,19 +154,19 @@ popuList.value = nameList.value } else if (typeData.value === 'extraOptions') { popuList.value = otherList.value[indexData.value].options.map((l : any) => ({ text: l.name, value: l.name })) - }else if (typeData.value === 'craftFlow') { - let item={} as any - craftList.value.forEach((l:any)=>{ - if(l.craftName===form.value.orderItems[indexData.value].craft){ - item=l; + } else if (typeData.value === 'craftFlow') { + let item = {} as any + craftList.value.forEach((l : any) => { + if (l.craftName === form.value.orderItems[indexData.value].craft) { + item = l; } }) popuList.value = [] - if(item.flows){ + if (item.flows) { item.flows.forEach((l : any) => { - if(l.bind==='通用') { - popuList.value.push({ value: l.name, text: l.name} ) - } + if (l.bind === '通用') { + popuList.value.push({ value: l.name, text: l.name }) + } }) } } @@ -613,6 +613,12 @@ padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } + .search-btn { padding: 1px 8px; border: none; diff --git a/pages/customOrder/detail.vue b/pages/customOrder/detail.vue index 5dd869c..813026e 100644 --- a/pages/customOrder/detail.vue +++ b/pages/customOrder/detail.vue @@ -756,6 +756,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; diff --git a/pages/customOrder/list.vue b/pages/customOrder/list.vue index 194c832..94fc0bc 100644 --- a/pages/customOrder/list.vue +++ b/pages/customOrder/list.vue @@ -299,6 +299,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; diff --git a/pages/distribution/distribution.vue b/pages/distribution/distribution.vue index 8a1aa03..1b30bc4 100644 --- a/pages/distribution/distribution.vue +++ b/pages/distribution/distribution.vue @@ -347,6 +347,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; @@ -428,6 +433,11 @@ height: 30px; padding: 10px 16px 0; } + ::v-deep .select-model .van-picker__confirm, + .select-model .van-picker__confirm { + height: 30px; + padding: 10px 16px 0; + } .search-btn { padding: 1px 8px; diff --git a/pages/index/index.vue b/pages/index/index.vue index 6527ff7..8987879 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -15,7 +15,7 @@ const ListData =ref([ { path: '../whiteEmbryo/listSearch', name: '白胚库存列表', - type:'', + type:'rawFabric', }, { path: '../maintenance/processOldzmd', diff --git a/pages/whiteEmbryo/listSearch.vue b/pages/whiteEmbryo/listSearch.vue index f55a9b1..2d5225b 100644 --- a/pages/whiteEmbryo/listSearch.vue +++ b/pages/whiteEmbryo/listSearch.vue @@ -1,10 +1,9 @@