yinq
/
hwbm-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.52 出差申请页面显示优化

Browse Source
dev
yinq 2 days ago
parent 41fb8c0ccd
commit e42c456af0
2 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File

12
src/views/oa/crm/businessTripApply/edit.vue
Unescape Escape View File

@ -23,7 +23,7 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="出差类型" prop="tripType">
<el-select v-model="form.tripType" placeholder="请选择出差类型" :disabled="isFormDisabled || !!form.tripId">
<el-select v-model="form.tripType" placeholder="请选择出差类型" disabled>
<el-option v-for="dict in trip_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
@ -33,6 +33,16 @@
<el-input v-model="form.applyCode" placeholder="自动生成" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请人姓名" prop="applicantName">
<el-input v-model="form.applicantName" placeholder="自动填充" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请人部门" prop="deptName">
<el-input v-model="form.deptName" placeholder="自动填充" disabled />
</el-form-item>
</el-col>
<!-- 动态字段：安装调试 (Type 1) -->
<template v-if="form.tripType === '1'">

79
src/views/oa/crm/businessTripApply/index.vue
Unescape Escape View File

@ -25,12 +25,12 @@
<el-form-item label="出差地点" prop="tripLocation">
<el-input v-model="queryParams.tripLocation" placeholder="请输入出差地点" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="开始日期" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择开始日期" />
</el-form-item>
<el-form-item label="结束日期" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择结束日期" />
</el-form-item>
<!-- <el-form-item label="开始日期" prop="startTime">-->
<!-- <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择开始日期" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="结束日期" prop="endTime">-->
<!-- <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择结束日期" />-->
<!-- </el-form-item>-->
<el-form-item label="业务方向" prop="businessDirection">
<el-select v-model="queryParams.businessDirection" placeholder="请选择业务方向" clearable filterable style="width: 200px">
<el-option v-for="dict in business_direction" :key="dict.value" :label="dict.label" :value="dict.value" />
@ -86,18 +86,18 @@
<el-table v-loading="loading" border :data="businessTripApplyList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="申请ID" align="center" prop="tripId" v-if="columns[0].visible" />
<el-table-column label="申请单号" align="center" prop="applyCode" v-if="columns[2].visible" />
<el-table-column label="出差类型" align="center" prop="tripType" v-if="columns[3].visible">
<el-table-column label="申请ID" align="center" prop="tripId" width="80" v-if="columns[0].visible" />
<el-table-column label="申请单号" align="center" prop="applyCode" width="130" v-if="columns[2].visible" />
<el-table-column label="出差类型" align="center" prop="tripType" width="100" v-if="columns[3].visible">
<template #default="scope">
<dict-tag :options="trip_type" :value="scope.row.tripType" />
</template>
</el-table-column>
<el-table-column label="申请人ID" align="center" prop="applicantId" v-if="columns[4].visible" />
<el-table-column label="申请人" align="center" prop="applicantName" v-if="columns[5].visible" />
<el-table-column label="申请人部门ID" align="center" prop="deptId" v-if="columns[6].visible" />
<el-table-column label="申请人ID" align="center" prop="applicantId" width="80" v-if="columns[4].visible" />
<el-table-column label="申请人" align="center" prop="applicantName" width="100" v-if="columns[5].visible" />
<el-table-column label="申请人部门ID" align="center" prop="deptId" width="100" v-if="columns[6].visible" />
<el-table-column label="申请人部门" align="center" prop="deptName" v-if="columns[7].visible" width="120" />
<el-table-column label="出差地点" align="center" prop="tripLocation" v-if="columns[8].visible" />
<el-table-column label="出差地点" align="center" prop="tripLocation" width="150" v-if="columns[8].visible" />
<el-table-column label="开始日期" align="center" prop="startTime" width="100" v-if="columns[9].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
@ -108,27 +108,27 @@
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="时长(天)" align="center" prop="durationDays" v-if="columns[11].visible" />
<el-table-column label="出差事由" align="center" prop="tripReason" v-if="columns[12].visible" />
<el-table-column label="项目ID" align="center" prop="projectId" v-if="columns[13].visible" />
<el-table-column label="时长(天)" align="center" prop="durationDays" width="80" v-if="columns[11].visible" />
<el-table-column label="出差事由" align="center" prop="tripReason" width="200" show-overflow-tooltip v-if="columns[12].visible" />
<el-table-column label="项目ID" align="center" prop="projectId" width="80" v-if="columns[13].visible" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" v-if="columns[14].visible" /> -->
<el-table-column label="交流对象" align="center" prop="exchangeObject" v-if="columns[15].visible" />
<el-table-column label="业务方向" align="center" prop="businessDirection" v-if="columns[16].visible">
<el-table-column label="交流对象" align="center" prop="exchangeObject" width="150" show-overflow-tooltip v-if="columns[15].visible" />
<el-table-column label="业务方向" align="center" prop="businessDirection" width="120" v-if="columns[16].visible">
<template #default="scope">
<dict-tag :options="business_direction" :value="scope.row.businessDirection" />
</template>
</el-table-column>
<el-table-column label="交流目的" align="center" prop="exchangePurpose" v-if="columns[17].visible" />
<el-table-column label="交流过程简述" align="center" prop="exchangeProcess" v-if="columns[18].visible" />
<el-table-column label="会议/展会名称" align="center" prop="meetingName" v-if="columns[19].visible" />
<el-table-column label="结果反馈" align="center" prop="feedback" v-if="columns[20].visible" />
<el-table-column label="申请状态" align="center" prop="tripStatus" v-if="columns[21].visible">
<el-table-column label="交流目的" align="center" prop="exchangePurpose" width="150" show-overflow-tooltip v-if="columns[17].visible" />
<el-table-column label="交流过程简述" align="center" prop="exchangeProcess" width="200" show-overflow-tooltip v-if="columns[18].visible" />
<el-table-column label="会议/展会名称" align="center" prop="meetingName" width="150" show-overflow-tooltip v-if="columns[19].visible" />
<el-table-column label="结果反馈" align="center" prop="feedback" width="200" show-overflow-tooltip v-if="columns[20].visible" />
<el-table-column label="申请状态" align="center" prop="tripStatus" width="100" v-if="columns[21].visible">
<template #default="scope">
<dict-tag :options="trip_status" :value="scope.row.tripStatus" />
</template>
</el-table-column>
<el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[22].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[23].visible" />
<el-table-column label="流程状态" align="center" prop="flowStatus" width="100" v-if="columns[22].visible" />
<el-table-column label="备注" align="center" prop="remark" width="150" show-overflow-tooltip v-if="columns[23].visible" />
<!-- <el-table-column label="附件ID" align="center" prop="ossId" v-if="columns[24].visible" /> -->
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="160">
<template #default="scope">
@ -155,15 +155,15 @@
v-hasPermi="['oa/crm:businessTripApply:edit']"
></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['oa/crm:businessTripApply:remove']"
></el-button>
</el-tooltip>
<!-- <el-tooltip content="删除" placement="top">-->
<!-- <el-button-->
<!-- link-->
<!-- type="primary"-->
<!-- icon="Delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['oa/crm:businessTripApply:remove']"-->
<!-- ></el-button>-->
<!-- </el-tooltip>-->
</template>
</el-table-column>
</el-table>
@ -198,8 +198,8 @@
<script setup name="BusinessTripApply" lang="ts">
import { listBusinessTripApply, delBusinessTripApply, updateBusinessTripApply } from '@/api/oa/crm/businessTripApply';
import { BusinessTripApplyVO, BusinessTripApplyQuery } from '@/api/oa/crm/businessTripApply/types';
import { listUser } from '@/api/system/user';
import { UserVO } from '@/api/system/user/types';
import { getUserList, listUser } from '@/api/system/user';
import { UserQuery, UserVO } from '@/api/system/user/types';
import { listDept } from '@/api/system/dept';
import { DeptVO } from '@/api/system/dept/types';
@ -243,7 +243,7 @@ const columns = ref<FieldOption[]>([
{ key: 19, label: `会议/展会名称`, visible: true },
{ key: 20, label: `结果反馈`, visible: true },
{ key: 21, label: `申请状态`, visible: true },
{ key: 22, label: `流程状态`, visible: true },
{ key: 22, label: `流程状态`, visible: false },
{ key: 23, label: `备注`, visible: true },
{ key: 24, label: `附件ID`, visible: false },
{ key: 25, label: `删除标志`, visible: true },
@ -353,8 +353,9 @@ const handleExport = () => {
onMounted(async () => {
// 加载用户列表
const userRes = await listUser({ pageNum: 1, pageSize: 1000 });
userList.value = userRes.rows;
const userQuery = ref<UserQuery>();
const userRes = await getUserList(userQuery.value);
userList.value = userRes.data;
// 加载部门列表
const deptRes = await listDept();
deptList.value = deptRes.data;

Write Preview
Loading…
Cancel
Save