bug fix

src/pages/system/library/books/list.vue

@@ -13,10 +13,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="条码">
-          <el-input v-model="bookBarcode"></el-input>
+          <el-input v-model="formData.bookBarcode"></el-input>
         </el-form-item>
         <el-form-item label="书名">
-          <el-input v-model="bookName"></el-input>
+          <el-input v-model="formData.bookName"></el-input>
         </el-form-item>
         <el-form-item :style="{ float: 'right' }">
           <el-button type="primary" size="medium" @click="filterList">搜索</el-button>
@@ -30,7 +30,7 @@
         <el-table :data="list" border style="width: 100%">
           <el-table-column label="图片" width="128">
             <template slot-scope="scope">
-              <img width="64" :src="scope.row.BookImg" alt>
+              <img width="64" :src="scope.row.BookImg + '?x-oss-process=style/compress-rotate'" alt>
             </template>
           </el-table-column>
           <el-table-column prop="BookBarcode" label="条码"></el-table-column>
@@ -110,9 +110,11 @@ export default {
   name: 'bookList',
   data() {
     return {
-      caseId: '',
-      bookBarcode: '',
-      bookName: '',
+      formData: {
+        caseId: '',
+        bookBarcode: '',
+        bookName: '',
+      },
       inputRef: window.document.createElement('input'),
       showDialog: false,
     }
@@ -128,13 +130,13 @@ export default {
       page: s => s.page,
       pagenum: s => s.pagenum,
       types: s => s.type.list
-    })
-  },
-  watch: {
-    defaultCase(nv) {
-      if (nv && !this.caseId) {
-        this.caseId = nv
-        this.filterList()
+    }),
+    caseId: {
+      get() {
+        return this.formData.caseId || this.defaultCase
+      },
+      set(nv) {
+        this.formData.caseId = nv
       }
     },
   },
@@ -179,8 +181,8 @@ export default {
       this.getList({
         page,
         caseid: caseId,
-        barcode: this.bookBarcode,
-        name: this.bookName
+        barcode: this.formData.bookBarcode,
+        name: this.formData.bookName
       }).catch(err => {
         this.$message({
           showClose: true,
@@ -232,7 +234,6 @@ export default {
     // 设为/取消推荐
     setRecommend(book) {
       const tipMsg = book.IsRecommend === 1 ? '确定取消推荐?' : '确认设置为推荐?'
-      book.IsRecommend = Math.abs(book.IsRecommend - 1)
 
       this.$confirm(tipMsg, '提示', {
         confirmButtonText: '是',
@@ -240,6 +241,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
+          book.IsRecommend = Math.abs(book.IsRecommend - 1)
           this.setBookRecommend(book)
             .then(() => {
               this.$message({

src/pages/system/library/books/types/list.vue

@@ -23,7 +23,7 @@
         <el-table :data="list" border style="width: 100%">
           <el-table-column label="图片" width="128">
             <template slot-scope="scope">
-              <img width="64" :src="scope.row.BookTypeImg" alt>
+              <img width="64" :src="scope.row.BookTypeImg + '?x-oss-process=style/compress-rotate'" alt>
             </template>
           </el-table-column>
           <el-table-column prop="BookTypeName" label="名称"></el-table-column>
@@ -64,7 +64,7 @@ export default {
   name: 'bookTypeList',
   data() {
     return {
-      caseId: ''
+      formData: { caseid: '' },
     }
   },
   computed: {
@@ -77,15 +77,15 @@ export default {
       list: s => s.type.list,
       page: s => s.type.page,
       pagenum: s => s.type.pagenum,
-    })
-  },
-  watch: {
-    defaultCase(nv) {
-      if (nv && !this.caseId) {
-        this.caseId = nv
-        this.filterList()
-      }
-    },
+    }),
+    caseId: {
+      get() {
+        return this.formData.caseid || this.defaultCase
+      },
+      set(nv) {
+        this.formData.caseid = nv
+      },
+    }
   },
   beforeRouteLeave (to, from, next) {
     this.resetStore('type.list')
@@ -101,8 +101,15 @@ export default {
     }),
 
     filterList({ page = 0 } = {}) {
-      const caseId = this.caseId || this.defaultCase
-      if (!caseId) return
+      const caseId = this.formData.caseId || this.defaultCase
+      if (!caseId) {
+        this.$message({
+          showClose: true,
+          message: '请选择案场',
+          type: 'error'
+        })
+        return
+      }
 
       this.getList({
         page,

src/pages/system/library/borrow/appointmentList.vue

@@ -37,9 +37,9 @@
         <el-table-column label="案场">
           <template slot-scope="scope">{{returnCaseName(scope.row.CaseId)}}</template>
         </el-table-column>
-        <el-table-column label="图片" width="300">
+        <el-table-column label="图片" width="128">
           <template slot-scope="scope">
-            <img :src="scope.row.BookImg" style="height: 150px;">
+            <img :src="scope.row.BookImg + '?x-oss-process=style/compress-rotate'" style="height: 64px;">
           </template>
         </el-table-column>
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
@@ -71,7 +71,7 @@
 
 <script>
 import { createNamespacedHelpers, mapState } from 'vuex'
-const { mapState: mapLibSate, mapActions: mapLibActions } = createNamespacedHelpers('library')
+const { mapState: mapLibSate, mapActions: mapLibActions, mapMutations } = createNamespacedHelpers('library')
 export default {
   name: 'borrowList',
   data () {
@@ -99,6 +99,10 @@ export default {
       this.total = res.pagenum
     })
   },
+  beforeRouteLeave (to, from, next) {
+    this.resetStore('borrow.list')
+    next()
+  },
   computed: {
     ...mapState({
       cases: x => x.app.cases.list,
@@ -118,6 +122,9 @@ export default {
     }
   },
   methods: {
+    ...mapMutations({
+      resetStore: 'clearData',
+    }),
     ...mapLibActions(['getBorrowList', 'cancelBorrow']),
     cancel (id) {
       this.$confirm('确认取消预约?', '提示', {

src/pages/system/library/borrow/bookreturn.vue

@@ -81,7 +81,7 @@ export default {
       orgid: x => x.app.user.OrgId
     }),
     ...mapLibSate({
-      list: s => s.list,
+      list: s => s.bookReturn.list,
       borrowHistory: s => s.borrow.history
     })
   },

src/pages/system/library/borrow/borrow.vue

@@ -36,7 +36,7 @@
       <!-- 过滤条件 -->
       <el-form inline>
         <el-form-item label="案场">
-          <el-select v-model="formData.caseid" size="medium" placeholder="请选择案场">
+          <el-select v-model="caseId" size="medium" placeholder="请选择案场">
             <el-option
               v-for="item in cases"
               :key="item.CaseId"
@@ -105,13 +105,14 @@ export default {
       list: s => s.list,
       borrowHistory: s => s.borrow.history,
     }),
-  },
-  watch: {
-    defaultCase(nv) {
-      if (nv && !this.formData.caseid) {
-        this.formData.caseid = nv
-      }
-    }
+    caseId: {
+      get() {
+        return this.formData.caseid || this.defaultCase
+      },
+      set(val) {
+        this.formData.caseid = val
+      },
+    },
   },
   methods: {
     ...mapActions({
@@ -143,7 +144,7 @@ export default {
 
     search() {
       // 必须选案场
-      if (!this.formData.caseid) {
+      if (!this.formData.caseid && !this.defaultCase) {
         this.$message({
           showClose: true,
           message: '请选择案场',
@@ -153,6 +154,10 @@ export default {
         return
       }
 
+      if (!this.formData.caseid) {
+        this.formData.caseid = this.defaultCase
+      }
+
       // 先扫码或者输入图书名称
       if (!this.formData.barcode && !this.formData.name) {
         this.$message({

src/pages/system/library/borrow/borrowList.vue

@@ -47,9 +47,9 @@
         <el-table-column label="案场">
           <template slot-scope="scope">{{returnCaseName(scope.row.CaseId)}}</template>
         </el-table-column>
-        <el-table-column label="图片" width="300">
+        <el-table-column label="图片" width="128">
           <template slot-scope="scope">
-            <img :src="scope.row.BookImg" style="height: 150px;">
+            <img :src="scope.row.BookImg + '?x-oss-process=style/compress-rotate'" style="height: 64px;">
           </template>
         </el-table-column>
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
@@ -82,7 +82,7 @@
 
 <script>
 import { createNamespacedHelpers, mapState } from 'vuex'
-const { mapState: mapLibSate, mapActions: mapLibActions } = createNamespacedHelpers('library')
+const { mapState: mapLibSate, mapActions: mapLibActions, mapMutations } = createNamespacedHelpers('library')
 export default {
   name: 'borrowList',
   data () {
@@ -140,7 +140,14 @@ export default {
       }
     }
   },
+  beforeRouteLeave (to, from, next) {
+    this.resetStore('borrow.list')
+    next()
+  },
   methods: {
+    ...mapMutations({
+      resetStore: 'clearData',
+    }),
     ...mapLibActions(['getBorrowList']),
     search () {
       this.page = 1