Skip to content

P
pc
Commit 4473f353 authored by levante's avatar levante
Browse files
Options

修复第一组可删除的bug

parent b5716fc5
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 27 deletions
src/views/label/labelRightSide.vue
View file @ 4473f353
......@@ -3,21 +3,25 @@
<div>
<a-row>
<!-- <a-col :span='1' v-if="triggerType == 'create'"> -->
<a-col :span='1'>
<div class="detailOperations">
<a-button @click="backPage"> 返回 </a-button>
</div>
</a-col>
<a-col :span='1' v-if="triggerType !== 'create' && triggerType !== 'loadParentLabel'" :offset='1'>
<a-button type='danger' @click="deleteLabel(labelId)">删除</a-button>
</a-col>
<a-col :span='1' :offset='1'>
<a-button type='primary' @click="preview()">预览</a-button>
</a-col>
<a-col :span='1' :offset='1'>
<a-button type='primary' @click="save()">保存</a-button>
</a-col>
<a-col :span='19'></a-col>
<a-col :span='16'>
<a-row>
<a-col :span='1'>
<div class="detailOperations">
<a-button @click="backPage"> 返回 </a-button>
</div>
</a-col>
<a-col :span='1' v-if="triggerType !== 'create' && triggerType !== 'loadParentLabel'" :offset='1'>
<a-button type='danger' @click="deleteLabel(labelId)">删除</a-button>
</a-col>
<a-col :span='1' :offset='1'>
<a-button type='primary' @click="preview()">预览</a-button>
</a-col>
<a-col :span='1' :offset='1'>
<a-button type='primary' @click="save()">保存</a-button>
</a-col>
<a-col :span='18'></a-col>
</a-row>
</a-col>
</a-row>
</div>
<a-divider type='horizontal' />
......@@ -72,24 +76,40 @@
<a-form :form='infoSettingForm' layout='inline'>
<div v-for="(item66, index66) in loopContent.data" :key="index66" style="margin-top: 20px; padding: 20px; border: 1px solid lightgrey">
<!-- {{index66}} -->
<a-row type='flex' style="font-weight: bold; font-size: 16px; margin-bottom: 20px; border-bottom: 1px solid lightgrey" align='middle'>
<a-col :span='21'>
<span style="font-weight: bold">条件分组{{index66+1}}</span>
</a-col>
<a-col :span='3'>
<a-col :span='3' v-if="index66 !== 0">
<a-button style="color: darkred" type="link" @click="delGroup(index66)"><a-icon type="delete" />删除分组 </a-button>
</a-col>
</a-row>
<div style="width: 90%; padding: 20px; margin-bottom: 20px">
<div v-for="(item, index) in item66.labelSelConditionList" :key='index' style="margin-bottom: 20px">
<a-form-item>
<a-row>
<a-form-item v-if="index == 0 && index66 !== 0" style="margin-bottom: 20px">
<a-select style="width: 80px" placeholder='与上组关系' v-decorator="['relationWithGroup-' + index66 + '-0',{initialValue: item66.relation, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
<a-select-option value='and'>与</a-select-option>
<a-select-option value='or'>或</a-select-option>
<a-select-option value='ne'>非</a-select-option>
</a-select>
</a-form-item>
<!-- <a-form-item v-if="index == 0">
<a-input style="width: 80px" placeholder='分组名' v-decorator="['groupName-' + index66,{initialValue: getInitialValueTwo(item.val), validateTrigger:'blur',rules: []}]"></a-input>
</a-form-item> -->
</a-row>
<a-form-item v-if="index !== 0">
<a-select style="width: 80px" placeholder='请选择条件' v-decorator="['relation-' + index66 +'-' + index,{initialValue: item.relation, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
<a-select-option value='and'>与</a-select-option>
<a-select-option value='or'>或</a-select-option>
<a-select-option value='ne'>非</a-select-option>
</a-select>
</a-form-item>
<a-form-item v-else style="width: 80px">
</a-form-item>
<a-form-item>
<a-select style="width: 80px" placeholder='请选择标记对象' v-decorator="['tableName-' + index66 +'-' + index,{initialValue: item.tableName, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
......@@ -121,7 +141,6 @@
{{infoSettingForm.getFieldValue('tableName-' + index66 +'-' + index)}}
{{infoSettingForm.getFieldValue('key-' + index66 +'-' + index)}} -->
<a-form-item v-if="checkIfSelectOptionAppears(availableKeyList, infoSettingForm.getFieldValue('tableName-' + index66 +'-' + index), infoSettingForm.getFieldValue('key-' + index66 +'-' + index))">
<!-- {{checkIfSelectOptionAppears(availableKeyList, infoSettingForm.getFieldValue('tableName-' + index66 +'-' + index), infoSettingForm.getFieldValue('key-' + index66 +'-' + index))}} -->
<!-- {{availableKeyList.find(item=>item.tblKey == 'stKind')}} -->
......@@ -410,11 +429,11 @@ export default {
},
methods: {
clearForm(formToClear) {
console.log(formToClear);
console.log(formToClear)
this.infoSettingForm.resetFields(formToClear)
},
getSelectedProperty(val) {
console.log(val);
console.log(val)
},
handleResultCancel() {
this.resultModalVisible = !this.resultModalVisible
......@@ -539,14 +558,14 @@ export default {
tableName: formData['tableName-' + i + '-'+index ],
val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
codition: formData['codition-' + i + '-' +index],
relation: formData['relation-' + i + '-' + index],
relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
selMet: formData['selMet-' + i + '-' + index]
})
})
innerResult.push({
'serial': 1,
'relation': formData['relation-' + i + '-0'],
'relation': !!formData['relationWithGroup-' + i + '-0']? formData['relationWithGroup-' + i + '-0']: 'and',
'labelSelConditionList': rowList
})
})
......@@ -791,14 +810,17 @@ export default {
tableName: formData['tableName-' + i + '-'+index ],
val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
codition: formData['codition-' + i + '-' +index],
relation: formData['relation-' + i + '-' + index],
relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
selMet: formData['selMet-' + i + '-' + index]
})
})
// console.log(!!formData['relationWithGroup-' + i + '-0']? formData['relationWithGroup-' + i + '-0']: 'and');
// relationWithGroup-0-0
innerResult.push({
'serial': 1,
'relation': formData['relation-' + i + '-0'],
'relation': !!formData['relationWithGroup-' + i + '-0']? formData['relationWithGroup-' + i + '-0']: 'and',
'labelSelConditionList': rowList
})
})
......@@ -865,14 +887,14 @@ export default {
tableName: formData['tableName-' + i + '-'+index ],
val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
codition: formData['codition-' + i + '-' +index],
relation: formData['relation-' + i + '-' + index],
relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
selMet: formData['selMet-' + i + '-' + index]
})
})
innerResult.push({
'serial': 1,
'relation': formData['relation-' + i + '-0'],
'relation': !!formData['relationWithGroup-' + i + '-0']? formData['relationWithGroup-' + i + '-0']: 'and',
'labelSelConditionList': rowList
})
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment