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 @@
+
+
+
+ 总米数:{{totalMeter(index)}}请扫描面料编码
+
{{itemSecond.ms}}米
-
{{itemSecond.ms}}米
-
总匹数:{{totalPs(index)}}
@@ -276,7 +276,7 @@ readonly :rules="[{ required: true, message: '请填写' }]" @click="choosePic()" />