填报单

package-lock.json

@@ -1668,16 +1668,6 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "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",
@@ -1704,53 +1694,6 @@
             "unique-filename": "^1.1.1"
           }
         },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz",
-          "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-          "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",
@@ -1767,16 +1710,6 @@
             "minipass": "^3.1.1"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703342506&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "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",
@@ -1793,18 +1726,6 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.1",
-          "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.1.tgz",
-          "integrity": "sha1-NU8SvAiXlUFYtxWQ+AApVxOneS0=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          }
         }
       }
     },
@@ -11592,6 +11513,87 @@
         }
       }
     },
+    "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/leadReport.vue

@@ -0,0 +1,122 @@
+<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 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 class="block">
+				 <el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page="currentPage"
+					:page-sizes="[10, 25, 50, 100]"
+					:page-size="100"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="total">
+    			</el-pagination>
+			</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')
+		},
+		handleSizeChange(val) {
+        	console.log(`每页 ${val} 条`);
+      		},
+      		handleCurrentChange(val) {
+        		console.log(`当前页: ${val}`);
+      		}
+	}
+}
+</script>
+
+
+<style>
+.btns{
+	float:right;
+}
+</style>

src/components/admin/routineMonitor.vue

@@ -1,9 +1,8 @@
+
 <template>
 	<div style="width: 100%">
-	
-			<div slot="header" class="clearfix">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			
+	<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>
@@ -11,56 +10,75 @@
 		</el-breadcrumb>
 		</div>
 		
-		<!-- 头部搜索栏 -->
-		<el-row :gutter="50" style="margin-right: 0px;">
-			<el-form style="display: flex; flex-direction: row;">
+		<!-- 头部查询栏 -->
+		<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="mini">
-					<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy" type="year"
-						clearable />
+					<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-select v-model="queryInfo.ispublic" style="width: 110px;" clearable>
-						<el-option v-for="item in taskispublic" :key="item.value" :label="item.label"
+						<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="mini">
 					<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-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-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>
-		<!--  头部钮区域-->
-		<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>
+				</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 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" />
@@ -89,8 +107,8 @@
 						<el-button type="success" size="mini" plain @click="takeTheLeadReport()">牵头单位报告</el-button>
 					</el-col>
 					<el-col style="margin-bottom: 5px;">
-						<el-button type="success" size="mini" plain>承担单位报告</el-button>
-						<el-button type="success" size="mini" plain @click="ttaskSample()">抽样单</el-button>
+						<el-button type="success" size="mini" plain @click="undertakeReport()">承担单位报告</el-button>
+						<el-button type="success" size="mini" plain @click="taskSample()">抽样单</el-button>
 					</el-col>
 				</template>
 			</el-table-column>
@@ -151,9 +169,7 @@
 
 		</el-dialog>
 	</div>
-
 </template>
-
 <script>
 	const token = window.sessionStorage.getItem('token')
 	const rybh = window.sessionStorage.getItem('rybh')
@@ -290,6 +306,12 @@
 			takeTheLeadReport() {
 				this.$router.push('takeTheLeadReporList')
 			},
+			undertakeReport(){
+				this.$router.push('undertakeReport')
+			},
+			taskSample(){
+				this.$router.push('taskSample')
+			},
 			// 搜索
 			async searchData() {
 				this.queryInfo.pageNum = 1
@@ -362,7 +384,7 @@
 			// 批量删除
 			handleSelectionChange(val) {
 				this.multipleSelection = val;
-				console.log(this.multipleSelection)
+				// console.log(this.multipleSelection)
 			},
 			// 删除任务
 			async delArray() {
@@ -388,9 +410,7 @@
 					delarr: that.delarr,
 					token: token
 				})
-				console.log(that.delarr)
-				console.log(result)
-
+				console.log(that.delarr);
 				if (result.data.code == 0) {
 					this.$message({
 						type: 'success',
@@ -469,7 +489,7 @@
 				// var val = this.selectedData;
 				this.pubarr = this.multipleSelection;
 				for (let i = 0; i < length; i++) {
-					if (this.pubarr[i].ispublic == '1') {
+					if (this.pubarr[i].ispublic == '已发布') {
 						this.pubarr[i].ispublic = 2
 						canPub = 1
 					} else {
@@ -535,9 +555,10 @@
 	}
 
 	.select {
-		display: flex;
+		// display: flex;
 		flex-direction: row;
-		margin-left: 10px;
+		// margin-left: 10px;
+		
 	}
 
 	.dialogItem /deep/ .el-dialog__body {
@@ -576,4 +597,10 @@
 		border-top: 1px solid #e5e5e5;
 		text-align: center;
 	}
+	.rightButton{
+		margin-top: 20px;
+	}
+	.headSearch{
+		margin-left: 25px;
+	}
 </style>

src/components/admin/specialMonitor.vue

@@ -10,9 +10,11 @@
 		  <el-breadcrumb-item>任务列表</el-breadcrumb-item>
 		</el-breadcrumb>
 		</div>
-		<!-- 头部搜索栏 -->
-				<el-row :gutter="50" style="margin-right: 0px;">
-			<el-form style="display: flex; flex-direction: row;">
+		<!-- 头部搜查询栏 -->
+		<div class="headSearch">
+			<el-row :gutter="50" style="margin-right: 0px;">
+			<!-- <el-form style="display: flex; flex-direction: row;"> -->
+				<el-form :inline="true">
 				<el-form-item label="年度" class="select" size="mini">
 					<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy" type="year"
 						clearable />
@@ -41,9 +43,10 @@
 				<el-button  size="mini" style="height: 40px;margin-left: 5px;" type="success" @click="reset()">重置</el-button>
 			</el-form>
 		</el-row>
-
-		<!--  头部钮区域-->
-		<el-row :gutter="90" style="margin-right: 0px;">
+		</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()">发布
@@ -52,7 +55,9 @@
 				<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>
+			</el-row>
+		</div>
+		
 
         <!--  表格数据区域-->
 		<el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row style="width: 100%"
@@ -87,11 +92,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="takeTheLeadReporList()">牵头单位报告</el-button>
+						<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>承担单位报告</el-button>
-						<el-button type="success" size="mini" plain @click="taskSample()">抽样单</el-button>
+						<el-button type="success" size="mini" plain @click="undertakeReporttwo()">承担单位报告</el-button>
+						<el-button type="success" size="mini" plain @click="taskSampletwo()">抽样单</el-button>
 					</el-col>
 				</template>
 			</el-table-column>
@@ -222,7 +227,6 @@
 						}
 					}]
 				},
-				total:0,
 				cellStyle: {
 					padding: 2 + 'px'
 				},
@@ -269,13 +273,14 @@
 				],
 				// 数据表格数据
 				tableData: [],
+				total:0,
 				// 批量选中数据
 				multipleSelection: [],
 				// 查看任务详情
 				readDialogVisible: false,
 				readForm: {},
 				delarr: [],
-				pubarr: []
+				pubarr: [],
 			}
 		},
 		created() {
@@ -287,6 +292,12 @@
 				this.queryInfo.pageNum = 1
 				this.gettaskList()
 			},
+			undertakeReporttwo(){
+				this.$router.push('undertakeReporttwo')
+			},
+			taskSampletwo(){
+				this.$router.push('taskSampletwo')
+			},
 			// 重置
 			reset(){
 				this.queryInfo={
@@ -396,6 +407,9 @@
 				}
 
 			},
+			leadReport() {
+				this.$router.push('leadReport')
+			},
 			// 批量删除
 			handleSelectionChange(val) {
 				this.multipleSelection = val;
@@ -463,11 +477,7 @@
 						delete this.queryInfo[key]
 					}
 				}
-				const {
-					data: res
-				} = await this.$http.post(
-					"getTaskList", this.queryInfo
-				);
+				const {data: res} = await this.$http.post("getTaskList", this.queryInfo);
 				this.tableData = res.data.rows
 				this.total = res.data.total
 			},
@@ -510,9 +520,9 @@
 	}
 
 	.select {
-		display: flex;
+		// display: flex;
 		flex-direction: row;
-		margin-left: 10px;
+		// margin-left: 10px;
 	}
 	
 		.el-form-item {
@@ -573,4 +583,13 @@
 		border-top: 1px solid #e5e5e5;
 		text-align: center;
 	}
+	.headSearch{
+		margin-left: 15px;
+	}
+	.rightButton{
+		margin-top: 20px;
+	}
+	.headSearch{
+		margin-left: 25px;
+	}
 </style>

src/components/admin/takeTheLeadReporList.vue

@@ -1,50 +1,70 @@
 <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 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>
-
-        <!-- 选择区域 -->
-          <el-select v-model="value" placeholder="请选择" style="margin:20px 0px">
-       <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value">
-     </el-option>
-     </el-select>
-
+            <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 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 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-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-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="currentPage4"
+					:page-sizes="[10, 25, 50, 100]"
+					:page-size="50"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="100">
+    			</el-pagination>
+			</div>
+		</div>
+	</div>
     
 </template>
 
@@ -54,6 +74,10 @@
 		name: '',
 		data() {
 			return {
+				currentPage1: 5,
+        		currentPage2: 5,
+        		currentPage3: 5,
+        		currentPage4: 4,
                 cellStyle: {
 					padding: 2 + 'px'
 				},
@@ -89,19 +113,47 @@
 					}
 				],
                 options: [{
-          value: '选项1',
-          label: '测试1'
-        }, {
-          value: '选项2',
-          label: '测试2'
-        }, {
-          value: '选项3',
-          label: '测试3'
-        }],
-				// 数据表格数据
+					value: '选项1',
+					label: '测试1'
+					}, {
+					value: '选项2',
+					label: '测试2'
+					}, {
+					value: '选项3',
+					label: '测试3'
+					}],
+			// 数据表格数据
 				tableData: []
             }
-        }
+        },
+		 methods: {
+        	returnTask(){
+            this.$router.push('routineMonitor')
+        	},
+      		handleSizeChange(val) {
+        	console.log(`每页 ${val} 条`);
+      		},
+      		handleCurrentChange(val) {
+        		console.log(`当前页: ${val}`);
+      		}
+    		},
     }
+</script>
 
-</script>
+<style>
+.btns{
+	float:right;
+}
+.table{
+	padding: 10px;
+}
+.foottable .pager{
+	float: left;
+	
+}
+.footer {
+		padding: 5px 0;
+		border-top: 1px solid #e5e5e5;
+		text-align: center;
+		}
+</style>

src/components/admin/taskSample.vue

@@ -1,30 +1,77 @@
 <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-item>抽样单</el-breadcrumb-item>
+			</el-breadcrumb>
+		</div>	
+		<!-- 下拉菜单 -->
 	<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-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="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 
+			: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 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>
-	
-	<!--    分页器区域-->
-	<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-table>
+			<!-- 分页器区域-->
+		<div class="block">
+				 <el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page="currentPage4"
+					:page-sizes="[10, 25, 50, 100]"
+					:page-size="100"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="400">
+    			</el-pagination>
 		</div>
+	</div>
+	</div>
+		
 </template>
 
 <script>
@@ -33,13 +80,17 @@
 		name: '',
 		data() {
 			return {
-                cellStyle: {
+				currentPage1: 5,
+				currentPage2: 5,
+				currentPage3: 5,
+				currentPage4: 4,
+            cellStyle: {
 					padding: 2 + 'px'
 				},
-				rowStyle: {
+			rowStyle: {
 					height: 35 + 'px'
 				},
-				tableHeader: [{
+			tableHeader: [{
 						label: '样品名称',
 						prop: '',
 						width: 150
@@ -78,7 +129,7 @@
 					}
 				],
 				// 数据表格数据
-				tableData: []
+			tableData: []
 			}
 		},
 		created() {
@@ -86,17 +137,27 @@
 		},
 		methods: {
 			// 获取牵头单位
-			getTaskById(){
-				
+			getTaskById(){	
 			},
 			// 获取抽样单列表
 			getZLTaskSampleListByJcInfo(){
 				
-			}
-			
+			},
+			returnTask(){
+				this.$router.push('routineMonitor')
+			},
+			handleSizeChange(val) {
+        	console.log(`每页 ${val} 条`);
+      		},
+      		handleCurrentChange(val) {
+        		console.log(`当前页: ${val}`);
+      		}
 		},
 	}
 </script>
 
 <style>
-</style>
+.block{
+	padding: 10px;
+}
+</style>

src/components/admin/taskSampletwo.vue

@@ -0,0 +1,133 @@
+<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-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>
+	<!-- 表格数据区域-->
+	<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>
+		<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>
+			<!-- 分页器区域-->
+		<!-- <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>
+</template>
+
+<script>
+	const token = window.sessionStorage.getItem('token')
+	export default {
+		name: '',
+		data() {
+			return {
+                cellStyle: {
+					padding: 2 + 'px'
+				},
+				rowStyle: {
+					height: 35 + 'px'
+				},
+				tableHeader: [{
+						label: '样品名称',
+						prop: '',
+						width: 150
+						// fixed: 'left'
+					},
+					{
+						label: '样品编码',
+						prop: '',
+						width: 80
+						// fixed: 'left'
+					}, {
+						label: '商标',
+						prop: '',
+						width: 150
+						// fixed: 'left'
+					},
+					{
+						label: '等级',
+						prop: '',
+						width: 120
+					},
+					{
+						label: '抽样基数',
+						prop: '',
+						width: 120
+					},
+					{
+						label: '抽样场所',
+						prop: '',
+						width: 120
+					},
+					{
+						label: '状态',
+						prop: '',
+						width: 180
+					}
+				],
+				// 数据表格数据
+				tableData: []
+			}
+		},
+		created() {
+			
+		},
+		methods: {
+			// 获取牵头单位
+			getTaskById(){
+				
+			},
+			// 获取抽样单列表
+			getZLTaskSampleListByJcInfo(){
+				
+			},
+			returnTask(){
+				this.$router.push('specialMonitor')
+			}
+			
+		},
+	}
+</script>
+
+<style>
+.btns{
+    float: right;
+}
+</style>

src/components/admin/undertakeReport.vue

@@ -0,0 +1,174 @@
+<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 class="btns" type="info" size="small" @click="returnTask">返回任务列表</el-button>
+
+            </div>
+			<!-- 表格 -->
+            <div class="table">
+                <el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row style="width: 100%"
+		        :row-style="rowStyle" :cell-style="cellStyle" @selection-change="handleSelectionChange">
+		        <!-- <el-table-column type="selection" width="50"></el-table-column> -->
+		            <el-table-column label="序号" width="50px">
+			        <template slot-scope="scope">
+				        {{ scope.$index+1 }}
+			        </template>
+		        </el-table-column>
+		        <el-table-column :key="table.label" v-for="table in tableHeader" :label="table.label" :prop="table.prop" align="center"
+			                    :width="table.width" :fixed="table.fixed" />
+		        <el-table-column label="操作" align="center" fixed="right">
+			<!-- 操作按钮区域的作用域插槽 -->
+			<!-- <template slot-scope="scope">
+					<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)">抽样单详情</el-button>
+			</template> -->
+		</el-table-column>
+	    </el-table>
+            </div>
+              <!-- 分页器 -->
+		<div class="foottable">
+			<label for="" class="pager">
+				显示
+				<select name="" id="">
+					<option value="10">10</option>
+					<option value="25">25</option>
+					<option value="50">50</option>
+					<option value="100">100</option>
+				</select>
+				项结果
+			</label>
+			<div class="datatable">
+			   显示第 0 至 0 项结果，共 项
+			</div>
+		</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 {
+           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: ''
+      }
+    },
+    methods: {
+        returnTask()
+        {
+            this.$router.push('routineMonitor')
+        }
+    }
+}
+</script>
+
+<style>
+.btns{
+    float:right;
+}
+.table{
+    padding: 10px;
+}
+</style>

src/components/admin/undertakeReporttwo.vue

@@ -0,0 +1,124 @@
+<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 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 class="block">
+				 <el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page="currentPage4"
+					:page-sizes="[10, 25, 50, 100]"
+					:page-size="100"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="400">
+    			</el-pagination>
+			</div>
+	
+	</div>
+</template>
+<script>
+export default {
+	data() {
+      return {
+		  		currentPage1: 5,
+        		currentPage2: 5,
+        		currentPage3: 5,
+        		currentPage4: 4,
+        options: [{
+          value: '选项1',
+          label: '测试1'
+        }, {
+          value: '选项2',
+          label: '测试2'
+        }, {
+          value: '选项3',
+          label: '测试3'
+        }, {
+          value: '选项4',
+          label: '测试4'
+        }],
+        value: ''
+      }
+    },
+	methods:{
+		returnTask()
+		{
+			this.$router.push('specialMonitor')
+		},
+		handleSizeChange(val) {
+        	console.log(`每页 ${val} 条`);
+      		},
+      		handleCurrentChange(val) {
+        		console.log(`当前页: ${val}`);
+      		}
+	}
+}
+</script>
+
+
+<style>
+.btns{
+	float:right;
+}
+</style>

src/components/jc/inputSample copy.vue

@@ -0,0 +1,520 @@
+<template>
+	<div>
+		<!-- 		<el-card class="box-card" style="height: 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 :to="{ path: '/jc/routineMonitor' }">例行检测</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>
+
+		<el-descriptions title="安徽省农业农村厅 农产品质量安全 例行检测 抽样单" :column="2" border>
+  <el-descriptions-item label="样品名称">
+    <el-select v-model="form.sample_name" clearable>
+		<el-option v-for="item in sampleList" :key="item.product_id" :label="item.product_name" :value="item.product_name">
+		</el-option>
+	</el-select>
+  </el-descriptions-item>
+  <el-descriptions-item label="样品名称" label-class-name="my-label">
+    <el-input v-model="form.sample_id" disabled>
+		<el-button slot="append" @click="createCode">生成</el-button>
+	</el-input>
+  </el-descriptions-item>
+
+  <el-descriptions-item label="商标">
+	  <el-input v-model="form.brand"></el-input>
+  </el-descriptions-item>
+  <el-descriptions-item label="包装">
+		<el-radio v-model="form.ispack" label="有">有</el-radio>
+		<el-radio v-model="form.ispack" label="无">无</el-radio>
+  </el-descriptions-item>
+
+  <el-descriptions-item label="型号规格">
+    <el-input v-model="form.type"></el-input>
+  </el-descriptions-item>
+    <el-descriptions-item label="执行标准">
+    <el-input v-model="form.standard"></el-input>
+  </el-descriptions-item>
+
+    <el-descriptions-item label="* 生产日期或批号" >
+    <el-input v-model="form.production_date" placeholder="必填项" required></el-input>
+  </el-descriptions-item>
+    <el-descriptions-item label="产地">
+    	<el-cascader size="mini" :options="options" v-model="selectedOptions" @change="handleChange">
+		</el-cascader>
+  </el-descriptions-item>
+
+  <el-descriptions-item label="* 产品认证情况" >
+    <el-radio v-model="form.certicfie" label="无公害农产品">无公害农产品</el-radio>
+	<el-radio v-model="form.certicfie" label="绿色食品">绿色食品</el-radio>
+	<el-radio v-model="form.certicfie" label="有机食品">有机食品</el-radio>
+	<el-radio v-model="form.certicfie" label="其他">其他</el-radio>
+  </el-descriptions-item>
+  <el-descriptions-item label="证书编号">
+    <el-input v-model="form.certifie_num"></el-input>
+  </el-descriptions-item>
+  
+  <el-descriptions-item label="* 抽样数量" >
+	<el-input v-model="form.sample_renum" width="50px"></el-input><a>* 单位</a><el-input v-model="form.sample_base_unit" clearable="true"></el-input>
+  </el-descriptions-item>
+  <el-descriptions-item label="抽样数量">
+    <el-input v-model="form.sample_renum"></el-input>
+  </el-descriptions-item>
+
+  <el-descriptions-item label="联系地址" :contentStyle="{'text-align': 'right'}">江苏省苏州市吴中区吴中大道 1188 号</el-descriptions-item>
+</el-descriptions>
+<el-button type="primary" @click="back">返回抽样列表</el-button>
+					<el-button @click="resetForm('form')">重置</el-button>
+					<el-button @click="onSubmit">保存，继续添加</el-button>
+
+		<div class="form">
+			<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>
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="样品名称" prop="sample_name" class="labelItem" size="mini" required>
+							<el-select v-model="form.sample_name" clearable>
+								<el-option v-for="item in sampleList" :key="item.product_id" :label="item.product_name"
+									:value="item.product_name">
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="11">
+						<el-form-item label="样品编码" prop="sample_id" class="labelItem" style="" size="mini">
+							<el-input v-model="form.sample_id" disabled>
+								<el-button slot="append" @click="createCode">生成</el-button>
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="商标" prop="brand" class="labelItem" size="mini">
+							<el-input v-model="form.brand"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="11">
+						<el-form-item label="包装" prop="ispack" class="labelItem" style="" size="mini">
+							<el-radio v-model="form.ispack" label="有">有</el-radio>
+							<el-radio v-model="form.ispack" label="无">无</el-radio>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="型号规格" prop="type" class="labelItem" size="mini">
+							<el-input v-model="form.type"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="11">
+						<el-form-item label="执行标准" prop="standard" class="labelItem" style="" size="mini">
+							<el-input v-model="form.standard"></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="生产日期或批号" prop="production_date" class="labelItem" size="mini" required>
+							<el-input v-model="form.production_date"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="11">
+						<el-form-item label="产地" prop="place" class="labelItem" style="" size="mini">
+							<el-cascader size="mini" :options="options" v-model="selectedOptions" @change="handleChange">
+							</el-cascader>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="产品认证情况" prop="certicfie" class="labelItem" size="mini" required>
+							<!-- <el-radio-group v-model="form.certicfie"> -->
+							<el-radio v-model="form.certicfie" label="无公害农产品">无公害农产品</el-radio>
+							<el-radio v-model="form.certicfie" label="绿色食品">绿色食品</el-radio>
+							<el-radio v-model="form.certicfie" label="有机食品">有机食品</el-radio>
+							<el-radio v-model="form.certicfie" label="其他">其他</el-radio>
+							<!-- </el-radio-group> -->
+						</el-form-item>
+					</el-col>
+					<el-col :span="11">
+						<el-form-item label="证书编号" prop="certifie_num" class="labelItem" style="" size="mini">
+							<el-input v-model="form.certifie_num"></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="12">
+						<el-row>
+							<!-- <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-row>
+						<el-row>
+							<!-- <el-col :span="10"> -->
+								<el-form-item label="单位" prop="sample_num_unit" class="labelItem" size="mini" required
+									>
+									<el-input v-model="form.sample_num_unit"></el-input>
+								</el-form-item>
+							<!-- </el-col> -->
+						</el-row>
+					</el-col>
+					<el-col :span="11">
+						<el-row>
+							<!-- <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-row>
+						<el-row>
+							<!-- <el-col :span="10"> -->
+								<el-form-item label="单位" prop="sample_base_unit" class="labelItem" size="mini" required
+									 clearable>
+									<el-input v-model="form.sample_base_unit"></el-input>
+								</el-form-item>
+							<!-- </el-col> -->
+						</el-row>
+					</el-col>
+				</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>
+							<el-radio v-model="form.sample_ground" label="屠宰场">屠宰场</el-radio>
+							<el-radio v-model="form.sample_ground" label="农贸市场">农贸市场</el-radio>
+							<el-radio v-model="form.sample_ground" label="批发市场">批发市场</el-radio>
+							<el-radio v-model="form.sample_ground" label="超市">超市</el-radio>
+							<el-radio v-model="form.sample_ground" label="其他">其他</el-radio>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<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">
+							受检单位情况
+					</el-col>
+					<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>
+						<el-form-item label="通讯地址" prop="address" class="labelItem" style="" size="mini" required>
+							<el-input v-model="form.address"></el-input>
+						</el-form-item>
+						<el-form-item label="法定代表人" prop="corporation" class="labelItem" style="" size="mini" required>
+							<el-input v-model="form.corporation"></el-input>
+						</el-form-item>
+						<el-form-item label="受检人" prop="user_name" class="labelItem" style="" size="mini" required>
+							<el-input v-model="form.user_name"></el-input>
+						</el-form-item>
+						<el-form-item label="电话" prop="phone" class="labelItem" style="" size="mini">
+							<el-input v-model="form.phone"></el-input>
+						</el-form-item>
+						<el-form-item label="传真" prop="fax" class="labelItem" style="" size="mini">
+							<el-input v-model="form.fax"></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<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="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>
+						</el-form-item>
+						<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="p_postcode" class="labelItem" style="" size="mini">
+							<el-input v-model="form.p_postcode"></el-input>
+						</el-form-item>
+						<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">
+							<el-input v-model="form.p_phone"></el-input>
+						</el-form-item>
+						<el-form-item label="传真" prop="p_fax" class="labelItem" style="" size="mini">
+							<el-input v-model="form.p_fax"></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<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="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>
+						</el-form-item>
+						<el-form-item label="联系人" prop="sample_unit_user" class="labelItem" style="" size="mini"
+							required>
+							<el-input v-model="form.sample_unit_user"></el-input>
+						</el-form-item>
+						<el-form-item label="通讯地址" prop="sample_unit_address" class="labelItem" style="" size="mini"
+							required>
+							<el-input v-model="form.sample_unit_address"></el-input>
+						</el-form-item>
+						<el-form-item label="邮编" prop="sample_unit_postcode" class="labelItem" style="" size="mini">
+							<el-input v-model="form.sample_unit_postcode"></el-input>
+						</el-form-item>
+						<el-form-item label="联系电话" prop="sample_unit_phone" class="labelItem" style="" size="mini">
+							<el-input v-model="form.sample_unit_phone"></el-input>
+						</el-form-item>
+						<el-form-item label="传真" prop="sample_unit_fax" class="labelItem" style="" size="mini">
+							<el-input v-model="form.sample_unit_fax"></el-input>
+						</el-form-item>
+						<el-form-item label="Email" prop="sample_unit_email" class="labelItem" style="" size="mini">
+							<el-input v-model="form.sample_unit_email"></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-form-item label="检测任务依据" prop="base" class="labelItem" style="" size="mini" required>
+						<el-input v-model="form.base"></el-input>
+					</el-form-item>
+				</el-row>
+				<el-row>
+					<el-form-item label="抽样时间" prop="sample_date" class="labelItem" style="" size="mini" required>
+						<el-date-picker v-model="form.sample_date" type="date" value-format="yyyy-MM-dd">
+						</el-date-picker>
+					</el-form-item>
+				</el-row>
+				<el-row>
+					<el-form-item label="被抽检单位签字盖章附件" prop="filr_url" class="labelItem" style="" size="mini">
+						<el-upload class="upload-demo" :file-list="fileList" drag :headers="myHeaders"
+							action="http://syjcapi.aielab.net/api/v1/ossUpload" :on-success="uploadSuccess" :limit="1">
+							<i class="el-icon-upload"></i>
+							<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+						</el-upload>
+					</el-form-item>
+				</el-row>
+				<el-form-item>
+					<el-button type="primary" @click="back">返回抽样列表</el-button>
+					<el-button @click="resetForm('form')">重置</el-button>
+					<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>
+</template>
+
+<script>
+	const token = window.sessionStorage.getItem('token')
+	import {
+		provinceAndCityData,
+		regionData,
+		provinceAndCityDataPlus,
+		regionDataPlus,
+		CodeToText,
+		TextToCode
+	} from 'element-china-area-data'
+	export default {
+		name: 'inputSample',
+		data() {
+			return {
+				myHeaders: {
+					Authorization: 'bearer' + token
+				},
+				fileList: [],
+				form: {
+					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: [],
+				// 样品下拉框
+				sampleList: [],
+				id: '',
+				// 产地
+				options: regionData,
+				selectedOptions: []
+			}
+		},
+		created() {
+			this.id = this.$route.params.id
+			console.log(this.id)
+			this.getTestObj()
+		},
+		methods: {
+			// 获取样本列别
+			async getTestObj() {
+				const result = await this.$http.post('getTestObj', {
+					id: this.id
+				})
+				if (result.data.code == 0) {
+					this.sampleList = result.data.data
+				}
+			},
+			// 生成样品编码
+			async createCode() {
+				var that = this
+				const result = await this.$http.post('getSampleId', {
+					id: this.id
+				})
+				if (result.data.code == 0) {
+					that.form.sample_id = result.data.data.id
+				}
+			},
+			// 获取选择产地
+			handleChange() {
+				var that = this
+				var loc = "";
+				// console.log(this.form.place)
+				for (let i = 0; i < this.selectedOptions.length; i++) {
+					loc += CodeToText[this.selectedOptions[i]];
+				}
+				// console.log(loc)
+				that.form.place = loc
+				console.log(that.form.place)
+			},
+			// 上传成功
+			uploadSuccess(res) {
+				console.log(res.data)
+				this.form.file_url = res.data.fileUrl
+				this.form.file_name = res.data.fileName
+			},
+			async onSubmit() {
+				// console.log(this.form.sample_name)
+				var that = this
+				that.units = {
+					'units_name': that.form.units_name,
+					'phone': that.form.phone,
+					'user_name': that.form.user_name,
+					'address': that.form.address,
+					'fax': that.form.fax
+				}
+				that.production = {
+					'production_name': that.form.production_name,
+					'phone': that.form.p_phone,
+					'user_name': that.form.p_user_name,
+					'address': that.form.p_address,
+					'fax': that.form.p_fax,
+					'postcode': that.form.p_postcode,
+					'production_class': that.form.production
+
+				}
+				that.form['task_id'] = that.id
+
+				that.form.units = that.units
+				that.form.production = that.production
+				console.log(that.form)
+				const result = await this.$http.post('saveSample', that.form)
+				if (result.data.code == 0) {
+					// that.form.sample_id = result.data.data.id
+					this.$message({
+						type: 'success',
+						message: '提交抽样单成功!'
+					});
+				}
+			},
+			// 重置表单
+			resetForm(formName) {
+				// console.log(this.form)
+					this.$refs[formName].resetFields();
+					this.selectedOptions = '';
+			},
+			// 返回
+			back() {
+				var that = this
+				this.$router.push({
+					name: 'setTaskcd',
+					params: {
+						id: that.id
+					}
+				})
+			}
+		},
+	}
+</script>
+
+<style lang="less" scoped>
+	.form {
+		display: flex;
+		flex-direction: row;
+		justify-content: center;
+		align-content: flex-start;
+	}
+
+	.el-descriptions {
+		width: 80%;
+		margin: auto;
+	}
+
+	/deep/ .el-descriptions__title {
+		margin: auto;
+		font-size: 1.25rem;
+		// font-weight: 31.25rem !important;
+	}
+</style>

src/components/jc/inputSample.vue

@@ -9,326 +9,191 @@
 			<el-breadcrumb-item :to="{ path: '/jc/routineMonitor' }">例行检测</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>
-
-		<el-descriptions title="安徽省农业农村厅 农产品质量安全 例行检测 抽样单" :column="2" border>
-  <el-descriptions-item label="样品名称">
-    <el-select v-model="form.sample_name" clearable>
-		<el-option v-for="item in sampleList" :key="item.product_id" :label="item.product_name" :value="item.product_name">
-		</el-option>
-	</el-select>
-  </el-descriptions-item>
-  <el-descriptions-item label="样品名称" label-class-name="my-label">
-    <el-input v-model="form.sample_id" disabled>
-		<el-button slot="append" @click="createCode">生成</el-button>
-	</el-input>
-  </el-descriptions-item>
-
-  <el-descriptions-item label="商标">
-	  <el-input v-model="form.brand"></el-input>
-  </el-descriptions-item>
-  <el-descriptions-item label="包装">
+  	<!-- <el-descriptions-item label="联系地址" :contentStyle="{'text-align': 'right'}">
+	  江苏省苏州市吴中区吴中大道 1188 号
+	</el-descriptions-item> -->
+<el-descriptions  title="安徽省农业农村厅 农产品质量安全 例行检测 抽样单" :column="2" border style="margin-top:20px" :contentStyle="{'text-align': left}">
+	<el-descriptions-item label="*样品名称" prop="sample_name" class="labelItem" size="mini" required >
+		<!-- <el-col :span="12"> -->
+		<el-select v-model="form.sample_name" clearable style="width:60%">
+				<el-option v-for="item in sampleList"
+				:key="item.product_id" 
+				:label="item.product_name"
+				:value="item.product_name">
+				</el-option>
+		</el-select>
+		<!-- </el-col> -->
+	</el-descriptions-item>
+	<el-descriptions-item label="样品编码" prop="sample_id" class="labelItem" style="" size="mini">
+		<el-input v-model="form.sample_id" disabled>
+			<el-button slot="append" @click="createCode">生成</el-button>
+		</el-input>
+	</el-descriptions-item>
+	<el-descriptions-item label="商标" prop="brand" class="labelItem" size="mini">
+		<el-input v-model="form.brand"></el-input>
+	</el-descriptions-item>
+	<el-descriptions-item label="包装" prop="ispack" class="labelItem" style="" size="mini">
 		<el-radio v-model="form.ispack" label="有">有</el-radio>
 		<el-radio v-model="form.ispack" label="无">无</el-radio>
-  </el-descriptions-item>
-
-  <el-descriptions-item label="型号规格">
-    <el-input v-model="form.type"></el-input>
-  </el-descriptions-item>
-    <el-descriptions-item label="执行标准">
-    <el-input v-model="form.standard"></el-input>
-  </el-descriptions-item>
-
-    <el-descriptions-item label="* 生产日期或批号" >
-    <el-input v-model="form.production_date" placeholder="必填项" required></el-input>
-  </el-descriptions-item>
-    <el-descriptions-item label="产地">
-    	<el-cascader size="mini" :options="options" v-model="selectedOptions" @change="handleChange">
-		</el-cascader>
-  </el-descriptions-item>
-
-  <el-descriptions-item label="* 产品认证情况" >
-    <el-radio v-model="form.certicfie" label="无公害农产品">无公害农产品</el-radio>
-	<el-radio v-model="form.certicfie" label="绿色食品">绿色食品</el-radio>
-	<el-radio v-model="form.certicfie" label="有机食品">有机食品</el-radio>
-	<el-radio v-model="form.certicfie" label="其他">其他</el-radio>
-  </el-descriptions-item>
-  <el-descriptions-item label="证书编号">
-    <el-input v-model="form.certifie_num"></el-input>
-  </el-descriptions-item>
-  
-  <el-descriptions-item label="* 抽样数量" >
-	<el-input v-model="form.sample_renum" width="50px"></el-input><a>* 单位</a><el-input v-model="form.sample_base_unit" clearable="true"></el-input>
-  </el-descriptions-item>
-  <el-descriptions-item label="抽样数量">
-    <el-input v-model="form.sample_renum"></el-input>
-  </el-descriptions-item>
-
-  <el-descriptions-item label="联系地址" :contentStyle="{'text-align': 'right'}">江苏省苏州市吴中区吴中大道 1188 号</el-descriptions-item>
-</el-descriptions>
-<el-button type="primary" @click="back">返回抽样列表</el-button>
-					<el-button @click="resetForm('form')">重置</el-button>
-					<el-button @click="onSubmit">保存，继续添加</el-button>
-
-		<div class="form">
-			<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>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="样品名称" prop="sample_name" class="labelItem" size="mini" required>
-							<el-select v-model="form.sample_name" clearable>
-								<el-option v-for="item in sampleList" :key="item.product_id" :label="item.product_name"
-									:value="item.product_name">
-								</el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="11">
-						<el-form-item label="样品编码" prop="sample_id" class="labelItem" style="" size="mini">
-							<el-input v-model="form.sample_id" disabled>
-								<el-button slot="append" @click="createCode">生成</el-button>
-							</el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="商标" prop="brand" class="labelItem" size="mini">
-							<el-input v-model="form.brand"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="11">
-						<el-form-item label="包装" prop="ispack" class="labelItem" style="" size="mini">
-							<el-radio v-model="form.ispack" label="有">有</el-radio>
-							<el-radio v-model="form.ispack" label="无">无</el-radio>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="型号规格" prop="type" class="labelItem" size="mini">
-							<el-input v-model="form.type"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="11">
-						<el-form-item label="执行标准" prop="standard" class="labelItem" style="" size="mini">
-							<el-input v-model="form.standard"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="生产日期或批号" prop="production_date" class="labelItem" size="mini" required>
-							<el-input v-model="form.production_date"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="11">
-						<el-form-item label="产地" prop="place" class="labelItem" style="" size="mini">
-							<el-cascader size="mini" :options="options" v-model="selectedOptions" @change="handleChange">
-							</el-cascader>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="产品认证情况" prop="certicfie" class="labelItem" size="mini" required>
-							<!-- <el-radio-group v-model="form.certicfie"> -->
-							<el-radio v-model="form.certicfie" label="无公害农产品">无公害农产品</el-radio>
+	</el-descriptions-item>
+	<el-descriptions-item label="型号规格" prop="type" class="labelItem" size="mini">
+		<el-input v-model="form.type"></el-input>
+	</el-descriptions-item>
+	<el-descriptions-item label="执行标准" prop="standard" class="labelItem" style="" size="mini">
+		<el-input v-model="form.standard"></el-input>
+	</el-descriptions-item>
+	<el-descriptions-item label="*生产日期或批号" prop="production_date" class="labelItem" size="mini" required>
+		<el-input v-model="form.production_date"></el-input>
+	</el-descriptions-item>
+	<el-descriptions-item label="产地" prop="place" class="labelItem" style="" size="mini">
+		<el-cascader  :options="options" v-model="selectedOptions" @change="handleChange" style="width:60%"></el-cascader>
+	</el-descriptions-item>
+	<el-descriptions-item label="*产品认证情况" prop="certicfie" class="labelItem" size="mini" required>
+		<el-radio v-model="form.certicfie" label="无公害农产品">无公害农产品</el-radio>
 							<el-radio v-model="form.certicfie" label="绿色食品">绿色食品</el-radio>
 							<el-radio v-model="form.certicfie" label="有机食品">有机食品</el-radio>
 							<el-radio v-model="form.certicfie" label="其他">其他</el-radio>
-							<!-- </el-radio-group> -->
-						</el-form-item>
-					</el-col>
-					<el-col :span="11">
-						<el-form-item label="证书编号" prop="certifie_num" class="labelItem" style="" size="mini">
-							<el-input v-model="form.certifie_num"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-row>
-							<!-- <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-row>
-						<el-row>
-							<!-- <el-col :span="10"> -->
-								<el-form-item label="单位" prop="sample_num_unit" class="labelItem" size="mini" required
-									>
-									<el-input v-model="form.sample_num_unit"></el-input>
-								</el-form-item>
-							<!-- </el-col> -->
-						</el-row>
-					</el-col>
-					<el-col :span="11">
-						<el-row>
-							<!-- <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-row>
-						<el-row>
-							<!-- <el-col :span="10"> -->
-								<el-form-item label="单位" prop="sample_base_unit" class="labelItem" size="mini" required
-									 clearable>
-									<el-input v-model="form.sample_base_unit"></el-input>
-								</el-form-item>
-							<!-- </el-col> -->
-						</el-row>
-					</el-col>
-				</el-row>
-				<el-row style="margin-bottom: 2%">
-					<el-col>
-						<el-form-item label="抽样场所" prop="sample_ground" class="labelItem" size="mini" required>
+	</el-descriptions-item>
+	<el-descriptions-item label="证书编号" prop="certifie_num" class="labelItem" style="" size="mini">
+		<el-input v-model="form.certifie_num"></el-input>
+	</el-descriptions-item>
+	<el-descriptions-item label="*抽样数量" prop="sample_renum" class="labelItem" size="mini" required>
+		<el-input v-model="form.sample_renum" style="width:180px"></el-input>
+		<a> * 单位 </a><el-input v-model="form.sample_base_unit" clearable="true" style="width:180px"></el-input>
+	</el-descriptions-item>
+	<el-descriptions-item label="抽样基数" prop="sample_base" class="labelItem" size="mini" required>
+		<el-input v-model="form.sample_base" style="width:180px"></el-input>
+		<a> * 单位 </a><el-input v-model="form.sample_base_unit" clearable="true" style="width:180px"></el-input>
+	</el-descriptions-item>
+	<el-descriptions-item label="*抽样场所" prop="sample_ground" class="labelItem" size="mini" required >
 							<el-radio v-model="form.sample_ground" label="生产基地/企业">生产基地/企业</el-radio>
 							<el-radio v-model="form.sample_ground" label="屠宰场">屠宰场</el-radio>
 							<el-radio v-model="form.sample_ground" label="农贸市场">农贸市场</el-radio>
 							<el-radio v-model="form.sample_ground" label="批发市场">批发市场</el-radio>
 							<el-radio v-model="form.sample_ground" label="超市">超市</el-radio>
 							<el-radio v-model="form.sample_ground" label="其他">其他</el-radio>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<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">
-							受检单位情况
-					</el-col>
-					<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>
-						<el-form-item label="通讯地址" prop="address" class="labelItem" style="" size="mini" required>
-							<el-input v-model="form.address"></el-input>
-						</el-form-item>
-						<el-form-item label="法定代表人" prop="corporation" class="labelItem" style="" size="mini" required>
-							<el-input v-model="form.corporation"></el-input>
-						</el-form-item>
-						<el-form-item label="受检人" prop="user_name" class="labelItem" style="" size="mini" required>
-							<el-input v-model="form.user_name"></el-input>
-						</el-form-item>
-						<el-form-item label="电话" prop="phone" class="labelItem" style="" size="mini">
-							<el-input v-model="form.phone"></el-input>
-						</el-form-item>
-						<el-form-item label="传真" prop="fax" class="labelItem" style="" size="mini">
+	</el-descriptions-item>
+	</el-descriptions>
+	<!-- 受检单位情况 -->
+	<el-descriptions :column="1" border style="" >
+		<el-descriptions-item label="受检单位情况" >
+			<el-descriptions  :column="1" border  size="mini" style="width:100%">
+				<el-descriptions-item label="*单位名称" prop="units_name" class="labelItem" style="" size="mini" required>
+									<el-input v-model="form.units_name"></el-input>
+				</el-descriptions-item>
+				<el-descriptions-item label="*通讯地址" prop="address" class="labelItem" style="" size="mini" required>
+									<el-input v-model="form.address"></el-input>
+				</el-descriptions-item>
+				<el-descriptions-item label="*法定代表人" prop="corporation" class="labelItem" style="" size="mini" required>
+									<el-input v-model="form.corporation"></el-input>
+				</el-descriptions-item>
+				<el-descriptions-item label="*受检人" prop="user_name" class="labelItem" style="" size="mini" required>
+									<el-input v-model="form.user_name"></el-input>
+				</el-descriptions-item>
+				<el-descriptions-item label="电话" prop="phone" class="labelItem" style="" size="mini">
+									<el-input v-model="form.phone"></el-input>
+				</el-descriptions-item>
+				<el-descriptions-item label="传真" prop="fax" class="labelItem" style="" size="mini">
 							<el-input v-model="form.fax"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<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="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>
-						</el-form-item>
-						<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="p_postcode" class="labelItem" style="" size="mini">
-							<el-input v-model="form.p_postcode"></el-input>
-						</el-form-item>
-						<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">
-							<el-input v-model="form.p_phone"></el-input>
-						</el-form-item>
-						<el-form-item label="传真" prop="p_fax" class="labelItem" style="" size="mini">
-							<el-input v-model="form.p_fax"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<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="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>
-						</el-form-item>
-						<el-form-item label="联系人" prop="sample_unit_user" class="labelItem" style="" size="mini"
-							required>
-							<el-input v-model="form.sample_unit_user"></el-input>
-						</el-form-item>
-						<el-form-item label="通讯地址" prop="sample_unit_address" class="labelItem" style="" size="mini"
-							required>
-							<el-input v-model="form.sample_unit_address"></el-input>
-						</el-form-item>
-						<el-form-item label="邮编" prop="sample_unit_postcode" class="labelItem" style="" size="mini">
-							<el-input v-model="form.sample_unit_postcode"></el-input>
-						</el-form-item>
-						<el-form-item label="联系电话" prop="sample_unit_phone" class="labelItem" style="" size="mini">
-							<el-input v-model="form.sample_unit_phone"></el-input>
-						</el-form-item>
-						<el-form-item label="传真" prop="sample_unit_fax" class="labelItem" style="" size="mini">
-							<el-input v-model="form.sample_unit_fax"></el-input>
-						</el-form-item>
-						<el-form-item label="Email" prop="sample_unit_email" class="labelItem" style="" size="mini">
-							<el-input v-model="form.sample_unit_email"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-form-item label="检测任务依据" prop="base" class="labelItem" style="" size="mini" required>
-						<el-input v-model="form.base"></el-input>
-					</el-form-item>
-				</el-row>
-				<el-row>
-					<el-form-item label="抽样时间" prop="sample_date" class="labelItem" style="" size="mini" required>
-						<el-date-picker v-model="form.sample_date" type="date" value-format="yyyy-MM-dd">
-						</el-date-picker>
-					</el-form-item>
-				</el-row>
-				<el-row>
-					<el-form-item label="被抽检单位签字盖章附件" prop="filr_url" class="labelItem" style="" size="mini">
-						<el-upload class="upload-demo" :file-list="fileList" drag :headers="myHeaders"
-							action="http://syjcapi.aielab.net/api/v1/ossUpload" :on-success="uploadSuccess" :limit="1">
-							<i class="el-icon-upload"></i>
-							<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-						</el-upload>
-					</el-form-item>
-				</el-row>
-				<el-form-item>
+				</el-descriptions-item>
+			</el-descriptions>
+		</el-descriptions-item>
+	</el-descriptions>
+		<!-- 生产单位情况 -->
+		<el-descriptions :column="1" border style="" >
+			<el-descriptions-item label="生产单位情况"  >
+				<el-descriptions  :column="1" border size="mini" style="width:100%" >
+			<el-descriptions-item label="*单位名称" prop="production_name" class="labelItem" style="" size="mini" required>
+				<el-input v-model="form.production_name"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="*通讯地址" prop="p_address" class="labelItem" style="" size="mini" required>
+				<el-input v-model="form.p_address"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="邮编" prop="p_postcode" class="labelItem" style="" size="mini">
+				<el-input v-model="form.p_postcode"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="*联系人" prop="p_user_name" class="labelItem" style="" size="mini" required>
+				<el-input v-model="form.p_user_name"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="电话" prop="p_phone" class="labelItem" style="" size="mini">
+				<el-input v-model="form.p_phone"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="传真" prop="p_fax" class="labelItem" style="" size="mini">
+				<el-input v-model="form.p_fax"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="生产方式" prop="production_class" class="labelItem" style=""  required>
+				<el-radio v-model="form.production_class" label="自产">自产</el-radio>
+				<el-radio v-model="form.production_class" label="收购">收购</el-radio>
+			</el-descriptions-item>
+			</el-descriptions>
+			</el-descriptions-item>
+		</el-descriptions>
+
+
+		<!-- 抽样单位情况 -->
+		<el-descriptions :column="1" border style="" >
+			<el-descriptions-item label="抽样单位情况" >
+				<el-descriptions  :column="1" border size="mini" style="width:100%">
+			<el-descriptions-item label="*单位名称" prop="sample_unit_name" class="labelItem" style="" size="mini"
+									required>
+									<el-input v-model="form.sample_unit_name"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="*联系人" prop="sample_unit_user" class="labelItem" style="" size="mini"
+									required>
+									<el-input v-model="form.sample_unit_user"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="*通讯地址" prop="sample_unit_address" class="labelItem" style="" size="mini"
+									required>
+									<el-input v-model="form.sample_unit_address"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="邮编" prop="sample_unit_postcode" class="labelItem" style="" size="mini">
+									<el-input v-model="form.sample_unit_postcode"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="联系电话" prop="sample_unit_phone" class="labelItem" style="" size="mini">
+									<el-input v-model="form.sample_unit_phone"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="传真" prop="sample_unit_fax" class="labelItem" style="" size="mini">
+									<el-input v-model="form.sample_unit_fax"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item label="Email" prop="sample_unit_email" class="labelItem" style="" size="mini">
+									<el-input v-model="form.sample_unit_email"></el-input>
+			</el-descriptions-item>
+			</el-descriptions>
+			</el-descriptions-item>
+		</el-descriptions>
+
+		<el-descriptions  :column="2" border>
+			<el-descriptions-item label="检测任务依据" prop="base" class="labelItem" style="" size="mini" required>
+								<el-input v-model="form.base"></el-input>
+			</el-descriptions-item>
+			<el-descriptions-item  label="抽样时间" prop="sample_date" class="labelItem" style="" size="mini" required>
+								<el-date-picker v-model="form.sample_date" type="date" value-format="yyyy-MM-dd">
+								</el-date-picker>
+			</el-descriptions-item>
+			<el-descriptions-item  label="被抽检单位签字盖章附件" prop="filr_url" class="labelItem" style="" size="mini">
+								<el-upload class="upload-demo" :file-list="fileList" drag :headers="myHeaders"
+									action="http://syjcapi.aielab.net/api/v1/ossUpload" :on-success="uploadSuccess" :limit="1">
+									<i class="el-icon-upload"></i>
+									<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+								</el-upload>
+			</el-descriptions-item>
+		</el-descriptions>
+<!-- 底部按钮 -->
+		<el-form>
+				<el-form-item class="btn">
 					<el-button type="primary" @click="back">返回抽样列表</el-button>
-					<el-button @click="resetForm('form')">重置</el-button>
+					<el-button @click="resetForm()">重置</el-button>
 					<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>
 </template>
 
 <script>
@@ -408,6 +273,7 @@
 			this.getTestObj()
 		},
 		methods: {
+
 			// 获取样本列别
 			async getTestObj() {
 				const result = await this.$http.post('getTestObj', {
@@ -480,9 +346,9 @@
 				}
 			},
 			// 重置表单
-			resetForm(formName) {
+			resetForm() {
 				// console.log(this.form)
-					this.$refs[formName].resetFields();
+					this.form='';
 					this.selectedOptions = '';
 			},
 			// 返回
@@ -517,4 +383,12 @@
 		font-size: 1.25rem;
 		// font-weight: 31.25rem !important;
 	}
+	.btn{
+		margin-top:20px ;
+		// float: right;
+		text-align: center;
+	}
+	.smallTitle{
+		margin-top: 20PX;
+	}
 </style>

src/router/index.js

@@ -52,7 +52,19 @@ const routes = [{
 			},{
 				path: '/admin/taskSample',
 				component: () => import('../components/admin/taskSample')
-			}
+			},{
+				path: '/admin/leadReport',
+				component: () => import('../components/admin/leadReport')
+			},{
+				path: '/admin/undertakeReport',
+				component: () => import('../components/admin/undertakeReport')
+			},{
+				path: '/admin/taskSampletwo',
+				component: () => import('../components/admin/taskSampletwo')
+			},{
+				path: '/admin/undertakeReporttwo',
+				component: () => import('../components/admin/undertakeReporttwo')
+			},
 		]
 	},
 	{