tx-lims-before.git

			@@ -926,7 +926,8 @@
			inspectionItemSubclass:null,
			methodS:null,
			circulateShow:false,
			circulateForm:{}
			circulateForm:{},
			isBsm2Val2:false
			}
			},
			watch: {
			@@ -1378,7 +1379,8 @@
			this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
			state,
			id: this.currentId,
			companyId:this.addObj.companyId
			companyId:this.addObj.companyId,
			laboratory:this.addObj.laboratory
			}, {
			headers: {
			'Content-Type': 'application/json'
			@@ -1649,13 +1651,13 @@
			} else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
			row.bsm1 = false
			}
			if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && row.state === 1) {
			if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
			this.bsm2 = true
			this.bsm1Dia = true
			if (this.bsm2Val2.length === 0) {
			this.bsm2Val = (this.sampleList.length - 1) * this.sampleList.length / 2
			this.computationalPairing(this.sampleList.length)
			this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
			this.bsm2 = true
			this.bsm1Dia = true
			}
			} else if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && row.state === 1 && this.sampleList.length > 1) {
			this.bsm2 = false
			@@ -1936,7 +1938,7 @@
			} else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
			p.bsm1 = false
			}
			if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && p.state === 1) {
			if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && p.state === 1&&!this.isBsm2Val2) {
			this.bsm2 = true
			this.bsm1Dia = true
			if (this.bsm2Val2.length === 0) {
			@@ -2189,6 +2191,7 @@
			return
			}
			}
			this.isBsm2Val2 = true;
			}
			// if(this.bsm3){
			// if(!this.bsm3Val){