lims-ruoyi-before.git

			@@ -3,17 +3,17 @@
			<div class="search">
			<div>
			<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
			<el-form-item label="实验室名称" prop="laboratoryName">
			<el-form-item label="行业名称" prop="laboratoryName">
			<el-input size="small" placeholder="请输入" clearable v-model="queryParams.laboratoryName"
			@keyup.enter.native="refreshTable"></el-input>
			</el-form-item>
			<el-form-item label="实验室编码" prop="laboratoryNumber">
			<el-form-item label="行业编码" prop="laboratoryNumber">
			<el-input size="small" placeholder="请输入" clearable v-model="queryParams.laboratoryNumber"
			@keyup.enter.native="refreshTable"></el-input>
			</el-form-item>
			<el-form-item>
			<el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">查询</el-button>
			<el-button icon="el-icon-refresh" size="mini" @click="refresh">重置</el-button>
			<el-button type="primary" size="mini" @click="refreshTable">查询</el-button>
			<el-button size="mini" @click="refresh">重置</el-button>
			</el-form-item>
			</el-form>
			</div>
			@@ -25,17 +25,17 @@
			<lims-table :tableData="tableData" :column="column" :height="'calc(100vh - 250px)'" @pagination="pagination"
			:page="page" :tableLoading="tableLoading"></lims-table>
			</div>
			<!-- 新增实验室-->
			<!-- 新增行业-->
			<el-dialog :title="formTitle" :visible.sync="addDia" width="450px">
			<el-form ref="laboratoryForm" :model="laboratoryForm" :rules="userRules" label-position="right"
			label-width="100px">
			<el-form-item label="实验室名称" prop="laboratoryName">
			<el-form-item label="行业名称" prop="laboratoryName">
			<el-input v-model="laboratoryForm.laboratoryName" size="small" clearable></el-input>
			</el-form-item>
			<el-form-item label="场所编码" prop="laboratoryNumber">
			<el-input v-model="laboratoryForm.laboratoryNumber" size="small" clearable></el-input>
			</el-form-item>
			<el-form-item label="实验室代号" prop="laboratoryCode">
			<el-form-item label="行业代号" prop="laboratoryCode">
			<el-input v-model="laboratoryForm.laboratoryCode" size="small" clearable></el-input>
			</el-form-item>
			<el-form-item label="负责人" prop="head">
			@@ -67,9 +67,9 @@
			placeholder="请选择" size="small" style="width:100%" collapse-tags clearable></el-cascader>
			</el-form-item>
			<el-form-item label="印章图片" prop="address">
			<el-upload class="avatar-uploader" :action="action" :headers="headers" accept='image/jpg,image/jpeg,image/png'
			:show-file-list="false" :on-success="handleSuccess" :on-change="beforeUpload" ref="upload"
			:on-error="onError">
			<el-upload class="avatar-uploader" :action="action" :headers="uploadHeader"
			accept='image/jpg,image/jpeg,image/png' :show-file-list="false" :on-success="handleSuccess"
			:on-change="beforeUpload" ref="upload" :on-error="onError">
			<img v-if="dataForm.address" :src="javaApi + '/img/' + dataForm.address" class="avatar">
			<i v-else class="el-icon-plus avatar-uploader-icon"></i>
			</el-upload>
			@@ -94,20 +94,14 @@
			upParameter
			} from "@/api/structural/laboratoryScope";
			import { getCertificationDetail } from "@/api/structural/laboratory";
			import { getToken } from "@/utils/auth";
			export default {
			components: {
			limsTable

			},
			computed: {
			headers() {
			return {
			'Authorization': "Bearer " + getToken()
			}
			},
			action() {
			return this.javaApi
			return this.javaApi + '/deviceScope/uploadFile'
			}
			},
			data() {
			@@ -119,9 +113,9 @@
			tableData: [],
			tableLoading: false,
			column: [
			{ label: '实验室名称', prop: 'laboratoryName' },
			{ label: '行业名称', prop: 'laboratoryName' },
			{ label: '场所编码', prop: 'laboratoryNumber' },
			{ label: '实验室代号', prop: 'laboratoryCode' },
			{ label: '行业代号', prop: 'laboratoryCode' },
			{ label: '负责人', prop: 'head' },
			{ label: '负责人电话', prop: 'phoneNumber' },
			{ label: '地址', prop: 'address' },
			@@ -129,9 +123,7 @@
			{ label: '创建时间', prop: 'createTime' },
			{
			dataType: 'action',
			fixed: 'right',
			label: '操作',
			width: '180px',
			operation: [
			{
			name: '编辑',
			@@ -169,7 +161,7 @@
			},
			operationType: '',
			userRules: {
			laboratoryName: [{ required: true, message: '请输入实验室名称', trigger: 'blur' }],
			laboratoryName: [{ required: true, message: '请输入行业名称', trigger: 'blur' }],
			laboratoryNumber: [{ required: true, message: '请输入场所编码', trigger: 'blur' }],
			head: [{ required: true, message: '请输入负责人', trigger: 'blur' }],
			phoneNumber: [{ required: true, message: '请输入负责人电话', trigger: 'blur' }],
			@@ -178,7 +170,7 @@
			fileComponentTableLoading: false,
			fileComponentData: [],
			fileComponentDataColumn: [
			{ label: '实验室名称', prop: 'laboratoryName' },
			{ label: '行业名称', prop: 'laboratoryName' },
			{ label: '印章图片', prop: 'address', dataType: 'image' },
			{ label: '印章类型', prop: 'type' },
			],
			@@ -202,8 +194,8 @@
			props: { multiple: false, emitPath: false, },
			options: [
			{
			value: '实验室资质',
			label: '实验室资质',
			value: '行业资质',
			label: '行业资质',
			children: []
			},
			{
			@@ -246,14 +238,14 @@
			this.refreshTable()
			},
			openAdd(type, row) {
			this.formTitle = type === 'add' ? '新增实验室' : '编辑实验室'
			this.formTitle = type === 'add' ? '新增行业' : '编辑行业'
			this.operationType = type
			if (type === 'edit') {
			this.laboratoryForm = this.HaveJson(row)
			}
			this.addDia = true
			},
			// 提交新增、编辑实验室表单
			// 提交新增、编辑行业表单
			customAdd() {
			this.$refs['laboratoryForm'].validate((valid) => {
			if (valid) {
			@@ -286,7 +278,7 @@
			this.resetForm('laboratoryForm')
			this.addDia = false
			},
			// 删除实验室
			// 删除行业
			delete(row) {
			this.$confirm('是否删除当前数据?', "警告", {
			confirmButtonText: "确定",
			@@ -296,8 +288,6 @@
			delParameter({ id: row.id }).then(res => {
			this.$message.success('删除成功')
			this.refreshTable()
			}).catch(e => {
			this.$message.error('删除失败')
			})
			}).catch(() => { })
			},