Merge pull request #130 from ArtisanCloud/dev/michaelhu

Dev/michaelhu
ArtisanCloud · Oct 23, 2023 · 6a5260c · 6a5260c
2 parents 8c70b8f + 3bd1936
commit 6a5260c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5,159 deletions.
diff --git a/.env.develop b/.env.develop
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "@fullcalendar/timegrid": "^6.1.6",
     "@fullcalendar/vue3": "^6.1.6",
     "@vueuse/core": "^9.3.0",
-    "@yaoyaochi/weyui": "^1.2.3",
+    "@yaoyaochi/weyui": "^1.3.3",
     "axios": "^0.24.0",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",

diff --git a/src/api/crm/customer-domain/customer.ts b/src/api/crm/customer-domain/customer.ts
@@ -15,6 +15,7 @@ export interface Customer extends PowerModel, CustomerExternalId {
   name: string;
   mobile: string;
   email: string;
+  uuid: string;
   inviterId: number;
   source: number;
   type: number;

diff --git a/src/views/crm/customer-domain/customer/components/edit-customer.vue b/src/views/crm/customer-domain/customer/components/edit-customer.vue
@@ -16,6 +16,13 @@
       <a-form-item label="邮箱地址" field="email">
         <a-input v-model="formModel.email" />
       </a-form-item>
+      <a-form-item label="唯一识别号" field="uuid">
+        <a-typography-text>{{
+          prop.node.uuid !== ''
+            ? prop.node.uuid
+            : '提交保存后会自动生成唯一识别号'
+        }}</a-typography-text>
+      </a-form-item>
       <a-form-item label="客源" field="source">
         <a-select
           v-model="formModel.source"
@@ -87,16 +94,15 @@
 
   const options = useOptionsStore();
 
-  const fileList = [];
-
   const formRef = ref();
   const formModel = ref({
     id: prop.node.id,
     name: prop.node.name,
     mobile: prop.node.mobile,
     email: prop.node.email,
-    inviter: prop.node.inviter,
-    inviterId: prop.node.inviterId,
+    // uuid: prop.node.uuid,
+    // inviter: prop.node.inviter,
+    // inviterId: prop.node.inviterId,
     source: prop.node.source,
     type: prop.node.type,
     isActivated: prop.node.isActivated,