wangfei 6 years ago
parent
commit
2f5bd0fb8b

+ 2
- 2
config/index.js View File

12
     proxyTable: {
12
     proxyTable: {
13
       '/api': {
13
       '/api': {
14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
15
-        // target: 'http://localhost:8080', //wf
15
+        target: 'http://localhost:8080', //wf
16
         // target: 'http://127.0.0.1:8080', 
16
         // target: 'http://127.0.0.1:8080', 
17
         // target: 'http://192.168.0.11:8080', //ys
17
         // target: 'http://192.168.0.11:8080', //ys
18
-        target: 'http://192.168.0.102:8080', //hyq
18
+        // target: 'http://192.168.0.102:8080', //hyq
19
         // target: 'http://dev.ycjcjy.com', //frp
19
         // target: 'http://dev.ycjcjy.com', //frp
20
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
20
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
21
         // pathRewrite: {
21
         // pathRewrite: {

+ 2
- 2
src/pages/system/library/borrow/bookreturn.vue View File

1
 <template>
1
 <template>
2
   <div class="subPage edit-book" :style="{ padding: '20px' }">
2
   <div class="subPage edit-book" :style="{ padding: '20px' }">
3
     <div v-if="!active">
3
     <div v-if="!active">
4
-      <el-form>
4
+      <el-form style="text-align: center;">
5
         <el-form-item>
5
         <el-form-item>
6
-          <el-input v-model="customerInfo" placeholder="会员手机号或条形码" :style="{ width: '200px' }"></el-input>
6
+          <el-input v-model="customerInfo" placeholder="会员手机号或条形码" :style="{ width: '400px' }"></el-input>
7
         </el-form-item>
7
         </el-form-item>
8
         <el-form-item :style="{ paddingTop: '20px' }">
8
         <el-form-item :style="{ paddingTop: '20px' }">
9
           <el-button type="primary" @click="nextStep()">下一步</el-button>
9
           <el-button type="primary" @click="nextStep()">下一步</el-button>

+ 3
- 3
src/pages/system/library/borrow/borrow.vue View File

1
 <template>
1
 <template>
2
   <div class="subPage edit-book" :style="{ padding: '20px' }">
2
   <div class="subPage edit-book" :style="{ padding: '20px' }">
3
     <div v-if="!active">
3
     <div v-if="!active">
4
-      <el-form>
4
+      <el-form style="text-align: center;">
5
         <el-form-item>
5
         <el-form-item>
6
-          <el-input v-model="customerInfo" placeholder="会员手机号或条形码" :style="{ width: '200px' }"></el-input>
6
+          <el-input v-model="customerInfo" placeholder="会员手机号或条形码" :style="{ width: '400px' }"></el-input>
7
         </el-form-item>
7
         </el-form-item>
8
         <el-form-item :style="{ paddingTop: '20px' }">
8
         <el-form-item :style="{ paddingTop: '20px' }">
9
           <el-button type="primary" @click="nextStep()">下一步</el-button>
9
           <el-button type="primary" @click="nextStep()">下一步</el-button>
13
     <div v-else>
13
     <div v-else>
14
 
14
 
15
       <!-- 用户信息区 -->
15
       <!-- 用户信息区 -->
16
-      <el-form label-width="100px">
16
+      <el-form label-width="100px" inline>
17
         <el-form-item label="姓名">
17
         <el-form-item label="姓名">
18
           <span>{{ borrowHistory.CustomerName }}</span>
18
           <span>{{ borrowHistory.CustomerName }}</span>
19
         </el-form-item>
19
         </el-form-item>

+ 12
- 1
src/store/library/index.js View File

271
         })
271
         })
272
           .catch(({ message }) => reject(message))
272
           .catch(({ message }) => reject(message))
273
       })
273
       })
274
-    }
274
+    },
275
+    getBorrowHistory({ commit }, payload) {
276
+      return new Promise((resolve, reject) => {
277
+        ajax({
278
+          ...api.book.history,
279
+          urlData: { ...payload },
280
+        }).then(() => {
281
+          resolve()
282
+        })
283
+          .catch(({ message }) => reject(message))
284
+      })
285
+    },
275
   },
286
   },
276
 }
287
 }

+ 4
- 0
src/util/api.js View File

1005
       method: 'post',
1005
       method: 'post',
1006
       url: `${baseUrl}${common}/book/excel`
1006
       url: `${baseUrl}${common}/book/excel`
1007
     },
1007
     },
1008
+    history: {
1009
+      method: 'get',
1010
+      url: `${baseUrl}${common}/book/customer/:code`
1011
+    }
1008
   },
1012
   },
1009
 }
1013
 }
1010
 export default $api
1014
 export default $api