bugs fix

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

@@ -82,27 +82,6 @@ export default {
     ...mapLibSate({
       detail: s => s.type.detail,
     }),
-    // formData: {
-    //   get: function() {
-    //     if (this.detail && this.detail.BookTypeId) {
-    //       return this.detail
-    //     }
-
-    //     return {
-    //       BookTypeId: '',
-    //       BookTypeName: '',
-    //       BookTypeImg: '',
-    //       CaseId: this.defaultCase,
-    //       OrgId: this.orgid,
-    //       Status: 1,
-    //       CreateDate: new Date()
-    //     }
-    //   },
-    //   set: function(val) {
-    //     console.log(val)
-    //     this.mergeDetail(val)
-    //   }
-    // }
   },
   watch: {
     detail: {
@@ -144,7 +123,7 @@ export default {
     submit() {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          this.updateDetail()
+          this.updateDetail(this.formData)
             .then(() => {
               this.$message({
                 showClose: true,

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

@@ -3,7 +3,7 @@
     <div>
       <el-form inline>
         <el-form-item label="案场">
-          <el-select v-model="caseId" size="medium" placeholder="请选择案场" @change="filterList">
+          <el-select v-model="caseId" size="medium" placeholder="请选择案场">
             <el-option
               v-for="item in cases"
               :key="item.CaseId"
@@ -13,7 +13,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :style="{ float: 'right' }">
-          <el-button type="primary" size="medium">搜索</el-button>
+          <el-button type="primary" size="medium" @click="filterList">搜索</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -21,9 +21,9 @@
       <el-button plain @click="editType()" size="medium">新增分类</el-button>
       <div :style="{ margin: '10px 0' }">
         <el-table :data="list" border style="width: 100%">
-          <el-table-column label="图片" width="250">
+          <el-table-column label="图片" width="128">
             <template slot-scope="scope">
-              <img width="150" :src="scope.row.BookTypeImg" alt>
+              <img width="64" :src="scope.row.BookTypeImg" alt>
             </template>
           </el-table-column>
           <el-table-column prop="BookTypeName" label="名称"></el-table-column>
@@ -43,7 +43,7 @@
         <el-pagination
           layout="prev, pager, next"
           :current-page="page"
-          :total="1000"
+          :total="pagenum"
           @current-change="pageChange">
         </el-pagination>
       </div>
@@ -75,6 +75,7 @@ export default {
     ...mapLibSate({
       list: s => s.type.list,
       page: s => s.type.page,
+      pagenum: s => s.type.pagenum,
     })
   },
   created() {
@@ -83,13 +84,16 @@ export default {
   methods: {
     ...mapActions({
       getList: 'getTypeList',
-      deleteType: 'deleteType'
+      deleteType: 'deleteType',
     }),
 
     filterList({ page = 0 } = {}) {
+      const caseId = this.caseId || this.defaultCase
+      if (!caseId) return
+
       this.getList({
         page,
-        CaseId: this.caseId || this.defaultCase
+        caseid: caseId,
       }).catch(err => {
         this.$message({
           showClose: true,

src/store/library/index.js

@@ -6,6 +6,7 @@ export default {
 
   state: {
     page: 0,
+    pagenum: 0,
     list: [
       {
         BookId: '1',
@@ -31,6 +32,7 @@ export default {
     detail: {},
     type: {
       page: 0,
+      pagenum: 0,
       list: [
         {
           BookTypeId: '1',
@@ -54,6 +56,8 @@ export default {
       },
     },
     stock: {
+      page: 0,
+      pagenum: 0,
       list: [
         {
           RecordId: '1',
@@ -96,7 +100,14 @@ export default {
     },
     setBorrowList (state, payload) { // 更新借阅记录
       state.borrow.list = payload
-    }
+    },
+    setTypeList (state, payload) {
+      const { list, pagenum } = payload || {}
+      if (!!list) { // eslint-disable-line
+        state.type.list = list
+        state.type.pagenum = pagenum
+      }
+    },
   },
   actions: {
     getBorrowList ({ commit }, payload) { // 获取借阅记录
@@ -113,8 +124,17 @@ export default {
       })
     },
     getTypeList ({ commit }, payload) {
-      return new Promise((resolve, reject) => {
+      console.log(api.bookType.list)
 
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.bookType.list,
+          queryData: payload,
+        }).then((x) => {
+          commit('setTypeList', x)
+          resolve(x)
+        })
+          .catch(({ message }) => reject(message))
       })
     },
     getTypeDetail ({ commit }, payload) {
@@ -122,9 +142,31 @@ export default {
 
       })
     },
-    updateTypeDetail ({ commit }, payload) {
+    updateTypeDetail ({ commit }, payload = {}) {
       return new Promise((resolve, reject) => {
+        const id = payload.BookTypeId
 
+        payload.CreateDate = ''
+
+        if (!id) {
+          ajax({
+            ...api.bookType.save,
+            data: payload,
+          }).then((x) => {
+            commit('mergeTypeDetail', x)
+            resolve(x)
+          })
+            .catch(({ message }) => reject(message))
+        } else {
+          ajax({
+            ...api.bookType.update,
+            data: payload,
+          }).then((x) => {
+            commit('mergeTypeDetail', x)
+            resolve(x)
+          })
+            .catch(({ message }) => reject(message))
+        }
       })
     },
     deleteType ({ commit }, payload) {

src/util/api.js

@@ -952,7 +952,7 @@ const $api = {
     getBorrowList: {
       method: 'get',
       url: `${baseUrl}${common}/book/record`
-    },    
+    },
   },
   bookType: {
     list: {