feats

src/components/tableSearch/index.vue

@@ -1,16 +1,15 @@
 <template>
-  <div class="tableSearch flex-h">
-    <div class="flex-item">
-      <el-input
-        :placeholder="value==undefined ? '请输入内容' : value"
-        v-model="key"
-        clearable>
-      </el-input>
-    </div>
-    <el-button
-        size="mini"
-        type="primary" @click="search">搜索</el-button>
-  </div>
+  <el-form inline label-width="80px" >
+    <el-form-item label="姓名">
+      <el-input size="small" v-model="name"></el-input>
+    </el-form-item>
+    <el-form-item label="手机号">
+      <el-input size="small" v-model="phone"></el-input>
+    </el-form-item>
+    <el-form-item>
+      <el-button size="small" type="primary" @click="search">搜索</el-button>
+    </el-form-item>
+  </el-form>
 </template>
 
 <script>
@@ -19,7 +18,8 @@ export default {
   props: ['value'],
   data () {
     return {
-      key: ''
+      name: '',
+      phone: ''
     }
   },
   mounted () {
@@ -29,7 +29,7 @@ export default {
   },
   methods: {
     search () { // 搜索
-      this.$emit('exportSearchKey', this.key)
+      this.$emit('exportSearchKey', { name: this.name, phone: this.phone })
     },
   }
 }

src/pages/system/dataStatistics/frontEndUserList/index.vue

@@ -60,6 +60,7 @@ export default {
       total: 0,
       postData: { // 表格搜索条件
         phone: '', // 手机号
+        username: '',
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
@@ -81,8 +82,9 @@ export default {
     handleCurrentChange (val) {
       this.getList()
     },
-    searchList (key) { // 搜索列表
-      this.postData.phone = key
+    searchList ({ name, phone } = {}) { // 搜索列表
+      this.postData.username = name
+      this.postData.phone = phone
       this.postData.page = 1
       this.getList()
     },

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

@@ -189,6 +189,14 @@ export default {
         caseid: caseId,
         barcode: this.formData.bookBarcode,
         name: this.formData.bookName
+      }).then(({ list }) => {
+        if (!list) {
+          this.$message({
+            showClose: true,
+            message: '未查询到数据',
+            type: 'error'
+          })
+        }
       }).catch(err => {
         this.$message({
           showClose: true,

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

@@ -101,7 +101,7 @@ export default {
     }),
 
     filterList({ page = 0 } = {}) {
-      const caseId = this.formData.caseId || this.defaultCase
+      const caseId = this.formData.caseid || this.defaultCase
       if (!caseId) {
         this.$message({
           showClose: true,

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

@@ -64,7 +64,11 @@
         </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="BookTypeName" label="分类"></el-table-column>
+        <el-table-column label="分类">
+          <template slot-scope="scope">
+            <span>{{ getTypeName(scope.row.BookTypeId) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="LeftNum" label="可借数量"></el-table-column>
         <el-table-column prop="BorrowDays" label="规定借阅天数"></el-table-column>
       </el-table>
@@ -104,6 +108,7 @@ export default {
     }),
     ...mapLibSate({
       list: s => s.list,
+      types: s => s.type.list,
       borrowHistory: s => s.borrow.history,
     }),
     caseId: {
@@ -126,6 +131,7 @@ export default {
     ...mapActions({
       getBorrowHistory: 'getBorrowHistory',
       getList: 'getBookList',
+      getTypeList: 'getTypeList',
       borrowBooks: 'borrowBooks'
     }),
 
@@ -177,6 +183,8 @@ export default {
         return
       }
 
+      this.getTypeList({ page: 0, pagesize: 1000, caseid: this.formData.caseid })
+
       this.getList({
         ...this.formData,
         // customerphone: this.borrowHistory.Phone,
@@ -226,6 +234,10 @@ export default {
         })
         .catch(x => x)
     },
+
+    getTypeName(id) {
+      return (this.types.filter(x => x.BookTypeId === id)[0] || {}).BookTypeName
+    },
   }
 }
 </script>