bug修改

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

@@ -23,6 +23,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <div class="red-hint" style="margin-left:100px;">建议上传156*220尺寸的图片</div>
         <el-form-item label="图片" prop="BookImg">
           <el-upload
             class="avatar-uploader"
@@ -36,7 +37,7 @@
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="书名" prop="BookName">
+        <el-form-item label="图书名" prop="BookName">
           <el-input v-model="formData.BookName" :style="{ width: '200px' }"></el-input>
         </el-form-item>
         <el-form-item label="分类" prop="BookTypeId">
@@ -213,6 +214,7 @@ export default {
                 message: '更新或编辑成功',
                 type: 'success'
               })
+              this.$router.push({ name: 'libraryList' })
             })
             .catch(err => {
               this.$message({

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

@@ -1,31 +1,46 @@
 <template>
   <div class="subPage" :style="{ padding: '20px' }">
-    <div>
-      <el-form inline>
-        <el-form-item label="案场">
-          <el-select v-model="caseId" size="medium" placeholder="请选择案场">
-            <el-option
-              v-for="item in cases"
-              :key="item.CaseId"
-              :label="item.CaseName"
-              :value="item.CaseId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="条码">
-          <el-input v-model="formData.bookBarcode"></el-input>
-        </el-form-item>
-        <el-form-item label="书名">
-          <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>
-        </el-form-item>
-      </el-form>
+    <div class="system-table-search">
+      <div class="flex-h" style="align-items: flex-start;">
+        <div class="flex-item flex-h">
+          <el-button plain @click="editBook()" size="medium">图书录入</el-button>
+          <el-button plain @click="showBatchInput()" size="medium">批量导入</el-button>
+        </div>
+        <ul style="white-space: normal;">
+            <li style="margin-bottom: 15px;">
+              <el-select v-model="caseId" size="medium" placeholder="请选择案场">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId"
+                ></el-option>
+              </el-select>
+            </li>
+            <li>
+              <el-input v-model="formData.bookBarcode" placeholder="请输入或扫描条码"></el-input>
+            </li>
+            <li>
+              <el-input v-model="formData.bookName" placeholder="请输入书名"></el-input>
+            </li>
+            <li>
+              <el-select v-model="formData.booktype" size="medium" placeholder="请选择分类">
+                <el-option label="所有分类" value=""></el-option>
+                <el-option
+                  v-for="item in types"
+                  :key="item.BookTypeId"
+                  :label="item.BookTypeName"
+                  :value="item.BookTypeId"
+                ></el-option>
+              </el-select>
+            </li>
+            <li>
+              <el-button type="primary" size="medium" @click="filterList">搜索</el-button>
+            </li>
+        </ul>
+      </div>
     </div>
     <div>
-      <el-button plain @click="editBook()" size="medium">图书录入</el-button>
-      <el-button plain @click="showBatchInput()" size="medium">批量导入</el-button>
       <div :style="{ margin: '10px 0' }">
         <el-table :data="list" border style="width: 100%">
           <el-table-column label="图片" width="128">
@@ -33,8 +48,8 @@
               <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>
-          <el-table-column prop="BookName" label="书名"></el-table-column>
+          <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
+          <el-table-column prop="BookName" label="图书名"></el-table-column>
           <el-table-column label="案场">
             <template slot-scope="scope">
               <span>{{ getCaseName(scope.row.CaseId) }}</span>
@@ -50,10 +65,10 @@
               <span>{{ formatPrice(scope.row.Price) }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="BorrowDays" label="借阅(天)"></el-table-column>
-          <el-table-column prop="InStock" label="总数量"></el-table-column>
-          <el-table-column prop="BorrowNum" label="借出"></el-table-column>
-          <el-table-column label="预约">
+          <el-table-column prop="BorrowDays" label="借阅时间" width="50"></el-table-column>
+          <el-table-column prop="InStock" label="总数量" width="50"></el-table-column>
+          <el-table-column prop="BorrowNum" label="已借出" width="50"></el-table-column>
+          <el-table-column label="预约数量" width="50">
             <template slot-scope="scope">
               <span>{{ getReserveNum(scope.row) }}</span>
             </template>
@@ -63,16 +78,12 @@
               <span>{{ toolClass.dateFormat(scope.row.CreateDate) }}</span>
             </template>
           </el-table-column>
-          <el-table-column fixed="right" label="操作" width="150">
+          <el-table-column fixed="right" label="操作" width="350">
             <template slot-scope="scope">
-              <div>
-                <el-button type="text" @click="changeStock(scope.row)" size="small">盘点</el-button>
-                <el-button @click="setRecommend(scope.row)" type="text" size="small">{{ scope.row.IsRecommend === 1 ? '取消推荐' : '设为推荐' }}</el-button>
-              </div>
-              <div>
-                <el-button @click="editBook(scope.row)" type="text" size="small">编辑</el-button>
-                <el-button @click="removeBook(scope.row)" type="text" size="small">删除</el-button>
-              </div>
+                <el-button type="primary" @click="changeStock(scope.row)" size="small">库存盘点</el-button>
+                <el-button @click="setRecommend(scope.row)" type="warning" size="small">{{ scope.row.IsRecommend === 1 ? '取消推荐' : '设为推荐' }}</el-button>
+                <el-button @click="editBook(scope.row)" type="warning" size="small">编辑</el-button>
+                <el-button @click="removeBook(scope.row)" type="danger" size="small">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -114,9 +125,11 @@ export default {
         caseId: '',
         bookBarcode: '',
         bookName: '',
+        booktype: '',
       },
       inputRef: undefined,
       showDialog: false,
+      load: true,
     }
   },
   computed: {
@@ -133,6 +146,9 @@ export default {
     }),
     caseId: {
       get() {
+        if (this.defaultCase !== '' && this.load) {
+          this.filterList()
+        }
         return this.formData.caseId || this.defaultCase
       },
       set(nv) {
@@ -172,6 +188,7 @@ export default {
 
     // 查询过滤
     filterList({ page = 0 } = {}) {
+      this.load = false
       const caseId = this.caseId || this.defaultCase
       if (!caseId) {
         this.$message({
@@ -188,7 +205,8 @@ export default {
         page,
         caseid: caseId,
         barcode: this.formData.bookBarcode,
-        name: this.formData.bookName
+        name: this.formData.bookName,
+        booktype: this.formData.booktype,
       }).then(({ list }) => {
         if (!list) {
           this.$message({

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

@@ -11,7 +11,8 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="图片" prop="BookTypeImg">
+      <div class="red-hint" style="margin-left:100px;">建议上传80*80尺寸的图片</div>
+      <el-form-item label="分类图片" prop="BookTypeImg">
         <el-upload
           class="avatar-uploader"
           action=""
@@ -24,7 +25,7 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="名称" prop="BookTypeName">
+      <el-form-item label="分类名称" prop="BookTypeName">
         <el-input v-model="formData.BookTypeName" :style="{ width: '200px' }"></el-input>
       </el-form-item>
       <el-form-item :style="{ paddingTop: '40px' }">
@@ -137,11 +138,11 @@ export default {
               })
             })
         } else {
-          this.$message({
-            showClose: true,
-            message: '表单填写错误',
-            type: 'error'
-          })
+          // this.$message({
+          //   showClose: true,
+          //   message: '表单填写错误',
+          //   type: 'error'
+          // })
           return false
         }
       })

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

@@ -25,22 +25,22 @@
     <div>
       <div :style="{ margin: '10px 0' }">
         <el-table :data="list" border style="width: 100%">
-          <el-table-column label="图片" width="128">
+          <el-table-column label="分类图片" width="128">
             <template slot-scope="scope">
               <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>
-          <el-table-column label="案场" width="200">
+          <el-table-column prop="BookTypeName" label="分类名称"></el-table-column>
+          <el-table-column label="所属案场" width="200">
             <template slot-scope="scope">
               <span>{{ getCaseName(scope.row.CaseId) }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="Nums" label="图书数量"></el-table-column>
-          <el-table-column fixed="right" label="操作" width="150">
+          <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
-              <el-button @click="editType(scope.row)" type="text" size="small">编辑</el-button>
-              <el-button @click="removeType(scope.row)" type="text" size="small">删除</el-button>
+              <el-button @click="editType(scope.row)" type="warning" size="small">编辑</el-button>
+              <el-button @click="removeType(scope.row)" type="danger" size="small">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -69,6 +69,7 @@ export default {
   data() {
     return {
       formData: { caseid: '' },
+      load: true,
     }
   },
   computed: {
@@ -84,6 +85,9 @@ export default {
     }),
     caseId: {
       get() {
+        if (this.defaultCase !== '' && this.load) {
+          this.filterList()
+        }
         return this.formData.caseid || this.defaultCase
       },
       set(nv) {
@@ -105,6 +109,7 @@ export default {
     }),
 
     filterList({ page = 0 } = {}) {
+      this.load = false
       const caseId = this.formData.caseid || this.defaultCase
       if (!caseId) {
         this.$message({

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

@@ -17,8 +17,8 @@
             <el-input placeholder="请输入手机号" v-model="postData.customerphone"></el-input>
           </li>
           <li style="margin-bottom: 15px;">
-            <el-select v-model="CaseId" placeholder="请选择案场">
-              <el-option key="all" label="所有案场" value="all"></el-option>
+            <el-select v-model="postData.caseid" placeholder="请选择案场">
+              <el-option key="all" label="所有案场" value=""></el-option>
               <el-option
                 v-for="item in cases"
                 :key="item.CaseId"
@@ -112,14 +112,14 @@ export default {
     ...mapLibSate({
       list: x => x.borrow.list
     }),
-    CaseId: {
-      get () {
-        return this.postData.caseid || this.defaultCaseId
-      },
-      set (val) {
-        this.postData.caseid = val
-      }
-    }
+    // CaseId: {
+    //   get () {
+    //     return this.postData.caseid || this.defaultCaseId
+    //   },
+    //   set (val) {
+    //     this.postData.caseid = val
+    //   }
+    // }
   },
   methods: {
     ...mapMutations({

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

@@ -49,13 +49,13 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="150">
           <template slot-scope="scope">
-            <el-button @click="isBookReturn(scope.row)" type="text" size="small">归还</el-button>
+            <el-button @click="isBookReturn(scope.row)" type="warning" size="small">归还</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <div :style="{ paddingTop: '40px' }">
-        <el-button @click="cancel()">取消</el-button>
+      <div :style="{ marginTop: '40px', marginBottom: '40px' }">
+        <el-button @click="cancel()">返回</el-button>
       </div>
     </div>
   </div>

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

@@ -73,9 +73,9 @@
         <el-table-column prop="BorrowDays" label="规定借阅天数"></el-table-column>
       </el-table>
 
-      <div :style="{ paddingTop: '40px' }">
+      <div :style="{ marginTop: '40px', marginBottom: '40px' }">
         <el-button type="primary" @click="submit()">立即借阅</el-button>
-        <el-button @click="$router.back()">取消</el-button>
+        <el-button @click="cancel()">返回</el-button>
       </div>
     </div>
   </div>
@@ -132,7 +132,8 @@ export default {
       getBorrowHistory: 'getBorrowHistory',
       getList: 'getBookList',
       getTypeList: 'getTypeList',
-      borrowBooks: 'borrowBooks'
+      borrowBooks: 'borrowBooks',
+      setListNil: 'setListNil',
     }),
 
     nextStep() {
@@ -224,6 +225,10 @@ export default {
               message: '借阅成功',
               type: 'success'
             })
+            this.formData.barcode = ''
+            this.formData.name = ''
+            this.getBorrowHistory({ customerInfo: this.customerInfo })
+            this.setListNil()
           }).catch(err => {
             this.$message({
               showClose: true,
@@ -238,6 +243,10 @@ export default {
     getTypeName(id) {
       return (this.types.filter(x => x.BookTypeId === id)[0] || {}).BookTypeName
     },
+    cancel() {
+      this.customerInfo = ''
+      this.active = 0
+    }
   }
 }
 </script>

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

@@ -17,8 +17,8 @@
             <el-input placeholder="请输入手机号" v-model="postData.customerphone"></el-input>
           </li>
           <li style="margin-bottom: 15px;">
-            <el-select v-model="CaseId" placeholder="请选择案场">
-              <el-option key="all" label="所有案场" value="all"></el-option>
+            <el-select v-model="postData.caseid" placeholder="请选择案场">
+              <el-option key="all" label="所有案场" value=""></el-option>
               <el-option
                 v-for="item in cases"
                 :key="item.CaseId"
@@ -103,7 +103,7 @@ export default {
         value: ''
       }, {
         id: '0',
-        value: '延期'
+        value: '逾期未还'
       }, {
         id: '1',
         value: '借阅中'
@@ -131,14 +131,14 @@ export default {
     ...mapLibSate({
       list: x => x.borrow.list
     }),
-    CaseId: {
-      get () {
-        return this.postData.caseid || this.defaultCaseId
-      },
-      set (val) {
-        this.postData.caseid = val
-      }
-    }
+    // CaseId: {
+    //   get () {
+    //     return this.postData.caseid || this.defaultCaseId
+    //   },
+    //   set (val) {
+    //     this.postData.caseid = val
+    //   }
+    // }
   },
   beforeRouteLeave (to, from, next) {
     this.resetStore('borrow.list')

src/pages/system/page.js

@@ -745,22 +745,26 @@ export default {
           path: 'type-manager',
           name: 'libraryType',
           component: LibraryTypeList,
-          children: []
-        }, { // 分类管理
-          path: 'type/:id?',
-          name: 'libraryTypeEdit',
-          component: LibraryTypeEdit,
-          children: []
+          children: [
+            { // 分类管理
+              path: 'type/:id?',
+              name: 'libraryTypeEdit',
+              component: LibraryTypeEdit,
+              children: []
+            }
+          ]
         }, { // 图书列表
           path: 'book-manage',
           name: 'libraryList',
           component: LibraryList,
-          children: []
-        }, { // 图书编辑
-          path: 'book/:id?',
-          name: 'libraryEdit',
-          component: LibraryEdit,
-          children: []
+          children: [
+            { // 图书编辑
+              path: 'book/:id?',
+              name: 'libraryEdit',
+              component: LibraryEdit,
+              children: []
+            }
+          ]
         }, { // 库存盘点
           path: 'stock/:id',
           name: 'stockChange',

src/store/library/index.js

@@ -326,6 +326,9 @@ export default {
         })
           .catch(({ message }) => reject(message))
       })
+    },
+    setListNil ({ commit }) {
+      commit('setBookList', {list: []})
     }
   },
 }