检测列表再次获取

src/components/jc/inputSample.vue

@@ -5,6 +5,7 @@
 		<!-- <div slot="header" class="clearfix"> -->
 		<el-breadcrumb separator-class="el-icon-arrow-right">
 			<el-breadcrumb-item>首页</el-breadcrumb-item>
+			<!-- <el-breadcrumb-item :to="{ path: '/jc/setTaskcd'}">例行检测</el-breadcrumb-item> -->
 			<!-- <el-breadcrumb-item>承担单位</el-breadcrumb-item>
 			<el-breadcrumb-item :to="{ path: '/jc/routineMonitor' }">例行检测</el-breadcrumb-item>
 			<el-breadcrumb-item>执行任务</el-breadcrumb-item>
@@ -22,7 +23,7 @@
 				<el-option v-for="item in sampleList"
 				:key="item.product_id" 
 				:label="item.product_name"
-				:value="item.product_name">
+				:value="item.product_id">
 				</el-option>
 		</el-select>
 		<!-- </el-col> -->
@@ -175,7 +176,7 @@
 			</el-descriptions-item>
 			<el-descriptions-item  label="被抽检单位签字盖章附件" prop="cyd_data.file_url" class="labelItem" style="" size="mini">
 								<el-upload class="upload-demo" :file-list="fileList" drag :headers="myHeaders"
-									action="http://new.syjc.com/api/v1/ossUpload" :on-success="uploadSuccess" :limit="1">
+									action="http://syjcapi.aielab.net/api/v1/ossUpload" :on-success="uploadSuccess" :limit="1">
 									<i class="el-icon-upload"></i>
 									<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
 								</el-upload>
@@ -184,7 +185,7 @@
 <!-- 底部按钮 -->
 		<el-form>
 				<el-form-item class="btn">
-					<el-button type="primary" @click="back">返回抽样列表</el-button>
+					<el-button type="primary" @click="back()">返回抽样列表</el-button>
 					<el-button @click="resetForm()">重置</el-button>
 					<el-button @click="onSubmit">保存，继续添加</el-button>
 				</el-form-item>
@@ -234,7 +235,7 @@
 			this.task_id = this.$route.params.task_id
 			this.undertake_id = this.$route.params.under_id
 			console.log(this.task_id)
-			console.log(this.under_id)
+			console.log(this.undertake_id)
 			this.getTestObj()
 		},
 		methods: {
@@ -246,7 +247,7 @@
 					undertake_id: this.undertake_id
 				})
 				if (result.data.code == 0) {
-					this.sampleList = result.data.data
+					this.sampleList = result.data.data.list
 				}
 			},
 			// 生成样品编码
@@ -311,10 +312,11 @@
 			// 返回
 			back() {
 				var that = this
+				console.log(that.task_id)
 				this.$router.push({
 					name: 'setTaskcd',
 					params: {
-						task_id: that.task_id
+						id: that.task_id
 					}
 				})
 			}

src/components/jc/sampleDetail.vue

@@ -69,8 +69,8 @@
 	<el-descriptions :column="1" border style="" >
 		<el-descriptions-item label="受检单位情况" >
 			<el-descriptions  :column="1" border  size="mini" style="width:100%">
-				<el-descriptions-item label="*单位名称" prop="unit_test.unit_name" class="labelItem" size="mini" required>
-									<el-input v-model="unit_test.unit_name" disabled></el-input>
+				<el-descriptions-item label="*单位名称" prop="unit_test.unit_test_name" class="labelItem" size="mini" required>
+									<el-input v-model="unit_test.unit_test_name" disabled></el-input>
 				</el-descriptions-item>
 				<el-descriptions-item label="*通讯地址" prop="unit_test.address" class="labelItem" size="mini" required>
 									<el-input v-model="unit_test.address" disabled></el-input>
@@ -94,8 +94,8 @@
 		<el-descriptions :column="1" border style="" >
 			<el-descriptions-item label="生产单位情况"  >
 				<el-descriptions  :column="1" border size="mini" style="width:100%" >
-			<el-descriptions-item label="*单位名称" prop="unit_production.production_name" class="labelItem" style="" size="mini" required>
-				<el-input v-model="unit_production.production_name" disabled></el-input>
+			<el-descriptions-item label="*单位名称" prop="unit_production.unit_production_name" class="labelItem" style="" size="mini" required>
+				<el-input v-model="unit_production.unit_production_name" disabled></el-input>
 			</el-descriptions-item>
 			<el-descriptions-item label="*通讯地址" prop="unit_production.address" class="labelItem" style="" size="mini" required>
 				<el-input v-model="unit_production.address" disabled></el-input>
@@ -125,8 +125,8 @@
 		<el-descriptions :column="1" border style="" >
 			<el-descriptions-item label="抽样单位情况" >
 				<el-descriptions  :column="1" border size="mini" style="width:100%">
-			<el-descriptions-item label="*单位名称" prop="unit_sample.unit_name" class="labelItem" style="" size="mini" required>
-									<el-input v-model="unit_sample.unit_name" disabled></el-input>
+			<el-descriptions-item label="*单位名称" prop="unit_sample.unit_sample_name" class="labelItem" style="" size="mini" required>
+									<el-input v-model="unit_sample.unit_sample_name" disabled></el-input>
 			</el-descriptions-item>
 			<el-descriptions-item label="*联系人" prop="unit_sample.unit_user" class="labelItem" style="" size="mini" required>
 									<el-input v-model="unit_sample.unit_user" disabled></el-input>

src/components/jc/setTaskcd.vue

@@ -28,7 +28,7 @@
 			<el-tab-pane label="任务详情" name="first">
 				<el-descriptions class="margin-top" title=" " :column="2" :size="size" border>
 					<el-descriptions-item>
-						<template slot="label" prop="releaser">
+						<template slot="label">
 							发布单位
 						</template>
 						{{readForm.releaserInfo.rymc}}
@@ -43,7 +43,7 @@
 						<template slot="label">
 							开始时间和结束时间
 						</template>
-						{{readForm.taskInfo.starttime}}-{{readForm.taskInfo.endtime}}
+						{{readForm.taskInfo.starttime}}至{{readForm.taskInfo.endtime}}
 					</el-descriptions-item>
 					<el-descriptions-item>
 						<template slot="label">
@@ -503,7 +503,11 @@
 				productNameText: '',
 				pesticidesNameText: '',
 				readForm: {
-					
+					modelInfo: [],
+					model_type: '',
+					pesticides: [],
+					releaserInfo: [],
+					taskInfo: []
 				},
 				sample_name: '',
 				sample_id: '',
@@ -526,7 +530,7 @@
 				underInfo:{
 					pageNum: 1,
 					pageSize: 10,
-					
+					underTake_id: ''
 				},
 				releaserInfo:{
 						groupname: '',
@@ -619,7 +623,7 @@
 						width: 180
 					}, {
 						label: '判定结果',
-						prop: 'test_result',
+						prop: 'testResult',
 						width: 100
 					}, {
 						label: '状态',
@@ -898,6 +902,7 @@
 			//保存检测单
 			async saveJcdItem() {
 				console.log(this.testPesticides)
+				console.log(this.underInfo)
 				for (let i = 0; i < this.testPesticides.length; i++) {
 					this.testPesticides[i]['unit'] = 'mg/kg'
 					console.log(this.testPesticides[i]['state_value'])
@@ -927,7 +932,7 @@
 						message: '检测成功!'
 					});
 					that.inputCheckShow = false
-					that.getJcdList()//需要undertake_id
+					that.getJcdList(this.underInfo.underTake_id)
 				} else {
 					this.$message({
 						type: 'error',
@@ -993,6 +998,17 @@
 				console.log(res.data)
 			
 				this.tableData1 = res.data.rows
+				for (let i = 0; i < this.tableData1.length; i++) {
+					if (this.tableData1[i].test_result == '0') {
+						this.tableData1[i].testResult = '不合格'
+					} else if (this.tableData1[i].test_result == '1') {
+						this.tableData1[i].testResult = '合格'
+					}else {
+						this.tableData1[i].testResult = '未检测'
+					}
+				console.log(this.tableData1)
+				this.testListTotal = res.data.total
+				}
 				for (let i = 0; i < this.tableData1.length; i++) {
 					if (this.tableData1[i].test_status == '0') {
 						this.tableData1[i].testStatus = '未上报'