tx-lims-before.git

			@@ -162,7 +162,7 @@
			</el-col>
			<!-- 右边布局 -->
			<el-col :span="7">
			<el-form :label-position="labelPosition" :model="formData" label-width="120px" ref="ruleForm">
			<el-form :label-position="labelPosition" :model="formData" label-width="140px" ref="ruleForm">
			<!-- 实验室列表 -->
			<el-form-item label="所属部门:">
			<el-select :disabled="isUp" v-model="formData.subordinateDepartmentsId" placeholder="请选择" size="small" style="width:100%">
			@@ -421,7 +421,7 @@
			</el-row>
			</span>
			</el-dialog>
			<dataAcquisitionConfig v-if="showData" :tableList="tableList"/>
			<dataAcquisitionConfig v-if="showData" :deviceId="deviceId"/>
			</div>
			</template>

			@@ -435,6 +435,16 @@
			},
			data() {
			return {
			deviceId: '',
			fileTypeOptions: [
			{label: 'csv', value: '.csv'},
			{label: 'db', value: '.db'},
			{label: 'mdb', value: '.mdb'},
			{label: 'word', value: '.docx'},
			{label: 'excel', value: '.xlsx'},
			{label: 'txt', value: '.txt'},
			{label: 'png', value: '.png'},
			],
			//是否是档案修订 true不是 false是
			isUp: true,
			formData: {
			@@ -519,7 +529,8 @@
			}
			},
			requiredAdd: [],
			requiredUp: []
			requiredUp: [],
			needSort: ['deviceName', 'acquisitionDate', 'activationDate', 'lastCalibrationDate', 'nextCalibrationDate', 'deviceStatus'],
			},
			entityCopy: {},
			upIndex: 0,
			@@ -574,8 +585,8 @@
			this.subordinateDepartmentsList = data
			})
			},
			refreshTable() {
			this.$refs['ValueTable'].selectList()
			refreshTable(e) {
			this.$refs['ValueTable'].selectList(e)
			},
			refresh() {
			this.componentData.entity = this.HaveJson(this.entityCopy)
			@@ -798,7 +809,7 @@
			}
			this.$message.success('修改成功')
			this.upLoad = false
			this.refreshTable()
			this.refreshTable('page')
			this.dialogVisible = false
			}).catch(e => {
			this.$message.error('修改失败')
			@@ -848,7 +859,7 @@
			}
			this.$message.success('提交成功')
			this.upLoad2 = false
			this.refreshTable()
			this.refreshTable('page')
			this.dialogVisible2 = false
			this.formData2 = {
			imageUpload: '',
			@@ -877,6 +888,7 @@
			list2.push(obj)
			})
			this.tableList = list2
			this.deviceId = row.id
			},
			closeDataVue () {
			this.showData = false
			@@ -918,7 +930,7 @@
			return
			}
			this.$message.success('操作成功')
			this.refreshTable()
			this.refreshTable('page')
			this.dialogVisible3 = false
			}).catch(e => {
			this.$message.error('操作失败')