Kaynağa Gözat

牵头单位执行任务后页面修改

jiangyu 3 yıl önce
ebeveyn
işleme
9f07af29cd

+ 25 - 27
src/components/jc/inputSample.vue

@@ -85,18 +85,18 @@
 				<el-descriptions-item label="*单位名称" prop="unit_test.unit_name" class="labelItem" style="" size="mini" required>
 									<el-input v-model="unit_test.unit_name"></el-input>
 				</el-descriptions-item>
-				<el-descriptions-item label="*通讯地址" prop="unit_test.address" class="labelItem" style="" size="mini" required>
-									<el-input v-model="unit_test.address"></el-input>
-				</el-descriptions-item>
 				<el-descriptions-item label="*法定代表人" prop="unit_test.represent_name" class="labelItem" style="" size="mini" required>
 									<el-input v-model="unit_test.represent_name"></el-input>
 				</el-descriptions-item>
 				<el-descriptions-item label="*受检人" prop="unit_test.user_name" class="labelItem" style="" size="mini" required>
 									<el-input v-model="unit_test.user_name"></el-input>
 				</el-descriptions-item>
-				<el-descriptions-item label="电话" prop="unit_test.phone" class="labelItem" style="" size="mini">
+				<el-descriptions-item label="*联系电话" prop="unit_test.phone" class="labelItem" style="" size="mini" required>
 									<el-input v-model="unit_test.phone"></el-input>
 				</el-descriptions-item>
+				<el-descriptions-item label="*通讯地址" prop="unit_test.address" class="labelItem" style="" size="mini" required>
+									<el-input v-model="unit_test.address"></el-input>
+				</el-descriptions-item>
 				<el-descriptions-item label="传真" prop="unit_test.fax" class="labelItem" style="" size="mini">
 							<el-input v-model="unit_test.fax"></el-input>
 				</el-descriptions-item>
@@ -105,23 +105,24 @@
 	</el-descriptions>
 		<!-- 生产单位情况 -->
 		<el-descriptions :column="1" border style="" >
-			<el-descriptions-item label="生产单位情况"  >
+			<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"></el-input>
 			</el-descriptions-item>
+			<el-descriptions-item label="*联系人" prop="unit_production.user_name" class="labelItem" style="" size="mini" required>
+				<el-input v-model="unit_production.user_name"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="*联系电话" prop="unit_production.phone" class="labelItem" style="" size="mini" required>
+				<el-input v-model="unit_production.phone"></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"></el-input>
 			</el-descriptions-item>
 			<el-descriptions-item label="邮编" prop="unit_production.postcode" class="labelItem" style="" size="mini">
 				<el-input v-model="unit_production.postcode"></el-input>
 			</el-descriptions-item>
-			<el-descriptions-item label="*联系人" prop="unit_production.user_name" class="labelItem" style="" size="mini" required>
-				<el-input v-model="unit_production.user_name"></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="电话" prop="unit_production.phone" class="labelItem" style="" size="mini">
-				<el-input v-model="unit_production.phone"></el-input>
-			</el-descriptions-item>
+
 			<el-descriptions-item label="传真" prop="unit_production.fax" class="labelItem" style="" size="mini">
 				<el-input v-model="unit_production.fax"></el-input>
 			</el-descriptions-item>
@@ -135,27 +136,24 @@
 
 
 		<!-- 抽样单位情况 -->
-		<el-descriptions :column="1" border style="" >
-			<el-descriptions-item label="抽样单位情况" >
+		<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"></el-input>
+			<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>
-			<el-descriptions-item label="*联系人" prop="unit_sample.unit_user" class="labelItem" style="" size="mini"
-									required>
+			<el-descriptions-item label="*联系人" prop="unit_sample.unit_user" class="labelItem" style="" size="mini" required>
 									<el-input v-model="unit_sample.unit_user"></el-input>
 			</el-descriptions-item>
-			<el-descriptions-item label="*通讯地址" prop="unit_sample.address" class="labelItem" style="" size="mini"
-									required>
+			<el-descriptions-item label="*联系电话" prop="unit_sample.phone" class="labelItem" style="" size="mini" required>
+									<el-input v-model="unit_sample.phone"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="*通讯地址" prop="unit_sample.address" class="labelItem" style="" size="mini" required>
 									<el-input v-model="unit_sample.address"></el-input>
 			</el-descriptions-item>
 			<el-descriptions-item label="邮编" prop="unit_sample.postcode" class="labelItem" style="" size="mini">
 									<el-input v-model="unit_sample.postcode"></el-input>
 			</el-descriptions-item>
-			<el-descriptions-item label="联系电话" prop="unit_sample.phone" class="labelItem" style="" size="mini">
-									<el-input v-model="unit_sample.phone"></el-input>
-			</el-descriptions-item>
 			<el-descriptions-item label="传真" prop="unit_sample.fax" class="labelItem" style="" size="mini">
 									<el-input v-model="unit_sample.fax"></el-input>
 			</el-descriptions-item>
@@ -185,7 +183,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>
@@ -246,9 +244,12 @@
 					task_id: this.task_id,
 					undertake_id: this.undertake_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)
 			},
 			// 生成样品编码
 			async createCode() {
@@ -347,7 +348,4 @@
 		// float: right;
 		text-align: center;
 	}
-	.smallTitle{
-		margin-top: 20PX;
-	}
 </style>

+ 1 - 1
src/components/jc/jcobj.vue

@@ -340,7 +340,7 @@
 				} else {
 					this.$message({
 						type: 'error',
-						message: '删除失败!'
+						message: '该模型已被绑定,不可删除!'
 					});
 				}
 

+ 14 - 13
src/components/jc/sampleDetail.vue

@@ -72,18 +72,18 @@
 				<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>
-				</el-descriptions-item>
 				<el-descriptions-item label="*法定代表人" prop="unit_test.represent_name" class="labelItem" size="mini" required>
 									<el-input v-model="unit_test.represent_name" disabled></el-input>
 				</el-descriptions-item>
 				<el-descriptions-item label="*受检人" prop="unit_test.user_name" class="labelItem" size="mini" required>
 									<el-input v-model="unit_test.user_name" disabled></el-input>
 				</el-descriptions-item>
-				<el-descriptions-item label="电话" prop="unit_test.phone" class="labelItem" size="mini">
+				<el-descriptions-item label="*联系电话" prop="unit_test.phone" class="labelItem" size="mini">
 									<el-input v-model="unit_test.phone" 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>
+				</el-descriptions-item>
 				<el-descriptions-item label="传真" prop="unit_test.fax" class="labelItem" size="mini">
 							<el-input v-model="unit_test.fax" disabled></el-input>
 				</el-descriptions-item>
@@ -97,18 +97,19 @@
 			<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.user_name" class="labelItem" style="" size="mini" required>
+				<el-input v-model="unit_production.user_name" disabled></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="*联系电话" prop="unit_production.phone" class="labelItem" style="" size="mini">
+				<el-input v-model="unit_production.phone" 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>
 			</el-descriptions-item>
 			<el-descriptions-item label="邮编" prop="unit_production.postcode" class="labelItem" style="" size="mini">
 				<el-input v-model="unit_production.postcode" disabled></el-input>
 			</el-descriptions-item>
-			<el-descriptions-item label="*联系人" prop="unit_production.user_name" class="labelItem" style="" size="mini" required>
-				<el-input v-model="unit_production.user_name" disabled></el-input>
-			</el-descriptions-item>
-			<el-descriptions-item label="电话" prop="unit_production.phone" class="labelItem" style="" size="mini">
-				<el-input v-model="unit_production.phone" disabled></el-input>
-			</el-descriptions-item>
+			
 			<el-descriptions-item label="传真" prop="unit_production.fax" class="labelItem" style="" size="mini">
 				<el-input v-model="unit_production.fax" disabled></el-input>
 			</el-descriptions-item>
@@ -131,15 +132,15 @@
 			<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>
 			</el-descriptions-item>
+			<el-descriptions-item label="*联系电话" prop="unit_sample.phone" class="labelItem" style="" size="mini">
+									<el-input v-model="unit_sample.phone" disabled></el-input>
+			</el-descriptions-item>
 			<el-descriptions-item label="*通讯地址" prop="unit_sample.address" class="labelItem" style="" size="mini" required>
 									<el-input v-model="unit_sample.address" disabled></el-input>
 			</el-descriptions-item>
 			<el-descriptions-item label="邮编" prop="unit_sample.postcode" class="labelItem" style="" size="mini">
 									<el-input v-model="unit_sample.postcode" disabled></el-input>
 			</el-descriptions-item>
-			<el-descriptions-item label="联系电话" prop="unit_sample.phone" class="labelItem" style="" size="mini">
-									<el-input v-model="unit_sample.phone" disabled></el-input>
-			</el-descriptions-item>
 			<el-descriptions-item label="传真" prop="unit_sample.fax" class="labelItem" style="" size="mini">
 									<el-input v-model="unit_sample.fax" disabled></el-input>
 			</el-descriptions-item>

+ 0 - 1166
src/components/jc/sampleDetailcd copy.vue

@@ -1,1166 +0,0 @@
-<template>
-	<div>
-
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>首页</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>
-		</el-breadcrumb>
-
-		<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-			<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>
-						{{readForm.releaserInfo.rymc}}
-					</el-descriptions-item>
-					<el-descriptions-item>
-						<template slot="label">
-							年度
-						</template>
-						{{readForm.taskInfo.year}}
-					</el-descriptions-item>
-					<el-descriptions-item>
-						<template slot="label">
-							开始时间和结束时间
-						</template>
-						{{readForm.taskInfo.starttime}}-{{readForm.taskInfo.endtime}}
-					</el-descriptions-item>
-					<el-descriptions-item>
-						<template slot="label">
-							抽样信息上报截止时间
-						</template>
-						{{readForm.taskInfo.endtime_cydsb}}
-					</el-descriptions-item>
-					<el-descriptions-item>
-						<template slot="label">
-							监测类型
-						</template>
-						{{readForm.taskInfo.task_class}}
-					</el-descriptions-item>
-					<el-descriptions-item>
-						<template slot="label">
-							行业
-						</template>
-						<!-- <div v-if="readForm.product!=[]"> -->
-						<span>{{readForm.model_type}}</span>
-						<!-- </div> -->
-						<!-- <div v-else>暂无</div> -->
-					</el-descriptions-item>
-					<el-descriptions-item>
-						<template slot="label">
-							抽检分离
-						</template>
-						<span v-if="readForm.taskInfo.is_divide==1">是</span>
-						<span v-if="readForm.taskInfo.is_divide==0">否</span>
-					</el-descriptions-item>
-					<el-descriptions-item>
-						<template slot="label">
-							附件
-						</template>
-						<div v-if="readForm.file_url==null">无</div>
-						<el-link v-else type="primary" :href="readForm.taskInfo.file_url">下载附件</el-link>
-					</el-descriptions-item>
-
-				</el-descriptions>
-				<el-descriptions class="margin-top" :size="size" border>
-					<el-descriptions-item>
-						<template slot="label">
-							备注
-						</template>
-						{{readForm.taskInfo.log}}
-					</el-descriptions-item>
-				</el-descriptions>
-				<el-descriptions class="margin-top" :size="size" border>
-					<el-descriptions-item>
-
-						<template slot="label">
-							检测对象
-						</template>
-						{{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>
-					<el-descriptions-item>
-						<template slot="label">
-							检测项
-						</template>
-						{{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  @current-change="handlecyCurrentChange" style="width: 100%"
-					:row-style="rowStyle" :cell-style="cellStyle">
-					<el-table-column :key="table.label" v-for="table in tableHeader2" :label="table.label"
-						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
-				</el-table> -->
-				<!-- <div class="footer">
-					<el-button type="success" size="mini" @click="input()">填报抽样单</el-button>
-					<el-button type="success" size="mini" @click="next">导出总览</el-button>
-					<el-button type="success" size="mini" @click="back">返回</el-button>
-				</div> -->
-			</el-tab-pane>
-
-			<el-tab-pane label="抽样" name="second">
-			<!-- <el-tab-pane v-if="sampleShow==true" label="抽样" name="second"> -->
-
-				<!-- 头部搜索栏 -->
-				
-					<el-form style="display: flex; flex-direction: column;" ref="form2" :model="queryInfo">
-						<el-row style="width: 75%;">
-							<el-col :span="6">
-						<el-form-item label="样品名称" class="select" size="small" prop="sample_name">
-							<el-input v-model="queryInfo.sample_name"></el-input>
-						</el-form-item>
-							</el-col>
-							<el-col :span="6">
-						<el-form-item label="样品编码" class="select" size="small" prop="sample_id">
-							<el-input v-model="queryInfo.sample_id"></el-input>
-						</el-form-item>
-							</el-col>
-							<el-col :span="6">
-						<el-form-item label="受检单位" class="select" size="small" prop="units_name">
-							<el-input v-model="queryInfo.unit_test_name"></el-input>
-						</el-form-item>
-						</el-col>
-						</el-row>
-						<el-row style="width: 75%;">
-							<el-col :span="6">
-						<el-form-item label="抽样单位" class="select" size="small" prop="sample_unit_name">
-							<el-input v-model="queryInfo.unit_sample_name"></el-input>
-						</el-form-item>
-						    </el-col>
-							<el-col :span="6">
-						<el-form-item label="抽样日期" class="select" size="small" prop="sample_data">
-							<el-input v-model="queryInfo.sample_data"></el-input>
-						</el-form-item>
-						</el-col>
-						<el-col :span="6">
-						<!-- <el-form-item label="抽样场所" class="select" size="small" prop="sample_ground">
-							<el-input v-model="queryInfo.sample_ground"></el-input>
-						</el-form-item> -->
-						</el-col>
-						<el-col :span="4">
-							<el-button style="height: 32px;margin-left: 10px;" size="mini" type="success"
-							@click="searchData()">查询
-						</el-button>
-						<!-- 重置 -->
-						<el-button style="height: 32px;margin-left: 5px;" size="mini" type="success" @click="resetForm('form2')">
-							重置
-						</el-button>
-						</el-col>
-						</el-row>
-					</el-form>
-				<el-row style="margin-right: 0px;">
-					<el-form style="display: flex; flex-direction: row;">
-						<!-- 	<el-form-item label="产地" class="select">
-							<el-select v-model="value" placeholder="请选择省份" size="small">
-								<el-option v-for="item in options" :key="item.value" :label="item.label"
-									:value="item.value">
-								</el-option>
-							</el-select>
-							<el-select v-model="value" placeholder="请选择城市" size="small">
-								<el-option v-for="item in options" :key="item.value" :label="item.label"
-									:value="item.value">
-								</el-option>
-							</el-select>
-							<el-select v-model="value" placeholder="请选择区/县" size="small">
-								<el-option v-for="item in options" :key="item.value" :label="item.label"
-									:value="item.value">
-								</el-option>
-							</el-select>
-						</el-form-item> -->
-						<!-- 查询 -->
-
-					</el-form>
-				<el-table :data="underTask" border stripe highlight-current-row  @current-change="handlecyCurrentChange" style="width: 100%"
-					:row-style="rowStyle" :cell-style="cellStyle">
-					<el-table-column :key="table.label" v-for="table in tableHeader2" :label="table.label"
-						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
-					<el-table-column label="操作" align="center" fixed="right">
-					<template slot-scope="scope">
-						<el-button 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 type="success" size="small" @click="getSampleList(scope.row.id)">查看抽样单列表
-						</el-button>
-							<!-- <el-button type="success" size="small" plain @click="sampleDetail(scope.row.sample_id)" @focus="getSampleListDialog = true">查看抽样单列表
-						</el-button> -->
-						<el-button type="primary" size="small" plain icon="el-icon-edit-outline" @click="appear">上报抽样信息
-						</el-button>
-					</template>
-					</el-table-column>
-				</el-table>
-
-				<!-- 抽样单列表对话框 -->
-			<el-dialog title="抽样单列表" :visible.sync="getSampleListDialog" width="80%" :close-on-click-modal="false" class="dialogItem">
-				<el-form v-if="getSampleListDialog">
-					<!--  表格数据区域-->
-					<el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row
-						@selection-change="handleSelectionChange" style="width: 100%" :row-style="rowStyle"
-						:cell-style="cellStyle">
-						<el-table-column type="selection" width="50"></el-table-column>
-						<el-table-column label="序号" width="50px">
-							<template slot-scope="scope">
-								{{ scope.$index+1 }}
-							</template>
-						</el-table-column>
-
-						<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" fixed="right">
-							<template slot-scope="scope">
-								<el-button type="success" size="small" plain @click="sampleDetail(scope.row.sample_id)">查看
-								</el-button>
-							</template>
-						</el-table-column>
-					</el-table>
-					<!--    分页器区域-->
-					<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-					:current-page="queryInfo.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo.pageSize"
-					layout="total, sizes, prev, pager, next, jumper" :total="total" background />
-				</el-form>
-			</el-dialog>
-		</el-row>	
-		</el-tab-pane>
-
-			<el-tab-pane label="检测" name="third">
-			<!-- <el-tab-pane  v-if="checkShow==true"  label="检测" name="third"> -->
-			<el-table :data="unitTask" border stripe highlight-current-row  @current-change="handlecyCurrentChange" style="width: 100%"
-					:row-style="rowStyle" :cell-style="cellStyle">
-				<el-table-column :key="table.label" v-for="table in tableHeader2" :label="table.label"
-					:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
-				<el-table-column label="操作" align="center" fixed="right">
-				<template slot-scope="scope">
-					<!-- <el-button 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 type="success" size="small" @click="getTestList(scope.row.id)">查看检测单列表
-					</el-button>
-						<!-- <el-button type="success" size="small" plain @click="sampleDetail(scope.row.sample_id)" @focus="getSampleListDialog = true">查看抽样单列表
-					</el-button> -->
-					<el-button type="primary" size="small" plain icon="el-icon-edit-outline" @click="appearTest">上报检测信息
-					</el-button>
-				</template>
-				</el-table-column>
-			</el-table>
-			<!-- 查看检测单列表弹框 -->
-			<el-dialog title="检测单列表" :visible.sync="checkTestList" width="70%" :close-on-click-modal="false"
-				class="dialogItem">
-				<!--  表格数据区域-->
-				<el-table :data="tableData1" border stripe highlight-current-row style="width: 100%"
-					:row-style="rowStyle" :cell-style="cellStyle">
-					<!-- <el-table-column type="selection" width="50"></el-table-column> -->
-					<el-table-column label="序号" width="50px">
-						<template slot-scope="scope">
-							{{ scope.$index+1 }}
-						</template>
-					</el-table-column>
-
-					<el-table-column :key="table.label" v-for="table in checkHeader" :label="table.label"
-						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
-					<el-table-column label="操作" align="center" fixed="right" width="220px">
-						<template slot-scope="scope">
-							<el-button type="success" size="mini" v-if="scope.row.jc_value_id==null" plain
-								@click="check(scope.row.sample_id,scope.row.sample_name)">检测</el-button>
-							<el-button type="primary" v-else size="mini" plain @click="update(scope.row)">修改</el-button>
-							<el-button type="primary" size="mini" plain @click="upcheck(scope.row.sample_id)">上报
-							</el-button>
-							<el-button type="primary" size="mini" plain @click="creatpdf(scope.row.sample_id)">生成检测报告
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-
-				<!--    分页器区域-->
-				<el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1"
-					:current-page="underInfo.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="underInfo.pageSize"
-					layout="total, sizes, prev, pager, next, jumper" :total="testListTotal" background />
-			</el-dialog>
-			</el-tab-pane>
-			
-
-			<el-dialog title="填写检测单" :visible.sync="inputCheckShow" width="70%" :close-on-click-modal="false"
-				class="dialogItem">
-				<span class="demonstration">样品编码:{{check_id}}</span>
-				<span class="demonstration">样品名称:{{check_name}}</span>
-				<el-button type="success" size="small" plain @click="onSubmit">保存</el-button>
-				<span class="demonstration">注意:“不得检出”只能填为“ND”</span>
-				<!--  表格数据区域-->
-				<el-table :data="testPesticides" border stripe highlight-current-row style="width: 100%"
-					:row-style="rowStyle" :cell-style="cellStyle">
-					<el-table-column :key="table.label" v-for="table in checkHeader2" :label="table.label"
-						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
-					<el-table-column label="检测值">
-						<template slot-scope="scope">
-							<el-input v-model="scope.row.test_value" size="small" />
-						</template>
-					</el-table-column>
-					<el-table-column label="限量值">
-						<template slot-scope="scope">
-							<el-input v-model="scope.row.state_value" size="small" />
-						</template>
-					</el-table-column>
-					<el-table-column label="单位">
-						<template slot-scope="scope">
-							<span v-model="scope.row.unit" size="small">mg/kg</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="抽检结果">
-						<template slot-scope="scope">
-							<span v-if="parseFloat(scope.row.test_value)<=parseFloat(scope.row.state_value)&&scope.row.state_value!='ND'"
-								size="small">合格</span>
-							<span v-else-if="parseFloat(scope.row.test_value)>parseFloat(scope.row.state_value)" size="small">不合格</span>
-							<span v-else-if="scope.row.test_value=='ND'&&scope.row.state_value=='ND'"
-								size="small">合格</span>
-							<span v-else-if="scope.row.test_value!='ND'&&scope.row.state_value=='ND'"
-								size="small">不合格</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="LOD">
-						<template slot-scope="scope">
-							<el-input v-model="scope.row.LOD" size="small" />
-						</template>
-					</el-table-column>
-					<el-table-column label="LOQ">
-						<template slot-scope="scope">
-							<el-input v-model="scope.row.LOQ" />
-						</template>
-					</el-table-column>
-
-				</el-table>
-			</el-dialog>
-			<!-- ///////////////////////////////////////////检测报告生成-------难、、、、、、、、、、、、、、、、、、、、、、 -->
-			<el-dialog title="生成监测报告" :visible.sync="dialogVisible2" width="50%">
-				<div id="pdf">
-					<el-form ref="formjc" :model="formjc" label-width="100px"
-						style="margin-top: 20px;width: 100%;background-color: aliceblue;padding: 5px;">
-						<el-row style="text-align: center; font-size: 23px; margin: 40px 0;">
-							安徽省农业农村厅农产品质量安全例行监测检测报告
-						</el-row>
-						<el-row>
-							<el-col :span="12">
-								<el-form-item label="样品名称" prop="sample_name" class="labelItem" size="mini">
-									<el-input disabled v-model="formjc.sample_name"></el-input>
-								</el-form-item>
-							</el-col>
-							<el-col :span="11">
-								<el-form-item label="样品编码" prop="sample_id" class="labelItem" style="" size="mini">
-									<el-input disabled v-model="formjc.sample_id"></el-input>
-								</el-form-item>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col :span="12">
-								<el-form-item label="型号规格" prop="type" class="labelItem" size="mini">
-									<el-input disabled v-model="formjc.type"></el-input>
-								</el-form-item>
-							</el-col>
-							<el-col :span="11">
-								<el-form-item label="执行标准" prop="standard" class="labelItem" style="" size="mini">
-									<el-input disabled v-model="formjc.standard"></el-input>
-								</el-form-item>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col :span="12">
-								<el-form-item label="生产日期或批号" prop="production_date" class="labelItem" size="mini">
-									<el-input disabled v-model="formjc.production_date"></el-input>
-								</el-form-item>
-							</el-col>
-							<el-col :span="11">
-								<el-form-item label="产地" prop="place" class="labelItem" style="" size="mini">
-									<el-input disabled v-model="formjc.place"></el-input>
-								</el-form-item>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col :span="12">
-								<el-form-item label="产品认证情况" prop="certicfie" class="labelItem" size="mini">
-									<el-input disabled v-model="formjc.certicfie"></el-input>
-								</el-form-item>
-							</el-col>
-							<el-col :span="11">
-								<el-form-item label="证书编号" prop="certifie_num" class="labelItem" style="" size="mini">
-									<el-input disabled v-model="formjc.certifie_num"></el-input>
-								</el-form-item>
-							</el-col>
-						</el-row>
-						<el-row>
-							<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>
-									</el-col>
-									<el-col :span="10">
-										<el-form-item label="单位" prop="sample_num_unit" class="labelItem" size="mini"
-											label-width="60px">
-											<el-input disabled v-model="formjc.sample_num_unit"></el-input>
-										</el-form-item>
-									</el-col>
-								</el-row>
-							</el-col>
-							<el-col :span="11">
-								<el-row>
-									<el-col :span="13">
-										<el-form-item label="抽样基数" prop="sample_base" class="labelItem" size="mini">
-											<el-input disabled v-model="formjc.sample_base"></el-input>
-										</el-form-item>
-									</el-col>
-									<el-col :span="10">
-										<el-form-item label="单位" prop="sample_base_unit" class="labelItem" size="mini"
-											label-width="60px" clearable>
-											<el-input disabled v-model="formjc.sample_base_unit"></el-input>
-										</el-form-item>
-									</el-col>
-								</el-row>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col>
-								<el-form-item label="抽样场所" prop="sample_ground" class="labelItem" size="mini">
-									<el-input disabled v-model="formjc.sample_ground"></el-input>
-								</el-form-item>
-							</el-col>
-						</el-row>
-						<el-row>
-							<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>
-								<el-form-item label="通讯地址" prop="address" class="labelItem" style="" size="mini">
-									<el-input disabled v-model="formjc.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>
-								<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>
-								<el-form-item label="电话" prop="phone" class="labelItem" style="" size="mini">
-									<el-input disabled v-model="formjc.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>
-							</el-col>
-						</el-row>
-					</el-form>
-					<el-table :data="resultjc" border stripe highlight-current-row style="width: 100%"
-						:row-style="rowStyle" :cell-style="cellStyle">
-						<el-table-column :key="table.label" v-for="table in jcheader" :label="table.label"
-							: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>
-
-			<el-tab-pane label="报告上传" name="five">
-				<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-tab-pane>
-		</el-tabs>
-
-	</div>
-</template>
-
-<script>
-	import htmlToPdf from '../../assets/js/htmlToPdf.js'
-	import inputCheck from './inputCheck'
-	const token = window.sessionStorage.getItem('token')
-	const name = window.sessionStorage.getItem('name')
-	export default {
-		name: 'setTask',
-		data() {
-			return {
-				size: 'medium',
-				myHeaders: {
-					Authorization: 'bearer' + token
-				},
-				formjc: {},
-				dialogVisible2: false,
-				getSampleListDialog: false,
-				checkTestList: false,
-				activeName: 'first',
-				id: 0,
-				productNameText: '',
-				pesticidesNameText: '',
-				readForm: {
-					
-				},
-				underTask: [],
-				unitTask: [],
-				unitTaskTotal: '0',
-				underTasktotal: '0',
-				testListTotal: '0',
-				queryInfo: {
-					pageNum: 1,
-					pageSize: 10,
-					task_id: '',
-					sample_id: '',
-					unit_test_name: '',
-					sample_name: '',
-					sample_data: '',
-					unit_sample_name: '',
-					sample_ground: '',
-				},
-				underInfo:{
-					pageNum: 1,
-					pageSize: 10,
-					task_id: '',
-					unit_id: '',
-				},
-				releaserInfo:{
-						groupname: '',
-						rymc:'',
-					},
-				taskInfo:{
-						base_file_url: null,
-						batch: '',
-						creater: null,
-						createtime: null,
-						endtime: null,
-						endtime_cydsb: null,
-						file_name: null,
-						file_url: null,
-						filenum: null,
-						id: null,
-						industry: null,
-						is_divide: null,
-						ispublic:null,
-						level:null,
-						log: null,
-						main_unit: null,
-						releaser:null,
-						starttime: null,
-						status: null,
-						task_class: null,
-						task_name:null,
-						test_model_id:null,
-						year: null,
-					},					
-				// 填报对话框弹出
-				inputDialogShow: false,
-				cellStyle: {
-					padding: 2 + 'px'
-				},
-				rowStyle: {
-					height: 35 + 'px'
-				},
-				tableHeader: [{
-						label: '样品编码',
-						prop: 'sample_id'
-						// fixed: 'left'
-					}, {
-						label: '样品名称',
-						prop: 'sample_name',
-						// fixed: 'left'
-					},
-					{
-						label: '受检单位',
-						prop: 'unit_test_name',
-						width: 180
-					},
-					{
-						label: '样品产地',
-						prop: 'place',
-						width: 180
-					}, {
-						label: '抽样日期',
-						prop: 'sample_date',
-						width: 180
-					}, {
-						label: '状态',
-						prop: 'status',
-						width: 180
-					}
-				],
-				checkHeader: [{
-						label: '样品名称',
-						prop: 'sample_name',
-						// fixed: 'left'
-					}, {
-						label: '样品编码',
-						prop: 'sample_id'
-						// fixed: 'left'
-					},
-					{
-						label: '受检单位',
-						prop: 'unit_test_name',
-						width: 180
-					},
-					{
-						label: '抽样单位',
-						prop: 'bear_name',
-						width: 180
-					}, {
-						label: '检测单位',
-						prop: 'check_name',
-						width: 180
-					}, {
-						label: '判定结果',
-						prop: 'test_result',
-						width: 180
-					}, {
-						label: '状态',
-						prop: 'test_status',
-						width: 180
-					}
-				],
-				checkHeader2: [{
-					label: '检测项目',
-					prop: 'test_name',
-					// fixed: 'left'
-				}],
-				// 数据表格数据
-				tableData: [],
-				tableData1: [],
-				options: [],
-				task_id: '',
-				multipleSelection: null,
-				// 填报检测对话框
-				inputCheckShow: false,
-				check_name: '',
-				check_id: '',
-				testPesticides: [],
-				resultjc: [],
-				// 模型列表
-				options: [],
-				bindForm: {
-					test_model_id: '',
-					closingdate: ''
-				},
-				jcheader: [{
-						label: '检测项目',
-						prop: 'test_name',
-					},
-					{
-						label: '检测值',
-						prop: 'test_value',
-					}, {
-						label: '限量值',
-						prop: 'state_value',
-					}, {
-						label: '单位',
-						prop: 'unit',
-					}, {
-						label: '抽检结果',
-						prop: 'test_result'
-					}, {
-						label: 'LOD',
-						prop: 'LOD',
-					}, {
-						label: 'LOQ',
-						prop: 'LOQ',
-					}
-				],
-				tableHeader2: [{
-						label: '抽样机构',
-						prop: 'bear_name',
-						width: 180,
-					}, {
-						label: '检测机构',
-						prop: 'check_name'
-					},
-					{
-						label: '抽样地区',
-						prop: 'address'
-					}, {
-						label: '抽样数量',
-						prop: 'sample_number'
-					},
-					{
-						label: '报告上传单位',
-						prop: 'report_name'
-					}, {
-						label: '报告上传截止时间',
-						prop: 'uploadtime'
-					}
-				],
-				fileList: [],
-				total: 0,
-				sampleShow: false, //是否展示抽样卡片
-				checkShow: false, //是否展示检测卡片
-				currentRow: null,
-				 //选中机构地域表格数据项
-			};
-		},
-		components: {
-			inputCheck
-		},
-		mounted() {},
-		created() {
-			this.task_id = this.$route.params.id
-
-
-			this.getTaskDetail()
-			// this.getTestList()
-			// this.getmodelList()
-			// this.getUnderTask()
-		},
-
-		methods: {
-			// 获取机构地域表格
-			// async getUnderTask() {
-			// 	this.queryInfo['task_id'] = this.task_id
-			// 	const result = await this.$http.post('getUnderTask', this.queryInfo)
-			// 	// 判断业务逻辑
-			// 	if (result.data.code == 0) {
-			// 		this.underTask = result.data.data.rows
-			// 		// 抽检分离时判断用户是抽样机构还是检测机构
-			// 		for (let i = 0; i < this.underTask.length; i++) {
-			// 			if (this.underTask[i].bear_name == name) {
-			// 				this.sampleShow = true
-			// 			}
-			// 			if (this.underTask[i].check_name == name) {
-			// 				this.checkShow = true
-			// 			}
-			// 		}
-			// 		this.underTasktotal = result.data.data.total
-			// 	}
-			// },
-			// 获取模型列表
-			// async getmodelList() {
-			// 	const {
-			// 		data: res
-			// 	} = await this.$http.post(
-			// 		"getModelList", {
-			// 			'pageNum': 1,
-			// 			'pageSize': 100,
-			// 			type_id: ""
-			// 		}
-			// 	);
-			// 	this.options = res.data.rows
-			// },	// 获取任务详情
-
-			//查询
-			async searchData() {
-				console.log(this.queryInfo)
-				this.queryInfo.pageNum = 1
-				this.getSampleList()
-			},
-			//重置
-			resetForm(formName) {
-				// console.log(this.queryInfo)
-					this.$refs[formName].resetFields();
-			},
-			//选中抽样任务(单选)
-			handlecyCurrentChange(val) {
-				this.currentRow = val;
-				console.log(this.currentRow)
-				console.log(this.currentRow.id)
-
-				// under_id = 
-			},
-			//获取任务详情
-			async getTaskDetail() {
-				var that = this
-				const {
-					data: res
-				} = await this.$http.post("getTaskDetail", {
-					task_id: that.task_id,
-					pageNum: that.queryInfo.pageNum,
-					pageSize: that.queryInfo.pageSize
-				});
-				console.log(res.data.product)
-				if (res.data.product.length > 0) {
-					if (res.data.product[0].type_id == '1') {
-						res.data.model_type = '种植业'
-					} else if (res.data.product[0].type_id == '2') {
-						res.data.model_type = '畜牧业'
-					} else if (res.data.product[0].type_id == '3') {
-						res.data.model_type = '渔业'
-					} else {
-						res.data.model_type = '其他'
-					}
-				}
-				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('、 ')
-				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
-				}
-			},
-
-			// 上传成功
-			async uploadSuccess(res) {
-				console.log(res.data)
-				this.form.file_url = res.data.fileUrl
-				this.form.file_name = res.data.fileName
-				const result = await this.$http.post('saveTestFile', {
-					sample_id: sample_id
-				})
-				if (result.data.code == 0) {
-					that.formjc = result.data.data
-				}
-			},
-			//下载检测报告
-			download() {
-				htmlToPdf.downloadPDF(document.querySelector('#pdf'), '检测报告')
-			},
-			//生成检测报告pdf
-			async creatpdf(sample_id) {
-				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 res = await this.$http.post('getTestValue', {
-					sample_id: sample_id
-				})
-				if (res.data.code == 0) {
-					that.resultjc = res.data.data.result_detail
-				}
-				console.log(that.resultjc)
-				// },
-
-			},
-			async onSubmit() {
-				console.log(this.testPesticides)
-				for (let i = 0; i < this.testPesticides.length; i++) {
-					this.testPesticides[i]['unit'] = 'mg/kg'
-					console.log(this.testPesticides[i]['state_value'])
-					if (this.testPesticides[i]['state_value'] === 'ND') {
-						if (this.testPesticides[i]['test_value'] !== 'ND') {
-							this.testPesticides[i]['test_result'] = '不合格'
-						}
-					} else {
-						if (this.testPesticides[i]['test_value'] <= this.testPesticides[i]['state_value']) {
-							this.testPesticides[i]['test_result'] = '合格'
-						} else if (this.testPesticides[i]['test_value'] > this.testPesticides[i]['state_value']) {
-							this.testPesticides[i]['test_result'] = '不合格'
-						}
-					}
-					delete this.testPesticides[i]['test_model_id']
-				}
-
-
-				var that = this
-				const result = await this.$http.post("saveSamplePesticides", {
-					pesticides: that.testPesticides,
-					sample_id: that.check_id
-				});
-				if (result.data.code == 0) {
-					this.$message({
-						type: 'success',
-						message: '检测成功!'
-					});
-					that.inputCheckShow = false
-					that.getSampleList()
-				} else {
-					this.$message({
-						type: 'error',
-						message: result.data.message
-					});
-					that.inputCheckShow = false
-				}
-			},
-			async check(id, name) {
-				this.inputCheckShow = true
-
-				this.check_id = id,
-				this.check_name = name
-				console.log(this.check_id)
-				console.log(this.check_name)
-				var that = this
-				const {
-					data: res
-				} = await this.$http.post("getTestPesticides", {
-					sample_id: id
-				});
-				that.testPesticides = res.data
-				console.log(that.testPesticides)
-			},
-			handleClick(tab, event) {
-				console.log(tab, event);
-			},
-			// 获取检测单列表
-			async getTestList(id){
-				this.checkTestList = true
-				console.log(id)
-				// for (var key in this.queryInfo) {
-				// 	if (this.queryInfo[key] == '') {
-				// 		delete this.queryInfo[key]
-				// 	}
-				// }
-				// this.queryInfo['underTake_id'] = id
-				this.underInfo['task_id'] = this.task_id
-				this.underInfo['unit_id'] = id
-
-				console.log(this.underInfo)
-				const {
-					data: res
-				} = await this.$http.post("getTaskDetail", this.underInfo);
-				
-				// console.log(res)
-				this.tableData1 = res.data.rows
-				console.log(this.tableData)
-				this.testListTotal = res.data.total
-				
-			},
-			// 获取抽样单列表
-			async getSampleList(id) {
-				// console.log(id2)
-				for (var key in this.queryInfo) {
-					if (this.queryInfo[key] == '') {
-						delete this.queryInfo[key]
-					}
-				}
-				this.queryInfo['task_id'] = this.task_id
-				this.queryInfo['undertake_id'] = id
-				
-				const {
-					data: res
-				} = await this.$http.post("getSampleList", 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].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() {
-				this.activeName = 'second'
-			},
-			// 填报抽样单
-			input(id) {
-				console.log(id)
-				// // console.log(this.currentRow.id)
-				// if(this.currentRow == null){
-				// 	this.$message('请选中一条表格数据');
-				// 	return
-				// }
-						this.$router.push({
-					name: 'inputSample',
-					params: {
-						task_id: this.readForm.taskInfo.id,
-						under_id:id
-					}
-				})
-				// }
-				// if(isset(this.currentRow.id)){
-				// 	this.under_id=this.currentRow.id
-				// }
-			
-				// console.log(this.currentRow.id)
-			},
-			// 返回
-			back() {
-				var that = this
-				this.$router.push({
-					name: 'setTaskcd',
-					params: {
-						id: that.id
-					}
-				})
-			},
-			// 上传抽样信息
-			async appear() {
-				let that = this
-				// that.orgs = that.multipleSelection
-				console.log(that.multipleSelection)
-				const result = await this.$http.post('setSampleStatus', that.multipleSelection)
-				// 判断业务逻辑
-				if (result.data.code == 0) {
-					// 判断业务逻辑
-					if (result.data.code == 0) {
-						this.$message({
-							type: 'success',
-							message: '上报抽样信息成功'
-						})
-						this.getSampleList()
-					}
-				}
-			},
-			// 多选删除抽样信息
-			async delAll() {
-				let that = this
-				// that.orgs = that.multipleSelection
-				console.log(that.multipleSelection)
-				const result = await this.$http.post('delSample', that.multipleSelection)
-				// 判断业务逻辑
-				if (result.data.code == 0) {
-					this.$message({
-						type: 'success',
-						message: '删除成功'
-					})
-					this.getSampleList()
-				}
-			},
-			/** 修复当用户在大于1的分页进行数据搜索没有返回值的问题 */
-			setPageNum() {
-				this.queryInfo.pageNum = 1
-				this.getSampleList()
-			},
-			setSelectedRow() {
-				// 设置当前页已选项
-				this.hander = true
-				this.tableData.forEach(item => {
-					if (this.list.includes(item[this.uniqueKey])) {
-						this.$refs.multipleTable.toggleRowSelection(item, true)
-					}
-				})
-				this.hander = false
-			},
-
-			/** 监听每页显示多少数据的改变 */
-			handleSizeChange(newSize) {
-				this.queryInfo.pageSize = newSize
-				this.getSampleList()
-			},
-
-			/** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.getSampleList()
-			},
-			/** 监听每页显示多少数据的改变 */
-			handleSizeChange1(newSize) {
-				this.unitInfo.pageSize = newSize
-				this.getTestList()
-			},
-
-			/** 监听页码的改变 */
-			handleCurrentChange1(newPage) {
-				this.unitInfo.pageNum = newPage
-				this.getTestList()
-			},
-			// 批量勾选
-			handleSelectionChange(val) {
-				this.multipleSelection = val
-				console.log(this.multipleSelection)
-				if (this.hander) return false
-				// this.setSelectRows() // 处理选中的方法
-			},
-			// 跳转到查看抽样单详情
-			sampleDetail(id) {
-				console.log(id)
-				this.$router.push({
-					name: 'sampleDetail',
-					params: {
-						id: id
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-	.el-breadcrumb {
-		margin-bottom: 20px;
-	}
-
-	// .el-form-item {
-	// 	margin-bottom: 0px;
-	// }
-
-	.el-select {
-		width: 210px;
-		height: 100%;
-	}
-
-	.select {
-		display: flex;
-		flex-direction: row;
-		margin-left: 10px;
-	}
-
-	// .el-form {
-	// 	margin-left: 35%;
-	// }
-
-	// .el-form-item {
-	// 	// margin-bottom: 8px;
-	// 	margin: 0 auto;
-	// }
-
-	// .labelItem /deep/ .el-form-item__label {
-	// 	// width: 80px;
-	// 	text-align: center;
-	// 	vertical-align: middle;
-	// 	float: left;
-	// 	font-size: 14px;
-	// 	color: #606266;
-	// 	font-weight: bold;
-	// 	// line-height: 40px;
-	// 	padding: 0 20px 0 0;
-	// 	-webkit-box-sizing: border-box;
-	// 	box-sizing: border-box;
-	// }
-
-	.demonstration {
-		margin: 20px;
-	}
-
-	// .el-form-item__content {
-	// 	width: 200px;
-	// }
-
-	.footer {
-		margin-top: 20px;
-		margin-left: 45%;
-	}
-	.el-table{
-		margin-top: 20px;
-	}
-	.el-pagination {
-		margin-top: 25px;
-	}
-</style>

+ 69 - 65
src/components/jc/setTask.vue

@@ -12,10 +12,10 @@
 			<el-tab-pane label="基本信息" name="first">
 				<el-form :model="readForm" label-position="right" label-width="auto" style="margin-left: 35%;">
 					<el-form-item label="发布单位:" prop="releaser" class="labelItem" required>
-						<div>{{readForm.releaserInfo.rymc}}</div>
+						<div>{{readForm.releaser}}</div>
 					</el-form-item>
 					<el-form-item label="任务名称:" prop="task_name" class="labelItem" required>
-						<div>{{readForm.taskInfo.task_name}}</div>
+						<div>{{readForm.task_name}}</div>
 					</el-form-item>
 					<el-form-item label="任务优先级:" prop="level" class="labelItem" required>
 						<div v-if="readForm.level=='0'">一般</div>
@@ -23,50 +23,50 @@
 						<div v-else>特急</div>
 					</el-form-item>
 					<el-form-item label="监测类型:" prop="task_class" width="70px" class="labelItem" required>
-						<div>{{readForm.taskInfo.task_class}}</div>
+						<div>{{readForm.task_class}}</div>
 					</el-form-item>
-					<el-form-item label="检测模型:" prop="bindForm.test_model_id" width="70px" class="labelItem" required>
-						<el-select v-model="bindForm.test_model_id" size="mini" placeholder="请选择">
+					<el-form-item label="检测模型:" prop="readForm.test_model_id" width="70px" class="labelItem" required>
+						<el-select v-model="readForm.test_model_id" size="mini" placeholder="请选择">
 							<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
 							</el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="抽检分离:" prop="bindForm.is_divide" width="70px" class="labelItem">
-						<el-select v-model="bindForm.is_divide" size="mini">
+					<el-form-item label="抽检分离:" prop="is_divide" width="70px" class="labelItem">
+						<el-select v-model="readForm.is_divide" size="mini">
 							<el-option v-for="item in divideOptions" :key="item.id" :label="item.name" :value="item.id">
 							</el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item label="年度:" prop="year" class="labelItem" required>
-						<div>{{readForm.taskInfo.year}}</div>
+						<div>{{readForm.year}}</div>
 					</el-form-item>
 				<!-- 	<el-form-item label="发布机构所属区域:" prop="year" class="labelItem" required>
 						<div>{{readForm.year}}</div>
 					</el-form-item> -->
-				<el-form-item label="机构级别:" prop="releaserInfo.groupname" class="labelItem" required>
-					<div>{{readForm.releaserInfo.groupname}}</div>
+				<el-form-item label="机构级别:" prop="releaserInfo.releaser_group" class="labelItem" required>
+					<div>{{readForm.releaser_group}}</div>
 				</el-form-item>
 					<!-- <el-form-item label="批次:" prop="batch" width="200px" class="labelItem">
 						<div>{{readForm.batch}}</div>
 					</el-form-item> -->
 					<el-form-item label="任务时间:" prop="starttime" width="200px" class="labelItem" required>
-						<div>{{readForm.taskInfo.starttime}} 至 {{readForm.taskInfo.endtime}}</div>
+						<div>{{readForm.starttime}} 至 {{readForm.endtime}}</div>
 					</el-form-item>
 					<el-form-item label="抽样信息上报截止时间:" size="mini" class="labelItem" required>
-						<el-date-picker v-model="bindForm.endtime_cydsb" type="date" value-format="yyyy-MM-dd">
+						<el-date-picker v-model="readForm.endtime_cydsb" type="date" value-format="yyyy-MM-dd">
 						</el-date-picker>
 					</el-form-item>
 					<el-form-item label="附件:" prop="file_url" class="labelItem">
-						<div v-if="readForm.taskInfo.file_url==null">无</div>
-						<el-link v-else type="primary" :href="readForm.taskInfo.file_url">{{readForm.taskInfo.file_name}}</el-link>
+						<div v-if="readForm.file_url==null">无</div>
+						<el-link v-else type="primary" :href="readForm.file_url">{{readForm.file_name}}</el-link>
 					</el-form-item>
 					<el-form-item label="文件号:" prop="filenum" width="200px" class="labelItem">
-						<div v-if="readForm.taskInfo.filenum==null">无</div>
-						<div v-else>{{readForm.taskInfo.filenum}}</div>
+						<div v-if="readForm.filenum==null">无</div>
+						<div v-else>{{readForm.filenum}}</div>
 					</el-form-item>
 					<el-form-item label="备注:" prop="log" class="labelItem">
-						<div v-if="readForm.taskInfo.log==null">无</div>
-						<div v-else>{{readForm.taskInfo.log}}</div>
+						<div v-if="readForm.log==null">无</div>
+						<div v-else>{{readForm.log}}</div>
 					</el-form-item>
 
 				</el-form>
@@ -435,16 +435,16 @@
 		mounted() {
 			this.task_id = this.$route.params.id
 			console.log(this.$route.params.id)
-			this.getTaskDetail()
+			this.getTaskBaseInfo()
 			this.getmodelList()
-			// this.getUnderTask()
+			this.getUndertakeList()
 		},
 		created() {
 			this.task_id = this.$route.params.id
 			console.log(this.$route.params.id)
-			this.getTaskDetail()
+			this.getTaskBaseInfo()
 			this.getmodelList()
-			// this.getUnderTask()
+			this.getUndertakeList()
 		},
 
 		methods: {
@@ -469,7 +469,7 @@
 						message: '保存成功!'
 					});
 					this.resetForm(formName)
-					this.getTaskDetail()
+					this.getUndertakeList()
 				}
 			},
 			//重置
@@ -499,15 +499,15 @@
 					this.delarr.push(this.multipleSelection[i].id);
 				}
 				const result = await this.$http.post('delUnderTask', {
-					delarr: that.delarr,
-					token: token
+					delarr: that.delarr
+					// token: token
 				})
 				if (result.data.code == 0) {
 					this.$message({
 						type: 'success',
 						message: '删除成功!'
 					});
-					that.getTaskDetail()
+					that.getUndertakeList()
 				} else {
 					this.$message({
 						type: 'error',
@@ -518,15 +518,17 @@
 				this.$refs.multipleTable.clearSelection();
 			},
 			// 获取机构地域表格
-			// async getUnderTask() {
-			// 	this.queryInfo['task_id'] = this.task_id
-			// 	const result = await this.$http.post('getUnderTask', this.queryInfo)
-			// 	// 判断业务逻辑
-			// 	if (result.data.code == 0) {
-			// 		this.underTask = result.data.data.rows
-			// 		this.underTasktotal = result.data.data.total
-			// 	}
-			// },
+			async getUndertakeList() {
+				this.queryInfo['task_id'] = this.task_id
+				const result = await this.$http.post('getUndertakeList', this.queryInfo)
+				// 判断业务逻辑
+				console.log(result.data.data.rows)
+				if (result.data.code == 0) {
+					this.underTask = result.data.data.rows
+					this.underTasktotal = result.data.data.total
+				}
+				
+			},
 			// 提交选中报告上传单位
 			choseReportUnit() {
 				let that = this
@@ -611,21 +613,23 @@
 			async bindModel() {
 				var that = this
 				that.bindForm['id'] = that.task_id
+				that.bindForm['test_model_id'] = that.readForm.test_model_id
+				that.bindForm['is_divide'] = that.readForm.is_divide
+				that.bindForm['endtime_cydsb'] = that.readForm.endtime_cydsb
+
 				console.log(that.bindForm)
 				const {
 					data: res
 				} = await this.$http.post(
 					"bindModel", this.bindForm
 				);
-					console.log(this.res.message)
-
 				if (res.code == 0) {
 					this.$message({
 						type: 'success',
 						message: '绑定模型成功!'
 					});
 					console.log(this.res)
-					that.getTaskDetail()
+					that.getTaskBaseInfo()
 				}else{
 					console.log(this.res.message)
 					this.$message({
@@ -661,43 +665,43 @@
 				console.log(tab, event);
 			},
 			// 获取任务详情
-			async getTaskDetail() {
+			async getTaskBaseInfo() {
 				var that = this
 				const {
 					data: res
-				} = await this.$http.post("getTaskDetail", {
-					task_id: that.task_id,
-					pageNum: that.queryInfo.pageNum,
-					pageSize: that.queryInfo.pageSize
+				} = await this.$http.post("getTaskBaseInfo", {
+					task_id: that.task_id
 				});
-				console.log(res.data.product)
-				if (res.data.product.length > 0) {
-					if (res.data.product[0].type_id == '1') {
-						res.data.model_type = '种植业'
-					} else if (res.data.product[0].type_id == '2') {
-						res.data.model_type = '畜牧业'
-					} else if (res.data.product[0].type_id == '3') {
-						res.data.model_type = '渔业'
-					} else {
-						res.data.model_type = '其他'
-					}
+				console.log(res.data)
+				if (res.data.industry == '1') {
+					res.data.model_type = '种植业'
+				} else if (res.data.industry == '2') {
+					res.data.model_type = '畜牧业'
+				} else if (res.data.industry == '3') {
+					res.data.model_type = '渔业'
+				} else {
+					res.data.model_type = '其他'
 				}
+				
 				this.readForm = res.data
-				this.underTask = res.data.unitTaskList.rows
-				this.underTasktotal = res.data.unitTaskList.total
 				console.log(this.readForm)
-				this.bindForm.is_divide = res.data.taskInfo.is_divide
-				this.bindForm.endtime_cydsb = res.data.taskInfo.endtime_cydsb
+				console.log(this.readForm.releaser)
+
+				// this.underTask = res.data.unitTaskList.rows
+				// this.underTasktotal = res.data.unitTaskList.total
+				
+				// this.bindForm.is_divide = res.data.taskInfo.is_divide
+				// this.bindForm.endtime_cydsb = res.data.taskInfo.endtime_cydsb
 				// this.bindForm.test_model_id = Number(res.data.taskInfo.test_model_id)
-				if(res.data.taskInfo.test_model_id === null) {
-					this.bindForm.test_model_id = undefined
+				if(res.data.test_model_id === null) {
+					this.readForm.test_model_id = undefined
 				}else
 				{
-					this.bindForm.test_model_id = Number(res.data.taskInfo.test_model_id)
+					this.readForm.test_model_id = Number(res.data.test_model_id)
 				}
-				console.log(this.bindForm.test_model_id)
+				console.log(this.readForm.test_model_id)
 				
-				console.log(this.divideOptions.id)
+				// console.log(this.divideOptions.id)
 			},
 
 			/** 修复当用户在大于1的分页进行数据搜索没有返回值的问题 */
@@ -719,13 +723,13 @@
 			/** 监听每页显示多少数据的改变 */
 			handleSizeChange(newSize) {
 				this.queryInfo.pageSize = newSize
-				this.getTaskDetail()
+				this.getTaskBaseInfo()
 			},
 
 			/** 监听页码的改变 */
 			handleCurrentChange(newPage) {
 				this.queryInfo.pageNum = newPage
-				this.getTaskDetail()
+				this.getTaskBaseInfo()
 			},
 			// 批量勾选
 			handleSelectionChange(val) {

+ 52 - 47
src/components/jc/taskdetail.vue

@@ -1,35 +1,35 @@
 <template>
 	<div id="pdf1">
-		<el-descriptions class="margin-top" :title="readForm.taskInfo.task_class+'任务'" :column="2" :size="size" border>
+		<el-descriptions class="margin-top" :title="readForm.task_class+'任务'" :column="2" :size="size" border>
 			<el-descriptions-item>
 				<template slot="label">
 					发布单位
 				</template>
-				{{readForm.releaserInfo.rymc}}
+				{{readForm.releaser}}
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
 					年度
 				</template>
-				{{readForm.taskInfo.year}}
+				{{readForm.year}}
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
 					开始时间和结束时间
 				</template>
-				{{readForm.taskInfo.starttime}}-{{readForm.taskInfo.endtime}}
+				{{readForm.starttime}}-{{readForm.endtime}}
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
 					抽样信息上报截止时间
 				</template>
-				{{readForm.taskInfo.endtime_cydsb}}
+				{{readForm.endtime_cydsb}}
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
 					监测类型
 				</template>
-				{{readForm.taskInfo.task_class}}
+				{{readForm.task_class}}
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
@@ -44,15 +44,15 @@
 				<template slot="label">
 					抽检分离
 				</template>
-				<span v-if="readForm.taskInfo.is_divide==1">是</span>
-				<span v-if="readForm.taskInfo.is_divide==0">否</span>
+				<span v-if="readForm.is_divide==1">是</span>
+				<span v-if="readForm.is_divide==0">否</span>
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
 					附件
 				</template>
-				<div v-if="readForm.taskInfo.file_url==null">无</div>
-				<el-link v-else type="primary" :href="readForm.taskInfo.file_url">下载附件</el-link>
+				<div v-if="readForm.file_url==null">无</div>
+				<el-link v-else type="primary" :href="readForm.file_url">下载附件</el-link>
 			</el-descriptions-item>
 
 		</el-descriptions>
@@ -61,7 +61,7 @@
 				<template slot="label">
 					备注
 				</template>
-				{{readForm.taskInfo.log}}
+				{{readForm.log}}
 			</el-descriptions-item>
 		</el-descriptions>
 		<el-descriptions class="margin-top" :size="size" border>
@@ -99,6 +99,7 @@
 				activeName: 'first',
 				id: 0,
 				task_id: this.task_id,
+				queryInfo:{},
 				readForm: {
 					// releaser: '',
 					// task_name: '',
@@ -179,62 +180,66 @@
 			};
 		},
 		created() {
-			this.getTaskDetail();
-			// this.getUnderTask();
+			this.getTaskBaseInfo()
+			this.getUndertakeList()
+			console.log(this.task_id)
 		},
 		methods: {
 			handleClick(tab, event) {
 				console.log(tab, event);
 			},
 			// 获取任务详情
-			async getTaskDetail() {
+			async getTaskBaseInfo() {
 				var that = this
 				const {
 					data: res
-				} = await this.$http.post("getTaskDetail", {
+				} = await this.$http.post("getTaskBaseInfo", {
 					task_id: that.task_id
 				});
-				console.log(res.data.product)
-				// if (res.data.modelInfo.product.length > 0) {
-					if (res.data.modelInfo.type_id == '1') {
-						res.data.model_type = '种植业'
-					} else if (res.data.modelInfo.type_id == '2') {
-						res.data.model_type = '畜牧业'
-					} else if (res.data.modelInfo.type_id == '3') {
-						res.data.model_type = '渔业'
-					} else if (res.data.modelInfo.type_id == '4') {
-						res.data.model_type = '其他'
-					}else {
-						res.data.model_type = '无'
-					}
-				// }
+				console.log(res.data)
+				if (res.data.industry == '1') {
+					res.data.model_type = '种植业'
+				} else if (res.data.industry == '2') {
+					res.data.model_type = '畜牧业'
+				} else if (res.data.industry == '3') {
+					res.data.model_type = '渔业'
+				} else {
+					res.data.model_type = '其他'
+				}
+				
 				this.readForm = res.data
-				this.underTask = res.data.unitTaskList.rows
-				this.underTasktotal = res.data.unitTaskList.total
-				console.log(this.readForm.product)
+				console.log(this.readForm)
+				console.log(this.readForm.releaser)	
+				console.log(this.readForm.task_class)	
+
+				if(res.data.test_model_id === null) {
+					this.readForm.test_model_id = undefined
+				}else
+				{
+					this.readForm.test_model_id = Number(res.data.test_model_id)
+				}
+				console.log(this.readForm.test_model_id)
 				
-				this.readForm.taskInfo.is_divide = res.data.taskInfo.is_divide
-					
-				this.readForm.taskInfo.endtime_cydsb = res.data.taskInfo.endtime_cydsb
-			
 				that.productNameText = that.readForm.product.map(el => el.product_name).join('、 ')
 				console.log(that.productNameText)
 				that.pesticidesNameText = that.readForm.pesticides.map(el => el.test_name).join('、 ')
 			
 				console.log(this.divideOptions.id)
 			},
+			
 			// 获取机构地域表格
-			// async getUnderTask() {
-
-			// 	const result = await this.$http.post('getUnderTask', {
-			// 		task_id: this.task_id
-			// 	})
-			// 	// 判断业务逻辑
-			// 	if (result.data.code == 0) {
-			// 		this.underTask = result.data.data.rows
-			// 		this.underTasktotal = result.data.data.total
-			// 	}
-			// },
+			async getUndertakeList() {
+				console
+				this.queryInfo['task_id'] = this.task_id
+				const result = await this.$http.post('getUndertakeList', this.queryInfo)
+				// 判断业务逻辑
+				console.log(result.data.data.rows)
+				if (result.data.code == 0) {
+					this.underTask = result.data.data.rows
+					this.underTasktotal = result.data.data.total
+				}
+				
+			},
 		}
 	}
 </script>