From 2a9256b4a3121c3f9eeb25a1b1ca24e5c3eb2f49 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 七月 2024 14:41:56 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/a6-device-management.vue | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index c9a0423..b687008 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -225,7 +225,7 @@
</el-upload>
</div>
</el-form-item>
- <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:" required>
+ <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
<el-select :disabled="isUp" v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
<el-option v-for="item in fileTypeOptions"
:key="item.value"
@@ -233,7 +233,7 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="閲囬泦鍦板潃:" required clearable>
+ <el-form-item label="閲囬泦鍦板潃:" clearable>
<el-input :disabled="isUp" v-model="formData.collectUrl"></el-input>
</el-form-item>
<el-form-item label="鍌ㄥ瓨鍦板潃:">
@@ -382,7 +382,7 @@
</el-upload>
</div>
</el-form-item>
- <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:" required>
+ <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
<el-select v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
<el-option v-for="item in fileTypeOptions"
:key="item.value"
@@ -390,7 +390,7 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="閲囬泦鍦板潃:" required clearable>
+ <el-form-item label="閲囬泦鍦板潃:" clearable>
<el-input v-model="formData.collectUrl"></el-input>
</el-form-item>
<el-form-item label="鍌ㄥ瓨鍦板潃:">
@@ -438,7 +438,7 @@
v-model="configForm.y"></el-input>
</div>
<div class="search_thing">
- <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鍏紡锛�</div>
+ <div class="search_label">鍏紡锛�</div>
<el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="configForm.formula"></el-input>
</div>
@@ -611,8 +611,8 @@
this.subordinateDepartmentsList = data
})
},
- refreshTable() {
- this.$refs['ValueTable'].selectList()
+ refreshTable(e) {
+ this.$refs['ValueTable'].selectList(e)
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -699,6 +699,23 @@
this.componentData.tagField.insProductIds.select = [...this.componentData.tagField.insProductIds.select,...children]
this.componentData.selectField.insProductIds.select = [...this.componentData.selectField.insProductIds.select,...children]
return m
+ })
+ this.options.forEach(item=>{
+ if(item.children.length==0){
+ item.children = null;
+ }else{
+ item.children.forEach(m=>{
+ if(m.children.length==0){
+ m.children = null;
+ }else{
+ m.children.forEach(n=>{
+ if(n.children&&n.children.length==0){
+ n.children = null;
+ }
+ })
+ }
+ })
+ }
})
})
},
@@ -801,14 +818,6 @@
this.$message.error('鏈緭鍏ユ牎鍑嗗懆鏈燂紙鏈堬級')
return
}
- if(!this.formData.fileType){
- this.$message.error('鏈�夋嫨鏂囦欢鍚庣紑锛�')
- return
- }
- if(!this.formData.collectUrl){
- this.$message.error('璇疯緭鍏ラ噰闆嗗湴鍧�锛�')
- return
- }
delete this.formData.createTime
delete this.formData.updateTime
delete this.formData.createUser
@@ -826,7 +835,7 @@
}
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible = false
}).catch(e => {
this.$message.error('淇敼澶辫触')
@@ -863,14 +872,6 @@
this.$message.error('杈撳叆鏍″噯鍛ㄦ湡锛堟湀锛�')
return
}
- if(!this.formData2.fileType){
- this.$message.error('鏈�夋嫨鏂囦欢鍚庣紑锛�')
- return
- }
- if(!this.formData2.collectUrl){
- this.$message.error('璇疯緭鍏ラ噰闆嗗湴鍧�锛�')
- return
- }
this.upLoad2 = true;
this.formData2.insProductIds = this.formData2.insProductIds.join()
this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
@@ -884,7 +885,7 @@
}
this.$message.success('鎻愪氦鎴愬姛')
this.upLoad2 = false
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible2 = false
this.formData2 = {
imageUpload: '',
@@ -942,10 +943,6 @@
this.$message.error('璇峰～鍐橸');
return
}
- if(!this.configForm.formula){
- this.$message.error('璇峰～鍐欏叕寮�');
- return
- }
this.upLoad3 = true
this.$axios.post(this.$api.deviceScope.numberCollect, this.configForm, {
@@ -958,7 +955,7 @@
return
}
this.$message.success('鎿嶄綔鎴愬姛')
- this.refreshTable()
+ this.refreshTable('page')
this.dialogVisible3 = false
}).catch(e => {
this.$message.error('鎿嶄綔澶辫触')
--
Gitblit v1.9.3