mod 巡检表单

src/api/crm/project/inspection/index.ts

@@ -2,17 +2,15 @@ import request from '@/config/axios'
 
 // 项目巡检配置 VO
 export interface ProjectInspectionConfigVO {
-  id?: number // 主键ID
   projectId: number // 项目ID
   configId: number // 配置ID
-  configType?: number // 配置类型
   configName: string // 配置名称
   frequency: string // 巡检频率
   managementParty: string // 管理方
   contactPerson: string // 联系人
   contactPhone: string // 联系电话
   responsiblePersonId: string // 负责人
-  status: number // 状态：0-停用，1-启用
+  status: boolean // 状态：0-停用，1-启用
   remark: string // 备注
 }
 

src/views/crm/project/inspection/config/checkpoint/ProjectInspectionCheckpointForm.vue

@@ -1,128 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="配置名称" prop="configName">
-            <el-input v-model="formData.configName" placeholder="请输入配置名称" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="显示顺序" prop="sort">
-            <el-input-number
-              v-model="formData.sort"
-              :min="0"
-              placeholder="请输入显示顺序"
-              class="!w-full"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="状态" prop="status">
-            <el-radio-group v-model="formData.status">
-              <el-radio
-                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-                :key="dict.value"
-                :label="dict.value"
-              >
-                {{ dict.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as ProjectInspectionCheckpointApi from '@/api/crm/project/inspection/checkpoint'
-
-/** 检查点配置 表单 */
-defineOptions({ name: 'ProjectInspectionCheckpointForm' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  configName: undefined,
-  sort: undefined,
-  status: undefined,
-})
-const formRules = reactive({
-  configName: [{ required: true, message: '配置名称不能为空', trigger: 'blur' }],
-  sort: [{ required: true, message: '显示顺序不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await ProjectInspectionCheckpointApi.getProjectInspectionCheckpoint(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as ProjectInspectionCheckpointApi.ProjectInspectionCheckpointVO
-    if (formType.value === 'create') {
-      await ProjectInspectionCheckpointApi.createProjectInspectionCheckpoint(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await ProjectInspectionCheckpointApi.updateProjectInspectionCheckpoint(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    configName: undefined,
-    sort: undefined,
-    status: undefined,
-  }
-  formRef.value?.resetFields()
-}
-</script>

src/views/crm/project/inspection/config/checkpoint/index.vue

@@ -1,189 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="配置名称" prop="configName">
-        <el-input
-          v-model="queryParams.configName"
-          placeholder="请输入配置名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="String(dict.value)"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['crm:project-inspection-checkpoint:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['crm:project-inspection-checkpoint:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="配置名称" align="center" prop="configName" />
-      <el-table-column label="显示顺序" align="center" prop="sort" />
-      <el-table-column label="状态" align="center" prop="status" min-width="80">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['crm:project-inspection-checkpoint:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['crm:project-inspection-checkpoint:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <ProjectInspectionCheckpointForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import download from '@/utils/download'
-import * as ProjectInspectionCheckpointApi from '@/api/crm/project/inspection/checkpoint'
-import ProjectInspectionCheckpointForm from './ProjectInspectionCheckpointForm.vue'
-
-/** 检查点配置 列表 */
-defineOptions({ name: 'CrmProjectInspectionCheckpoint' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref<ProjectInspectionCheckpointApi.ProjectInspectionCheckpointVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  configName: undefined,
-  status: undefined,
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await ProjectInspectionCheckpointApi.getProjectInspectionCheckpointPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ProjectInspectionCheckpointApi.deleteProjectInspectionCheckpoint(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await ProjectInspectionCheckpointApi.exportProjectInspectionCheckpoint(queryParams)
-    download.excel(data, '检查点配置.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>

src/views/crm/project/inspection/record/ProjectInspectionRecordForm.vue

@@ -73,7 +73,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24">
-          <el-form-item label="总体状态" prop="overallStatus">
+          <el-form-item label="结论" prop="overallStatus">
             <el-radio-group v-model="formData.overallStatus">
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PROJECT_INSPECTION_RECORD_OVERALL_STATUS)"

src/views/crm/project/inspection/record/index.vue

@@ -53,10 +53,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="总体状态" prop="overallStatus">
+      <el-form-item label="结论" prop="overallStatus">
         <el-select
           v-model="queryParams.overallStatus"
-          placeholder="请选择总体状态"
+          placeholder="请选择结论"
           clearable
           class="!w-240px"
         >
@@ -127,17 +127,17 @@
           {{ getUserName(scope.row.inspector) }}
         </template>
       </el-table-column>
-      <el-table-column label="总体状态" align="center" prop="overallStatus">
+      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CRM_PROJECT_INSPECTION_RECORD_OVERALL_STATUS" :value="scope.row.overallStatus" />
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_PROJECT_INSPECTION_RECORD_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
+      <el-table-column label="结论" align="center" prop="overallStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_PROJECT_INSPECTION_RECORD_OVERALL_STATUS" :value="scope.row.overallStatus" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" min-width="120px">
         <template #default="scope">
           <el-button