okls

src/views/label/labelRightSide.vue

@@ -63,9 +63,8 @@
         <a-form-item>
           <a-input placeholder='请输入' v-decorator="['inputOne' + index,{initialValue: item.inputOne, validateTrigger:'blur',rules: [],}]"></a-input>
         </a-form-item>
-
-        <a-form-item v-if="!!item.range && item.range == 'btw'">
-          <a-input :disabled="!!item.range && item.range == 'equals'" placeholder='请输入' v-decorator="['inputTwo' + index,{initialValue: item.inputTwo, validateTrigger:'blur',rules: []}]"></a-input>
+        <a-form-item v-if="infoSettingForm.getFieldValue('range'+index) == 'btw'">
+          <a-input placeholder='请输入' v-decorator="['inputTwo' + index,{initialValue: item.inputTwo, validateTrigger:'blur',rules: []}]"></a-input>
         </a-form-item>
 
         <a-form-item>
@@ -136,7 +135,8 @@ export default {
             } else { // 区间值
               this.jsonData.push({
                 key: formData['businessProperty'+i],
-                val: formData['inputOne' + i],
+                val1: formData['inputOne' + i],
+                val2: formData['inputTwo' + i],
                 condition: formData['range'+i],
                 relation: formData['relation' + i],
               })