xcx

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

@@ -14,13 +14,12 @@
           <el-input v-model="formData.BookBarcode" :style="{ width: '200px' }" :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="案场" prop="CaseId">
-          <el-select v-model="formData.CaseId" placeholder="请选择案场">
+          <el-select v-model="formData.CaseId" placeholder="请选择案场" @change="filterTypes">
             <el-option
               v-for="item in cases"
               :key="item.CaseId"
               :label="item.CaseName"
               :value="item.CaseId"
-              @change="filterTypes"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -109,8 +108,8 @@ export default {
     if (id) {
       this.active = 1
 
-      this.getInfo({
-        BookId: id
+      this.getInfo({ id }).then((x) => {
+        this.filterTypes(x.CaseId)
       }).catch(err => {
         this.$message({
           showClose: true,
@@ -136,6 +135,7 @@ export default {
   watch: {
     detail: {
       handler (nv, ov) {
+        console.log(nv)
         if (nv.BookId === this.formData.BookId) {
           return
         }
@@ -150,12 +150,13 @@ export default {
       },
       immediate: true,
     },
-    formData: {
-      handler (nv) {
-        this.mergeDetail(nv)
-      },
-      deep: true,
-    },
+    // formData: {
+    //   handler (nv) {
+    //     console.log('----------', nv)
+    //     this.bookImg = nv.BookImg
+    //   },
+    //   deep: true,
+    // },
   },
   methods: {
     ...mapMutations({
@@ -189,18 +190,22 @@ export default {
     },
 
     uploadSuccess(res) {
-      this.formData.BookImg = res.result.url
+      this.$set(this.formData, 'BookImg', res.result.url)
+      // this.formData.BookImg = res.result.url
     },
 
     filterTypes(val) {
-      const CaseId = val
-      this.getTypeList({ page: 0, CaseId, pagesize: 10000 })
+      this.getTypeList({ page: 0, caseid: val, pagesize: 10000 })
     },
 
     submit() {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          this.updateDetail()
+          if (!this.formData.Price) {
+            this.formData.Price = 0
+          }
+
+          this.updateDetail(this.formData)
             .then(() => {
               this.$message({
                 showClose: true,

src/pages/system/library/books/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"
@@ -19,19 +19,18 @@
           <el-input v-model="bookName"></el-input>
         </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>
     <div>
       <el-button plain @click="editBook()" size="medium">图书录入</el-button>
-      <el-button plain @click="showBatchInput()" size="medium">批量导入</el-button>
-      <el-button type="text" size="medium">点击下载导入模板</el-button>
+      <el-button plain @click="showDialog = true" 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.BookImg" alt>
+              <img width="64" :src="scope.row.BookImg" alt>
             </template>
           </el-table-column>
           <el-table-column prop="BookBarcode" label="条码"></el-table-column>
@@ -85,6 +84,19 @@
         ></el-pagination>
       </div>
     </div>
+    <el-dialog
+      title="批量导入"
+      :visible.sync="showDialog"
+      width="50%">
+      <div :style="{ margin: 'auto', width: '80%' }">
+        <div><el-button @click="showBatchInput" :style="{ width: '100%' }">上传文件</el-button></div>
+        <div><el-button type="text" size="medium" :style="{ float: 'right' }">下载导入模板</el-button></div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="showDialog = false">确 定</el-button>
+        <el-button @click="showDialog = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -100,7 +112,8 @@ export default {
       caseId: '',
       bookBarcode: '',
       bookName: '',
-      inputRef: window.document.createElement('input')
+      inputRef: window.document.createElement('input'),
+      showDialog: false,
     }
   },
   computed: {
@@ -128,19 +141,20 @@ export default {
       getList: 'getBookList',
       getTypeList: 'getTypeList',
       deleteBook: 'deleteBook',
-      setBookRecommend: 'setBookRecommend'
+      setBookRecommend: 'updateBookDetail',
+      batchImport: 'batchImport',
     }),
 
     // 查询过滤
     filterList({ page = 0 } = {}) {
       const caseId = this.caseId || this.defaultCase
-      this.getTypeList({ page: 0, pagesize: 1000, CaseId: caseId })
+      this.getTypeList({ page: 0, pagesize: 1000, caseid: caseId })
 
       this.getList({
         page,
-        CaseId: caseId,
-        BookBarcode: this.bookBarcode,
-        BookName: this.bookName
+        caseid: caseId,
+        barcode: this.bookBarcode,
+        name: this.bookName
       }).catch(err => {
         this.$message({
           showClose: true,
@@ -192,6 +206,7 @@ export default {
     // 设为/取消推荐
     setRecommend(book) {
       const tipMsg = book.IsRecommend === 1 ? '确定取消推荐?' : '确认设置为推荐?'
+      book.IsRecommend = Math.abs(book.IsRecommend - 1)
 
       this.$confirm(tipMsg, '提示', {
         confirmButtonText: '是',
@@ -241,6 +256,14 @@ export default {
     importBatch(e) {
       // 需要指定案场
       const caseName = this.getCaseName(this.caseId)
+      const file = e.target.files[0]
+      if (!file) {
+        this.$message({
+          showClose: true,
+          message: '请选择导入文件',
+          type: 'error'
+        })
+      }
 
       this.$confirm(`数据将被导入至【${caseName}】案场, 是否继续?`, '提示', {
         confirmButtonText: '确定',
@@ -248,8 +271,33 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          // TODO
-          // const file = e.target.files[0];
+          const data = {
+            caseId: this.caseId,
+            excel: file,
+          }
+
+          this.batchImport(data).then(() => {
+            this.$confirm(`数据导入完成, 点击【确定】刷新页面`, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              window.location.reload()
+            })
+          }).catch((err) => {
+            this.$message({
+              showClose: true,
+              message: err,
+              type: 'error'
+            })
+          })
+
+          // const loading = this.$loading({
+          //   lock: true,
+          //   text: '数据导入中, 可能耗时较长, 请稍后 ...',
+          // })
+
+          // window.setTimeout(() => loading.close(), 2000)
         })
         .catch(x => x)
     },

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

@@ -28,7 +28,7 @@
         <el-input v-model="formData.BookTypeName" :style="{ width: '200px' }"></el-input>
       </el-form-item>
       <el-form-item :style="{ paddingTop: '40px' }">
-        <el-button type="primary" @click="submit()">立即创建</el-button>
+        <el-button type="primary" @click="submit()">保存</el-button>
         <el-button @click="$router.back()">取消</el-button>
       </el-form-item>
     </el-form>
@@ -62,9 +62,7 @@ export default {
   created() {
     const id = this.$route.params.id
     if (id) {
-      this.getInfo({
-        BookTypeId: id
-      }).catch(err => {
+      this.getInfo({ id }).catch(err => {
         this.$message({
           showClose: true,
           message: err,
@@ -82,27 +80,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: {
@@ -121,12 +98,12 @@ export default {
       },
       immediate: true,
     },
-    formData: {
-      handler (nv) {
-        this.mergeDetail(nv)
-      },
-      deep: true,
-    },
+    // formData: {
+    //   handler (nv) {
+    //     this.mergeDetail(nv)
+    //   },
+    //   deep: true,
+    // },
   },
   methods: {
     ...mapMutations({
@@ -138,13 +115,14 @@ export default {
     }),
 
     uploadSuccess(res) {
-      this.formData.BookTypeImg = res.result.url
+      this.$set(this.formData, 'BookTypeImg', res.result.url)
+      // this.formData.BookTypeImg = res.result.url
     },
 
     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,33 @@ 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
+      } else {
+        state.type.list = []
+        state.type.pagenum = 0
+      }
+    },
+    deleteTypeList (state, payload = {}) {
+      state.type.list = state.type.list.filter(x => x.BookTypeId !== payload.BookTypeId)
+    },
+    setBookList (state, payload) {
+      const { list, pagenum } = payload || {}
+      if (!!list) { // eslint-disable-line
+        state.list = list
+        state.pagenum = pagenum
+      } else {
+        state.list = []
+        state.pagenum = 0
+      }
+    },
+    deleteBookList (state, payload = {}) {
+      state.list = state.list.filter(x => x.BookId !== payload.BookId)
+    },
   },
   actions: {
     cancelBorrow ({ commit }, payload) { // 取消预约
@@ -124,53 +154,123 @@ export default {
     },
     getTypeList ({ commit }, payload) {
       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) {
+    getTypeDetail ({ commit }, payload = {}) {
       return new Promise((resolve, reject) => {
-
+        ajax({
+          ...api.bookType.detail,
+          urlData: { ...payload },
+        }).then((x) => {
+          commit('mergeTypeDetail', x)
+          resolve(x)
+        })
+          .catch(({ message }) => reject(message))
       })
     },
-    updateTypeDetail ({ commit }, payload) {
+    updateTypeDetail ({ commit }, payload = {}) {
       return new Promise((resolve, reject) => {
+        const id = payload.BookTypeId
+        payload.CreateDate = ''
 
+        const apiConf = !id ? api.bookType.save : api.bookType.update
+        ajax({
+          ...apiConf,
+          data: payload,
+        }).then((x) => {
+          commit('mergeTypeDetail', x)
+          resolve(x)
+        })
+          .catch(({ message }) => reject(message))
       })
     },
     deleteType ({ commit }, payload) {
       return new Promise((resolve, reject) => {
-
+        ajax({
+          ...api.bookType.delete,
+          urlData: { id: payload.BookTypeId },
+        }).then(() => {
+          commit('deleteTypeList', payload)
+          resolve()
+        })
+          .catch(({ message }) => reject(message))
       })
     },
     getBookList ({ commit }, payload) {
       return new Promise((resolve, reject) => {
-
+        ajax({
+          ...api.book.list,
+          queryData: payload,
+        }).then((x) => {
+          console.log(x)
+          commit('setBookList', x)
+          resolve(x)
+        })
+          .catch((err) => console.log(err) && reject(err.message))
       })
     },
-    getBookDetail ({ commit }, payload) {
+    getBookDetail ({ commit }, payload = {}) {
       return new Promise((resolve, reject) => {
-
+        ajax({
+          ...api.book.detail,
+          urlData: { ...payload },
+        }).then((x) => {
+          commit('mergeBookDetail', x)
+          resolve(x)
+        })
+          .catch(({ message }) => reject(message))
       })
     },
-    updateBookDetail ({ commit }, payload) {
+    updateBookDetail ({ commit }, payload = {}) {
       return new Promise((resolve, reject) => {
+        const id = payload.BookId
 
+        const apiConf = !id ? api.book.save : api.book.update
+        ajax({
+          ...apiConf,
+          data: payload,
+        }).then((x) => {
+          commit('mergeBookDetail', x)
+          resolve(x)
+        })
+          .catch(({ message }) => reject(message))
       })
     },
-    deleteBook ({ commit }, payload) {
+    deleteBook ({ commit }, payload = {}) {
       return new Promise((resolve, reject) => {
-
+        ajax({
+          ...api.book.delete,
+          urlData: { id: payload.BookId },
+        }).then((x) => {
+          commit('deleteBookList', payload)
+          resolve(x)
+        })
+          .catch(({ message }) => reject(message))
       })
     },
-    setBookRecommend ({ commit }, payload) {
+    getStockList ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })
     },
-    getStockList ({ commit }, payload) {
+    batchImport(_, payload) {
       return new Promise((resolve, reject) => {
-
+        ajax({
+          ...api.book.import,
+          data: payload,
+        }).then(() => {
+          resolve()
+        })
+          .catch(({ message }) => reject(message))
       })
-    },
+    }
   },
 }

src/util/api.js

@@ -975,6 +975,36 @@ const $api = {
       method: 'post',
       url: `${baseUrl}${common}/booktype`
     },
+    delete: {
+      method: 'delete',
+      url: `${baseUrl}${common}/booktype/:id`
+    },
+  },
+  book: {
+    list: {
+      method: 'get',
+      url: `${baseUrl}${common}/book`
+    },
+    detail: {
+      method: 'get',
+      url: `${baseUrl}${common}/book/:id`
+    },
+    save: {
+      method: 'post',
+      url: `${baseUrl}${common}/book`
+    },
+    update: {
+      method: 'put',
+      url: `${baseUrl}${common}/book`
+    },
+    delete: {
+      method: 'delete',
+      url: `${baseUrl}${common}/book/:id`
+    },
+    import: {
+      method: 'post',
+      url: `${baseUrl}${common}/book/excel`
+    },
   },
 }
 export default $api