监管端

src/components/admin/addTask.vue

@@ -45,9 +45,9 @@
 					</el-date-picker>
 				</el-col>
 			</el-form-item>
-			<el-form-item label="发布单位" required>
+			<!-- <el-form-item label="发布单位" required>
 				<el-input v-model="rymc" :disabled="true"></el-input>
-			</el-form-item>
+			</el-form-item> -->
 			<el-form-item label="牵头单位" required>
 				<el-input v-model="form.main_unit" @focus="getTestListShow = true"></el-input>
 			</el-form-item>

src/components/admin/leadReport.vue

@@ -20,8 +20,8 @@
                 	</el-option>
                 </el-select>
                 <!-- 返回按钮 -->
-                <el-button class="btns" type="info" size="small" @click="returnTask">
-					返回任务列表
+                <el-button plain class="btns" type="info" size="small" @click="returnTask">
+					返回
 				</el-button>
             </div>
 			<!-- 表格 -->

src/components/admin/routineMonitor.vue

@@ -92,7 +92,7 @@
 						<el-tag type="success"  effect="plain" v-if="scope.row.ispublic==5">执行中</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="level" label="任务优先级" width="85">
+				<el-table-column prop="level" label="任务优先级" width="105">
 					<template slot-scope="scope">
 						<el-tag type="success" v-if="scope.row.level==0">一般</el-tag>
 						<el-tag type="warning" v-if="scope.row.level==1">紧急</el-tag>
@@ -104,10 +104,10 @@
 				<template slot-scope="scope">
 					<el-col style="margin-bottom: 5px;">
 						<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)">详情</el-button>
-						<el-button type="success" size="mini" plain @click="takeTheLeadReport()">牵头单位报告</el-button>
+						<el-button type="success" size="mini" plain @click="takeTheLeadReportList(scope.row.id)">牵头单位报告</el-button>
 					</el-col>
 					<el-col style="margin-bottom: 5px;">
-						<el-button type="success" size="mini" plain @click="undertakeReport()">承担单位报告</el-button>
+						<el-button type="success" size="mini" plain @click="undertakeReport(scope.row.id)">承担单位报告</el-button>
 						<el-button type="success" size="mini" plain @click="taskSample(scope.row.id)">抽样单</el-button>
 					</el-col>
 				</template>
@@ -225,7 +225,7 @@
 					{
 						label: '创建者',
 						prop: 'creater',
-						width: 120
+						width: 160
 					},
 					{
 						label: '创建时间',
@@ -301,11 +301,23 @@
 			add() {
 				this.$router.push('addTask')
 			},
-			takeTheLeadReport() {
-				this.$router.push('takeTheLeadReportList')
+			takeTheLeadReportList(id) {
+				console.log(id)
+				this.$router.push({
+					name:'takeTheLeadReportList',
+					params: {
+					task_id: id,
+					}
+				})
 			},
-			undertakeReport(){
-				this.$router.push('undertakeReport')
+			undertakeReport(id){
+				console.log(id)
+				this.$router.push({
+					name:'undertakeReport',
+					params: {
+					task_id: id,
+					}
+				})
 			},
 			taskSample(id){
 				console.log(id)

src/components/admin/specialMonitor.vue

@@ -95,8 +95,8 @@
 						<el-button type="success" size="mini" plain @click="leadReport()">牵头单位报告</el-button>
 					</el-col>
 					<el-col style="margin-bottom: 5px;">
-						<el-button type="success" size="mini" plain @click="undertakeReporttwo()">承担单位报告</el-button>
-						<el-button type="success" size="mini" plain @click="taskSampletwo()">抽样单</el-button>
+						<el-button type="success" size="mini" plain @click="undertakeReportZx()">承担单位报告</el-button>
+						<el-button type="success" size="mini" plain @click="taskSampleZx()">抽样单</el-button>
 					</el-col>
 				</template>
 			</el-table-column>
@@ -287,16 +287,36 @@
 			this.gettaskList()
 		},
 		methods: {
+			//跳转抽样单
+			taskSampleZx(id){
+				console.log(id)
+				this.$router.push({
+					name:'taskSampleZx',
+					params: {
+					task_id: id,
+					}
+				})
+		},
+			//跳转承担单位
+			undertakeReportZx(id){
+				console.log(id)
+				this.$router.push({
+					name:'undertakeReportZx',
+					params: {
+					task_id: id,
+					}
+				})
+			},
 			// 搜索
 			async searchData() {
 				this.queryInfo.pageNum = 1
 				this.gettaskList()
 			},
-			undertakeReporttwo(){
-				this.$router.push('undertakeReporttwo')
+			undertakeReportZx(){
+				this.$router.push('undertakeReportZx')
 			},
-			taskSampletwo(){
-				this.$router.push('taskSampletwo')
+			taskSampleZx(){
+				this.$router.push('taskSampleZx')
 			},
 			// 重置
 			reset(){

src/components/admin/takeTheLeadReportList.vue

@@ -20,8 +20,8 @@
 						<el-input v-model="queryInfo.task_name"></el-input>
 					</el-form-item>
 					<el-button type="success" size="small">查询</el-button>
-					<el-button class="btns" type="info" size="" @click="returnTask">
-						返回任务列表
+					<el-button plain class="btns" type="info" size="" @click="returnTask">
+						返回
 					</el-button>
 				</el-form> 
 			</el-row>
@@ -138,23 +138,47 @@
 				tableData: []
             }
         },
+		mounted: function() {
+			this.getJgQtouList()
+		},
+		created: function() {
+			console.log(this.$route.params.task_id)
+			// this.unit_id = this.$route.params.unit_id
+			this.task_id = this.$route.params.task_id
+			this.getJgQtouList()
+		},
 		 methods: {
 			  /** 监听页码的改变 */
 			handleCurrentChange(newPage) {
 				this.queryInfo.pageNum = newPage
-				this.gettaskList()
+				this.getJgQtouList()
 			},
 			/** 监听每页显示多少数据的改变 */
 			handleSizeChange(newSize) {
 				this.queryInfo.pageSize = newSize
-				this.gettaskList()
+				this.getJgQtouList()
 			},
 			
 			/** 监听页码的改变 */
 			handleCurrentChange(newPage) {
 				this.queryInfo.pageNum = newPage
-				this.gettaskList()
+				this.getJgQtouList()
 			},
+			// 获取牵头单位报告列表
+				async getJgQtouList() {
+				const result = await this.$http.post('getJgQtouList', {
+					task_id: this.task_id,
+					pageSize:this.queryInfo.pageSize,
+					pageNum:this.queryInfo.pageNum
+				})
+				console.log( result.data)
+				console.log(this.queryInfo.pageSize)
+				if (result.data.code == 0) {
+				this.tableData = result.data.data
+				}
+				console.log(this.tableData)
+				},
+				
         	returnTask(){
             this.$router.push('routineMonitor')
         	},

src/components/admin/taskSample.vue

@@ -4,28 +4,17 @@
 			<el-breadcrumb separator-class="el-icon-arrow-right">	
 		  	<el-breadcrumb-item >首页</el-breadcrumb-item>
 		  	<el-breadcrumb-item>监测任务</el-breadcrumb-item>
-		  	<el-breadcrumb-item>专项监测</el-breadcrumb-item>
 		  	<el-breadcrumb-item>抽样单</el-breadcrumb-item>
 			</el-breadcrumb>
 		</div>	
-		<!-- 下拉菜单 -->
-	<div>
-			牵头单位
-        <el-select v-model="value" placeholder="请选择">
-            <el-option
-                v-for="item in qiantouList"
-                :key="item.unit_id"
-                :label="item.unit_id"
-                :value="item.unit_id">
-            </el-option>
-        </el-select>
+		<!-- 牵头单位弹框 -->
+		<el-button icon="el-icon-search" @click="dialogVisible=true" size="medium">搜索牵头单位</el-button>
         <!-- 返回按钮 -->
 		<div class="btns">
 			<el-button plain size="" @click="returnTask()">
 				返回
 			</el-button>
 		</div>
-	</div>
 	<!-- 表格数据区域-->
 	<div class="table">
 		<el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row style="width: 100%" 
@@ -39,9 +28,9 @@
 		align="center" :width="table.width" :fixed="table.fixed"/>
 		<el-table-column label="操作" align="center" fixed="right">
 			<!-- 操作按钮区域的作用域插槽 -->
-			<template slot-scope="scope">
+			<template >
 					<!-- <el-button type="success" size="mini" @click="readDialogVisible1(scope.row)">抽样单详情</el-button> -->
-					<el-button style="margin: 5px auto;" type="success" size="small" @click="readDialogVisible1()">查看详情</el-button>
+					<el-button style="margin: 5px auto;" type="success" size="small" @click="readSampleList()">查看详情</el-button>
 					<el-button  size="small"  @click="sendBack()">退回</el-button>
 			</template>
 		</el-table-column>
@@ -52,9 +41,29 @@
 					:page-sizes="[10, 15, 20]" :page-size="queryInfo.pageSize" 
 					layout="total, sizes, prev, pager, next, jumper" :total="total" background />
 		</div>
-		<!-- 查看详情对话框 -->
-		<el-dialog title="查看" :visible.sync="readDialogVisible" width="80%" :close-on-click-modal="false" class="dialogItem">
-				<el-form v-if="readDialogVisible"></el-form>
+			<!-- 牵头单位弹框 -->
+			<el-dialog title="机构选择" :visible.sync="dialogVisible" width="50%" :close-on-click-modal="ture" :show-close="true" :center="true" @click="getTestList()" >
+			<!-- <el-form v-if="getQtListShow" :model="getTestListForm"> -->
+				<!--  表格数据区域-->
+				<el-table ref="multipleTable" :data="QtouList" row-key="id" @selection-change="handleSelectionChange()"
+					border stripe highlight-current-row style="width: 100%">
+					<el-table-column type="selection" :reserve-selection="true" 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.prop" v-for="table in tableHeader_qt" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+				</el-table>
+				<div class="footer">
+					<!--    分页器区域-->
+					<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-button type="success" @click="dialogVisible = false" size="small">提交</el-button>
+				</div>
+			<!-- </el-form> -->
 		</el-dialog>
 	</div>
 	</div>
@@ -67,12 +76,12 @@
 		name: '',
 		data() {
 			return {
+				
+				//控制弹框显隐
+				dialogVisible: false,
 				total:0,
-				// 牵头单位下拉框
-				qiantouList: [
-				],
-				task_id:'',
 				queryInfo:{
+					keyWord: '',
 					year:'',
 					task_name:'',
 					starttime:'',
@@ -81,20 +90,7 @@
 					pageSize:10,
 					pageNum:1,
 					task_class:'专项监测',
-					// sample_id: '',
-					// sample_name:'',
-					// task_id:'',
-					// place:'',
-					// sample_date:'',
-					// sample_status:'',
-					// test_status:'',
-					// bear_name:'',
-					// check_name:'',
-					// report_name:'',
-					// underTake_task_id:'',
-					// unit_test_name:'',
-					// unit_production_name:'',
-					// undertake_id:''
+					task_id:'',
 				},
             cellStyle: {
 					padding: 2 + 'px'
@@ -111,7 +107,7 @@
 					{
 						label: '样品编码',
 						prop: 'sample_id',
-						width: 150
+						width: 200
 						// fixed: 'left'
 					}, {
 						label: '商标',
@@ -140,20 +136,52 @@
 						width: 180
 					}
 				],
+				// 表头
+				tableHeader_qt: [{
+						label: '单位名称',
+						prop: 'name',
+						width: 300
+						// fixed: 'left'
+					},
+					{
+						label: '机构类型',
+						prop: 'jgxz',
+						// width: 40
+						// fixed: 'left'
+					}, {
+						label: '所属区域',
+						prop: 'ssqy',
+						width: 300
+						// fixed: 'left'
+					},{
+						label: '产品范围',
+						prop: 'cpfw',
+						width: 300
+						// fixed: 'left'
+					}
+				],
+				// 总共多少条数据
+				total: 0,
+				// table表格多选选项
+				multipleSelection: null,
+				getQtListShow: {},
+				// 选中的牵头单位
+				orgs: [],
 				// 数据表格数据
-			tableData: []
+			tableData: [],
+			QtouList:[]
 			}
 		},
 		mounted: function() {
 			this.getJgCydList()
-			// this.getQtouList()
+			this.getQtouList()
 		},
 		created: function() {
 			console.log(this.$route.params.task_id)
 			// this.unit_id = this.$route.params.unit_id
 			this.task_id = this.$route.params.task_id
 			this.getJgCydList()
-			// this.getQtouList()
+			this.getQtouList()
 		},
 		
 		methods: {
@@ -165,20 +193,23 @@
 					console.log(`当前页: ${val}`);
 					this.getJgCydList()
 				},
-				// 批量选中
+			//批量选中
 				handleSelectionChange(val) {
 					this.multipleSelection = val;
 					console.log(this.multipleSelection)
 			},
+			
 			//获取牵头单位列表
-			// async getQtouList() {
-			// 	const result = await this.$http.post('getQtouList', {
-			// 		task_id: this.task_id,
-			// 	})
-			// 	if (result.data.code == 0) {
-			// 		this.qiantouList = result.data.data
-			// 	}
-			// }
+			async getQtouList() {
+				this.queryInfo['token'] = token
+				const result = await this.$http.post('getQtouList',this.queryInfo )
+				console.log( result.data.data.rows);
+				// 判断业务逻辑
+				if (result.data.code == 0) {
+					this.QtouList = result.data.data.rows
+					this.total = result.data.data.total
+				}
+			},
 			//返回
 			returnTask(){
 				this.$router.push('routineMonitor')
@@ -195,7 +226,7 @@
 				this.queryInfo.pageNum = newPage
 				this.getJgCydList()
 			},
-				// 获取抽样单列表
+			// 获取抽样单列表
 				async getJgCydList() {
 				const result = await this.$http.post('getJgCydList', {
 					task_id: this.task_id,
@@ -205,15 +236,17 @@
 				console.log( result.data)
 				console.log(this.queryInfo.pageSize)
 				if (result.data.code == 0) {
-				this.tableData = result.data.data
+				this.tableData = result.data.data.rows
 				}
 				console.log(this.tableData)
 				},
-				//查看详情
-				async readDialogVisible1(row) {
-	
+			//查看详情
+			async readSampleList(row) {
+				const result = await this.$http.post('readSampleList',{
+					task_id:this.task_id,
+				})
 			},
-				}
+		}
 		}
 	
 	
@@ -228,4 +261,10 @@
 	float:right;
 	padding: 10px;
 }
+.footer {
+		margin-top: 5px;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+}
 </style>

src/components/admin/taskSampleZx.vue

@@ -0,0 +1,270 @@
+<template>
+	<div>	
+		<div slot="header" class="clearfix">
+			<el-breadcrumb separator-class="el-icon-arrow-right">	
+		  	<el-breadcrumb-item >首页</el-breadcrumb-item>
+		  	<el-breadcrumb-item>监测任务</el-breadcrumb-item>
+		  	<el-breadcrumb-item>抽样单</el-breadcrumb-item>
+			</el-breadcrumb>
+		</div>	
+		<!-- 牵头单位弹框 -->
+		<el-button icon="el-icon-search" @click="dialogVisible=true" size="medium">搜索牵头单位</el-button>
+        <!-- 返回按钮 -->
+		<div class="btns">
+			<el-button plain size="" @click="returnTask()">
+				返回
+			</el-button>
+		</div>
+	<!-- 表格数据区域-->
+	<div class="table">
+		<el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row style="width: 100%" 
+		:row-style="rowStyle" :cell-style="cellStyle"  @selection-change="handleSelectionChange">
+		<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 >
+					<!-- <el-button type="success" size="mini" @click="readDialogVisible1(scope.row)">抽样单详情</el-button> -->
+					<el-button style="margin: 5px auto;" type="success" size="small" @click="readSampleList()">查看详情</el-button>
+					<el-button  size="small"  @click="sendBack()">退回</el-button>
+			</template>
+		</el-table-column>
+		</el-table>
+			<!-- 分页器区域-->
+		<div class="block">
+				 <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryInfo.pageNum"
+					:page-sizes="[10, 15, 20]" :page-size="queryInfo.pageSize" 
+					layout="total, sizes, prev, pager, next, jumper" :total="total" background />
+		</div>
+			<!-- 牵头单位弹框 -->
+			<el-dialog title="机构选择" :visible.sync="dialogVisible" width="50%" :close-on-click-modal="ture" :show-close="true" :center="true" @click="getTestList()" >
+			<!-- <el-form v-if="getQtListShow" :model="getTestListForm"> -->
+				<!--  表格数据区域-->
+				<el-table ref="multipleTable" :data="QtouList" row-key="id" @selection-change="handleSelectionChange()"
+					border stripe highlight-current-row style="width: 100%">
+					<el-table-column type="selection" :reserve-selection="true" 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.prop" v-for="table in tableHeader_qt" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+				</el-table>
+				<div class="footer">
+					<!--    分页器区域-->
+					<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-button type="success" @click="dialogVisible = false" size="small">提交</el-button>
+				</div>
+			<!-- </el-form> -->
+		</el-dialog>
+	</div>
+	</div>
+		
+</template>
+
+<script>
+	const token = window.sessionStorage.getItem('token')
+	export default {
+		name: '',
+		data() {
+			return {
+				
+				//控制弹框显隐
+				dialogVisible: false,
+				total:0,
+				queryInfo:{
+					keyWord: '',
+					year:'',
+					task_name:'',
+					starttime:'',
+					endtime:'',
+					ispublic:'',
+					pageSize:10,
+					pageNum:1,
+					task_class:'专项监测',
+					task_id:'',
+				},
+            cellStyle: {
+					padding: 2 + 'px'
+				},
+			rowStyle: {
+					height: 35 + 'px'
+				},
+			tableHeader: [{
+						label: '样品名称',
+						prop: 'sample_name',
+						width: 150
+						// fixed: 'left'
+					},
+					{
+						label: '样品编码',
+						prop: 'sample_id',
+						width: 200
+						// fixed: 'left'
+					}, {
+						label: '商标',
+						prop: 'brand',
+						width: 150
+						// fixed: 'left'
+					},
+					{
+						label: '等级',
+						prop: 'level',
+						width: 120
+					},
+					{
+						label: '抽样基数',
+						prop: 'sample_base',
+						width: 120
+					},
+					{
+						label: '抽样场所',
+						prop: 'sample_ground',
+						width: 120
+					},
+					{
+						label: '状态',
+						prop: 'sample_status',
+						width: 180
+					}
+				],
+				// 表头
+				tableHeader_qt: [{
+						label: '单位名称',
+						prop: 'name',
+						width: 300
+						// fixed: 'left'
+					},
+					{
+						label: '机构类型',
+						prop: 'jgxz',
+						// width: 40
+						// fixed: 'left'
+					}, {
+						label: '所属区域',
+						prop: 'ssqy',
+						width: 300
+						// fixed: 'left'
+					},{
+						label: '产品范围',
+						prop: 'cpfw',
+						width: 300
+						// fixed: 'left'
+					}
+				],
+				// 总共多少条数据
+				total: 0,
+				// table表格多选选项
+				multipleSelection: null,
+				getQtListShow: {},
+				// 选中的牵头单位
+				orgs: [],
+				// 数据表格数据
+			tableData: [],
+			QtouList:[]
+			}
+		},
+		mounted: function() {
+			this.getJgCydList()
+			this.getQtouList()
+		},
+		created: function() {
+			console.log(this.$route.params.task_id)
+			// this.unit_id = this.$route.params.unit_id
+			this.task_id = this.$route.params.task_id
+			this.getJgCydList()
+			this.getQtouList()
+		},
+		
+		methods: {
+				handleSizeChange(val) {
+					console.log(`每页 ${val} 条`);
+				},
+				handleCurrentChange(val) {
+					this.queryInfo.pageNum = val;
+					console.log(`当前页: ${val}`);
+					this.getJgCydList()
+				},
+			//批量选中
+				handleSelectionChange(val) {
+					this.multipleSelection = val;
+					console.log(this.multipleSelection)
+			},
+			
+			//获取牵头单位列表
+			async getQtouList() {
+				this.queryInfo['token'] = token
+				const result = await this.$http.post('getQtouList',this.queryInfo )
+				console.log( result.data.data.rows);
+				// 判断业务逻辑
+				if (result.data.code == 0) {
+					this.QtouList = result.data.data.rows
+					this.total = result.data.data.total
+				}
+			},
+			//返回
+			returnTask(){
+				this.$router.push('specialMonitor')
+			},
+
+			/** 监听每页显示多少数据的改变 */
+			handleSizeChange1(newSize) {
+				this.queryInfo.pageSize = newSize
+				this.getJgCydList()
+			},
+
+			/** 监听页码的改变 */
+			handleCurrentChange1(newPage) {
+				this.queryInfo.pageNum = newPage
+				this.getJgCydList()
+			},
+			// 获取抽样单列表
+				async getJgCydList() {
+				const result = await this.$http.post('getJgCydList', {
+					task_id: this.task_id,
+					pageSize:this.queryInfo.pageSize,
+					pageNum:this.queryInfo.pageNum
+				})
+				console.log( result.data)
+				console.log(this.queryInfo.pageSize)
+				if (result.data.code == 0) {
+				this.tableData = result.data.data.rows
+				}
+				console.log(this.tableData)
+				},
+			//查看详情
+			async readSampleList(row) {
+				const result = await this.$http.post('readSampleList',{
+					task_id:this.task_id,
+				})
+			},
+		}
+		}
+	
+	
+	
+</script>
+
+<style>
+.block{
+	padding: 10px;
+}
+.btns{
+	float:right;
+	padding: 10px;
+}
+.footer {
+		margin-top: 5px;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+}
+</style>

src/components/admin/undertakeReport.vue

@@ -20,7 +20,7 @@
                 </el-option>
                 </el-select>
                 <!-- 返回按钮 -->
-                <el-button class="btns" type="info" size="small" @click="returnTask">返回任务列表</el-button>
+                <el-button plain class="btns" type="info" size="small" @click="returnTask">返回</el-button>
 
             </div>
 			<!-- 表格 -->
@@ -163,6 +163,15 @@ export default {
         value: ''
       }
     },
+		mounted: function() {
+			this.getJgCdList()
+		},
+		created: function() {
+			console.log(this.$route.params.task_id)
+			// this.unit_id = this.$route.params.unit_id
+			this.task_id = this.$route.params.task_id
+			this.getJgCdList()
+		},
     methods: {
 		/** 监听每页显示多少数据的改变 */
 			handleSizeChange(newSize) {
@@ -175,6 +184,20 @@ export default {
 				this.queryInfo.pageNum = newPage
 				this.gettaskList()
 			},
+			// 获取承担单位报告列表
+				async getJgCdList(id) {
+				const result = await this.$http.post('getJgCdList', {
+					task_id: this.task_id,
+					pageSize:this.queryInfo.pageSize,
+					pageNum:this.queryInfo.pageNum
+				})
+				console.log( result.data)
+				console.log(this.queryInfo.pageSize)
+				if (result.data.code == 0) {
+				this.tableData = result.data.data.rows
+				}
+				console.log(this.tableData)
+				},
         returnTask()
         {
             this.$router.push('routineMonitor')

src/components/admin/undertakeReportZx.vue

@@ -0,0 +1,216 @@
+<template>
+
+	<div style="width: 100%">
+			<div slot="header" class="clearfix">
+				<el-breadcrumb separator-class="el-icon-arrow-right">
+					<el-breadcrumb-item >首页</el-breadcrumb-item>
+		  			<el-breadcrumb-item>监测任务</el-breadcrumb-item>
+		  			<el-breadcrumb-item>专项监测</el-breadcrumb-item>
+		  			<el-breadcrumb-item>承担报告单位列表</el-breadcrumb-item>
+				</el-breadcrumb>
+			</div>    
+            <div>
+                <!-- 下拉菜单 -->
+                <el-select v-model="value" placeholder="请选择">
+                <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                </el-option>
+                </el-select>
+                <!-- 返回按钮 -->
+                <el-button plain class="btns" type="info" size="small" @click="returnTask">返回</el-button>
+
+            </div>
+			<!-- 表格 -->
+            <div class="table">
+                <el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row style="width: 100%"
+		        :row-style="rowStyle" :cell-style="cellStyle" @selection-change="handleSelectionChange">
+		        <!-- <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="mini" @click="readDialogVisible1(scope.row)">抽样单详情</el-button>
+			</template> -->
+		</el-table-column>
+	    </el-table>
+            </div>
+               <!--分页器区域-->
+			<div class="block">
+				 <el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page="currentPage4"
+					:page-sizes="[10, 15, 20, ]"
+					:page-size="queryInfo.pageSize"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="total"
+					background />
+    			
+			</div>
+			<!-- <el-table  :data="tableData"  style="width: 100%">
+      			<el-table-column
+        		prop="num"
+        		label="序号"
+        		width="80">
+      			</el-table-column>
+      			<el-table-column
+        		prop="year"
+        		label="年份"
+        		width="80">
+      			</el-table-column>
+      			<el-table-column
+        		prop="task"
+        		label="所属任务"
+				width="200">
+      			</el-table-column>
+				  <el-table-column
+        		prop="company"
+        		label="单位"
+				width="120">
+      			</el-table-column>
+				   <el-table-column
+        		prop="reportname"
+        		label="报告名称"
+				width="200">
+      			</el-table-column>
+				  <el-table-column
+        		prop="state"
+        		label="状态"
+				width="80">
+      			</el-table-column>
+				  <el-table-column
+        		prop="operation"
+        		label="操作"
+				width="80">
+      			</el-table-column>
+    		</el-table> -->
+	
+	
+	</div>
+</template>
+
+<script>
+export default {
+    data() {
+      return {
+		   total:0,
+				queryInfo:{
+					year:'',
+					task_name:'',
+					starttime:'',
+					endtime:'',
+					ispublic:'',
+					pageSize:10,
+					pageNum:1,
+					task_class:'专项监测'
+				},
+           cellStyle: {
+					padding: 2 + 'px'
+				},
+				rowStyle: {
+					height: 35 + 'px'
+				},
+				tableHeader: [{
+						label: '年份',
+						prop: '',
+						width: 50
+						// fixed: 'left'
+					},
+					{
+						label: '所属任务',
+						prop: '',
+						width:200
+						// fixed: 'left'
+					}, {
+						label: '单位',
+						prop: '',
+						width: 150
+						// fixed: 'left'
+					},
+					{
+						label: '报告名称',
+						prop: '',
+						width: 200
+					},
+					{
+						label: '状态',
+						prop: '',
+						width: 180
+					}
+				],
+        options: [{
+          value: '选项1',
+          label: '测试1'
+        }, {
+          value: '选项2',
+          label: '测试2'
+        }, {
+          value: '选项3',
+          label: '测试3'
+        }, {
+          value: '选项4',
+          label: '测试4'
+        }],
+        value: ''
+      }
+    },
+		mounted: function() {
+			this.getJgCdList()
+		},
+		created: function() {
+			console.log(this.$route.params.task_id)
+			// this.unit_id = this.$route.params.unit_id
+			this.task_id = this.$route.params.task_id
+			this.getJgCdList()
+		},
+    methods: {
+		/** 监听每页显示多少数据的改变 */
+			handleSizeChange(newSize) {
+				this.queryInfo.pageSize = newSize
+				this.gettaskList()
+			},
+			
+			/** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.queryInfo.pageNum = newPage
+				this.gettaskList()
+			},
+			// 获取承担单位报告列表
+				async getJgCdList(id) {
+				const result = await this.$http.post('getJgCdList', {
+					task_id: this.task_id,
+					pageSize:this.queryInfo.pageSize,
+					pageNum:this.queryInfo.pageNum
+				})
+				console.log( result.data)
+				console.log(this.queryInfo.pageSize)
+				if (result.data.code == 0) {
+				this.tableData = result.data.data.rows
+				}
+				console.log(this.tableData)
+				},
+        returnTask()
+        {
+            this.$router.push('specialMonitor')
+        }
+    }
+}
+</script>
+
+<style>
+.btns{
+    float:right;
+}
+.table{
+    padding: 10px;
+}
+</style>

src/router/index.js

@@ -48,6 +48,7 @@ const routes = [{
 			},
 			{
 				path: '/admin/takeTheLeadReportList',
+				name:'takeTheLeadReportList',
 				component: () => import('../components/admin/takeTheLeadReportList')
 			},{
 				path: '/admin/taskSample',
@@ -58,8 +59,24 @@ const routes = [{
 				component: () => import('../components/admin/leadReport')
 			},{
 				path: '/admin/undertakeReport',
+				name:'undertakeReport',
 				component: () => import('../components/admin/undertakeReport')
 			},
+			// {
+			// 	path: '/admin/readSampleList',
+			// 	name:'readSampleList',
+			// 	component: () => import('../components/admin/readSampleList')
+			// },
+		{
+			path: '/admin/taskSampleZx',
+				name:'taskSampleZx',
+				component: () => import('../components/admin/taskSampleZx')
+			},
+			{
+				path: '/admin/undertakeReportZx',
+					name:'taskSampleZx',
+					component: () => import('../components/admin/undertakeReportZx')
+				},
 		]
 	},
 	{