提交

pages/rawMaterialInfo/rawMaterialInfo.vue

@@ -64,7 +64,7 @@
 					</view>
 					<view class="testing-list">
 						<view class="testing-list-title">抽样标准:</view>
-						<text class="check-btn" @tap="checkBtn(index)">点击查看</text>
+						<!-- <text class="check-btn" @tap="checkBtn(index)">点击查看</text> -->
 					</view>
 					<view class="cybz-card">
 						{{item.standard}}
@@ -111,7 +111,8 @@
 					placeholder="请输入抽检结果"></textarea>
 			</view>
 			<view class="submit-btn">
-				<button type="primary" @tap="submit" :disabled="buttonState==false?true:false" v-if="!check_status">提交</button>
+				<button type="primary" @tap="submit" :disabled="buttonState==false?true:false"
+					v-if="!check_status">提交</button>
 			</view>
 		</view>
 	</view>
@@ -144,6 +145,7 @@
 				check_status: 0,
 				jyxItem: {},
 				buttonState: true,
+				standard: {},
 				froms: {
 					result: 1,
 					purchase_id: '', //采购数据ID
@@ -172,15 +174,14 @@
 			this.type = this.CyInfo.examine_status
 			this.check_status = this.CyInfo.m_id
 			this.getitem()
-			if (this.check_status) {
+
-				this.getInfo()
-			}
 			console.log('检验项', this.jyxItem)
 		},
 		methods: {
 			getitem() {
 				materialItem().then(res => {
 					this.itemList = res.item;
+					this.standard = res.standard;
 					for (let b in res.item) {
 						this.item.push({
 							check_item: res.item[b],
@@ -193,6 +194,10 @@
 						})
 					}
 
+					if (this.check_status) {
+						this.getInfo()
+					}
+
 				})
 			},
 			getInfo() {
@@ -200,7 +205,25 @@
 					purchase_id: this.CyInfo.id
 				}).then(res => {
 					this.info = res
-					this.item=this.info.item;
+					this.item = this.info.item.map(item => {
+						for (let b in this.standard) {
+							if (b == item.check_item) {
+								item.standard = this.standard[b];
+								
+								break;
+							}
+						}
+						for (let b in this.itemList) {
+							if (b == item.check_item) {
+								item.check_item = this.itemList[b];
+								break;
+							}
+						}
+						
+						
+						
+						return item;
+					})
 					this.froms.dimensional_inspection = this.info.dimensional_inspection
 					this.froms.order_no = this.info.data.order_no
 					this.froms.arrival_quantity = this.info.data.arrival_quantity

pages/tcqInfo/index.scss

@@ -434,16 +434,16 @@
 
 .tx-ul{
 	width: 710upx;
-			@include flex(center,space-bteween);
+			@include flex(center,space-between);
 			.tx-title{
-				width: 500upx;
+				width: 200upx;
 				@include fonts(24upx,#666,400);
 			}
 			.tx-in-nav{
-				width: 200upx;
+				width:500upx;
-				@include flex(center,space-bteween);
+				@include flex(center,space-between);
 				input{
-					width: 100upx;
+					//width: 200upx;
 					padding: 20upx;
 					border: 1upx solid #F1F1F1;
 					font-size: 24upx;

pages/tcqInfo/tcqInfo.vue

@@ -68,7 +68,7 @@
 			<view v-for="(value, idx) in item.check_conf_msg" :key="idx" class="cyxj-content">
 				<view class="cyxj-content-card" v-if="item.check_conf_msg[idx].status == 1">
 					<view class="xx-card">
-						<view class="xx-title">{{ value.title }}</view>
+						<view class="xx-title">规格:{{ value.spec }}</view>
 						<view class="xx-ul">
 							<view class="xx-list" v-for="(va, i) in ifcomplete" :key="i" @tap="value.choice = va">
 								<image :src="va == value.choice ? '../../static/xz.png' : '../../static/wxz.png'"
@@ -90,10 +90,11 @@
 				</view>
 				<view class="cyxj-content-card" v-else>
 					<view class="tx-ul">
-						<view class="tx-title">{{ value.title }}</view>
+						<view class="xx-title" style="font-size: 26upx;">规格:{{ value.spec }}</view>
 						<view class="tx-in-nav">
 							<view>{{value.bottom}}</view>
-							<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false" type="number" @input="inputListener($event,index, idx)" v-model="value.input"
+							<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false"
+								type="number" @input="inputListener($event,index, idx)" v-model="value.input"
 								placeholder="请输入" />
 							<view>{{value.top}}</view>
 						</view>
@@ -125,7 +126,8 @@
 		<view class="cyxj-content" style="margin-top: 24upx;">
 			<view class="bzqk-card"><textarea v-model="froms.remake" placeholder="备注情况说明" /></view>
 			<view class="submit-btn">
-				<button v-if="type==1" type="primary" :disabled="buttonState==false?true:false" @tap="submits">提交</button>
+				<button v-if="type==1" type="primary" :disabled="buttonState==false?true:false"
+					@tap="submits">提交</button>
 				<button v-if="type==3" @tap="applys()" type="primary">审核</button>
 			</view>
 		</view>
@@ -196,13 +198,15 @@
 
 			if (this.type != 1) {
 				this.getInfo();
+			} else {
+				this.getConfig();
 			}
 			bad({}).then(res => {
 				for (let b in res) {
 					this.methList.push(res[b]);
 				}
 			});
-			this.getConfig();
+
 		},
 		methods: {
 			ifQualifiedChange(index) {
@@ -231,8 +235,7 @@
 				} else {
 					if (item.input < item.bottom || item.input > item.top) {
 						this.configSet[index].check_conf_msg[idx].inputState = false;
-					}
+					} else {
-					 else {
 						this.configSet[index].check_conf_msg[idx].inputState = true;
 					}
 				}
@@ -242,10 +245,10 @@
 					product_id: this.CyInfo.product_id
 				}).then(res => {
 					this.configSet = res.map(item => {
-						item.check_conf_msg = item.check_conf_msg.map(value => {
+						item.check_conf_msg = item.product_tcq_conf.map(value => {
 							return this.matchingConfig(value);
 						});
-
+						item.title = item.status_name;
 						return item;
 					});
 				});
@@ -258,8 +261,8 @@
 				value.inputState = true;
 				let CheckCyMsg = this.info.CheckTcqMsg ? this.info.CheckTcqMsg : [];
 				for (let b in CheckCyMsg) {
-					if (CheckCyMsg[b].check_tcq_id == value.id) {
 					let json = JSON.parse(CheckCyMsg[b].json);
+					if (json.check_tcq_id == value.id) {
 						value.choice = json.choice;
 						value.content = json.content;
 						value.situation = json.situation;
@@ -282,6 +285,7 @@
 					this.froms.model = res.model;
 					this.froms.frequency = res.frequency;
 					this.froms.remake = res.remake;
+					this.getConfig();
 
 				});
 			},
@@ -318,7 +322,8 @@
 								choice: items.choice,
 								content: items.content,
 								situation: items.situation,
-								input: items.input
+								input: items.input,
+								check_tcq_id: items.id
 							}
 						});
 					}