|
|
@@ -392,8 +392,8 @@
|
|
|
<el-col :span="12">
|
|
|
<el-row>
|
|
|
<el-col :span="13">
|
|
|
- <el-form-item label="抽样数量" prop="sample_renum" class="labelItem" size="mini">
|
|
|
- <el-input disabled v-model="formjc.sample_renum"></el-input>
|
|
|
+ <el-form-item label="抽样数量" prop="sample_num" class="labelItem" size="mini">
|
|
|
+ <el-input disabled v-model="formjc.sample_num"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
|
@@ -428,30 +428,29 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- <el-col :span="7"
|
|
|
- style="text-align: center;vertical-align: middle;line-height: 250px;font-size: 14px;">
|
|
|
+ <el-col :span="7" style="text-align: center;vertical-align: middle;line-height: 250px;font-size: 14px;">
|
|
|
<div class="">
|
|
|
受检单位情况
|
|
|
</div>
|
|
|
</el-col>
|
|
|
<el-col :span="15">
|
|
|
- <el-form-item label="单位名称" prop="units_name" class="labelItem" style="" size="mini">
|
|
|
- <el-input disabled v-model="formjc.units_name"></el-input>
|
|
|
+ <el-form-item label="单位名称" prop="unitTest.unit_test_name" class="labelItem" style="" size="mini">
|
|
|
+ <el-input disabled v-model="unitTest.unit_test_name"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="通讯地址" prop="address" class="labelItem" style="" size="mini">
|
|
|
- <el-input disabled v-model="formjc.address"></el-input>
|
|
|
+ <el-form-item label="通讯地址" prop="unitTest.address" class="labelItem" style="" size="mini">
|
|
|
+ <el-input disabled v-model="unitTest.address"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="法定代表人" prop="corporation" class="labelItem" style="" size="mini">
|
|
|
- <el-input disabled v-model="formjc.corporation"></el-input>
|
|
|
+ <el-form-item label="法定代表人" prop="unitTest.represent_name" class="labelItem" style="" size="mini">
|
|
|
+ <el-input disabled v-model="unitTest.represent_name"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="受检人" prop="user_name" class="labelItem" style="" size="mini">
|
|
|
- <el-input disabled v-model="formjc.user_name"></el-input>
|
|
|
+ <el-form-item label="受检人" prop="unitTest.user_name" class="labelItem" style="" size="mini">
|
|
|
+ <el-input disabled v-model="unitTest.user_name"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="电话" prop="phone" class="labelItem" style="" size="mini">
|
|
|
- <el-input disabled v-model="formjc.phone"></el-input>
|
|
|
+ <el-form-item label="电话" prop="unitTest.phone" class="labelItem" style="" size="mini">
|
|
|
+ <el-input disabled v-model="unitTest.phone"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="传真" prop="fax" class="labelItem" style="" size="mini">
|
|
|
- <el-input disabled v-model="formjc.fax"></el-input>
|
|
|
+ <el-form-item label="传真" prop="unitTest.fax" class="labelItem" style="" size="mini">
|
|
|
+ <el-input disabled v-model="unitTest.fax"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -495,6 +494,7 @@
|
|
|
Authorization: 'bearer' + token
|
|
|
},
|
|
|
formjc: {},
|
|
|
+ unitTest: {},
|
|
|
dialogVisible2: false,
|
|
|
getSampleListDialog: false,
|
|
|
checkTestList: false,
|
|
|
@@ -505,6 +505,8 @@
|
|
|
readForm: {
|
|
|
|
|
|
},
|
|
|
+ sample_name: '',
|
|
|
+ sample_id: '',
|
|
|
sampleTask: [],
|
|
|
underTask: [],
|
|
|
unitTaskTotal: '0',
|
|
|
@@ -872,19 +874,23 @@
|
|
|
var that = this
|
|
|
that.dialogVisible2 = true
|
|
|
// async getSampleDetail() {
|
|
|
- const result = await this.$http.post('getSampleDetail', {
|
|
|
- sample_id: sample_id
|
|
|
- })
|
|
|
- if (result.data.code == 0) {
|
|
|
- that.formjc = result.data.data
|
|
|
- }
|
|
|
- console.log(that.formjc)
|
|
|
+ // const result = await this.$http.post('getSampleDetail', {
|
|
|
+ // sample_id: sample_id
|
|
|
+ // })
|
|
|
+ // if (result.data.code == 0) {
|
|
|
+ // that.formjc = result.data.data
|
|
|
+ // }
|
|
|
+ // console.log(that.formjc)
|
|
|
const res = await this.$http.post('getTestValue', {
|
|
|
sample_id: sample_id
|
|
|
})
|
|
|
+ console.log()
|
|
|
if (res.data.code == 0) {
|
|
|
+ that.formjc = res.data.data.result
|
|
|
+ that.unitTest = res.data.data.result.unitTest
|
|
|
that.resultjc = res.data.data.result_detail
|
|
|
}
|
|
|
+ console.log(that.formjc)
|
|
|
console.log(that.resultjc)
|
|
|
// },
|
|
|
|
jiangyu