Merge branch 'master' of git.echepei.com:caojunjie/Smart_platform_ui

src/api/basicData/customerInformation.js

@@ -3,7 +3,7 @@ import request from '@/router/axios';
 //客户资料列表查询
 export function customerList(data) {
     return request({
-        url: '/api/blade-client/corpsdesc/page',
+        url: '/api/blade-client/corpsdesc/list',
         method: 'get',
         params: data
     })

src/views/basicData/commodityCategory/index.vue

@@ -41,14 +41,19 @@ export default {
       form: {},
       option: option,
       parentId:0,
-      dataList: []
+      dataList: [],
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0,
+      }
     }
   },
   created() {
-    customerList({parentId:0}).then(res => {
-      console.log(res.data.data.records)
-      this.dataList = res.data.data.records
-    })
+    // customerList({parentId:0}).then(res => {
+    //   console.log(res.data.data.records)
+    //   this.dataList = res.data.data.records
+    // })
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)
@@ -127,8 +132,10 @@ export default {
       done();
     },
     //点击搜索按钮触发
-    searchChange() {
-      console.log('1')
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done()
     },
     searchReset() {
       console.log('1')
@@ -145,8 +152,12 @@ export default {
     refreshChange() {
       console.log('1')
     },
-    onLoad() {
-      console.log('1')
+    onLoad(page, params = {parentId:0}) {
+      let queryParams = Object.assign({}, params, {pageSize: page.pageSize, pageNum: page.currentPage})
+      customerList(queryParams).then(res => {
+        this.dataList = res.data.data.records
+        this.page.total = res.data.data.total
+      })
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {

src/views/basicData/customerCategory/index.vue

@@ -41,14 +41,16 @@ export default {
       form: {},
       option: option,
       parentId:0,
-      dataList: []
+      dataList: [],
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0,
+      }
     }
   },
   created() {
-    customerList({parentId:0}).then(res => {
-      console.log(res.data.data.records)
-      this.dataList = res.data.data.records
-    })
+
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)
@@ -126,8 +128,10 @@ export default {
       done();
     },
     //点击搜索按钮触发
-    searchChange() {
-      console.log('1')
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done()
     },
     searchReset() {
       console.log('1')
@@ -144,8 +148,13 @@ export default {
     refreshChange() {
       console.log('1')
     },
-    onLoad() {
-      console.log('1')
+    onLoad(page, params = {parentId:0}) {
+      let queryParams = Object.assign({}, params, {pageSize: page.pageSize, pageNum: page.currentPage})
+      customerList(queryParams).then(res => {
+        console.log(res.data.data.records)
+        this.dataList = res.data.data.records
+        this.page.total = res.data.data.total
+      })
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -376,8 +376,8 @@ export default {
 
     })
     if (this.$route.query.id){
-      console.log(this.$route.query.id)
       let id = this.$route.query.id.replace(/\"/g, "")
+      // let id = parseInt(this.$route.query.id)
       detail(id).then(res => {
         console.log(res.data.data)
         this.form = res.data.data;
@@ -394,7 +394,7 @@ export default {
     '$route'(to,from) {
       console.log(to,from);
       if (this.$route.query.id){
-        let id = this.$route.query.id.replace(/\"/g, "")
+        let id = JSON.parse(this.$route.query.id).replace(/\"/g, "")
         detail(id).then(res => {
           console.log(res.data.data)
           this.form = res.data.data;

src/views/basicData/customerInformation/index.vue

@@ -4,6 +4,7 @@
                :data="dataList"
                ref="crud"
                v-model="form"
+               :page.sync="page"
                @row-del="rowDel"
                @row-update="rowUpdate"
                :before-open="beforeOpen"
@@ -55,15 +56,17 @@ export default {
       form: {},
       option: option,
       parentId:0,
-      dataList: []
+      dataList: [],
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0,
+      }
     }
   },
   created() {
     console.log('wangbadan')
-    customerList({parentId:0}).then(res => {
-      console.log(res.data.data.records)
-      this.dataList = res.data.data.records
-    })
+    // this.onLoad()
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)
@@ -123,7 +126,7 @@ export default {
     //查看跳转页面
     beforeOpenPage(row,index) {
       this.$router.push({
-        path: "/detailsPage",
+        path: "/detailsPageEdit",
         query: { id: JSON.stringify(row.id) },
       });
     },
@@ -149,8 +152,11 @@ export default {
       done();
     },
     //点击搜索按钮触发
-    searchChange() {
-      console.log('1')
+    searchChange(params, done) {
+      console.log(params)
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done()
     },
     searchReset() {
       console.log('1')
@@ -167,8 +173,12 @@ export default {
     refreshChange() {
       console.log('1')
     },
-    onLoad() {
-      console.log('1')
+    onLoad(page, params = {parentId:0}) {
+      let queryParams = Object.assign({}, params, {pageSize: page.pageSize, pageNum: page.currentPage})
+      customerList(queryParams).then(res => {
+        this.dataList = res.data.data.records
+        this.page.total = res.data.data.total
+      })
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {