src/views/Basic/Dept/DeptForm.vue

@@ -1,7 +1,5 @@
 <template>
   <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
-    <el-tabs v-model="tabIndex">
-      <el-tab-pane label="基础信息" :name="1">
     <el-form
       ref="formRef"
       v-loading="formLoading"
@@ -66,64 +64,13 @@
         </el-col>
       </el-row>
     </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="业务指标" :name="2">
-        <el-form :model="formData" label-width="auto">
-          <el-form-item label="每日跟进指标数">
-            <el-input-number
-              v-model="formData.followDaliyNum"
-              :controls="false"
-              style="width: 150px"
-            />
-          </el-form-item>
-          <el-form-item label="跟进指标生效日期">
-            <el-date-picker
-              v-model="formData.effectDate"
-              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="taskList.push({})">添加年份</el-button>
-        <el-table :data="taskList" 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[`month${col}`]"
-                size="small"
-                :controls="false"
-                style="width: 100%"
-              />
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
-
     <template #footer>
       <el-button type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script name="SystemDeptForm" setup>
+<script lang="ts" name="SystemDeptForm" setup>
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
@@ -134,9 +81,6 @@ const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
-
-const tabIndex = ref(1)
-
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
@@ -148,7 +92,7 @@ const formData = ref({
   status: CommonStatusEnum.ENABLE,
   remark: undefined
 })
-const formRules = reactive({
+const formRules = reactive<any>({
   parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
   sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
@@ -160,10 +104,10 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构
-const userList = ref([]) // 用户列表
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
 /** 打开弹窗 */
-const open = async (type, id) => {
+const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -194,7 +138,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value
+    const data = formData.value as unknown as DeptApi.DeptVO
     if (formType.value === 'create') {
       await DeptApi.createDept(data)
       message.success(t('common.createSuccess'))
@@ -228,10 +172,8 @@ const resetForm = () => {
 const getTree = async () => {
   deptTree.value = []
   const data = await DeptApi.getSimpleDeptList()
-  let dept = { id: 0, name: '顶级部门', children: [] }
+  let dept: Tree = { id: 0, name: '顶级部门', children: [] }
   dept.children = handleTree(data)
   deptTree.value.push(dept)
 }
-
-const taskList = ref([])
 </script>

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

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