查看抽样单

src/components/admin.vue

@@ -142,16 +142,16 @@
 				},
 				{	
 
-					subMenuName: '主体管理',
-					children: [{
-							id: '6-1',
-							subMenuName: '监管机构',
-							path: '/admin/regulatoryAuthority'
-						}, {
-							id: '6-2',
-							subMenuName: '监测机构',
-							path: '/admin/testingFacility'
-						}
+					// subMenuName: '主体管理',
+					// children: [{
+					// 		id: '6-1',
+					// 		subMenuName: '监管机构',
+					// 		path: '/admin/regulatoryAuthority'
+					// 	}, {
+					// 		id: '6-2',
+					// 		subMenuName: '监测机构',
+					// 		path: '/admin/testingFacility'
+					// 	}
 						// ,{
 						//      id: '5-3',
 						//      subMenuName: '监测抽查',
@@ -160,10 +160,10 @@
 						//      id: '5-4',
 						//      subMenuName: '复检任务',
 						//      path: '/admin/'
-						//    },
-					]
-				},
-				{
+				// 		//    },
+				// 	]
+				// },
+				// {
 					// icon: 'el-icon-user-solid',
 					subMenuName: '监测任务',
 					children: [{

src/components/admin/getJcds.vue

@@ -0,0 +1,164 @@
+<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>
+		</div>
+<!-- 表格区域 -->
+    <el-table :data="tableData" border stripe highlight-current-row style="width: 100%" >
+        <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>
+            <el-button @click="readCheckList()" style="margin:5px 0" type="success" size="small" >查看检测单列表</el-button>
+        </template>
+        </el-table-column>
+    </el-table>
+        <!--分页器区域-->
+            <el-pagination class="feyeqi" @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 class="btns">
+                <el-button plain size="medium" @click="returnTask()" >
+                    返回
+                </el-button>
+            </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            // 数据表格数据
+			tableData: [],
+            sampleOrgId:{},
+            queryInfo:{
+					pageSize:10,
+					pageNum:1,
+					task_class:'例行监测',
+                    task_id: 33, //任务id
+                    sample_org_id: 18, //抽样单位id
+                    check_org_id: 272, //检测单位id
+                    sample_address:null, //抽样地址
+                    create_time:null,
+                    update_time: null,
+                    delete_time: null,
+                    },
+            sampleOrgId: {
+                    name:null, //抽样单位名称
+                    name_other: null, //抽样单位别名
+                    groupnam: null,
+                    properties: null,
+                    contact_name: null,
+                    contact_phone: null,
+                    create_time: null,
+                    update_time: null
+                    },
+            checkOrgId: {
+                    id: null, //task_profile_id
+                    name: null, //抽样单位名称
+                    name_other: null, //抽样单位别名
+                    groupname: null,
+                    properties:null,
+                    contact_name: null,
+                    contact_phone: null,
+                    create_time: null,
+                    update_time: null
+            },
+            	total:0,
+                tableHeader2: [{
+                            label: '抽样机构',
+                            prop: 'sampleOrgId.name',
+                            width: 180,
+                        }, {
+                            label: '检测机构',
+                            prop: 'checkOrgId.name'
+                        },
+                        {
+                            label: '抽样地区',
+                            prop: 'sample_address'
+                        }, 
+                ]  
+        }
+    },
+    mounted() {
+        this.getJgTaskProfiles()
+    },
+    created() {
+        this.id = this.$route.params.id
+        // this.task_id = this.$route.params.id
+        // console.log(this.task_id)
+        this.getJgTaskProfiles()
+    },
+	methods: {
+        //返回
+        returnTask(){
+            this.$router.push('routineMonitor')
+        },
+        // 获取抽样机构列表
+        async getJgTaskProfiles() {
+            for (var key in this.queryInfo) {
+                if (this.queryInfo[key] == '') {
+                    delete this.queryInfo[key]
+                }
+            }
+            const {
+                data: res
+            } = await this.$http.post(
+                "getJgTaskProfiles", this.queryInfo
+            );
+            this.tableData = res.data.rows
+            this.total = res.data.total
+            this.task_id = res.data.rows.task_id
+            console.log(result.data.rows.task_id)
+        },
+    },
+        //查看检测单 
+        readCheckList(id){
+				this.$router.push({
+					name:'readCheckList',
+					params: {
+					task_id:id,
+					}
+				})
+			},
+        //分页器
+                handleSizeChange(val) {
+                    console.log(`每页 ${val} 条`);
+                    },
+                handleCurrentChange(val) {
+                    this.queryInfo.pageNum = val;
+                    console.log(`当前页: ${val}`);
+                    this.getJgTaskProfiles()
+                    },
+                /** 监听页码的改变 */
+                handleCurrentChange(newPage) {
+                    this.queryInfo.pageNum = newPage
+                    this.getJgTaskProfiles()
+                },
+                /** 监听每页显示多少数据的改变 */
+                handleSizeChange(newSize) {
+                    this.queryInfo.pageSize = newSize
+                    this.getJgTaskProfiles()
+                },
+    }
+
+</script>
+<style>
+.btns{
+	float:right;
+	/* margin-top: 10px; */
+	padding: 10px;
+}
+.feyeqi{
+    margin-top: 10px;
+}
+</style>

src/components/admin/getMonitor.vue

@@ -9,24 +9,23 @@
         
         <div class="card">
             <!-- 检索信息 -->
-            <el-form-item label="机构性质">
+            <el-form-item label="所属行业">
                 <el-checkbox-group v-model="form.properties" class="querybox">
                     <el-checkbox label="不限" name="type"></el-checkbox>
-                    <el-checkbox label="政府部门" name="type"></el-checkbox>
-                    <el-checkbox label="事业单位" name="type"></el-checkbox>
-                    <el-checkbox label="企业" name="type"></el-checkbox>
+                    <el-checkbox label="种植业" name="type"></el-checkbox>
+                    <el-checkbox label="畜牧业" name="type"></el-checkbox>
+                    <el-checkbox label="渔业" name="type"></el-checkbox>
+                     <el-checkbox label="其他" name="type"></el-checkbox>
                 </el-checkbox-group>
             </el-form-item>
 
-            <el-form-item label="资质证书">
+            <el-form-item label="机构级别">
                 <el-checkbox-group v-model="form.certificate" class="querybox">
                     <el-checkbox label="不限" name="type"></el-checkbox>
-                    <el-checkbox label="CNAS" name="type"></el-checkbox>
-                    <el-checkbox label="CAL" name="type"></el-checkbox>
-                    <el-checkbox label="CMAF" name="type"></el-checkbox>
-                    <el-checkbox label="CATL" name="type"></el-checkbox>
-                    <el-checkbox label="CMA" name="type"></el-checkbox>
-                    <el-checkbox label="暂未取得资质" name="type"></el-checkbox>
+                    <el-checkbox label="部级" name="type"></el-checkbox>
+                    <el-checkbox label="省级" name="type"></el-checkbox>
+                    <el-checkbox label="市级" name="type"></el-checkbox>
+                    <el-checkbox label="县级" name="type"></el-checkbox>
                 </el-checkbox-group>
             </el-form-item>
 

src/components/admin/readSampleList.vue

@@ -0,0 +1,191 @@
+<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>
+		</div>
+<!-- 表格区域 -->
+    <el-table :data="tableData" border stripe highlight-current-row style="width: 100%" >
+        <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>
+            <el-button style="margin:5px 0" type="success" size="small" @click="readSample()">查看详情</el-button>
+        </template>
+        </el-table-column>
+    </el-table>
+        <!--分页器区域-->
+            <el-pagination class="feyeqi" @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 class="btns">
+                <el-button plain size="medium" @click="returnSampleList()" >
+                    返回
+                </el-button>
+            </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            // 数据表格数据
+			tableData: [],
+            sampleOrgId:{},
+            queryInfo:{
+					pageSize:10,
+					pageNum:1,
+					task_class:'例行监测',
+                    task_id: 33, //任务id
+                    sample_org_id: 18, //抽样单位id
+                    check_org_id: 272, //检测单位id
+                    sample_address:null, //抽样地址
+                    create_time:null,
+                    update_time: null,
+                    delete_time: null,
+                    properties:null, 
+                    },
+             creater: {
+                id:'', 
+                name:null, 
+                name_other: null,
+                groupname:null, 
+                // properties:null, 
+                contact_name: null, 
+                contact_phone: null 
+                }, 
+            releaser: {
+                id:'', 
+                name:null, 
+                name_other: null, 
+                groupname: null, 
+                // properties:null, 
+                contact_name: null, 
+                contact_phone: null
+                }, 
+                year: null, 
+                batch:null, 
+                qydm: null, 
+                level:null, 
+                task_class: "例行监测",
+                ispublic:null, 
+                filenum:null, 
+                log:null, 
+                file_url: null, 
+                file_name:null, 
+                is_divide: null, 
+                create_time: null, 
+                update_time:null, 
+            	total:0,
+                tableHeader2: [{
+                            label: '任务名称',
+                            prop: 'task_name',
+                            width: 180,
+                        },{
+                            label: '开始时间',
+                            prop: 'starttime',
+                            width: 120,
+                        },{
+                            label: '结束时间',
+                            prop: 'endtime',
+                            width: 120,
+                        },{
+                            label: '创建者',
+                            prop: 'releaser.name',
+                            width: 160,
+                        },{
+                            label: '组别',
+                            prop: 'releaser.groupname',
+                            width: 120,
+                        },{
+                            label: '机构性质',
+                            prop: 'releaser.properties'
+                        },{
+                            label: '任务优先级',
+                            prop: 'releaser.level',
+                            width: 120,
+                        },{
+                            label: '文件号',
+                            prop: 'releaserfilenum'
+                        },
+                ]  
+        }
+    },
+    mounted() {
+        this.getTasks()
+    },
+    created() {
+        this.id = this.$route.params.id
+        // this.task_id = this.$route.params.id
+        // console.log(this.task_id)
+        this.getTasks()
+    },
+	methods: {
+        //返回
+        returnSampleList(){
+            this.$router.push('setTaskJg')
+        },
+       // 获取抽样单列表
+        async getTasks() {
+            for (var key in this.queryInfo) {
+                if (this.queryInfo[key] == '') {
+                    delete this.queryInfo[key]
+                }
+            }
+            const {
+                data: res
+            } = await this.$http.post(
+                "getTasks", this.queryInfo
+            );
+            this.tableData = res.data.rows
+            this.total = res.data.total
+            this.task_id = res.data.rows.task_id
+            this.queryInfo = result.data.data
+                if (this.queryInfo.properties == 1){
+                      this.queryInfo.properties ='政府部门';
+                }else if(this.queryInfo.properties == 2){
+                    this.queryInfo.properties ='事业单位';
+                }else{
+                     this.queryInfo.properties ='企业';
+                }
+        },
+        //分页器
+                handleSizeChange(val) {
+                    console.log(`每页 ${val} 条`);
+                    },
+                handleCurrentChange(val) {
+                    this.queryInfo.pageNum = val;
+                    console.log(`当前页: ${val}`);
+                    this.getTasks()
+                    },
+                /** 监听页码的改变 */
+                handleCurrentChange(newPage) {
+                    this.queryInfo.pageNum = newPage
+                    this.getTasks()
+                },
+                /** 监听每页显示多少数据的改变 */
+                handleSizeChange(newSize) {
+                    this.queryInfo.pageSize = newSize
+                    this.getTasks()
+                },
+    }
+}
+</script>
+<style>
+.btns{
+	float:right;
+	/* margin-top: 10px; */
+	padding: 10px;
+}
+.feyeqi{
+    margin-top: 10px;
+}
+</style>

src/components/admin/routineMonitor.vue

@@ -104,11 +104,13 @@
 				<template slot-scope="scope">
 					<el-col style="margin-bottom: 5px;">
 						<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-button type="success" size="mini" @click="sendBack(scope.row)" style="margin-top:5px">退回</el-button>
 					</el-col>
 					<el-col style="margin-bottom: 5px;">
-						<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-button type="success" size="mini" plain @click="takeTheLeadReportList(scope.row.id)" style="margin-top:5px">牵头单位报告</el-button> -->
+						<el-button type="success" size="mini" plain @click="getJcds(scope.row.id)" style="margin-top:5px">检测单</el-button> 
+						<!-- <el-button type="success" size="mini" plain @click="undertakeReport(scope.row.id)">承担单位报告</el-button> -->
+						<el-button type="success" size="mini" plain @click="sampleList(scope.row.id)">抽样单</el-button>
 					</el-col>
 				</template>
 			</el-table-column>
@@ -186,7 +188,9 @@
 					ispublic:'',
 					pageSize:10,
 					pageNum:1,
-					task_class:'例行监测'
+					task_class:'例行监测',
+					task_id:'',
+					task_profile_id:''
 				},
 				total:0,
 				cellStyle: {
@@ -298,36 +302,54 @@
 			this.getTasks()
 		},
 		methods: {
+			//新增
 			add() {
 				this.$router.push('addTask')
 			},
-			takeTheLeadReportList(id) {
-				console.log(id)
+			//查看抽样机构
+			sampleList(id){
 				this.$router.push({
-					name:'takeTheLeadReportList',
+					name:'setTaskJg',
 					params: {
-					task_id: id,
+					task_id:id,
 					}
 				})
 			},
-			undertakeReport(id){
+			//查看检测机构
+			getJcds(id,profile_id) {
 				console.log(id)
 				this.$router.push({
-					name:'undertakeReport',
+					name:'getJcds',
 					params: {
 					task_id: id,
+					task_profile_id:profile_id
 					}
 				})
 			},
-			taskSample(id){
-				console.log(id)
-				this.$router.push({
-					name:'taskSample',
-					params: {
-					task_id: id,
-					}
-				})
-		},
+			// takeTheLeadReportList(id) {
+			// 	console.log(id)
+			// 	this.$router.push({
+			// 		name:'takeTheLeadReportList',
+			// 		params: {
+			// 		task_id: id,
+			// 		}
+			// 	})
+			// },
+			//
+			// 	})
+			// },
+			//承担单位报告
+			// undertakeReport(id){
+			// 	console.log(id)
+			// 	this.$router.push({
+			// 		name:'undertakeReport',
+			// 		params: {
+			// 		task_id: id,
+			// 		}
+			// 	})
+			// },
+			
+		// },
 			
 			// 搜索
 			async searchData() {
@@ -348,6 +370,10 @@
 					task_id
 				}
 				this.getTasks()
+			},
+			//退回
+			sendBack(){
+
 			},
 			/** 监听页码的改变 */
 			handleCurrentChange(newPage) {
@@ -407,16 +433,13 @@
 				// 		this.$alert('任务仅创建者可以删除！', {
 				// 			confirmButtonText: '确定',
 				// 			callback: action => {
-
 				// 			}
 				// 		});
 				// 	}
 				// }
 				var that = this;
 				const length = this.multipleSelection.length;
-				// var val = this.selectedData;
 				for (let i = 0; i < length; i++) {
-					// console.log(this.multipleSelection[i])
 					this.delarr.push(this.multipleSelection[i].id);
 				}
 				const result = await this.$http.post('deleteTasks', {
@@ -516,7 +539,6 @@
 						this.$alert('任务不在可废止状态！', {
 							confirmButtonText: '确定',
 							callback: action => {
-
 							}
 						});
 					}
@@ -537,8 +559,6 @@
 				}
 
 			}
-
-
 		},
 	}
 </script>
@@ -577,7 +597,7 @@
 	.select {
 		// display: flex;
 		flex-direction: row;
-		// margin-left: 10px;
+		margin-left: 35px;
 		
 	}
 

src/components/admin/setTaskJg.vue

@@ -0,0 +1,164 @@
+<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>
+		</div>
+<!-- 表格区域 -->
+    <el-table :data="tableData" border stripe highlight-current-row style="width: 100%" >
+        <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>
+            <el-button @click="read()" style="margin:5px 0" type="success" size="small">查看抽样单列表</el-button>
+        </template>
+        </el-table-column>
+    </el-table>
+        <!--分页器区域-->
+            <el-pagination class="feyeqi" @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 class="btns">
+                <el-button plain size="medium" @click="returnTask()" >
+                    返回
+                </el-button>
+            </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            // 数据表格数据
+			tableData: [],
+            sampleOrgId:{},
+            queryInfo:{
+					pageSize:10,
+					pageNum:1,
+					task_class:'例行监测',
+                    task_id: 33, //任务id
+                    sample_org_id: 18, //抽样单位id
+                    check_org_id: 272, //检测单位id
+                    sample_address:null, //抽样地址
+                    create_time:null,
+                    update_time: null,
+                    delete_time: null,
+                    },
+            sampleOrgId: {
+                    name:null, //抽样单位名称
+                    name_other: null, //抽样单位别名
+                    groupnam: null,
+                    properties: null,
+                    contact_name: null,
+                    contact_phone: null,
+                    create_time: null,
+                    update_time: null
+                    },
+            checkOrgId: {
+                    id: null, //task_profile_id
+                    name: null, //抽样单位名称
+                    name_other: null, //抽样单位别名
+                    groupname: null,
+                    properties:null,
+                    contact_name: null,
+                    contact_phone: null,
+                    create_time: null,
+                    update_time: null
+            },
+            	total:0,
+                tableHeader2: [{
+                            label: '抽样机构',
+                            prop: 'sampleOrgId.name',
+                            width: 180,
+                        }, {
+                            label: '检测机构',
+                            prop: 'checkOrgId.name'
+                        },
+                        {
+                            label: '抽样地区',
+                            prop: 'sample_address'
+                        }, 
+                ]  
+        }
+    },
+    mounted() {
+        this.getJgTaskProfiles()
+    },
+    created() {
+        this.id = this.$route.params.id
+        // this.task_id = this.$route.params.id
+        // console.log(this.task_id)
+        this.getJgTaskProfiles()
+    },
+	methods: {
+        //返回
+        returnTask(){
+            this.$router.push('routineMonitor')
+        },
+        // 获取抽样机构列表
+        async getJgTaskProfiles() {
+            for (var key in this.queryInfo) {
+                if (this.queryInfo[key] == '') {
+                    delete this.queryInfo[key]
+                }
+            }
+            const {
+                data: res
+            } = await this.$http.post(
+                "getJgTaskProfiles", this.queryInfo
+            );
+            this.tableData = res.data.rows
+            this.total = res.data.total
+            this.task_id = res.data.rows.task_id
+            console.log(result.data.rows.task_id)
+        },
+        //查看抽样单 
+        read(id){
+				this.$router.push({
+					name:'readSampleList',
+					params: {
+					task_id:id,
+					}
+				})
+		},
+        //分页器
+                handleSizeChange(val) {
+                    console.log(`每页 ${val} 条`);
+                    },
+                handleCurrentChange(val) {
+                    this.queryInfo.pageNum = val;
+                    console.log(`当前页: ${val}`);
+                    this.getJgTaskProfiles()
+                    },
+                /** 监听页码的改变 */
+                handleCurrentChange(newPage) {
+                    this.queryInfo.pageNum = newPage
+                    this.getJgTaskProfiles()
+                },
+                /** 监听每页显示多少数据的改变 */
+                handleSizeChange(newSize) {
+                    this.queryInfo.pageSize = newSize
+                    this.getJgTaskProfiles()
+                },
+    },
+}
+
+</script>
+<style>
+.btns{
+	float:right;
+	/* margin-top: 10px; */
+	padding: 10px;
+}
+.feyeqi{
+    margin-top: 10px;
+}
+</style>

src/components/admin/specialMonitor.vue

@@ -542,7 +542,7 @@
 	.select {
 		// display: flex;
 		flex-direction: row;
-		// margin-left: 10px;
+		margin-left: 35px;
 	}
 	
 		.el-form-item {

src/components/admin/taskSample.vue

@@ -6,8 +6,7 @@
 		  	<el-breadcrumb-item>监测任务</el-breadcrumb-item>
 		  	<el-breadcrumb-item>抽样单</el-breadcrumb-item>
 			</el-breadcrumb>
-		</div>	
-
+		</div>
 		<!-- 牵头单位弹框 -->
 		<!-- <el-button icon="el-icon-search" @click="getQtouList()" size="medium">搜索牵头单位</el-button> -->
 		<!-- 下拉菜单 -->
@@ -22,6 +21,7 @@
 				@change="choseQt()">
             </el-option>
         </el-select> -->
+
         <!-- 返回按钮 -->
 		<el-form-item label="牵头单位名称" class="select" size="small">
 			<el-input v-model="queryInfo.unit_name"></el-input>	
@@ -59,30 +59,6 @@
 					: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>
 		
@@ -98,6 +74,7 @@
 				//控制弹框显隐
 				dialogVisible: false,
 				total:0,
+				task_id:'',
 				queryInfo:{
 					keyWord: '',
 					year:'',
@@ -108,7 +85,6 @@
 					pageSize:10,
 					pageNum:1,
 					task_class:'专项监测',
-					task_id:'',
 					unit_name:'',
 				},
             cellStyle: {
@@ -118,91 +94,54 @@
 					height: 35 + 'px'
 				},
 			tableHeader: [{
-						label: '样品名称',
-						prop: 'sample_name',
-						width: 150
+						label: '抽样单编码',
+						prop: 'cyd_code',
+						width: 260
 						// fixed: 'left'
 					},
 					{
-						label: '样品编码',
-						prop: 'sample_id',
+						label: '受检单位',
+						prop: 'inspectedUnit.inspected_name',
 						width: 200
 						// fixed: 'left'
 					}, {
-						label: '商标',
-						prop: 'brand',
-						width: 150
+						label: '抽样日期',
+						prop: 'cydProfile.cyd_date',
+						width: 180
 						// 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'
+						prop: 'cyd_status',
+						width: 160
 					},
-					{
-						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: {},
+				// multipleSelection: null,
+				// getQtListShow: {},
 				// 选中的牵头单位
 				orgs: [],
 				// 数据表格数据
-			tableData: [],
-			QtouList:[]
+				tableData: [],
 			}
-		},
-		mounted: function() {
-			this.getJgCydList()
+		// },
+		
 			// this.getQtouList()
 		},
-		created() {
-		},
+		mounted: function() {
+			this.getCyds()
+			},
 		created: function() {
+			this.getCyds()
 			console.log(this.$route.params.task_id)
-			// this.unit_id = this.$route.params.unit_id
+			console.log(this.$route.params.task_profile_id)
 			this.task_id = this.$route.params.task_id
-			this.getJgCydList()
-			// this.getQtouList()
+			this.task_profile_id = this.$route.params.task_profile_id
+			
+			// this.getCyds()
 		},
 		
 		methods: {
@@ -212,27 +151,26 @@
 				handleCurrentChange(val) {
 					this.queryInfo.pageNum = val;
 					console.log(`当前页: ${val}`);
-					this.getJgCydList()
+					this.getCyds()
 				},
 			//批量选中
-				handleSelectionChange(val) {
-					this.multipleSelection = val;
-					console.log(this.multipleSelection)
-			},
-			
+			// 	handleSelectionChange(val) {
+			// 		this.multipleSelection = val;
+			// 		console.log(this.multipleSelection)
+			// },
 			//获取牵头单位列表
-			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);
+			// 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
-				}
-			},
+			// 	if (result.data.code == 0) {
+			// 		this.QtouList = result.data.data.rows
+			// 		this.total = result.data.data.total
+			// 	}
+			// },
 			//返回
 			returnTask(){
 				this.$router.push('routineMonitor')
@@ -241,23 +179,25 @@
 			/** 监听每页显示多少数据的改变 */
 			handleSizeChange1(newSize) {
 				this.queryInfo.pageSize = newSize
-				this.getJgCydList()
+				this.getCyds()
 			},
 
 			/** 监听页码的改变 */
 			handleCurrentChange1(newPage) {
 				this.queryInfo.pageNum = newPage
-				this.getJgCydList()
+				this.getCyds()
 			},
+			
 			// 获取抽样单列表
-				async getJgCydList() {
-				const result = await this.$http.post('getJgCydList', {
-					task_id: this.task_id,
+				async getCyds() {
+				const result = await this.$http.post('getCyds', {
+					task_id:this.task_id,
+					task_profile_id:this.task_profile_id,
 					pageSize:this.queryInfo.pageSize,
-					pageNum:this.queryInfo.pageNum
+					pageNum:this.queryInfo.pageNum,
 				})
 				console.log( result.data)
-				console.log(this.queryInfo.pageSize)
+				console.log(result.data.data)
 				if (result.data.code == 0) {
 					for (let i = 0; i < result.data.data.rows.length; i++) {
 					if (result.data.data.rows[i].sample_status == '0') {
@@ -265,7 +205,7 @@
 					} else {
 						result.data.data.rows[i].sample_status = '已上报'
 					}
-				this.tableData = result.data.data.rows
+				this.tableData = result.data.data
 				this.total = result.data.data.total
 				console.log( result.data.data.total)
 				}
@@ -282,9 +222,8 @@
 					}
 				})
 			},
-					// 跳转到查看抽样单详情
-		}
 		}
+	}
 	
 	
 	
@@ -295,8 +234,9 @@
 	padding: 10px;
 }
 .btns{
-	float:right;
-	padding: 10px;
+	float:left;
+	margin-bottom: 10px;
+	/* padding: 10px; */
 }
 .footer {
 		margin-top: 5px;

src/router/index.js

@@ -106,7 +106,24 @@ const routes = [{
 				path: '/admin/regulatoryAuthority',
 				name:'regulatoryAuthority',
 				component: () => import('../components/admin/regulatoryAuthority')
+			},{
+				path: '/admin/setTaskJg',
+				name:'setTaskJg',
+				component: () => import('../components/admin/setTaskJg')
+			},{
+				path: '/admin/readSampleList',
+				name:'readSampleList',
+				component: () => import('../components/admin/readSampleList')
+			},{
+				path: '/admin/getJcds',
+				name:'getJcds',
+				component: () => import('../components/admin/getJcds')
+			},{
+				path: '/admin/readCheckList',
+				name:'readCheckList',
+				component: () => import('../components/admin/readCheckList')
 			},
+			
 		]
 	},
 	{