Merge branch 'test'

src/components/icss/bill/AddBill.vue

@@ -65,7 +65,7 @@
                       v-for="item in conceptList"
                       :key="item.id"
                       :label="item.name"
-                      :value="item.name"
+                      :value="item.id"
                       :title="item.name"
                     ></el-option>
                   </el-select>
@@ -194,7 +194,8 @@ export default {
     },
     changeWord(val) {
       if (val === '') return;
-      let concept = this.conceptList.find(item => (item.name = val));
+      let concept = this.conceptList.find(item => (item.id = val));
+      this.form.conceptName = concept.name;
       this.form.concept.conceptLabel = concept.conceptLabel;
       this.form.concept.id = concept.id;
       this.form.concept.name = concept.name;
@@ -289,6 +290,12 @@ export default {
     },
 
     onSubmit() {
+      // console.log(this.$route.params,'this.$route.params')
+      const {currentPage,isEdit} = this.$route.params
+      let numberpage = 1
+      if(isEdit){
+        numberpage = currentPage
+      }
       let goOn = true;
       this.$refs.subForm.$refs.form1 &&
         this.$refs.subForm.$refs.form1.validate(valid => {
@@ -341,7 +348,7 @@ export default {
               this.$router.push({
                 name: 'Bill',
                 params: Object.assign({}, this.$route.params, {
-                  currentPage: 1
+                  currentPage: numberpage
                 })
               });
             } else if (res.data.code === '00020007') {

src/components/icss/bill/Bill.vue

@@ -8,6 +8,11 @@
         <el-form-item label="开单项目：">
           <el-input size="mini" v-model="filter.conceptName" placeholder="请输入" clearable></el-input>
         </el-form-item>
+        <el-form-item label="状态：" class="selectMedicine">
+          <el-select size="mini" v-model="filter.relationStatus" placeholder="请选择" clearable>
+            <el-option v-for="item in stateList" :label="item.name" :value="item.id" :key="item.id"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item class="dododo">
           <el-button size="mini" @click="filterDatas">检索</el-button>
           <el-button size="mini" type="warning" @click="addRelation">添加规则</el-button>
@@ -20,6 +25,7 @@
         <el-table-column :resizable="false" prop="ruleName" label="规则名称" width="180"></el-table-column>
         <el-table-column :resizable="false" prop="conditionName" label="条件明细" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="conceptName" label="开单项目" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="relationName" label="开单类型" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="ruleType" label="规则类型" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{scope.row.ruleType === 1 ? '文本类型' : ''}}</span>
@@ -33,14 +39,19 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
           <template slot-scope="scope">
-             <el-button v-if="scope.row.relationStatus===0" type="text" size="small" class="is-disabled">修改</el-button>
+            <el-button
+              v-if="scope.row.relationStatus===0"
+              type="text"
+              size="small"
+              class="is-disabled"
+            >修改</el-button>
             <el-button
               v-if="scope.row.relationStatus==1"
               type="text"
               size="small"
               @click="toEditProduct(scope.row)"
             >修改</el-button>
-            
+
             <span style="margin:0 3px;">|</span>
             <el-button
               v-if="scope.row.relationStatus===0"
@@ -86,8 +97,19 @@ export default {
       searched: false,
       filter: {
         conditionName: '', //条件明细
-        conceptName: '' //开单项目
+        conceptName: '', //开单项目
+        relationStatus: ''
       },
+      stateList: [
+        {
+          id: "1",
+          name: '启用'
+        },
+        {
+          id: "0",
+          name: '禁用'
+        }
+      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
@@ -140,6 +162,7 @@ export default {
             .then(res => {
               if (res.data.code == '0') {
                 this.currentPage = 1; //恢复数据跳转到筛选条件下首页
+                console.log(this.currentPage);
                 this.warning(res.data.msg || '操作成功', 'success');
                 this.getDataList();
               } else {
@@ -209,7 +232,8 @@ export default {
         number: this.inCurrentPage - 1 || this.currentPage - 1,
         size: this.pageSize,
         conditionName: this.filter.conditionName.trim(),
-        conceptName: this.filter.conceptName.trim()
+        conceptName: this.filter.conceptName.trim(),
+        relationStatus: this.filter.relationStatus
         // uniqueCode: ''
       };
       return param;
@@ -218,7 +242,8 @@ export default {
     clearFilter() {
       this.filter = {
         conditionName: '',
-        conceptName: ''
+        conceptName: '',
+        relationStatus: ''
       };
     },
     handleSizeChange(val) {

src/components/icss/bill/ConditionForm1.vue

@@ -28,9 +28,9 @@
             <el-option
               v-for="item in conditionList"
               :key="item.id + item.name"
-              :label="item.name"
-              :value="item.name"
-              :title="item.name"
+              :label="item.name + '('+item.conditionLabel + ')'"
+              :value="item.id"
+              :title="item.name +  '('+item.conditionLabel + ')'"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -66,9 +66,9 @@
                 <el-option
                   v-for="item in conditionList"
                   :key="item.id + item.name"
-                  :label="item.name"
-                  :value="item.name"
-                  :title="item.name"
+                  :label="item.name + '('+item.conditionLabel + ')'"
+                  :value="item.id"
+                  :title="item.name + '('+item.conditionLabel + ')'"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -90,12 +90,13 @@
                   ref="compare"
                   clearable
                   @clear="handleClear(index)"
+                  @change="handleChangeCom(index)"
                 >
                   <!-- <el-option
                     label="大于"
                     value=">"
                     :disabled="index=== 0 ? isCompare1==='>' : isCompare2==='>'"
-                  ></el-option> -->
+                  ></el-option>-->
                   <el-option
                     label="大于等于"
                     value=">="
@@ -105,7 +106,7 @@
                     label="小于"
                     value="<"
                     :disabled="index=== 0 ? isCompare1==='<' : isCompare2==='<'"
-                  ></el-option> -->
+                  ></el-option>-->
                   <el-option
                     label="小于等于"
                     value="<="
@@ -274,7 +275,7 @@ export default {
       if (ruleForm.length != 2) return false;
       if (ruleForm[1].compare == '') {
         return false;
-      } else if ( ruleForm[1].compare == '>=') {
+      } else if (ruleForm[1].compare == '>=') {
         return '>=';
       } else if (ruleForm[1].compare == '<=') {
         return '<=';
@@ -285,9 +286,9 @@ export default {
       if (ruleForm.length != 2) return false;
       if (ruleForm[0].compare == '') {
         return false;
-      } else if ( ruleForm[0].compare == '>=') {
+      } else if (ruleForm[0].compare == '>=') {
         return '>=';
-      } else if ( ruleForm[0].compare == '<=') {
+      } else if (ruleForm[0].compare == '<=') {
         return '<=';
       }
     }
@@ -300,6 +301,10 @@ export default {
     _initData() {
       this.form = { ...this.data };
       const { maxValue, minValue, unit } = this.form;
+      // console.log(this.form, 'this.form');
+      this.form.name = this.form.conditionLabel
+        ? `${this.form.name}(${this.form.conditionLabel})`
+        : '';
       // console.log(maxValue, 'maxValue', minValue, 'minValue');
       if (minValue === null && maxValue === null) {
         this.ruleForm.ruleForm = [
@@ -350,10 +355,34 @@ export default {
     },
     changeWord(val) {
       if (val === '') return;
-      let condition = this.conditionList.find(item => item.name == val);
+      let condition = this.conditionList.find(item => item.id == val);
+      // console.log(condition, 'condition');
+      this.form.name = condition.conditionLabel
+        ? `${condition.name}(${condition.conditionLabel})`
+        : '';
       this.$emit('split', condition);
     },
     handleClear(index) {
+      // this.ruleForm.ruleForm[index].value = '';
+    },
+    handleChangeCom(index) {
+      let compare = this.ruleForm.ruleForm[index].compare;
+      if (index === 0 && this.ruleForm.ruleForm.length == 1) {
+        if (compare == '>=') {
+          this.form.maxValue = '';
+          this.$emit('handleInput', {
+            type: 'maxValue',
+            value: this.form.maxValue
+          });
+        } else if (compare == '<=') {
+          this.form.minValue = '';
+          this.$emit('handleInput', {
+            type: 'minValue',
+            value: this.form.minValue
+          });
+        }
+      }
+      // console.log(compare);
       this.ruleForm.ruleForm[index].value = '';
     },
     handleUnitClear(index) {