new-LIMS-before.git

			@@ -69,10 +69,10 @@
			<div class="section-title" style="margin-top: 0;">基本信息</div>
			<el-form :label-position="labelPosition" :model="formData" label-width="120px">
			<div class="form-row">
			<el-form-item label="仪器名称:" required prop="deviceName">
			<el-form-item label="设备名称:" required prop="deviceName">
			<el-input :disabled="isUp" v-model="formData.deviceName" size="small"></el-input>
			</el-form-item>
			<el-form-item label="仪器名称EN:">
			<el-form-item label="设备EN名称:">
			<el-input :disabled="isUp" v-model="formData.enDeviceName" size="small"></el-input>
			</el-form-item>
			</div>
			@@ -273,10 +273,10 @@
			<div class="section-title" style="margin-top: 0;">基本信息</div>
			<el-form :label-position="labelPosition" :model="formData2" label-width="120px">
			<div class="form-row">
			<el-form-item label="仪器名称:" required>
			<el-form-item label="设备名称:" required>
			<el-input v-model="formData2.deviceName" size="small"></el-input>
			</el-form-item>
			<el-form-item label="仪器名称EN:">
			<el-form-item label="设备EN名称:">
			<el-input v-model="formData2.enDeviceName" size="small"></el-input>
			</el-form-item>
			</div>
			@@ -494,7 +494,7 @@
			tableData: [],
			column: [
			{ label: "设备名称", prop: "deviceName", dataType: 'link', linkMethod: 'selectAllByOne' },
			{ label: "设备名称EN", prop: "enDeviceName" },
			{ label: "设备EN名称", prop: "enDeviceName" },
			{
			label: "规格型号",
			prop: "specificationModel",
			@@ -560,6 +560,8 @@
			{
			name: "数采配置",
			type: "text",
			// 数采功能尚未实现，暂时对所有用户隐藏
			showHide: () => false,
			clickFun: (row) => {
			this.handleConfig(row);
			},
			@@ -831,6 +833,8 @@
			this.formData[key] = `${this.formData[key]} 00:00:00`
			}
			})
			// 打开弹窗时按已有的最近日期和周期重算下次日期，避免要重新选择日期才计算
			this.calcNextDate(this.formData)
			},
			beforeUpload(file) {
			if (file.size > 1024 * 1024 * 10) {
			@@ -888,7 +892,7 @@
			},
			submitForm() {
			if (!this.formData.deviceName) {
			this.$message.error('未输入仪器名称')
			this.$message.error('未输入设备名称')
			return
			}
			if (!this.formData.specificationModel) {
			@@ -937,7 +941,7 @@
			// 提交档案修订--新增
			submitForm2() {
			if (!this.formData2.deviceName) {
			this.$message.error('未输入仪器名称')
			this.$message.error('未输入设备名称')
			return
			}
			if (!this.formData2.specificationModel) {