tx-lims-before.git

			@@ -350,7 +350,7 @@
			</el-form-item>
			<el-form-item label="当前状态:">
			<el-select v-model="formData2.deviceStatus" placeholder="请选择" size="small" style="width:100%">
			<el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
			<el-option v-for="item in deviceStatusList" :key="item.id" :label="item.label" :value="item.value">
			</el-option>
			</el-select>
			</el-form-item>
			@@ -552,6 +552,11 @@
			category: "设备状态"
			}).then(res => {
			this.deviceStatusList = res.data
			this.deviceStatusList.forEach(a=>{
			if(!isNaN(a.value)){
			a.value = parseInt(a.value)
			}
			})
			this.componentData.tagField.deviceStatus.select = res.data
			})
			this.$axios.post(this.$api.enums.selectEnumByCategory, {
			@@ -581,7 +586,7 @@
			this.componentData.tagField.insProductIds.select = []
			this.componentData.selectField.insProductIds.select = []
			this.options = res.data.map((m,i)=>{
			m.id = i;
			m.id = m.name;
			let children = m.children.map(n=>{
			n.label = n.name;
			n.value = n.id;
			@@ -628,6 +633,9 @@
			//row = 点击对应行值一行值
			//复制给formData
			this.formData = this.HaveJson(row);
			if(typeof(row.insProductIds)==='number'){
			row.insProductIds = row.insProductIds+''
			}
			this.formData.insProductIds = row.insProductIds ? row.insProductIds.split(',') : [];
			},
			beforeUpload(file) {
			@@ -659,12 +667,12 @@
			}
			},
			submitForm() {
			this.upLoad = true;
			delete this.formData.createTime
			delete this.formData.updateTime
			delete this.formData.createUser
			delete this.formData.updateUser
			this.formData.insProductIds = this.formData.insProductIds.join()
			this.upLoad = true;
			this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, {
			headers: {
			'Content-Type': 'application/json'
			@@ -686,7 +694,7 @@
			},
			submitForm2() {
			this.upLoad2 = true;
			this.formData.insProductIds = this.formData.insProductIds.join()
			this.formData2.insProductIds = this.formData2.insProductIds.join()
			this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
			headers: {
			'Content-Type': 'application/json'