From e3d6cc8c9ee3a771b92a8706e3cf83dededfaa43 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期日, 24 九月 2023 16:26:52 +0800
Subject: [PATCH] 	modified:   src/assets/api/controller.js 	modified:   src/components/view/Technicalindex.vue 	modified:   src/components/view/finishedProductInspectionUp.vue 	modified:   src/components/view/processInspectionUpdate.vue 	modified:   src/components/view/rawInsDetail.vue 	modified:   src/components/view/sale.vue

---
 src/components/view/processInspectionUpdate.vue     |  956 ++++++++++++++-------------
 src/components/view/Technicalindex.vue              |    3 
 src/components/view/finishedProductInspectionUp.vue | 1039 +++++++++++++++--------------
 src/components/view/rawInsDetail.vue                |   52 +
 src/assets/api/controller.js                        |    1 
 src/components/view/sale.vue                        |   30 
 6 files changed, 1,105 insertions(+), 976 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index f7536c8..b9aa5b2 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -186,6 +186,7 @@
 	selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
 	addSale: "sale/addSale", //鏂板閿�鍞崟
 	saleCheck: "sale/check", //瀹℃牳閿�鍞崟
+	saleDownload: "sale/download",//涓嬭浇闄勪欢
 	synchronization: "sale/synchronization", //鍚屾
 	updateSaleById: "sale/updateSaleById", //鏍规嵁閿�鍞崟id淇敼璇︽儏淇℃伅
 	delSale: "sale/delSale", //鏍规嵁閿�鍞崟id鍒犻櫎
diff --git a/src/components/view/Technicalindex.vue b/src/components/view/Technicalindex.vue
index ccd67be..c363f22 100644
--- a/src/components/view/Technicalindex.vue
+++ b/src/components/view/Technicalindex.vue
@@ -324,9 +324,10 @@
 		},
 		downloadSelect() {
 			console.log(this.downloadTypeSelect);
+			
 		},
 		handleSelectionChange() {
-			
+
 		},
 		chooseType() {
 			this.$axios.get(this.$api.url.chooseType).then(res => {
diff --git a/src/components/view/finishedProductInspectionUp.vue b/src/components/view/finishedProductInspectionUp.vue
index dd3495e..af64790 100644
--- a/src/components/view/finishedProductInspectionUp.vue
+++ b/src/components/view/finishedProductInspectionUp.vue
@@ -24,14 +24,14 @@
 						</el-col>
 						<el-col :span="7">
 							<el-form-item label="瀹㈡埛鍚嶇О锛�">
-								<el-input disabled style="width: 180px;" v-model="processInspectVo.prname" placeholder="璇疯緭鍏ュ鎴峰悕绉�"
-									autocomplete="off" />
+								<el-input disabled style="width: 180px;" v-model="processInspectVo.prname"
+									placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="7">
 							<el-form-item label="宸ョ▼鍚嶇О锛�">
-								<el-input disabled style="width: 180px;" v-model="processInspectVo.sname" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�"
-									autocomplete="off" />
+								<el-input disabled style="width: 180px;" v-model="processInspectVo.sname"
+									placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -54,8 +54,8 @@
 						</el-col>
 						<el-col :span="7">
 							<el-form-item label="浜у搧缂栫爜锛�">
-								<el-input disabled style="width: 180px;" v-model="processInspectVo.mcode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
-									autocomplete="off" />
+								<el-input disabled style="width: 180px;" v-model="processInspectVo.mcode"
+									placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -68,14 +68,14 @@
 						</el-col>
 						<el-col :span="7">
 							<el-form-item label="鍗曚綅锛�">
-								<el-input disabled style="width: 180px;" v-model="processInspectVo.unit" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
-									autocomplete="off" />
+								<el-input disabled style="width: 180px;" v-model="processInspectVo.unit"
+									placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="7">
 							<el-form-item label="鏁伴噺锛�">
-								<el-input disabled style="width: 180px;" v-model="processInspectVo.quantity" placeholder="璇疯緭鍏ユ暟閲�"
-									autocomplete="off" />
+								<el-input disabled style="width: 180px;" v-model="processInspectVo.quantity"
+									placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="3" style="display: flex;justify-content: end;">
@@ -88,9 +88,11 @@
 		<div class="inspectionProject">
 			<el-row>
 				<el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col>
-				<el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span" style="display: flex;justify-content: end;">
+				<el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span"
+					style="display: flex;justify-content: end;">
 					<el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�楠屽�煎垪</el-button>
-					<el-button style="margin-right: 30px;" size="mini" @click="clickAddInspectionColumn()">娣诲姞妫�楠屽�煎垪</el-button>
+					<el-button style="margin-right: 30px;" size="mini"
+						@click="clickAddInspectionColumn()">娣诲姞妫�楠屽�煎垪</el-button>
 					<!-- <el-button
               size="mini"
               style="margin-right: 30px;"
@@ -120,8 +122,8 @@
 				<el-table-column prop="dname" label="璇曢獙璁惧" min-width="100">
 					<template slot-scope="scope">
 						<el-button type="text" @click="clickTableSelect(scope)">{{
-                            scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
-                        }}</el-button>
+							scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
+						}}</el-button>
 					</template>
 				</el-table-column>
 				<el-table-column label="缁撹">
@@ -164,11 +166,11 @@
 			<div class="div_device_dialog">
 				<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 6px;">
 				</el-input>
-				<el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all highlight-current
-					@node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
+				<el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all
+					highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
 					<div class="custom-tree-node" slot-scope="{ data }">
-						<span><i
-								:class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>{{ data.name }}</span>
+						<span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>{{
+							data.name }}</span>
 					</div>
 				</el-tree>
 			</div>
@@ -181,146 +183,181 @@
 </template>
 
 <script>
-	export default {
-		props: ['rowInfo'],
-		data() {
-			return {
-				isUpBtn: false,
-				showUp: false,
-				isAddProject: false,
-				showLook: false,
-				detailId: 0,
-				rowInfp: {},
-				search: {
-					countSize: 10,
-					pageSize: 1,
-					result: "", // 妫�娴嬬姸鎬�
-					name: "", // 浜у搧鍚嶇О
-					techfather: "" // 宸ュ簭
-				},
-				optionsSamplename: [],
-				inspectionTable: [],
-				tableColumn: [],
-				optionSoptionSprocesses: [],
-				optionTechnology: [],
-				inspectionTableTotal: 0,
-				pageSize: 10,
-				currentPage: 1,
-				treeProject: [],
-				// 娣诲姞鍒�
-				empiricalValueAdd: 1,
-				// 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
-				empiricalValueAddMaxNumber: 0,
-				showAddPage: false,
-				processInspectVo: {
-					id: null,
-					material: null,
-					mcode: null,
-					prname: null,
-					sname: null,
-					orderNumber: "D-001",
-					qualityTraceability: null,
-					quantity: null,
-					specificationsModel: null,
-					unit: null,
-					technologyId: null
-				},
-				InspectioniD: null,
-				addInspectionform: [{
-					number: "",
-					username: "",
-					projectname: "",
-					tracenumber: "",
-					code: "",
-					class: "",
-					specificationmodel: "",
-					unit: "",
-					quantity: "",
-					group: "",
-					worker: "",
-					machine: ""
-				}],
-				inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
-				inspectionResultForm: [{
-					id: "",
-					name: "",
-					inspecter: "",
-					conclusion: "",
-					operation: ""
-				}],
-				options: [],
-				value: "",
-				rowList: [],
-				spanArr: [],
-				position: 0,
-				// 璁惧閫夋嫨鏍戞樉绀�
-				centerDialogVisible: false,
-				filterText: "",
-				materialOptions: [],
-				defaultProps: {
-					// 璁惧鏍戞暟鎹缃�
-					children: "children",
-					label: "name"
-				},
-				nodeData: {
-					id: 0,
-					name: null
-				}, // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
-				clickSelectDevice: {
-					index: null, // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
-					rpId: null // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
-				}
-			};
-		},
-		watch: {
-			// filterText(val) {
-			//     this.$refs.tree.filter(val);
-			// }
-		},
-		mounted() {
-			if (this.rowInfo.result != null && this.rowInfo.result != '') {
-				this.isUpBtn = true
+export default {
+	props: ['rowInfo'],
+	data() {
+		return {
+			isUpBtn: false,
+			showUp: false,
+			isAddProject: false,
+			showLook: false,
+			detailId: 0,
+			rowInfp: {},
+			search: {
+				countSize: 10,
+				pageSize: 1,
+				result: "", // 妫�娴嬬姸鎬�
+				name: "", // 浜у搧鍚嶇О
+				techfather: "" // 宸ュ簭
+			},
+			optionsSamplename: [],
+			inspectionTable: [],
+			tableColumn: [],
+			optionSoptionSprocesses: [],
+			optionTechnology: [],
+			inspectionTableTotal: 0,
+			pageSize: 10,
+			currentPage: 1,
+			treeProject: [],
+			// 娣诲姞鍒�
+			empiricalValueAdd: 1,
+			// 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
+			empiricalValueAddMaxNumber: 0,
+			showAddPage: false,
+			processInspectVo: {
+				id: null,
+				material: null,
+				mcode: null,
+				prname: null,
+				sname: null,
+				orderNumber: "D-001",
+				qualityTraceability: null,
+				quantity: null,
+				specificationsModel: null,
+				unit: null,
+				technologyId: null
+			},
+			InspectioniD: null,
+			addInspectionform: [{
+				number: "",
+				username: "",
+				projectname: "",
+				tracenumber: "",
+				code: "",
+				class: "",
+				specificationmodel: "",
+				unit: "",
+				quantity: "",
+				group: "",
+				worker: "",
+				machine: ""
+			}],
+			inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
+			inspectionResultForm: [{
+				id: "",
+				name: "",
+				inspecter: "",
+				conclusion: "",
+				operation: ""
+			}],
+			options: [],
+			value: "",
+			rowList: [],
+			spanArr: [],
+			position: 0,
+			// 璁惧閫夋嫨鏍戞樉绀�
+			centerDialogVisible: false,
+			filterText: "",
+			materialOptions: [],
+			defaultProps: {
+				// 璁惧鏍戞暟鎹缃�
+				children: "children",
+				label: "name"
+			},
+			nodeData: {
+				id: 0,
+				name: null
+			}, // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
+			clickSelectDevice: {
+				index: null, // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
+				rpId: null // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
 			}
-			this.processInspectVo.material = this.rowInfo.material
-			this.processInspectVo.mcode = this.rowInfo.material_code
-			this.processInspectVo.orderNumber = this.rowInfo.order_number
-			this.processInspectVo.qualityTraceability = this.rowInfo.quality_traceability
-			this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
-			this.processInspectVo.unit = this.rowInfo.unit
-			this.processInspectVo.quantity = this.rowInfo.quantity
-			this.processInspectVo.prname = this.rowInfo.customer_name
-			this.processInspectVo.sname = this.rowInfo.project_name
-			this.inspectionResultForm[0].id = this.rowInfo.material_code
-			this.inspectionResultForm[0].name = this.rowInfo.material
-			this.inspectionResultForm[0].conclusion = this.rowInfo.result
-			this.detailId = this.rowInfo.id
-			this.getTableData()
-			// this.getOptions();
-		},
-		methods: {
-			// blurNode(row){
-			//     console.log(11);
-			//     row.isSelectDevice=false
-			// },
-			escalation() {
-				let arr = this.inspectionItems
-				let bl = false
-				for (let index = 0; index < arr.length; index++) {
-					const element = arr[index];
-					if (element.dname != null && element.empiricalValueAddss[0] != '') {
-						bl = true
-						break
-					} else {
-						bl = false
-					}
+		};
+	},
+	watch: {
+		// filterText(val) {
+		//     this.$refs.tree.filter(val);
+		// }
+	},
+	mounted() {
+		if (this.rowInfo.result != null && this.rowInfo.result != '') {
+			this.isUpBtn = true
+		}
+		this.processInspectVo.material = this.rowInfo.material
+		this.processInspectVo.mcode = this.rowInfo.material_code
+		this.processInspectVo.orderNumber = this.rowInfo.order_number
+		this.processInspectVo.qualityTraceability = this.rowInfo.quality_traceability
+		this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
+		this.processInspectVo.unit = this.rowInfo.unit
+		this.processInspectVo.quantity = this.rowInfo.quantity
+		this.processInspectVo.prname = this.rowInfo.customer_name
+		this.processInspectVo.sname = this.rowInfo.project_name
+		this.inspectionResultForm[0].id = this.rowInfo.material_code
+		this.inspectionResultForm[0].name = this.rowInfo.material
+		this.inspectionResultForm[0].conclusion = this.rowInfo.result
+		this.detailId = this.rowInfo.id
+		this.getTableData()
+		// this.getOptions();
+	},
+	methods: {
+		// blurNode(row){
+		//     console.log(11);
+		//     row.isSelectDevice=false
+		// },
+		escalation() {
+			let arr = this.inspectionItems
+			let bl = false
+			for (let index = 0; index < arr.length; index++) {
+				const element = arr[index];
+				if (element.dname != null && element.empiricalValueAddss[0] != '') {
+					bl = true
+					break
+				} else {
+					bl = false
 				}
-				if (bl != true) {
+			}
+			if (bl != true) {
+				this.$message({
+					message: '璇峰厛妫�娴嬩竴椤归」鐩紒',
+					type: 'warning'
+				});
+				return
+			}
+			let pro = this.inspectionItems.filter(item => {
+				return item.result === 0;
+			})
+			if (pro.length > 0) {
+				this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
+					confirmButtonText: '纭畾',
+					cancelButtonText: '鍙栨秷',
+					inputPattern: /^\d+$/,
+					inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
+				}).then(({ value }) => {
+					this.$axios.post(this.$api.url.finishedInspectUpdateFinishInspectsById, {
+						id: this.detailId,
+						number: value
+					}).then(res => {
+						if (res.code == 200) {
+							this.$message({
+								message: '涓婃姤鎴愬姛',
+								type: 'success'
+							});
+							this.$parent.comBackMain(true)
+						} else {
+							this.$message({
+								message: res.message,
+								type: 'warning'
+							});
+						}
+
+					})
+				}).catch(() => {
 					this.$message({
-						message: '璇峰厛妫�娴嬩竴椤归」鐩紒',
-						type: 'warning'
+						type: 'info',
+						message: '鍙栨秷杈撳叆'
 					});
-					return
-				}
+				});
+			} else {
 				this.$axios.post(this.$api.url.finishedInspectUpdateFinishInspectsById, {
 					id: this.detailId
 				}).then(res => {
@@ -332,10 +369,10 @@
 							});
 							return
 						}
-						this.$message({
-							message: '涓婃姤鎴愬姛',
-							type: 'success'
-						});
+						// this.$message({
+						// 	message: '涓婃姤鎴愬姛',
+						// 	type: 'success'
+						// });
 						this.$parent.comBackMain(true)
 					} else {
 						this.$message({
@@ -344,365 +381,365 @@
 						});
 					}
 				})
-
-			},
-			changeOptionsSamplename() {
-				let id = this.processInspectVo.material.split("-")[0]
-				let sample = this.optionsSamplename.filter(o => {
-					return o.id == id
-				})[0]
-				this.processInspectVo.qualityTraceability = sample.qualityTraceability
-				this.processInspectVo.mcode = sample.mcode
-				this.processInspectVo.specificationsModel = sample.specifications
-				this.processInspectVo.unit = sample.unit
-			},
-			comBack() {
-				this.$parent.comBackMain()
-			},
-			handleClick(row) {
-				this.rowInfp = row
-				this.showLook = true
-			},
-			updateInsInfo(row) {
-				this.rowInfp = row
-				this.showUp = true
-			},
-			combackMain() {
-				this.showUp = false
-				this.showLook = false
-			},
-			searchPro() {
-				this.search.countSize = this.pageSize
-				this.search.pageSize = this.currentPage
-				this.defaultInitializationTable()
-			},
-			// 鐐瑰嚮璁惧鏍戜繚瀛樼偣鍑昏褰�
-			nodeClick(data) {
-				if (data.id != undefined) this.nodeData = data;
-			},
-			// 璁惧鏍戣繃婊ゆ悳绱�
-			filterNode(value, data) {
-				if (!value) return true;
-				return data.name.indexOf(value) !== -1;
-			},
-			// 鑾峰彇璁惧鏍戝唴瀹�
-			getOptions(row) {
-				this.$axios.get(this.$api.url.inspectionItemChooseDev, {
-					params: {
-						father: row.father,
-						name: row.name,
-						technologyId: this.processInspectVo.technologyId
-					}
-				}).then(res => {
-					this.materialOptions = res.data;
-					if (this.materialOptions.length === 1 && row.did != null) {
-						this.$message({
-							message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
-							type: 'warning'
-						});
-						return
-					}
-					row.isSelectDevice = true
-				});
-			},
-			// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
-			clickTableSelect(scope) {
-				this.centerDialogVisible = true;
-				this.clickSelectDevice.index = scope.$index;
-				this.clickSelectDevice.rpId = scope.row.id;
-				this.getOptions(scope.row);
-			},
-			// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
-			clickNodeSure(row) {
-				if (this.detailId == null) {
-					this.projectTable[this.clickSelectDevice.index].deviceId = this.nodeData.id;
-					this.projectTable[this.clickSelectDevice.index].deviceName = this.nodeData.name;
-					this.centerDialogVisible = false;
-				} else {
-					this.$axios.post(this.$api.url.inspectionItemUpdateDevByInsId, {
-						id: this.clickSelectDevice.rpId,
-						devId: this.nodeData.id,
-						type: 2
-					}).then(res => {
-						this.centerDialogVisible = false;
-						this.inspectionItems.forEach(a=>{
-							if(a.id == this.clickSelectDevice.rpId){
-								a.dname = this.nodeData.name
-							}
-						})
-					});
+			}
+		},
+		changeOptionsSamplename() {
+			let id = this.processInspectVo.material.split("-")[0]
+			let sample = this.optionsSamplename.filter(o => {
+				return o.id == id
+			})[0]
+			this.processInspectVo.qualityTraceability = sample.qualityTraceability
+			this.processInspectVo.mcode = sample.mcode
+			this.processInspectVo.specificationsModel = sample.specifications
+			this.processInspectVo.unit = sample.unit
+		},
+		comBack() {
+			this.$parent.comBackMain()
+		},
+		handleClick(row) {
+			this.rowInfp = row
+			this.showLook = true
+		},
+		updateInsInfo(row) {
+			this.rowInfp = row
+			this.showUp = true
+		},
+		combackMain() {
+			this.showUp = false
+			this.showLook = false
+		},
+		searchPro() {
+			this.search.countSize = this.pageSize
+			this.search.pageSize = this.currentPage
+			this.defaultInitializationTable()
+		},
+		// 鐐瑰嚮璁惧鏍戜繚瀛樼偣鍑昏褰�
+		nodeClick(data) {
+			if (data.id != undefined) this.nodeData = data;
+		},
+		// 璁惧鏍戣繃婊ゆ悳绱�
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		// 鑾峰彇璁惧鏍戝唴瀹�
+		getOptions(row) {
+			this.$axios.get(this.$api.url.inspectionItemChooseDev, {
+				params: {
+					father: row.father,
+					name: row.name,
+					technologyId: this.processInspectVo.technologyId
 				}
-			},
-			changeState(row, index) {
-				if (row.did != null && row.did != '') {
-					// let val = row.empiricalValueAddss.filter(item => {
-					//     return item != '' && item != null
-					// })
-					// let eq = val.filter(item => {
-					//     return /^[^><=]/.test(item)
-					// })
-					// if (eq.length > 0) {
-					//     this.$message({
-					//         message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
-					//         type: 'warning'
-					//     });
-					//     return
-					// }
-					let str = ""
-					row.empiricalValueAddss.forEach(e => {
-						str += e + ","
-					})
-					if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
-						return
-					}
-					this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
-						deviceId: row.did,
-						inspectionItemId: row.id,
-						inspectionValue: str.slice(0, -1)
-					}, {
-						headers: {
-							"Content-Type": "application/json"
-						}
-					}).then(res => {
-						row.result = res.data.result
-						row.username = res.data.username
-					})
-				} else {
+			}).then(res => {
+				this.materialOptions = res.data;
+				if (this.materialOptions.length === 1 && row.did != null) {
 					this.$message({
-						message: '璇烽�夋嫨鎷╄澶囷紒',
+						message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
 						type: 'warning'
 					});
+					return
 				}
-			},
-			// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
-			handleSizeChange(val) {
-				this.search.countSize = val;
-				this.defaultInitializationTable();
-			},
-			handleSpanMethod({
-				row,
-				column,
-				rowIndex,
-				columnIndex
-			}) {
-				if (columnIndex === 0) {
-					const _row = this.spanArr[rowIndex];
-					const _col = _row > 0 ? 1 : 0;
-					return {
-						rowspan: _row,
-						colspan: _col
-					}
-				}
-				if (columnIndex === 1) {
-					const _row = this.spanArr[rowIndex];
-					const _col = _row > 0 ? 1 : 0;
-					return {
-						rowspan: _row,
-						colspan: _col
-					}
-				}
-			},
-			// 鍚堝苟琛ㄦ牸
-			mergeTable() {
-				this.rowList = []
-				this.spanArr = []
-				this.position = 0
-				this.inspectionItems.forEach((item, index) => {
-					if (index === 0) {
-						this.spanArr.push(1);
-						this.position = 0;
-					} else {
-						if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) {
-							this.spanArr[this.position] += 1;
-							this.spanArr.push(0);
-						} else {
-							this.spanArr.push(1);
-							this.position = index;
+				row.isSelectDevice = true
+			});
+		},
+		// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
+		clickTableSelect(scope) {
+			this.centerDialogVisible = true;
+			this.clickSelectDevice.index = scope.$index;
+			this.clickSelectDevice.rpId = scope.row.id;
+			this.getOptions(scope.row);
+		},
+		// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
+		clickNodeSure(row) {
+			if (this.detailId == null) {
+				this.projectTable[this.clickSelectDevice.index].deviceId = this.nodeData.id;
+				this.projectTable[this.clickSelectDevice.index].deviceName = this.nodeData.name;
+				this.centerDialogVisible = false;
+			} else {
+				this.$axios.post(this.$api.url.inspectionItemUpdateDevByInsId, {
+					id: this.clickSelectDevice.rpId,
+					devId: this.nodeData.id,
+					type: 2
+				}).then(res => {
+					this.centerDialogVisible = false;
+					this.inspectionItems.forEach(a => {
+						if (a.id == this.clickSelectDevice.rpId) {
+							a.dname = this.nodeData.name
 						}
-					}
+					})
+				});
+			}
+		},
+		changeState(row, index) {
+			if (row.did != null && row.did != '') {
+				// let val = row.empiricalValueAddss.filter(item => {
+				//     return item != '' && item != null
+				// })
+				// let eq = val.filter(item => {
+				//     return /^[^><=]/.test(item)
+				// })
+				// if (eq.length > 0) {
+				//     this.$message({
+				//         message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+				//         type: 'warning'
+				//     });
+				//     return
+				// }
+				let str = ""
+				row.empiricalValueAddss.forEach(e => {
+					str += e + ","
 				})
-			},
-			changeOptionSoptionSprocesses() {
-				this.optionTechnology = []
-				let working = this.optionSoptionSprocesses.filter(item => {
-					return item.name === this.processInspectVo.techfather
-				})[0]
-				this.optionTechnology = working.children
-			},
-			addTestProjevt() {
-				// this.isAddProject = true
-				let val = JSON.parse(JSON.stringify(this.processInspectVo))
-				val.material = this.processInspectVo.material.split("-")[1]
-				val.id = this.processInspectVo.material.split("-")[0]
-				this.$axios.post(this.$api.url.finishedInspectAddFinish, val, {
+				if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
+					return
+				}
+				this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
+					deviceId: row.did,
+					inspectionItemId: row.id,
+					inspectionValue: str.slice(0, -1)
+				}, {
 					headers: {
 						"Content-Type": "application/json"
 					}
 				}).then(res => {
-					if (res.code == 201) {
-						this.$message({
-							message: res.message,
-							type: 'warning'
-						});
-						return
-					}
-					this.detailId = res.data
-					this.inspectionResultForm[0].id = val.mcode
-					this.inspectionResultForm[0].name = val.material
-					this.getTableData()
+					row.result = res.data.result
+					row.username = res.data.username
 				})
-			},
-			getTableData() {
-				console.log(this.rowInfo);
-				this.$axios.get(this.$api.url.finishedInspectSelectFinishInspectsListById, {
-					params: {
-						id: this.rowInfo.id
-					}
-				}).then(res => {
-					this.processInspectVo.technologyId = res.data[0].techId
-				})
-				this.$axios.get(this.$api.url.inspectionItemListUser, {
-					params: {
-						id: this.detailId,
-						type: 2
-					}
-				}).then(res => {
-					if (res.data.length < 1) {
-						return
-					}
-					this.inspectionItems = res.data
-					let arr = []
-					let val = JSON.parse(JSON.stringify(this.inspectionItems))
-					const uName = []
-					//杞垚涓�缁存暟缁�
-					val.forEach(l => {
-						let father = l.father
-						l.children.forEach(c => {
-							c.father = father
-							c.empiricalValueAddss = []
-							if (c.inspectionValue != '' && c.inspectionValue != null) {
-								c.empiricalValueAddss = c.inspectionValue.split(",");
-							} else {
-								c.empiricalValueAddss.push("")
-							}
-							uName.push(c['username'])
-							c.isSelectDevice = false
-							arr.push(c)
-						})
-					})
-					this.inspectionItems = arr
-					let arrSort = JSON.parse(JSON.stringify(arr))
-					//鏍规嵁闆嗗悎瀵硅薄鏁扮粍闀垮害鎺掑簭
-					arrSort.sort((a, b) => {
-						if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) {
-							return -1; // a鎺掑湪b鍓嶉潰
-						} else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) {
-							return 1; // a鎺掑湪b鍚庨潰
-						} else {
-							return 0; // 淇濇寔鐩稿椤哄簭涓嶅彉
-						}
-					});
-					// console.log(arrSort);
-					console.log(uName);
-					let name = [...new Set(uName)].filter(item => item !== null);
-					let rname = ''
-					name.forEach(m => {
-						rname += m + ","
-					})
-					this.inspectionResultForm[0].inspecter = rname.slice(0, -1)
-					this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length
-					this.mergeTable(arr)
-				})
-			},
-			selectSample() {
-				let sample = this.optionsSamplename.filter(item => {
-					return item.name === this.processInspectVo.material
-				})[0]
-				this.processInspectVo.techfather = null
-				this.processInspectVo.techname = null
-				this.processInspectVo.materialCode = sample.code
-				this.processInspectVo.specificationsModel = sample.specifications
-				this.processInspectVo.unit = sample.unit
-				this.optionSoptionSprocesses = []
-				this.optionSoptionSprocesses = sample.children
-			},
-			selectInfoByOrderId() {
-				this.$axios.get(this.$api.url.finishedInspectChooseMater, {
-					params: {
-						orderNumber: this.processInspectVo.orderNumber
-					}
-				}).then(res => {
-					if (res.data.length > 0) {
-						console.log(res.data);
-						this.processInspectVo.sname = res.data[0].sname
-						this.processInspectVo.prname = res.data[0].prname
-						this.optionsSamplename = res.data[0].children
-					} else {
-						this.$message({
-							message: '娌℃湁璇ヨ鍗曞彿锛�',
-							type: 'warning'
-						});
-					}
-				})
-			},
-			// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
-			handleCurrentChange(val) {
-				this.search.pageSize = val;
-				this.defaultInitializationTable();
-			},
-			// 鏄剧ず鏂板椤甸潰
-			handleAddNew() {
-				this.showAddPage = true;
-				// this.getTableData()
-			},
-			// 琛ㄦ牸鍒濆鍖栨帴鍙�
-			defaultInitializationTable() {
-				this.$axios
-					.post(this.$api.url.selectProcessInspectsList, this.search)
-					.then(res => {
-						this.inspectionTableTotal = res.data.total;
-						this.inspectionTable = res.data.row;
-					});
-			},
-			// 娣诲姞琛�
-			clickAddLine() {
-				let obj = {
-					material: "",
-					materialCode: "",
-					orderNumber: "",
-					quantity: 0,
-					specificationsModel: "",
-					techfather: "",
-					techname: "",
-					technologyId: 0,
-					unit: ""
-				};
-				this.inspectionItems.push(obj);
-			},
-			// 鍒犻櫎琛�
-			clickDeleteline(scope) {
-				this.inspectionItems.splice(scope.$index, 1);
-			},
-			// 鍒犻櫎妫�楠屽�煎垪
-			clickDeleteInspectionColumn() {
-				if (this.empiricalValueAdd - 1 === 0) {} else {
-					if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
-						this.empiricalValueAdd = this.empiricalValueAdd - 1;
-						this.inspectionItems.forEach(i => {
-							i.testValueList.splice(this.empiricalValueAdd, 1);
-						});
-					}
-				}
-			},
-			// 娣诲姞妫�楠屽�煎垪
-			clickAddInspectionColumn() {
-				this.empiricalValueAdd = this.empiricalValueAdd + 1;
+			} else {
+				this.$message({
+					message: '璇烽�夋嫨鎷╄澶囷紒',
+					type: 'warning'
+				});
 			}
 		},
-		created() {
-			this.defaultInitializationTable(); // 鍒濆鍖栬〃鏍兼暟鎹�
+		// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
+		handleSizeChange(val) {
+			this.search.countSize = val;
+			this.defaultInitializationTable();
+		},
+		handleSpanMethod({
+			row,
+			column,
+			rowIndex,
+			columnIndex
+		}) {
+			if (columnIndex === 0) {
+				const _row = this.spanArr[rowIndex];
+				const _col = _row > 0 ? 1 : 0;
+				return {
+					rowspan: _row,
+					colspan: _col
+				}
+			}
+			if (columnIndex === 1) {
+				const _row = this.spanArr[rowIndex];
+				const _col = _row > 0 ? 1 : 0;
+				return {
+					rowspan: _row,
+					colspan: _col
+				}
+			}
+		},
+		// 鍚堝苟琛ㄦ牸
+		mergeTable() {
+			this.rowList = []
+			this.spanArr = []
+			this.position = 0
+			this.inspectionItems.forEach((item, index) => {
+				if (index === 0) {
+					this.spanArr.push(1);
+					this.position = 0;
+				} else {
+					if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) {
+						this.spanArr[this.position] += 1;
+						this.spanArr.push(0);
+					} else {
+						this.spanArr.push(1);
+						this.position = index;
+					}
+				}
+			})
+		},
+		changeOptionSoptionSprocesses() {
+			this.optionTechnology = []
+			let working = this.optionSoptionSprocesses.filter(item => {
+				return item.name === this.processInspectVo.techfather
+			})[0]
+			this.optionTechnology = working.children
+		},
+		addTestProjevt() {
+			// this.isAddProject = true
+			let val = JSON.parse(JSON.stringify(this.processInspectVo))
+			val.material = this.processInspectVo.material.split("-")[1]
+			val.id = this.processInspectVo.material.split("-")[0]
+			this.$axios.post(this.$api.url.finishedInspectAddFinish, val, {
+				headers: {
+					"Content-Type": "application/json"
+				}
+			}).then(res => {
+				if (res.code == 201) {
+					this.$message({
+						message: res.message,
+						type: 'warning'
+					});
+					return
+				}
+				this.detailId = res.data
+				this.inspectionResultForm[0].id = val.mcode
+				this.inspectionResultForm[0].name = val.material
+				this.getTableData()
+			})
+		},
+		getTableData() {
+			console.log(this.rowInfo);
+			this.$axios.get(this.$api.url.finishedInspectSelectFinishInspectsListById, {
+				params: {
+					id: this.rowInfo.id
+				}
+			}).then(res => {
+				this.processInspectVo.technologyId = res.data[0].techId
+			})
+			this.$axios.get(this.$api.url.inspectionItemListUser, {
+				params: {
+					id: this.detailId,
+					type: 2
+				}
+			}).then(res => {
+				if (res.data.length < 1) {
+					return
+				}
+				this.inspectionItems = res.data
+				let arr = []
+				let val = JSON.parse(JSON.stringify(this.inspectionItems))
+				const uName = []
+				//杞垚涓�缁存暟缁�
+				val.forEach(l => {
+					let father = l.father
+					l.children.forEach(c => {
+						c.father = father
+						c.empiricalValueAddss = []
+						if (c.inspectionValue != '' && c.inspectionValue != null) {
+							c.empiricalValueAddss = c.inspectionValue.split(",");
+						} else {
+							c.empiricalValueAddss.push("")
+						}
+						uName.push(c['username'])
+						c.isSelectDevice = false
+						arr.push(c)
+					})
+				})
+				this.inspectionItems = arr
+				let arrSort = JSON.parse(JSON.stringify(arr))
+				//鏍规嵁闆嗗悎瀵硅薄鏁扮粍闀垮害鎺掑簭
+				arrSort.sort((a, b) => {
+					if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) {
+						return -1; // a鎺掑湪b鍓嶉潰
+					} else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) {
+						return 1; // a鎺掑湪b鍚庨潰
+					} else {
+						return 0; // 淇濇寔鐩稿椤哄簭涓嶅彉
+					}
+				});
+				// console.log(arrSort);
+				console.log(uName);
+				let name = [...new Set(uName)].filter(item => item !== null);
+				let rname = ''
+				name.forEach(m => {
+					rname += m + ","
+				})
+				this.inspectionResultForm[0].inspecter = rname.slice(0, -1)
+				this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length
+				this.mergeTable(arr)
+			})
+		},
+		selectSample() {
+			let sample = this.optionsSamplename.filter(item => {
+				return item.name === this.processInspectVo.material
+			})[0]
+			this.processInspectVo.techfather = null
+			this.processInspectVo.techname = null
+			this.processInspectVo.materialCode = sample.code
+			this.processInspectVo.specificationsModel = sample.specifications
+			this.processInspectVo.unit = sample.unit
+			this.optionSoptionSprocesses = []
+			this.optionSoptionSprocesses = sample.children
+		},
+		selectInfoByOrderId() {
+			this.$axios.get(this.$api.url.finishedInspectChooseMater, {
+				params: {
+					orderNumber: this.processInspectVo.orderNumber
+				}
+			}).then(res => {
+				if (res.data.length > 0) {
+					console.log(res.data);
+					this.processInspectVo.sname = res.data[0].sname
+					this.processInspectVo.prname = res.data[0].prname
+					this.optionsSamplename = res.data[0].children
+				} else {
+					this.$message({
+						message: '娌℃湁璇ヨ鍗曞彿锛�',
+						type: 'warning'
+					});
+				}
+			})
+		},
+		// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
+		handleCurrentChange(val) {
+			this.search.pageSize = val;
+			this.defaultInitializationTable();
+		},
+		// 鏄剧ず鏂板椤甸潰
+		handleAddNew() {
+			this.showAddPage = true;
+			// this.getTableData()
+		},
+		// 琛ㄦ牸鍒濆鍖栨帴鍙�
+		defaultInitializationTable() {
+			this.$axios
+				.post(this.$api.url.selectProcessInspectsList, this.search)
+				.then(res => {
+					this.inspectionTableTotal = res.data.total;
+					this.inspectionTable = res.data.row;
+				});
+		},
+		// 娣诲姞琛�
+		clickAddLine() {
+			let obj = {
+				material: "",
+				materialCode: "",
+				orderNumber: "",
+				quantity: 0,
+				specificationsModel: "",
+				techfather: "",
+				techname: "",
+				technologyId: 0,
+				unit: ""
+			};
+			this.inspectionItems.push(obj);
+		},
+		// 鍒犻櫎琛�
+		clickDeleteline(scope) {
+			this.inspectionItems.splice(scope.$index, 1);
+		},
+		// 鍒犻櫎妫�楠屽�煎垪
+		clickDeleteInspectionColumn() {
+			if (this.empiricalValueAdd - 1 === 0) { } else {
+				if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
+					this.empiricalValueAdd = this.empiricalValueAdd - 1;
+					this.inspectionItems.forEach(i => {
+						i.testValueList.splice(this.empiricalValueAdd, 1);
+					});
+				}
+			}
+		},
+		// 娣诲姞妫�楠屽�煎垪
+		clickAddInspectionColumn() {
+			this.empiricalValueAdd = this.empiricalValueAdd + 1;
 		}
+	},
+	created() {
+		this.defaultInitializationTable(); // 鍒濆鍖栬〃鏍兼暟鎹�
 	}
+}
 </script>
 
 <style></style>
\ No newline at end of file
diff --git a/src/components/view/processInspectionUpdate.vue b/src/components/view/processInspectionUpdate.vue
index e7b2921..eb95ed5 100644
--- a/src/components/view/processInspectionUpdate.vue
+++ b/src/components/view/processInspectionUpdate.vue
@@ -24,29 +24,31 @@
 							<el-form-item label="浜у搧鍚嶇О锛�">
 								<el-select style="width: 210px;" size="small" disabled @change="selectSample"
 									v-model="processInspectVo.material" placeholder="璇烽�夋嫨浜у搧">
-									<el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name" :value="item.name">
+									<el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name"
+										:value="item.name">
 									</el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="7">
 							<el-form-item label="浜у搧缂栫爜锛�">
-								<el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.materialCode"
-									placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" />
+								<el-input style="width: 210px;" size="small" disabled
+									v-model="processInspectVo.materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" />
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row :gutter="230">
 						<el-col :span="7">
 							<el-form-item label="瑙勬牸鍨嬪彿锛�">
-								<el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.specificationsModel"
-									placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+								<el-input style="width: 210px;" size="small" disabled
+									v-model="processInspectVo.specificationsModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="7">
 							<el-form-item label="宸ュ簭鍚嶇О锛�">
-								<el-select @change="changeOptionSoptionSprocesses" disabled v-model="processInspectVo.techfather"
-									placeholder="璇烽�夋嫨" style="width: 210px;" size="small">
+								<el-select @change="changeOptionSoptionSprocesses" disabled
+									v-model="processInspectVo.techfather" placeholder="璇烽�夋嫨" style="width: 210px;"
+									size="small">
 									<el-option v-for="item in optionSoptionSprocesses" :key="item.name" :label="item.name"
 										:value="item.name">
 									</el-option>
@@ -55,8 +57,8 @@
 						</el-col>
 						<el-col :span="7">
 							<el-form-item label="宸ヨ壓鍚嶇О锛�">
-								<el-select v-model="processInspectVo.techname" disabled placeholder="璇烽�夋嫨" style="width: 210px;"
-									size="small">
+								<el-select v-model="processInspectVo.techname" disabled placeholder="璇烽�夋嫨"
+									style="width: 210px;" size="small">
 									<el-option v-for="item in optionTechnology" :key="item.id" :label="item.name"
 										:value="item.id + '-' + item.name">
 									</el-option>
@@ -89,7 +91,8 @@
 				<el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col>
 				<el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span">
 					<el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�楠屽�煎垪</el-button>
-					<el-button style="margin-right: 30px;" size="mini" @click="clickAddInspectionColumn()">娣诲姞妫�楠屽�煎垪</el-button>
+					<el-button style="margin-right: 30px;" size="mini"
+						@click="clickAddInspectionColumn()">娣诲姞妫�楠屽�煎垪</el-button>
 					<!-- <el-button
               size="mini"
               style="margin-right: 30px;"
@@ -120,7 +123,7 @@
 					<template slot-scope="scope">
 						<el-col>
 							<el-button type="text" @click="clickTableSelect(scope)">
-								{{scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname}}
+								{{ scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname }}
 							</el-button>
 						</el-col>
 					</template>
@@ -129,7 +132,7 @@
 					<template slot-scope="scope">
 						<span style="color: #34BD66;" v-if="scope.row.result === 1">鍚堟牸</span>
 						<span style="color: #E84738;" v-else-if="scope.row.result === 0">涓嶅悎鏍�</span>
-						<span v-show="scope.row.result === null">{{null}}</span>
+						<span v-show="scope.row.result === null">{{ null }}</span>
 					</template>
 				</el-table-column>
 				<!-- <el-table-column v-if="detailId == null" label="鎿嶄綔" width="100">
@@ -165,10 +168,11 @@
 			<div class="div_device_dialog">
 				<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 6px;">
 				</el-input>
-				<el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all highlight-current
-					@node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
+				<el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all
+					highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
 					<div class="custom-tree-node" slot-scope="{ data }">
-						<span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>{{ data.name }}</span>
+						<span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>{{
+							data.name }}</span>
 					</div>
 				</el-tree>
 			</div>
@@ -181,142 +185,177 @@
 </template>
 
 <script>
-	export default {
-		props: ['rowInfo'],
-		data() {
-			return {
-				isUpBtn: false,
-				showUp: false,
-				isAddProject: false,
-				detailId: 0,
-				row: {},
-				search: {
-					countSize: 10,
-					pageSize: 1,
-					result: "", // 妫�娴嬬姸鎬�
-					name: "", // 浜у搧鍚嶇О
-					techfather: "" // 宸ュ簭
-				},
-				optionsSamplename: [],
-				inspectionTable: [],
-				tableColumn: [],
-				optionSoptionSprocesses: [],
-				optionTechnology: [],
-				inspectionTableTotal: "",
-				treeProject: [],
-				// 娣诲姞鍒�
-				empiricalValueAdd: 1,
-				// 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
-				empiricalValueAddMaxNumber: 0,
-				showAddPage: false,
-				processInspectVo: {
-					material: null,
-					materialCode: null,
-					orderNumber: "",
-					quantity: null,
-					specificationsModel: null,
-					techfather: null,
-					techname: null,
-					technologyId: null,
-					unit: null
-				},
-				InspectioniD: null,
-				addInspectionform: [{
-					number: "",
-					username: "",
-					projectname: "",
-					tracenumber: "",
-					code: "",
-					class: "",
-					specificationmodel: "",
-					unit: "",
-					quantity: "",
-					group: "",
-					worker: "",
-					machine: ""
-				}],
-				inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
-				inspectionResultForm: [{
-					id: "",
-					name: "",
-					inspecter: "",
-					conclusion: "",
-					operation: ""
-				}],
-				options: [],
-				value: "",
-				rowList: [],
-				spanArr: [],
-				position: 0,
-				// 璁惧閫夋嫨鏍戞樉绀�
-				centerDialogVisible: false,
-				filterText: "",
-				materialOptions: [],
-				defaultProps: {
-					// 璁惧鏍戞暟鎹缃�
-					children: "children",
-					label: "name"
-				},
-				nodeData: {
-					id: 0,
-					name: null
-				}, // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
-				clickSelectDevice: {
-					index: null, // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
-					rpId: null // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
-				}
-			};
-		},
-		watch: {
-			// filterText(val) {
-			//     this.$refs.tree.filter(val);
-			// }
-		},
-		created() {
-			if (this.rowInfo.result != null && this.rowInfo.result != '') {
-				this.isUpBtn = true
-			}
-			this.processInspectVo.orderNumber = this.rowInfo.order_number
-			this.processInspectVo.material = this.rowInfo.material
-			this.processInspectVo.materialCode = this.rowInfo.material_code
-			this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
-			this.processInspectVo.techfather = this.rowInfo.techfather
-			this.processInspectVo.techname = this.rowInfo.techname
-			this.processInspectVo.unit = this.rowInfo.unit
-			this.processInspectVo.quantity = this.rowInfo.quantity
-			this.detailId = this.rowInfo.id
-			this.inspectionResultForm[0].id = this.rowInfo.material_code
-			this.inspectionResultForm[0].name = this.rowInfo.material
-			this.inspectionResultForm[0].conclusion = this.rowInfo.result
-			// console.log(this.detailId);
-		},
-		mounted() {
-			this.getTableData()
-		},
-		methods: {
-			blurNode(scope) {
-				// console.log(11);
-				// this.$set(this.inspectionItems[scope.$index],'isSelectDevice',false)
+export default {
+	props: ['rowInfo'],
+	data() {
+		return {
+			isUpBtn: false,
+			showUp: false,
+			isAddProject: false,
+			detailId: 0,
+			row: {},
+			search: {
+				countSize: 10,
+				pageSize: 1,
+				result: "", // 妫�娴嬬姸鎬�
+				name: "", // 浜у搧鍚嶇О
+				techfather: "" // 宸ュ簭
 			},
-			escalation() {
-				let arr = this.inspectionItems
-				let bl = false
-				for (let index = 0; index < arr.length; index++) {
-					const element = arr[index];
-					if (element.dname != null && element.empiricalValueAddss[0] != '') {
-						bl = true
-						break
-					} else {
-						bl = false
-					}
+			optionsSamplename: [],
+			inspectionTable: [],
+			tableColumn: [],
+			optionSoptionSprocesses: [],
+			optionTechnology: [],
+			inspectionTableTotal: "",
+			treeProject: [],
+			// 娣诲姞鍒�
+			empiricalValueAdd: 1,
+			// 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
+			empiricalValueAddMaxNumber: 0,
+			showAddPage: false,
+			processInspectVo: {
+				material: null,
+				materialCode: null,
+				orderNumber: "",
+				quantity: null,
+				specificationsModel: null,
+				techfather: null,
+				techname: null,
+				technologyId: null,
+				unit: null
+			},
+			InspectioniD: null,
+			addInspectionform: [{
+				number: "",
+				username: "",
+				projectname: "",
+				tracenumber: "",
+				code: "",
+				class: "",
+				specificationmodel: "",
+				unit: "",
+				quantity: "",
+				group: "",
+				worker: "",
+				machine: ""
+			}],
+			inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
+			inspectionResultForm: [{
+				id: "",
+				name: "",
+				inspecter: "",
+				conclusion: "",
+				operation: ""
+			}],
+			options: [],
+			value: "",
+			rowList: [],
+			spanArr: [],
+			position: 0,
+			// 璁惧閫夋嫨鏍戞樉绀�
+			centerDialogVisible: false,
+			filterText: "",
+			materialOptions: [],
+			defaultProps: {
+				// 璁惧鏍戞暟鎹缃�
+				children: "children",
+				label: "name"
+			},
+			nodeData: {
+				id: 0,
+				name: null
+			}, // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
+			clickSelectDevice: {
+				index: null, // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
+				rpId: null // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
+			}
+		};
+	},
+	watch: {
+		// filterText(val) {
+		//     this.$refs.tree.filter(val);
+		// }
+	},
+	created() {
+		if (this.rowInfo.result != null && this.rowInfo.result != '') {
+			this.isUpBtn = true
+		}
+		this.processInspectVo.orderNumber = this.rowInfo.order_number
+		this.processInspectVo.material = this.rowInfo.material
+		this.processInspectVo.materialCode = this.rowInfo.material_code
+		this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
+		this.processInspectVo.techfather = this.rowInfo.techfather
+		this.processInspectVo.techname = this.rowInfo.techname
+		this.processInspectVo.unit = this.rowInfo.unit
+		this.processInspectVo.quantity = this.rowInfo.quantity
+		this.detailId = this.rowInfo.id
+		this.inspectionResultForm[0].id = this.rowInfo.material_code
+		this.inspectionResultForm[0].name = this.rowInfo.material
+		this.inspectionResultForm[0].conclusion = this.rowInfo.result
+		// console.log(this.detailId);
+	},
+	mounted() {
+		this.getTableData()
+	},
+	methods: {
+		blurNode(scope) {
+			// console.log(11);
+			// this.$set(this.inspectionItems[scope.$index],'isSelectDevice',false)
+		},
+		escalation() {
+			let arr = this.inspectionItems
+			let bl = false
+			for (let index = 0; index < arr.length; index++) {
+				const element = arr[index];
+				if (element.dname != null && element.empiricalValueAddss[0] != '') {
+					bl = true
+					break
+				} else {
+					bl = false
 				}
-				if (bl != true) {
+			}
+			if (bl != true) {
+				this.$message({
+					message: '璇峰厛妫�娴嬩竴椤归」鐩紒',
+					type: 'warning'
+				});
+				return
+			}
+			let pro = this.inspectionItems.filter(item => {
+				return item.result === 0;
+			})
+			if (pro.length > 0) {
+				this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
+					confirmButtonText: '纭畾',
+					cancelButtonText: '鍙栨秷',
+					inputPattern: /^\d+$/,
+					inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
+				}).then(({ value }) => {
+					this.$axios.post(this.$api.url.processInspectUpdateProcessInspectsById, {
+						id: this.detailId,
+						number: value
+					}).then(res => {
+						if (res.code == 200) {
+							// this.$message({
+							// 	message: '涓婃姤鎴愬姛',
+							// 	type: 'success'
+							// });
+							this.$parent.combackMain(true)
+						} else {
+							this.$message({
+								message: res.message,
+								type: 'warning'
+							});
+						}
+
+					})
+				}).catch(() => {
 					this.$message({
-						message: '璇峰厛妫�娴嬩竴椤归」鐩紒',
-						type: 'warning'
+						type: 'info',
+						message: '鍙栨秷杈撳叆'
 					});
-					return
-				}
+				});
+			} else {
 				this.$axios.post(this.$api.url.processInspectUpdateProcessInspectsById, {
 					id: this.detailId
 				}).then(res => {
@@ -341,336 +380,337 @@
 					}
 
 				})
-			},
-			handleClick() {},
-			updateInsInfo(row) {
-				this.row = row
-				this.showUp = true
-			},
-			// 鐐瑰嚮璁惧鏍戜繚瀛樼偣鍑昏褰�
-			nodeClick(data) {
-				if (data.id != undefined) this.nodeData = data;
-			},
-			// 璁惧鏍戣繃婊ゆ悳绱�
-			filterNode(value, data) {
-				if (!value) return true;
-				return data.name.indexOf(value) !== -1;
-			},
-			// 鑾峰彇璁惧鏍戝唴瀹�
-			getOptions(row) {
-				this.$axios.get(this.$api.url.inspectionItemChooseDev, {
-					params: {
-						father: row.father,
-						name: row.name,
-						technologyId: this.processInspectVo.technologyId
-					}
-				}).then(res => {
-					this.materialOptions = res.data;
-					if (this.materialOptions.length === 1 && row.did != null) {
-						this.$message({
-							message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
-							type: 'warning'
-						});
-						return
-					}
-					row.isSelectDevice = true
-				});
-			},
-			//杩斿洖
-			combackFather() {
-				this.$parent.combackMain()
-			},
-			// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
-			clickTableSelect(scope) {
-				this.centerDialogVisible = true;
-				this.clickSelectDevice.index = scope.$index;
-				this.clickSelectDevice.rpId = scope.row.id;
-				this.getOptions(scope.row);
-			},
-			// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
-			clickNodeSure() {
-				if (this.detailId == null) {
-					this.projectTable[this.clickSelectDevice.index].deviceId = this.nodeData.id;
-					this.projectTable[this.clickSelectDevice.index].deviceName = this.nodeData.name;
-					this.centerDialogVisible = false;
-				} else {
-					this.$axios.post(this.$api.url.inspectionItemUpdateDevByInsId, {
-						id: this.clickSelectDevice.rpId,
-						devId: this.nodeData.id,
-						type: 1
-					}).then(res => {
-						this.centerDialogVisible = false;
-						this.inspectionItems.forEach(a=>{
-							if(a.id == this.clickSelectDevice.rpId){
-								a.dname = this.nodeData.name
-							}
-						})
-					});
+			}
+		},
+		handleClick() { },
+		updateInsInfo(row) {
+			this.row = row
+			this.showUp = true
+		},
+		// 鐐瑰嚮璁惧鏍戜繚瀛樼偣鍑昏褰�
+		nodeClick(data) {
+			if (data.id != undefined) this.nodeData = data;
+		},
+		// 璁惧鏍戣繃婊ゆ悳绱�
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		// 鑾峰彇璁惧鏍戝唴瀹�
+		getOptions(row) {
+			this.$axios.get(this.$api.url.inspectionItemChooseDev, {
+				params: {
+					father: row.father,
+					name: row.name,
+					technologyId: this.processInspectVo.technologyId
 				}
-			},
-			changeState(row, index) {
-				if (row.did != null && row.did != '') {
-					let str = ""
-					row.empiricalValueAddss.forEach(e => {
-						str += e + ","
-					})
-					if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
-						return
-					}
-					this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
-						deviceId: row.did,
-						inspectionItemId: row.id,
-						inspectionValue: str.slice(0, -1)
-					}, {
-						headers: {
-							"Content-Type": "application/json"
-						}
-					}).then(res => {
-						row.result = res.data.result
-						row.username = res.data.username
-					})
-				} else {
+			}).then(res => {
+				this.materialOptions = res.data;
+				if (this.materialOptions.length === 1 && row.did != null) {
 					this.$message({
-						message: '璇烽�夋嫨鎷╄澶囷紒',
+						message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
 						type: 'warning'
 					});
+					return
 				}
-			},
-			// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
-			handleSizeChange(val) {
-				this.search.countSize = val;
-				this.defaultInitializationTable();
-			},
-			handleSpanMethod({
-				row,
-				column,
-				rowIndex,
-				columnIndex
-			}) {
-				if (columnIndex === 0) {
-					const _row = this.spanArr[rowIndex];
-					const _col = _row > 0 ? 1 : 0;
-					return {
-						rowspan: _row,
-						colspan: _col
-					}
-				}
-				if (columnIndex === 1) {
-					const _row = this.spanArr[rowIndex];
-					const _col = _row > 0 ? 1 : 0;
-					return {
-						rowspan: _row,
-						colspan: _col
-					}
-				}
-			},
-			// 鍚堝苟琛ㄦ牸
-			mergeTable() {
-				this.rowList = []
-				this.spanArr = []
-				this.position = 0
-				this.inspectionItems.forEach((item, index) => {
-					if (index === 0) {
-						this.spanArr.push(1);
-						this.position = 0;
-					} else {
-						if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) {
-							this.spanArr[this.position] += 1;
-							this.spanArr.push(0);
-						} else {
-							this.spanArr.push(1);
-							this.position = index;
+				row.isSelectDevice = true
+			});
+		},
+		//杩斿洖
+		combackFather() {
+			this.$parent.combackMain()
+		},
+		// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
+		clickTableSelect(scope) {
+			this.centerDialogVisible = true;
+			this.clickSelectDevice.index = scope.$index;
+			this.clickSelectDevice.rpId = scope.row.id;
+			this.getOptions(scope.row);
+		},
+		// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
+		clickNodeSure() {
+			if (this.detailId == null) {
+				this.projectTable[this.clickSelectDevice.index].deviceId = this.nodeData.id;
+				this.projectTable[this.clickSelectDevice.index].deviceName = this.nodeData.name;
+				this.centerDialogVisible = false;
+			} else {
+				this.$axios.post(this.$api.url.inspectionItemUpdateDevByInsId, {
+					id: this.clickSelectDevice.rpId,
+					devId: this.nodeData.id,
+					type: 1
+				}).then(res => {
+					this.centerDialogVisible = false;
+					this.inspectionItems.forEach(a => {
+						if (a.id == this.clickSelectDevice.rpId) {
+							a.dname = this.nodeData.name
 						}
-					}
+					})
+				});
+			}
+		},
+		changeState(row, index) {
+			if (row.did != null && row.did != '') {
+				let str = ""
+				row.empiricalValueAddss.forEach(e => {
+					str += e + ","
 				})
-			},
-			changeOptionSoptionSprocesses() {
-				this.optionTechnology = []
-				let working = this.optionSoptionSprocesses.filter(item => {
-					return item.name === this.processInspectVo.techfather
-				})[0]
-				this.optionTechnology = working.children
-			},
-			addTestProjevt() {
-				this.isAddProject = true
-				let val = JSON.parse(JSON.stringify(this.processInspectVo))
-				val.techname = this.processInspectVo.techname.split("-")[1]
-				val.technologyId = this.processInspectVo.techname.split("-")[0]
-				this.$axios.post(this.$api.url.processInspectAddProcess, {
-					material: val.material,
-					materialCode: val.materialCode,
-					orderNumber: val.orderNumber,
-					quantity: val.quantity,
-					specificationsModel: val.specificationsModel,
-					techfather: val.techfather,
-					techname: val.techname,
-					technologyId: val.technologyId,
-					unit: val.unit
+				if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
+					return
+				}
+				this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
+					deviceId: row.did,
+					inspectionItemId: row.id,
+					inspectionValue: str.slice(0, -1)
 				}, {
 					headers: {
 						"Content-Type": "application/json"
 					}
 				}).then(res => {
-					if (res.code === 201) {
-						this.$message({
-							message: res.message,
-							type: 'warning'
-						});
-						return
-					}
-					this.detailId = res.data
-					this.inspectionResultForm[0].id = res.data
-					this.inspectionResultForm[0].name = val.material
-					this.getTableData()
+					row.result = res.data.result
+					row.username = res.data.username
 				})
-			},
-			getTableData() {
-				this.$axios.get(this.$api.url.processInspectSelectProcessInspectsListById, {
-					params: {
-						id: this.rowInfo.id
-					}
-				}).then(res => {
-					// console.log(res.data);
-					this.processInspectVo.technologyId = res.data[0].techId
-					// console.log(this.processInspectVo);
-				})
-				this.$axios.get(this.$api.url.inspectionItemListUser, {
-					params: {
-						id: this.detailId,
-						type: 1
-					}
-				}).then(res => {
-					if (res.data.length < 1) {
-						return
-					}
-					this.inspectionItems = res.data
-					let arr = []
-					let val = JSON.parse(JSON.stringify(this.inspectionItems))
-					const uName = []
-					//杞垚涓�缁存暟缁�
-					val.forEach(l => {
-						let father = l.father
-						l.children.forEach(c => {
-							c.father = father
-							c.empiricalValueAddss = []
-							if (c.inspectionValue != '' && c.inspectionValue != null) {
-								c.empiricalValueAddss = c.inspectionValue.split(",");
-							} else {
-								c.empiricalValueAddss.push("")
-							}
-							uName.push(c['username'])
-							c.isSelectDevice = false
-							arr.push(c)
-						})
-					})
-					this.inspectionItems = arr
-					let arrSort = JSON.parse(JSON.stringify(arr))
-					//鏍规嵁闆嗗悎瀵硅薄鏁扮粍闀垮害鎺掑簭
-					arrSort.sort((a, b) => {
-						if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) {
-							return -1; // a鎺掑湪b鍓嶉潰
-						} else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) {
-							return 1; // a鎺掑湪b鍚庨潰
-						} else {
-							return 0; // 淇濇寔鐩稿椤哄簭涓嶅彉
-						}
-					});
-					// console.log(arrSort);
-					console.log(uName);
-					let name = [...new Set(uName)].filter(item => item !== null);
-					let rname = ''
-					name.forEach(m => {
-						rname += m + ","
-					})
-					this.inspectionResultForm[0].inspecter = rname.slice(0, -1)
-					this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length
-					this.mergeTable(arr)
-				})
-			},
-			selectSample() {
-				let sample = this.optionsSamplename.filter(item => {
-					return item.name === this.processInspectVo.material
-				})[0]
-				this.processInspectVo.techfather = null
-				this.processInspectVo.techname = null
-				this.processInspectVo.materialCode = sample.code
-				this.processInspectVo.specificationsModel = sample.specifications
-				this.processInspectVo.unit = sample.unit
-				this.optionSoptionSprocesses = []
-				this.optionSoptionSprocesses = sample.children
-			},
-			selectInfoByOrderId() {
-				this.$axios.get(this.$api.url.chooseMaterProcessInspect, {
-					params: {
-						orderNumber: this.processInspectVo.orderNumber
-					}
-				}).then(res => {
-					if (res.data.length > 0) {
-						console.log(res.data);
-						this.optionsSamplename = res.data
+			} else {
+				this.$message({
+					message: '璇烽�夋嫨鎷╄澶囷紒',
+					type: 'warning'
+				});
+			}
+		},
+		// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
+		handleSizeChange(val) {
+			this.search.countSize = val;
+			this.defaultInitializationTable();
+		},
+		handleSpanMethod({
+			row,
+			column,
+			rowIndex,
+			columnIndex
+		}) {
+			if (columnIndex === 0) {
+				const _row = this.spanArr[rowIndex];
+				const _col = _row > 0 ? 1 : 0;
+				return {
+					rowspan: _row,
+					colspan: _col
+				}
+			}
+			if (columnIndex === 1) {
+				const _row = this.spanArr[rowIndex];
+				const _col = _row > 0 ? 1 : 0;
+				return {
+					rowspan: _row,
+					colspan: _col
+				}
+			}
+		},
+		// 鍚堝苟琛ㄦ牸
+		mergeTable() {
+			this.rowList = []
+			this.spanArr = []
+			this.position = 0
+			this.inspectionItems.forEach((item, index) => {
+				if (index === 0) {
+					this.spanArr.push(1);
+					this.position = 0;
+				} else {
+					if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) {
+						this.spanArr[this.position] += 1;
+						this.spanArr.push(0);
 					} else {
-						this.$message({
-							message: '娌℃湁璇ヨ鍗曞彿锛�',
-							type: 'warning'
-						});
-					}
-				})
-			},
-			// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
-			handleCurrentChange(val) {
-				this.search.pageSize = val;
-				this.defaultInitializationTable();
-			},
-			// 鏄剧ず鏂板椤甸潰
-			handleAddNew() {
-				this.showAddPage = true;
-				// this.getTableData()
-			},
-			// 琛ㄦ牸鍒濆鍖栨帴鍙�
-			defaultInitializationTable() {
-				this.$axios
-					.post(this.$api.url.selectProcessInspectsList, this.search)
-					.then(res => {
-						this.inspectionTableTotal = res.data.total;
-						this.inspectionTable = res.data.row;
-					});
-			},
-			// 娣诲姞琛�
-			clickAddLine() {
-				let obj = {
-					material: "",
-					materialCode: "",
-					orderNumber: "",
-					quantity: 0,
-					specificationsModel: "",
-					techfather: "",
-					techname: "",
-					technologyId: 0,
-					unit: ""
-				};
-				this.inspectionItems.push(obj);
-			},
-			// 鍒犻櫎琛�
-			clickDeleteline(scope) {
-				this.inspectionItems.splice(scope.$index, 1);
-			},
-			// 鍒犻櫎妫�楠屽�煎垪
-			clickDeleteInspectionColumn() {
-				if (this.empiricalValueAdd - 1 === 0) {} else {
-					if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
-						this.empiricalValueAdd = this.empiricalValueAdd - 1;
-						this.inspectionItems.forEach(i => {
-							i.testValueList.splice(this.empiricalValueAdd, 1);
-						});
+						this.spanArr.push(1);
+						this.position = index;
 					}
 				}
-			},
-			// 娣诲姞妫�楠屽�煎垪
-			clickAddInspectionColumn() {
-				this.empiricalValueAdd = this.empiricalValueAdd + 1;
+			})
+		},
+		changeOptionSoptionSprocesses() {
+			this.optionTechnology = []
+			let working = this.optionSoptionSprocesses.filter(item => {
+				return item.name === this.processInspectVo.techfather
+			})[0]
+			this.optionTechnology = working.children
+		},
+		addTestProjevt() {
+			this.isAddProject = true
+			let val = JSON.parse(JSON.stringify(this.processInspectVo))
+			val.techname = this.processInspectVo.techname.split("-")[1]
+			val.technologyId = this.processInspectVo.techname.split("-")[0]
+			this.$axios.post(this.$api.url.processInspectAddProcess, {
+				material: val.material,
+				materialCode: val.materialCode,
+				orderNumber: val.orderNumber,
+				quantity: val.quantity,
+				specificationsModel: val.specificationsModel,
+				techfather: val.techfather,
+				techname: val.techname,
+				technologyId: val.technologyId,
+				unit: val.unit
+			}, {
+				headers: {
+					"Content-Type": "application/json"
+				}
+			}).then(res => {
+				if (res.code === 201) {
+					this.$message({
+						message: res.message,
+						type: 'warning'
+					});
+					return
+				}
+				this.detailId = res.data
+				this.inspectionResultForm[0].id = res.data
+				this.inspectionResultForm[0].name = val.material
+				this.getTableData()
+			})
+		},
+		getTableData() {
+			this.$axios.get(this.$api.url.processInspectSelectProcessInspectsListById, {
+				params: {
+					id: this.rowInfo.id
+				}
+			}).then(res => {
+				// console.log(res.data);
+				this.processInspectVo.technologyId = res.data[0].techId
+				// console.log(this.processInspectVo);
+			})
+			this.$axios.get(this.$api.url.inspectionItemListUser, {
+				params: {
+					id: this.detailId,
+					type: 1
+				}
+			}).then(res => {
+				if (res.data.length < 1) {
+					return
+				}
+				this.inspectionItems = res.data
+				let arr = []
+				let val = JSON.parse(JSON.stringify(this.inspectionItems))
+				const uName = []
+				//杞垚涓�缁存暟缁�
+				val.forEach(l => {
+					let father = l.father
+					l.children.forEach(c => {
+						c.father = father
+						c.empiricalValueAddss = []
+						if (c.inspectionValue != '' && c.inspectionValue != null) {
+							c.empiricalValueAddss = c.inspectionValue.split(",");
+						} else {
+							c.empiricalValueAddss.push("")
+						}
+						uName.push(c['username'])
+						c.isSelectDevice = false
+						arr.push(c)
+					})
+				})
+				this.inspectionItems = arr
+				let arrSort = JSON.parse(JSON.stringify(arr))
+				//鏍规嵁闆嗗悎瀵硅薄鏁扮粍闀垮害鎺掑簭
+				arrSort.sort((a, b) => {
+					if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) {
+						return -1; // a鎺掑湪b鍓嶉潰
+					} else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) {
+						return 1; // a鎺掑湪b鍚庨潰
+					} else {
+						return 0; // 淇濇寔鐩稿椤哄簭涓嶅彉
+					}
+				});
+				// console.log(arrSort);
+				console.log(uName);
+				let name = [...new Set(uName)].filter(item => item !== null);
+				let rname = ''
+				name.forEach(m => {
+					rname += m + ","
+				})
+				this.inspectionResultForm[0].inspecter = rname.slice(0, -1)
+				this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length
+				this.mergeTable(arr)
+			})
+		},
+		selectSample() {
+			let sample = this.optionsSamplename.filter(item => {
+				return item.name === this.processInspectVo.material
+			})[0]
+			this.processInspectVo.techfather = null
+			this.processInspectVo.techname = null
+			this.processInspectVo.materialCode = sample.code
+			this.processInspectVo.specificationsModel = sample.specifications
+			this.processInspectVo.unit = sample.unit
+			this.optionSoptionSprocesses = []
+			this.optionSoptionSprocesses = sample.children
+		},
+		selectInfoByOrderId() {
+			this.$axios.get(this.$api.url.chooseMaterProcessInspect, {
+				params: {
+					orderNumber: this.processInspectVo.orderNumber
+				}
+			}).then(res => {
+				if (res.data.length > 0) {
+					console.log(res.data);
+					this.optionsSamplename = res.data
+				} else {
+					this.$message({
+						message: '娌℃湁璇ヨ鍗曞彿锛�',
+						type: 'warning'
+					});
+				}
+			})
+		},
+		// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
+		handleCurrentChange(val) {
+			this.search.pageSize = val;
+			this.defaultInitializationTable();
+		},
+		// 鏄剧ず鏂板椤甸潰
+		handleAddNew() {
+			this.showAddPage = true;
+			// this.getTableData()
+		},
+		// 琛ㄦ牸鍒濆鍖栨帴鍙�
+		defaultInitializationTable() {
+			this.$axios
+				.post(this.$api.url.selectProcessInspectsList, this.search)
+				.then(res => {
+					this.inspectionTableTotal = res.data.total;
+					this.inspectionTable = res.data.row;
+				});
+		},
+		// 娣诲姞琛�
+		clickAddLine() {
+			let obj = {
+				material: "",
+				materialCode: "",
+				orderNumber: "",
+				quantity: 0,
+				specificationsModel: "",
+				techfather: "",
+				techname: "",
+				technologyId: 0,
+				unit: ""
+			};
+			this.inspectionItems.push(obj);
+		},
+		// 鍒犻櫎琛�
+		clickDeleteline(scope) {
+			this.inspectionItems.splice(scope.$index, 1);
+		},
+		// 鍒犻櫎妫�楠屽�煎垪
+		clickDeleteInspectionColumn() {
+			if (this.empiricalValueAdd - 1 === 0) { } else {
+				if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
+					this.empiricalValueAdd = this.empiricalValueAdd - 1;
+					this.inspectionItems.forEach(i => {
+						i.testValueList.splice(this.empiricalValueAdd, 1);
+					});
+				}
 			}
+		},
+		// 娣诲姞妫�楠屽�煎垪
+		clickAddInspectionColumn() {
+			this.empiricalValueAdd = this.empiricalValueAdd + 1;
 		}
 	}
+}
 </script>
 
 <style></style>
\ No newline at end of file
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 5cfeb6c..fe4b199 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -102,7 +102,8 @@
 					<template slot-scope="scope">
 						<!-- <el-input v-if="detailId == null" v-model="scope.row.name" placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input> -->
 						<el-autocomplete v-if="detailId == null" class="inline-input" v-model="scope.row.name"
-							:fetch-suggestions="querySearch" placeholder="璇疯緭鍏ラ」鐩悕绉�" @select="handleSelect(scope.row)" @blur="handleSelect(scope.row)"></el-autocomplete>
+							:fetch-suggestions="querySearch" placeholder="璇疯緭鍏ラ」鐩悕绉�" @select="handleSelect(scope.row)"
+							@blur="handleSelect(scope.row)"></el-autocomplete>
 						<el-input v-else v-model="scope.row.rpName" disabled></el-input>
 					</template>
 				</el-table-column>
@@ -181,7 +182,7 @@
 				</el-table-column>
 				<el-table-column v-if="detailId !== null" label="鎿嶄綔" width="120">
 					<template>
-						<el-button type="text" size="small" @click.once="submitSave">涓婃姤</el-button>
+						<el-button type="text" size="small" @click="submitSave">涓婃姤</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -301,10 +302,10 @@
 				this.detailInfo.number = this.ifsInfo.number
 				this.detailInfo.specifications = this.ifsInfo.specifications
 				this.restaurants = JSON.parse(JSON.stringify(this.ifsInfo.rawInsProducts))
-				this.restaurants.forEach(item=>{
-					this.$set(item,"value",item.name)
+				this.restaurants.forEach(item => {
+					this.$set(item, "value", item.name)
 				})
-				console.log("restaurants",this.restaurants);
+				console.log("restaurants", this.restaurants);
 			})
 		},
 		querySearch(queryString, cb) {
@@ -319,13 +320,13 @@
 			};
 		},
 		handleSelect(row) {
-			let select=this.restaurants.filter(item=>{
-				return item.name===row.name
+			let select = this.restaurants.filter(item => {
+				return item.name === row.name
 			})[0]
-			if(select!=undefined){
-				this.$set(row,"internal",select.internal)
-				this.$set(row,"required",select.required)
-				this.$set(row,"unit",select.unit)
+			if (select != undefined) {
+				this.$set(row, "internal", select.internal)
+				this.$set(row, "required", select.required)
+				this.$set(row, "unit", select.unit)
 				//妫�楠屽��
 			}
 		},
@@ -438,14 +439,39 @@
 				this.getDetailInfo(); //閲嶆柊鍒锋柊淇℃伅鏁版嵁
 			}
 		},
-		async submitSave() {
-			const res = await this.$axios.post(
+		 submitSave() {
+			let pro = this.projectTable.filter(item => {
+				return item.testState === 0;
+			})
+			if (pro.length > 0) {
+				this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
+					confirmButtonText: '纭畾',
+					cancelButtonText: '鍙栨秷',
+					inputPattern: /^\d+$/,
+					inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
+				}).then(({ value }) => {
+					this.$axios.post(
+						this.$api.url.updateRawInspectsById+`${this.detailId}`, {"number": value }
+					).then(res => {
+						this.$message.success("鎻愪氦鎴愬姛");
+						this.getDetailInfo();
+						this.goBack()
+					});
+				}).catch(() => {
+					this.$message({
+						type: 'info',
+						message: '鍙栨秷杈撳叆'
+					});
+				});
+			}else{
+			 this.$axios.post(
 				this.$api.url.updateRawInspectsById + `${this.detailId}`
 			).then(res => {
 				this.$message.success("鎻愪氦鎴愬姛");
 				this.getDetailInfo();
 				this.goBack()
 			});
+			}
 		},
 		// 鑾峰彇璁惧鏍戝唴瀹�
 		getOptions() {
diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index e4c28ad..72e2de9 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -157,7 +157,7 @@
 				</el-table-column>
 				<el-table-column label="璁㈠崟绫诲瀷" width="100">
 					<template slot-scope="scope">
-						<el-tag effect="dark" size="mini" style="font-size: 8px;">{{scope.row.order_type}}</el-tag>
+						<el-tag effect="dark" size="mini" style="font-size: 8px;">{{ scope.row.order_type }}</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column prop="code" label="鍚堝悓缂栧彿" width="220">
@@ -174,12 +174,13 @@
 					<template slot-scope="scope">
 						<span style="color: #34BD66;" v-if="scope.row.type == 1">閫氳繃</span>
 						<span style="color: #E84738;" v-else-if="scope.row.type == 0">涓嶉�氳繃</span>
-						<span v-else>{{null}}</span>
+						<span v-else>{{ null }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="鎿嶄綔" width="220">
 					<template slot-scope="scope">
 						<span class="table_do" @click="changeShowDetail(scope.row)">&nbsp;鏌ョ湅璇︽儏&nbsp;</span>
+						<span class="table_do" @click="downloadFile(scope.row)">&nbsp;涓嬭浇闄勪欢&nbsp;</span>
 						<span class="table_do" v-if="scope.row.type == 2" @click="saleCheck(scope)">&nbsp;瀹℃牳&nbsp;</span>
 						<span class="table_do" v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
 						<span class="table_do" v-if="scope.row.type == 2"
@@ -450,6 +451,29 @@
 		this.selectRawInspectsList()
 	},
 	methods: {
+		downloadFile(row) {
+			let baseIp = "http://192.168.18.16:9999"
+			this.axios.post(this.$api.url.saleDownload, {
+				id: row.id
+			}).then(res => {
+				// console.log(res.data);
+				// 寰幆閬嶅巻姣忎釜鏂囦欢骞跺垱寤轰笅杞介摼鎺�
+				for (let index = 0; index < res.data.length; index++) {
+					const element = res.data[index];
+					// 鍒涘缓涓�涓摼鎺ュ厓绱�
+					var a = document.createElement('a');
+
+					// 璁剧疆閾炬帴鍏冪礌鐨刪ref灞炴�т负鏂囦欢鐨刄RL
+					a.href = baseIp+element;
+
+					// // 璁剧疆閾炬帴鍏冪礌鐨刣ownload灞炴�т负鏂囦欢鍚�
+					// a.download = row.name+"闄勪欢"+(index+1);
+
+					// 妯℃嫙鐐瑰嚮閾炬帴浠ヨЕ鍙戜笅杞�
+					a.click();
+				}
+			})
+		},
 		closeDialog() {
 			this.addData = {
 				orderNumber: null,
@@ -485,7 +509,7 @@
 					message: '鍚屾鍋囨垚鍔�(鈼曖礂鈼�)锛�',
 					type: 'success'
 				});
-				this.isSync=false
+				this.isSync = false
 			}, 2000);
 			return
 			//璋冪敤鍚屾鎺ュ彛

--
Gitblit v1.9.3