Merge branch 'master' of http://192.168.3.53:11080/aielab/jcxt_qd

package-lock.json

@@ -1668,6 +1668,16 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1616431156987&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@@ -1694,6 +1704,53 @@
             "unique-filename": "^1.1.1"
           }
         },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.1.tgz",
+          "integrity": "sha512-g4miPa9uUrZz4iElkaVJgDFwKJGh8aQGM7pUL4ejXl6cu7kSb30seQOVGNMP6sW8j7DW77X68hJZ+GM7UGhXeQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
@@ -1710,6 +1767,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1610194262897&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -1726,6 +1793,18 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.2",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.2.tgz",
+          "integrity": "sha512-Nkq+z9mAsMEK+qkXgK+9Ia7D8w9uu9j4ut0IMT5coMfux3rCgIp1QBB1CYwY0M34A1nRMSONEaWXxAAw6xSl/Q==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -11513,87 +11592,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
-      "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.5.1",
       "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.5.1.tgz?cache=0&sync_timestamp=1617697843139&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.5.1.tgz",

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

@@ -1,122 +1,215 @@
 <template>
-
-	<div style="width: 100%">
+    <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-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 class="btns" type="info" size="small" @click="returnTask">
-					返回任务列表
-				</el-button>
-            </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> 
+
+			<div class="headSearch">
+			<el-row :gutter="50" style="margin-right: 0px;">
+				<el-form :inline="true">
+					<!-- <el-form style="display: flex; flex-direction: row;" > -->
+					<el-form-item label="年度" class="select" size="small">
+						<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy" type="year" clearable />
+					</el-form-item>
+					<el-form-item label="任务名称" class="select" size="small">
+						<el-input v-model="queryInfo.task_name"></el-input>
+					</el-form-item>
+					<el-button type="success" size="small">查询</el-button>
+					<el-button plain class="btns" size="medium" @click="returnTask()">
+						返回
+					</el-button>
+				</el-form> 
+			</el-row>
+		</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">
+				</el-table-column>
+	    	</el-table>
+				<!--分页器区域-->
 			<div class="block">
 				 <el-pagination
 					@size-change="handleSizeChange"
 					@current-change="handleCurrentChange"
-					:current-page="currentPage"
-					:page-sizes="[10, 25, 50, 100]"
-					:page-size="100"
+					:current-page="currentPage4"
+					:page-sizes="[10, 15, 20, ]"
+					:page-size="queryInfo.pageSize"
 					layout="total, sizes, prev, pager, next, jumper"
-					:total="total">
-    			</el-pagination>
+					:total="total"
+					background />
+    			
 			</div>
-	
+		</div>
 	</div>
+    
 </template>
+
 <script>
-export default {
-	data() {
-      return {
-		  		currentPage: 1,
-        options: [{
-          value: '选项1',
-          label: '测试1'
-        }, {
-          value: '选项2',
-          label: '测试2'
-        }, {
-          value: '选项3',
-          label: '测试3'
-        }, {
-          value: '选项4',
-          label: '测试4'
-        }],
-        value: '',
-		total:0
-      }
-    },
-	methods:{
-		returnTask()
-		{
-			this.$router.push('specialMonitor')
+	const token = window.sessionStorage.getItem('token')
+	export default {
+		name: '',
+		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'
+					}],
+			// 数据表格数据
+				tableData: []
+            }
+        },
+		mounted: function() {
+			this.getJgQtouList()
 		},
-		handleSizeChange(val) {
+		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.getJgQtouList()
+			},
+			/** 监听每页显示多少数据的改变 */
+			handleSizeChange(newSize) {
+				this.queryInfo.pageSize = newSize
+				this.getJgQtouList()
+			},
+			
+			/** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.queryInfo.pageNum = newPage
+				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('specialMonitor')
+        	},
+      		handleSizeChange(val) {
         	console.log(`每页 ${val} 条`);
       		},
       		handleCurrentChange(val) {
-        		console.log(`当前页: ${val}`);
+        	console.log(`当前页: ${val}`);
       		}
-	}
-}
+    		},
+    }
 </script>
 
-
 <style>
 .btns{
 	float:right;
+	padding: 10px;
+}
+.table{
+	padding: 10px;
+}
+.foottable .pager{
+	float: left;
+	
+}
+.footer {
+		padding: 5px 0;
+		border-top: 1px solid #e5e5e5;
+		text-align: center;
+		}
+.headSearch{
+		margin-left: 25px;
 }
 </style>

src/components/admin/routineMonitor.vue

@@ -15,11 +15,11 @@
 			<el-row :gutter="50" style="margin-right: 0px;">
 				<el-form :inline="true">
 				<!-- <el-form style="display: flex; flex-direction: row;" > -->
-				<el-form-item label="年度" class="select" size="mini">
+				<el-form-item label="年度" class="select" size="small">
 					<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy" type="year" clearable />
 				</el-form-item>
 
-				<el-form-item label="任务状态" class="select" size="mini">
+				<el-form-item label="任务状态" class="select" size="small">
 					<el-select v-model="queryInfo.ispublic" style="width: 110px;" clearable>
 						<el-option 
 							v-for="item in taskispublic" 
@@ -30,17 +30,17 @@
 					</el-select>
 				</el-form-item>
 
-				<el-form-item label="任务时间" class="select" size="mini">
+				<el-form-item label="任务时间" class="select" size="small">
 					<el-date-picker v-model="queryInfo.starttime" style="width: 180px;" align="right" type="date"
 						:picker-options="pickerOptions" clearable value-format="yyyy-MM-dd" />
 				</el-form-item>
 
-				<el-form-item label="--" class="select" style="margin-left: 10px;" size="mini">
+				<el-form-item label="--" class="select" style="margin-left: 10px;" size="small">
 					<el-date-picker v-model="queryInfo.endtime" style="width: 180px;" align="right" type="date"
 						:picker-options="pickerOptions"  clearable />
 				</el-form-item>
 
-				<el-form-item label="任务名称" class="select" size="mini">
+				<el-form-item label="任务名称" class="select" size="small">
 					<el-input v-model="queryInfo.task_name"></el-input>
 				</el-form-item>
 
@@ -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="95" align="center">
 					<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>
@@ -103,11 +103,11 @@
 				<!-- 操作按钮区域的作用域插槽 -->
 				<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" @click="readDialogVisible1(scope.row)" style="margin-top:5px">详情</el-button>
+						<el-button type="success" size="mini" plain @click="takeTheLeadReportList(scope.row.id)" style="margin-top:5px">牵头单位报告</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>
@@ -224,8 +224,8 @@
 					},
 					{
 						label: '创建者',
-						prop: 'releaser',
-						width: 120
+						prop: 'creater',
+						width: 140
 					},
 					{
 						label: '创建时间',
@@ -301,19 +301,34 @@
 			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)
 				this.$router.push({
 					name:'taskSample',
-					params: {task_id:id}})
-			},
+					params: {
+					task_id: id,
+					}
+				})
+		},
+			
 			// 搜索
 			async searchData() {
 				this.queryInfo.pageNum = 1
@@ -329,7 +344,8 @@
 					ispublic:'',
 					pageSize:10,
 					pageNum:1,
-					task_class:'例行监测'
+					task_class:'例行监测',
+					task_id
 				}
 				this.gettaskList()
 			},
@@ -419,8 +435,10 @@
 						message: '删除失败!'
 					});
 				}
-
+				// console.log(this.$refs.multipleTable);
 				this.$refs.multipleTable.clearSelection();
+				that.delarr = [];
+				// this.$refs.multipleTable.clearSelectionFun();
 			},
 			// 发布任务
 			async ispublic() {

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

@@ -9,21 +9,25 @@
 				</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 class="btns" type="info" size="small" @click="returnTask">
-					返回任务列表
-				</el-button>
-            </div>
+			<div class="headSearch">
+			<el-row :gutter="50" style="margin-right: 0px;">
+				<el-form :inline="true">
+					<!-- <el-form style="display: flex; flex-direction: row;" > -->
+					<el-form-item label="年度" class="select" size="small">
+						<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy" type="year" clearable />
+					</el-form-item>
+					<el-form-item label="任务名称" class="select" size="small">
+						<el-input v-model="queryInfo.task_name"></el-input>
+					</el-form-item>
+					<el-button type="success" size="small">查询</el-button>
+					<el-button plain class="btns" size="medium" @click="returnTask()">
+						返回
+					</el-button>
+				</el-form> 
+			</el-row>
+		</div>
+
+            
         <!-- 表格区域 -->
 		<div class="table">
 			<!--  表格数据区域-->
@@ -134,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')
         	},
@@ -167,6 +195,7 @@
 <style>
 .btns{
 	float:right;
+	padding: 10px;
 }
 .table{
 	padding: 10px;
@@ -180,4 +209,7 @@
 		border-top: 1px solid #e5e5e5;
 		text-align: center;
 		}
+.headSearch{
+		margin-left: 25px;
+}
 </style>

src/components/admin/taskSample.vue

@@ -4,12 +4,14 @@
 			<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>	
+
+		<!-- 牵头单位弹框 -->
+		<!-- <el-button icon="el-icon-search" @click="getQtouList()" size="medium">搜索牵头单位</el-button> -->
 		<!-- 下拉菜单 -->
-	<div>
+	<!-- <div>
 			牵头单位
         <el-select v-model="value" placeholder="请选择" clearable>
             <el-option
@@ -19,64 +21,68 @@
                 :value="item.value"
 				@change="choseQt()">
             </el-option>
-        </el-select>
+        </el-select> -->
         <!-- 返回按钮 -->
+		<el-form-item label="牵头单位名称" class="select" size="small">
+			<el-input v-model="queryInfo.unit_name"></el-input>	
+			<el-button type="success" size="small">查询</el-button>
+		</el-form-item>
+	
 		<div class="btns">
-			<el-button type="info" size="small" @click="returnTask">
-				返回任务列表
-			</el-button>
-			<el-button type="info" size="small" @click="sendBack">
-				退回
+			<el-button plain size="small" @click="returnTask()">
+				返回
 			</el-button>
 		</div>
-       
-	</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 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>
+		<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-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 />
+				 <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>
 		
@@ -88,12 +94,12 @@
 		name: '',
 		data() {
 			return {
+				
+				//控制弹框显隐
+				dialogVisible: false,
 				total:0,
-				  options: [{
-					value: '选项1',
-					label: '部级监测机构'
-					}],
 				queryInfo:{
+					keyWord: '',
 					year:'',
 					task_name:'',
 					starttime:'',
@@ -101,7 +107,9 @@
 					ispublic:'',
 					pageSize:10,
 					pageNum:1,
-					task_class:'专项监测'
+					task_class:'专项监测',
+					task_id:'',
+					unit_name:'',
 				},
             cellStyle: {
 					padding: 2 + 'px'
@@ -111,76 +119,177 @@
 				},
 			tableHeader: [{
 						label: '样品名称',
-						prop: '',
+						prop: 'sample_name',
 						width: 150
 						// fixed: 'left'
 					},
 					{
 						label: '样品编码',
-						prop: '',
-						width: 80
+						prop: 'sample_id',
+						width: 200
 						// fixed: 'left'
 					}, {
 						label: '商标',
-						prop: '',
+						prop: 'brand',
 						width: 150
 						// fixed: 'left'
 					},
 					{
 						label: '等级',
-						prop: '',
+						prop: 'level',
 						width: 120
 					},
 					{
 						label: '抽样基数',
-						prop: '',
+						prop: 'sample_base',
 						width: 120
 					},
 					{
 						label: '抽样场所',
-						prop: '',
+						prop: 'sample_ground',
 						width: 120
 					},
 					{
 						label: '状态',
-						prop: '',
+						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: []
+			tableData: [],
+			QtouList:[]
 			}
 		},
+		mounted: function() {
+			this.getJgCydList()
+			// this.getQtouList()
+		},
 		created() {
-		
 		},
+		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: {
-			sendBack(){},
-			// 获取牵头单位
-			getTaskById(){	
+				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)
 			},
-			// 获取抽样单列表
-			getZLTaskSampleListByJcInfo(){
-				
+			
+			//获取牵头单位列表
+			async getQtouList() {
+				this.dialogVisible = 'ture'
+				console.log(this.dialogVisible)
+				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')
 			},
-			handleSizeChange(val) {
-        	console.log(`每页 ${val} 条`);
-      		},
-      		handleCurrentChange(val) {
-        		console.log(`当前页: ${val}`);
-      		}
-		},
-	}
+
+			/** 监听每页显示多少数据的改变 */
+			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
+				this.total = result.data.data.total
+				console.log( result.data.data.total)
+				}
+				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{
+.btns{
 	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" size="medium" @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,21 @@ 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
+				this.total = result.data.data.total
+				}
+				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" size="medium" @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,17 +48,40 @@ const routes = [{
 			},
 			{
 				path: '/admin/takeTheLeadReportList',
+				name:'takeTheLeadReportList',
 				component: () => import('../components/admin/takeTheLeadReportList')
 			},{
+				path: '/admin/taskSample',
+				name:'taskSample',
+				component: () => import('../components/admin/taskSample')
+			},{
+
 				path: '/admin/leadReport',
 				component: () => import('../components/admin/leadReport')
 			},{
 				path: '/admin/undertakeReport',
+				name:'undertakeReport',
 				component: () => import('../components/admin/undertakeReport')
-			},{
-				path: '/admin/taskSample',
-				component: () => import('../components/admin/taskSample')
-			}
+			},
+			// {
+			// 	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')
+			},
+			// 	path: '/admin/taskSample',
+			// 	component: () => import('../components/admin/taskSample')
+			// }
+
 		]
 	},
 	{