Browse Source

Merge branch '03/03Lebao' into dev

mo 4 years ago
parent
commit
0b44b6b946
2 changed files with 3 additions and 2 deletions
  1. 1 0
      src/views/musicalManager/index.vue
  2. 2 2
      src/views/repairManager/repairList.vue

+ 1 - 0
src/views/musicalManager/index.vue

@@ -198,6 +198,7 @@ export default {
      try{
        const res = await getInstrument({...this.searchForm,rows:this.rules.limit,page:this.rules.page})
         this.tableList = res.data.rows
+        this.rules.total = res.data.total
      }catch(e){
        console.log(e)
      }

+ 2 - 2
src/views/repairManager/repairList.vue

@@ -20,7 +20,7 @@
             placeholder="维修单号/姓名"
           ></el-input>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input
             type="number"
             v-model.trim="searchForm.studentInstrumentId"
@@ -37,7 +37,7 @@
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item>
           <el-select