123

src/views/label/labelRightSide.vue

@@ -61,8 +61,9 @@
       </a-form-item>
     </a-form>
     <!-- <div style="background-color: #F0F2F5; height: 10px; "></div> -->
-    {{loopContent}}
+    <!-- {{loopContent}} -->
       <a-form :form='infoSettingForm' layout='inline'>
+        <!-- {{loopContent.data}} -->
         <div v-for="(item66, index66) in loopContent" :key="index66" style="margin-top: 20px; padding: 20px; border: 1px solid lightgrey">
           <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'>
@@ -72,6 +73,7 @@
               <a-button style="color: darkred" type="link" @click="delGroup(index66)"><a-icon type="delete" /> {{index66}}删除分组 </a-button>
             </a-col>
           </a-row>
+          {{item66}}
           <div v-if="JSON.stringify(loopContent[index66]) !== '[]'" style="width: 90%; padding: 20px; margin-bottom: 20px">
             <!-- <span v-if="index66 !== 'data'">与</span> -->
             <!-- {{item66}} -->
@@ -83,7 +85,8 @@
                   <a-select-option value='ne'>非</a-select-option>
                 </a-select>
               </a-form-item> -->
-
+              <!-- {{item}} -->
+              {{item}}
               <a-form-item>
                 <a-select style="width: 120px" placeholder='请选择条件' v-decorator="['relation-' + index66 +'-' + index,{initialValue: item.relation, validateTrigger:'blur',rules: []}]">
                   <a-select-option value='and'>与</a-select-option>
@@ -93,13 +96,13 @@
               </a-form-item>
 
               <a-form-item>
-                <a-select style="width: 120px" placeholder='请选择业务属性' v-decorator="['key-' + index66 +'-' + index,{initialValue: item.key, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
+                <a-select style="width: 120px" placeholder='请选择业务属性' v-decorator="['key-' + index66 +'-' + index,{initialValue: item.labelSelConditionList[0].key, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
                   <a-select-option v-for="(item1, index1) in availableKeyList" :key='index1' :value='item1.tblKey'>{{item1.tblKeyName}}</a-select-option>
                 </a-select>
               </a-form-item>
 
               <a-form-item>
-                <a-select style="width: 120px" placeholder='区间' v-decorator="['codition-' + index66 +'-' + index,{initialValue: item.codition, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
+                <a-select style="width: 120px" placeholder='区间' v-decorator="['codition-' + index66 +'-' + index,{initialValue: item.labelSelConditionList[0].codition, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
                   <a-select-option value='eq'>等于</a-select-option>
                   <a-select-option value='gt'>大于</a-select-option>
                   <a-select-option value='gte'>大于等于</a-select-option>
@@ -108,16 +111,16 @@
                   <a-select-option value='btw'>区间</a-select-option>
                 </a-select>
               </a-form-item>
-
+              <!-- {{item}} -->
               <a-form-item>
-                <a-input style="width: 120px" placeholder='请输入' v-decorator="['inputOne-' + index66 +'-' + index,{initialValue: getInitialValueOne(item.val), validateTrigger:'blur',rules: [],}]"></a-input>
+                <a-input style="width: 120px" placeholder='请输入' v-decorator="['inputOne-' + index66 +'-' + index,{initialValue: getInitialValueOne(item.labelSelConditionList[0].val), validateTrigger:'blur',rules: [],}]"></a-input>
               </a-form-item>
               <a-form-item v-if="infoSettingForm.getFieldValue('codition-'+index66 +'-' + index) == 'btw'">
-                <a-input style="width: 120px" placeholder='请输入' v-decorator="['inputTwo-' + index66 +'-' + index,{initialValue: getInitialValueTwo(item.val), validateTrigger:'blur',rules: []}]"></a-input>
+                <a-input style="width: 120px" placeholder='请输入' v-decorator="['inputTwo-' + index66 +'-' + index,{initialValue: getInitialValueTwo(item.labelSelConditionList[0].val), validateTrigger:'blur',rules: []}]"></a-input>
               </a-form-item>
 
               <a-form-item>
-                <a-select style="width: 120px" placeholder='查询方式' v-decorator="['selMet-' + index66 +'-' + index,{initialValue: item.selMet, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
+                <a-select style="width: 120px" placeholder='查询方式' v-decorator="['selMet-' + index66 +'-' + index,{initialValue: item.labelSelConditionList[0].selMet, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
                   <a-select-option value='equels'>精确</a-select-option>
                   <a-select-option value='like'>模糊</a-select-option>
                 </a-select>
@@ -127,8 +130,6 @@
                 <a-icon v-if="index+1 == loopContent.data.length" theme='filled' style="color:red; margin-left: 5px" type="minus-circle" @click="deleteRow(index66, index)" />
               </a-form-item> -->
               <a-form-item>
-                {{index66}}
-                {{index + 1}}
                 <a-icon v-if="index+1 == loopContent.data.length" theme='filled' style="color:lightgreen;" type="plus-circle" @click="addRow(index66)" />
                 <a-icon v-if="index+1 == loopContent.data.length" theme='filled' style="color:red; margin-left: 5px" type="minus-circle" @click="deleteRow(index66, index)" />
               </a-form-item>
@@ -260,13 +261,7 @@ export default {
       const groupTotal = Object.keys(this.loopContent).length
       
       Vue.set(this.loopContent, 'data'+(groupTotal+1), [
-        {
-          key: '',
-          codition: 'eq',
-          val: '',
-          selMet: '',
-          relation: 'and'
-        }
+        { "serial": "1", "relation": "and", "labelSelConditionList": [ { "key": "", "val": "", "codition": "eq", "selMet": "", "relation": "" } ] }
       ])
 
       console.log(JSON.stringify(this.loopContent))
@@ -344,6 +339,7 @@ export default {
       })
     },
     getInitialValueOne(val) {
+      // return ''
       if(val.indexOf(',') > -1) {
         return val.split(',')[0]
       } else {
@@ -351,6 +347,7 @@ export default {
       }
     },
     getInitialValueTwo(val) {
+      // return ''
       if(val.indexOf(',') > -1) {
         return val.split(',')[1]
       } else {
@@ -409,12 +406,7 @@ export default {
       this.deleteVisible = !this.deleteVisible
     },
     resetFormFields() {
-      this.loopContent = {data: [{
-        key: '',
-        codition: 'eq',
-        val: '',
-        selMet: ''
-      }]}
+      this.loopContent = { "data": [ { "serial": "1", "relation": "and", "labelSelConditionList": [ { "key": "", "val": "", "codition": "eq", "selMet": "", "relation": "" } ] } ] }
       this.resultList = []
       this.labelForm.resetFields()
       this.jsonData = {selParams: []}