11

src/components/jc/fillSampleReport.vue

@@ -20,26 +20,26 @@
 		</div>
 		<!-- 受检单位信息 -->
 		<div id="sjinformation" style="margin:40px auto; width:60%" v-show="active == 1">
-			<el-form>
-				<el-form-item label="单位名称:" prop="inspected_name" class="labelItem" required show-message="false" inline-message="true">
+			<el-form :rules="rules" :model="inspected_Unit">
+				<el-form-item label="单位名称:" prop="inspected_name" class="labelItem">
 					<el-input v-model="inspected_Unit.inspected_name" style="width:42%"></el-input>
 				</el-form-item>
-				<el-form-item label="单位地址:" prop="inspected_address" class="labelItem" required>
+				<el-form-item label="单位地址:" prop="inspected_address" class="labelItem">
 					<el-row>
 					<el-col :span="10" style="margin-right:10px;">	
 						<!-- <el-cascader placeholder="请选择地区" :options="region" v- model="selectedOptions" @change="handleChange" :props="{ expandTrigger: 'hover' }" style="width:100%">
 						</el-cascader> -->
 					</el-col>
 					<el-col :span="10">
-						<el-input v-model="inspected_Unit.address2" placeholder="请输入详细地址" style="width:100%"></el-input>
+						<el-input v-model="inspected_Unit.inspected_address" placeholder="请输入详细地址" style="width:100%"></el-input>
 					</el-col>
 					</el-row>
 				</el-form-item>
 				
-				<el-form-item label="联系人:" prop="contact_name" class="labelItem" required>
+				<el-form-item label="联系人:" prop="contact_name" class="labelItem">
 					<el-input v-model="inspected_Unit.contact_name" style="width:42%"></el-input>
 				</el-form-item>
-				<el-form-item label="联系电话:" prop="contact_phone" class="labelItem" required>
+				<el-form-item label="联系电话:" prop="contact_phone" class="labelItem">
 					<el-input v-model="inspected_Unit.contact_phone" style="width:42%"></el-input>
 				</el-form-item>
 				<el-form-item label="Email:" prop="contact_email" class="labelItem">
@@ -83,22 +83,30 @@
 
 		</div>
 		<div id="sjinformation" style="margin:40px auto; width:60%" v-show="active == 3">
-			<el-form>
-				<el-form-item label="抽样单编号:" prop="cyd_code" class="labelItem" required>
-					<el-input v-model="cyd_code" style="width:40%"></el-input>
+			<el-form :rules="rules2" :model="sample_unit">
+				<el-form-item label="抽样单编号:" prop="cyd_code" class="labelItem">
+					<el-input v-model="sample_unit.cyd_code" style="width:40%"></el-input>
 				</el-form-item>
-			</el-form>
-			<el-form>
-				<el-form-item label="备注:" prop="cyd_log" class="labelItem" required>
+				<el-form-item label="抽样人员1:" prop="sample_person_one" class="labelItem">
+					<el-input v-model="sample_unit.sample_person_one" style="width:40%"></el-input>
+				</el-form-item>
+				<el-form-item label="抽样人员2:" prop="sample_person_two" class="labelItem">
+					<el-input v-model="sample_unit.sample_person_two" style="width:40%"></el-input>
+				</el-form-item>
+				<el-form-item label="抽样单日期:" prop="cyd_date" class="labelItem">
+					<el-date-picker v-model="sample_unit.cyd_date" style="width: 42%;" align="right" type="date"
+						:picker-options="pickerOptions" clearable />
+				</el-form-item>
+				<el-form-item label="备注:" prop="cyd_log" class="labelItem">
 					<el-input v-model="sample_unit.cyd_log" style="width:40%"></el-input>
 				</el-form-item>
 			</el-form>
 			<el-form>
-				<el-form-item label="抽样单报告上传:" prop="releaser" class="labelItem" required>
+				<el-form-item label="抽样单报告上传:" prop="releaser" class="labelItem">
 					<el-upload
 						class="upload-demo"
 						:headers="myHeaders"
-						action="http://syjcapi.aielab.net/api/v1/ossUpload"
+						action='http://new.syjc.com/api/v1'
 						:on-preview="handlePreview"
 						:on-remove="handleRemove"
 						:before-remove="beforeRemove"
@@ -109,11 +117,6 @@
 						<el-button size="small" type="primary">点击上传</el-button>
 						<div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
 					</el-upload>
-					<!-- <el-upload class="upload-demo" :file-list="fileList" drag :headers="myHeaders"
-						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> -->
 				</el-form-item>
 			</el-form>
 						<div class="footer">
@@ -127,21 +130,22 @@
 
 		<!-- 新增样品信息弹框 -->
 		<el-dialog title="新增样品信息" :visible.sync="addSampleInforDialog" width="50%" :close-on-click-modal="false" class="dialogItem" append-to-body>
-		<el-form id="addSample">
-				<el-form-item label="样品名称:" prop="sample_name" class="labelItem" required show-message="false">
+		<el-form id="addSample" :rules="rules1" :model="product_Unit">
+				<el-form-item label="样品名称:" prop="sample_name" class="labelItem">
 					<el-input v-model="product_Unit.sample_name" style="width:42%"></el-input>
 				</el-form-item>
 				<!-- <el-form-item label="样品编号:" prop="releaser" class="labelItem" required>
 					<el-input v-model="" style="width:42%"></el-input>
 				</el-form-item> -->
-				<el-form-item label="样品商标:" prop="sample_brand" class="labelItem" required>
+				<el-form-item label="样品商标:" prop="sample_brand" class="labelItem">
 					<el-input v-model="product_Unit.sample_brand" style="width:42%"></el-input>
 				</el-form-item>
-				<el-form-item label="规格型号:" prop="sample_type" class="labelItem" required>
+				<el-form-item label="规格型号:" prop="sample_type" class="labelItem">
 					<el-input v-model="product_Unit.sample_type" style="width:42%"></el-input>
 				</el-form-item>
 				<el-form-item label="生产日期:" prop="sample_md_date" class="labelItem">
-					<el-input v-model="product_Unit.sample_md_date" style="width:42%"></el-input>
+					<el-date-picker v-model="product_Unit.sample_md_date" style="width: 42%;" align="right" type="date"
+						:picker-options="pickerOptions" clearable />
 				</el-form-item>
 				<el-form-item label="质量等级:" prop="sample_quality_grade" class="labelItem">
 					<el-input v-model="product_Unit.sample_quality_grade" style="width:42%"></el-input>
@@ -211,6 +215,32 @@
 				rowStyle: {
 					height: 35 + 'px'
 				},
+
+				rules: {
+                	inspected_name: [{required: true, message: '请输入单位名称', trigger: 'blur'},],
+					inspected_address: [{required: true, message: '请输入单位地址', trigger: 'blur'},],
+					contact_name: [{required: true, message: '请输入联系人', trigger: 'blur'},],
+					contact_phone: [{required: true, message: '请输入联系电话', trigger: 'blur'},]
+						},
+				rules1: {
+                	sample_name: [{required: true, message: '请输入样品名称', trigger: 'blur'},],
+					sample_brand: [{required: true, message: '请输入样品商标', trigger: 'blur'},],
+					sample_type: [{required: true, message: '请输入规格型号', trigger: 'blur'},],
+					sample_md_date: [{required: true, message: '请输入生产日期', trigger: 'blur'},],
+					sample_quality_grade: [{required: true, message: '请输入质量等级', trigger: 'blur'},],
+					sample_product_name: [{required: true, message: '请输入标称生产者名称', trigger: 'blur'},],
+					sample_product_phone: [{required: true, message: '请输入标称生产者联系电话', trigger: 'blur'},],
+					sample_source: [{required: true, message: '请输入样品来源', trigger: 'blur'},],
+					sample_count: [{required: true, message: '请输入抽样数量', trigger: 'blur'},],
+					sample_base: [{required: true, message: '请输入抽样基数', trigger: 'blur'},],
+					sample_ing_date: [{required: true, message: '请输入抽样时间', trigger: 'blur'},],
+						},
+				rules2: {
+                	cyd_code: [{required: true, message: '请输入抽样单编号', trigger: 'blur'},],
+					sample_person_one: [{required: true, message: '请输入抽样人员姓名', trigger: 'blur'},],
+					sample_person_two: [{required: true, message: '请输入抽样人员姓名', trigger: 'blur'},],
+					cyd_date: [{required: true, message: '请输入抽样单日期', trigger: 'blur'},],
+						},
 				tableHeader: [{
 						label: '样品名称',
 						prop: 'sample_name'
@@ -261,11 +291,34 @@
 				cyd_id: '',
 				cyd_code: '',//抽验单编号
 				cyd_data: {},//抽样单信息上部分
-				inspected_Unit: {},//受检单位信息
-				product_Unit: {},//样品信息
-				unit_production: {},//生产单位信息
-				unit_sample: {},//抽样单位信息
-				sample_unit: {},//填报抽样单最后一步
+				inspected_Unit: {
+					inspected_name: '',
+					inspected_address: '',
+					contact_name: '',
+					contact_phone: '',
+					contact_email: ''
+				},//受检单位信息
+				product_Unit: {
+					sample_name: '',
+					sample_brand: '',
+					sample_type: '',
+					sample_md_date: '',
+					sample_quality_grade: '',
+					sample_product_name: '',
+					sample_product_phone: '',
+					sample_source: '',
+					sample_count: '',
+					sample_base: '',
+					sample_ing_date: '',
+					sample_log: ''
+				},//样品信息
+				sample_unit: {
+					cyd_code: '',
+					sample_person_one: '',
+					sample_person_two: '',
+					cyd_date: '',
+					cyd_log: ''
+				},//填报抽样单最后一步
 				units: [],
 				production: [],
 				// 样品下拉框
@@ -440,7 +493,7 @@
 				const res = await this.$http.post('postCydProfile',that.sample_unit)
 				const result = await this.$http.post('postCyd',{
 					cyd_id: that.cyd_id,
-					cyd_code: that.cyd_code})
+					cyd_code: that.sample_unit.cyd_code})
 				console.log(result)
 				console.log(res)
 				this.$router.push({
@@ -572,6 +625,15 @@
 		.el-form-item__label{
 			width: 14%;
 		}
+		.el-form-item__error{
+		left:135px;
+	}
+		.el-upload__tip{
+			margin-left: 8.125rem;
+		}
+		.el-upload-list__item-name{
+			margin-left: 7.8125rem
+		}
 	}
 	.footer {
 		margin-left: 45%;
@@ -581,5 +643,8 @@
 		.el-form-item__label{
 			width: 17%;
 		}
+		.el-form-item__error{
+		left:155px;
+	}
 	}
 </style>

src/components/jc/routineMonitor.vue

@@ -65,6 +65,7 @@
 					align="center" :width="table.width" :fixed="table.fixed" />
 				<el-table-column prop="ispublic" label="任务状态" align="center">
 					<template slot-scope="scope">
+						<el-tag type="danger" v-if="scope.row.ispublic==1">已发布</el-tag>
 						<el-tag type="danger" v-if="scope.row.ispublic==2">废止</el-tag>
 						<el-tag type="info" v-if="scope.row.ispublic==3">已结束，未完成</el-tag>
 						<el-tag type="success" v-if="scope.row.ispublic==4">已结束，已完成</el-tag>
@@ -80,7 +81,8 @@
 				</el-table-column>
 				<el-table-column prop="file_url" label="附件" width="80" align="center">
 					<template slot-scope="scope">
-						<el-link type="primary" :href="scope.row.file_url">下载</el-link>
+						<span v-if="scope.row.file_url == null">--</span>
+						<el-link v-else type="primary" :href="scope.row.file_url">下载</el-link>
 					</template>
 				</el-table-column>
 				<el-table-column label="操作" align="center" fixed="right">
@@ -180,11 +182,11 @@ const HeadersList = [{
 						prop: 'releaser',
 
 					},
-					{
-						label: '创建时间',
-						prop: 'createtime',
-						// width: 180
-					},
+					// {
+					// 	label: '创建时间',
+					// 	prop: 'create_time',
+					// 	// width: 180
+					// },
 
 				],
 				total:'',

src/components/jc/sampleReport.vue

@@ -17,9 +17,9 @@
 	  江苏省苏州市吴中区吴中大道 1188 号
 	</el-descriptions-item> -->
 	<div id="sampleReport">
-<el-descriptions  title="农产品质量安全抽样单" :column="2" border style="margin-top:20px" :contentStyle="{'text-align': left}">
-	<el-descriptions-item label="*抽样单编号" prop="cyd_data.sample_name" style="width:200px" class="labelItem" size="mini" required >
-		<el-input v-model="cyd_data.brand" placeholder='必填项'></el-input>
+<el-descriptions  title="农产品质量安全抽样单" :column="2" border style="margin-top:20px">
+	<el-descriptions-item label="*抽样单编号" prop="cyd_data.cyd_code" style="width:200px" class="labelItem" size="mini" required >
+		{{cyd_data.cyd_code}}
 	</el-descriptions-item>
 	<!-- <el-descriptions-item label="样品编码" prop="cyd_data.sample_id" class="labelItem" style="" size="mini">
 		<el-input v-model="cyd_data.sample_id" disabled>
@@ -75,26 +75,20 @@
 	<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.address" size="mini" required>
-					<el-row>
-					<el-col :span="12" style="margin-right:10px;">	
-						<el-cascader placeholder="请选择地区" :options="region" v-model="selectedOptions" @change="handleChange" :props="{ expandTrigger: 'hover' }" style="width:100%">
-						</el-cascader>
-					</el-col>
-					<el-col :span="11">
-						<el-input v-model="unit_test.address" placeholder="请输入详细地址" style="width:100%"></el-input>
-					</el-col>
-					</el-row>
+				<el-descriptions-item label="单位名称" prop="inspected_unit.inspected_name" size="mini" required>
+					{{inspected_unit.inspected_name}}
 				</el-descriptions-item>
-				<el-descriptions-item label="*联系人" prop="unit_test.user_name" size="mini" required>
-									<el-input v-model="unit_test.user_name"></el-input>
+				<el-descriptions-item label="单位地址" prop="inspected_unit.inspected_address" size="mini" required>
+					{{inspected_unit.inspected_address}}
 				</el-descriptions-item>
-				<el-descriptions-item label="*联系电话" prop="unit_test.phone" size="mini" required>
-									<el-input v-model="unit_test.phone"></el-input>
+				<el-descriptions-item label="联系人" prop="inspected_unit.contact_name" size="mini" required>
+					{{inspected_unit.contact_name}}
 				</el-descriptions-item>
-
-				<el-descriptions-item label="Email" prop="unit_test.fax" size="mini">
-							<el-input v-model="unit_test.fax"></el-input>
+				<el-descriptions-item label="联系电话" prop="inspected_unit.contact_phone" size="mini" required>
+					{{inspected_unit.contact_phone}}
+				</el-descriptions-item>
+				<el-descriptions-item label="Email" prop="inspected_unit.contact_email" size="mini">
+					{{inspected_unit.contact_email}}
 				</el-descriptions-item>
 			</el-descriptions>
 		</el-descriptions-item>
@@ -103,23 +97,15 @@
 		<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.address" size="mini" required>
-					<el-row>
-					<el-col :span="12" style="margin-right:10px;">	
-						<el-cascader placeholder="请选择地区" :options="region" v-model="selectedOptions" @change="handleChange" :props="{ expandTrigger: 'hover' }" style="width:100%">
-						</el-cascader>
-					</el-col>
-					<el-col :span="11">
-						<el-input v-model="unit_test.address" placeholder="请输入详细地址" style="width:100%"></el-input>
-					</el-col>
-					</el-row>
+				<el-descriptions-item label="样品名称" prop="sample.sample_name" size="mini" required>
+					{{sample.sample_name}}
 				</el-descriptions-item>
 			</el-descriptions>
 			</el-descriptions-item>
 		</el-descriptions>
 	
 		
-		<el-descriptions  :column="2" border>
+		<!-- <el-descriptions  :column="2" border>
 			<el-descriptions-item label="检测任务依据" prop="cyd_data.base" class="labelItem" style="" size="mini" required>
 								<el-input v-model="cyd_data.base"></el-input>
 			</el-descriptions-item>
@@ -134,7 +120,7 @@
 									<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
 								</el-upload>
 			</el-descriptions-item>
-		</el-descriptions>
+		</el-descriptions> -->
 	</div>
 <!-- 底部按钮 -->
 		<el-form>
@@ -171,9 +157,8 @@
 				fileList: [],
 				form: {},
 				cyd_data: {},//抽样单信息上部分
-				unit_test: {},//受检单位信息
-				unit_production: {},//生产单位信息
-				unit_sample: {},//抽样单位信息
+				inspected_unit: {},//受检单位信息
+				sample: {},//样品信息
 				units: [],
 				production: [],
 				// 样品下拉框
@@ -186,27 +171,27 @@
 			}
 		},
 		created() {
-			this.task_id = this.$route.params.task_id
-			this.undertake_id = this.$route.params.under_id
-			console.log(this.task_id)
-			console.log(this.undertake_id)
-			this.getTestObj()
+			this.task_profile_id = this.$route.params.id
+			console.log(this.task_profile_id)
+			this.getCyd()
 		},
 		methods: {
 
-			// 获取样本列表
-			async getTestObj() {
-				const result = await this.$http.post('getTestObj', {
-					task_id: this.task_id,
-					undertake_id: this.undertake_id
+			// 获取抽样单信息
+			async getCyd() {
+				const result = await this.$http.post('getCyd', {
+					task_profile_id: this.task_profile_id
 				})
-				console.log(result.data.data.sample_info.name)
-				if (result.data.code == 0) {
-					this.sampleList = result.data.data.list
-					this.unit_sample.unit_name = result.data.data.sample_info.name
-				}
-				console.log(this.unit_sample.unit_name)
+				console.log(result.data.data)
+				this.cyd_data = result.data.data
+				this.inspected_unit = result.data.data.inspectedUnit
+				this.sample = result.data.data.sample
+				console.log(this.cyd_data)
+				console.log(this.inspected_unit)
+				console.log(this.sample)
 			},
+
+
 			// 生成样品编码
 			async createCode() {
 				var that = this

src/components/jc/setTaskcd.vue

@@ -184,7 +184,7 @@
 						<el-button style="margin:5px 0" type="success" size="small" plain @click="input(scope.row.id)">填报抽样单
 						</el-button>
 						<!-- <el-button type="success" size="small" plain @click="sampleDetail(scope.row.sample_id)">查看 -->
-						<el-button style="margin-bottom:5px" type="success" size="small" @click="getSampleList(scope.row.id)">查看抽样单列表
+						<el-button style="margin-bottom:5px" type="success" size="small" @click="getCydlist(scope.row.id)">查看抽样单列表
 						</el-button>
 							<!-- <el-button type="success" size="small" plain @click="sampleDetail(scope.row.sample_id)" @focus="getSampleListDialog = true">查看抽样单列表
 						</el-button> -->
@@ -210,9 +210,15 @@
 
 						<el-table-column :key="table.label" v-for="table in tableHeader" :label="table.label"
 							:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+						<!-- <el-table-column  label="附件" align="center" width="60">
+							<template slot-scope="scope">
+								<span v-if="scope.row.cydProfile.cyd_file_url==''">无</span>
+								<el-link v-else type="primary" :href="scope.row.cydProfile.cyd_file_url">下载</el-link>
+							</template>
+						</el-table-column> -->
 						<el-table-column label="操作" align="center" fixed="right">
 							<template slot-scope="scope">
-								<el-button style="margin:5px 5px" type="success" size="small" plain @click="sampleDetail(scope.row.sample_id)">查看
+								<el-button style="margin:5px 5px" type="success" size="small" plain @click="sampleDetail(scope.row.id)">查看
 								</el-button>
 								<el-button style="margin:5px 5px" type="primary" size="small" plain icon="el-icon-edit-outline" @click="upCydItem(scope.row.sample_id)">上报抽样信息
 								</el-button>
@@ -521,13 +527,6 @@
 				queryInfo: {
 					pageNum: 1,
 					pageSize: 10,
-					task_id: '',
-					sample_id: '',
-					unit_test_name: '',
-					sample_name: '',
-					sample_data: '',
-					unit_sample_name: '',
-					sample_ground: '',
 				},
 				underInfo:{
 					pageNum: 1,
@@ -572,28 +571,21 @@
 					height: 35 + 'px'
 				},
 				tableHeader: [{
-						label: '样品编码',
-						prop: 'sample_id'
-						// fixed: 'left'
-					}, {
-						label: '样品名称',
-						prop: 'sample_name',
+						label: '抽样单编码',
+						prop: 'cyd_code'
 						// fixed: 'left'
 					},
 					{
 						label: '受检单位',
-						prop: 'unit_test_name',
+						prop: 'inspectedUnit.inspected_name',
 						width: 180
 					},
 					{
-						label: '样品产地',
-						prop: 'place',
-						width: 180
-					}, {
 						label: '抽样日期',
-						prop: 'sample_date',
+						prop: 'cydProfile.cyd_date',
 						width: 150
-					}, {
+					},
+					{
 						label: '状态',
 						prop: 'status',
 						width: 100
@@ -722,10 +714,6 @@
 			this.task_id = this.$route.params.id
 
 			this.getTask()
-			// this.getJcdList()
-			// this.getmodelList()
-			// this.getUnderTask()
-			// this.getSampleTaskList()
 			this.getCheckTaskList()
 		},
 
@@ -767,7 +755,7 @@
 			async searchData() {
 				console.log(this.queryInfo)
 				this.queryInfo.pageNum = 1
-				this.getSampleList()
+				this.getCyds()
 			},
 			//重置
 			resetForm(formName) {
@@ -795,34 +783,6 @@
 				
 				that.readForm = res.data
 				console.log(that.readForm)
-				// that.productNameText = that.readForm.product.map(el => el.product_name).join('、 ')
-				// that.pesticidesNameText = that.readForm.pesticides.map(el => el.test_name).join('、 ')
-				// console.log(res.data.modelInfo)
-			
-				// 	if (res.data.modelInfo.type_id == '1') {
-				// 		that.readForm.model_type = '种植业'
-				// 	} else if (res.data.modelInfo.type_id == '2') {
-				// 		that.readForm.model_type = '畜牧业'
-				// 	} else if (res.data.modelInfo.type_id == '3') {
-				// 		that.readForm.model_type = '渔业' 
-
-				// 	} else {
-				// 		that.readForm.model_type = '其他'
-				// 	}
-				
-				// console.log(that.readForm.model_type)
-				// that.underTask = res.data.underTaskList.rows
-				// that.unitTask = res.data.unitTaskList.rows
-				// console.log(that.underTask)
-				// console.log(that.unitTask)
-				// that.underTasktotal = res.data.underTaskList.total
-				// that.unitTasktotal = res.data.unitTaskList.total
-
-				// 抽检不分离
-				// if (that.taskInfo.is_divide == 0) {
-				// 	this.sampleShow = true
-				// 	this.checkShow = true
-				// }
 			},
 
 			//抽样标签详情
@@ -972,7 +932,7 @@
 					sample_id: id
 				})
 				console.log(result.data.data)
-				// this.getSampleList()
+				// this.getCyds()
 					// 判断业务逻辑
 					if (result.data.code == 0) {
 						this.$message({
@@ -1029,41 +989,21 @@
 				}
 			},
 			// 获取抽样单列表
-			async getSampleList(id) {
-				console.log(id)
-			
+			async getCydlist(id) {
 				this.queryInfo['task_id'] = this.task_id
-				this.queryInfo['undertake_id'] = id
-				
+				this.queryInfo['task_profile_id'] = id
+				this.getSampleListDialog = true
+				this.getCyds()
+			},
+			async getCyds() {
 				const {
 					data: res
-				} = await this.$http.post("getSampleList", this.queryInfo);
+				} = await this.$http.post("getCyds", this.queryInfo);
 				// console.log(res)
 				this.tableData = res.data.rows
 				console.log(this.tableData)
-				for (let i = 0; i < this.tableData.length; i++) {
-					if (this.tableData[i].sample_status == '0') {
-						this.tableData[i].status = '未上报'
-					} else {
-						this.tableData[i].status = '已上报'
-					}
-					// if (this.tableData[i].jc_value_id == null) {
-					// 	this.tableData[i].test_result = '暂未检测'
-					// } else {
-					// 	if (this.tableData[i].test_result == '0') {
-					// 		this.tableData[i].test_result = '不合格'
-					// 	} else if (this.tableData[i].test_result == '1') {
-					// 		this.tableData[i].test_result = '合格'
-					// 	}
-					// }
-					// if (this.tableData[i].test_status == '0') {
-					// 	this.tableData[i].test_status = '未上报'
-					// } else if (this.tableData[i].test_status == '1') {
-					// 	this.tableData[i].test_status = '已上报'
-					// }
-				}
 				this.total = res.data.total
-				this.getSampleListDialog = true
+				
 			},
 			// 跳转到填写抽样单
 			inputSample() {
@@ -1107,7 +1047,7 @@
 					sample_id: id
 				})
 				console.log(result.data.data)
-				// this.getSampleList()
+				// this.getCyds()
 					// 判断业务逻辑
 					if (result.data.code == 0) {
 						this.$message({
@@ -1115,7 +1055,7 @@
 							message: '上报抽样信息成功'
 						})
 						
-						this.getSampleList(result.data.data)
+						this.getCyds(result.data.data)
 					}
 			},
 			// 多选删除抽样信息
@@ -1130,13 +1070,13 @@
 						type: 'success',
 						message: '删除成功'
 					})
-					this.getSampleList()
+					this.getCyds()
 				}
 			},
 			/** 修复当用户在大于1的分页进行数据搜索没有返回值的问题 */
 			setPageNum() {
 				this.queryInfo.pageNum = 1
-				this.getSampleList()
+				this.getCyds()
 			},
 			setSelectedRow() {
 				// 设置当前页已选项
@@ -1152,13 +1092,13 @@
 			/** 监听每页显示多少数据的改变 */
 			handleSizeChange(newSize) {
 				this.queryInfo.pageSize = newSize
-				this.getSampleList()
+				this.getCyds()
 			},
 
 			/** 监听页码的改变 */
 			handleCurrentChange(newPage) {
 				this.queryInfo.pageNum = newPage
-				this.getSampleList()
+				this.getCyds()
 			},
 			/** 监听每页显示多少数据的改变 */
 			handleSizeChange1(newSize) {
@@ -1182,7 +1122,7 @@
 			sampleDetail(id) {
 				console.log(id)
 				this.$router.push({
-					name: 'sampleDetail',
+					name: 'sampleReport',
 					params: {
 						id: id
 					}