许成详 6 年之前
父節點
當前提交
b16786fb70

+ 2
- 2
src/pages/system/caseManager/caseInfo/index.vue 查看文件

@@ -60,7 +60,7 @@ export default {
60 60
       total: 0,
61 61
       postData: { // 表格搜索条件
62 62
         name: '', // 案场名称
63
-        page: 0, // 当前页码
63
+        page: 1, // 当前页码
64 64
         pagesize: 10, // 请求数据量
65 65
       },
66 66
       currentList: []
@@ -102,7 +102,7 @@ export default {
102 102
     searchList (key) { // 搜索列表
103 103
       this.postData.name = key
104 104
       this.currentList = []
105
-      this.postData.page = 0
105
+      this.postData.page = 1
106 106
       this.getList()
107 107
     }
108 108
   }

+ 50
- 49
src/pages/system/caseManager/keyManager/index.vue 查看文件

@@ -6,23 +6,25 @@
6 6
         <ul>
7 7
           <li>
8 8
             <span>选择案场:</span>
9
-            <el-select v-model="tableSearch.caseId" placeholder="请选择">
9
+            <el-select v-model="CaseId" placeholder="请选择">
10 10
               <el-option
11
-                v-for="item in caseList"
12
-                :key="item.value"
13
-                :label="item.label"
14
-                :value="item.value">
11
+                v-for="item in cases"
12
+                :key="item.CaseId"
13
+                :label="item.CaseName"
14
+                :value="item.CaseId">
15 15
               </el-option>
16 16
             </el-select>
17 17
           </li>
18 18
         </ul>
19
-        <tableSearch value="请输入锁柜编号" @exportSearchKey="searchList"></tableSearch>
19
+        <el-button
20
+          size="mini"
21
+          type="primary" @click="search">搜索</el-button>
20 22
       </div>
21 23
       <div class="moreFilter"></div>
22 24
     </div>
23 25
     <div class="system-table-box">
24 26
       <el-table
25
-        :data="tableData"
27
+        :data="currentList"
26 28
         stripe
27 29
         style="width: 100%">
28 30
         <el-table-column
@@ -52,12 +54,11 @@
52 54
       </el-table>
53 55
     </div>
54 56
     <el-pagination
55
-      @size-change="handleSizeChange"
56 57
       @current-change="handleCurrentChange"
57
-      :current-page.sync="currentPage"
58
-      :page-size="10"
58
+      :current-page.sync="postData.page"
59
+      :page-size="postData.pagesize"
59 60
       layout="prev, pager, next, jumper"
60
-      :total="100">
61
+      :total="total">
61 62
     </el-pagination>
62 63
     <el-dialog title="钥匙绑定" :visible.sync="dialogTableVisible">
63 64
       <ul class="cutBindType">
@@ -89,10 +90,7 @@
89 90
 </template>
90 91
 
91 92
 <script>
92
-import { createNamespacedHelpers } from 'vuex'
93
-import tableSearch from '@/components/tableSearch/index'
94
-
95
-const { mapState: mapCaseState } = createNamespacedHelpers('case')
93
+import { mapState } from 'vuex'
96 94
 
97 95
 export default {
98 96
   name: '',
@@ -119,47 +117,53 @@ export default {
119 117
         name: '王小虎',
120 118
         address: '上海市普陀区金沙江路 1518 弄'
121 119
       }],
122
-      currentPage: 0, // 当前页码
123
-      tableSearch: { // 表格搜索条件
124
-        key: '', // 搜索关键字
125
-        caseId: '', // 案场id
120
+      total: 0,
121
+      postData: { // 表格搜索条件
122
+        CaseId: '', // 案场id
123
+        page: 1, // 当前页码
124
+        pagesize: 10, // 请求数据量
126 125
       },
127
-      tableData: [{
128
-        lockersId: 'xxx',
129
-        currentUser: 'xxx',
130
-        status: 'xxx'
131
-      }, {
132
-        lockersId: 'xxx',
133
-        currentUser: 'xxx',
134
-        status: 'xxx'
135
-      }, {
136
-        lockersId: 'xxx',
137
-        currentUser: 'xxx',
138
-        status: 'xxx'
139
-      }, {
140
-        lockersId: 'xxx',
141
-        currentUser: 'xxx',
142
-        status: 'xxx'
143
-      }]
126
+      currentList: [],
144 127
     }
145 128
   },
146
-  computed: {
147
-    ...mapCaseState({
148
-      caseList: x => x.caseList,
149
-    })
129
+  created () {
130
+    this.getList()
150 131
   },
151
-  components: {
152
-    tableSearch,
132
+  computed: {
133
+    ...mapState({
134
+      cases: x => x.app.cases.list,
135
+      defaultCaseId: x => x.app.cases.default
136
+    }),
137
+    CaseId: {
138
+      get () {
139
+        return this.postData.CaseId || this.defaultCaseId
140
+      },
141
+      set (val) {
142
+        this.postData.CaseId = val
143
+      }
144
+    }
153 145
   },
154 146
   methods: {
155 147
     sureBindPhone () { // 确认绑定手机号
156 148
       this.showCardList = true
157 149
     },
158
-    handleSizeChange (val) {
159
-      console.log(`每页 ${val} 条`)
150
+    search () { // 搜索
151
+      this.postData.page = 1
152
+      this.currentList = []
153
+      this.getList()
160 154
     },
161
-    handleCurrentChange (val) {
162
-      console.log(`当前页: ${val}`)
155
+    getList () { // 获取列表
156
+      this.$ajax(this.$api.caseManager.getKeyList.url, {
157
+        method: this.$api.caseManager.getKeyList.method,
158
+        queryData: { ...this.postData, CaseId: this.CaseId }
159
+      }).then(res => {
160
+        this.currentList = res.list
161
+        this.postData.page = res.page
162
+        this.total = res.pagenum
163
+      })
164
+    },
165
+    handleCurrentChange (val) { // 跳转到分页
166
+      this.getList()
163 167
     },
164 168
     bindItem (index, row) { // 绑定
165 169
       console.log(index, row)
@@ -183,9 +187,6 @@ export default {
183 187
         })
184 188
       })
185 189
     },
186
-    searchList (key) { // 搜索列表
187
-      console.log(key)
188
-    }
189 190
   }
190 191
 }
191 192
 </script>

+ 2
- 3
src/pages/system/channelManager/channelList/index.vue 查看文件

@@ -71,7 +71,7 @@ export default {
71 71
       total: 0,
72 72
       postData: { // 表格搜索条件
73 73
         CaseId: '', // 案场id
74
-        page: 0, // 当前页码
74
+        page: 1, // 当前页码
75 75
         pagesize: 10, // 请求数据量
76 76
       },
77 77
       currentList: []
@@ -96,7 +96,7 @@ export default {
96 96
   },
97 97
   methods: {
98 98
     search () { // 搜索
99
-      this.postData.page = 0
99
+      this.postData.page = 1
100 100
       this.currentList = []
101 101
       this.getList()
102 102
     },
@@ -114,7 +114,6 @@ export default {
114 114
       })
115 115
     },
116 116
     handleCurrentChange (val) { // 跳转到分页
117
-      this.postData.page = val - 1
118 117
       this.getList()
119 118
     },
120 119
     handleEdit (index, row) { // 编辑

+ 3
- 3
src/pages/system/goodsManager/goodsSpecManager/index.vue 查看文件

@@ -67,8 +67,8 @@ export default {
67 67
       total: 0,
68 68
       postData: { // 表格搜索条件
69 69
         CaseId: '', // 案场id
70
-        page: 0, // 当前页码
71
-        pagesize: 10, // 请求数据量
70
+        page: 1, // 当前页码
71
+        pagesize: 3, // 请求数据量
72 72
       },
73 73
       currentList: []
74 74
     }
@@ -92,7 +92,7 @@ export default {
92 92
   },
93 93
   methods: {
94 94
     search () { // 搜索
95
-      this.postData.page = 0
95
+      this.postData.page = 1
96 96
       this.currentList = []
97 97
       this.getList()
98 98
     },

+ 2
- 2
src/pages/system/goodsManager/goodsTypeManager/index.vue 查看文件

@@ -71,7 +71,7 @@ export default {
71 71
       total: 0,
72 72
       postData: { // 表格搜索条件
73 73
         CaseId: '', // 案场id
74
-        page: 0, // 当前页码
74
+        page: 1, // 当前页码
75 75
         pagesize: 10, // 请求数据量
76 76
       },
77 77
       currentList: []
@@ -96,7 +96,7 @@ export default {
96 96
   },
97 97
   methods: {
98 98
     search () { // 搜索
99
-      this.postData.page = 0
99
+      this.postData.page = 1
100 100
       this.currentList = []
101 101
       this.getList()
102 102
     },

+ 4
- 0
src/util/api.js 查看文件

@@ -35,6 +35,10 @@ const $api = {
35 35
       method: 'put',
36 36
       url: `${baseUrl}/common/case/info/:id`
37 37
     },
38
+    getKeyList: { // 获取钥匙列表
39
+      method: 'get',
40
+      url: `${baseUrl}/common/case/key`
41
+    },
38 42
   },
39 43
   goodsManager: {
40 44
     getGoodsSpecList: { // 商品规格列表