From aac3afd7a714ea1582f73435dd50f97bf82b1027 Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Mon, 6 Jun 2022 14:02:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  2 +-
 src/views/erp/bas/BasCustomerList.vue         | 13 +++++----
 src/views/erp/bas/BasSupplierList.vue         |  6 ++++
 .../erp/bas/modules/BasCustomerModal.vue      | 28 ++++++++++++++-----
 .../erp/bas/modules/BasSupplierModal.vue      | 27 ++++++++++++++----
 5 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index d6a2a29..43b723d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -15,7 +15,7 @@ try {
 Vue.use(Router)
 
 export default new Router({
-  mode: 'history',
+  mode: 'hash',
   base: process.env.BASE_URL,
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap
diff --git a/src/views/erp/bas/BasCustomerList.vue b/src/views/erp/bas/BasCustomerList.vue
index fd1b927..bb3c20c 100644
--- a/src/views/erp/bas/BasCustomerList.vue
+++ b/src/views/erp/bas/BasCustomerList.vue
@@ -71,7 +71,6 @@
 
       </a-table>
     </div>
-
     <basCustomer-modal ref="modalForm" @ok="modalFormOk"></basCustomer-modal>
   </a-card>
 </template>
@@ -98,6 +97,7 @@
             dataIndex: '',
             key:'rowIndex',
             width:40,
+            fixed: 'left',
             align:"center",
             customRender:function (t,r,index) {
               return parseInt(index)+1;
@@ -118,19 +118,21 @@
           {
             title:'简称',
             width:160,
+            ellipsis: true,
             align:"center",
             dataIndex: 'shortName'
           },
           {
             title:'等级',
-            width:60,
+            width:80,
             align:"center",
             dataIndex: 'customerLevelId_dictText'
           },
           {
             title:'纳税规模',
-            width:100,
+            width:150,
             align:"center",
+            ellipsis: true,
             dataIndex: 'taxScale'
           },
           {
@@ -161,6 +163,7 @@
             title: '操作',
             dataIndex: 'action',
             width:120,
+            fixed:"right",
             align:"center",
             scopedSlots: { customRender: 'action' }
           }
@@ -183,7 +186,6 @@
     methods: {
       initDictConfig(){
       },
-
       myHandleAdd(){
         this.$refs.modalForm.action = "add";
         this.handleAdd();
@@ -195,8 +197,7 @@
       myHandleDetail(record){
         this.$refs.modalForm.action = "detail";
         this.handleDetail(record);
-      },
-
+      }
     }
   }
 </script>
diff --git a/src/views/erp/bas/BasSupplierList.vue b/src/views/erp/bas/BasSupplierList.vue
index d220533..acbc569 100644
--- a/src/views/erp/bas/BasSupplierList.vue
+++ b/src/views/erp/bas/BasSupplierList.vue
@@ -119,6 +119,7 @@
             title:'简称',
             width:160,
             align:"left",
+            ellipsis: true,
             dataIndex: 'shortName'
           },
           {
@@ -131,23 +132,28 @@
             title:'纳税规模',
             width:100,
             align:"center",
+            ellipsis: true,
             dataIndex: 'taxScale_dictText'
           },
           {
             title:'所属地区',
             width:120,
             align:"left",
+            ellipsis: true,
             dataIndex: 'area'
           },
           {
             title:'业务地域',
             width:120,
             align:"left",
+            ellipsis: true,
             dataIndex: 'bizArea'
           },
           {
             title:'所属总公司',
             align:"center",
+            width:120,
+            ellipsis: true,
             dataIndex: 'headquarters'
           },
           {
diff --git a/src/views/erp/bas/modules/BasCustomerModal.vue b/src/views/erp/bas/modules/BasCustomerModal.vue
index f01604a..c6da3f5 100644
--- a/src/views/erp/bas/modules/BasCustomerModal.vue
+++ b/src/views/erp/bas/modules/BasCustomerModal.vue
@@ -1,6 +1,6 @@
 <template>
-  <j-modal
-    :title="'客户 - ' + title"
+  <!-- <j-modal -->
+    <!-- :title="'客户 - ' + title"
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
@@ -8,13 +8,19 @@
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
-    @cancel="handleCancel">
-
-    <template slot="footer">
+    @cancel="handleCancel"> -->
+<a-drawer
+    :title="'客户 - ' + title"
+    :width="width"
+    placement="right"
+    :closable="readOnly"
+    @close="handleCancel"
+    :visible="visible">
+    <!-- <template slot="footer">
       <a-button v-if="action!=='detail'" key="cancel" @click="handleCancel">取消</a-button>
       <a-button v-if="!readOnly" key="save"   @click="handleOk" type="primary" :loading="confirmLoading">保存</a-button>
       <a-button v-if="action==='detail'"  key="close"  @click="handleCancel" type="primary">关闭</a-button>
-    </template>
+    </template> -->
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
@@ -210,9 +216,17 @@
             </a-form-item>
           </a-col>
         </a-row>
+         <a-row>
+          <a-col :span="12" :offset="10">
+            <a-button v-if="action!=='detail'" key="cancel" @click="handleCancel">取消</a-button>
+            <a-button v-if="action==='detail'" key="close" @click="handleCancel" type="primary">关闭</a-button>
+            <a-button style="margin-left: 18px" v-if="!readOnly" key="save" @click="handleOk" type="primary" :loading="confirmLoading">保存</a-button>
+          </a-col>
+         </a-row>
       </a-form>
     </a-spin>
-  </j-modal>
+  </a-drawer>
+  <!-- </j-modal> -->
 </template>
 
 <script>
diff --git a/src/views/erp/bas/modules/BasSupplierModal.vue b/src/views/erp/bas/modules/BasSupplierModal.vue
index fb114bc..d989107 100644
--- a/src/views/erp/bas/modules/BasSupplierModal.vue
+++ b/src/views/erp/bas/modules/BasSupplierModal.vue
@@ -1,6 +1,6 @@
 <template>
-  <j-modal
-    :title="'供应商 - ' + title"
+  <!-- <j-modal -->
+    <!-- :title="'供应商 - ' + title"
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
@@ -8,13 +8,20 @@
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
-    @cancel="handleCancel">
+    @cancel="handleCancel"> -->
 
-    <template slot="footer">
+<a-drawer
+    :title="'供应商 - ' + title"
+    :width="width"
+    placement="right"
+    :closable="readOnly"
+    @close="handleCancel"
+    :visible="visible">
+    <!-- <template slot="footer">
       <a-button v-if="action!=='detail'" key="cancel" @click="handleCancel">取消</a-button>
       <a-button v-if="!readOnly" key="save"   @click="handleOk" type="primary" :loading="confirmLoading">保存</a-button>
       <a-button v-if="action==='detail'"  key="close"  @click="handleCancel" type="primary">关闭</a-button>
-    </template>
+    </template> -->
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
@@ -210,9 +217,17 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row>
+          <a-col :span="12" :offset="10">
+            <a-button v-if="action!=='detail'" key="cancel" @click="handleCancel">取消</a-button>
+            <a-button v-if="action==='detail'"  key="close"  @click="handleCancel" type="primary">关闭</a-button>
+            <a-button style="margin-left: 18px" v-if="!readOnly" key="save"   @click="handleOk" type="primary" :loading="confirmLoading">保存</a-button>
+          </a-col>
+        </a-row>
       </a-form>
     </a-spin>
-  </j-modal>
+  <!-- </j-modal> -->
+  </a-drawer>
 </template>
 
 <script>