diff --git a/api/user.js b/api/user.js
index 1c65194..3167aa6 100644
--- a/api/user.js
+++ b/api/user.js
@@ -79,3 +79,43 @@ export function firstCheckAdd(data) {
data
});
}
+
+
+/**
+ * 首检审核
+ * @param {Object} data
+ */
+export function firstCheckSure(data) {
+ console.log(data)
+ return request({
+ url: `${functions.getDomain()}/api/first-check-sure`,
+ method: "post",
+ data
+ });
+}
+
+/**
+ * 冲压巡检提交
+ * @param {Object} data
+ */
+export function cyCheckAdd(data) {
+ console.log(data)
+ return request({
+ url: `${functions.getDomain()}/api/cy-check-add`,
+ method: "post",
+ data
+ });
+}
+
+/**
+ * 冲压巡检提交
+ * @param {Object} data
+ */
+export function cyCheckDetail(data) {
+ console.log(data)
+ return request({
+ url: `${functions.getDomain()}/api/cy-check-detail`,
+ method: "post",
+ data
+ });
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 52ce387..9cbb167 100644
--- a/pages.json
+++ b/pages.json
@@ -161,13 +161,13 @@
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "uni-app",
- "navigationBarBackgroundColor": "#008EBC",
+ "navigationBarBackgroundColor": "#007aff",
"backgroundColor": "#F8F8F8"
},
"tabBar": {
"backgroundColor": "#FFFFFF",
"color": "#C3C3C3",
- "selectedColor": "#1296db",
+ "selectedColor": "#419CFF",
"list": [{
"pagePath": "pages/index/index",
"text": "首页",
diff --git a/pages/firstInspection/firstInspection.vue b/pages/firstInspection/firstInspection.vue
index 3bf47d5..66f8d2c 100644
--- a/pages/firstInspection/firstInspection.vue
+++ b/pages/firstInspection/firstInspection.vue
@@ -7,7 +7,9 @@
物料名称:{{item.product_name}}
-
+
+
+
diff --git a/pages/firstInspection/index.scss b/pages/firstInspection/index.scss
index 31efc7f..890af84 100644
--- a/pages/firstInspection/index.scss
+++ b/pages/firstInspection/index.scss
@@ -14,7 +14,10 @@
margin-top: 24upx;
@include flex(center,space-between);
.card-right{
- image{
+ .sh-cion{
+ @include wh(34upx,34upx)
+ }
+ .glass-cion{
@include wh(34upx,34upx)
}
}
diff --git a/pages/firstInspectionInfo/firstInspectionInfo.vue b/pages/firstInspectionInfo/firstInspectionInfo.vue
index 2341d83..54946a3 100644
--- a/pages/firstInspectionInfo/firstInspectionInfo.vue
+++ b/pages/firstInspectionInfo/firstInspectionInfo.vue
@@ -16,6 +16,12 @@
{{palnInfo.product_name}}
+
+
+ 物料编号:
+ {{palnInfo.product_number}}
+
+
检验日期:
@@ -38,18 +44,34 @@
{{palnInfo.line_title}}
+
+
+ 首检信息:
+
+
+
+
+
+ {{info.msg}}
+
+
+
+
抽样方式:
-
-
+
{{item.name}}
-
-
+
+
+
+
+ {{info.sampling}}
@@ -58,14 +80,17 @@
检验依据:
-
{{item}}
-
+
+
+ {{info.basis}}
+
@@ -76,7 +101,6 @@
检验标准:
- 检验标准
@@ -103,23 +127,34 @@
2
3
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -129,16 +164,17 @@
外观:
-
{{item}}
-
+
+ {{info.appearance}}
@@ -146,15 +182,16 @@
结构性能:
-
{{item}}
-
+
+ {{info.structure}}
@@ -165,31 +202,43 @@
最终判定:
-
-
+
{{item}}
+
+ 合格
+ 不合格
+
是否量产:
-
-
+
{{item}}
+
+ 是
+ 否
+
+
+
+
-
+
+
@@ -199,7 +248,8 @@
diff --git a/pages/stampingInspectionInfo/stampingInspectionInfo.vue b/pages/stampingInspectionInfo/stampingInspectionInfo.vue
index 26c164a..b37aa3a 100644
--- a/pages/stampingInspectionInfo/stampingInspectionInfo.vue
+++ b/pages/stampingInspectionInfo/stampingInspectionInfo.vue
@@ -10,17 +10,17 @@
物料编号:
- 2021-07-15
+ {{CyInfo.product_number}}
生产日期:
- 2021-07-15
+ {{CyInfo.production}}
机型:
- 2021-07-15
+ {{CyInfo.product_size}}
班次:
@@ -33,13 +33,13 @@
-
+
检测员:
- 2021-07-15
+ {{info.name}}
@@ -100,6 +100,7 @@