Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

.env.base

@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+VITE_BASE_URL='http://localhost:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径

src/api/login/index.ts

@@ -71,10 +71,3 @@ export const getAppInfo = (instanceId: number) => {
     url: '/admin-api/system/serviceInstance/getInstanceInfo?instanceId=' + instanceId
   })
 }
-
-export const bindWx = (data: any) => {
-  return request.post({
-    url: '/admin-api/system/user/bind/wx',
-    data
-  })
-}

src/api/system/notify/message/index.ts

@@ -15,12 +15,12 @@ export interface NotifyMessageVO {
 }
 
 // 查询站内信消息列表
-export const getNotifyMessagePage = async (params: any) => {
+export const getNotifyMessagePage = async (params: PageParam) => {
   return await request.get({ url: '/admin-api/system/notify-message/page', params })
 }
 
 // 获得我的站内信分页
-export const getMyNotifyMessagePage = async (params: any) => {
+export const getMyNotifyMessagePage = async (params: PageParam) => {
   return await request.get({ url: '/admin-api/system/notify-message/my-page', params })
 }
 

src/config/axios/service.ts

@@ -205,8 +205,6 @@ service.interceptors.response.use(
       if (msg === '无效的刷新令牌') {
         // hard coding：忽略这个提示，直接登出
         console.log(msg)
-      } else if (code == 18888) {
-        return { data }
       } else {
         ElNotification.error({ title: msg })
         if (code == 403) {

src/layout/components/Message/src/Message.vue

@@ -101,7 +101,7 @@ onUnmounted(() => {
   .message-item {
     display: flex;
     align-items: center;
-    padding: 5px 0;
+    padding: 0;
     border-bottom: 1px solid var(--el-border-color-light);
 
     &:last-child {

src/views/Basic/Dept/index.vue

@@ -23,11 +23,7 @@
     <el-table-column prop="name" label="部门名称" />
     <el-table-column prop="leader" label="负责人" width="120" />
     <el-table-column prop="sort" label="排序" width="200" />
-    <el-table-column prop="status" label="状态" width="100">
-      <template #default="{ row }">
-        {{ ['启用', '禁用'][row.status] }}
-      </template>
-    </el-table-column>
+    <el-table-column prop="status" label="状态" width="100" />
     <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
     <el-table-column label="操作" class-name="fixed-width" width="240">
       <template #default="scope">

src/views/Basic/Role/Comp/ReportDaily.vue

@@ -3,8 +3,8 @@
     <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" v-loading="formLoading">
       <el-form-item label="开启通知">
         <el-radio-group v-model="form.status">
-          <el-radio :label="0"> 开启 </el-radio>
-          <el-radio :label="1"> 关闭 </el-radio>
+          <el-radio :label="1"> 开启 </el-radio>
+          <el-radio :label="0"> 关闭 </el-radio>
         </el-radio-group>
       </el-form-item>
 

src/views/Basic/User/DeptTree.vue

@@ -1,4 +1,11 @@
 <template>
+  <div class="head-container">
+    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称">
+      <template #prefix>
+        <Icon icon="ep:search" />
+      </template>
+    </el-input>
+  </div>
   <div class="head-container">
     <el-tree
       ref="treeRef"
@@ -19,6 +26,7 @@ import { ElTree } from 'element-plus'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'
 
+const deptName = ref('')
 const deptList = ref<Tree[]>([]) // 树形结构
 const treeRef = ref<InstanceType<typeof ElTree>>()
 

src/views/Basic/User/UserForm.vue

@@ -139,8 +139,7 @@ const formData = ref({
   remark: '',
   status: CommonStatusEnum.ENABLE,
   roleIds: [],
-  hireDate: '',
-  isNewUserConfirm: false
+  hireDate: ''
 })
 const formRules = ref<any>({
   username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
@@ -193,14 +192,8 @@ const submitForm = async () => {
   try {
     const data = formData.value as unknown as UserApi.UserVO
     if (formType.value === 'create') {
-      const resp = await UserApi.createUser(data)
-      if (resp.code == 18888) {
-        await message.confirm(resp.msg)
-        formData.value.isNewUserConfirm = true
-        submitForm()
-      } else {
-        message.success(t('common.createSuccess'))
-      }
+      await UserApi.createUser(data)
+      message.success(t('common.createSuccess'))
     } else {
       await UserApi.updateUser(data)
       message.success(t('common.updateSuccess'))
@@ -227,8 +220,7 @@ const resetForm = () => {
     remark: '',
     status: CommonStatusEnum.ENABLE,
     roleIds: [],
-    hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
-    isNewUserConfirm: false
+    hireDate: formatDate(new Date(), 'YYYY-MM-DD')
   }
   formRef.value?.resetFields()
 }

src/views/Clue/Order/Comp/Reback.vue

@@ -7,9 +7,6 @@
       <el-form-item>
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
-      <el-form-item>
-        <el-input v-model="searchForm.mobile" placeholder="联系方式" clearable />
-      </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
           <el-option label="待审核" :value="1" />
@@ -136,8 +133,8 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
-      <el-table-column prop="signId" label="成交单号" min-width="150px" />
-      <el-table-column prop="name" label="线索名称" width="120px" />
+      <el-table-column prop="signId" label="成交单号" min-width="180px" />
+      <el-table-column prop="name" label="线索名称" width="150px" />
       <el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
       <el-table-column prop="money" label="回款金额" min-width="120px">
         <template #default="{ row }">
@@ -210,12 +207,6 @@
         label="转化人"
         min-width="90"
       />
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 1"
-        prop="area"
-        label="区域"
-        min-width="90"
-      />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column
         prop="dealDate"
@@ -340,7 +331,6 @@ const searchForm = ref({
   applyTime: [],
   applyUser: undefined,
   checkTime: [],
-  phone: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -368,7 +358,6 @@ function handleReset() {
     applyTime: [],
     applyUser: undefined,
     checkTime: [],
-    mobile: undefined,
     pageNo: 1,
     pageSize: 20
   }

src/views/Login/MPLogin.vue

@@ -9,17 +9,12 @@
         <el-input v-model="form.password" placeholder="请输入密码" show-password type="password" />
       </el-form-item>
     </el-form>
-    <el-button type="primary" :disabled="formLoading" class="w-full" @click="onSubmit">
-      授权登陆
-    </el-button>
+    <el-button type="primary" class="w-full" @click="onSubmit">授权登陆</el-button>
+    <div v-if="form.code">code: {{ form.code }}</div>
   </div>
 </template>
 
 <script setup name="MPLogin">
-import { bindWx } from '@/api/login'
-
-const message = useMessage() // 消息弹窗
-
 const form = ref({
   code: undefined,
   username: undefined,
@@ -43,29 +38,13 @@ const params = ref({
   scope: 'snsapi_base' // snsapi_base 静默授权获取 open id ；snsapi_userinfo 需要用户授权，获取详细信息
   // state:'code', // a-zA-Z0-9的参数值，最多128字节
 })
-
-const formLoading = ref(false)
-async function onSubmit() {
+function onSubmit() {
   // 这些需要判断没有 code 情况拉起授权登陆，有就结束放在重复拉起授权登陆
   if (!form.value.code) {
     const access_url = WX_AUTH_URL + `${new URLSearchParams(params.value)}` + REDIRECT
     location.href = access_url
   } else {
-    // 校验表单
-    if (!formRef.value) return
-    const valid = await formRef.value.validate()
-    if (!valid) return
-    // 提交请求
-    formLoading.value = true
-    try {
-      await bindWx(form.value)
-      message.success('绑定成功')
-      window.close()
-    } catch (error) {
-      console.log(error)
-    } finally {
-      formLoading.value = false
-    }
+    alert(`授权成功!`)
   }
 }
 

src/views/Profile/NotifyMessage.vue

@@ -49,7 +49,7 @@
     @row-dblclick="handleDetail"
   >
     <el-table-column type="selection" :selectable="selectable" reserve-selection width="60px" />
-    <el-table-column label="类型" align="left" prop="messageTypeName" width="200px" />
+    <el-table-column label="类型" align="left" prop="messageType" width="200px" />
     <el-table-column label="标题" align="left" prop="title" />
     <el-table-column
       label="时间"
@@ -100,10 +100,7 @@ const queryFormRef = ref() // 搜索的表单
 const getList = async () => {
   loading.value = true
   try {
-    const data = await NotifyMessageApi.getMyNotifyMessagePage({
-      ...queryParams,
-      roleId: userStore.getUser?.currentRole
-    })
+    const data = await NotifyMessageApi.getNotifyMessagePage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -122,10 +119,11 @@ const handleQuery = () => {
   getList()
 }
 
-async function handleDetail(row: any) {
+function handleDetail(row: any) {
   if (!row.readStatus) {
-    await handleReadOne(row.id)
+    handleReadOne(row.id)
   }
+
   const url = router.resolve({
     path: '/nm-detail',
     query: { id: row.id }
@@ -136,14 +134,6 @@ async function handleDetail(row: any) {
 const tableRef = ref() // 表格的 Ref
 const selectedIds = ref<number[]>([]) // 表格的选中 ID 数组
 
-/** 标记一条站内信已读 */
-const handleReadOne = async (id: number) => {
-  await NotifyMessageApi.updateNotifyMessageRead({
-    ids: [id]
-  })
-  await getList()
-}
-
 /** 标记全部站内信已读 **/
 const handleUpdateAll = async () => {
   await NotifyMessageApi.updateAllNotifyMessageRead({
@@ -168,6 +158,15 @@ const handleUpdateList = async () => {
   await getList()
 }
 
+/** 标记一条站内信已读 */
+const handleReadOne = async (id: number) => {
+  await NotifyMessageApi.updateNotifyMessageRead({
+    ids: [id],
+    roleId: userStore.getUser?.currentRole
+  })
+  await getList()
+}
+
 /** 当表格选择项发生变化时会触发该事件  */
 const handleSelectionChange = (array: NotifyMessageApi.NotifyMessageVO[]) => {
   selectedIds.value = []

src/views/Profile/NotifyMessageDetail.vue

@@ -1,12 +1,5 @@
-<!--
- * @Author: riverQiu
- * @Date: 2024-09-11 18:42:37
- * @LastEditors: riverQiu
- * @LastEditTime: 2024-09-11 19:03:23
- * @Description: 
--->
 <template>
-  <div class="container">
+  <div class="p-20px">
     <ContentWrap style="max-width: 1000px; margin: 0 auto">
       <div class="text-center">
         <div class="mb-10px" style="font-size: 24px; letter-spacing: 2px">
@@ -24,7 +17,7 @@
 </template>
 
 <script setup name="NMDetail">
-import { getNotifyMessageDetail, updateNotifyMessageRead } from '@/api/system/notify/message'
+import { getNotifyMessageDetail } from '@/api/system/notify/message'
 import { formatDate } from '@/utils/formatTime'
 
 const route = useRoute()
@@ -33,32 +26,15 @@ const info = ref({})
 function init() {
   getNotifyMessageDetail(route.query.id).then((data) => {
     info.value = data
-    if (!data.readStatus) {
-      handleReadOne(data.id)
-    }
   })
 }
 
-/** 标记一条站内信已读 */
-const handleReadOne = async (id) => {
-  await updateNotifyMessageRead({
-    ids: [id]
-    // roleId: userStore.getUser?.currentRole
-  })
-  await getList()
-}
-
 onMounted(() => {
   init()
 })
 </script>
 
 <style lang="scss" scoped>
-.container {
-  padding: 20px;
-  max-height: 100%;
-  overflow-y: auto;
-}
 :deep(p) {
   font-size: 14px;
 }