diff --git a/common/http/config.ts b/common/http/config.ts index 9c85c16..09bb77b 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: 'https://scm.goodsilk.cn/api', base_auth:'https://oauth.goodsilk.cn/api',//登录 base_mes:'https://scm.goodsilk.cn/mes',//面料 base_process:'https://scm.goodsilk.cn/mes',//工艺 diff --git a/pages.json b/pages.json index 6369dd1..bf9f1fb 100644 --- a/pages.json +++ b/pages.json @@ -425,6 +425,30 @@ "bounce": "none" } } + }, + { + "path" : "pages/colorBlank/ColorBlankQuality", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } + }, + { + "path" : "pages/colorBlank/chemical", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } } ], "globalStyle": { diff --git a/pages/colorBlank/ColorBlankQuality.vue b/pages/colorBlank/ColorBlankQuality.vue new file mode 100644 index 0000000..9c5ac82 --- /dev/null +++ b/pages/colorBlank/ColorBlankQuality.vue @@ -0,0 +1,113 @@ + + + + + \ No newline at end of file diff --git a/pages/colorBlank/chemical.vue b/pages/colorBlank/chemical.vue new file mode 100644 index 0000000..c6de90a --- /dev/null +++ b/pages/colorBlank/chemical.vue @@ -0,0 +1,218 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 8987879..8057cfe 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -102,11 +102,11 @@ const ListData =ref([ name:'跟单列表', type:'tracking', }, - // { - // path:'../Delivery/Delivery', - // name:'待收货列表', - // type:'', - // }, + { + path:'../Delivery/Delivery', + name:'待收货列表', + type:'blemish', + }, { path:'../colorBlank/colorBlank', name:'色胚质检列表', @@ -117,16 +117,26 @@ const ListData =ref([ name:'色胚质检瑕疵维护', type:'blemish', }, - // { - // path:'../colorBlank/quality', - // name:'色胚质检项维护', - // type:'', - // }, - // { - // path:'../colorBlank/physical', - // name:'理化报告选项维护', - // type:'', - // } + { + path:'../colorBlank/quality', + name:'色胚质检项维护', + type:'blemish', + }, + { + path:'../colorBlank/physical', + name:'理化报告选项维护', + type:'blemish', + }, + { + path:'../colorBlank/ColorBlankQuality', + name:'色胚质检', + type:'blemish', + }, + { + path:'../colorBlank/chemical', + name:'理化报告', + type:'blemish', + } ] as any[]) diff --git a/pages/whiteEmbryo/w-list.vue b/pages/whiteEmbryo/w-list.vue index 976fd50..482d389 100644 --- a/pages/whiteEmbryo/w-list.vue +++ b/pages/whiteEmbryo/w-list.vue @@ -243,7 +243,11 @@ const msps = ref({}) } //选择框确认 const pickerConfirm = (val : any) => { - listItem.value[dataType.value] = val.selectedValues[0] + if(dataType.value==='stupid'){ + form.value.stupid = val.selectedValues[0] + }else{ + listItem.value[dataType.value] = val.selectedValues[0] + } showPickerCancel() } //取消 @@ -258,6 +262,8 @@ const msps = ref({}) popuList.value=djList.value.map(l=>({text:l.level,value:l.level})) }else if(dataType.value==='czyy'){ popuList.value=[{ text: '配货进厂', value: '配货进厂' }, { text: '做本白', value: '做本白' }] + }else if(dataType.value==='stupid'){ + popuList.value=[{ text: '是', value: '是' }, { text: '否', value: '否' }] } } @@ -352,7 +358,10 @@ const msps = ref({}) @click="selectChoose('form')" /> - + + + +