From 3c3383fcd91a18d087d947f4e22eb35bdfac57f1 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Mon, 8 Jun 2020 23:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86-=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E3=80=81=E5=BA=97=E9=93=BA=E5=8A=9F=E8=83=BD=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/organization/OrganizationCompany.vue  | 5 +++--
 src/pages/organization/OrganizationCustomer.vue | 6 +++---
 src/pages/organization/OrganizationRegion.vue   | 2 +-
 src/pages/organization/OrganizationStore.vue    | 6 +++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/pages/organization/OrganizationCompany.vue b/src/pages/organization/OrganizationCompany.vue
index 08246a8..c77bc27 100644
--- a/src/pages/organization/OrganizationCompany.vue
+++ b/src/pages/organization/OrganizationCompany.vue
@@ -61,7 +61,7 @@
                     ></i-input>
                 </FormItem>
                 <FormItem label="所属大区" prop="parentId">
-                    <Select v-model="formValidate.parentId"
+                    <Select filterable clearable v-model="formValidate.parentId"
                             placeholder="选择大区">
                         <Option v-for="item in regionList" :value="item.id" :key="item.id">{{ item.name }}</Option>
                     </Select>
@@ -267,9 +267,10 @@
                     let data = res.data;
 
                     that.data1 = [];
+
                     for (let i=0;i<data.results.records.length;i++) {
                         let item = data.results.records[i];
-                        item.index = i+ that.pageNum * that.pageSize;
+                        item.index = that.pageSize * (that.pageNum-1)  + i+1 ;
                         that.data1.push(item);
                     }
 
diff --git a/src/pages/organization/OrganizationCustomer.vue b/src/pages/organization/OrganizationCustomer.vue
index ab6a83b..12d8bd0 100644
--- a/src/pages/organization/OrganizationCustomer.vue
+++ b/src/pages/organization/OrganizationCustomer.vue
@@ -59,7 +59,7 @@
                     </i-input>
                 </FormItem>
                 <FormItem label="零售公司" prop="parentId">
-                    <Select v-model="formValidate.parentId"
+                    <Select filterable clearable v-model="formValidate.parentId"
                             placeholder="选择零售公司">
                         <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
                     </Select>
@@ -188,7 +188,7 @@
                     }
                 }
             },
-            show: function (index) {
+            show: function () {
                 this.isShow = true;
             },
             hide: function () {
@@ -269,7 +269,7 @@
                     that.data1 = [];
                     for (let i=0;i<data.results.records.length;i++) {
                         let item = data.results.records[i];
-                        item.index = i+ that.pageNum * that.pageSize;
+                        item.index = that.pageSize * (that.pageNum-1)  + i+1 ;
                         that.data1.push(item);
                     }
 
diff --git a/src/pages/organization/OrganizationRegion.vue b/src/pages/organization/OrganizationRegion.vue
index 947786a..58ee6c8 100644
--- a/src/pages/organization/OrganizationRegion.vue
+++ b/src/pages/organization/OrganizationRegion.vue
@@ -207,7 +207,7 @@
 
                     for (let i=0;i<data.results.records.length;i++) {
                         let item = data.results.records[i];
-                        item.index = i + that.pageNum * that.pageSize;
+                        item.index = that.pageSize * (that.pageNum-1)  + i+1 ;
                         that.data1.push(item);
                     }
 
diff --git a/src/pages/organization/OrganizationStore.vue b/src/pages/organization/OrganizationStore.vue
index bcd4937..7a129eb 100644
--- a/src/pages/organization/OrganizationStore.vue
+++ b/src/pages/organization/OrganizationStore.vue
@@ -112,6 +112,10 @@
                         title: '店铺名称',
                         key: 'name'
                     },
+                    {
+                        title: '店铺简称',
+                        key: 'abbreviation'
+                    },
                     {
                         title: '店铺编码',
                         key: 'code'
@@ -294,7 +298,7 @@
                     that.data1 = [];
                     for (let i=0;i<data.results.records.length;i++) {
                         let item = data.results.records[i];
-                        item.index = i+ that.pageNum * that.pageSize;
+                        item.index = that.pageSize * (that.pageNum-1)  + i+1 ;
                         that.data1.push(item);
                     }