From 1154207954b8aa079c552a6f2c34c322fa501546 Mon Sep 17 00:00:00 2001
From: huangli865118801 <865118801@qq.com>
Date: Fri, 6 Aug 2021 10:31:24 +0800
Subject: [PATCH] ddd

---
 .../firstInspectionInfo.vue                   |  8 +++---
 pages/tcqInfo/tcqInfo.vue                     | 25 +++++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pages/firstInspectionInfo/firstInspectionInfo.vue b/pages/firstInspectionInfo/firstInspectionInfo.vue
index db76a70..d0bd14d 100644
--- a/pages/firstInspectionInfo/firstInspectionInfo.vue
+++ b/pages/firstInspectionInfo/firstInspectionInfo.vue
@@ -67,10 +67,10 @@
 								</image>
 								<text>{{item.name}}</text>
 							</view>
-							<view v-if="type==2" class="other-input">
+							<view  v-if="type==1" class="other-input">
 								<input type="text" v-model="msgModel" @input="msgInput" placeholder="其他" />
 							</view>
-							<view>
+							<view  v-if="type==2">
 								<text>{{info.sampling}}</text>
 							</view>
 						</view>
@@ -85,10 +85,10 @@
 								<image :src="item==forms.basis?'../../static/xz.png':'../../static/wxz.png'"></image>
 								<text>{{item}}</text>
 							</view>
-							<view class="other-input" v-if="type==2">
+							<view class="other-input" v-if="type==1">
 								<input type="text" v-model="basisModel" @input="basisInput" placeholder="其他" />
 							</view>
-							<view>
+							<view  v-if="type==2">
 								<text>{{info.basis}}</text>
 							</view>
 						</view>
diff --git a/pages/tcqInfo/tcqInfo.vue b/pages/tcqInfo/tcqInfo.vue
index 7fc3082..f92ffa8 100644
--- a/pages/tcqInfo/tcqInfo.vue
+++ b/pages/tcqInfo/tcqInfo.vue
@@ -37,16 +37,16 @@
 						<view class="content-box-card-title">时间段:</view>
 						<text>2021-07-15</text>
 					</view> -->
-					<view class="content-box-card-list">
+					<!-- <view class="content-box-card-list">
 						<view class="content-box-card-title">检测员:</view>
 						<text>{{ info ? info.name : '' }}</text>
 					</view>
 					<view class="content-box-card-list">
 						<view class="content-box-card-title">生产数量:</view>
 						<input type="number" v-model="froms.product_number" />
-					</view>
+					</view> -->
 				</view>
-				<view class="content-box-card-ul-two">
+				<!-- <view class="content-box-card-ul-two">
 					<view class="content-box-card-list">
 						<view class="content-box-card-title">不合格数:</view>
 						<input type="number" v-model="froms.no_number" />
@@ -56,7 +56,7 @@
 						<view class="content-box-card-title">报废数:</view>
 						<input type="number" v-model="froms.scrap" />
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 
@@ -121,7 +121,7 @@
 				froms: {
 					item: [],
 					plan_id: '',
-					model: '',
+					//model: '',
 					frequency: 0, //班次
 					remake: '' //，备注
 				},
@@ -144,11 +144,10 @@
 			this.productId = e.product_id;
 			this.froms.plan_id = this.pId;
 			this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
-			this.froms.model = this.CyInfo.product_size;
 			this.power = this.userInfo.power
-			//this.getArr();
+			this.getArr();
 			
-			if (this.CyInfo.check != 0 && this.type != 1) {
+			if (this.type == 2||this.type == 3) {
 				this.getInfo();
 			}else{
 				this.getConfig();
@@ -172,7 +171,7 @@
 					}
 			
 				})
-				console.log("xinshuzu", this.jurisdiction)
+				//console.log("xinshuzu", this.jurisdiction)
 			},
 			isMenu(title) {
 				return this.jurisdiction.includes(title);
@@ -227,10 +226,13 @@
 				}).then(res => {
 					this.info = res;
 					this.froms.plan_id = this.pId;
-					this.froms.model = res.model;
+					//this.froms.model = res.model;
 					this.froms.frequency = res.frequency;
 					this.froms.remake = res.remake;
+				//	this.configSet=res.CheckTcqMsg;
+					
 					this.getConfig();
+					console.log("选项",this.configSet)
 				});
 			},
 			bindline: function(e) {
@@ -276,7 +278,8 @@
 				this.$functions.confirm('是否确定操作？').then(res => {
 					tcqCheckSure({
 						plan_id: this.info.plan_id,
-						play_id: this.info.play_id
+						play_id: this.info.play_id,
+						id:this.id
 					}).then(res => {
 						this.$functions.success('操作成功').then(() => {
 							uni.navigateBack({});