From 9476b458c82f256e99edb25e2ddf409dd1b999e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A4=A9=E6=89=AC?= <18784771@qq.com>
Date: Sun, 21 Nov 2021 16:39:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/sales.js                     |  9 +++++
 .../Fields/ClientCategoriesSelect.vue         | 10 ++---
 frontend/src/views/client/Client.vue          | 40 +++++++++++++++----
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/frontend/src/api/sales.js b/frontend/src/api/sales.js
index 838f563..094d70d 100644
--- a/frontend/src/api/sales.js
+++ b/frontend/src/api/sales.js
@@ -184,6 +184,15 @@ export function clientCategoriesDestroy(form) {
   })
 }
 
+export function clientCategoriesOptions(params) {
+  return axios({
+    url: '/api/client_categories/options',
+    headers: { 'X-CSRFToken': Cookies.get('csrftoken') },
+    method: 'get',
+    params,
+  })
+}
+
 // SalesPaymentRecord
 export function salesPaymentRecord(params) {
   return axios({
diff --git a/frontend/src/components/Fields/ClientCategoriesSelect.vue b/frontend/src/components/Fields/ClientCategoriesSelect.vue
index 2f05a17..5fd6216 100644
--- a/frontend/src/components/Fields/ClientCategoriesSelect.vue
+++ b/frontend/src/components/Fields/ClientCategoriesSelect.vue
@@ -1,7 +1,7 @@
 <template>
   <a-select v-model.number="value" :disabled="disabled">
     <a-select-option
-      v-for="(client) in clientList"
+      v-for="(client) in clientCategoriesOptions"
       :key="client.id"
       :value="client.id"
     >
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { clientList } from "@/api/sales";
+import { clientCategoriesOptions } from "@/api/sales";
 export default {
   props: ["value","disabled"],
   watch:{
@@ -21,11 +21,11 @@ export default {
   },
   data() {
     var that = this;
-    clientList().then((resp) => {
-      that.clientList = resp.data.results;
+    clientCategoriesOptions().then((resp) => {
+      that.clientCategoriesOptions = resp.data.results;
     });
     return {
-      clientList: [],
+      clientCategoriesOptions: [],
     };
   },
 };
diff --git a/frontend/src/views/client/Client.vue b/frontend/src/views/client/Client.vue
index b699d84..400c46a 100644
--- a/frontend/src/views/client/Client.vue
+++ b/frontend/src/views/client/Client.vue
@@ -51,8 +51,19 @@
         <a-form-model-item prop="number" label="客户编号">
           <a-input v-model="form.number" />
         </a-form-model-item>
-        <a-form-model-item prop="contacts" label="联系人">
-          <a-input v-model="form.contacts" />
+          <a-form-model-item prop="level" label="等级">
+          <a-select v-model="form.level">
+            <a-select-option :value="0">1</a-select-option>
+          <a-select-option :value="1">2</a-select-option>
+          <a-select-option :value="2">3</a-select-option>
+          <a-select-option :value="3">4</a-select-option>
+          </a-select>
+        </a-form-model-item>
+       <a-form-model-item prop="category" label="客户分类">
+         <ClientCategoriesSelect v-model="form.category"></ClientCategoriesSelect>
+        </a-form-model-item>
+        <a-form-model-item prop="contact" label="联系人">
+          <a-input v-model="form.contact" />
         </a-form-model-item>
         <a-form-model-item prop="phone" label="手机号">
           <a-input v-model="form.phone" />
@@ -63,11 +74,9 @@
         <a-form-model-item prop="address" label="地址">
           <a-input v-model="form.address" />
         </a-form-model-item>
-        <a-form-model-item prop="status" label="状态">
-          <a-select v-model="form.status">
-            <a-select-option :value="true">启用</a-select-option>
-            <a-select-option :value="false">停用</a-select-option>
-          </a-select>
+        <a-form-model-item prop="is_active" label="激活状态">
+             <a-switch checked-children="开" un-checked-children="关" 
+             v-model="form.is_active" />
         </a-form-model-item>
         <a-form-model-item prop="order" label="排序">
           <a-input-number v-model="form.order" />
@@ -107,7 +116,19 @@
           {
             title: '客户编号',
             dataIndex: 'number',
-            key: 'name',
+            key: 'number',
+            sorter: true,
+          },
+          {
+            title: '客户等级',
+            dataIndex: 'level_display',
+            key: 'level_display',
+            sorter: true,
+          },
+          {
+            title: '客户分类',
+            dataIndex: 'category_name',
+            key: 'category_name',
             sorter: true,
           },
           {
@@ -168,6 +189,9 @@
         visible: false,
       };
     },
+    components:{
+      ClientCategoriesSelect: () => import("@/components/Fields/ClientCategoriesSelect"),
+    },
     methods: {
       initailize() {
         this.resetForm();