From 7a6e9b234c846197678ad1731317c06d15598beb Mon Sep 17 00:00:00 2001 From: ljx120 <10717296+ljx120@user.noreply.gitee.com> Date: Wed, 12 Feb 2025 17:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http/config.ts | 16 ++-- pages.json | 31 +++++++- pages/colorBlank/ColorBlankQuality.vue | 6 +- pages/colorBlank/ColorBlankQuality1.vue | 4 +- pages/colorBlank/ScanCodeStorage.vue | 101 ++++++++++++++++++++++++ pages/colorBlank/resultsQuery.vue | 9 ++- pages/distribution/detailCus.vue | 4 +- pages/distribution/detailSpot.vue | 4 +- pages/index/index.vue | 15 ++-- pages/orderStatus/orderStatus.vue | 85 ++++++++++++++++++++ static/zhaoxiangji.png | Bin 0 -> 3790 bytes 11 files changed, 250 insertions(+), 25 deletions(-) create mode 100644 pages/colorBlank/ScanCodeStorage.vue create mode 100644 pages/orderStatus/orderStatus.vue create mode 100644 static/zhaoxiangji.png diff --git a/common/http/config.ts b/common/http/config.ts index caebe4e..d505333 100644 --- a/common/http/config.ts +++ b/common/http/config.ts @@ -1,18 +1,18 @@ export default { //正式接口 - base_scm:'/api', - base_auth:'',//登录 - base_mes:'/mes',//面料 - base_process:'/mes',//工艺 + // base_scm:'/api', + // base_auth:'',//登录 + // base_mes:'/mes',//面料 + // base_process:'/mes',//工艺 //本地服务 // 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',//工艺 + 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',//工艺 } \ No newline at end of file diff --git a/pages.json b/pages.json index 150dd79..a82e31a 100644 --- a/pages.json +++ b/pages.json @@ -490,7 +490,36 @@ "path" : "pages/colorBlank/ColorBlankQuality1", "style" : { - "navigationBarTitleText" : "" + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } + }, + { + "path" : "pages/colorBlank/ScanCodeStorage", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } + }, + { + "path" : "pages/orderStatus/orderStatus", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } } } ], diff --git a/pages/colorBlank/ColorBlankQuality.vue b/pages/colorBlank/ColorBlankQuality.vue index 8e90810..f877d45 100644 --- a/pages/colorBlank/ColorBlankQuality.vue +++ b/pages/colorBlank/ColorBlankQuality.vue @@ -236,7 +236,7 @@ id: form.value.ids[j], mlxq: l, testItems: testItems.value, - status: '回修', + status: '质检完成', }) } else { data.push({ @@ -263,7 +263,7 @@ id: form.value.ids[j], mlxq: l, testItems: testItems.value, - status: '回修', + status: '暂存', }) } else { data.push({ @@ -332,7 +332,7 @@ id: form.value.ids[j], mlxq: l, testItems: testItems.value, - status: '回修', + status: '待审核', }) } else { data.push({ diff --git a/pages/colorBlank/ColorBlankQuality1.vue b/pages/colorBlank/ColorBlankQuality1.vue index 3ded3d7..82089a9 100644 --- a/pages/colorBlank/ColorBlankQuality1.vue +++ b/pages/colorBlank/ColorBlankQuality1.vue @@ -236,7 +236,7 @@ id: form.value.ids[j], mlxq: l, testItems: testItems.value, - status: '回修', + status: '质检完成', }) } else { data.push({ @@ -263,7 +263,7 @@ id: form.value.ids[j], mlxq: l, testItems: testItems.value, - status: '回修', + status: '暂存', }) } else { data.push({ diff --git a/pages/colorBlank/ScanCodeStorage.vue b/pages/colorBlank/ScanCodeStorage.vue new file mode 100644 index 0000000..904c874 --- /dev/null +++ b/pages/colorBlank/ScanCodeStorage.vue @@ -0,0 +1,101 @@ + + + + + \ No newline at end of file diff --git a/pages/colorBlank/resultsQuery.vue b/pages/colorBlank/resultsQuery.vue index 8f15d9e..e9dec69 100644 --- a/pages/colorBlank/resultsQuery.vue +++ b/pages/colorBlank/resultsQuery.vue @@ -77,6 +77,11 @@ } }) } + + const choose = () =>{ + list.value = [] + init() + } //日期选择 const show = ref(false) @@ -204,8 +209,8 @@ - 重置 - 筛选 + 重置 + 筛选 diff --git a/pages/distribution/detailCus.vue b/pages/distribution/detailCus.vue index cc7b4a9..404dd6f 100644 --- a/pages/distribution/detailCus.vue +++ b/pages/distribution/detailCus.vue @@ -259,7 +259,7 @@ {{itemSecond.code}}
{{itemSecond.ms}}米 - +

总米数:{{totalMeter(index)}}

@@ -281,7 +281,7 @@ readonly :rules="[{ required: true, message: '请填写' }]" @click="choosePic" /> -
diff --git a/pages/distribution/detailSpot.vue b/pages/distribution/detailSpot.vue index f769611..5ba2d9d 100644 --- a/pages/distribution/detailSpot.vue +++ b/pages/distribution/detailSpot.vue @@ -252,7 +252,7 @@ {{itemSecond.code}}
{{itemSecond.ms}}米 - +

总匹数:{{totalPs(index)}}

@@ -276,7 +276,7 @@ readonly :rules="[{ required: true, message: '请填写' }]" @click="choosePic()" /> - diff --git a/pages/index/index.vue b/pages/index/index.vue index 95ad953..fb28e27 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -127,11 +127,16 @@ const ListData =ref([ name:'质检结果查询', type:'testing', }, - // { - // path:'../colorBlank/ColorBlankQuality', - // name:'色胚质检', - // type:'blemish', - // }, + { + path:'../colorBlank/ScanCodeStorage', + name:'扫码暂存', + type:'testing', + }, + { + path:'../orderStatus/orderStatus', + name:'订单状态查询', + type:'testing', + }, // { // path:'../colorBlank/chemical', // name:'理化报告', diff --git a/pages/orderStatus/orderStatus.vue b/pages/orderStatus/orderStatus.vue new file mode 100644 index 0000000..b412980 --- /dev/null +++ b/pages/orderStatus/orderStatus.vue @@ -0,0 +1,85 @@ + + + + + \ No newline at end of file diff --git a/static/zhaoxiangji.png b/static/zhaoxiangji.png new file mode 100644 index 0000000000000000000000000000000000000000..81d2fe154f3250f4fae0574fd50105d87158d823 GIT binary patch literal 3790 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 L4SCgLPG0^u97#ip literal 0 HcmV?d00001