fix bug

src/components/icss/bill/Bill.vue

@@ -161,7 +161,7 @@ export default {
             .updateBillmanStatus({ relationId: row.relationId, status })
             .then(res => {
               if (res.data.code == '0') {
-                // this.currentPage = 1; //恢复数据跳转到筛选条件下首页
+                this.currentPage = 1; //恢复数据跳转到筛选条件下首页
                 console.log(this.currentPage);
                 this.warning(res.data.msg || '操作成功', 'success');
                 this.getDataList();

src/components/icss/bill/ConditionForm1.vue

@@ -301,7 +301,10 @@ export default {
     _initData() {
       this.form = { ...this.data };
       const { maxValue, minValue, unit } = this.form;
-      this.form.name = `${this.form.name}(${this.form.conditionLabel})`;
+      // 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 = [
@@ -353,7 +356,10 @@ export default {
     changeWord(val) {
       if (val === '') return;
       let condition = this.conditionList.find(item => item.id == val);
-      this.form.name = `${condition.name}(${condition.conditionLabel})`;
+      // console.log(condition, 'condition');
+      this.form.name = condition.conditionLabel
+        ? `${condition.name}(${condition.conditionLabel})`
+        : '';
       this.$emit('split', condition);
     },
     handleClear(index) {