diff --git a/App.vue b/App.vue
index 6edf75d..c9c2bf2 100644
--- a/App.vue
+++ b/App.vue
@@ -12,9 +12,19 @@
}
-
diff --git a/api/user.js b/api/user.js
index 072932a..b610ddb 100644
--- a/api/user.js
+++ b/api/user.js
@@ -354,4 +354,17 @@ export function materialCheckForm(data) {
method: "post",
data
});
+}
+
+/**
+ * 新增首检检测列表
+ * @param {Object} data
+ */
+export function newFirstCheckList(data) {
+ console.log(data)
+ return request({
+ url: `${functions.getDomain()}/api/new-first-check-lists`,
+ method: "post",
+ data
+ });
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 9cbb167..2a9a2df 100644
--- a/pages.json
+++ b/pages.json
@@ -157,6 +157,15 @@
}
}
+ ,{
+ "path" : "pages/stampingInspectionList/stampingInspectionList",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "white",
diff --git a/pages/stampingInspection/stampingInspection.vue b/pages/stampingInspection/stampingInspection.vue
index 90a014e..339ce66 100644
--- a/pages/stampingInspection/stampingInspection.vue
+++ b/pages/stampingInspection/stampingInspection.vue
@@ -55,7 +55,7 @@
firstInspectionInfo(plan_id,item) {
console.log("id",plan_id)
uni.navigateTo({
- url: `../stampingInspectionInfo/stampingInspectionInfo?plan_id=${plan_id}&product_id=${item.product_id}&planInfo=${encodeURIComponent(JSON.stringify(item))}`,
+ url: `../stampingInspectionList/stampingInspectionList?plan_id=${plan_id}&planInfo=${encodeURIComponent(JSON.stringify(item))}`,
success: res => {},
fail: () => {},
complete: () => {}
diff --git a/pages/stampingInspectionInfo/index.scss b/pages/stampingInspectionInfo/index.scss
index 5ba9429..29c7eb7 100644
--- a/pages/stampingInspectionInfo/index.scss
+++ b/pages/stampingInspectionInfo/index.scss
@@ -1,10 +1,4 @@
-.big-title{
- width: 690upx;
- margin: auto;
- margin-top: 30upx;
- margin-bottom: 30upx;
- @include fonts(26upx,#666,bold);
- }
+
.sm-box{
@include wh(750upx,auto);
padding-top: 30upx;
@@ -289,14 +283,25 @@
width: 710upx;
@include flex(center,space-bteween);
.tx-title{
- width: 590upx;
+ width: 500upx;
@include fonts(24upx,#666,400);
}
- input{
- width: 120upx;
- padding: 20upx;
- border: 1upx solid #F1F1F1;
- font-size: 24upx;
- text-align: right;
+ .tx-in-nav{
+ width: 200upx;
+ @include flex(center,space-bteween);
+ input{
+ width: 100upx;
+ padding: 20upx;
+ border: 1upx solid #F1F1F1;
+ font-size: 24upx;
+ text-align: right;
+ margin-left: 5upx;
+ margin-right: 5upx;
+ }
+ view{
+ font-size: 24upx;
+ color: #555555;
+ }
}
+
}
\ No newline at end of file
diff --git a/pages/stampingInspectionInfo/stampingInspectionInfo.vue b/pages/stampingInspectionInfo/stampingInspectionInfo.vue
index e8091a5..e9d8467 100644
--- a/pages/stampingInspectionInfo/stampingInspectionInfo.vue
+++ b/pages/stampingInspectionInfo/stampingInspectionInfo.vue
@@ -70,7 +70,11 @@
{{ value.title }}
-
+
+ {{value.bottom}}
+
+ {{value.top}}
+
@@ -79,7 +83,7 @@
-
+
@@ -92,6 +96,7 @@ import { cyCheckSure } from '../../api/index.js';
export default {
data() {
return {
+ type:0,
ifSubmit:false,
line: ['夜班', '白班'],
ifcomplete: ['OK', 'NG'],
@@ -115,11 +120,12 @@ export default {
},
onLoad(e) {
+ this.type=e.type;
this.pId = e.plan_id;
this.froms.plan_id = this.pId;
this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
this.froms.model = this.CyInfo.product_size;
- if(this.CyInfo.check!=0){
+ if(this.CyInfo.check!=0&&this.type!=1){
this.getInfo();
}
bad({}).then(res => {
@@ -183,32 +189,32 @@ export default {
this.configSet[index].check_conf_msg[idx].situation = this.methList[e.detail.value];
},
submits() {
- for (let b in this.configSet) {
- for (let i in this.configSet[b].check_conf_msg) {
- let items = this.configSet[b].check_conf_msg[i];
- if (this.configSet[b].check_conf_msg[i].status == 1) {
- if (items.choice == 'NG' && (!items.content || !items.situation)) {
- this.$functions.error('请完整填写信息');
- return false;
- }
- } else {
- if (!items.input) {
- this.$functions.error('请完整填写信息');
- return false;
- }
- }
+ // for (let b in this.configSet) {
+ // for (let i in this.configSet[b].check_conf_msg) {
+ // let items = this.configSet[b].check_conf_msg[i];
+ // if (this.configSet[b].check_conf_msg[i].status == 1) {
+ // if (items.choice == 'NG' && (!items.content || !items.situation)) {
+ // this.$functions.error('请完整填写信息');
+ // return false;
+ // }
+ // } else {
+ // if (!items.input) {
+ // this.$functions.error('请完整填写信息');
+ // return false;
+ // }
+ // }
- this.froms.item.push({
- check_conf_id: item.id,
- json: {
- choice: items.choice,
- content: items.content,
- situation: items.situation,
- input: items.input
- }
- });
- }
- }
+ // this.froms.item.push({
+ // check_conf_id: item.id,
+ // json: {
+ // choice: items.choice,
+ // content: items.content,
+ // situation: items.situation,
+ // input: items.input
+ // }
+ // });
+ // }
+ // }
cyCheckAdd(this.froms).then(res => {
this.$functions.success('提交成功').then(() => {
diff --git a/pages/stampingInspectionList/index.scss b/pages/stampingInspectionList/index.scss
new file mode 100644
index 0000000..66414bd
--- /dev/null
+++ b/pages/stampingInspectionList/index.scss
@@ -0,0 +1,243 @@
+
+.sm-box{
+ @include wh(750upx,auto);
+ padding-top: 30upx;
+ padding-bottom: 30upx;
+ background: white;
+ .card{
+ @include wh(710upx,auto);
+ margin: auto;
+ border: 1upx solid #F1F1F1;
+ padding-top: 30upx;
+ padding-bottom: 30upx;
+ .title{
+ width: 690upx;
+ margin: auto;
+ @include fonts(26upx,#666,bold);
+ }
+ .content{
+ width: 690upx;
+ margin: auto;
+ @include fonts(24upx,#999);
+ }
+ }
+ .content-box-card{
+ width: 690upx;
+ margin: auto;
+
+ .content-box-card-ul{
+ @include flex(flex-start,flex-start);
+ .content-box-card-list{
+ @include flex(flex-start,flex-start);
+ margin-top: 24upx;
+ .content-box-card-title{
+ width: 140upx;
+ @include fonts(26upx,#333,bold);
+ }
+ text{
+ @include fonts(24upx,#999);
+ }
+ .right-check{
+ width: 500upx;
+ @include flex(flex-start,flex-start);
+ flex-wrap: wrap;
+
+ .check-list{
+ //width: 240upx;
+
+ @include flex(center,flex-start);
+ margin-left: 24upx;
+ image{
+ @include wh(33upx,33upx);
+ }
+ text{
+ @include fonts(24upx,#999);
+ margin-left: 10upx;
+ }
+ }
+ .other-input{
+ @include wh(240upx,50upx);
+ @include flex(center,center);
+ border: 1upx solid #F1F1F1;
+ border-radius: 4upx;
+ margin-left: 24upx;
+ input{
+ font-size: 26upx;
+ margin-left: 20upx;
+ }
+ }
+ }
+ }
+
+ }
+ .content-box-card-ul-two{
+ @include flex(flex-start,flex-start);
+ .content-box-card-list{
+ width: 345upx;
+ @include flex(flex-start,flex-start);
+ margin-top: 24upx;
+ .content-box-card-title{
+ width: 140upx;
+ @include fonts(24upx,#333,bold);
+ }
+ text{
+ @include fonts(24upx,#999);
+ }
+ .lin-div{
+ @include wh(140upx,50upx);
+ line-height: 50upx;
+ border: 1upx solid #F1F1F1;
+ border-radius: 5upx;
+ @include flex(center,space-around);
+ text{
+ @include fonts(24upx,#999);
+ }
+ image{
+ @include wh(22upx,14upx);
+ }
+ }
+ }
+
+ }
+ .sj-card{
+ width: 630upx;
+ margin: auto;
+ border: 1upx solid #F1F1F1;
+ padding: 30upx;
+ margin-top: 30upx;
+ .sj-title{
+ @include fonts(26upx,#333,bold);
+ }
+ .sj-nav{
+ @include flex(flex-start,space-between);
+ .left{
+ view{
+ @include fonts(24upx,#999);
+ margin-top: 60upx;
+ }
+ }
+ .right{
+ width: 500upx;
+ @include flex(center,space-between);
+ .right-list{
+ text-align: center;
+ .num-div{
+ @include fonts(24upx,#999);
+ }
+ .gg-div{
+ width: 100upx;
+ height: 50upx;
+ @include flex(center,center);
+ border: 1upx solid #F1F1F1;
+ margin-top: 24upx;
+ input{
+ font-size: 24upx;
+ }
+ }
+ }
+ }
+ }
+ }
+ .beizhu{
+ width: 630upx;
+ margin: auto;
+ border: 1upx solid #F1F1F1;
+ padding: 30upx;
+ margin-top: 30upx;
+ textarea{
+ font-size: 24upx;
+ height: 200upx;
+ }
+ }
+ }
+}
+
+.white-card{
+ @include wh(750upx,auto);
+ padding-top: 30upx;
+ padding-bottom: 30upx;
+ background: white;
+ //margin-top: 24upx;
+ .lists{
+ @include wh(710upx,auto);
+ margin: auto;
+ border-bottom: 1upx solid #C8C7CC;
+ padding-bottom: 30upx;
+ @include flex(flex-start,space-between);
+ .list-left{
+ @include wh(660upx,auto);
+ .list-left-up{
+ @include flex(center,flex-start);
+ .list-left-up-left{
+ width: 240upx;
+ @include fonts(24upx,#333,bold);
+ }
+ .list-left-up-mid{
+ width:370upx;
+ @include fonts(24upx,#333,bold);
+ }
+ .list-left-up-right-ok{
+ @include wh(60upx,60upx);
+ border: 1upx solid #4CD964;
+ border-radius: 50%;
+ line-height: 60upx;
+ text-align: center;
+ @include fonts(24upx, #4CD964,bold);
+ }
+ .list-left-up-right-no{
+ @include wh(60upx,60upx);
+ border: 1upx solid red;
+ border-radius: 50%;
+ line-height: 60upx;
+ text-align: center;
+ @include fonts(24upx,red,bold);
+ }
+ }
+ .list-left-dow{
+ @include flex(center,flex-start);
+ margin-top: 30upx;
+ .list-left-dow-left{
+ width: 240upx;
+ @include fonts(24upx,#333,bold);
+ }
+ .list-left-dow-btn{
+ width: 400upx;
+ @include flex(center,space-between);
+ view{
+ @include wh(160upx,44upx);
+ background: #4CD964;
+ @include fonts(24upx,#fff,500);
+ text-align: center;
+ line-height: 44upx;
+ border-radius: 10upx;
+ }
+ .red{
+ background: #DD524D!important;
+ }
+ }
+ }
+ }
+ .list-right{
+ @include wh(40upx,40upx);
+ border: 1upx solid #007AFF;
+ border-radius: 50%;
+ line-height: 40upx;
+ text-align: center;
+ @include fonts(24upx, #007AFF,bold);
+ }
+ .mj-color{
+ @include wh(40upx,40upx);
+ border: 1upx solid #F0AD4E;
+ border-radius: 50%;
+ line-height: 40upx;
+ text-align: center;
+ @include fonts(24upx, #F0AD4E,bold);
+ }
+ }
+}
+
+.submit-btn{
+ @include wh(690upx,auto);
+ margin: auto;
+ margin-top: 60upx;
+}
\ No newline at end of file
diff --git a/pages/stampingInspectionList/stampingInspectionList.vue b/pages/stampingInspectionList/stampingInspectionList.vue
new file mode 100644
index 0000000..b2a2fcb
--- /dev/null
+++ b/pages/stampingInspectionList/stampingInspectionList.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+ 物料编号:
+ {{ info.product_number }}
+
+
+ 规格:
+ {{ info.product_size }}
+
+
+
+
+ 生产线:
+ {{ info.line_title }}
+
+
+ 物料名称:
+ {{ info.product_name }}
+
+
+
+
+
+ 巡检记录
+
+
+
+
+
+ 巡检人:{{item.one}}
+ 巡检时间:{{item.create_time}}
+ OK
+ NG
+
+
+ 审核人:{{item.two}}
+
+
+ 查看详情
+
+
+ 审核
+
+
+
+
+
+ 首
+
+
+ 首
+
+
+
+
+
+
+
+
+
+
+
+