tx-lims-before.git

			@@ -9,10 +9,10 @@
			<title>LIMS实验室管理系统</title>
			<link rel="icon" type="image/x-icon" href="./static/img/logo.png">

			<link href="./static/luckysheet/plugins/css/pluginsCss.css" rel="stylesheet" />
			<link href="./static/luckysheet/plugins/plugins.css" rel="stylesheet" />
			<link href="./static/luckysheet/css/luckysheet.css" rel="stylesheet" />
			<link href="./static/luckysheet/assets/iconfont/iconfont.css" rel="stylesheet" />
			<link href="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/css/pluginsCss.css" rel="stylesheet" />
			<link href="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/plugins.css" rel="stylesheet" />
			<link href="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/css/luckysheet.css" rel="stylesheet" />
			<link href="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/assets/iconfont/iconfont.css" rel="stylesheet" />
			<style>
			#app{
			overflow: hidden;
			@@ -26,7 +26,7 @@
			<body>
			<div id="app"></div>
			<script type='text/javascript' src='http://10.16.173.59:81/web-apps/apps/api/documents/api.js'></script>
			</body>
			<script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/js/plugin.js"></script>
			<script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/luckysheet.umd.js"></script>
			</body>
			</html>

			@@ -524,14 +524,14 @@
			prop="resValue"
			label="衰减差"
			align="center"
			v-if="wareForm.inspectionItemSubclass!=20"
			v-if="wareForm.inspectionItemSubclass!='20(常温)'"
			min-width="150">
			</el-table-column>
			<el-table-column
			prop="insResult"
			label="结论"
			align="center"
			min-width="150" v-if="wareForm.inspectionItemSubclass!=20">
			min-width="150" v-if="wareForm.inspectionItemSubclass!='20(常温)'">
			<template slot-scope="scope">
			<span v-if="scope.row.insResult===1" style="color: green;">合格</span>
			<span v-else-if="scope.row.insResult===0" style="color: red;">不合格</span>
			@@ -793,7 +793,7 @@
			currentTab:null,
			wareForm:{
			inspectionItem:1,
			inspectionItemSubclass:20,
			inspectionItemSubclass:'20(常温)',
			},
			wareForm0:{},
			numOptions:[],
			@@ -977,7 +977,7 @@
			v:row.comValue
			}
			}]
			if(this.wareForm.inspectionItemSubclass!=20){
			if(this.wareForm.inspectionItemSubclass!='20(常温)'){
			row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(3):''
			this.param[row.id].resValue.v.v = row.resValue
			if(row.ask&&row.resValue){
			@@ -1008,7 +1008,12 @@
			this.wareForm[type] = Number(m)
			}
			let wareForm = {...this.wareForm}
			wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'℃'
			if(this.wareForm.inspectionItemSubclass=='20(常温)'){
			wareForm.inspectionItemSubclass ='20℃(常温)'
			console.log(wareForm)
			}else{
			wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'℃'
			}
			this.wareTableDataLoading = true
			this.$axios.post(this.$api.insOrderPlan.temCycle,{
			sampleId:this.currentSample.id,
			@@ -1398,7 +1403,7 @@
			this.temperatureOptions = []
			mySet1.forEach(m => {
			this.temperatureOptions.push({
			value:m,
			value:String(m),
			label:m
			})
			})
			@@ -1769,7 +1774,6 @@
			value: 0,
			})
			})
			console.log(comValue)
			for (var a in comValue) {
			valueList.forEach(b => {
			if (b.name == a) {

	index.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/do/b1-inspect-order-plan/Inspection.vue	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史