yyfang 3 năm trước cách đây
mục cha
commit
2b5f659fe4

+ 187 - 0
src/components/admin/getOrganization copy.vue

@@ -0,0 +1,187 @@
+  <template>
+	<div style="width: 100%">
+		<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>
+		<el-form ref="form" :model="form" label-width="80px">
+        
+        <div class="card">
+            <!-- 检索信息 -->
+            <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-group>
+            </el-form-item>
+
+            <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-group>
+            </el-form-item>
+
+            <el-form-item label="主体状态">
+                <el-checkbox-group v-model="form.type" 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-group>
+            </el-form-item>
+            <!-- 地区和机构名称 -->
+            <el-row :gutter="50" style="margin-right: 0px;">
+                <el-form style="display: flex; flex-direction: row;" size="mini">
+
+                    <el-form-item prop="address" label="地区" class="select" >
+                        <el-cascader  :options="region" v-model="sample_address"
+                            @change="handleChange" size="small">
+                        </el-cascader>
+                    </el-form-item>
+
+                    <el-form-item prop="name" label="机构名称" class="select" >
+                        <el-input v-model="form.name" size="small"></el-input>
+                    </el-form-item>
+
+                    <el-form-item prop="name" label="机构负责人" class="select" >
+                        <el-input v-model="form.person" size="small"></el-input>
+                    </el-form-item>
+                    <el-button type="success" size="mini" style="height: 40px;margin-left: 10px;" @click="searchData()" >查询</el-button>
+                    <el-button type="success" size="mini" style="height: 40px;margin-left: 10px;"  @click="searchData()" >重置</el-button>
+                </el-form>
+                
+            </el-row>
+        </div>
+        
+            <!--  表格数据区域-->
+			<el-table ref="multipleTable" :data="tableData" row-key="id" @selection-change="handleSelectionChange1"
+				border stripe highlight-current-row style="width: 100%;margin-top:30px">
+					<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" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+                 <!--    分页器区域-->
+                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page="form.pageNum" :page-sizes="[10, 15, 20]" :page-size="form.pageSize"
+                    layout="total, sizes, prev, pager, next, jumper" :total="total" background />
+	
+
+                <!-- 操作按钮区域的作用域插槽 -->
+                <el-table-column label="操作" align="center" fixed="right">
+                    <template>
+                        <el-col style="margin-bottom: 5px;">
+                            <el-button type="text" size="mini" @click="readDetails()" style="margin-top:5px">详情</el-button>
+                            <el-button type="text" size="mini" plain @click="reVoke()" style="margin-top:5px">撤销</el-button>
+                        </el-col>
+                    </template>
+			    </el-table-column>
+			</el-table>
+					
+
+        </el-form>
+	</div>
+</template>
+<script>
+
+	export default {
+		data() {
+			return {
+				form: {
+                    properties:[],
+                    certificate:[],
+                    type:[],
+                    address:'',
+                 
+                },
+                queryInfo:{
+                  	pageSize:10,
+					pageNum:1,
+                },
+                total:0,
+                // 数据表格数据
+				tableData: [],
+                tableHeader: [{
+						label: '机构名称',
+						prop: 'name',
+						width: 240
+					},{
+						label: '机构类别',
+						prop: 'properties',
+						width: 160
+					},{
+						label: '机构级别',
+						prop: 'level',
+						width: 160
+					},{
+						label: '所属区域',
+						prop: 'address',
+						width: 240
+					},{
+						label: '机构负责人',
+						prop: 'person',
+						width: 150
+					},{
+						label: '创建时间',
+						prop: 'create_time',
+						width: 200
+					},{
+						label: '修改时间',
+						prop: 'update_time',
+						width: 200
+					},
+                ]}
+        },
+		created() {
+			this.getJgOrgs()
+		},
+		methods: {
+            /** 监听每页显示多少数据的改变 */
+			handleSizeChange(newSize) {
+				this.form.pageSize = newSize
+				this.getJgOrgs()
+			},
+            /** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.form.pageNum = newPage
+				this.getJgOrgs()
+			},
+			 async getJgOrgs() {
+				const result = await this.$http.post('getJgOrgs')
+				console.log(result.data.data)
+                // this.form = result.data.data
+                this.tableData = result.data.data
+                this.total = result.data.total
+		}
+    }
+}
+	
+</script>
+
+<style>
+	/* .querybox{
+        padding: -20px;
+    } */
+    .select {
+		display: flex;
+		flex-direction: row;
+		margin-left: 38px;
+        
+	}
+    .card{
+        box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.1);
+        background: rgb(249, 255, 250);
+    }
+</style>

+ 617 - 0
src/components/admin/reTask copy.vue

@@ -0,0 +1,617 @@
+
+<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 class="headSearch">
+			<el-row :gutter="120" style="margin-right: 0px;">
+				<el-form :inline="true">
+				<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-select v-model="queryInfo.ispublic" style="width: 110px;" clearable>
+						<el-option 
+							v-for="item in taskispublic" 
+							:key="item.value" 
+							:label="item.label"
+							:value="item.value" >
+						</el-option>
+					</el-select>
+				</el-form-item>
+
+				<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: 8px;" 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="small">
+					<el-input v-model="queryInfo.task_name"></el-input>
+				</el-form-item>
+
+				<!-- 查询 -->
+				<el-button  size="mini" style="height: 40px;margin-left: 10px;" type="success" @click="searchData()">查询</el-button>
+				<!-- 重置 -->
+				<el-button  size="mini" style="height: 40px;margin-left: 5px;" type="success" @click="reset()">重置</el-button>
+				</el-form>
+			</el-row>
+		</div>
+		
+		<!--头部右侧按钮区域-->
+		<div class="rightButton">
+			<el-row :gutter="90" style="margin-right: 0px;">
+				<div style="display: flex;flex-direction: row;float: right;">
+					<!-- <el-button type="primary" size="small" plain icon="el-icon-plus" @click="add()">新增</el-button> -->
+					<el-button type="primary" size="small" plain icon="el-icon-edit-outline" @click="ispublic()">发布
+					</el-button>
+					<el-button type="primary" size="small" plain icon="el-icon-scissors" @click="repeal()">废止</el-button>
+					<el-button type="primary" size="small" plain icon="el-icon-delete" @click="delArray()">删除</el-button>
+					<!-- <el-button type="primary" size="small" plain icon="el-icon-download">导出</el-button> -->
+				</div>
+			</el-row>
+		</div>
+		
+		<!--  表格数据区域-->
+		<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 prop="status" label="任务状态" width="130" align="center" >
+					<template slot-scope="scope">
+						<el-tag v-if="scope.row.ispublic==0">未发布</el-tag>
+						<el-tag type="warning" v-if="scope.row.ispublic==1">已发布</el-tag>
+						<el-tag type="danger" v-if="scope.row.ispublic==2">已废止</el-tag>
+						<el-tag type="info" v-if="scope.row.ispublic==3">已结束,未完成</el-tag>
+						<el-tag type="success" v-if="scope.row.ispublic==4">已结束,已完成</el-tag>
+						<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="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>
+						<el-tag type="danger" v-if="scope.row.level==2">特急</el-tag>
+					</template>
+				</el-table-column>
+			<el-table-column label="操作" align="center" fixed="right">
+				<!-- 操作按钮区域的作用域插槽 -->
+				<template slot-scope="scope">
+					<el-col style="margin-bottom: 5px;">
+                        <el-button type="success" size="mini" @click="editInform(scope.row.id)" style="margin-top:5px">编辑</el-button>
+						<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)" 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="getJcds(scope.row.id)" style="margin-top:5px">检测单</el-button> 
+						<el-button type="success" size="mini" plain @click="sampleList(scope.row.id)">抽样单</el-button>
+					</el-col>
+				</template>
+			</el-table-column>
+		</el-table>
+		
+		<!--    分页器区域-->
+		<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-dialog title="查看" :visible.sync="readDialogVisible" width="30%" :close-on-click-modal="false"
+			class="dialogItem">
+			<el-form v-if="readDialogVisible" :model="readForm" label-width="100px">
+				<el-form-item label="任务名称:" prop="task_name" class="labelItem">
+					<div>{{readForm.task_name}}</div>
+				</el-form-item>
+				<el-form-item label="任务优先级:" prop="level" class="labelItem">
+					<div v-if="readForm.level=='0'">一般</div>
+					<div v-else-if="readForm.level=='1'">紧急</div>
+					<div v-else>特急</div>
+				</el-form-item>
+				<el-form-item label="监测类型:" prop="task_class" width="70px" class="labelItem">
+					<div>{{readForm.task_class}}</div>
+				</el-form-item>
+				<el-form-item label="年度:" prop="year" class="labelItem">
+					<div>{{readForm.year}}</div>
+				</el-form-item>
+
+				<el-form-item label="批次:" prop="batch" width="200px" class="labelItem">
+					<div>{{readForm.batch}}</div>
+				</el-form-item>
+				<el-form-item label="任务时间:" prop="starttime" width="200px" class="labelItem">
+					<div>{{readForm.starttime}} 至 {{readForm.endtime}}</div>
+				</el-form-item>
+				<el-form-item label="发布单位:" prop="creater" class="labelItem">
+					<div>{{readForm.creater.name}}</div>
+				</el-form-item>
+				<!-- <el-form-item label="牵头单位:" prop="main_unit" class="labelItem">
+					<div>{{readForm.main_unit}}</div>
+				</el-form-item> -->
+				<el-form-item label="附件:" prop="file_url" class="labelItem">
+					<!-- <div>{{readForm.file_url}}</div> -->
+					<el-link :href="readForm.file_url" type="primary">{{readForm.file_name}}</el-link>
+				</el-form-item>
+				<el-form-item label="文件号:" prop="filenum" width="230px" class="labelItem">
+					<div v-if="readForm.filenum==null">无</div>
+					<div v-else>{{readForm.filenum}}</div>
+				</el-form-item>
+				<el-form-item label="备注:" prop="log" class="labelItem">
+					<div v-if="readForm.log==null">无</div>
+					<div v-else>{{readForm.log}}</div>
+				</el-form-item>
+				<div class="footer">
+					<el-button type="success" @click="readDialogVisible = false">返回</el-button>
+				</div>
+			</el-form>
+
+		</el-dialog>
+	</div>
+</template>
+<script>
+	// const token = window.sessionStorage.getItem('token')
+	// const rybh = window.sessionStorage.getItem('rybh')
+	// const rymc = window.sessionStorage.getItem('rymc')
+	export default {
+		name: '',
+		data() {
+			return {
+				queryInfo:{
+					pageSize:10,
+					pageNum:1,
+					// task_class:'retask',
+					task_id:'33',
+				}, 
+				total:0,
+				cellStyle: {
+					padding: 2 + 'px'
+				},
+				rowStyle: {
+					height: 35 + 'px'
+				},
+				tableHeader: [{
+						label: '任务名称',
+						prop: 'task_name',
+						width: 150
+						// fixed: 'left'
+					},
+					{
+						label: '开始时间',
+						prop: 'starttime',
+						width: 120
+					},
+					{
+						label: '结束时间',
+						prop: 'endtime',
+						width: 120
+					},
+					{
+						label: '年度',
+						prop: 'year',
+						width: 80
+						// fixed: 'left'
+					}, {
+						label: '文件号',
+						prop: 'filenum',
+						width: 180
+						// fixed: 'left'
+					},
+					{
+						label: '创建者',
+						prop: 'creater.name',
+						width: 140
+					},
+					{
+						label: '创建时间',
+						prop: 'create_time',
+						width: 180
+					}
+				],
+				// 数据表格数据
+				tableData: [],
+				// 批量删除选中数据
+				multipleSelection: [],
+				// 任务状态选项
+				taskispublic: [{
+					value: '',
+					label: '全部'
+				}, {
+					value: '0',
+					label: '未发布'
+				}, {
+					value: '1',
+					label: '已发布'
+				}, {
+					value: '2',
+					label: '废止'
+				}, {
+					value: '5',
+					label: '执行中'
+				}, {
+					value: '3',
+					label: '已结束,未完成'
+				}, {
+					value: '4',
+					label: '已结束,已完成'
+				}],
+				// 日期选择器快捷选项
+				pickerOptions: {
+					// disabledDate(time) {
+					// 	return time.getTime() > Date.now();
+					// },
+					shortcuts: [{
+						text: '今天',
+						onClick(picker) {
+							picker.$emit('pick', new Date());
+						}
+					}, {
+						text: '昨天',
+						onClick(picker) {
+							const date = new Date();
+							date.setTime(date.getTime() - 3600 * 1000 * 24);
+							picker.$emit('pick', date);
+						}
+					}, {
+						text: '一周前',
+						onClick(picker) {
+							const date = new Date();
+							date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', date);
+						}
+					}]
+				},
+				// 查看任务详情
+				readDialogVisible: false,
+				readForm: {},
+				multipleSelection: [],
+				delarr: [],
+				pubarr: []
+			}
+		},
+		created() {
+			this.getTasks()
+		},
+		methods: {
+			//新增
+			// add() {
+			// 	this.$router.push('addTask')
+			// },
+			
+            //编辑
+            editInform(id){
+				this.$router.push({
+					name:'editInformation',
+					params: {
+					task_id:id,
+					},
+				})
+			},
+			//查看抽样机构
+			sampleList(id){
+				this.$router.push({
+					name:'setTaskJg',
+					params: {
+					task_id:id,
+					}
+				})
+			},
+			// 搜索
+			async searchData() {
+				this.queryInfo.pageNum = 1
+				this.gettaskList()
+			},
+			// 重置
+			reset(){
+				this.queryInfo={
+					year:'',
+					task_name:'',
+					starttime:'',
+					endtime:'',
+					ispublic:'',
+					pageSize:10,
+					pageNum:1,
+					task_class:'例行监测',
+					task_id
+				}
+				this.getTasks()
+			},
+			//退回
+			sendBack(){
+
+			},
+			/** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.queryInfo.pageNum = newPage
+				this.getTasks()
+			},
+			/** 监听每页显示多少数据的改变 */
+			handleSizeChange(newSize) {
+				this.queryInfo.pageSize = newSize
+				this.getTasks()
+			},
+			// 获取任务列表
+			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);
+				const {data: res} = await this.$http.post('getTasks',this.queryInfo)
+				this.tableData = res.data.rows
+				//获取task_id
+				for(let i=0; i<res.data.rows.length; i++){
+					this.task_id = res.data.rows[i].id
+					console.log(this.task_id)
+				}
+				// this.total = res.data.total
+				// this.task_id = res.data.rows[i].id
+
+
+				
+			},
+			// 查看任务详情
+			async readDialogVisible1(row) {
+				this.readForm.batch = row.batch
+				this.readForm.task_name = row.task_name
+				this.readForm.task_class = row.task_class
+				this.readForm.level = row.level
+				this.readForm.year = row.year
+				this.readForm.starttime = row.starttime
+				this.readForm.endtime = row.endtime
+				this.readForm.releaser = row.releaser
+				this.readForm.creater = row.creater
+				this.readForm.main_unit = row.main_unit
+				this.readForm.file_url = row.file_url
+				this.readForm.file_name = row.file_name
+				this.readForm.filenum = row.filenum
+				this.readForm.log = row.log
+				this.readDialogVisible = true
+
+			},
+			// 批量删除
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+				// console.log(this.multipleSelection)
+			},
+			// 删除任务
+			async delArray() {
+				// 判断任务是否为该创建者创建
+				// for (let i = 0; i < this.multipleSelection.length; i++) {
+				// 	if (rybh != this.multipleSelection[i].releaser) {
+				// 		this.$alert('任务仅创建者可以删除!', {
+				// 			confirmButtonText: '确定',
+				// 			callback: action => {
+				// 			}
+				// 		});
+				// 	}
+				// }
+				var that = this;
+				const length = this.multipleSelection.length;
+				for (let i = 0; i < length; i++) {
+					this.delarr.push(this.multipleSelection[i].id);
+				}
+				const result = await this.$http.post('deleteTasks', {
+					delarr: that.delarr,
+					token: token
+				})
+				console.log(that.delarr);
+				if (result.data.code == 0) {
+					this.$message({
+						type: 'success',
+						message: '删除成功!'
+					});
+					that.getTasks()
+				} else {
+					this.$message({
+						type: 'error',
+						message: '删除失败!'
+					});
+				}
+				// console.log(this.$refs.multipleTable);
+				this.$refs.multipleTable.clearSelection();
+				that.delarr = [];
+				// this.$refs.multipleTable.clearSelectionFun();
+			},
+			// 发布任务
+			async ispublic() {
+				// 判断任务是否为该创建者创建
+				// for (let i = 0; i < this.multipleSelection.length; i++) {
+				// 	if (rybh != this.multipleSelection[i].releaser) {
+				// 		this.$alert('任务仅创建者可以发布!', {
+				// 			confirmButtonText: '确定',
+				// 			callback: action => {
+
+				// 			}
+				// 		});
+				// 	}
+				// }
+				var that = this;
+				let canPub = 0
+				const length = this.multipleSelection.length;
+				// var val = this.selectedData;
+				console.log(this.multipleSelection)
+				// this.pubarr = this.multipleSelection;
+				for (let i = 0; i < length; i++) {
+					if (this.multipleSelection[i].ispublic != '0') {
+						this.$alert('任务不在可发布状态!', {
+							confirmButtonText: '确定',
+							callback: action => {
+
+							}
+						});
+					} else {
+						this.multipleSelection[i].ispublic = 1
+						canPub = 1
+					}
+				}
+				if(canPub==1){
+					const result = await this.$http.post('putTaskPublic', {
+						pubarr: that.multipleSelection,
+						token: token,
+					})
+					console.log(result.data.code)
+					if (result.data.code == 0) {
+						this.$message({
+							type: 'success',
+							message: '发布成功!'
+						});
+						that.getTasks()
+					}else{
+						this.$message({
+							type: 'error',
+							message: result.data.message})
+					}				
+				}
+			},
+			// 废止任务
+			async repeal() {
+				// 判断任务是否为该创建者创建
+				for (let i = 0; i < this.multipleSelection.length; i++) {
+					if (rybh != this.multipleSelection[i].releaser) {
+						this.$alert('任务仅创建者可以废止!', {
+							confirmButtonText: '确定',
+							callback: action => {}
+						});
+					}
+				}
+				var that = this;
+				let canPub = 0
+				const length = this.multipleSelection.length;
+				// var val = this.selectedData;
+				this.pubarr = this.multipleSelection;
+				for (let i = 0; i < length; i++) {
+					if (this.pubarr[i].ispublic == 1) {
+						this.pubarr[i].ispublic = 2
+						canPub = 1
+					} else {
+						this.$alert('任务不在可废止状态!', {
+							confirmButtonText: '确定',
+							callback: action => {
+							}
+						});
+					}
+					if(canPub==1){
+						const result = await this.$http.post('putTaskPublic', {
+							pubarr: that.pubarr,
+							token: token
+						})
+						if (result.data.code == 0) {
+							this.$message({
+								type: 'success',
+								message: '任务已废止!'
+							});
+							that.getTasks()
+						}
+					}
+					
+				}
+
+			}
+		},
+	}
+</script>
+
+<style lang="less" scoped>
+	.el-breadcrumb {
+		margin-bottom: 20px;
+	}
+	.el-table {
+		align-items: center;
+		margin-top: 25px;
+	}
+
+	/deep/ .el-col {
+		padding-right: 0 !important;
+	}
+
+	/deep/ .el-radio-group label {
+		width: 180px;
+		margin-right: 10px;
+	}
+
+	.el-pagination {
+		margin-top: 25px;
+	}
+
+	// .el-cascader {
+	// 	width: 290px;
+	// }
+
+	.el-select {
+		width: 210px;
+		height: 100%;
+	}
+
+	.select {
+		// display: flex;
+		flex-direction: row;
+		margin-left: 35px;
+		
+	}
+
+	.dialogItem /deep/ .el-dialog__body {
+		padding: 15px 12px 0;
+		color: #606266;
+		font-size: 14px;
+		word-break: break-all;
+	}
+
+	.el-form-item {
+		margin-bottom: 8px;
+	}
+
+	.labelItem /deep/ .el-form-item__label {
+		// width: 80px;
+		text-align: center;
+		vertical-align: middle;
+		float: left;
+		font-size: 13px;
+		color: #606266;
+		// line-height: 40px;
+		padding: 0 2px 0 0;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+
+	.el-dialog__header {
+		border-bottom: 1px solid #e5e5e5;
+	}
+
+	// .el-form-item__content{
+	// 	margin-left: 0;
+	// }
+	.footer {
+		padding: 5px 0;
+		border-top: 1px solid #e5e5e5;
+		text-align: center;
+	}
+	.rightButton{
+		margin-top: 20px;
+	}
+	.headSearch{
+		margin-left: 25px;
+	}
+</style>

+ 224 - 0
src/components/admin/readSampleList copy.vue

@@ -0,0 +1,224 @@
+<template>
+    
+   	<div style="width: 100%">
+        <!-- 标题栏导航 -->
+	    <div slot="header" class="clearfix">
+            <el-breadcrumb separator-class="el-icon-artableDate-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 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>
+						<el-tag type="danger" v-if="scope.row.level==2">特急</el-tag>
+					</template>
+				</el-table-column> -->
+        <!-- 操作 -->
+        <el-table-column label="操作" align="center" fixed="right">
+        <template>
+            <el-button style="margin:5px 0" type="success" size="small" @click="dialogVisible=true">查看详情</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>
+        <!-- 查看详情对话框-->
+		<el-dialog title="查看" :visible.sync="dialogVisible" width="30%" :close-on-click-modal="false"
+			class="dialogItem" >
+			<el-form v-if="dialogVisible" label-width="100px">
+				<el-form-item label="抽样单编码:" prop="tableData.cyd_code" class="labelItem">
+					<div>{{readForm.cyd_code}}</div>
+				</el-form-item>
+				<el-form-item label="抽样单状态:" prop="cyd_status" class="labelItem">
+					<div v-if="level=='0'">一般</div>
+					<div v-if="level=='1'">紧急</div>
+					<div v-if="level=='2'">特急</div>
+				</el-form-item>
+				<el-form-item label="抽样人员1:" prop="sample_person_one" width="70px" class="labelItem">
+					<div>{{sample_person_one}}</div>
+				</el-form-item>
+				<el-form-item label="抽样人员2:" prop="sample_person_two" class="labelItem">
+					<div>{{readForm.sample_person_two}}</div>
+				</el-form-item>
+				<el-form-item label="抽样时间:" prop="cyd_date" class="labelItem">
+					<div>{{readForm.cyd_date}}</div>
+				</el-form-item>
+				<el-form-item label="单位名称:" prop="inspected_name" class="labelItem">
+					<div>{{readForm.inspected_name}}</div>
+				</el-form-item>
+				<el-form-item label="单位地址:" prop="inspected_address" class="labelItem">
+					<div>{{readForm.inspected_address}}</div>
+				</el-form-item>
+                <el-form-item label="联系人:" prop="contact_name" class="labelItem">
+					<div>{{readForm.contact_name}}</div>
+				</el-form-item>
+				<el-form-item label="备注:" prop="cyd_log" class="labelItem">
+					<div v-if="readForm.cyd_log==null">无</div>
+					<div v-else>{{readForm.cyd_log}}</div>
+				</el-form-item>
+				<div class="footer">
+					<el-button type="success" @click="dialogVisible = false">返回</el-button>
+				</div>
+			</el-form>
+		</el-dialog>
+
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            // 查看任务详情
+			dialogVisible: false,
+			readForm: {
+                cyd_code:''
+            },
+            // 数据表格数据
+			tableData:[],
+            sampleOrgId:{},
+            queryInfo:{
+					pageSize:10,
+					pageNum:1,
+					task_class:'例行监测',
+                    task_id: 39, //任务id
+                    task_profile_id: 90, //task_profile_id
+                    sample_org_id: 18, //抽样单位id
+                    check_org_id: 272, //检测单位id
+                    cyd_status:'',
+                    cyd_status_condition:'',
+                    cyd_code:''
+                    },
+                tableHeader2: [{
+                            label: '抽样单编码',
+                            prop: 'cyd_code',
+                            width: 180,
+                        },{
+                            label: '抽样人员1',
+                            prop: 'cydProfile.sample_person_one',
+                            width: 120,
+                        },{
+                            label: '抽样人员2',
+                            prop: 'cydProfile.sample_person_two',
+                            width: 120,
+                        },{
+                            label: '抽样时间',
+                            prop: 'cydProfile.cyd_date',
+                            width: 160,
+                        },
+                        // {
+                        //     label: '样品名称',
+                        //     prop: 'inspectedUnit.sample_name',
+                        //     width: 120,
+                        // },{
+                        //     label: '样品商标',
+                        //     prop: 'sample.data.sample_brand'
+                        // },
+                        {
+                            label: '抽样单状态',
+                            prop: 'cyd_status'
+                        },
+                ]  
+        }
+    },
+    mounted() {
+        this.getCyds()
+    },
+    created() {
+        this.id = this.$route.params.id
+        // this.task_id = this.$route.params.id
+        // console.log(this.task_id)
+        this.getCyds()
+    },
+	methods: {
+        //返回
+        returnSampleList(){
+            this.$router.push('setTaskJg')
+        },
+       // 获取抽样单列表
+        async getCyds() {
+            for (var key in this.queryInfo) {
+                if (this.queryInfo[key] == '') {
+                    delete this.queryInfo[key]
+                }
+            }
+            const {
+                data: res
+            } = await this.$http.post(
+                "getCyds", this.queryInfo
+            );
+            this.tableData = res.data.rows
+            console.log( this.tableData)
+            this.total = res.data.total
+            this.task_id = res.data.rows.task_id
+            for(let i=0; i<this.tableData.length; i++){
+                if (this.tableData[i].cyd_status == "0"){
+                      this.tableData[i].cyd_status ="未发布";
+                }else if(this.tableData[i].cyd_status == "1"){
+                    this.tableData[i].cyd_status ="已发布";
+                }else if(this.tableData[i].cyd_status == "2"){
+                    this.tableData[i].cyd_status ="废止";
+                }else if(this.tableData[i].cyd_status == "3"){
+                    this.tableData[i].cyd_status ="已结束未完成";
+                }else if(this.tableData[i].cyd_status == "4"){
+                    this.tableData[i].cyd_status ="已结束已完成";
+                }else{
+                     this.tableData[i].releaser.properties ="执行中";
+                }
+            }
+        },
+        
+        //分页器
+                handleSizeChange(val) {
+                    console.log(`每页 ${val} 条`);
+                    },
+                handleCurrentChange(val) {
+                    this.queryInfo.pageNum = val;
+                    console.log(`当前页: ${val}`);
+                    this.getCyds()
+                    },
+                /** 监听页码的改变 */
+                handleCurrentChange(newPage) {
+                    this.queryInfo.pageNum = newPage
+                    this.getCyds()
+                },
+                /** 监听每页显示多少数据的改变 */
+                handleSizeChange(newSize) {
+                    this.queryInfo.pageSize = newSize
+                    this.getCyds()
+                },
+            	// 查看任务详情
+			async readDialogVisible1(row) {
+				this.readForm.cyd_code = row.cyd_code
+				
+				this.readDialogVisible = true
+            }
+         
+    }
+}
+</script>
+<style>
+.btns{
+	float:right;
+	/* margin-top: 10px; */
+	padding: 10px;
+}
+.feyeqi{
+    margin-top: 10px;
+}
+</style>