Переглянути джерело

Merge branch 'master' of http://git.in.ahbd.net/aielab/jcxt_qd

yyfang 3 роки тому
батько
коміт
30de28a147

+ 14 - 14
src/components/jc.vue

@@ -122,20 +122,20 @@ export default {
   },
   watch: {
     /** 监听,当路由发生变化的时候执行(防止用户手动更换地址导致tabs的面板变动却不切换相应的tabs) */
-    '$route.path': function () {
-      var iindex = -1
-      var jindex = -1
-      for (let i = 0; i < this.menuList.length; i++) {
-        for (let j = 0; j < this.menuList[i].children.length; j++) {
-          if (this.menuList[i].children[j].path == this.$route.path) {
-            iindex = i
-            jindex = j
-            break
-          }
-        }
-      }
-      this.addTab(this.menuList[iindex].children[jindex].subMenuName, this.$route.path)
-    }
+    // '$route.path': function () {
+    //   var iindex = -1
+    //   var jindex = -1
+    //   for (let i = 0; i < this.menuList.length; i++) {
+    //     for (let j = 0; j < this.menuList[i].children.length; j++) {
+    //       if (this.menuList[i].children[j].path == this.$route.path) {
+    //         iindex = i
+    //         jindex = j
+    //         break
+    //       }
+    //     }
+    //   }
+    //   this.addTab(this.menuList[iindex].children[jindex].subMenuName, this.$route.path)
+    // }
   },
   created () {
     this.lastTime = new Date().getTime() // 网页第一次打开时,记录当前时间

+ 44 - 6
src/components/jc/fillSampleReport.vue

@@ -27,7 +27,7 @@
 				<el-form-item label="单位地址:" prop="inspected_address" class="labelItem">	
 						<el-cascader placeholder="请选择地区" :options="options" v-model="selectedOptions" @change="handleChange" style="width:25%">
 						</el-cascader>
-						<el-input v-model="inspected_Unit.inspected_address2" placeholder="请输入详细地址" style="width:34%;margin-left:5px;"></el-input>
+						<el-input v-model="inspected_Unit.inspected_address2" placeholder="请输入详细地址" style="width:34.5%;margin-left:5px;"></el-input>
 				</el-form-item>
 				
 				<!-- <el-form-item label="" prop="inspected_address2" class="labelItem">	
@@ -216,6 +216,39 @@
 	export default {
 		name: 'inputSample',
 		data() {
+			// 电话号码验证
+			var checkNumber = (rule, value, callback) => {
+			// const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
+			// if (!value) {
+			// return callback(new Error('电话号码不能为空'))
+			// }
+			setTimeout(() => {
+			// Number.isInteger是es6验证数字是否为整数的方法,实际输入的数字总是识别成字符串
+			// 所以在前面加了一个+实现隐式转换
+		
+			if (!Number.isInteger(+value)) {
+				callback(new Error('请输入数字值'))
+			}
+			//  else {
+			// 	if (phoneReg.test(value)) {
+			// 	callback()
+			// 	} else {
+			// 	callback(new Error('电话号码格式不正确'))
+			// 	}
+			// }
+			}, 100)
+			}
+
+			// 邮箱验证
+			 var checkEmail = (rule, value, callback) => {
+				const regEmail = /^\w+@\w+(\.\w+)+$/
+				if (regEmail.test(value)) {
+					// 合法邮箱
+					return callback()
+				}
+				callback(new Error('请输入合法邮箱'))
+				}
+
 			return {
 				active: 1,
 				addSampleInforDialog: false,
@@ -231,7 +264,10 @@
                 	inspected_name: [{required: true, message: '请输入单位名称', trigger: 'blur'},],
 					// inspected_address: [{required: true, message: '请输入单位地址', trigger: 'blur'},],
 					contact_name: [{required: true, message: '请输入联系人', trigger: 'blur'},],
-					contact_phone: [{required: true, message: '请输入联系电话', trigger: 'blur'},]
+					contact_phone: [{required: true, message: '请输入联系电话', trigger: 'blur'},
+									{validator: checkNumber, trigger: 'blur' }],
+					contact_email:[{required: true, message: '请输入联系电话', trigger: 'blur'},
+									{validator: checkEmail, trigger: 'blur' }]
 						},
 				rules1: {
                 	sample_name: [{required: true, message: '请输入样品名称', trigger: 'blur'},],
@@ -242,8 +278,10 @@
 					sample_product_name: [{required: true, message: '请输入标称生产者名称', trigger: 'blur'},],
 					sample_product_phone: [{required: true, message: '请输入标称生产者联系电话', trigger: 'blur'},],
 					sample_source: [{required: true, message: '请输入样品来源', trigger: 'blur'},],
-					sample_count: [{required: true, message: '请输入抽样数量', trigger: 'blur'},],
-					sample_base: [{required: true, message: '请输入抽样基数', trigger: 'blur'},],
+					sample_count: [{required: true, message: '请输入抽样数量', trigger: 'blur'},
+									{validator: checkNumber, trigger: 'blur' }],
+					sample_base: [{required: true, message: '请输入抽样基数', trigger: 'blur'},
+									{validator: checkNumber, trigger: 'blur' }],
 					sample_ing_date: [{required: true, message: '请输入抽样时间', trigger: 'blur'},],
 						},
 				rules2: {
@@ -686,7 +724,7 @@
 			width: 14%;
 		}
 		.el-form-item__error{
-		left:135px;
+		left:9.0625rem;
 	}
 		.el-upload__tip{
 			margin-left: 7.5rem;
@@ -695,7 +733,7 @@
 			margin-left: 7.8125rem
 		}
 		.labelItem{
-			width: 120%;
+			width: 130%;
 		}
 	
 	}

+ 2 - 2
src/components/jc/returnTaskcd.vue

@@ -6,7 +6,7 @@
 				<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>
@@ -308,7 +308,7 @@ const HeadersList = [{
 			runtask(id) {
 				console.log(id)
 				this.$router.push({
-					name: 'setReturnTask',
+					name: 'setReturnTasks',
 					params: {
 						id: id
 					}

+ 3 - 4
src/components/jc/routineMonitor.vue

@@ -6,7 +6,7 @@
 				<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>
@@ -94,7 +94,7 @@
 				</el-table-column>
 			</el-table>
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-				:current-page="queryInfo.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="queryInfo.pageSize"
+				:current-page="queryInfo.currentPage" :page-sizes="[1,10, 20, 30, 40]" :page-size="queryInfo.pageSize"
 				layout="total, sizes, prev, pager, next, jumper" :total="total">
 			</el-pagination>
 	
@@ -258,6 +258,7 @@ const HeadersList = [{
 			handleSizeChange(val) {
 				this.queryInfo.pageSize = val;
 				console.log(`每页 ${val} 条`);
+				this.gettaskList()
 			},
 			handleCurrentChange(val) {
 				this.queryInfo.pageNum = val;
@@ -281,8 +282,6 @@ const HeadersList = [{
 				console.log(res)
 				this.tableData = res.data.rows
 				this.total = res.data.total
-
-
 			},
 				// 搜索
 			async searchData() {

+ 1 - 3
src/components/jc/setReturnTask.vue

@@ -754,9 +754,7 @@
 				// 	checkOrgId: '',
 				// 	sample_address: ''
 				// },
-				thTask: [
-					
-				],
+				thTask: [],
 				thTaskTotal: 0,
 				task_id: '',
 				multipleSelection: null,

+ 1597 - 0
src/components/jc/setReturnTasks.vue

@@ -0,0 +1,1597 @@
+<template>
+	<div>
+
+		<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>
+
+		<!-- <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+			<el-tab-pane label="任务详情" name="taskDetail">
+			</el-tab-pane>
+
+			<el-tab-pane label="抽样" name="sampleDetail">
+				<sampleDetailcd v-if="activeName == 'sampleDetail'" ref="sampleDetail"></sampleDetailcd>
+			</el-tab-pane>
+
+			<el-tab-pane label="检测" name="testDetail">
+			</el-tab-pane>
+
+			<el-tab-pane label="报告上传" name="reportDetail">
+			</el-tab-pane>
+		</el-tabs> -->
+
+		<div id="taskDetail">
+		<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+			<el-tab-pane label="任务详情" name="first">
+				<el-descriptions class="margin-top" title=" " :column="2" :size="size" border>
+					<el-descriptions-item>
+						<template slot="label">
+							创建单位
+						</template>
+						{{readForm.creater.name}}
+					</el-descriptions-item>
+					<el-descriptions-item>
+						<template slot="label">
+							发布单位
+						</template>
+						{{readForm.releaser.name}}
+					</el-descriptions-item>
+					<el-descriptions-item>
+						<template slot="label">
+							年度
+						</template>
+						{{readForm.year}}
+					</el-descriptions-item>
+					<el-descriptions-item>
+						<template slot="label">
+							监测类型
+						</template>
+						{{readForm.task_class}}
+					</el-descriptions-item>
+					<el-descriptions-item>
+						<template slot="label">
+							开始时间
+						</template>
+						{{readForm.starttime}}
+					</el-descriptions-item>
+					<el-descriptions-item>
+						<template slot="label">
+							结束时间
+						</template>
+						{{readForm.endtime}}
+					</el-descriptions-item>
+					<el-descriptions-item>
+						<template slot="label">
+							抽检分离
+						</template>
+						<span v-if="readForm.is_divide==1">是</span>
+						<span v-if="readForm.is_divide==0">否</span>
+					</el-descriptions-item>
+					<el-descriptions-item>
+						<template slot="label">
+							附件
+						</template>
+						<div v-if="readForm.file_url==null">无</div>
+						<el-link v-else type="primary" :href="readForm.file_url">下载附件</el-link>
+					</el-descriptions-item>
+
+				</el-descriptions>
+				<el-descriptions class="margin-top" :size="size" border>
+					<el-descriptions-item>
+						<template slot="label">
+							备注
+						</template>
+						{{readForm.log}}
+					</el-descriptions-item>
+				</el-descriptions>
+			</el-tab-pane>
+
+				<el-tab-pane label="退回" name="fourth">
+			<div>
+				<el-table :data="thTask" border stripe highlight-current-row  @current-change="handlecyCurrentChange" style="width: 100%"
+					:row-style="rowStyle" :cell-style="cellStyle">
+					<el-table-column :key="table.label" v-for="table in thtableHeader" :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 style="margin:5px 0" type="success" size="small" @click="checkUnqualifiedItems(scope.row.task_id,scope.row.id)">查看不合格检测项
+						</el-button>
+					</template>
+					</el-table-column>
+				</el-table>
+
+				<!--    分页器区域-->
+					<el-pagination @size-change="handleSizeChangeth" @current-change="handleCurrentChangeth"
+					:current-page="queryInfoth.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfoth.pageSize"
+					layout="total, sizes, prev, pager, next, jumper" :total="thTaskTotal" background />
+				
+				<!-- 不合格检测项目 -->
+				<el-dialog title="不合格检测项目" :visible.sync="UnqualifiedJcxItemDialog" width="70%" :close-on-click-modal="false"
+				class="dialogItem">
+					<el-table :data="thjcxItems" border stripe highlight-current-row style="width: 100%"
+						:row-style="rowStyle" :cell-style="cellStyle">
+						<!-- <el-table-column type="selection" width="50" align="center"></el-table-column> -->
+						<el-table-column label="序号" width="50px" align="center">
+							<template slot-scope="scope">
+								{{ scope.$index+1 }}
+							</template>
+						</el-table-column>
+
+						<el-table-column :key="table.label" v-for="table in thjcxHeader" :label="table.label" :prop="table.prop"
+							align="center" :width="table.width" :fixed="table.fixed" />
+					</el-table>
+					<el-pagination @size-change="handleSizeChangethItems" @current-change="handleCurrentChangethItems"
+					:current-page="queryInfothItems.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfothItems.pageSize"
+					layout="total, sizes, prev, pager, next, jumper" :total="thItemsTotal" background />
+				</el-dialog>
+			</div>
+		</el-tab-pane>
+
+			<el-tab-pane label="抽样" name="second">
+			<!-- <el-tab-pane v-if="sampleShow==true" label="抽样" name="second"> -->
+
+				<!-- 头部搜索栏 -->
+				
+					<!-- <el-form style="display: flex; flex-direction: column;" ref="form2" :model="queryInfo">
+						<el-row style="width: 75%;">
+							<el-col :span="6">
+						<el-form-item label="样品名称" class="select" size="small" prop="sample_name">
+							<el-input v-model="queryInfo.sample_name"></el-input>
+						</el-form-item>
+							</el-col>
+							<el-col :span="6">
+						<el-form-item label="样品编码" class="select" size="small" prop="sample_id">
+							<el-input v-model="queryInfo.sample_id"></el-input>
+						</el-form-item>
+							</el-col>
+							<el-col :span="6">
+						<el-form-item label="受检单位" class="select" size="small" prop="units_name">
+							<el-input v-model="queryInfo.unit_test_name"></el-input>
+						</el-form-item>
+						</el-col>
+						</el-row>
+						<el-row style="width: 75%;">
+							<el-col :span="6">
+						<el-form-item label="抽样单位" class="select" size="small" prop="sample_unit_name">
+							<el-input v-model="queryInfo.unit_sample_name"></el-input>
+						</el-form-item>
+						    </el-col>
+							<el-col :span="6">
+						<el-form-item label="抽样日期" class="select" size="small" prop="sample_data">
+							<el-input v-model="queryInfo.sample_data"></el-input>
+						</el-form-item>
+						</el-col>
+						<el-col :span="6">
+						<el-form-item label="抽样场所" class="select" size="small" prop="sample_ground">
+							<el-input v-model="queryInfo.sample_ground"></el-input>
+						</el-form-item>
+						</el-col>
+						<el-col :span="4">
+							<el-button style="height: 32px;margin-left: 10px;" size="mini" type="success"
+							@click="searchData()">查询
+						</el-button>
+					
+						<el-button style="height: 32px;margin-left: 5px;" size="mini" type="success" @click="resetForm('form2')">
+							重置
+						</el-button>
+						</el-col>
+						</el-row>
+					</el-form> -->
+				<el-row style="margin-right: 0px;">
+				
+				<el-table :data="underTask" border stripe highlight-current-row  @current-change="handlecyCurrentChange" style="width: 100%"
+					:row-style="rowStyle" :cell-style="cellStyle">
+					<el-table-column :key="table.label" v-for="table in tableHeader2" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+					<el-table-column label="操作" align="center" fixed="right">
+					<template slot-scope="scope">
+						<el-button style="margin:5px 0" type="success" size="small" plain @click="input(scope.row.id)">填报抽样单
+						</el-button>
+						<el-button style="margin-bottom:5px" type="success" size="small" @click="getCydlist(scope.row.id)">查看抽样单列表
+						</el-button>
+							<!-- <el-button type="success" size="small" plain @click="sampleDetail(scope.row.sample_id)" @focus="getSampleListDialog = true">查看抽样单列表
+						</el-button> -->
+						<!-- <el-button type="primary" size="small" plain icon="el-icon-edit-outline" @click="appear">上报抽样信息
+						</el-button> -->
+					</template>
+					</el-table-column>
+				</el-table>
+
+				<!-- 抽样单列表对话框 -->
+			<el-dialog title="抽样单列表" :visible.sync="getSampleListDialog" width="75%" :close-on-click-modal="false" class="dialogItem">
+				<el-form v-if="getSampleListDialog">
+					<!--  表格数据区域-->
+					<el-table ref="multipleTable" :data="tableData" border stripe highlight-current-row
+						@selection-change="handleSelectionChange" style="width: 100%" :row-style="rowStyle"
+						:cell-style="cellStyle">
+						<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" width="60">
+							<template slot-scope="scope">
+								<span v-if="scope.row.cydProfile.cyd_file_url==''">无</span>
+								<el-link v-else type="primary" :href="scope.row.cydProfile.cyd_file_url">下载</el-link>
+							</template>
+						</el-table-column> -->
+						<el-table-column label="操作" align="center" fixed="right">
+							<template slot-scope="scope">
+								<el-button style="margin:5px 5px" type="success" size="small" plain @click="sampleDetail(scope.row.id)">查看
+								</el-button>
+								<el-button style="margin:5px 5px" type="primary" size="small" plain icon="el-icon-edit-outline" v-if="scope.row.cyd_status == 1" @click="putCydStatus(scope.row.id)">上报抽样信息
+								</el-button>
+								<el-button style="margin:5px 5px" type="success" size="small" plain v-if="scope.row.cyd_status == 1" @click="deleteCyd(scope.row.id)">删除
+								</el-button>
+								<el-button style="margin:5px 5px" type="primary" size="small" plain icon="el-icon-edit-outline" v-else>抽样信息已上报
+								</el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+					<!--    分页器区域-->
+					<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+					:current-page="queryInfo.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo.pageSize"
+					layout="total, sizes, prev, pager, next, jumper" :total="total" background />
+				</el-form>
+			</el-dialog>
+		</el-row>	
+		</el-tab-pane>
+
+			<el-tab-pane label="检测" name="third">
+			<!-- <el-tab-pane  v-if="checkShow==true"  label="检测" name="third"> -->
+			<el-table :data="underTask" border stripe highlight-current-row  @current-change="handlecyCurrentChange" style="width: 100%"
+					:row-style="rowStyle" :cell-style="cellStyle">
+				<el-table-column :key="table.label" v-for="table in tableHeader2" :label="table.label"
+					:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+				<el-table-column label="操作" align="center" fixed="right">
+				<template slot-scope="scope">
+					<el-button style="margin:5px 0" type="success" size="small" @click="getJcdList(scope.row.id)">查看检测单列表
+					</el-button>
+				</template>
+				</el-table-column>
+			</el-table>
+			<!-- 查看检测单列表弹框 -->
+			<el-dialog title="检测单列表" :visible.sync="checkTestList" width="70%" :close-on-click-modal="false"
+				class="dialogItem">
+				<!--  表格数据区域-->
+				<el-table :data="tableData1" border stripe highlight-current-row style="width: 100%"
+					:row-style="rowStyle" :cell-style="cellStyle">
+					<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 checkHeader" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+					<el-table-column label="操作" align="center" fixed="right" width="350px">
+						<template slot-scope="scope">
+							<el-button style="margin:5px 5px" type="success" size="mini" plain
+								@click="getSamplesLists(scope.row.id)">获取样品列表</el-button>
+							
+							<!-- <el-button style="margin:5px 5px" type="primary" size="mini" plain @click="creatpdf(scope.row.sample_id)">生成检测报告
+							</el-button> -->
+						</template>
+					</el-table-column>
+				</el-table>
+
+				<!--    分页器区域-->
+				<el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1"
+					:current-page="queryInfo1.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo1.pageSize"
+					layout="total, sizes, prev, pager, next, jumper" :total="jcdListTotal" background />
+			</el-dialog>
+			</el-tab-pane>
+			
+			<el-dialog title="样品信息列表" :visible.sync="getSamplesList" width="75%" :close-on-click-modal="false"
+				class="dialogItem">
+							<!--  表格数据区域-->
+			<el-table ref="multipleTable" :data="yptableData" border stripe highlight-current-row style="width: 100%; margin:auto;"
+				:row-style="rowStyle" :cell-style="cellStyle">
+				<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 yptableHeader" :label="table.label" :prop="table.prop"
+					align="center" :width="table.width" :fixed="table.fixed" />
+				<el-table-column label="操作" align="center">
+						<template slot-scope="scope">
+						<el-col style="margin-bottom: 5px;">
+							<el-button style="margin:5px 5px" type="success" size="mini" v-if="scope.row.jcd==null" plain
+								@click="getJcdObj(scope.row.id,scope.row.cyd_id)">填报检测单</el-button>
+							<!-- <el-button style="margin:5px 5px" type="primary" v-else size="mini" plain @click="update(scope.row)">修改</el-button> -->
+							<el-button style="margin:5px 5px" type="primary" size="mini" plain @click="putJcdStatus(scope.row.jcd.id,scope.row.cyd_id)" v-else-if="scope.row.jcd.jcd_status == '1'">上报检测单
+							</el-button>
+							<el-button style="margin:5px 5px" type="primary" size="mini" plain v-else-if="scope.row.jcd.jcd_status == '3'">检测单已上报
+							</el-button>
+						</el-col>
+					</template>
+				</el-table-column>
+			</el-table>
+				<el-pagination @size-change="handleSizeChangeyp" @current-change="handleCurrentChangeyp"
+					:current-page="ypqueryInfo.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="ypqueryInfo.pageSize"
+					layout="total, sizes, prev, pager, next, jumper" :total="samplesListTotal" background />
+			</el-dialog>
+
+			<el-dialog title="填报检测单" :visible.sync="inputJcdShow" width="70%" :close-on-click-modal="false"
+				class="dialogItem">
+
+			<div id="inputJcd" style="margin:10px 50px; width:100%">
+				<el-form :rules="rules" :model="jcd">
+					<el-row>
+					<el-col :span="10">
+					<el-form-item label="检测单编码:" prop="jcd_code" class="labelItem">	
+							<el-input v-model="jcd.jcd_code" placeholder="请输入检测单编码" style="width:50%;margin-left:5px;"></el-input>
+					</el-form-item>
+					</el-col>
+					<el-col :span="6">
+					<el-form-item label="检测结果:" prop="jcd_result" class="labelItem">
+						<el-radio-group v-model="jcd.jcd_result">
+							<el-radio :label="1">合格</el-radio>
+							<el-radio :label="0">不合格</el-radio>
+						</el-radio-group>
+					</el-form-item>
+					</el-col>
+					</el-row>
+					<!-- 上传检测报告 -->
+					<el-form-item label="检测单报告上传:" prop="jcd" class="labelItem">
+					<el-upload
+						class="upload-demo"
+						:headers="myHeaders"
+						action='http://new.syjcapi.aielab.net/api/v1/ossUpload'
+						:on-preview="handlePreview"
+						:on-remove="handleRemove"
+						:before-remove="beforeRemove"
+						:on-success="uploadSuccess"
+						multiple
+						:file-list="fileList">
+						<el-button size="small" type="primary">点击上传</el-button>
+						<div slot="tip" class="el-upload__tip">只能上传pdf文件,且不超过500kb</div>
+					</el-upload>
+				</el-form-item>
+	
+				
+				</el-form>
+			</div>
+			<!-- <div v-show="jcd.jcd_result==0"> -->
+			<div style="display: flex;flex-direction: row;float: right;margin-bottom: 10px;" v-show="jcd.jcd_result==0">
+				<el-button type="success" size="small" plain @click="addJcxItemDialog = true">新增不合格项</el-button>
+			</div>
+			<div  v-show="jcd.jcd_result==0" id="additems">
+			<!--  表格数据区域-->
+			<el-table border :data="jcxItems" >
+				<el-table-column type="selection"></el-table-column>
+				<el-table-column label="序号">
+					<template slot-scope="scope">
+						{{scope.$index+1}}
+					</template>
+				</el-table-column>
+				<el-table-column :key="table.label" v-for="table in jcxHeader" :label="table.label" :prop="table.prop" align="center"></el-table-column>
+				<el-table-column label="操作" align="center">
+					<template slot-scope="scope">
+						<el-col>
+							<el-button type="success" size="mini" @click="delJcdItem(scope.row.id)">删除</el-button>
+						</el-col>
+					</template>
+				</el-table-column>
+			</el-table>
+			<!-- <el-table ref="multipleTable" :data="jcxItems" border stripe highlight-current-row style="margin:auto;width:100%;"
+				:row-style="rowStyle" :cell-style="cellStyle">
+				<el-table-column type="selection" width="50px"></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 jcxHeader" :label="table.label" :prop="table.prop"
+					align="center" :width="table.width" :fixed="table.fixed" />
+				<el-table-column label="操作" align="center">
+						<template slot-scope="scope">
+						<el-col style="margin-bottom: 5px;">
+							<el-button type="success" size="mini" @click="delJcdItem(scope.row.id)">删除</el-button>
+						</el-col>
+					</template>
+				</el-table-column>
+			</el-table> -->
+
+			<!--    分页器区域-->
+			<el-pagination @size-change="handleSizeChange2" @current-change="handleCurrentChange2"
+				:current-page="queryInfo2.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo2.pageSize"
+				layout="total, sizes, prev, pager, next, jumper" :total="jcxItemTotal" background />
+		
+			</div>
+
+			
+<!-- 
+				<el-table :data="jcxItems" border stripe highlight-current-row style="width: 100%;"
+					:row-style="rowStyle" :cell-style="cellStyle" align="center" v-show="jcd.jcd_result==0">
+					<el-table-column label="序号" align="center" style="width: auto;">
+						<template slot-scope="scope">
+							{{ scope.$index+1 }}
+						</template>
+					</el-table-column>
+
+					<el-table-column :key="table.label" v-for="table in jcxHeader" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed">
+						
+					</el-table-column>
+					<el-table-column label="操作" align="center">
+							<template slot-scope="scope">
+							<el-col style="margin: 5px auto">
+								<el-button type="success" size="mini" @click="delJcdItem(scope.row.id)">删除</el-button>
+							</el-col>
+						</template>
+					</el-table-column>
+				</el-table> -->
+
+				
+
+		
+			<div class="footer">
+				<el-button type="success" style="margin-bottom:30px;" size="small" @click="putJcd()">完成</el-button>
+			</div>
+			</el-dialog>
+
+			<el-dialog title="新增不合格检测项目" :visible.sync="addJcxItemDialog" width="40%" :close-on-click-modal="false"
+				class="dialogItem">
+				<div id="addUnqualifiedJcx" style="margin:auto;">
+				<el-form ref="jcxform" :rules="rules" :model="jcxItem" style="margin:10px auto;">
+					<el-form-item label="检测项目:" prop="item_name" class="labelItem">
+						<el-input v-model="jcxItem.item_name" style="width:42%"></el-input>
+					</el-form-item>
+					<el-form-item label="标准指标:" prop="item_standard" class="labelItem">	
+							<el-input v-model="jcxItem.item_standard" style="width:42%;"></el-input>
+					</el-form-item>
+					<el-form-item label="实测值:" prop="item_measured_value" class="labelItem">
+						<el-input v-model="jcxItem.item_measured_value" style="width:42%"></el-input>
+					</el-form-item>
+					<el-form-item label="单项判定:" prop="item_result" class="labelItem">
+						<el-input v-model="jcxItem.item_result" style="width:42%"></el-input>
+					</el-form-item>
+					<el-form-item label="监测依据:" prop="item_basis" class="labelItem">
+						<el-input v-model="jcxItem.item_basis" style="width:42%"></el-input>
+					</el-form-item>
+					<el-form-item label="备注:" prop="item_log" class="labelItem">
+						<el-input v-model="jcxItem.item_log" style="width:42%"></el-input>
+					</el-form-item>
+				</el-form>
+				</div>
+			<div class="footer">
+				<el-button type="success" style="margin-bottom:30px;" size="small" @click="postJcdItem('jcxform')">保存</el-button>
+			</div>
+			</el-dialog>
+			<!-- ///////////////////////////////////////////检测报告生成-------难、、、、、、、、、、、、、、、、、、、、、、 -->
+			<el-dialog title="生成监测报告" :visible.sync="dialogVisible2" width="50%">
+				<div id="pdf">
+					<el-form ref="formjc" :model="formjc" label-width="100px"
+						style="margin-top: 20px;width: 100%;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">
+									<el-input disabled v-model="formjc.sample_name"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="11">
+								<el-form-item label="样品编码" prop="sample_id" class="labelItem" style="" size="mini">
+									<el-input disabled v-model="formjc.sample_id"></el-input>
+								</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 disabled v-model="formjc.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 disabled v-model="formjc.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">
+									<el-input disabled v-model="formjc.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-input disabled v-model="formjc.place"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="12">
+								<el-form-item label="产品认证情况" prop="certicfie" class="labelItem" size="mini">
+									<el-input disabled v-model="formjc.certicfie"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="11">
+								<el-form-item label="证书编号" prop="certifie_num" class="labelItem" style="" size="mini">
+									<el-input disabled v-model="formjc.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_num" class="labelItem" size="mini">
+											<el-input disabled v-model="formjc.sample_num"></el-input>
+										</el-form-item>
+									</el-col>
+									<el-col :span="10">
+										<el-form-item label="单位" prop="sample_num_unit" class="labelItem" size="mini"
+											label-width="60px">
+											<el-input disabled v-model="formjc.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">
+											<el-input disabled v-model="formjc.sample_base"></el-input>
+										</el-form-item>
+									</el-col>
+									<el-col :span="10">
+										<el-form-item label="单位" prop="sample_base_unit" class="labelItem" size="mini"
+											label-width="60px" clearable>
+											<el-input disabled v-model="formjc.sample_base_unit"></el-input>
+										</el-form-item>
+									</el-col>
+								</el-row>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col>
+								<el-form-item label="抽样场所" prop="sample_ground" class="labelItem" size="mini">
+									<el-input disabled v-model="formjc.sample_ground"></el-input>
+								</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="">
+									受检单位情况
+								</div>
+							</el-col>
+							<el-col :span="15">
+								<el-form-item label="单位名称" prop="unitTest.unit_test_name" class="labelItem" style="" size="mini">
+									<el-input disabled v-model="unitTest.unit_test_name"></el-input>
+								</el-form-item>
+								<el-form-item label="通讯地址" prop="unitTest.address" class="labelItem" style="" size="mini">
+									<el-input disabled v-model="unitTest.address"></el-input>
+								</el-form-item>
+								<el-form-item label="法定代表人" prop="unitTest.represent_name" class="labelItem" style="" size="mini">
+									<el-input disabled v-model="unitTest.represent_name"></el-input>
+								</el-form-item>
+								<el-form-item label="受检人" prop="unitTest.user_name" class="labelItem" style="" size="mini">
+									<el-input disabled v-model="unitTest.user_name"></el-input>
+								</el-form-item>
+								<el-form-item label="电话" prop="unitTest.phone" class="labelItem" style="" size="mini">
+									<el-input disabled v-model="unitTest.phone"></el-input>
+								</el-form-item>
+								<el-form-item label="传真" prop="unitTest.fax" class="labelItem" style="" size="mini">
+									<el-input disabled v-model="unitTest.fax"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+					<el-table :data="resultjc" border stripe highlight-current-row style="width: 100%"
+						:row-style="rowStyle" :cell-style="cellStyle">
+						<el-table-column :key="table.label" v-for="table in jcheader" :label="table.label"
+							:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+					</el-table>
+				</div>
+				<!-- <div  style="margin-top: 10px; text-align: center">
+				<el-button @click="dialogVisible2 = false">取 消</el-button>
+				<el-button type="primary" @click="download">生成检测报告pdf</el-button>
+				</div> -->
+				<!-- </span> -->
+			</el-dialog>
+
+			<!-- <el-tab-pane label="报告上传" name="five">
+				<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-tab-pane> -->
+		</el-tabs>
+		</div>
+	</div>
+</template>
+
+<script>
+	import htmlToPdf from '../../assets/js/htmlToPdf.js'
+	import inputCheck from './inputCheck'
+	const token = window.sessionStorage.getItem('token')
+	const name = window.sessionStorage.getItem('name')
+	export default {
+		name: 'setTask',
+		data() {
+			return {
+				size: 'medium',
+				myHeaders: {
+					Authorization: token
+				},
+				rules: {
+                	item_name: [{required: true, message: '该项为必填项', trigger: 'blur'},],
+					// inspected_address: [{required: true, message: '请输入单位地址', trigger: 'blur'},],
+					item_standard: [{required: true, message: '该项为必填项', trigger: 'blur'},],
+					item_measured_value: [{required: true, message: '该项为必填项', trigger: 'blur'},],
+					item_result: [{required: true, message: '该项为必填项', trigger: 'blur'},],
+					item_basis: [{required: true, message: '该项为必填项', trigger: 'blur'},],
+					item_log: [{required: true, message: '该项为必填项', trigger: 'blur'},],
+						},
+				radio:{},
+				formjc: {},
+				unitTest: {},
+				dialogVisible2: false,
+				getSampleListDialog: false,//抽样单列表对话框
+				checkTestList: false,//检测单列表对话框
+				addJcxItemDialog: false,//新增不合格检测项目对话框
+				getSamplesList: false,//检测单列表中获取样品信息对话框
+				UnqualifiedJcxItemDialog: false,//退回中查看不合格检测项目对话框
+				jcxItemTotal: 0,
+				samplesListTotal: 0,
+				activeName: 'first',
+				jcxItems: [],
+				thjcxItems:[],
+				thItemsTotal: 0,
+				id: 0,
+				jcd: {
+					jcd_result: 1,
+					file_name: '',
+					file_url: '',
+					sample_id: '',
+					cyd_id: ''
+				},
+				readForm: {
+					creater: [],
+					releaser: [],
+					modelInfo: [],
+					model_type: '',
+				
+				},
+				// sample_name: '',
+				// sample_id: '',
+				sampleTask: [],
+				underTask: [],
+				
+				jcdListTotal: 0,
+				queryInfo: {
+					pageNum: 1,
+					pageSize: 10,
+				},
+				queryInfo1:{
+					pageNum: 1,
+					pageSize: 10,
+					task_id: '',
+					task_profile_id: ''
+				},	
+				queryInfo2:{
+					pageNum: 1,
+					pageSize: 10,
+					jcd_id: ''
+				},
+				ypqueryInfo:{
+					pageNum: 1,
+					pageSize: 10,
+					cyd_id: ''
+				},	
+				queryInfoth:{
+					pageNum: 1,
+					pageSize: 10,
+					task_id: ''
+				},
+				queryInfothItems:{
+					pageNum: 1,
+					pageSize: 10,
+					task_id: '',
+					task_profile_id: ''
+				},			
+				cellStyle: {
+					padding: 2 + 'px'
+				},
+				rowStyle: {
+					height: 35 + 'px'
+				},
+				tableHeader: [{
+						label: '抽样单编码',
+						prop: 'cyd_code'
+						// fixed: 'left'
+					},
+					{
+						label: '受检单位',
+						prop: 'inspectedUnit.inspected_name',
+						width: 180
+					},
+					{
+						label: '抽样日期',
+						prop: 'cydProfile.cyd_date',
+						width: 150
+					},
+					{
+						label: '状态',
+						prop: 'status',
+						width: 100
+					}
+				],
+				//获取检测单列表表格
+				checkHeader: [{
+						label: '抽样单编码',
+						prop: 'cyd_code'
+						// fixed: 'left'
+					},
+					{
+						label: '受检单位',
+						prop: 'inspectedUnit.inspected_name',
+						// width: 180
+					},
+					{
+						label: '抽样日期',
+						prop: 'cydProfile.cyd_date',
+						// width: 150
+					},
+					// {
+					// 	label: '状态',
+					// 	prop: 'status',
+					// 	width: 100
+					// }
+				],
+
+				jcxHeader: [
+					{
+						label: '检测项目',
+						prop: 'item_name',
+						// width: 'auto'
+						// fixed: 'left'
+					},
+					{
+						label: '标准指标',
+						prop: 'item_standard',
+						// width: 'auto'
+					},
+					{
+						label: '实测值',
+						prop: 'item_measured_value',
+						// width: 'auto'
+					},
+					{
+						label: '单项判定',
+						prop: 'item_result',
+						// width: 'auto'
+					},
+					{
+						label: '检验依据',
+						prop: 'item_basis',
+						// width: 'auto'
+					},
+					{
+						label: '备注',
+						prop: 'item_log',
+						// width: 'auto'
+					},
+					],
+				thjcxHeader: [
+					{
+						label: '检测项目',
+						prop: 'item_name'
+						// fixed: 'left'
+					},
+					{
+						label: '标准指标',
+						prop: 'item_standard',
+						// width: 180
+					},
+					{
+						label: '实测值',
+						prop: 'item_measured_value',
+						// width: 150
+					},
+					{
+						label: '单项判定',
+						prop: 'item_result',
+						// width: 100
+					},
+					{
+						label: '检验依据',
+						prop: 'item_basis',
+						// width: 100
+					},
+					{
+						label: '备注',
+						prop: 'item_log',
+						// width: 100
+					},
+					],
+					
+				checkHeader2: [{
+					label: '检测项目',
+					prop: 'test_name',
+					// fixed: 'left'
+				}],
+				// 数据表格数据
+				tableData: [],
+				tableData1: [],
+				yptableData: [],//检测单列表中样品信息表格
+				options: [],
+				thTask: [],
+				thTaskTotal: 0,
+				task_id: '',
+				multipleSelection: null,
+				// 填报检测对话框
+				inputJcdShow: false,
+				jcd_id: '',
+				testPesticides: [],
+				resultjc: [],
+				thtableHeader: [{
+						label: '抽样机构',
+						prop: 'sampleOrgId.name',
+						// width: 180,
+					}, {
+						label: '检测机构',
+						prop: 'checkOrgId.name'
+					},
+					{
+						label: '抽样地区',
+						prop: 'sample_address'
+					}, 
+				],
+				jcheader: [{
+						label: '检测项目',
+						prop: 'test_name',
+					},
+					{
+						label: '检测值',
+						prop: 'test_value',
+					}, {
+						label: '限量值',
+						prop: 'state_value',
+					}, {
+						label: '单位',
+						prop: 'unit',
+					}, {
+						label: '抽检结果',
+						prop: 'test_result'
+					}, {
+						label: 'LOD',
+						prop: 'LOD',
+					}, {
+						label: 'LOQ',
+						prop: 'LOQ',
+					}
+				],
+				tableHeader2: [{
+						label: '抽样机构',
+						prop: 'sampleOrgId.name',
+						width: 180,
+					}, {
+						label: '检测机构',
+						prop: 'checkOrgId.name'
+					},
+					{
+						label: '抽样地区',
+						prop: 'sample_address'
+					}, 
+					// {
+					// 	label: '抽样数量',
+					// 	prop: 'sample_number',
+					// 	width: 100,
+					// },
+					// {
+					// 	label: '报告上传单位',
+					// 	prop: 'report_name'
+					// },
+					//  {
+					// 	label: '任务截止时间',
+					// 	prop: 'uploadtime'
+					// }
+				],
+				yptableHeader: [{
+						label: '样品名称',
+						prop: 'sample_name'
+						// fixed: 'left'
+					},
+					{
+						label: '样品来源',
+						prop: 'sample_source',
+						// fixed: 'left'
+					},
+					{
+						label: '抽样数量',
+						prop: 'sample_count'
+					},
+					{
+						label: '抽样基数',
+						prop: 'sample_base'
+					},
+					{
+						label: '生产日期',
+						prop: 'sample_md_date'
+					},
+					{
+						label: '检测单状态',
+						prop: 'jcd_status'
+					},
+					{
+						label: '备注',
+						prop: 'sample_log'
+					}
+
+				],
+				fileList: [],
+				total: 0,
+				sampleShow: false, //是否展示抽样卡片
+				checkShow: false, //是否展示检测卡片
+				currentRow: null,//选中机构地域表格数据项
+				jcxItem:{},//新增检测项目
+			};
+		},
+		components: {
+			inputCheck
+		},
+		mounted() {},
+		created() {
+			this.task_id = this.$route.params.id
+
+			this.getTask()
+			this.getCheckTaskList()
+			this.getOldTaskProfile()
+		},
+
+		methods: {
+			// 获取检测单列表
+			async getJcdList(id){
+				this.queryInfo1['task_id'] = this.task_id
+				this.queryInfo1['task_profile_id'] = id
+				this.checkTestList = true
+				this.getJcds()
+			},
+			async getJcds() {
+				const {
+					data: res
+				} = await this.$http.post("getJcds", this.queryInfo1);
+				// console.log(res)
+				this.tableData1 = res.data.rows
+				for(let i= 0; i < this.tableData1.length; i++) {
+					if(this.tableData1[i].cyd_status == 1) {
+						this.tableData1[i].status = '未上报'
+					}else {
+						this.tableData1[i].status = '已上报'
+					}
+				}
+				this.jcdListTotal = res.data.total
+				
+			},
+			// 获取抽样单列表
+			async getCydlist(id) {
+				this.queryInfo['task_id'] = this.task_id
+				this.queryInfo['task_profile_id'] = id
+				this.getSampleListDialog = true
+				this.getCyds()
+			},
+			async getCyds() {
+				const {
+					data: res
+				} = await this.$http.post("getCyds", this.queryInfo);
+				// console.log(res)
+				this.tableData = res.data.rows
+				for(let i= 0; i < this.tableData.length; i++) {
+					if(this.tableData[i].cyd_status == 1) {
+						this.tableData[i].status = '未上报'
+					}else {
+						this.tableData[i].status = '已上报'
+					}
+				}
+				this.total = res.data.total	
+			},
+
+			//删除抽样单
+			async deleteCyd(id){
+				let that = this
+				const res = await this.$http.post('deleteCyd',{cyd_id:id})
+				this.getCyds()
+
+			},
+			//检测单列表中获取样品信息列表
+			async getSamplesLists(id){
+				let that = this
+				that.ypqueryInfo['cyd_id'] = id
+				this.getSamples()
+			},
+			async getSamples() {
+				let that = this
+				// that.ypqueryInfo['cyd_id'] = id
+				const res = await this.$http.post('getSamples',that.ypqueryInfo)
+				console.log(res.data.data.rows)
+				that.yptableData = res.data.data.rows
+				for(let i= 0; i < this.yptableData.length; i++) {
+					if(this.yptableData[i].jcd == null) {
+						this.yptableData[i].jcd_status = '未填报'
+					}else if(this.yptableData[i].jcd.jcd_status == '1') {
+						this.yptableData[i].jcd_status = '未上报'
+					}else if(this.yptableData[i].jcd.jcd_status == '3') {
+						this.yptableData[i].jcd_status = '已上报'
+					}else if(this.yptableData[i].jcd.jcd_status == '5') {
+						this.yptableData[i].jcd_status = '已完成'
+					}
+				}
+				console.log(that.yptableData)
+				that.samplesListTotal = res.data.data.total
+				this.getSamplesList = true
+			},
+
+			// 删除不合格检测项目信息
+			async delJcdItem(id) {
+				let that = this
+				const result = await this.$http.post('delJcdItem', {jcd_item_id: id})
+				// 判断业务逻辑
+				if (result.data.code == 0) {
+					this.$message({
+						type: 'success',
+						message: '删除成功'
+					})
+					this.getJcdItems()
+				}
+			},
+			//新增不合格检测项目
+			async postJcdItem(formName) {
+				let that = this
+				that.jcxItem['jcd_id'] = that.jcd_id
+				const result = await this.$http.post('postJcdItem', that.jcxItem)
+				if (result.data.code == 0) {
+				this.$message({
+					type: 'success',
+					message: '保存成功'
+				})
+				this.addJcxItemDialog = false
+				this.$refs[formName].resetFields();
+				this.getJcdItems()
+			}
+			},
+			//获取不合格检测项目列表
+			async getJcdItems() {
+				let that = this
+				that.queryInfo2.jcd_id = that.jcd_id
+				const res = await this.$http.post('getJcdItems',that.queryInfo2)
+				console.log(res.data.data.rows)
+				this.jcxItems = res.data.data.rows
+				this.jcxItemTotal = res.data.data.total
+			},
+			//填报检测单完成
+			async putJcd() {
+				let that = this
+				that.jcd.jcd_id = that.jcd_id
+				console.log(that.jcd)
+				const res = await this.$http.post('putJcd',that.jcd)
+				if (res.data.code == 0) {
+				this.$message({
+					type: 'success',
+					message: '填报检测单成功'
+				})
+				}
+				this.inputJcdShow = false
+				// this.getSamplesList = false
+				this.getSamples(that.jcd.cyd_id)
+				that.jcd.jcd_result = 1
+			},
+			
+			//查询
+			async searchData() {
+				console.log(this.queryInfo)
+				this.queryInfo.pageNum = 1
+				this.getCyds()
+			},
+			//重置
+			resetForm(formName) {
+				// console.log(this.queryInfo)
+					this.$refs[formName].resetFields();
+			},
+			//选中抽样任务(单选)
+			handlecyCurrentChange(val) {
+				this.currentRow = val;
+				console.log(this.currentRow)
+				console.log(this.currentRow.id)
+
+				// under_id = 
+			},
+			//获取任务详情
+			async getTask() {
+				var that = this
+				const {
+					data: res
+				} = await this.$http.post("getTask", {
+					task_id: that.task_id,
+					pageNum: that.queryInfo.pageNum,
+					pageSize: that.queryInfo.pageSize
+				});
+				
+				that.readForm = res.data
+				console.log(that.readForm)
+			},
+
+			//退回任务列表
+			async getOldTaskProfile(){
+				this.queryInfoth['task_id'] = this.task_id
+				const res = await this.$http.post('getOldTaskProfile',this.queryInfoth)
+				console.log(res.data.data)
+				this.thTask = res.data.data.rows
+				this.thTaskTotal = res.data.data.total
+			},
+			//退回中查看不合格检测项目
+			async checkUnqualifiedItems(task_id,task_profile_id){
+				var that = this
+				that.queryInfothItems['task_id'] = task_id
+				that.queryInfothItems['task_profile_id'] = task_profile_id
+				this.checkbhgItems()
+			},
+			async checkbhgItems(){
+				var that = this
+				const res = await this.$http.post('getUnqualifiedItem',that.queryInfothItems)
+				this.thjcxItems = res.data.data.rows
+				for(let i= 0; i < this.thjcxItems.length; i++) {
+					if(this.thjcxItems[i].item_result == 0) {
+						this.thjcxItems[i].item_result = '不合格'
+					}else if(this.thjcxItems[i].item_result == 1) {
+						this.thjcxItems[i].item_result = '合格'
+					}
+				}
+				this.thItemsTotal = res.data.data.total
+				this.UnqualifiedJcxItemDialog = true
+			},
+
+			//上传文件
+			 handleRemove(file, fileList) {
+				console.log(file, fileList);
+			},
+			handlePreview(file) {
+				console.log(file);
+			},
+			beforeRemove(file, fileList) {
+				return this.$confirm(`确定移除 ${ file.name }?`);
+			},
+
+			// 上传成功
+			uploadSuccess(res) {
+				console.log(res.data)
+				this.jcd.file_url = res.data.fileUrl
+				this.jcd.file_name = res.data.fileName
+				console.log(this.jcd.file_url)
+				console.log(this.jcd.file_name)
+			},
+
+			//抽样标签详情
+			async getSampleTaskList(){
+				for (var key in this.queryInfo) {
+				if (this.queryInfo[key] == '') {
+					delete this.queryInfo[key]
+					}
+				}
+				var that = this
+				const {
+					data: res
+				} = await this.$http.post("getSampleTaskList", {
+					task_id: that.task_id,
+					// pageNum: that.queryInfo.pageNum,
+					// pageSize: that.queryInfo.pageSize
+				});
+				console.log(res)
+				that.sampleTask = res.data.rows
+				console.log(that.sampleTask)
+			},
+
+			//检测标签详情
+			async getCheckTaskList(){
+				var that = this
+				const {
+					data: res
+				} = await this.$http.post("getCheckTaskList", {
+					task_id: that.task_id,
+					// pageNum: that.queryInfo.pageNum,
+					// pageSize: that.queryInfo.pageSize
+				});
+				console.log(res)
+				that.underTask = res.data.rows
+				console.log(that.underTask)
+			},
+			
+			// 上传成功
+			// async uploadSuccess(res) {
+			// 	console.log(res.data)
+			// 	this.form.file_url = res.data.fileUrl
+			// 	this.form.file_name = res.data.fileName
+			// 	const result = await this.$http.post('saveTestFile', {
+			// 		sample_id: sample_id
+			// 	})
+			// 	if (result.data.code == 0) {
+			// 		that.formjc = result.data.data
+			// 	}
+			// },
+			//下载检测报告
+			// download() {
+			// 	htmlToPdf.downloadPDF(document.querySelector('#pdf'), '检测报告')
+			// },
+			//生成检测报告pdf
+			// async creatpdf(sample_id) {
+			// 	var that = this
+			// 	that.dialogVisible2 = true
+			// 	// async getSampleDetail() {
+			// 	// const result = await this.$http.post('getSampleDetail', {
+			// 	// 	sample_id: sample_id
+			// 	// })
+			// 	// if (result.data.code == 0) {
+			// 	// 	that.formjc = result.data.data
+			// 	// }
+			// 	// console.log(that.formjc)
+			// 	const res = await this.$http.post('getTestValue', {
+			// 		sample_id: sample_id
+			// 	})
+			// 	console.log()
+			// 	if (res.data.code == 0) {
+			// 		that.formjc = res.data.data.result
+			// 		that.unitTest = res.data.data.result.unitTest
+			// 		that.resultjc = res.data.data.result_detail
+			// 	}
+			// 	console.log(that.formjc)
+			// 	console.log(that.resultjc)
+			// 	// },
+
+			// },
+			//保存检测单
+			// async saveJcdItem() {
+			// 	console.log(this.testPesticides)
+			// 	console.log(this.underInfo)
+			// 	for (let i = 0; i < this.testPesticides.length; i++) {
+			// 		this.testPesticides[i]['unit'] = 'mg/kg'
+			// 		console.log(this.testPesticides[i]['state_value'])
+			// 		if (this.testPesticides[i]['state_value'] === 'ND') {
+			// 			if (this.testPesticides[i]['test_value'] !== 'ND') {
+			// 				this.testPesticides[i]['test_result'] = '不合格'
+			// 			}
+			// 		} else {
+			// 			if (this.testPesticides[i]['test_value'] <= this.testPesticides[i]['state_value']) {
+			// 				this.testPesticides[i]['test_result'] = '合格'
+			// 			} else if (this.testPesticides[i]['test_value'] > this.testPesticides[i]['state_value']) {
+			// 				this.testPesticides[i]['test_result'] = '不合格'
+			// 			}
+			// 		}
+			// 		delete this.testPesticides[i]['test_model_id']
+			// 	}
+
+
+			// 	var that = this
+			// 	const result = await this.$http.post("saveJcdItem", {
+			// 		pesticides: that.testPesticides,
+			// 		sample_id: that.sample_id
+			// 	});
+			// 	if (result.data.data.disable_upload_data == '') {
+			// 		this.$message({
+			// 			type: 'success',
+			// 			message: '检测成功!'
+			// 		});
+			// 		that.inputCheckShow = false
+			// 		that.getJcdList(this.underInfo.underTake_id)
+			// 	} else if(result.data.data.enable_upload_data == ''){
+			// 		this.$message({
+			// 			type: 'error',
+			// 			message: '请输入检测数据'
+			// 		});
+			// 	} else{
+			// 		this.$message({
+			// 			type: 'error',
+			// 			message: '已存在数据保存失败,新增数据保存成功'
+			// 		});
+			// 		that.inputCheckShow = false
+			// 		that.getJcdList(this.underInfo.underTake_id)
+			// 	}
+			// },
+			//填报检测单
+			async getJcdObj(sample_id,cyd_id) {
+				console.log(111)
+				this.inputJcdShow = true
+				console.log(222)
+				var that = this
+				that.jcd.cyd_id = cyd_id
+				const {
+					data: res
+				} = await this.$http.post("getJcdObj", {
+					cyd_id: cyd_id,
+					sample_id: sample_id
+				});
+
+				that.jcd_id = res.data.jcd_id
+				// that.jcd.sample_id = 
+				console.log(that.jcd_id)
+				// console.log(that.cyd_id)
+			},
+			//检测单列表-上报
+			async putJcdStatus(id,cyd_id){
+				var that = this
+				console.log(cyd_id)
+				const result = await this.$http.post('putJcdStatus', {
+					jcd_id: id
+				})
+				console.log(result.data.data)
+				// this.getCyds()
+					// 判断业务逻辑
+					if (result.data.code == 0) {
+						this.$message({
+							type: 'success',
+							message: '上报抽样信息成功'
+						})
+						
+						this.getSamples(cyd_id)
+					}
+			},
+			handleClick(tab, event) {
+				console.log(tab, event);
+			},
+			
+			// 跳转到填写抽样单
+			inputSample() {
+				this.activeName = 'second'
+			},
+			// 填报抽样单
+			input(id) {
+				console.log(id)
+				console.log(this.readForm.id)
+
+						this.$router.push({
+					name: 'fillSampleReport',
+					params: {
+						task_id: this.readForm.id,
+						under_id:id
+					}
+				})
+				// }
+				// if(isset(this.currentRow.id)){
+				// 	this.under_id=this.currentRow.id
+				// }
+			
+				// console.log(this.currentRow.id)
+			},
+			// 返回
+			back() {
+				var that = this
+				this.$router.push({
+					name: 'setTaskcd',
+					params: {
+						id: that.id
+					}
+				})
+			},
+			// 上传抽样信息
+			async putCydStatus(id) {
+				let that = this
+				// that.orgs = that.multipleSelection
+				// console.log(that.multipleSelection)
+				const result = await this.$http.post('putCydStatus', {
+					cyd_id: id
+				})
+				console.log(result.data.data)
+				// this.getCyds()
+					// 判断业务逻辑
+					this.$message({
+							type: 'success',
+							message: '上报抽样信息成功'
+						})
+						
+						this.getCyds(result.data.data)
+					// if (result.data.code == 0) {
+					// 	this.$message({
+					// 		type: 'success',
+					// 		message: '上报抽样信息成功'
+					// 	})
+						
+					// 	this.getCyds(result.data.data)
+					// }
+			},
+		
+			/** 修复当用户在大于1的分页进行数据搜索没有返回值的问题 */
+			setPageNum() {
+				this.queryInfo.pageNum = 1
+				this.getCyds()
+			},
+			setSelectedRow() {
+				// 设置当前页已选项
+				this.hander = true
+				this.tableData.forEach(item => {
+					if (this.list.includes(item[this.uniqueKey])) {
+						this.$refs.multipleTable.toggleRowSelection(item, true)
+					}
+				})
+				this.hander = false
+			},
+
+			/** 监听每页显示多少数据的改变 */
+			handleSizeChange(newSize) {
+				this.queryInfo.pageSize = newSize
+				this.getCyds()
+			},
+
+			/** 监听页码的改变 */
+			handleCurrentChange(newPage) {
+				this.queryInfo.pageNum = newPage
+				this.getCyds()
+			},
+			/** 监听每页显示多少数据的改变 */
+			handleSizeChange1(newSize) {
+				this.queryInfo1.pageSize = newSize
+				this.getJcds()
+			},
+
+			/** 监听页码的改变 */
+			handleCurrentChange1(newPage) {
+				this.queryInfo1.pageNum = newPage
+				this.getJcds()
+			},
+				/** 监听每页显示多少数据的改变 */
+			handleSizeChange2(newSize) {
+				this.queryInfo2.pageSize = newSize
+				this.getJcdItems()
+			},
+
+			/** 监听页码的改变 */
+			handleCurrentChange2(newPage) {
+				this.queryInfo2.pageNum = newPage
+				this.getJcdItems()
+			},
+			handleSizeChangeyp(newSize) {
+				this.ypqueryInfo.pageSize = newSize
+				this.getSamples()
+			},
+
+			/** 监听页码的改变 */
+			handleCurrentChangeyp(newPage) {
+				this.ypqueryInfo.pageNum = newPage
+				this.getSamples()
+			},
+
+			/** 监听每页显示多少数据的改变 */
+			handleSizeChangeth(newSize) {
+				this.queryInfoth.pageSize = newSize
+				this.getOldTaskProfile()
+			},
+
+			/** 监听页码的改变 */
+			handleCurrentChangeth(newPage) {
+				this.queryInfoth.pageNum = newPage
+				this.getOldTaskProfile()
+			},
+			handleSizeChangethItems(newSize) {
+				this.queryInfothItems.pageSize = newSize
+				this.checkbhgItems()
+			},
+
+			/** 监听页码的改变 */
+			handleCurrentChangethItems(newPage) {
+				this.queryInfothItems.pageNum = newPage
+				this.checkbhgItems()
+			},
+			// 批量勾选
+			handleSelectionChange(val) {
+				this.multipleSelection = val
+				console.log(this.multipleSelection)
+				if (this.hander) return false
+				// this.setSelectRows() // 处理选中的方法
+			},
+			// 跳转到查看抽样单详情
+			sampleDetail(id) {
+				console.log(id)
+				console.log(this.task_id)
+
+				this.$router.push({
+					name: 'sampleReport',
+					params: {
+						task_id: this.task_id,
+						cyd_id: id
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.el-breadcrumb {
+		margin-bottom: 20px;
+	}
+
+	// .el-form-item {
+	// 	margin-bottom: 0px;
+	// }
+
+	.el-select {
+		width: 210px;
+		height: 100%;
+	}
+
+	.select {
+		display: flex;
+		flex-direction: row;
+		margin-left: 10px;
+	}
+
+	// .el-form {
+	// 	margin-left: 35%;
+	// }
+
+	// .el-form-item {
+	// 	// margin-bottom: 8px;
+	// 	margin: 0 auto;
+	// }
+
+	// .labelItem /deep/ .el-form-item__label {
+	// 	// width: 80px;
+	// 	text-align: center;
+	// 	vertical-align: middle;
+	// 	float: left;
+	// 	font-size: 14px;
+	// 	color: #606266;
+	// 	font-weight: bold;
+	// 	// line-height: 40px;
+	// 	padding: 0 20px 0 0;
+	// 	-webkit-box-sizing: border-box;
+	// 	box-sizing: border-box;
+	// }
+
+	.demonstration {
+		margin: 20px;
+	}
+
+	// .el-form-item__content {
+	// 	width: 200px;
+	// }
+
+	.footer {
+		margin-top: 20px;
+		margin-left: 45%;
+	}
+	.el-table{
+		margin-top: 20px;
+	}
+	.el-pagination {
+		margin-top: 25px;
+	}
+	/deep/ #taskDetail{
+		.el-descriptions-item__label.is-bordered-label{
+		width: 18.75rem;}
+	}
+	/deep/ #addUnqualifiedJcx{
+		.el-form-item__label{
+			width: 15%;
+		}
+		.el-form-item__error{
+		left: 6.875rem;
+	}
+	}
+	// /deep/ #additems{
+
+	// 	.el-table__header{
+	// 		width: 100%;
+	// 	}
+	// }
+	// /deep/ #inputJcd{
+	// 	.el-upload__tip{
+	// 		margin-left: 7.1875rem;
+	// 	}
+	// }
+</style>

+ 47 - 16
src/components/jc/setTaskcd.vue

@@ -233,7 +233,7 @@
 					<el-table-column label="操作" align="center" fixed="right" width="350px">
 						<template slot-scope="scope">
 							<el-button style="margin:5px 5px" type="success" size="mini" plain
-								@click="getSamples(scope.row.id)">获取样品列表</el-button>
+								@click="getSamplesLists(scope.row.id)">获取样品列表</el-button>
 							
 							<!-- <el-button style="margin:5px 5px" type="primary" size="mini" plain @click="creatpdf(scope.row.sample_id)">生成检测报告
 							</el-button> -->
@@ -294,7 +294,7 @@
 					</el-col>
 					<el-col :span="6">
 					<el-form-item label="检测结果:" prop="jcd_result" class="labelItem">
-						<el-radio-group v-model="jcd.jcd_result" @change="jcResult()">
+						<el-radio-group v-model="jcd.jcd_result">
 							<el-radio :label="1">合格</el-radio>
 							<el-radio :label="0">不合格</el-radio>
 						</el-radio-group>
@@ -325,9 +325,26 @@
 			<div style="display: flex;flex-direction: row;float: right;margin-bottom: 10px;" v-show="jcd.jcd_result==0">
 				<el-button type="success" size="small" plain @click="addJcxItemDialog = true">新增不合格项</el-button>
 			</div>
-				<!--  表格数据区域-->
-			<el-table ref="multipleTable" :data="jcxItems" border stripe highlight-current-row style="margin:auto;"
-				:row-style="rowStyle" :cell-style="cellStyle" v-show="jcd.jcd_result==0">
+			<div  v-show="jcd.jcd_result==0" id="additems">
+			<!--  表格数据区域-->
+			<el-table border :data="jcxItems" >
+				<el-table-column type="selection"></el-table-column>
+				<el-table-column label="序号">
+					<template slot-scope="scope">
+						{{scope.$index+1}}
+					</template>
+				</el-table-column>
+				<el-table-column :key="table.label" v-for="table in jcxHeader" :label="table.label" :prop="table.prop" align="center"></el-table-column>
+				<el-table-column label="操作" align="center">
+					<template slot-scope="scope">
+						<el-col>
+							<el-button type="success" size="mini" @click="delJcdItem(scope.row.id)">删除</el-button>
+						</el-col>
+					</template>
+				</el-table-column>
+			</el-table>
+			<!-- <el-table ref="multipleTable" :data="jcxItems" border stripe highlight-current-row style="margin:auto;width:100%;"
+				:row-style="rowStyle" :cell-style="cellStyle">
 				<el-table-column type="selection" width="50px"></el-table-column>
 				<el-table-column label="序号" width="50px">
 					<template slot-scope="scope">
@@ -344,7 +361,15 @@
 						</el-col>
 					</template>
 				</el-table-column>
-			</el-table>
+			</el-table> -->
+
+			<!--    分页器区域-->
+			<el-pagination @size-change="handleSizeChange2" @current-change="handleCurrentChange2"
+				:current-page="queryInfo2.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo2.pageSize"
+				layout="total, sizes, prev, pager, next, jumper" :total="jcxItemTotal" background />
+		
+			</div>
+
 			
 <!-- 
 				<el-table :data="jcxItems" border stripe highlight-current-row style="width: 100%;"
@@ -368,10 +393,7 @@
 					</el-table-column>
 				</el-table> -->
 
-				<!--    分页器区域-->
-				<el-pagination @size-change="handleSizeChange2" @current-change="handleCurrentChange2"
-					:current-page="queryInfo2.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo2.pageSize"
-					layout="total, sizes, prev, pager, next, jumper" :total="jcxItemTotal" background  v-show="jcd.jcd_result==0" />
+				
 
 		
 			<div class="footer">
@@ -588,7 +610,7 @@
 				jcxItemTotal: 0,
 				samplesListTotal: 0,
 				activeName: 'first',
-				jcxItems: {},
+				jcxItems: [],
 				id: 0,
 				jcd: {
 					jcd_result: 1,
@@ -854,7 +876,6 @@
 						this.tableData1[i].status = '已上报'
 					}
 				}
-				console.log(this.tableData1[0].cyd_status)
 				this.jcdListTotal = res.data.total
 				
 			},
@@ -878,7 +899,6 @@
 						this.tableData[i].status = '已上报'
 					}
 				}
-				console.log(this.tableData[0].status)
 				this.total = res.data.total	
 			},
 
@@ -890,9 +910,14 @@
 
 			},
 			//检测单列表中获取样品信息列表
-			async getSamples(id) {
+			async getSamplesLists(id){
 				let that = this
 				that.ypqueryInfo['cyd_id'] = id
+				this.getSamples()
+			},
+			async getSamples() {
+				let that = this
+				// that.ypqueryInfo['cyd_id'] = id
 				const res = await this.$http.post('getSamples',that.ypqueryInfo)
 				console.log(res.data.data.rows)
 				that.yptableData = res.data.data.rows
@@ -1278,13 +1303,13 @@
 			/** 监听每页显示多少数据的改变 */
 			handleSizeChange1(newSize) {
 				this.queryInfo1.pageSize = newSize
-				this.getJcdList()
+				this.getJcds()
 			},
 
 			/** 监听页码的改变 */
 			handleCurrentChange1(newPage) {
 				this.queryInfo1.pageNum = newPage
-				this.getJcdList()
+				this.getJcds()
 			},
 				/** 监听每页显示多少数据的改变 */
 			handleSizeChange2(newSize) {
@@ -1404,6 +1429,12 @@
 		left: 6.875rem;
 	}
 	}
+	// /deep/ #additems{
+
+	// 	.el-table__header{
+	// 		width: 100%;
+	// 	}
+	// }
 	// /deep/ #inputJcd{
 	// 	.el-upload__tip{
 	// 		margin-left: 7.1875rem;

+ 1 - 1
src/components/jc/specialMonitorcd.vue

@@ -6,7 +6,7 @@
 				<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>

+ 72 - 34
src/components/jc/subjectInformation.vue

@@ -9,95 +9,92 @@
 			</div>
 
         <div id="ztinformation" style="margin:40px auto; width:60%">
-			<el-form :rules="rules" :model="inspected_Unit">
+			<el-form :model="ztinfo" style="width:100%">
                  <el-row style="text-align: center; font-size: 23px; margin: 40px 0;">
                         主体信息维护
                 </el-row>
 				<el-form-item label="单位名称:" prop="user_id.name" class="labelItem">
-					<el-input v-model="ztinfo.user_id.name" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.user_id.name" class="input"></el-input>
 				</el-form-item>
-				<el-form-item label="单位地址:" prop="address." class="labelItem">	
+				<el-form-item label="单位地址:" prop="address" class="labelItem">	
 						<!-- <el-cascader placeholder="请选择地区" :options="options" v-model="selectedOptions" @change="handleChange" style="width:15%">
 						</el-cascader> -->
-						<el-input v-model="ztinfo.address" placeholder="请输入详细地址" style="width:42%;margin-left:5px;"></el-input>
+						<el-input v-model="ztinfo.address" placeholder="请输入详细地址" class="input"></el-input>
 				</el-form-item>
 				
 				<!-- <el-form-item label="" prop="inspected_address2" class="labelItem">	
 						<el-input v-model="inspected_Unit.inspected_address" placeholder="请输入详细地址" style="width:42%"></el-input>
 				</el-form-item> -->
                 <el-form-item label="法人代表:" prop="user_fa" class="labelItem">
-					<el-input v-model="ztinfo.user_fa" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.user_fa" class="input"></el-input>
 				</el-form-item>
 				<el-form-item label="联系人:" prop="user_id.contact_name" class="labelItem">
-					<el-input v-model="ztinfo.user_id.contact_name" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.user_id.contact_name" class="input"></el-input>
 				</el-form-item>
 				<el-form-item label="联系电话:" prop="user_id.contact_phone" class="labelItem">
-					<el-input v-model="ztinfo.user_id.contact_phone" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.user_id.contact_phone" class="input"></el-input>
 				</el-form-item>
                 <el-form-item label="QQ:" prop="user_id.contact_qq" class="labelItem">
-					<el-input v-model="ztinfo.user_id.contact_qq" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.user_id.contact_qq" class="input"></el-input>
 				</el-form-item>
 				<el-form-item label="Email:" prop="user_id.contact_mail" class="labelItem">
-					<el-input v-model="ztinfo.user_id.contact_mail" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.user_id.contact_mail" class="input"></el-input>
 				</el-form-item>
                 <el-form-item label="依托单位:" prop="dtRelyOnUnit" class="labelItem">
-					<el-input v-model="ztinfo.dtRelyOnUnit" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.dtRelyOnUnit" class="input"></el-input>
 				</el-form-item>
                 <el-form-item label="机构性质:" prop="jgxz" class="labelItem">
-					<el-input v-model="ztinfo.jgxz" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.jgxz" class="input" disabled></el-input>
 				</el-form-item>
                 <el-form-item label="统一社会信用代码:" prop="dtCode" class="labelItem">
-					<el-input v-model="ztinfo.dtCode" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.dtCode" class="input" disabled></el-input>
 				</el-form-item>
                 <el-form-item label="所属区域:" prop="ssqy" class="labelItem">
-					<el-input v-model="ztinfo.ssqy" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.ssqy" class="input"></el-input>
 				</el-form-item>
                 <el-form-item label="邮编:" prop="zipcode" class="labelItem">
-					<el-input v-model="ztinfo.zipcode" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.zipcode" class="input"></el-input>
 				</el-form-item>
                 <el-form-item label="技术负责人姓名:" prop="user_js" class="labelItem">
-					<el-input v-model="ztinfo.user_js" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.user_js" class="input"></el-input>
 				</el-form-item>
                 <el-form-item label="质量负责人姓名:" prop="user_zl" class="labelItem">
-					<el-input v-model="ztinfo.user_zl" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.user_zl" class="input"></el-input>
 				</el-form-item>
                 <el-form-item label="资质情况:" prop="zizhi" class="labelItem">
-					<el-input v-model="ztinfo.zizhi" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.zizhi" class="input"></el-input>
 				</el-form-item>
                 <el-form-item label="catl证书编号:" prop="catl_code" class="labelItem">
-					<el-input v-model="ztinfo.catl_code" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.catl_code" class="input" disabled></el-input>
 				</el-form-item>
                 <el-form-item label="catl到期时间:" prop="calt_expiration" class="labelItem">
-					<el-input v-model="ztinfo.calt_expiration" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.calt_expiration" class="input" disabled></el-input>
 				</el-form-item>
                 <el-form-item label="cma证书编号:" prop="cma_code" class="labelItem">
-					<el-input v-model="ztinfo.cma_code" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.cma_code" class="input" disabled></el-input>
 				</el-form-item>
                 <el-form-item label="cma到期时间:" prop="cma_code" class="labelItem">
-					<el-input v-model="ztinfo.cma_code" style="width:42%"></el-input>
-				</el-form-item>
-                <el-form-item label="cma证书编号:" prop="cma_expiration" class="labelItem">
-					<el-input v-model="ztinfo.cma_expiration" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.cma_code" class="input" disabled></el-input>
 				</el-form-item>
                 <el-form-item label="农业农村部认可编号:" prop="mara_code" class="labelItem">
-					<el-input v-model="ztinfo.cma_code" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.cma_code" class="input" disabled></el-input>
 				</el-form-item>
                 <el-form-item label="农业农村部到期时间:" prop="mara_expiration" class="labelItem">
-					<el-input v-model="ztinfo.mara_expiration" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.mara_expiration" class="input" disabled></el-input>
 				</el-form-item>
                 <el-form-item label="产品范围:" prop="cpfw" class="labelItem">
-					<el-input v-model="ztinfo.cpfw" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.cpfw" class="input"></el-input>
 				</el-form-item>
                 <el-form-item label="认证产品数量:" prop="shuliang" class="labelItem">
-					<el-input v-model="ztinfo.shuliang" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.shuliang" class="input"></el-input>
 				</el-form-item>
                 <el-form-item label="认证参数数量:" prop="canshu" class="labelItem">
-					<el-input v-model="ztinfo.canshu" style="width:42%"></el-input>
+					<el-input v-model="ztinfo.canshu" class="input"></el-input>
 				</el-form-item>
 			</el-form>
 
 			<div class="footer">
-				<el-button type="success" style="margin-bottom:30px;" size="small" @click="next1()">保存</el-button>
+				<el-button type="success" style="margin-bottom:30px;" size="small" @click="save()">保存</el-button>
 			</div>
 		</div>
     </div>
@@ -110,12 +107,15 @@
 			return {
 				pageNum:1,
                 pageSize: 2,
-                ztinfo:''
+                ztinfo:{
+					user_id: [],
+				}
+					
+				
 			}
 		},
 
-		mounted: function() {
-			
+		mounted() {
 		},
 		created(){
             this.getOrganization()
@@ -135,9 +135,21 @@
                 const result = await this.$http.post('getOrganization')
                 console.log(result.data.data)
                 this.ztinfo = result.data.data
-            }
+            },
+			async save(){
+			console.log(111)
+			const result = await this.$http.post('putJcjgOrganization',this.ztinfo)
+			if (result.data.code == 0) {
+					this.$message({
+						type: 'success',
+						message: '修改成功'
+					})
+					this.getOrganization()
+				}
+		}
         },
 	
+	
 	}
 </script>
 
@@ -172,6 +184,32 @@
 		-webkit-box-sizing: border-box;
 		box-sizing: border-box;
 	}
+	/deep/ #ztinformation{
+		.el-form-item{
+			margin-left: 90px;
+		}
+		.input{
+			width: 48%;
+		}
+		.el-form-item__label{
+			width: 9.375rem;
+			text-align: right;
+			margin-right: .9375rem;
+		}
+	}
+	// .labelItem /deep/ .el-form-item__label {
+	// 	// width: 80px;
+	// 	text-align: center;
+	// 	vertical-align: middle;
+	// 	float: left;
+	// 	font-size: 14px;
+	// 	color: #606266;
+	// 	font-weight: bold;
+	// 	// line-height: 40px;
+	// 	padding: 0 20px 0 0;
+	// 	-webkit-box-sizing: border-box;
+	// 	box-sizing: border-box;
+	// }
     .footer {
 		margin-left: 45%;
 		margin-top: 20px;

+ 1 - 1
src/components/login.vue

@@ -7,7 +7,7 @@
 				安徽省农产品质量安全监测系统
 			</div>
 		</el-header>
-		<el-form class="form" ref="loginForm" :model="loginForm" label-position="top" :rules="rulesLoginForm" label-width="70px">
+		<el-form class="form" ref="loginForm" :model="loginForm" label-position="top" :rules="rulesLoginForm" label-width="70px" @keyup.enter="submitForm">
 			<!-- 	<el-radio v-model="loginForm.user_flag" label="1">监管机构</el-radio>
 			<el-radio v-model="loginForm.user_flag" label="2">检测机构</el-radio> -->
 			<el-form-item  prop="login_name">

+ 4 - 0
src/router/index.js

@@ -253,6 +253,10 @@ const routes = [{
 			path: '/jc/setReturnTask',
 			name:'setReturnTask',
 			component: () => import('../components/jc/setReturnTask')
+		},{
+			path: '/jc/setReturnTasks',
+			name:'setReturnTasks',
+			component: () => import('../components/jc/setReturnTasks')
 		}
 		]
 	},{