fixbug

src/components/icss/bill/AddBill.vue

@@ -290,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 => {
@@ -342,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/ConditionForm1.vue

@@ -28,9 +28,9 @@
             <el-option
               v-for="item in conditionList"
               :key="item.id + item.name"
-              :label="item.name"
+              :label="item.name + '('+item.conditionLabel + ')'"
               :value="item.id"
-              :title="item.name"
+              :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"
+                  :label="item.name + '('+item.conditionLabel + ')'"
                   :value="item.id"
-                  :title="item.name"
+                  :title="item.name + '('+item.conditionLabel + ')'"
                 ></el-option>
               </el-select>
             </el-form-item>