fix bug

src/components/icss/bill/AddBill.vue

@@ -25,15 +25,14 @@
                 <el-option label="数值类型" :value="2"></el-option>
               </el-select>
             </el-form-item>
-            <el-row :gutter="24" class="concept">
-              <el-form-item label="开单项目" prop="concept">
-                <el-col :span="8">
+            <el-row class="concept">
+              <el-col :span="8">
+                <el-form-item label="开单项目" prop="conceptType">
                   <el-select
                     v-model="form.conceptType"
                     placeholder="请选择项目类型"
                     style="width: 100%"
                     @change="handleConceptType"
-                    clearable
                     ref="conceptType"
                   >
                     <el-option label="检验套餐" :value="1"></el-option>
@@ -42,8 +41,10 @@
                     <el-option label="手术和操作" :value="4"></el-option>
                     <el-option label="药品注册名" :value="5"></el-option>
                   </el-select>
-                </el-col>
-                <el-col :span="15">
+                </el-form-item>
+              </el-col>
+              <el-col :span="16" style="paddingLeft: 4px">
+                <el-form-item label label-width="0px" prop="concept">
                   <el-select
                     style="width:100%;minWidth: 240px"
                     v-model="form.conceptName"
@@ -68,8 +69,8 @@
                       :title="item.name"
                     ></el-option>
                   </el-select>
-                </el-col>
-              </el-form-item>
+                </el-form-item>
+              </el-col>
             </el-row>
             <ConditionForm
               :data="form.condition"
@@ -102,16 +103,16 @@ export default {
   name: 'AddBill',
   data() {
     var checkFrequency = (rule, value, callback) => {
-      let conceptName = this.$refs.conceptName.value;
-      if (!conceptName) {
-        callback('请输入开单项目');
+      let conceptType = this.$refs.conceptType.value;
+      if (!conceptType) {
+        callback('请选择项目类型');
       } else {
         callback();
       }
     };
     var checkFrequency2 = (rule, value, callback) => {
-      let conceptType = this.$refs.conceptType.value;
-      if (!conceptType) {
+      let conceptName = this.$refs.conceptName.value;
+      if (!conceptName) {
         callback('请输入开单项目');
       } else {
         callback();
@@ -121,7 +122,7 @@ export default {
       form: {
         ruleName: '',
         ruleType: '',
-        conceptType: '',
+        conceptType: 2,
         conceptName: '',
         concept: {
           conceptLabel: '',
@@ -153,12 +154,11 @@ export default {
           { required: true, message: '请选择规则类型', trigger: 'change' }
         ],
         concept: [
-          { required: true, validator: checkFrequency, trigger: 'blur' },
-          { validator: checkFrequency2, trigger: 'change' }
+          { required: true, validator: checkFrequency2, trigger: 'blur' }
+        ],
+        conceptType: [
+          { required: true, validator: checkFrequency, trigger: 'blur' }
         ]
-        // conditionName: [
-        //   { required: true, message: '请输入条件明细', trigger: 'change' }
-        // ]
       },
       saveDisable: false, //保存按钮禁止点击
       isEdit: false, // 是否处于编辑页面 false--新增   true--编辑
@@ -263,8 +263,14 @@ export default {
         condition: {
           conditionLabel: condition.conditionLabel,
           id: condition.id,
-          maxValue: (condition.maxValue === '' || condition.maxValue === null) ? '' : +condition.maxValue,
-          minValue: (condition.minValue === '' || condition.minValue === null) ? '' : +condition.minValue,
+          maxValue:
+            condition.maxValue === '' || condition.maxValue === null
+              ? ''
+              : +condition.maxValue,
+          minValue:
+            condition.minValue === '' || condition.minValue === null
+              ? ''
+              : +condition.minValue,
           // minValue: !null && +condition.minValue,
           name: condition.name,
           range: condition.range,
@@ -371,11 +377,11 @@ export default {
 <style lang="less">
 .concept {
   /deep/ .el-form-item__label {
-    margin-left: 12px !important;
+    // margin-left: 12px !important;
   }
   /deep/ .el-col {
-    padding-left: 0px !important;
-    padding-right: 4px !important;
+    // padding-left: 0px !important;
+    // padding-right: 4px !important;
   }
   /deep/ .el-form-item__error {
     float: left;

src/components/icss/bill/ConditionForm1.vue

@@ -20,7 +20,7 @@
             loading-text="加载中..."
             @change="changeWord"
             @visible-change="handleVisible"
-            placeholder="搜索开单项目"
+            placeholder="搜索条件明细"
             :remote-method="searchCondition"
             reserve-keyword
             ref="conditionListName"
@@ -91,25 +91,25 @@
                   clearable
                   @clear="handleClear(index)"
                 >
-                  <el-option
+                  <!-- <el-option
                     label="大于"
                     value=">"
                     :disabled="index=== 0 ? isCompare1==='>' : isCompare2==='>'"
-                  ></el-option>
+                  ></el-option> -->
                   <el-option
                     label="大于等于"
                     value=">="
-                    :disabled="index=== 0 ? isCompare1==='>' : isCompare2==='>'"
+                    :disabled="index=== 0 ? isCompare1==='>=' : isCompare2==='>='"
                   ></el-option>
-                  <el-option
+                  <!-- <el-option
                     label="小于"
                     value="<"
                     :disabled="index=== 0 ? isCompare1==='<' : isCompare2==='<'"
-                  ></el-option>
+                  ></el-option> -->
                   <el-option
                     label="小于等于"
                     value="<="
-                    :disabled="index=== 0 ? isCompare1==='<' : isCompare2==='<'"
+                    :disabled="index=== 0 ? isCompare1==='<=' : isCompare2==='<='"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -161,7 +161,7 @@ export default {
     let checkFrequency = (rule, value, callback) => {
       let conditionListName = this.$refs.conditionListName.value;
       if (conditionListName === '') {
-        callback('请输入开单项目');
+        callback('请输入条件明细');
       } else {
         callback();
       }
@@ -274,10 +274,10 @@ export default {
       if (ruleForm.length != 2) return false;
       if (ruleForm[1].compare == '') {
         return false;
-      } else if (ruleForm[1].compare == '>' || ruleForm[1].compare == '>=') {
-        return '>';
-      } else if (ruleForm[1].compare == '<' || ruleForm[1].compare == '<=') {
-        return '<';
+      } else if ( ruleForm[1].compare == '>=') {
+        return '>=';
+      } else if (ruleForm[1].compare == '<=') {
+        return '<=';
       }
     },
     isCompare2() {
@@ -285,10 +285,10 @@ export default {
       if (ruleForm.length != 2) return false;
       if (ruleForm[0].compare == '') {
         return false;
-      } else if (ruleForm[0].compare == '>' || ruleForm[0].compare == '>=') {
-        return '>';
-      } else if (ruleForm[0].compare == '<' || ruleForm[0].compare == '<=') {
-        return '<';
+      } else if ( ruleForm[0].compare == '>=') {
+        return '>=';
+      } else if ( ruleForm[0].compare == '<=') {
+        return '<=';
       }
     }
   },
@@ -369,7 +369,7 @@ export default {
     // },
     handleVisible(flag) {
       if (!flag) {
-        this.conceptList = [];
+        this.conditionList = [];
       }
     },
     // 搜索列表