xiugai

src/components/jc/inputSample.vue

@@ -5,14 +5,17 @@
 		<!-- <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 :to="{ path: '/jc/routineMonitor' }">例行检测</el-breadcrumb-item>
-			<el-breadcrumb-item :to="{ path: '/jc/setTaskcd' }">执行任务</el-breadcrumb-item>
+			<el-breadcrumb-item>执行任务</el-breadcrumb-item>
+			<!-- :to="{ path: '/jc/setTaskcd' }" -->
+			
 			<el-breadcrumb-item>抽样</el-breadcrumb-item>
 			<el-breadcrumb-item>填报抽样单</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div class="form">
-			<el-form ref="form" :model="form" label-width="100px"
-				style="margin-top: 20px;width: 48%;background-color: aliceblue;padding: 5px;">
+			<el-form ref="form" :model="form" :inline="true"
+				style="margin-top: 20px;width: 80%;background-color: aliceblue;padding: 5px;">
 				<el-row style="text-align: center; font-size: 23px; margin: 40px 0;">
 					安徽省农业农村厅 农产品质量安全 例行检测 抽样单
 				</el-row>
@@ -92,36 +95,40 @@
 				<el-row>
 					<el-col :span="12">
 						<el-row>
-							<el-col :span="13">
+							<!-- <el-col :span="13"> -->
 								<el-form-item label="抽样数量" prop="sample_renum" class="labelItem" size="mini" required>
 									<el-input v-model="form.sample_renum"></el-input>
 								</el-form-item>
-							</el-col>
-							<el-col :span="10">
+							<!-- </el-col> -->
+						</el-row>
+						<el-row>
+							<!-- <el-col :span="10"> -->
 								<el-form-item label="单位" prop="sample_num_unit" class="labelItem" size="mini" required
-									label-width="60px">
+									>
 									<el-input v-model="form.sample_num_unit"></el-input>
 								</el-form-item>
-							</el-col>
+							<!-- </el-col> -->
 						</el-row>
 					</el-col>
 					<el-col :span="11">
 						<el-row>
-							<el-col :span="13">
+							<!-- <el-col :span="13"> -->
 								<el-form-item label="抽样基数" prop="sample_base" class="labelItem" size="mini" required>
 									<el-input v-model="form.sample_base"></el-input>
 								</el-form-item>
-							</el-col>
-							<el-col :span="10">
+							<!-- </el-col> -->
+						</el-row>
+						<el-row>
+							<!-- <el-col :span="10"> -->
 								<el-form-item label="单位" prop="sample_base_unit" class="labelItem" size="mini" required
-									label-width="60px" clearable>
+									 clearable>
 									<el-input v-model="form.sample_base_unit"></el-input>
 								</el-form-item>
-							</el-col>
+							<!-- </el-col> -->
 						</el-row>
 					</el-col>
 				</el-row>
-				<el-row>
+				<el-row style="margin-bottom: 2%">
 					<el-col>
 						<el-form-item label="抽样场所" prop="sample_ground" class="labelItem" size="mini" required>
 							<el-radio v-model="form.sample_ground" label="生产基地/企业">生产基地/企业</el-radio>
@@ -133,14 +140,12 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-				<el-row>
-					<el-col :span="7"
-						style="text-align: center;vertical-align: middle;line-height: 250px;font-size: 14px;">
-						<div class="">
+				<el-row style="margin-bottom: 2%">
+					<el-col :span="3"
+						style="text-align: center;vertical-align: middle;line-height: 75px;font-size: 14px; color: #606266">
 							受检单位情况
-						</div>
 					</el-col>
-					<el-col :span="15">
+					<el-col :span="19">
 						<el-form-item label="单位名称" prop="units_name" class="labelItem" style="" size="mini" required>
 							<el-input v-model="form.units_name"></el-input>
 						</el-form-item>
@@ -161,21 +166,20 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-			</el-form>
-			<el-form ref="form" :model="form" label-width="110px"
-				style="margin-top: 20px;width: 48%;background-color: aliceblue;padding:10px 1px 1px 10px;">
-				<el-row>
-					<el-col :span="7"
-						style="text-align: center;vertical-align: middle;line-height: 250px;font-size: 14px;">
+				<el-row style="margin-bottom: 2%">
+				<el-col :span="3"
+						style="text-align: center;vertical-align: middle;line-height: 130px;font-size: 14px; color: #606266">
 						<div class="">
 							生产单位情况
 						</div>
-					</el-col>
-					<el-col :span="15">
+				</el-col>
+					<el-col :span="19">
+						<el-row>
 						<el-form-item label="" prop="production_class" class="labelItem" style="" size="mini" required>
 							<el-radio v-model="form.production_class" label="自产">自产</el-radio>
 							<el-radio v-model="form.production_class" label="收购">收购</el-radio>
 						</el-form-item>
+						</el-row>
 						<el-form-item label="单位名称" prop="production_name" class="labelItem" style="" size="mini"
 							required>
 							<el-input v-model="form.production_name"></el-input>
@@ -183,10 +187,10 @@
 						<el-form-item label="通讯地址" prop="p_address" class="labelItem" style="" size="mini" required>
 							<el-input v-model="form.p_address"></el-input>
 						</el-form-item>
-						<el-form-item label="邮编" prop="postcode" class="labelItem" style="" size="mini">
+						<el-form-item label="邮编" prop="p_postcode" class="labelItem" style="" size="mini">
 							<el-input v-model="form.p_postcode"></el-input>
 						</el-form-item>
-						<el-form-item label="联系人" prop="user_name" class="labelItem" style="" size="mini" required>
+						<el-form-item label="联系人" prop="p_user_name" class="labelItem" style="" size="mini" required>
 							<el-input v-model="form.p_user_name"></el-input>
 						</el-form-item>
 						<el-form-item label="电话" prop="p_phone" class="labelItem" style="" size="mini">
@@ -197,14 +201,14 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-				<el-row>
-					<el-col :span="7"
-						style="text-align: center;vertical-align: middle;line-height: 250px;font-size: 14px;">
+				<el-row style="padding-bottom: 2%">
+					<el-col :span="3"
+						style="text-align: center;vertical-align: middle;line-height: 130px;font-size: 14px; color: #606266">
 						<div class="">
 							抽样单位情况
 						</div>
 					</el-col>
-					<el-col :span="15">
+					<el-col :span="19">
 						<el-form-item label="单位名称" prop="sample_unit_name" class="labelItem" style="" size="mini"
 							required>
 							<el-input v-model="form.sample_unit_name"></el-input>
@@ -257,6 +261,11 @@
 					<el-button @click="onSubmit">保存，继续添加</el-button>
 				</el-form-item>
 			</el-form>
+			<!-- <el-form ref="form1" :model="form" label-width="110px"
+				style="margin-top: 20px;width: 48%;background-color: aliceblue;padding:10px 1px 1px 10px;">
+				
+					
+			</el-form> -->
 		</div>
 		<!-- </el-card> -->
 	</div>
@@ -281,10 +290,48 @@
 				},
 				fileList: [],
 				form: {
-					sample_id: '',
+					sample_name: '',//样品名称
+					sample_id: '',//样品编码
+					brand: '',//商标
+					ispack: '',//包装
+					type: '', //型号规格
+					standard: '',//执行标准
+					production_date: '',//生产日期或批号
 					place: '', //产地,
-
-				},
+					certicfie: '',//产品认证情况
+					certifie_num: '',//证书编号
+					sample_renum: '',//抽样数量
+					sample_num_unit: '',//单位
+					sample_base: '',//抽样基数
+					sample_base_unit: '',//单位
+					sample_ground: '',//抽样场所
+					// 受检单位情况
+					units_name: '',//单位名称
+					address: '',//通讯地址
+					corporation: '',//法定代表人
+					user_name: '',//受检人
+					phone: '',//电话
+					fax: '',//传真
+					// 生产单位情况
+					production_class: '',//生产、自购
+					production_name: '',//单位名称
+					p_address: '',//通讯地址
+					p_postcode: '',//邮编
+					p_user_name: '',//联系人
+					p_phone: '',//电话
+					p_fax: '',//传真
+					// 抽样单位情况
+					sample_unit_name: '',//单位名称
+					sample_unit_user: '',//联系人
+					sample_unit_address: '',//通讯地址
+					sample_unit_postcode: '',//邮编
+					sample_unit_phone: '',//联系电话
+					sample_unit_fax: '',//传真
+					sample_unit_email: '',//Email
+					base: '',//检测任务依据
+					sample_date: '',//抽样时间
+					filr_url: '',//被抽检单位签字盖章附件
+						},
 				units: [],
 				production: [],
 				// 样品下拉框
@@ -374,7 +421,9 @@
 			},
 			// 重置表单
 			resetForm(formName) {
-				this.$refs[formName].resetFields();
+				// console.log(this.form)
+					this.$refs[formName].resetFields();
+					this.selectedOptions = '';
 			},
 			// 返回
 			back() {
@@ -394,11 +443,11 @@
 	.form {
 		display: flex;
 		flex-direction: row;
-		justify-content: space-between;
+		justify-content: center;
+		align-content: flex-start;
 	}
 
-	/* 	.el-form {
-	
+	// .el-row {
 		
-	} */
+	// }
 </style>

src/components/jc/routineMonitor.vue

@@ -12,7 +12,7 @@
 			</div>
 			<!-- 头部搜索栏 -->
 			<el-row :gutter="50" style="margin-right: 0px;">
-				<el-form style="display: flex; flex-direction: row;" >
+				<el-form style="display: flex; flex-direction: row;" size="mini">
 					<el-form-item label="年度" class="select">
 						<el-date-picker v-model="queryInfo.taskyear" style="width: 110px;" value-format="yyyy"
 							type="year" clearable />
@@ -36,9 +36,9 @@
 						<el-input v-model="queryInfo.taskname"></el-input>
 					</el-form-item>
 					<!-- 查询 -->
-					<el-button style="height: 40px;margin-left: 10px;" type="success" @click="searchData()">查询</el-button>
+					<el-button style="height: 28px;margin-left: 10px;" size="mini" type="success" @click="searchData()">查询</el-button>
 					<!-- 重置 -->
-					<el-button style="height: 40px;margin-left: 5px;" type="success" @click="reset()">重置</el-button>
+					<el-button style="height: 28px;margin-left: 5px;"  size="mini" type="success" @click="reset()">重置</el-button>
 				</el-form>
 			</el-row>
 			<!--  头部钮区域-->

src/components/jc/routineMonitorqt.vue

@@ -12,7 +12,7 @@
 			<!-- 头部搜索栏 -->
 			<div class="form">
 				<el-row :gutter="50" style="margin-right: 0px;">
-					<el-form style="display: flex; flex-flow: row nowrap;">
+					<el-form style="display: flex; flex-flow: row nowrap;" size="mini">
 						<el-form-item label="年度" class="select" style="margin-left: -0.3%;">
 							<el-date-picker v-model="queryInfo.year" value-format="yyyy"
 								type="year" clearable />
@@ -36,9 +36,9 @@
 							<el-input v-model="queryInfo.task_name"></el-input>
 						</el-form-item>
 						<!-- 查询 -->
-						<el-button style="height: 2.5rem;margin-left: 1%;" type="success"  size="mini" @click="searchData()">查询</el-button>
+						<el-button style="height: 28px;margin-left: 1%;" type="success"  size="mini" @click="searchData()">查询</el-button>
 						<!-- 重置 -->
-						<el-button style="height: 2.5rem;margin-left: 0.5%;" type="success"  size="mini" @click="reset()">重置</el-button>
+						<el-button style="height: 28px;margin-left: 0.5%;" type="success"  size="mini" @click="reset()">重置</el-button>
 					</el-form>
 				</el-row>
 			</div>

src/components/jc/setTask.vue

@@ -74,7 +74,7 @@
 					<el-button type="success" size="mini" @click="bindModel">保存</el-button>
 					<el-button type="success" size="mini" @click="next">下一步</el-button>
 				</div>
-				</el-form>
+				
 			</el-tab-pane>
 
 			<el-tab-pane label="机构与地域" name="second">
@@ -200,7 +200,7 @@
 						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
 				</el-table>
 				<div>
-					<!--    分页器区域-->
+					<!--    分页器区域--> 
 					<el-pagination @size-change="handleSizeChanges" @current-change="handleCurrentChanges"
 						:current-page="queryInfos.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfos.pageSize"
 						layout="total, sizes, prev, pager, next, jumper" :total="totals" background />
@@ -623,9 +623,9 @@
 		margin: 20px;
 	}
 
-	.el-form-item__content {
-		// width: 200px;
-	}
+	// .el-form-item__content {
+	// 	width: 200px;
+	// }
 
 	.my-label {
 		width: 100px;

src/components/jc/setTaskcd.vue

@@ -420,7 +420,7 @@
 				</div>
 				<el-button @click="dialogVisible2 = false">取 消</el-button>
 				<el-button type="primary" @click="download">生成检测报告pdf</el-button>
-				</span>
+				<!-- </span> -->
 			</el-dialog>
 
 			<el-tab-pane label="报告上传" name="five">
@@ -456,7 +456,8 @@
 				underTasktotal: '0',
 				queryInfo: {
 					pageNum: 1,
-					pageSize: 10
+					pageSize: 10,
+					task_id: ''
 				},
 				// 填报对话框弹出
 				inputDialogShow: false,

src/components/jc/specialMonitorcd.vue

@@ -12,7 +12,7 @@
 			</div>
 			<!-- 头部搜索栏 -->
 			<el-row :gutter="50" style="margin-right: 0px;">
-				<el-form style="display: flex; flex-direction: row;">
+				<el-form style="display: flex; flex-direction: row;" size="mini">
 					<el-form-item label="年度" class="select">
 						<el-date-picker v-model="queryInfo.taskyear" style="width: 110px;" value-format="yyyy"
 							type="year" clearable />
@@ -36,9 +36,9 @@
 						<el-input v-model="queryInfo.taskname"></el-input>
 					</el-form-item>
 					<!-- 查询 -->
-					<el-button style="height: 40px;margin-left: 10px;" type="success">查询</el-button>
+					<el-button style="height: 28px;margin-left: 10px;" size="mini" type="success" @click="searchData()">查询</el-button>
 					<!-- 重置 -->
-					<el-button style="height: 40px;margin-left: 5px;" type="success">重置</el-button>
+					<el-button style="height: 28px;margin-left: 5px;"  size="mini" type="success" @click="reset()">重置</el-button>
 				</el-form>
 			</el-row>
 			<!--  头部钮区域-->
@@ -63,9 +63,8 @@
 
 				<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="任务状态"  align="center">
+				<el-table-column prop="ispublic" label="任务状态"  align="center">
 					<template slot-scope="scope">
-						<el-tag type="success" 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>
@@ -161,26 +160,20 @@
 				queryInfo: {},
 				// 任务状态选项
 				taskstatus: [{
-					value: '选项1',
+					value: '',
 					label: '全部'
-				}, {
-					value: '选项2',
-					label: '未发布'
-				}, {
-					value: '选项3',
-					label: '已发布'
-				}, {
-					value: '选项4',
+				},{
+					value: '2',
 					label: '已废止'
 				}, {
-					value: '选项5',
-					label: '执行中'
-				}, {
-					value: '选项6',
+					value: '3',
 					label: '已结束，未完成'
 				}, {
-					value: '选项7',
+					value: '4',
 					label: '已结束，已完成'
+				}, {
+					value: '5',
+					label: '执行中'
 				}],
 				// 日期选择器快捷选项
 				pickerOptions: {
@@ -237,9 +230,30 @@
 				console.log(res)
 				this.tableData = res.data.rows
 				this.total = res.data.total
+			},
 
+			// 搜索
+			async searchData() {
+				console.log(this.queryInfo)
+				this.queryInfo.pageNum = 1
+				this.gettaskList()
+			},
 
+			// 重置
+			reset(){
+				this.queryInfo={
+					year:'',
+					task_name:'',
+					starttime:'',
+					endtime:'',
+					ispublic:'',
+					pageSize:10,
+					pageNum:1,
+					task_class:'专项监测'
+				}
+				this.gettaskList()
 			},
+
 			runtask(id) {
 				console.log(id)
 				this.$router.push({

src/components/jc/specialMonitorqt.vue

@@ -12,7 +12,7 @@
 			</div>
 			<!-- 头部搜索栏 -->
 			<el-row :gutter="50" style="margin-right: 0px;">
-				<el-form style="display: flex; flex-direction: row;">
+				<el-form style="display: flex; flex-direction: row;" size="mini">
 					<el-form-item label="年度" class="select">
 						<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy"
 							type="year" clearable />
@@ -36,9 +36,9 @@
 						<el-input v-model="queryInfo.task_name"></el-input>
 					</el-form-item>
 					<!-- 查询 -->
-					<el-button style="height: 40px;margin-left: 10px;" type="success"  size="mini"  @click="searchData()">查询</el-button>
+					<el-button style="height: 28px;margin-left: 10px;" type="success"  size="mini"  @click="searchData()">查询</el-button>
 					<!-- 重置 -->
-					<el-button style="height: 40px;margin-left: 5px;" type="success"  size="mini" @click="reset()">重置</el-button>
+					<el-button style="height: 28px;margin-left: 5px;" type="success"  size="mini" @click="reset()">重置</el-button>
 				</el-form>
 			</el-row>
 			<!--  头部钮区域-->