|
@@ -79,7 +79,8 @@
|
|
|
<template slot="label">
|
|
|
检测对象
|
|
|
</template>
|
|
|
- <span v-for="item in readForm.product">{{item.product_name}}、</span>
|
|
|
+ {{productNameText}}
|
|
|
+ <!-- <span v-for="item in readForm.product">{{item.product_name}}、</span> -->
|
|
|
</el-descriptions-item>
|
|
|
</el-descriptions>
|
|
|
<el-descriptions class="margin-top" :size="size" border>
|
|
@@ -87,7 +88,8 @@
|
|
|
<template slot="label">
|
|
|
检测项
|
|
|
</template>
|
|
|
- <span v-for="item in readForm.pesticides">{{item.test_name}}、</span>
|
|
|
+ {{pesticidesNameText}}
|
|
|
+ <!-- <span v-for="item in readForm.pesticides">{{item.test_name}}、</span> -->
|
|
|
</el-descriptions-item>
|
|
|
</el-descriptions>
|
|
|
<el-table :data="underTask" border stripe highlight-current-row style="width: 100%"
|
|
@@ -416,8 +418,10 @@
|
|
|
:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
+ <div style="margin-top: 10px; text-align: center">
|
|
|
<el-button @click="dialogVisible2 = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="download">生成检测报告pdf</el-button>
|
|
|
+ </div>
|
|
|
<!-- </span> -->
|
|
|
</el-dialog>
|
|
|
|
|
@@ -450,6 +454,8 @@
|
|
|
dialogVisible2: false,
|
|
|
activeName: 'first',
|
|
|
id: 0,
|
|
|
+ productNameText: '',
|
|
|
+ pesticidesNameText: '',
|
|
|
readForm: {},
|
|
|
underTask: [],
|
|
|
underTasktotal: '0',
|
|
@@ -668,6 +674,8 @@
|
|
|
}
|
|
|
}
|
|
|
that.readForm = res.data
|
|
|
+ that.productNameText = that.readForm.product.map(el => el.product_name).join('、 ')
|
|
|
+ that.pesticidesNameText = that.readForm.pesticides.map(el => el.test_name).join('、 ')
|
|
|
// 抽检不分离
|
|
|
if (that.readForm.is_divide == 0) {
|
|
|
this.sampleShow = true
|
|
@@ -814,8 +822,15 @@
|
|
|
})
|
|
|
},
|
|
|
// 返回
|
|
|
+ // 返回
|
|
|
back() {
|
|
|
-
|
|
|
+ var that = this
|
|
|
+ this.$router.push({
|
|
|
+ name: 'setTaskcd',
|
|
|
+ params: {
|
|
|
+ id: that.id
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
// 上传抽样信息
|
|
|
async appear() {
|