sc

cj

src/api/clue/settle.js

@@ -24,3 +24,8 @@ export const getMallSettleDetail = async (id) => {
 export const batchSaveSettle = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign-settlement/batch/save', data })
 }
+
+// 修改结算
+export const updateSettle = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-settlement/update/money', data })
+}

src/api/clue/sign.js

@@ -29,3 +29,25 @@ export const signAddPay = async (data) => {
 export const getSignExtraPayList = async (params) => {
   return await request.get({ url: '/admin-api/crm/sign/extra-pay/get', params })
 }
+
+// 安装状态修改
+export const updateInstallStatus = (signIdList, installStatus) => {
+  const data = {
+    signIdList,
+    installStatus
+  }
+  return request.post({ url: '/admin-api/crm/sign/install-status/batchSave', data: data })
+}
+
+// 修改生产状态
+export const updateProduceStatus = (data) => {
+  return request.put({ url: '/admin-api/crm/sign-prodcut/update', data: data })
+}
+
+export const updateProduceSort = (data) => {
+  return request.post({ url: '/admin-api/crm/sign-prodcut/adjust/sort', data: data })
+}
+
+export const getSignProfit = (params) => {
+  return request.get({ url: '/admin-api/crm/sign/profit', params })
+}

src/api/login/index.ts

@@ -71,3 +71,10 @@ 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/dept/index.ts

@@ -41,3 +41,13 @@ export const updateDept = async (params: DeptVO) => {
 export const deleteDept = async (id: number) => {
   return await request.delete({ url: '/admin-api/system/dept/delete?id=' + id })
 }
+
+// 获取部门业务指标
+export const getDeptTarget = async (deptId: number) => {
+  return await request.get({ url: '/admin-api/crm/dept-target/get', params: { deptId } })
+}
+
+// 更新部门业务指标
+export const updateDeptTarget = async (data: any) => {
+  return await request.put({ url: '/admin-api/crm/dept-target/save', data, isSubmitForm: true })
+}

src/api/system/dict/dict.data.ts

@@ -44,6 +44,11 @@ export const deleteDictData = (id: number) => {
 }
 
 // 导出字典类型数据
-export const exportDictData = (params) => {
+export const exportDictData = (params: any) => {
   return request.get({ url: '/admin-api/crm/dict-data/export', params })
 }
+
+// 获取通用字典数据
+export const getGeneralSysDictData = (dictType: string) => {
+  return request.get({ url: '/admin-api/system/dict-data/get-by-type', params: { dictType } })
+}

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

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import qs from 'qs'
 
 export interface NotifyMessageVO {
   id: number
@@ -16,35 +15,39 @@ export interface NotifyMessageVO {
 }
 
 // 查询站内信消息列表
-export const getNotifyMessagePage = async (params: PageParam) => {
+export const getNotifyMessagePage = async (params: any) => {
   return await request.get({ url: '/admin-api/system/notify-message/page', params })
 }
 
 // 获得我的站内信分页
-export const getMyNotifyMessagePage = async (params: PageParam) => {
+export const getMyNotifyMessagePage = async (params: any) => {
   return await request.get({ url: '/admin-api/system/notify-message/my-page', params })
 }
 
 // 批量标记已读
-export const updateNotifyMessageRead = async (ids) => {
+export const updateNotifyMessageRead = async (data: any) => {
   return await request.put({
-    url:
-      '/admin-api/system/notify-message/update-read?' +
-      qs.stringify({ ids: ids }, { indices: false })
+    url: '/admin-api/system/notify-message/update-read?',
+    data
   })
 }
 
 // 标记所有站内信为已读
-export const updateAllNotifyMessageRead = async () => {
-  return await request.put({ url: '/admin-api/system/notify-message/update-all-read' })
+export const updateAllNotifyMessageRead = async (data: any) => {
+  return await request.put({ url: '/admin-api/system/notify-message/update-all-read', data })
 }
 
 // 获取当前用户的最新站内信列表
-export const getUnreadNotifyMessageList = async () => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list' })
+export const getUnreadNotifyMessageList = async (params: any) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list', params })
 }
 
 // 获得当前用户的未读站内信数量
-export const getUnreadNotifyMessageCount = async () => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count' })
+export const getUnreadNotifyMessageCount = async (params: any) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count', params })
+}
+
+// 获取详情
+export const getNotifyMessageDetail = async (id: number) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get', params: { id } })
 }

src/api/system/role/daliyReport.js

@@ -0,0 +1,25 @@
+import request from '@/config/axios'
+
+// 获取角色快报配置
+export const getRoleDaliyReport = async (roleId) => {
+  return await request.get({
+    url: '/admin-api/system/role-message-setting/get',
+    params: { roleId }
+  })
+}
+
+// 保存角色每日快报配置
+export const updateRoleDaliyReport = async (data) => {
+  return await request.post({
+    url: '/admin-api/system/role-message-setting/save',
+    data,
+    isSubmitForm: true
+  })
+}
+
+// 获取每日快报发送内容
+export const getDaliyReportContent = async () => {
+  return await request.get({
+    url: '/admin-api/system/message-item/list-all-simple'
+  })
+}

src/components/Dialog/src/Dialog.vue

@@ -67,6 +67,7 @@ const emit = defineEmits(['close'])
     destroy-on-close
     draggable
     lock-scroll
+    append-to-body
     v-bind="getBindValue"
     @close="emit('close')"
   >

src/components/SSTable/index.vue

@@ -3,6 +3,8 @@
     <div class="flex">
       <el-table
         :data="tableObject.tableList"
+        :row-key="rowkey"
+        :expand-row-keys="expandRowKeys"
         border
         style="flex: 1"
         @selection-change="handleSelectionChange"
@@ -58,7 +60,9 @@ import { useRoute } from 'vue-router'
 
 const props = defineProps({
   tableObject: { type: Object, default: () => ({ tableList: [] }) },
-  tableColumns: { type: Array, default: () => [] }
+  tableColumns: { type: Array, default: () => [] },
+  rowkey: { type: String, default: 'id' },
+  expandRowKeys: { type: Array, default: () => [] }
 })
 
 const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns', 'selection-change'])

src/config/axios/service.ts

@@ -205,6 +205,8 @@ 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

@@ -1,6 +1,9 @@
 <script lang="ts" name="Message" setup>
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
+import { useUserStore } from '@/store/modules/user'
+
+const userStore = useUserStore()
 
 const { push } = useRouter()
 const activeName = ref('notice')
@@ -9,16 +12,21 @@ const list = ref<any[]>([]) // 消息列表
 
 // 获得消息列表
 const getList = async () => {
-  list.value = await NotifyMessageApi.getUnreadNotifyMessageList()
+  const data = await NotifyMessageApi.getUnreadNotifyMessageList({
+    roleId: userStore.getUser?.currentRole
+  })
+  list.value = data.list
   // 强制设置 unreadCount 为 0，避免小红点因为轮询太慢，不消除
   unreadCount.value = 0
 }
 
 // 获得未读消息数
 const getUnreadCount = async () => {
-  NotifyMessageApi.getUnreadNotifyMessageCount().then((data) => {
-    unreadCount.value = data
-  })
+  NotifyMessageApi.getUnreadNotifyMessageCount({ roleId: userStore.getUser?.currentRole }).then(
+    (data) => {
+      unreadCount.value = data
+    }
+  )
 }
 
 // 跳转我的站内信
@@ -34,9 +42,9 @@ onMounted(() => {
   // 首次加载小红点
   getUnreadCount()
   // 轮询刷新小红点
-  // msgInterval.value = setInterval(() => {
-  //   getUnreadCount()
-  // }, 1000 * 60 * 2)
+  msgInterval.value = setInterval(() => {
+    getUnreadCount()
+  }, 1000 * 60 * 2)
 })
 
 onUnmounted(() => {
@@ -56,10 +64,9 @@ onUnmounted(() => {
           <div class="message-list">
             <template v-for="item in list" :key="item.id">
               <div class="message-item">
-                <img alt="" class="message-icon" src="@/assets/imgs/avatar.gif" />
                 <div class="message-content">
                   <span class="message-title">
-                    {{ item.templateNickname }}：{{ item.templateContent }}
+                    {{ item.title }}
                   </span>
                   <span class="message-date">
                     {{ formatDate(item.createTime) }}
@@ -94,7 +101,7 @@ onUnmounted(() => {
   .message-item {
     display: flex;
     align-items: center;
-    padding: 20px 0;
+    padding: 5px 0;
     border-bottom: 1px solid var(--el-border-color-light);
 
     &:last-child {
@@ -113,6 +120,7 @@ onUnmounted(() => {
 
       .message-title {
         margin-bottom: 5px;
+        font-weight: bold;
       }
 
       .message-date {

src/permission.js

@@ -14,7 +14,16 @@ const { start, done } = useNProgress()
 
 const { loadStart, loadDone } = usePageLoading()
 // 路由不重定向白名单
-const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/swagger']
+const whiteList = [
+  '/login',
+  '/mp-login',
+  '/nm-detail',
+  '/social-login',
+  '/auth-redirect',
+  '/bind',
+  '/register',
+  '/swagger'
+]
 
 // 路由加载前
 router.beforeEach(async (to, from, next) => {

src/router/modules/remaining.ts

@@ -161,6 +161,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+  {
+    path: '/mp-login',
+    component: () => import('@/views/Login/MPLogin.vue'),
+    name: 'MPLogin',
+    meta: {
+      hidden: true,
+      title: '用户绑定',
+      noTagsView: true
+    }
+  },
   {
     path: '/sso',
     component: () => import('@/views/Login/Login.vue'),
@@ -171,6 +181,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+  {
+    path: '/nm-detail',
+    component: () => import('@/views/Profile/NotifyMessageDetail.vue'),
+    name: 'NMDetail',
+    meta: {
+      hidden: true,
+      title: '通知详情',
+      noTagsView: true
+    }
+  },
   {
     path: '/403',
     component: () => import('@/views/Error/403.vue'),

src/store/modules/user.ts

@@ -9,6 +9,7 @@ interface UserVO {
   id: number
   avatar: string
   nickname: string
+  currentRole: number
 }
 interface UserInfoVO {
   permissions: string[]
@@ -25,7 +26,8 @@ export const useUserStore = defineStore('admin-user', {
     user: {
       id: 0,
       avatar: '',
-      nickname: ''
+      nickname: '',
+      currentRole: 0
     }
   }),
   getters: {
@@ -49,7 +51,7 @@ export const useUserStore = defineStore('admin-user', {
         return null
       }
       let userInfo = cache.local.get(CACHE_KEY.USER)
-      if (!userInfo) {
+      if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
         userInfo = await getInfo({})
       }
       this.permissions = userInfo.permissions
@@ -72,7 +74,8 @@ export const useUserStore = defineStore('admin-user', {
       this.user = {
         id: 0,
         avatar: '',
-        nickname: ''
+        nickname: '',
+        currentRole: 0
       }
     },
     refresh() {

src/views/Basic/Dept/DeptForm.vue

@@ -70,7 +70,7 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemDeptForm" setup>
+<script name="SystemDeptForm" setup>
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
@@ -81,6 +81,7 @@ const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
+
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
@@ -92,7 +93,7 @@ const formData = ref({
   status: CommonStatusEnum.ENABLE,
   remark: undefined
 })
-const formRules = reactive<any>({
+const formRules = reactive({
   parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
   sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
@@ -104,10 +105,10 @@ const formRules = reactive<any>({
 })
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构
-const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const userList = ref([]) // 用户列表
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type, id) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -138,7 +139,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as DeptApi.DeptVO
+    const data = formData.value
     if (formType.value === 'create') {
       await DeptApi.createDept(data)
       message.success(t('common.createSuccess'))
@@ -172,7 +173,7 @@ const resetForm = () => {
 const getTree = async () => {
   deptTree.value = []
   const data = await DeptApi.getSimpleDeptList()
-  let dept: Tree = { id: 0, name: '顶级部门', children: [] }
+  let dept = { id: 0, name: '顶级部门', children: [] }
   dept.children = handleTree(data)
   deptTree.value.push(dept)
 }

src/views/Basic/Dept/DialogTarget.vue

@@ -0,0 +1,133 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
+    <el-form ref="formRef" :model="formData" label-width="130px">
+      <el-form-item label="每日跟进指标数">
+        <el-input-number v-model="formData.targetNum" :controls="false" style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="跟进指标生效日期">
+        <el-date-picker
+          v-model="formData.startDate"
+          type="date"
+          placeholder="选择日期时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          style="width: 150px"
+        />
+      </el-form-item>
+    </el-form>
+    <el-divider direction="horizontal" content-position="left">成交额指标</el-divider>
+    <el-button class="mb-10px" type="primary" @click="handleAddPrice"> 添加年份 </el-button>
+    <el-table :data="formData.deptSignPriceTargetVOList" border>
+      <el-table-column label="年份" width="120">
+        <template #default="{ row }">
+          <el-date-picker
+            v-model="row.year"
+            type="year"
+            placeholder="选择年份"
+            size="small"
+            format="YYYY"
+            value-format="YYYY"
+            style="width: 100%"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column v-for="col in 12" :key="col" :label="`${col}月`" width="100px">
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.monthTargetVOList[col - 1].targetPrice"
+            size="small"
+            :controls="false"
+            style="width: 100%"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <template #footer>
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup name="DialogTarget">
+import * as DeptApi from '@/api/system/dept'
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  remark: undefined
+})
+
+/** 打开弹窗 */
+const open = async (deptId) => {
+  dialogVisible.value = true
+  dialogTitle.value = '业绩指标'
+  resetForm()
+  // 修改时，设置数据
+  if (deptId) {
+    formLoading.value = true
+    try {
+      formData.value = await DeptApi.getDeptTarget(deptId)
+      formData.value.deptId = deptId
+      if (formData.value?.deptSignPriceTargetVOList) {
+        formData.value.deptSignPriceTargetVOList.forEach((it) => {
+          it.year = it.year + ''
+        })
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const formRef = ref() // 表单 Ref
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  try {
+    await DeptApi.updateDeptTarget(formData.value)
+    message.success('修改成功')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    targetNum: undefined,
+    startDate: undefined,
+    deptSignPriceTargetVOList: []
+  }
+  formRef.value?.resetFields()
+}
+
+function handleAddPrice() {
+  const obj = {
+    year: undefined,
+    monthTargetVOList: []
+  }
+  for (let i = 1; i <= 12; i++) {
+    obj.monthTargetVOList.push({
+      month: i,
+      targetPrice: undefined
+    })
+  }
+  if (!formData.value.deptSignPriceTargetVOList) {
+    formData.value.deptSignPriceTargetVOList = []
+  }
+  formData.value.deptSignPriceTargetVOList.push(obj)
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Basic/Dept/index.vue

@@ -23,9 +23,13 @@
     <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" />
+    <el-table-column prop="status" label="状态" width="100">
+      <template #default="{ row }">
+        {{ ['启用', '禁用'][row.status] }}
+      </template>
+    </el-table-column>
     <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
-    <el-table-column label="操作" class-name="fixed-width" width="160">
+    <el-table-column label="操作" class-name="fixed-width" width="240">
       <template #default="scope">
         <el-button
           link
@@ -35,6 +39,14 @@
         >
           修改
         </el-button>
+        <el-button
+          link
+          type="primary"
+          @click="openTarget(scope.row.id)"
+          v-hasPermi="['basic:dept:update']"
+        >
+          业绩指标
+        </el-button>
         <el-button
           link
           type="danger"
@@ -49,11 +61,13 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <DeptForm ref="formRef" @success="getList" />
+  <DialogTarget ref="targetDialogRef" @success="getList" />
 </template>
 <script setup lang="ts" name="SystemDept">
 import { handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import DeptForm from './DeptForm.vue'
+import DialogTarget from './DialogTarget.vue'
 import { dateFormatter } from '@/utils/formatTime'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -93,6 +107,11 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
+const targetDialogRef = ref()
+const openTarget = (id: number) => {
+  targetDialogRef.value.open(id)
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {

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

@@ -0,0 +1,149 @@
+<template>
+  <div class="pl-20px pr-20px">
+    <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-group>
+      </el-form-item>
+
+      <el-form-item label="发送途径">
+        <el-checkbox-group v-model="form.sendType">
+          <el-checkbox v-for="(item, index) in sendTypeOptions" :key="index" :label="item.value">
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item label="发送时间">
+        <el-time-picker
+          v-model="form.sendTime"
+          placeholder="任意时间点"
+          format="HH:mm"
+          value-format="HH:mm"
+        />
+      </el-form-item>
+      <el-form-item label="发送内容">
+        <el-tree
+          ref="treeRef"
+          :data="contentOptions"
+          :props="defaultProps"
+          empty-text="加载中，请稍候"
+          node-key="id"
+          show-checkbox
+          default-expand-all
+          style="width: 100%"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button :disabled="formLoading" type="primary" @click="submitForm"> 保 存 </el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script setup name="ReportDaily">
+import * as DaliyReportApi from '@/api/system/role/daliyReport'
+import { defaultProps, handleTree } from '@/utils/tree'
+import { getGeneralSysDictData } from '@/api/system/dict/dict.data'
+
+const message = useMessage() // 消息弹窗
+const props = defineProps({
+  roleId: {
+    type: Number
+  }
+})
+
+const formLoading = ref(false)
+const form = ref({
+  sendItem: []
+})
+
+watch(
+  () => props.roleId,
+  () => {
+    getReportInfo()
+  }
+)
+
+onMounted(() => {
+  init()
+})
+
+const formRef = ref()
+
+const rules = {}
+
+const contentOptions = ref([])
+
+async function init() {
+  getOptions()
+  getReportInfo()
+}
+
+const sendTypeOptions = ref([])
+const treeRef = ref()
+function getOptions() {
+  getGeneralSysDictData('message_send_type').then((data) => {
+    sendTypeOptions.value = data
+  })
+  DaliyReportApi.getDaliyReportContent().then((data) => {
+    contentOptions.value = handleTree(data)
+  })
+}
+
+async function getReportInfo() {
+  try {
+    formLoading.value = true
+    const data = await DaliyReportApi.getRoleDaliyReport(props.roleId)
+    form.value = { ...data }
+
+    if (!form.value.sendType) {
+      form.value.sendType = []
+    }
+
+    if (!form.value.sendTime) {
+      form.value.sendTime = '22:00'
+    }
+
+    if (!form.value.sendItem) {
+      form.value.sendItem = []
+    }
+    treeRef.value.setCheckedKeys([], false)
+    // 设置选中
+    form.value.sendItem.forEach((menuId) => {
+      treeRef.value.setChecked(menuId, true, false)
+    })
+    formLoading.value = false
+  } catch (error) {
+    console.log(error)
+    formLoading.value = false
+  }
+}
+
+/** 提交表单 */
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = {
+      id: form.value.id,
+      roleId: props.roleId,
+      sendType: form.value.sendType,
+      sendTime: form.value.sendTime,
+      status: form.value.status,
+      sendItem: [
+        ...treeRef.value.getCheckedKeys(false), // 获得当前选中节点
+        ...treeRef.value.getHalfCheckedKeys() // 获得半选中的父节点
+      ]
+    }
+    await DaliyReportApi.updateRoleDaliyReport(data)
+    message.success('保存成功')
+    getReportInfo()
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Basic/Role/index.vue

@@ -75,6 +75,13 @@
             @success="getList"
           />
         </el-tab-pane>
+        <el-tab-pane label="每日快报" :name="4">
+          <ReportDaily
+            v-if="roleOperateIndex == 4"
+            ref="reportDailyRef"
+            :roleId="list[libraryIndex].id"
+          />
+        </el-tab-pane>
       </el-tabs>
     </el-card>
     <!-- 表单弹窗：添加/修改 -->
@@ -86,6 +93,7 @@ import RoleForm from './RoleForm.vue'
 import RoleEmployee from './Comp/RoleEmployee.vue'
 import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
 import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
+import ReportDaily from './Comp/ReportDaily.vue'
 import * as RoleApi from '@/api/system/role'
 
 const message = useMessage() // 消息弹窗

src/views/Basic/User/DeptTree.vue

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

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

@@ -8,7 +8,7 @@
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.state" placeholder="审核状态" clearable>
+        <el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
           <el-option label="待审核" :value="1" />
           <el-option label="已撤销" :value="2" />
           <el-option label="已通过" :value="3" />
@@ -16,7 +16,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+        <el-select
+          v-model="searchForm.signUser"
+          placeholder="登记人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -34,10 +40,17 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
+        <el-select
+          v-model="searchForm.applyUser"
+          placeholder="申请人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -55,12 +68,31 @@
           range-separator="-"
           start-placeholder="申请日期"
           end-placeholder="申请日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
-        <el-button @click="batchAudit">批量审核</el-button>
+        <el-date-picker
+          v-model="searchForm.checkTime"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="审核日期"
+          end-placeholder="审核日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']">
+          查询
+        </el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:after-sale-reset']">
+          重置
+        </el-button>
+        <el-button @click="batchAudit" v-hasPermi="['clue:order:after-sale-batch-audit']">
+          批量审核
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -94,10 +126,23 @@
         min-width="120px"
         :formatter="dateFormatter"
       />
+      <el-table-column prop="checkUser" label="审核人" min-width="90" />
+      <el-table-column
+        prop="checkTime"
+        label="审核时间"
+        min-width="120px"
+        :formatter="dateFormatter"
+      />
       <el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90px" />
       <el-table-column label="操作" width="150px" fixed="right">
         <template #default="{ row }">
-          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-hasPermi="['clue:order:after-sale-detail']"
+            @click="handleDetail(row.id)"
+          >
             详情
           </el-button>
           <el-button
@@ -162,6 +207,7 @@ const searchForm = ref({
   dealUser: undefined,
   createDate: [],
   createUser: undefined,
+  checkTime: [],
   pageNo: 1,
   pageSize: 20
 })
@@ -185,6 +231,7 @@ function handleReset() {
     dealUser: undefined,
     createDate: [],
     createUser: undefined,
+    checkTime: [],
     pageNo: 1,
     pageSize: 20
   }

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

@@ -1,16 +1,39 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
     <Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
-      <el-form-item label="状态" prop="state">
-        <el-radio-group v-model="formData.state">
-          <el-radio :label="3"> 通过 </el-radio>
-          <el-radio :label="4"> 驳回 </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <Editor v-model:modelValue="formData.remark" />
-      </el-form-item>
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :rules="ruels"
+      :model="formData"
+      label-width="80px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
+          <el-form-item label="状态" prop="state">
+            <el-radio-group v-model="formData.state">
+              <el-radio :label="3"> 通过 </el-radio>
+              <el-radio :label="4"> 驳回 </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="审核日期" prop="checkTime">
+            <el-date-picker
+              v-model="formData.checkTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
+          <el-form-item label="备注" prop="remark">
+            <Editor v-model:modelValue="formData.remark" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -20,6 +43,7 @@
 </template>
 <script name="DialogAfterSaleAudit" setup>
 import { auditAfterSale } from '@/api/clue/afterSale'
+import { formatDate } from '@/utils/formatTime'
 
 const message = useMessage() // 消息弹窗
 
@@ -104,6 +128,10 @@ const formData = ref({
 })
 const formRef = ref() // 表单 Ref
 
+const ruels = {
+  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
+}
+
 const orderInfo = ref({})
 /** 打开弹窗 */
 const open = async (row) => {
@@ -140,6 +168,7 @@ const resetForm = (signId) => {
   formData.value = {
     saleId: signId,
     state: 3,
+    checkTime: formatDate(new Date()),
     remark: ''
   }
   formRef.value?.resetFields()

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

@@ -1,15 +1,38 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
-      <el-form-item label="状态" prop="state">
-        <el-radio-group v-model="formData.state">
-          <el-radio :label="3"> 通过 </el-radio>
-          <el-radio :label="4"> 驳回 </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <Editor v-model:modelValue="formData.remark" />
-      </el-form-item>
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :rules="ruels"
+      :model="formData"
+      label-width="80px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
+          <el-form-item label="状态" prop="state">
+            <el-radio-group v-model="formData.state">
+              <el-radio :label="3"> 通过 </el-radio>
+              <el-radio :label="4"> 驳回 </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="审核日期" prop="checkTime">
+            <el-date-picker
+              v-model="formData.checkTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
+          <el-form-item label="备注" prop="remark">
+            <Editor v-model:modelValue="formData.remark" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -20,6 +43,7 @@
 <script name="DialogAfterSaleAudit" setup>
 import { batchAuditAfterSale } from '@/api/clue/afterSale'
 import { batchAuditPayment } from '@/api/clue/payment'
+import { formatDate } from '@/utils/formatTime'
 
 const message = useMessage() // 消息弹窗
 
@@ -32,6 +56,10 @@ const formData = ref({
   remark: ''
 })
 const formRef = ref() // 表单 Ref
+const ruels = {
+  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
+}
+
 const formType = ref('aftersale')
 const titleMap = {
   aftersale: '批量售后审核',
@@ -79,6 +107,7 @@ const resetForm = (ids) => {
   formData.value = {
     payIds: ids,
     saleIds: ids,
+    checkTime: formatDate(new Date()),
     state: 3,
     remark: ''
   }

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

@@ -77,6 +77,32 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12" :offset="0">
+            <el-form-item label="其他支出">
+              <el-select v-model="extraPay.extraPayType" placeholder="其他支出类型" filterable>
+                <el-option
+                  v-for="item in extraPayOptions"
+                  :key="item.id"
+                  :label="item.extraPayName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" :offset="0">
+            <el-form-item label="支出金额">
+              <el-input-number v-model="extraPay.extraPayMoney" :controls="false" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24" :offset="0">
+            <el-form-item label="支出备注">
+              <el-input v-model="extraPay.remark" placeholder="备注信息" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </template>
       <template v-else>
         <el-table :data="inventoryList" @selection-change="handleSelectionChange">
@@ -98,7 +124,7 @@
           </el-table-column>
         </el-table>
       </template>
-      <el-form-item label="备注">
+      <el-form-item label="发货备注">
         <Editor v-model:modelValue="form.remark" />
       </el-form-item>
     </el-form>
@@ -116,15 +142,20 @@ import { getSimpleWarehouseList, getRemainInventoryList } from '@/api/mall/wareh
 import { createDelivery } from '@/api/clue/delivery'
 import { getConfigList } from '@/api/system/set'
 import { getDictOptions } from '@/utils/dict'
+import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
 
 const message = useMessage() // 消息弹窗
 
 const warehouseOptions = ref([])
+const extraPayOptions = ref([])
 const supplierOptions = getDictOptions('erp_supplier')
 function getOptions() {
   getSimpleWarehouseList().then((data) => {
     warehouseOptions.value = data
   })
+  getExtraFeeSimpleList().then((data) => {
+    extraPayOptions.value = data
+  })
 }
 
 function getRemainInventory(signProductId) {
@@ -144,6 +175,7 @@ defineExpose({
 })
 
 const form = ref({})
+const extraPay = ref({})
 const rules = ref({
   supplier: { required: true, message: '供应商不可为空', trigger: 'change' },
   warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' },
@@ -164,6 +196,11 @@ function resetForm(row) {
     unitPrice: undefined,
     remark: undefined
   }
+  extraPay.value = {
+    extraPayType: undefined,
+    extraPayMoney: undefined,
+    remark: undefined
+  }
 }
 
 const emit = defineEmits(['success'])
@@ -209,6 +246,9 @@ async function onSubmit() {
         unitPrice: form.value.unitPrice,
         warehouseId: form.value.warehouseId
       }
+      if (extraPay.value.extraPayMoney) {
+        params.purchaseOrder.extraPay = [extraPay.value]
+      }
     } else {
       params.detailList = deliveryArr.value
     }

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

@@ -1,21 +1,44 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
     <Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
-    <el-table :data="followList" size="small" border class="mt-10px">
+    <el-table :data="followList" size="small" border class="mt-10px mb-10px">
       <el-table-column prop="userName" label="跟进人" />
       <el-table-column prop="followTime" label="最新跟进时间" :formatter="dateFormatter" />
       <el-table-column prop="signSate" label="成交状态" />
     </el-table>
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
-      <el-form-item label="状态" prop="state">
-        <el-radio-group v-model="formData.state">
-          <el-radio :label="3"> 通过 </el-radio>
-          <el-radio :label="4"> 驳回 </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <Editor v-model:modelValue="formData.remark" />
-      </el-form-item>
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="ruels"
+      label-width="80px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
+          <el-form-item label="状态" prop="state">
+            <el-radio-group v-model="formData.state">
+              <el-radio :label="3"> 通过 </el-radio>
+              <el-radio :label="4"> 驳回 </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="审核日期" prop="checkTime">
+            <el-date-picker
+              v-model="formData.checkTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
+          <el-form-item label="备注" prop="remark">
+            <Editor v-model:modelValue="formData.remark" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -25,9 +48,9 @@
 </template>
 <script name="DialogFeebackAudit" setup>
 import { getFollowUserList } from '@/api/clue'
-import { auditPayment } from '@/api/clue/payment'
-import { dateFormatter } from '@/utils/formatTime'
-
+import { auditPayment, getPaymentDetail } from '@/api/clue/payment'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
+import {} from '@/utils/formatTime'
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -89,6 +112,11 @@ const formData = ref({
   state: 3,
   remark: ''
 })
+
+const ruels = {
+  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
+}
+
 const formRef = ref() // 表单 Ref
 
 const orderInfo = ref({})
@@ -98,7 +126,7 @@ const open = async (row) => {
   dialogTitle.value = '回款审核'
   resetForm(row.id)
   // 设置数据
-  orderInfo.value = { ...row }
+  orderInfo.value = await getPaymentDetail({ id: row.id })
   // 获取跟进信息
   getFollowInfo(row.clueId)
 }
@@ -129,6 +157,7 @@ const resetForm = (signId) => {
   formData.value = {
     payId: signId,
     state: 3,
+    checkTime: formatDate(new Date()),
     remark: ''
   }
   formRef.value?.resetFields()

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

@@ -1,7 +1,7 @@
 <template>
   <Dialog title="成交详情" v-model="show" width="800px">
     <el-tabs v-model="tabName">
-      <el-tab-pane label="线索信息" name="clueInfo">
+      <el-tab-pane label="线索信息" name="clueInfo" v-if="checkPermi(['clue:pool:detail'])">
         <Descriptions :data="clueInfo" :schema="clueSchema" :columns="2" labelWidth="130px" />
       </el-tab-pane>
       <el-tab-pane label="成交信息" name="orderInfo">
@@ -61,7 +61,11 @@
           </el-table>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="回款记录" name="returnRecord">
+      <el-tab-pane
+        label="回款记录"
+        name="returnRecord"
+        v-if="checkPermi(['clue:order:return-list'])"
+      >
         <el-table :data="returnRecordList" border stripe>
           <el-table-column type="index" width="50" />
           <el-table-column prop="money" label="回款金额" />
@@ -70,7 +74,11 @@
           <el-table-column prop="stateName" label="审核状态" />
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="售后记录" name="afterSale">
+      <el-tab-pane
+        label="售后记录"
+        name="afterSale"
+        v-if="checkPermi(['clue:order:after-sale-list'])"
+      >
         <el-table :data="aftersaleList" border stripe>
           <el-table-column type="index" width="50" />
           <el-table-column prop="reason" label="售后原因" />
@@ -183,11 +191,17 @@ function getFields() {
   })
 
   getOrderFieldList().then((data) => {
-    const arr = useCrudSchemas(data).allSchemas.detailSchema
-    arr.forEach((it) => {
+    const list = useCrudSchemas(data).allSchemas.detailSchema
+    const arr = []
+    list.forEach((it) => {
       if (it.label.includes('日期')) {
         it.dateFormat = 'YYYY-MM-DD'
       }
+      if (it.field == 'receivedMoney') {
+        checkPermi(['clue:order:return-list']) && arr.push(it)
+      } else {
+        arr.push(it)
+      }
     })
     if (arr.length % 2 != 0) {
       arr.push({})

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

@@ -52,6 +52,13 @@
         <template #actionMore>
           <el-button @click="getTableList" v-hasPermi="['clue:order:search']"> 搜索 </el-button>
           <el-button @click="resetQuery" v-hasPermi="['clue:order:reset']"> 重置 </el-button>
+          <el-button
+            type="primary"
+            @click="handleBatchUpdateInstall"
+            v-hasPermi="['clue:order:batch-update-install']"
+          >
+            批量修改安装状态
+          </el-button>
         </template>
       </Search>
     </div>
@@ -61,49 +68,89 @@
       class="mt-10px"
       v-model:tableObject="tableObject"
       :tableColumns="allSchemas.tableColumns"
+      rowkey="signId"
+      :expandRowKeys="expendRows"
       @get-list="getTableList"
       @get-checked-columns="getCheckedColumns"
+      @selection-change="handleSelectionChange"
     >
+      <el-table-column type="selection" width="60" />
       <el-table-column type="expand">
         <template #default="{ row }">
           <div class="p-10px flex justify-center">
-            <el-table :data="row.signProducts" stripe style="width: 900px">
-              <el-table-column prop="productName" label="成交产品" />
-              <el-table-column prop="specsName" label="产品规格" width="100px" />
-              <el-table-column prop="signNum" label="成交数量" width="90px" />
-              <el-table-column prop="remark" label="成交备注" />
-              <el-table-column label="发货状态" prop="sendState" width="90px" />
-              <el-table-column label="发货备注" width="100px">
-                <template #default="scope">
-                  <el-popover
-                    placement="top"
-                    width="500px"
-                    trigger="click"
-                    v-if="scope.row.warehouseName && scope.row.sendRemark"
-                  >
-                    <template #reference>
-                      <el-button type="primary" style="padding: 0" text>点击查看</el-button>
-                    </template>
-                    <div v-dompurify-html="scope.row.sendRemark"></div>
-                  </el-popover>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" width="100px">
-                <template #default="scope">
-                  <el-button
-                    type="primary"
-                    class="mr-10px"
-                    link
-                    :disabled="scope.row.sendState == '已发货'"
-                    style="padding: 0; margin-left: 0"
-                    v-hasPermi="['clue:order:send']"
-                    @click="handleDelivery(scope.row)"
-                  >
-                    发货
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
+            <VueDraggable
+              target="tbody"
+              v-model="row.signProducts"
+              :animation="150"
+              @end="onDragEnd"
+              style="width: 100%"
+            >
+              <el-table
+                :data="row.signProducts"
+                row-key="id"
+                stripe
+                style="width: 80%; margin: 0 auto"
+              >
+                <el-table-column prop="productName" label="成交产品" />
+                <el-table-column prop="specsName" label="产品规格" />
+                <el-table-column prop="signNum" label="成交数量" width="90px" />
+                <el-table-column prop="remark" label="成交备注" width="100px" />
+                <el-table-column label="生产状态" width="160px">
+                  <template #default="scope">
+                    <el-switch
+                      v-model="scope.row.isProduced"
+                      :active-value="true"
+                      :inactive-value="false"
+                      active-text="已生产"
+                      inactive-text="待生产"
+                      :disabled="!checkPermi(['clue:order:update-produce'])"
+                      size="small"
+                      @change="handleChangeProdoce(scope.row)"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="发货状态" prop="sendState" width="90px">
+                  <template #default="scope">
+                    <el-tag
+                      :type="scope.row.sendState == '待发货' ? 'danger' : 'success'"
+                      size="small"
+                    >
+                      {{ scope.row.sendState }}
+                    </el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column label="发货备注" width="100px">
+                  <template #default="scope">
+                    <el-popover
+                      placement="top"
+                      width="500px"
+                      trigger="click"
+                      v-if="scope.row.warehouseName && scope.row.sendRemark"
+                    >
+                      <template #reference>
+                        <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+                      </template>
+                      <div v-dompurify-html="scope.row.sendRemark"></div>
+                    </el-popover>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" width="100px">
+                  <template #default="scope">
+                    <el-button
+                      type="primary"
+                      class="mr-10px"
+                      link
+                      :disabled="scope.row.sendState == '已发货'"
+                      style="padding: 0; margin-left: 0"
+                      v-hasPermi="['clue:order:send']"
+                      @click="handleDelivery(scope.row)"
+                    >
+                      发货
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </VueDraggable>
           </div>
         </template>
       </el-table-column>
@@ -115,17 +162,14 @@
         min-width="120px"
       >
         <template #default="{ row }">
-          <el-popover
-            placement="top"
-            width="500px"
-            trigger="click"
-            v-if="item.field == 'remark' && row.remark"
-          >
-            <template #reference>
-              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
-            </template>
-            <div v-dompurify-html="row.remark"></div>
-          </el-popover>
+          <div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
+            <el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
+              <template #reference>
+                <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+              </template>
+              <div v-dompurify-html="row[item.field]"></div>
+            </el-popover>
+          </div>
           <span v-else-if="item.form?.component == 'DatePicker'">
             {{ formatDate(row[item.field]) }}
           </span>
@@ -211,6 +255,9 @@ import DialogDelivery from './DialogDelivery.vue'
 
 import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
+import { ElMessageBox, ElOption, ElSelect } from 'element-plus'
+import { VueDraggable } from 'vue-draggable-plus'
+import { checkPermi } from '@/utils/permission'
 
 const userOptions = ref([])
 const allUserOptions = ref([])
@@ -356,6 +403,96 @@ const deliveryDialog = ref()
 function handleDelivery(row) {
   deliveryDialog.value.open(row)
 }
+
+const batchIds = ref([])
+function handleSelectionChange(val) {
+  batchIds.value = val.map((it) => it.signId)
+}
+
+const selectedValue = ref(undefined)
+const installOptions = [
+  { label: '待安装', value: 1 },
+  { label: '已安装', value: 2 },
+  { label: '无需安装', value: 3 }
+]
+
+const select = () =>
+  h(
+    ElSelect,
+    {
+      modelValue: selectedValue.value,
+      placeholder: '新状态',
+      'onUpdate:modelValue': (val) => {
+        selectedValue.value = val
+      }
+    },
+    () =>
+      installOptions.map((item) => {
+        return h(ElOption, { label: item.label, value: item.value })
+      })
+  )
+
+function handleBatchUpdateInstall() {
+  if (batchIds.value.length) {
+    ElMessageBox({
+      title: '是否确认修改安装状态？',
+      message: select,
+      showCancelButton: true,
+      confirmButtonText: '确定',
+      cancelButtonText: '取消'
+    }).then(async (action) => {
+      // 处理用户点击确定或取消按钮后的逻辑
+      if (action == 'confirm') {
+        try {
+          // 发起修改状态
+          await SignApi.updateInstallStatus(batchIds.value, selectedValue.value)
+          message.success('修改成功')
+          // 刷新列表
+          await getTableList()
+        } catch (err) {
+          // 取消后，进行恢复按钮
+          console.log(err)
+        }
+      }
+    })
+  } else {
+    message.info('请选择表格行')
+  }
+}
+
+async function handleChangeProdoce(row) {
+  try {
+    // 修改状态的二次确认
+    await message.confirm('确认要修改生产状态吗?')
+    // 发起修改状态
+    await SignApi.updateProduceStatus({
+      signId: row.signId,
+      id: row.id,
+      isProduced: row.isProduced
+    })
+    message.success('修改成功')
+    // 刷新列表
+    getTableList()
+  } catch {
+    // 取消后，进行恢复按钮
+    row.isProduced = !row.isProduced
+  }
+}
+
+const expendRows = ref([])
+async function onDragEnd(ev) {
+  try {
+    expendRows.value = [ev.data.signId]
+    const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts
+    await SignApi.updateProduceSort(list.map((it) => it.id))
+    message.success('修改成功')
+    // 刷新列表
+    getTableList()
+  } catch (error) {
+    console.log(error)
+    getTableList()
+  }
+}
 </script>
 
 <style lang="scss" scoped></style>

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

@@ -2,22 +2,44 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
+        <el-input
+          v-model="searchForm.signId"
+          placeholder="成交单号"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.phone" placeholder="联系方式" clearable />
+        <el-input
+          v-model="searchForm.phone"
+          placeholder="联系方式"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.settlementType" placeholder="结算类型" clearable filterable>
+        <el-select
+          v-model="searchForm.settlementType"
+          placeholder="结算类型"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option label="货款" value="货款" />
           <el-option label="其他支出" value="其他支出" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+        <el-select
+          v-model="searchForm.signUser"
+          placeholder="登记人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -35,6 +57,19 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.createDate"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="支出日期"
+          end-placeholder="支出日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
@@ -44,6 +79,7 @@
           filterable
           clearable
           @change="searchForm.signSpecs = undefined"
+          style="width: 150px"
         >
           <el-option
             v-for="item in prodOptions"
@@ -60,6 +96,7 @@
           filterable
           clearable
           :disabled="!searchForm.signProduct"
+          style="width: 120px"
         >
           <el-option
             v-for="item in specsOptions(searchForm.signProduct)"
@@ -70,7 +107,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.supplier" placeholder="选择供应商" filterable clearable>
+        <el-select
+          v-model="searchForm.supplier"
+          placeholder="选择供应商"
+          filterable
+          clearable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in supplierOptions"
             :key="item.value"
@@ -87,9 +130,11 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
-        <el-button @click="batchSettle">批量结算</el-button>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:settle-search']">查询</el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:settle-reset']">重置</el-button>
+        <el-button @click="batchSettle" v-hasPermi="['clue:order:settle-batch-audit']">
+          批量结算
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -112,10 +157,38 @@
       <el-table-column prop="phone" label="联系方式" width="120px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column prop="dealDate" label="成交日期" width="120px" :formatter="dateFormatter" />
+      <el-table-column prop="createTime" label="支出日期" width="140px">
+        <template #default="{ row, col }">
+          <el-date-picker
+            v-if="row.edit"
+            v-model="row.createTime"
+            type="date"
+            size="small"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            style="width: 110px"
+            :clearable="false"
+            placeholder="选择日期"
+          />
+          <div v-else>{{ dateFormatter(row, col, row.createTime) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="signProduct" label="成交产品" min-width="150px" />
       <el-table-column prop="signSpecs" label="成交规格" min-width="150px" />
       <el-table-column prop="supplier" label="供应商" min-width="150px" />
-      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px" />
+      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px">
+        <template #default="{ row }">
+          <el-input-number
+            v-if="row.edit"
+            v-model="row.settlementPrice"
+            size="small"
+            :min="0"
+            :controls="false"
+            style="width: 100%"
+          />
+          <div v-else>{{ row.settlementPrice }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="settlementNum" label="结算数量" min-width="150px" />
       <el-table-column prop="settlementMoney" label="结算金额" min-width="150px" />
       <el-table-column label="费用备注" width="90px">
@@ -148,6 +221,19 @@
           </el-popover>
         </template>
       </el-table-column>
+      <el-table-column label="操作" width="100px" fixed="right">
+        <template #default="{ row }">
+          <el-button
+            v-if="row.settlementState == '待结算'"
+            type="primary"
+            text
+            v-hasPermi="['clue:order:settle-update']"
+            @click="handleUpdate(row)"
+          >
+            {{ row.edit ? '保存' : '修改' }}
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <Pagination
       v-model:limit="searchForm.pageSize"
@@ -197,6 +283,7 @@ const searchForm = ref({
   phone: undefined,
   signUser: undefined,
   dealDate: [],
+  createDate: [],
   signProduct: undefined,
   signSpecs: undefined,
   signId: undefined,
@@ -213,6 +300,7 @@ function handleReset() {
     phone: undefined,
     signUser: undefined,
     dealDate: [],
+    createDate: [],
     signProduct: undefined,
     signSpecs: undefined,
     signId: undefined,
@@ -265,6 +353,28 @@ function getSummaries(param) {
   return sums
 }
 
+async function handleUpdate(row) {
+  if (row.edit) {
+    // 删除的二次确认
+    await message.confirm('是否确认修改结算数据？')
+    // 保存
+    SettleApi.updateSettle({
+      settlementId: row.settlementId,
+      settlementPrice: row.settlementPrice,
+      createTime: row.createTime
+    })
+      .then(() => {
+        message.success('修改成功')
+        getList()
+      })
+      .finally(() => {
+        row.edit = false
+      })
+  } else {
+    row.edit = true
+  }
+}
+
 const selectList = ref([])
 function handleSelectionChange(val) {
   selectList.value = [...val]

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

@@ -89,17 +89,14 @@
         min-width="120px"
       >
         <template #default="{ row }">
-          <el-popover
-            placement="top"
-            width="500px"
-            trigger="click"
-            v-if="item.field == 'remark' && row[item.field]"
-          >
-            <template #reference>
-              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
-            </template>
-            <div v-dompurify-html="row.remark"></div>
-          </el-popover>
+          <div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
+            <el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
+              <template #reference>
+                <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+              </template>
+              <div v-dompurify-html="row[item.field]"></div>
+            </el-popover>
+          </div>
           <span v-else-if="item.form?.component == 'DatePicker'">
             {{ formatDate(row[item.field]) }}
           </span>

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

@@ -8,7 +8,10 @@
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.state" placeholder="审核状态" clearable>
+        <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" />
           <el-option label="已撤销" :value="2" />
           <el-option label="已通过" :value="3" />
@@ -16,7 +19,13 @@
         </el-select>
       </el-form-item>
       <el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
-        <el-select v-model="searchForm.receiver" placeholder="接待人" clearable filterable>
+        <el-select
+          v-model="searchForm.receiver"
+          placeholder="接待人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in allUserOptions"
             :key="item.id"
@@ -26,7 +35,13 @@
         </el-select>
       </el-form-item>
       <el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
-        <el-select v-model="searchForm.convertPeople" placeholder="转化人" clearable filterable>
+        <el-select
+          v-model="searchForm.convertPeople"
+          placeholder="转化人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in allUserOptions"
             :key="item.id"
@@ -36,7 +51,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+        <el-select
+          v-model="searchForm.signUser"
+          placeholder="登记人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -54,10 +75,17 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
+        <el-select
+          v-model="searchForm.applyUser"
+          placeholder="申请人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -75,12 +103,27 @@
           range-separator="-"
           start-placeholder="申请日期"
           end-placeholder="申请日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
-        <el-button @click="batchAudit">批量审核</el-button>
+        <el-date-picker
+          v-model="searchForm.checkTime"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="审核日期"
+          end-placeholder="审核日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:return-search']">查询</el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:return-reset']">重置</el-button>
+        <el-button @click="batchAudit" v-hasPermi="['clue:order:return-batch-audit']">
+          批量审核
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -93,8 +136,8 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
-      <el-table-column prop="signId" label="成交单号" min-width="180px" />
-      <el-table-column prop="name" label="线索名称" width="150px" />
+      <el-table-column prop="signId" label="成交单号" min-width="150px" />
+      <el-table-column prop="name" label="线索名称" width="120px" />
       <el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
       <el-table-column prop="money" label="回款金额" min-width="120px">
         <template #default="{ row }">
@@ -146,7 +189,15 @@
         </template>
       </el-table-column>
       <el-table-column prop="signPrice" label="成交价" min-width="90" />
-      <el-table-column prop="isPayoff" label="是否结清" min-width="90" />
+      <el-table-column prop="isPayoff" label="是否结清" min-width="90">
+        <template #default="{ row }">
+          <el-select v-if="row.edit" size="small" v-model="row.isPayoffValue">
+            <el-option label="结清" :value="true" />
+            <el-option label="未结清" :value="false" />
+          </el-select>
+          <div v-else>{{ row.isPayoff }}</div>
+        </template>
+      </el-table-column>
       <el-table-column
         v-if="appStore.getAppInfo?.instanceType == 1"
         prop="receiverName"
@@ -159,6 +210,12 @@
         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"
@@ -170,13 +227,41 @@
       <el-table-column
         prop="applyTime"
         label="申请时间"
+        min-width="140px"
+        :formatter="dateFormatter"
+      >
+        <template #default="{ row, col }">
+          <el-date-picker
+            v-if="row.edit"
+            v-model="row.applyTime"
+            type="date"
+            size="small"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            style="width: 110px"
+            :clearable="false"
+            placeholder="选择日期"
+          />
+          <div v-else>{{ dateFormatter(row, col, row.applyTime) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkUser" label="审核人" min-width="90" />
+      <el-table-column
+        prop="checkTime"
+        label="审核时间"
         min-width="120px"
         :formatter="dateFormatter"
       />
       <el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90" />
       <el-table-column label="操作" width="220px" fixed="right">
         <template #default="{ row }">
-          <el-button type="primary" style="padding: 0" text @click="handleDetail(row)">
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-hasPermi="['clue:order:return-detail']"
+            @click="handleDetail(row)"
+          >
             详情
           </el-button>
           <el-button
@@ -236,7 +321,7 @@ import DialogBatchAudit from './DialogBatchAudit.vue'
 
 import { removeNullField } from '@/utils'
 import { useAppStore } from '@/store/modules/app'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
@@ -254,6 +339,8 @@ const searchForm = ref({
   signUser: undefined,
   applyTime: [],
   applyUser: undefined,
+  checkTime: [],
+  phone: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -280,6 +367,8 @@ function handleReset() {
     signUser: undefined,
     applyTime: [],
     applyUser: undefined,
+    checkTime: [],
+    mobile: undefined,
     pageNo: 1,
     pageSize: 20
   }
@@ -354,7 +443,7 @@ function getSummaries(param) {
     } else if (column.property == 'personProfit') {
       sums[index] = totalInfo.value.totalPersonProfit
     } else if (column.property == 'companyProfit') {
-      sums[index] = totalInfo.value.totalPersonProfit
+      sums[index] = totalInfo.value.totalCompanyProfit
     } else if (column.property == 'signPrice') {
       sums[index] = totalInfo.value.totalSignPrice
     } else {
@@ -374,16 +463,20 @@ async function handleUpdate(row) {
       id: row.id,
       money: row.money,
       companyProfit: row.companyProfit,
-      personProfit: row.personProfit
+      personProfit: row.personProfit,
+      isPayoff: row.isPayoffValue,
+      applyTime: formatDate(row.applyTime)
     })
       .then(() => {
         message.success('修改成功')
+        getList()
       })
       .finally(() => {
         row.edit = false
       })
   } else {
     row.edit = true
+    row.isPayoffValue = row.isPayoff == '结清'
   }
 }
 

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

@@ -2,22 +2,44 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
+        <el-input
+          v-model="searchForm.signId"
+          placeholder="成交单号"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.phone" placeholder="联系方式" clearable />
+        <el-input
+          v-model="searchForm.phone"
+          placeholder="联系方式"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.settlementType" placeholder="结算类型" clearable filterable>
+        <el-select
+          v-model="searchForm.settlementType"
+          placeholder="结算类型"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option label="报名费" value="报名费" />
           <el-option label="其他支出" value="其他支出" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+        <el-select
+          v-model="searchForm.signUser"
+          placeholder="登记人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -35,6 +57,19 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.createDate"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="支出日期"
+          end-placeholder="支出日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
@@ -44,6 +79,7 @@
           filterable
           clearable
           @change="changeSchool"
+          style="width: 120px"
         >
           <el-option
             v-for="item in schoolOptions"
@@ -61,6 +97,7 @@
           clearable
           :disabled="!searchForm.signSchool"
           @change="changePlace"
+          style="width: 120px"
         >
           <el-option
             v-for="item in placeOptions"
@@ -77,6 +114,7 @@
           placeholder="选择班型"
           filterable
           clearable
+          style="width: 120px"
         >
           <el-option
             v-for="item in classOptions"
@@ -93,9 +131,11 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
-        <el-button @click="batchSettle">批量结算</el-button>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:settle-search']">查询</el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:settle-reset']">重置</el-button>
+        <el-button @click="batchSettle" v-hasPermi="['clue:order:settle-batch-audit']">
+          批量结算
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -118,10 +158,38 @@
       <el-table-column prop="phone" label="联系方式" width="120px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column prop="dealDate" label="成交日期" width="120px" :formatter="dateFormatter" />
+      <el-table-column prop="createTime" label="支出日期" width="140px">
+        <template #default="{ row, col }">
+          <el-date-picker
+            v-if="row.edit"
+            v-model="row.createTime"
+            type="date"
+            size="small"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            style="width: 110px"
+            :clearable="false"
+            placeholder="选择日期"
+          />
+          <div v-else>{{ dateFormatter(row, col, row.createTime) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="signSchool" label="成交驾校" min-width="150px" />
       <el-table-column prop="signPlace" label="成交场地" min-width="150px" />
       <el-table-column prop="signClass" label="成交班型" min-width="150px" />
-      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px" />
+      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px">
+        <template #default="{ row }">
+          <el-input-number
+            v-if="row.edit"
+            v-model="row.settlementPrice"
+            size="small"
+            :min="0"
+            :controls="false"
+            style="width: 100%"
+          />
+          <div v-else>{{ row.settlementPrice }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="settlementNum" label="结算数量" min-width="150px" />
       <el-table-column prop="settlementMoney" label="结算金额" min-width="150px" />
       <el-table-column label="费用备注" width="90px">
@@ -154,6 +222,19 @@
           </el-popover>
         </template>
       </el-table-column>
+      <el-table-column label="操作" width="100px" fixed="right">
+        <template #default="{ row }">
+          <el-button
+            v-if="row.settlementState == '待结算'"
+            type="primary"
+            text
+            v-hasPermi="['clue:order:settle-update']"
+            @click="handleUpdate(row)"
+          >
+            {{ row.edit ? '保存' : '修改' }}
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <Pagination
       v-model:limit="searchForm.pageSize"
@@ -204,6 +285,7 @@ const searchForm = ref({
   phone: undefined,
   signUser: undefined,
   dealDate: [],
+  createDate: [],
   signSchool: undefined,
   signPlace: undefined,
   signClass: undefined,
@@ -220,6 +302,7 @@ function handleReset() {
     phone: undefined,
     signUser: undefined,
     dealDate: [],
+    createDate: [],
     signSchool: undefined,
     signPlace: undefined,
     signClass: undefined,
@@ -253,6 +336,28 @@ async function getList() {
   }
 }
 
+async function handleUpdate(row) {
+  if (row.edit) {
+    // 删除的二次确认
+    await message.confirm('是否确认修改结算数据？')
+    // 保存
+    SettleApi.updateSettle({
+      settlementId: row.settlementId,
+      settlementPrice: row.settlementPrice,
+      createTime: row.createTime
+    })
+      .then(() => {
+        message.success('修改成功')
+        getList()
+      })
+      .finally(() => {
+        row.edit = false
+      })
+  } else {
+    row.edit = true
+  }
+}
+
 function getSummaries(param) {
   const { columns } = param
   const sums = []

src/views/Clue/Order/index.vue

@@ -1,21 +1,29 @@
 <template>
   <el-tabs v-model="tabName">
-    <el-tab-pane label="成交列表" name="list">
+    <el-tab-pane label="成交列表" name="list" v-if="checkPermi(['clue:order:order-list'])">
       <template v-if="tabName == 'list'">
         <OrderList v-if="appStore.getAppInfo?.instanceType == 1" />
         <MallOrderList v-else-if="appStore.getAppInfo?.instanceType == 2" />
       </template>
     </el-tab-pane>
-    <el-tab-pane label="回款申请" name="commission">
+    <el-tab-pane label="回款申请" name="commission" v-if="checkPermi(['clue:order:return-list'])">
       <Reback v-if="tabName == 'commission'" />
     </el-tab-pane>
-    <el-tab-pane label="售后申请" name="aftersale">
+    <el-tab-pane
+      label="售后申请"
+      name="aftersale"
+      v-if="checkPermi(['clue:order:after-sale-list'])"
+    >
       <AfterSales v-if="tabName == 'aftersale'" />
     </el-tab-pane>
-    <el-tab-pane label="发货列表" name="delivery" v-if="appStore.getAppInfo?.instanceType == 2">
+    <el-tab-pane
+      label="发货列表"
+      name="delivery"
+      v-if="appStore.getAppInfo?.instanceType == 2 && checkPermi(['clue:order:delivery-list'])"
+    >
       <Delivery v-if="tabName == 'delivery'" />
     </el-tab-pane>
-    <el-tab-pane label="对外结算" name="settle" v-if="checkPermi(['clue:order:settle'])">
+    <el-tab-pane label="对外结算" name="settle" v-if="checkPermi(['clue:order:settle-list'])">
       <Settle v-if="tabName == 'settle'" />
     </el-tab-pane>
   </el-tabs>

src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue

@@ -52,8 +52,8 @@ const form = ref({
 })
 
 const rules = ref({
-  originFollowUserId: { required: true, message: '原跟进人不可为空', trigger: 'change' },
-  newFollowUserId: { required: true, message: '新跟进人不可为空', trigger: 'change' }
+  originFollowUserId: { required: true, message: '原跟进人不可为空', trigger: 'change' }
+  // newFollowUserId: { required: true, message: '新跟进人不可为空', trigger: 'change' }
 })
 
 function open(clueIdList) {

src/views/Clue/Pool/Comp/DialogClue.vue

@@ -33,7 +33,7 @@
                 v-model="row.nextFollowTime"
                 type="date"
                 placeholder="选择日期时间"
-                :disabled="!row.editable"
+                :disabled="row.userId != useUserStore().getUser.id"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 style="width: 100%"
@@ -47,7 +47,7 @@
                 type="textarea"
                 :autoSize="{ minRows: 2 }"
                 placeholder="输入跟进内容"
-                :disabled="!row.editable"
+                :disabled="row.userId != useUserStore().getUser.id"
               />
             </template>
           </el-table-column>
@@ -172,6 +172,9 @@ const formSchema = computed(() => {
       // it.componentProps['disabled'] = formType.value != 'create'
       it.componentProps['disabled'] = true
     }
+    // else if (it.field == 'convertPeople' && formType.value == 'update') {
+    //   it.componentProps['disabled'] = true
+    // }
     if (it.field == 'convertPeople') {
       it.options = props.allUserOptions.map((it) => ({ ...it, name: it.nickname }))
     }
@@ -361,8 +364,8 @@ async function handleSave() {
       const data = await ClueApi.createClue(params)
       message.success(data)
     } else {
-      const data = await ClueApi.updateClue(params)
-      message.success(data)
+      await ClueApi.updateClue(params)
+      message.success('修改成功')
     }
     dialogVisible.value = false
     // 发送操作成功的事件

src/views/Clue/Pool/Comp/DialogSchoolInfo.vue

@@ -1,18 +1,44 @@
 <template>
   <el-dialog width="800px" :title="title" v-model="show" append-to-body>
+    <el-divider direction="horizontal" content-position="left" style="margin-top: 10px">
+      场地班型
+    </el-divider>
+    <el-table :data="tableList" border stripe size="small">
+      <el-table-column type="index" width="50" />
+      <el-table-column prop="typeName" label="班型名称" />
+      <el-table-column prop="licenseType" label="驾照类型" />
+      <el-table-column label="班型备注">
+        <template #default="{ row }">
+          <el-popover placement="top" width="500px" trigger="click">
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="row.remark"></div>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-divider direction="horizontal" content-position="left">场地详细信息</el-divider>
     <div v-dompurify-html="detail" class="mb-20px"></div>
   </el-dialog>
 </template>
 
 <script setup name="DialogSchoolInfo">
+import { getClassTypeList } from '@/api/school/class'
 const title = ref('')
 const show = ref(false)
 const detail = ref('')
 
+const tableList = ref([])
 function open(info) {
   title.value = `【${info.schoolName}】详细信息`
   show.value = true
   detail.value = info.introduce || '该驾校暂未配置详细信息'
+
+  getClassTypeList({ placeId: info.placeId, status: 0 }).then((data) => {
+    tableList.value = data
+  })
 }
 
 defineExpose({

src/views/Clue/Pool/Comp/DialogSuccess.vue

@@ -11,7 +11,7 @@
       labelWidth="130px"
       :defaultShow="false"
     />
-    <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" class="mt-20px">
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="100px" class="mt-20px">
       <el-row :gutter="20">
         <!-- 驾校招生模式 -->
         <template v-if="appStore.getAppInfo?.instanceType == 1">
@@ -118,20 +118,38 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="8" :offset="0" v-if="appStore.getAppInfo?.instanceType == 1">
-          <el-form-item label="接待人" prop="receiver">
-            <el-select v-model="form.receiver" placeholder="选择接待人" clearable filterable>
-              <el-option
-                v-for="item in allUserOptions"
-                :key="item.id"
-                :label="item.nickname"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
+        <template v-if="appStore.getAppInfo?.instanceType == 1">
+          <el-col :span="8" :offset="0" v-if="form.signClass">
+            <el-form-item label="利润">
+              <div style="color: blue; font-weight: bold; font-size: 16px">{{ profitNum }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" :offset="0">
+            <el-form-item label="接待人" prop="receiver">
+              <el-select v-model="form.receiver" placeholder="选择接待人" clearable filterable>
+                <el-option
+                  v-for="item in allUserOptions"
+                  :key="item.id"
+                  :label="item.nickname"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </template>
+        <template v-else>
+          <el-col :span="8" :offset="0">
+            <el-form-item label="安装状态" prop="installStatus">
+              <el-select v-model="form.installStatus">
+                <el-option label="待安装" :value="1" />
+                <el-option label="已安装" :value="2" />
+                <el-option label="无需安装" :value="3" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </template>
         <el-col
-          :span="8"
+          :span="fieldItem.component == 'Editor' ? 24 : 8"
           :offset="0"
           v-for="fieldItem in diyFieldList"
           :key="fieldItem.clueParamId"
@@ -323,7 +341,7 @@
 
 <script setup name="DialogSuccess">
 import * as ClueApi from '@/api/clue'
-import { createSign } from '@/api/clue/sign'
+import { createSign, getSignProfit } from '@/api/clue/sign'
 import { getDiyFieldList } from '@/api/clue/orderField'
 import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
@@ -462,7 +480,8 @@ async function resetForm(id) {
     isCompanyReceipts: data.configValue == 'true',
     receiver: undefined,
     extraPay: [],
-    signProducts: []
+    signProducts: [],
+    installStatus: 3
   }
 }
 
@@ -580,6 +599,19 @@ function signPriceChange() {
   if (form.value.isPayoff) {
     form.value.payAmount = form.value.signPrice
   }
+  calcSignProfit()
+}
+
+const profitNum = ref(0)
+function calcSignProfit() {
+  if (form.value.signClass && appStore.getAppInfo?.instanceType == 1) {
+    // 计算员工利润
+    getSignProfit({ signClass: form.value.signClass, signPrice: form.value.signPrice }).then(
+      (data) => {
+        profitNum.value = data
+      }
+    )
+  }
 }
 
 function handleRemove(type, index) {

src/views/Clue/Pool/Comp/DrawerClue.vue

@@ -22,7 +22,13 @@
           <el-button type="primary" v-hasPermi="['clue:pool:update']" plain @click="handleUpdate">
             修改
           </el-button>
-          <el-button type="danger" v-hasPermi="['clue:pool:delete']" plain @click="handleRemove">
+          <el-button
+            type="danger"
+            v-if="info.state != '成交'"
+            v-hasPermi="['clue:pool:delete']"
+            plain
+            @click="handleRemove"
+          >
             删除
           </el-button>
         </div>

src/views/Clue/Pool/index.vue

@@ -14,7 +14,7 @@
         </el-tab-pane>
         <el-tab-pane name="2">
           <template #label>
-            <Tooltip message="下次跟进时间在今日之前的未成交线索" />
+            <Tooltip message="下次跟进时间在今日及之前的未成交线索" />
             <el-badge v-if="clueCount.followNum" :value="clueCount.followNum" :max="9999">
               <span class="ml-3px">待跟进</span>
             </el-badge>

src/views/Clue/Set/Comp/ClueSource.vue

@@ -9,6 +9,12 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item>
+        <el-radio-group v-model="searchForm.status" @change="handleQuery">
+          <el-radio :label="0"> 开启 </el-radio>
+          <el-radio :label="1"> 关闭 </el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">搜索</el-button>
         <el-button @click="resetQuery">重置</el-button>
@@ -59,7 +65,8 @@ const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const searchForm = ref({
-  sourceName: undefined
+  sourceName: undefined,
+  status: 0
 })
 
 const sourceDialog = ref()
@@ -71,7 +78,8 @@ function handleQuery() {
 }
 function resetQuery() {
   searchForm.value = {
-    sourceName: ''
+    sourceName: '',
+    status: 0
   }
   getList()
 }

src/views/Home/CloseRate.vue

@@ -0,0 +1,7 @@
+<template>
+  <div> 成交率 </div>
+</template>
+
+<script setup name="CloseRate"></script>
+
+<style lang="scss" scoped></style>

src/views/Login/MPLogin.vue

@@ -0,0 +1,86 @@
+<template>
+  <div class="p-20px">
+    <p class="mb-30px font-bold text-20px">微信授权登陆</p>
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="auto">
+      <el-form-item label="用户名" prop="username">
+        <el-input v-model="form.username" placeholder="请输入用户名" />
+      </el-form-item>
+      <el-form-item label="密码" prop="password">
+        <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>
+  </div>
+</template>
+
+<script setup name="MPLogin">
+import { bindWx } from '@/api/login'
+
+const message = useMessage() // 消息弹窗
+
+const form = ref({
+  code: undefined,
+  username: undefined,
+  password: undefined
+})
+const formRef = ref()
+const rules = {
+  username: { required: true, message: '用户名不可为空', trigger: 'blur' },
+  password: { required: true, message: '密码不可为空', trigger: 'blur' }
+}
+
+// 微信授权登陆地址
+const WX_AUTH_URL = 'https://open.weixin.qq.com/connect/oauth2/authorize?'
+// 重定向参数-固定写法
+const REDIRECT = '#wechat_redirect'
+
+const params = ref({
+  appid: 'wxf87aa1f474c0494f', // 公众号 APP ID
+  redirect_uri: ``, // 授权后重定向的回调链接地址， 请使用 urlEncode 对链接进行处理
+  response_type: 'code', // 固定写法
+  scope: 'snsapi_base' // snsapi_base 静默授权获取 open id ；snsapi_userinfo 需要用户授权，获取详细信息
+  // state:'code', // a-zA-Z0-9的参数值，最多128字节
+})
+
+const formLoading = ref(false)
+async 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
+    }
+  }
+}
+
+onMounted(() => {
+  const uri = location.origin + location.pathname
+  params.value.redirect_uri = encodeURI(uri)
+  // 获取地址参数
+  const param = new URLSearchParams(location.search)
+  form.value.code = param.get('code')
+
+  if (!form.value.code) {
+    const access_url = WX_AUTH_URL + `${new URLSearchParams(params.value)}` + REDIRECT
+    location.href = access_url
+  }
+})
+</script>
+
+<style lang="scss" scoped></style>

src/views/Profile/NotifyMessage.vue

@@ -1,7 +1,193 @@
 <template>
-  <div> 站内信 </div>
+  <!-- 搜索工作栏 -->
+  <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="0">
+    <el-form-item>
+      <el-select
+        v-model="queryParams.messageType"
+        placeholder="消息类型"
+        clearable
+        filterable
+        @change="handleQuery"
+      >
+        <el-option
+          v-for="item in typeOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item>
+      <el-select
+        v-model="queryParams.readStatus"
+        placeholder="状态"
+        clearable
+        filterable
+        @change="handleQuery"
+      >
+        <el-option label="已读" :value="true" />
+        <el-option label="未读" :value="false" />
+      </el-select>
+    </el-form-item>
+    <el-form-item>
+      <el-button :disabled="selectedIds.length == 0" @click="handleUpdateList">
+        标记已读
+      </el-button>
+      <el-button @click="handleUpdateAll"> 全部已读 </el-button>
+    </el-form-item>
+  </el-form>
+
+  <el-text class="mb-10px" type="danger">tips: 双击展示消息详情</el-text>
+
+  <!-- 列表 -->
+  <el-table
+    ref="tableRef"
+    v-loading="loading"
+    :data="list"
+    row-key="id"
+    @selection-change="handleSelectionChange"
+    @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="title" />
+    <el-table-column
+      label="时间"
+      align="left"
+      prop="createTime"
+      width="180"
+      :formatter="dateFormatter"
+    />
+    <el-table-column label="状态" align="left" width="100px">
+      <template #default="{ row }">
+        <el-tag :type="row.readStatus ? 'success' : 'info'">
+          {{ row.readStatus ? '已读' : '未读' }}
+        </el-tag>
+      </template>
+    </el-table-column>
+  </el-table>
+  <!-- 分页 -->
+  <Pagination
+    :total="total"
+    v-model:page="queryParams.pageNo"
+    v-model:limit="queryParams.pageSize"
+    @pagination="getList"
+  />
 </template>
+<script lang="ts" setup name="NotifyMessage">
+import { dateFormatter } from '@/utils/formatTime'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+import { useUserStore } from '@/store/modules/user'
+import { getGeneralSysDictData } from '@/api/system/dict/dict.data'
 
-<script setup name="NotifyMessage"></script>
+const router = useRouter()
 
-<style lang="scss" scoped></style>
+const userStore = useUserStore()
+const message = useMessage() // 消息
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref<any[]>([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 20,
+  messageType: undefined,
+  readStatus: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await NotifyMessageApi.getMyNotifyMessagePage({
+      ...queryParams,
+      roleId: userStore.getUser?.currentRole
+    })
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 某一行，是否允许选中 */
+const selectable = (row: any) => {
+  return !row.readStatus
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+async function handleDetail(row: any) {
+  if (!row.readStatus) {
+    await handleReadOne(row.id)
+  }
+  const url = router.resolve({
+    path: '/nm-detail',
+    query: { id: row.id }
+  })
+  window.open(url.href, '_blank')
+}
+
+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({
+    roleId: userStore.getUser?.currentRole
+  })
+  message.success('全部已读成功！')
+  tableRef.value.clearSelection()
+  await getList()
+}
+
+/** 标记一些站内信已读 **/
+const handleUpdateList = async () => {
+  if (selectedIds.value.length === 0) {
+    return
+  }
+  await NotifyMessageApi.updateNotifyMessageRead({
+    ids: selectedIds.value,
+    roleId: userStore.getUser?.currentRole
+  })
+  message.success('批量已读成功！')
+  tableRef.value.clearSelection()
+  await getList()
+}
+
+/** 当表格选择项发生变化时会触发该事件  */
+const handleSelectionChange = (array: NotifyMessageApi.NotifyMessageVO[]) => {
+  selectedIds.value = []
+  if (!array) {
+    return
+  }
+  array.forEach((row) => selectedIds.value.push(row.id))
+}
+
+const typeOptions = ref<any[]>([])
+
+function getOptions() {
+  getGeneralSysDictData('message_type').then((data) => {
+    typeOptions.value = data
+  })
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getOptions()
+  getList()
+})
+</script>

src/views/Profile/NotifyMessageDetail.vue

@@ -0,0 +1,89 @@
+<!--
+ * @Author: riverQiu
+ * @Date: 2024-09-11 18:42:37
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2024-09-11 19:03:23
+ * @Description: 
+-->
+<template>
+  <div class="container">
+    <ContentWrap style="max-width: 1000px; margin: 0 auto">
+      <div class="text-center">
+        <div class="mb-10px" style="font-size: 24px; letter-spacing: 2px">
+          {{ info.title }}
+        </div>
+        <el-text>
+          {{ formatDate(info.createTime, 'YYYY-MM-DD hh:mm:ss') }}
+        </el-text>
+      </div>
+      <el-divider direction="horizontal" />
+
+      <div v-dompurify-html="info.content"></div>
+    </ContentWrap>
+  </div>
+</template>
+
+<script setup name="NMDetail">
+import { getNotifyMessageDetail, updateNotifyMessageRead } from '@/api/system/notify/message'
+import { formatDate } from '@/utils/formatTime'
+
+const route = useRoute()
+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;
+}
+:deep(table) {
+  margin-top: 10px;
+  border-collapse: separate;
+  text-indent: initial;
+  border-spacing: 1px;
+  text-align: left;
+  border-width: 1px;
+  box-sizing: border-box;
+}
+:deep(th) {
+  font-size: 14px;
+  text-align: left;
+  border-width: 1px;
+  box-sizing: border-box;
+}
+:deep(td) {
+  font-size: 12px;
+  text-align: left;
+  border-width: 1px;
+  box-sizing: border-box;
+}
+:deep(.el-card__body) {
+  padding: 20px 10px;
+}
+</style>

src/views/SchoolManagement/Class/Comp/DialogClass.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px">
+  <Dialog v-if="dialogVisible" :title="dialogTitle" v-model="dialogVisible" width="1000px">
     <el-tabs v-model="currentTab">
       <el-tab-pane label="基础信息" name="base">
         <el-form
@@ -474,12 +474,15 @@ const opts = ref({
 })
 
 /** 打开弹窗 */
-const open = async (type, id) => {
+const open = async (type, id, sp) => {
   dialogVisible.value = true
   dialogTitle.value = type == 'create' ? '新增班型' : '修改班型'
   formType.value = type
   currentTab.value = 'base'
   resetForm()
+  if (type == 'create' && sp && sp.length) {
+    formData.value.schPlace = sp
+  }
   if (!opts.value.length) {
     const arr = await ClassApi.getCommissionParams()
     arr.map((item) => {
@@ -491,6 +494,7 @@ const open = async (type, id) => {
     formLoading.value = true
     try {
       formData.value = await ClassApi.getClassType(id)
+      formData.value.remark = formData.value.remark || ''
       formData.value.schPlace = [formData.value.schoolId, formData.value.placeId]
       if (!formData.value.companyProfitVO) {
         profitCompanyForm.value = {
@@ -540,11 +544,23 @@ const resetForm = () => {
     typeName: '',
     licenseType: '',
     status: 0,
-    remark: '',
+    remark: undefined,
     quotations: [],
     percentages: []
   }
   formRef.value?.resetFields()
+
+  profitCompanyForm.value = {
+    profitMode: 1,
+    dangwei: [],
+    profitRule: {}
+  }
+
+  profitEmployeeForm.value = {
+    profitMode: 1,
+    dangwei: [],
+    profitRule: {}
+  }
 }
 
 function handleAddPrice() {

src/views/SchoolManagement/Class/index.vue

@@ -47,20 +47,23 @@
           plain
           @click="handleOpenDialog('create', null)"
           v-hasPermi="['school:class:add']"
-          >新增</el-button
         >
+          新增
+        </el-button>
         <el-button
           type="danger"
           @click="handleBatchDelete([])"
           v-hasPermi="['school:class:batch-delete']"
-          >批量删除</el-button
         >
+          批量删除
+        </el-button>
         <el-button
           type="warning"
           @click="handleBatchStatus"
           v-hasPermi="['school:class:batch-status']"
-          >批量启/停用</el-button
         >
+          批量启/停用
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -235,7 +238,7 @@ async function getList() {
 
 const ClassDialog = ref()
 function handleOpenDialog(type, id = null) {
-  ClassDialog.value.open(type, id)
+  ClassDialog.value.open(type, id, searchForm.value.schPlace)
 }
 
 function handleReset() {

src/views/SchoolManagement/Place/index.vue

@@ -109,10 +109,22 @@
               <el-input v-model="placeForm.address" placeholder="输入地址" />
             </el-form-item>
             <el-form-item label="经度" prop="lng">
-              <el-input v-model="placeForm.lng" placeholder="输入经度" />
+              <el-input-number
+                v-model="placeForm.lng"
+                :min="1"
+                :controls="false"
+                placeholder="输入经度"
+                style="width: 100%"
+              />
             </el-form-item>
             <el-form-item label="纬度" prop="lat">
-              <el-input v-model="placeForm.lat" placeholder="输入纬度" />
+              <el-input-number
+                v-model="placeForm.lat"
+                :min="1"
+                :controls="false"
+                placeholder="输入纬度"
+                style="width: 100%"
+              />
             </el-form-item>
             <el-form-item label="所属区域" prop="area">
               <el-select v-model="placeForm.area" placeholder="请选择" clearable class="w-full">
@@ -130,10 +142,10 @@
             <el-form-item label="负责人" prop="contact">
               <el-input v-model="placeForm.contact" placeholder="输入负责人" />
             </el-form-item>
-            <el-form-item label="是否推荐" prop="contact">
+            <!-- <el-form-item label="是否推荐" prop="contact">
               <el-radio v-model="placeForm.recommend" :label="true">是</el-radio>
               <el-radio v-model="placeForm.recommend" :label="false">否</el-radio>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="描述" name="desc">
@@ -145,6 +157,19 @@
         <el-button @click="closePlaceDialog">取消</el-button>
       </div>
     </el-card>
+    <el-autocomplete
+      :style="{
+        position: 'absolute',
+        top: '20px',
+        left: placeDialogShow ? '380px' : '20px',
+        width: '200px'
+      }"
+      v-model="areaValue"
+      clearable
+      placeholder="输入并搜索位置"
+      :fetch-suggestions="remoteMethod"
+      @select="currentSelect"
+    />
 
     <!-- 底部驾校场地列表 -->
     <el-card
@@ -234,6 +259,7 @@
 
 <script setup name="Place">
 import * as PlaceApi from '@/api/school/place'
+import { getConfigByConfigKey } from '@/api/system/set'
 import { getAreaSimpleList } from '@/api/school/setting/area'
 import { checkPermi } from '@/utils/permission'
 
@@ -267,18 +293,35 @@ const mapHelpText = ref('')
 const tipPostion = ref({})
 const placeTab = ref('info')
 
-function initMap() {
+const defaultLatLng = ref({
+  lat: 31.86119,
+  lng: 117.283042
+})
+const defaultCity = ref('合肥')
+
+let AutoComplete = ref(null)
+async function initMap() {
+  const data = await getConfigByConfigKey({ configKey: 'defaultLocation' })
+  const cityInfo = JSON.parse(data.configValue)
+  defaultLatLng.value = {
+    lat: cityInfo.lat,
+    lng: cityInfo.lng
+  }
+  defaultCity.value = cityInfo.locationName
   AMapLoader.load({
     key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
     version: '2.0',
-    plugins: ['AMap.Geocoder']
+    plugins: ['AMap.Geocoder', 'AMap.AutoComplete']
   }).then((AMap) => {
     aMap.value = AMap
     geoCoder.value = new AMap.Geocoder()
     dialogMap.value = new AMap.Map('dialogMap', {
       zoom: 12,
       zooms: [2, 22],
-      center: [117.283042, 31.86119]
+      center: [defaultLatLng.value.lng, defaultLatLng.value.lat]
+    })
+    AutoComplete.value = new AMap.AutoComplete({
+      city: defaultCity.value
     })
     locationMarker.value = new AMap.Marker({
       icon: FlagRed
@@ -313,6 +356,32 @@ function initMap() {
   })
 }
 
+const areaValue = ref('')
+function remoteMethod(searchValue, cb) {
+  if (searchValue) {
+    AutoComplete.value?.search(searchValue, (status, result) => {
+      if (result.tips?.length) {
+        // areaList.value = result?.tips
+        const list = result.tips.map((it) => ({
+          ...it,
+          value: it.name
+        }))
+        cb(list)
+      } else {
+        cb([])
+      }
+    })
+  } else {
+    cb([])
+  }
+}
+
+function currentSelect(val) {
+  if (val) {
+    dialogMap.value.setCenter([val.location?.lng, val.location?.lat], true)
+  }
+}
+
 function regeoCode() {
   geoCoder.value.getAddress([placeForm.value.lng, placeForm.value.lat], (status, result) => {
     if (status === 'complete' && result.regeocode) {