Squashed commit of the following:

commit a514bf4009 Author: 浅念 <email@sample.com> Date: Thu Sep 18 09:55:10 2025 +0800 Squashed commit of the following: commit 9e260ddcd8 Author: 浅念 <email@sample.com> Date: Thu Sep 18 09:49:33 2025 +0800 修改 kpi commit 6feb3ace75 Author: 浅念 <email@sample.com> Date: Thu Sep 18 09:42:44 2025 +0800 kpi 统计 commit ec257a246d Author: 浅念 <email@sample.com> Date: Wed Sep 17 17:04:35 2025 +0800 修改弹框表格 commit fa764852ab Author: 浅念 <email@sample.com> Date: Wed Sep 17 15:54:35 2025 +0800 添加账户简称 commit 65f7f4a123 Author: 浅念 <email@sample.com> Date: Wed Sep 17 15:10:28 2025 +0800 品牌加热门修改仪表盘接口 commit 922cfec81d Author: 浅念 <email@sample.com> Date: Tue Sep 16 15:57:17 2025 +0800 调整备货单 crm 端页面 commit 5c8df36f12 Author: 浅念 <email@sample.com> Date: Mon Sep 15 17:14:38 2025 +0800 调整备货单及各页面名称 commit 5503a14408 Author: 浅念 <email@sample.com> Date: Fri Sep 12 18:10:03 2025 +0800 账户添加公司 commit 3439b45d9a Author: 浅念 <email@sample.com> Date: Fri Sep 12 17:53:26 2025 +0800 修改终版备货单 commit 045d13eb7b Author: 浅念 <email@sample.com> Date: Fri Sep 12 17:49:07 2025 +0800 修改备货单等页面 commit da690dfa06 Author: 浅念 <email@sample.com> Date: Thu Sep 11 17:44:37 2025 +0800 修改备货单详情 commit 853e9591b3 Author: 浅念 <email@sample.com> Date: Wed Sep 10 18:11:39 2025 +0800 修改备货单页面 commit 9052bd1027 Author: 浅念 <email@sample.com> Date: Tue Sep 9 20:53:30 2025 +0800 备货单审核功能 commit 079d9babb8 Merge: ebd7479 91d810b Author: 浅念 <email@sample.com> Date: Tue Sep 9 14:51:43 2025 +0800 Merge branch 'feature/crm_pc' of http://219.157.255.213:25311/xinyouhe/art-design into feature/crm_vehicle commit ebd7479573 Merge: 64e53b6 459d306 Author: 浅念 <email@sample.com> Date: Tue Sep 9 13:57:28 2025 +0800 Merge branch 'feature/crm_pc' of http://219.157.255.213:25311/xinyouhe/art-design into feature/crm_vehicle commit 64e53b6ee9 Author: 浅念 <email@sample.com> Date: Mon Sep 8 19:09:55 2025 +0800 备货单加审批流程 commit 9bd7c89cb4 Author: 浅念 <email@sample.com> Date: Thu Sep 4 15:09:17 2025 +0800 车辆信息，备货单等页面 commit 91d810b33a Author: 浅念 <email@sample.com> Date: Tue Sep 9 14:51:23 2025 +0800 添加公司搜索 commit 459d306504 Author: 浅念 <email@sample.com> Date: Tue Sep 9 13:56:43 2025 +0800 用户添加公司搜索 commit 8a0d4fc516 Author: 浅念 <email@sample.com> Date: Thu Sep 4 14:38:09 2025 +0800 自定义跟进时间处理 commit 58f7d56f40 Author: 浅念 <email@sample.com> Date: Wed Sep 3 15:13:10 2025 +0800 工单去掉移动端不显示限制 commit a91e1d7820 Author: 浅念 <email@sample.com> Date: Tue Sep 2 14:13:15 2025 +0800 将编号后移 commit a9f8c5c4dc Author: 浅念 <email@sample.com> Date: Wed Aug 27 09:20:56 2025 +0800 客户重复通知 commit aefd43f79d Author: 浅念 <email@sample.com> Date: Tue Aug 26 09:55:42 2025 +0800 修改通知详情样式和即时通讯 commit 1bd9d163ec Author: 浅念 <email@sample.com> Date: Mon Aug 25 15:31:14 2025 +0800 通知列表富文本内容显示 commit be6093e57d Author: 浅念 <email@sample.com> Date: Mon Aug 25 13:34:13 2025 +0800 crm 客户添加自定义列跟进添加图片粘贴上传 commit d83246ba8c Author: 浅念 <email@sample.com> Date: Fri Aug 22 18:33:58 2025 +0800 显示编号 commit 329acaf68d Author: 浅念 <email@sample.com> Date: Fri Aug 22 18:27:26 2025 +0800 通知板块及功能调整 commit b319944007 Author: 浅念 <email@sample.com> Date: Thu Aug 21 11:12:12 2025 +0800 调整联系方式字段为电话列表中多个联系方式纵向排列显示会增加公司信息的自定义输入框排序搜索等功能 commit 70d26f0829 Author: 浅念 <email@sample.com> Date: Tue Aug 19 16:18:15 2025 +0800 1.0.3 的相关功能 commit 0e84bedb67 Author: 浅念 <email@sample.com> Date: Fri Aug 15 16:31:55 2025 +0800 v1.0.2 更新内容 commit f5deb7b8f7 Author: 浅念 <email@sample.com> Date: Wed Aug 13 19:27:49 2025 +0800 添加菜单权限等页面 commit e797cb24de Author: 浅念 <email@sample.com> Date: Mon Aug 11 19:24:24 2025 +0800 添加工单附件及样式 commit 619311dfbe Author: chenlan <suya123456> Date: Fri Aug 8 22:13:25 2025 +0800 添加crm 归属客户 commit b402e522bf Author: 浅念 <email@sample.com> Date: Thu Aug 7 10:51:17 2025 +0800 询单权限校验 commit f950f665a9 Author: 浅念 <email@sample.com> Date: Thu Aug 7 10:10:45 2025 +0800 添加询单图片预览 commit 8deecc8197 Author: 浅念 <email@sample.com> Date: Wed Aug 6 18:36:42 2025 +0800 修改用户页面询单 commit 3e24d1905f Author: 浅念 <email@sample.com> Date: Tue Aug 5 18:25:32 2025 +0800 添加用户页面客户页面接口等 commit 7542d80e38 Author: 浅念 <email@sample.com> Date: Mon Aug 4 18:05:07 2025 +0800 修改仪表盘页面样式 commit e5548f95e4 Author: 浅念 <email@sample.com> Date: Mon Aug 4 14:50:55 2025 +0800 修改询单字段仪表盘页面及添加管理端客户页面 commit d30ea5b7bf Author: 浅念 <email@sample.com> Date: Mon Aug 4 14:48:58 2025 +0800 添加echarts 插件 commit 0e4160c5ca Author: 浅念 <email@sample.com> Date: Fri Aug 1 18:27:22 2025 +0800 仪表盘接口 commit bd23288acd Author: 浅念 <email@sample.com> Date: Fri Aug 1 18:26:46 2025 +0800 修改仪表盘 commit 6bfb940881 Author: 浅念 <email@sample.com> Date: Fri Aug 1 10:01:35 2025 +0800 客户列表添加公海详情展示 commit b50f650565 Author: 浅念 <email@sample.com> Date: Thu Jul 31 17:26:36 2025 +0800 修改客户标签样式个人信息添加邮箱修复关闭全部页面404 commit ea1dbb7af4 Author: 浅念 <email@sample.com> Date: Wed Jul 30 18:50:31 2025 +0800 修改公海和询单页面 commit 1bfbb95bd9 Author: 浅念 <email@sample.com> Date: Wed Jul 30 17:23:09 2025 +0800 修改样式和添加用户数据显示 commit a9f5f76b35 Author: 浅念 <email@sample.com> Date: Wed Jul 30 15:06:03 2025 +0800 设置默认页面 commit 3ea9d3d5df Author: 浅念 <email@sample.com> Date: Wed Jul 30 11:46:31 2025 +0800 修改飞书登录公司id 系统id 获取不到问题客户及公海添加用户信息显示 commit 0cef82279f Author: 浅念 <email@sample.com> Date: Tue Jul 29 16:42:36 2025 +0800 修改工单客户等页面 commit 695ebbcc71 Author: 浅念 <email@sample.com> Date: Fri Jul 25 17:50:04 2025 +0800 修改默认值 commit ffc194a1c1 Author: 浅念 <email@sample.com> Date: Fri Jul 25 17:05:33 2025 +0800 飞书授权添加系统码及登录进入页面路由 commit 48b95e252f Author: 浅念 <email@sample.com> Date: Fri Jul 25 15:48:49 2025 +0800 回收站添加占位 commit 382011d592 Author: 浅念 <email@sample.com> Date: Fri Jul 25 15:11:50 2025 +0800 修改登录页样式公海数据个人信息默认图 commit 0f790269db Author: 浅念 <email@sample.com> Date: Fri Jul 25 09:16:55 2025 +0800 修改字段名称 commit f18cfdb69e Author: 浅念 <email@sample.com> Date: Thu Jul 24 17:28:51 2025 +0800 调整代码格式 commit 858147fbbd Author: 浅念 <email@sample.com> Date: Thu Jul 24 10:17:22 2025 +0800 修改token刷新及修改询单详情展示 commit c333b907e6 Author: 浅念 <email@sample.com> Date: Wed Jul 23 18:22:56 2025 +0800 对接询单接口 commit 7979a31e36 Author: 浅念 <email@sample.com> Date: Wed Jul 23 14:40:02 2025 +0800 修改代码格式 commit 4a39387865 Author: 浅念 <email@sample.com> Date: Wed Jul 23 14:07:13 2025 +0800 设置客户列表权限 commit fc4de02582 Author: 浅念 <email@sample.com> Date: Tue Jul 22 17:08:13 2025 +0800 feat(router): 调整菜单 commit 2ffe0c9753 Author: 浅念 <email@sample.com> Date: Tue Jul 22 17:04:16 2025 +0800 feat(crmApi.ts): 调整结构 commit c3fb2c48d3 Author: 浅念 <email@sample.com> Date: Tue Jul 22 17:00:25 2025 +0800 feat(router): 路由调整 commit c5b0a8265a Author: 浅念 <email@sample.com> Date: Tue Jul 22 16:54:06 2025 +0800 chore: 添加询单页面及调整菜单 commit ca06c9bc46 Author: 浅念 <email@sample.com> Date: Tue Jul 22 16:35:43 2025 +0800 询单页面及菜单 commit 3b6de4c7fa Merge: d3bb4ec 85e8b9b Author: 浅念 <email@sample.com> Date: Tue Jul 22 09:22:20 2025 +0800 Merge branch 'master' into feature/crm_pc commit d3bb4ec6e5 Merge: c7d8908 d7ab6f1 Author: 浅念 <email@sample.com> Date: Mon Jul 21 18:22:55 2025 +0800 Merge branch 'master' into feature/crm_pc # Conflicts: # .gitignore # src/api/crmApi.ts # src/api/usersApi.ts # src/store/modules/user.ts # src/utils/http/index.ts # src/views/auth/login/index.vue # src/views/crmpc/customer/Show.vue # src/views/crmpc/customer/index.vue commit c7d890809c Author: 浅念 <email@sample.com> Date: Mon Jul 21 18:12:16 2025 +0800 添加系统码 commit 31cd18fade Author: 浅念 <email@sample.com> Date: Mon Jul 21 18:02:48 2025 +0800 Merge branch 'master' into feature/crm_pc # Conflicts: # .gitignore commit 59c9c97c08 Author: 浅念 <email@sample.com> Date: Mon Jul 21 17:56:52 2025 +0800 Merge branch 'master' into feature/crm_pc # Conflicts: # .gitignore commit d4b577c42e Author: 浅念 <email@sample.com> Date: Mon Jul 21 13:03:56 2025 +0800 feat(crm): 添加相关图片 commit e4967760b7 Merge: 0c67666 85102fc Author: 浅念 <email@sample.com> Date: Mon Jul 21 11:25:49 2025 +0800 Finish crm_pc commit 85102fcf32 Author: 浅念 <email@sample.com> Date: Mon Jul 21 11:24:06 2025 +0800 crm 接口对接 commit 0c67666793 Author: 浅念 <email@sample.com> Date: Wed Jul 16 17:18:14 2025 +0800 添加上传头部信息 commit a41c75f703 Author: 浅念 <email@sample.com> Date: Tue Jul 15 09:40:53 2025 +0800 修改页面 commit 22ae0e86c8 Author: 浅念 <email@sample.com> Date: Mon Jul 14 17:59:02 2025 +0800 修改页面 commit 812e3c4b0c Author: 浅念 <email@sample.com> Date: Mon Jul 14 10:09:10 2025 +0800 修改菜单问题 commit 2ad479b006 Author: 浅念 <email@sample.com> Date: Fri Jul 11 19:45:57 2025 +0800 修改样式 commit 5802e157bf Author: 浅念 <email@sample.com> Date: Fri Jul 11 19:43:34 2025 +0800 修改工单 commit 713d43f7b4 Author: 浅念 <email@sample.com> Date: Fri Jul 11 18:37:16 2025 +0800 添加登录 commit 719911918f Author: 浅念 <email@sample.com> Date: Fri Jul 4 17:16:38 2025 +0800 项目创建 commit ce47b39fa5 Author: 浅念 <email@sample.com> Date: Wed Jul 2 09:37:51 2025 +0800 删除 # Conflicts: # src/App.vue # src/api/adminApi.ts # src/api/crmApi.ts # src/api/menuApi.ts # src/api/systemApi.ts # src/api/usersApi.ts # src/components/core/layouts/art-header-bar/index.vue # src/components/core/layouts/art-page-content/index.vue # src/router/routes/asyncRoutes.ts # src/router/routesAlias.ts # src/views/admin/customer/customeraudit.vue # src/views/admin/customer/highseas.vue # src/views/admin/customer/index.vue # src/views/admin/inquiry_system/index.vue # src/views/admin/system/company.vue # src/views/admin/system/feishu_app.vue # src/views/admin/system/menu/index.vue # src/views/admin/system/role/index.vue # src/views/admin/system/systems.vue # src/views/admin/user/index.vue # src/views/admin/user/user_info.vue # src/views/auth/login/index.vue # src/views/crmpc/customer/Add.vue # src/views/crmpc/customer/Edit.vue # src/views/crmpc/customer/Followadd.vue # src/views/crmpc/customer/Show.vue # src/views/crmpc/customer/index.vue # src/views/crmpc/highseas/index.vue # src/views/crmpc/recycle/index.vue # src/views/crmpc/team/team_customer.vue # src/views/crmpc/team/user_customer.vue # src/views/dashboard/console/index.vue # src/views/system/user-center/index.vue # src/views/work/myOrder/index.vue # src/views/work/order/index.vue
2025-09-18 10:57:17 +08:00
parent 5d906087d3
commit c7cdec27e0
100 changed files with 31463 additions and 1997 deletions
@@ -116,6 +116,50 @@
              <ElFormItem label="邮箱" prop="email">
                <ElInput v-model="form.email" :disabled="!isEdit" />
              </ElFormItem>
+              <ElFormItem label="签名" prop="signature" class="right-input">
+                <template v-if="form.sign_img">
+                  <img :src="sign_img_url" class="signature-img" />
+                  <el-button
+                    v-if="isEdit"
+                    style="margin-left: 12px"
+                    @click="showReSignQR = !showReSignQR"
+                  >
+                    重新签名
+                  </el-button>
+                  <div
+                    v-if="isEdit && showReSignQR"
+                    class="signature-qrcode"
+                    style="margin-top: 20px; margin-left: 20px"
+                  >
+                    <qrcode-vue
+                      :value="qrcodeUrl"
+                      :size="200"
+                      level="M"
+                      render-as="svg"
+                      :include-margin="true"
+                      background="#ffffff"
+                      foreground="#000000"
+                    />
+                    <div class="qrcode-tip">手机扫码重新签名</div>
+                  </div>
+                </template>
+                <template v-else>
+                  <div class="signature-qrcode">
+                    <qrcode-vue
+                      :value="qrcodeUrl"
+                      :size="200"
+                      level="M"
+                      render-as="svg"
+                      :include-margin="true"
+                      background="#ffffff"
+                      foreground="#000000"
+                    />
+                    <div class="qrcode-tip">手机扫码进行签名</div>
+                  </div>
+                </template>
+                <!-- <el-button @click="handleSignature" type="primary">签名</el-button> -->
+                <el-input type="hidden" v-model="form.signature" />
+              </ElFormItem>
            </ElRow>
            <!-- <ElRow>
              <ElFormItem
@@ -218,15 +262,18 @@
  import { UserService } from '@/api/usersApi'
  import { useUploadHeaders } from '@/composables/useUploadHeaders'
  import { useUserStore } from '@/store/modules/user'
+  import { computed } from 'vue'
+  import QrcodeVue from 'qrcode.vue'
  const { uploadHeaders } = useUploadHeaders()
  let actionImageUplode = `${import.meta.env.VITE_API_URL}/ticket/upload`
-  defineOptions({ name: 'UserCenter' })
+  defineOptions({ name: 'AdminUserCenter' })
  // 定义客户详情类型
  interface CustomerInfo {
    [key: string]: any
  }
  // const imageUrls = ref(imageUrl)
  const imageUrlavatar = ref('')
+  const sign_img_url = ref('')
  // const socialize_pic_full = ref('')
  // const countryOptions = ref<any>()
  const form = ref<CustomerInfo>({})
@@ -240,16 +287,23 @@
  //     countryOptions.value = res||[]
  //   } catch (error) { countryOptions.value = [] }
  // }
-  const { getUserInfo } = useUserStore()
+  // const { getUserInfo } = useUserStore()
  const userInfo = ref<CustomerInfo>({})
  const getuserInfo = async () => {
-    // const data = await CrmService.userget()
-    userInfo.value = getUserInfo.user
-    form.value = getUserInfo.user
-    imageUrlavatar.value = getUserInfo.user.avatar
+    const data = await UserService.getUserInfo()
+    userInfo.value = data.user
+    form.value = data.user
+    imageUrlavatar.value = data.user.avatar
+    // socialize_pic_full.value = data.socialize_pic_full
+    sign_img_url.value = data.user.sign_img_url
+    // userInfo.value = getUserInfo.user
+    // form.value = getUserInfo.user
+    // imageUrlavatar.value = getUserInfo.user.avatar
+    // sign_img_url.value = getUserInfo.user.sign_img_url
    // socialize_pic_full.value = data.socialize_pic_full
  }
  const isEdit = ref(false)
+  const showReSignQR = ref(false)
  const isEditPwd = ref(false)
  const pwdForm = reactive({
    password: '',
@@ -265,11 +319,11 @@
      label: '未知'
    },
    {
-      value: '1',
+      value: 1,
      label: '男'
    },
    {
-      value: '2',
+      value: 2,
      label: '女'
    }
  ]
@@ -277,13 +331,35 @@
    // await getarea()
    await getuserInfo()
  })
+  const qrcodeUrl = computed(() => {
+    const userStore = useUserStore() as any
+    const userId = form.value?.id || userInfo.value?.id || ''
+    const base = location.origin
+    const params = new URLSearchParams({ userId: String(userId) })
+
+    // 只保留必要的参数，减少URL长度
+    if (userStore?.accessToken) params.append('token', userStore.accessToken)
+    if (userStore?.companyabbr) params.append('corp', userStore.companyabbr)
+    if (userStore?.companyid) params.append('corpid', userStore.companyid)
+    if (userStore?.systemsabbr) params.append('sys', userStore.systemsabbr)
+    if (userStore?.systemsid) params.append('sysid', userStore.systemsid)
+    if (userStore?.loginType) params.append('type', userStore.loginType)
+    if (userStore?.language) params.append('lang', userStore.language)
+
+    return `${base}/auth/signature/mobile?${params.toString()}`
+  })
  const edit = async () => {
    if (isEdit.value) {
-      const res = await UserService.editUserInfo(form.value)
+      const payload: any = { ...(form.value as any) }
+      delete payload.sign_img_url
+      const res = await UserService.editUserInfo(payload)
      ElMessage.success(res?.message || '操作成功')
      getuserInfo()
    }
    isEdit.value = !isEdit.value
+    if (isEdit.value === false) {
+      showReSignQR.value = false
+    }
  }

  const editPwd = async () => {
@@ -328,7 +404,7 @@
 </style>

 <style lang="scss" scoped>
-  :deep(.qrcode-radio-group .el-form-item__content){
+  :deep(.qrcode-radio-group .el-form-item__content) {
    height: 40px;
  }
  .avatar {
@@ -337,7 +413,7 @@
    border-radius: 50%;
    object-fit: cover;
  }
-  .qrcode-img{
+  .qrcode-img {
    width: 80px;
    height: 80px;
  }
@@ -372,7 +448,7 @@
          overflow: hidden;
          text-align: center;
          // background: var(--art-main-bg-color);
-          background: linear-gradient(180deg, #E9F0FF 0%, #FFFFFF 67.9%);
+          background: linear-gradient(180deg, #e9f0ff 0%, #ffffff 67.9%);

          border-radius: $box-radius;
          .avatar {
@@ -530,4 +606,7 @@
      }
    }
  }
+  .signature-img {
+    width: 160px;
+  }
 </style>