taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ctr): 优化合同类型展示

Browse Source 
- 在费用合同和收入合同列表中，将合同类型列的数据通过字典转换为可读性更强的文本
- 新增 useDict 钩子，用于获取字典数据
- 修复了项目用户列表中的部分样式问题
This commit is contained in:
tcy
2025-08-21 12:27:24 +08:00
parent 4c01c0a4a3
commit 3b90f269ae
3 changed files with 93 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/ctr/expensesContract/index.vue
View File

@ -60,6 +60,11 @@
<el-table-column label="项目ID" align="center" prop="projectId" />
<el-table-column label="合同编号" align="center" prop="contractCode" />
<el-table-column label="合同类型" align="center" prop="contractType" />
<el-table-column label="合同类型" align="center" prop="contractType">
<template #default="scope">
<dict-tag :options="expenses_contract_type" :value="scope.row.contractType" />
</template>
</el-table-column>
<el-table-column label="供应商" align="center" prop="contractSupplier" />
<el-table-column label="分包内容" align="center" prop="contractedContent" />
<el-table-column label="合同金额" align="center" prop="amount" />
@ -128,7 +133,9 @@ import { ExpensesContractVO, ExpensesContractQuery, ExpensesContractForm } from
import FileList from '@/components/FileList/index.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { expenses_contract_type, income_contract_type } = toRefs(
proxy?.useDict('income_contract_type', 'expenses_contract_type')
);
const expensesContractList = ref<ExpensesContractVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);

11
src/views/ctr/incomeContract/index.vue
View File

@ -56,7 +56,11 @@
<el-table-column type="index" width="50" label="序号" />
<el-table-column label="项目ID" align="center" prop="projectId" />
<el-table-column label="合同编号" align="center" prop="contractCode" />
<el-table-column label="合同类型" align="center" prop="contractType" />
<el-table-column label="合同类型" align="center" prop="contractType">
<template #default="scope">
<dict-tag :options="income_contract_type" :value="scope.row.contractType" />
</template>
</el-table-column>
<el-table-column label="业主单位" align="center" prop="contractOwner" />
<el-table-column label="承包内容" align="center" prop="contractedContent" />
<el-table-column label="合同金额" align="center" prop="amount" />
@ -118,8 +122,11 @@
import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract, getFileList } from '@/api/ctr/incomeContract';
import { IncomeContractVO, IncomeContractQuery, IncomeContractForm } from '@/api/ctr/incomeContract/types';
import FileList from '@/components/FileList/index.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { proxy } = getCurrentInstance();
const { expenses_contract_type, income_contract_type } = toRefs(
proxy?.useDict('income_contract_type', 'expenses_contract_type')
);
const incomeContractList = ref<IncomeContractVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);

156
src/views/project/projectUser/index.vue
View File

@ -1,6 +1,7 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
@ -40,59 +41,43 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete()"
v-hasPermi="['contractor:constructionUser:remove']"
>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
v-hasPermi="['contractor:constructionUser:remove']">
删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['contractor:constructionUser:export']"
>导出
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['contractor:constructionUser:export']">导出
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑 </el-button>
<el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑
</el-button>
</el-col>
<el-col :span="1.5">
<el-switch
v-model="playCardStatus"
class="ml-2"
inline-prompt
style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
:loading="playCardLoding"
@change="handlePlayCardStatus"
inactive-text="一键关闭打卡"
active-text="一键开启打卡"
/>
<el-switch v-model="playCardStatus" class="ml-2" inline-prompt
style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" :loading="playCardLoding"
@change="handlePlayCardStatus" inactive-text="一键关闭打卡" active-text="一键开启打卡" />
</el-col>
<el-row @mouseover="informationStatus = true" :gutter="10" @mouseout="informationStatus = false">
<el-col :span="1.5">
<el-button type="success" plain>员工资料 </el-button>
</el-col>
<el-col :span="1.5" v-show="informationStatus">
<el-button type="primary" plain icon="Edit" @click="downloadTemplate" v-hasPermi="['contractor:constructionUserFile:download']"
>下载资料模板
<el-button type="primary" plain icon="Edit" @click="downloadTemplate"
v-hasPermi="['contractor:constructionUserFile:download']">下载资料模板
</el-button>
</el-col>
<el-col :span="1.5" v-show="informationStatus">
<file-upload
v-model="filePath"
isImportInfo
:isShowTip="false"
uploadUrl="/project/constructionUserFile/upload/zip"
:limit="1"
:file-size="50"
>
<el-button type="warning" plain icon="Edit" v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button>
<file-upload v-model="filePath" isImportInfo :isShowTip="false"
uploadUrl="/project/constructionUserFile/upload/zip" :limit="1" :file-size="50">
<el-button type="warning" plain icon="Edit"
v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button>
</file-upload>
</el-col>
</el-row>
@ -130,18 +115,9 @@
</el-table-column>
<el-table-column label="打卡状态" align="center" prop="clock">
<template #default="scope">
<el-switch
v-model="scope.row.clock"
class="ml-2"
inline-prompt
style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
active-text="开启"
inactive-text="禁用"
:loading="playCardLoding"
active-value="0"
inactive-value="1"
@change="handleClockStatus(scope.row)"
/>
<el-switch v-model="scope.row.clock" class="ml-2" inline-prompt
style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" active-text="开启" inactive-text="禁用"
:loading="playCardLoding" active-value="0" inactive-value="1" @change="handleClockStatus(scope.row)" />
</template>
</el-table-column>
<el-table-column label="薪水" align="center" min-width="180">
@ -150,7 +126,8 @@
{{ scope.row.salary ? scope.row.salary : scope.row.standardSalary }}
(<dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit"></dict-tag>)
</span>
<div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">{{ scope.row.salary ? '取消变更' : '变更' }}</div>
<div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">{{ scope.row.salary ?
'取消变更' : '变更' }}</div>
</template>
</el-table-column>
<el-table-column label="入场时间" align="center" prop="entryDate" min-width="180" />
@ -164,30 +141,29 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="300">
<template #default="scope">
<el-space wrap>
<el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['contractor:constructionUser:query']">
<el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)"
v-hasPermi="['contractor:constructionUser:query']">
详情
</el-button>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['contractor:constructionUser:edit']">
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['contractor:constructionUser:edit']">
修改
</el-button>
<el-button link type="warning" icon="Female" @click="handlePlayCard(scope.row)"> 打卡 </el-button>
<el-button
link
type="danger"
icon="Avatar"
@click="handleJoinBlacklist(scope.row)"
v-hasPermi="['contractor:constructionBlacklist:add']"
>
<el-button link type="danger" icon="Avatar" @click="handleJoinBlacklist(scope.row)"
v-hasPermi="['contractor:constructionBlacklist:add']">
黑名单
</el-button>
<!-- <el-button link type="primary" icon="Switch" @click="handleToggle(scope.row)"> 切换人脸 </el-button> -->
<el-button link type="primary" icon="Switch" @click="handleChange(scope.row)"> 人员迁移 </el-button>
<el-button link type="primary" icon="ChatLineSquare" @click="handleExit(scope.row)"> 入退场记录 </el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['contractor:constructionUser:remove']">
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['contractor:constructionUser:remove']">
删除
</el-button>
<el-tooltip content="红点：部分上传，绿点：已上传，无点：未上传" placement="right" effect="dark">
<el-badge :is-dot="scope.row.fileUploadStatus != '1'" :type="uploadStatusColor(scope.row.fileUploadStatus)">
<el-badge :is-dot="scope.row.fileUploadStatus != '1'"
:type="uploadStatusColor(scope.row.fileUploadStatus)">
<el-button link type="primary" icon="FolderAdd" @click="handleUpload(scope.row)">文件上传 </el-button>
</el-badge>
</el-tooltip>
@ -196,7 +172,8 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改施工人员对话框 -->
<el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="930px" append-to-body>
@ -248,12 +225,14 @@
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证有效开始期" prop="sfzStart">
<el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效开始期" />
<el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD"
placeholder="请输入身份证有效开始期" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证有效结束期" prop="sfzEnd">
<el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效结束期" />
<el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD"
placeholder="请输入身份证有效结束期" />
</el-form-item>
</div>
<div class="el-col el-col-12">
@ -263,7 +242,8 @@
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证出生日期" prop="sfzBirth">
<el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证出生日期" />
<el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD"
placeholder="请输入身份证出生日期" />
</el-form-item>
</div>
<div class="el-col el-col-12">
@ -316,14 +296,16 @@
<div class="el-col el-col-12">
<el-form-item label="打卡" prop="clock">
<el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
<el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in user_clock_type" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="结算方式" prop="wageMeasureUnit">
<el-select v-model="form.wageMeasureUnit" clearable placeholder="请选择结算方式">
<el-option v-for="item in wage_measure_unit_type" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in wage_measure_unit_type" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
</div>
@ -352,7 +334,8 @@
</el-select>
</el-form-item>
<el-form-item label="分包单位" label-width="130px">
<el-select v-model="skipObject.contractorId" :disabled="!skipObject.projectId" placeholder="请选择分包单位" style="width: 240px">
<el-select v-model="skipObject.contractorId" :disabled="!skipObject.projectId" placeholder="请选择分包单位"
style="width: 240px">
<el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -367,7 +350,8 @@
<div class="image_upload" v-for="(item, index) in uploadPath" :key="item.value">
<div class="title">{{ item.label }}</div>
<div class="file_upload_all" v-if="item.value != 7">
<file-upload v-model="item.path" isConstruction :isShowTip="false" :limit="10" :file-type="['pdf']" :file-size="50" />
<file-upload v-model="item.path" isConstruction :isShowTip="false" :limit="10" :file-type="['pdf']"
:file-size="50" />
</div>
</div>
<template #footer>
@ -386,8 +370,7 @@
</el-form>
</div>
<template #footer>
<span
><el-button type="primary" @click="submitForm">保存</el-button>
<span><el-button type="primary" @click="submitForm">保存</el-button>
<el-button @click="showFaceDrawer = false">取消</el-button>
</span>
</template>
@ -399,8 +382,7 @@
</el-select>
</el-form-item>
<template #footer>
<span
><el-button type="primary" @click="handleEdit">保存</el-button>
<span><el-button type="primary" @click="handleEdit">保存</el-button>
<el-button @click="statusDialog = false">取消</el-button>
</span>
</template>
@ -424,8 +406,8 @@
<el-timeline-item color="rgb(255, 73, 73)">
<div class="mb">{{ '退场时间：' + item.entryDate }}</div>
<div class="pl-xl">
<span class="text-coolgray font-bold">退场文件：<image-preview v-for="itm in item.pathUrl" :src="itm" width="100px" class="mr" /></span
><br />
<span class="text-coolgray font-bold">退场文件：<image-preview v-for="itm in item.pathUrl" :src="itm"
width="100px" class="mr" /></span><br />
<p class="mt text-coolgray">
备注：<span class="text-blue">{{ item.remark }}</span>
</p>
@ -453,11 +435,8 @@
<el-date-picker v-model="monthValue" type="month" placeholder="请选择月份" @change="handleMonth" />
</template>
<template #date-cell="{ data }">
<div
class="w100% h100% position-relative m-0 monthDay"
:class="data.isSelected ? 'is-selected' : ''"
@click="handleViewPlayCard(playCardIdx(data), data)"
>
<div class="w100% h100% position-relative m-0 monthDay" :class="data.isSelected ? 'is-selected' : ''"
@click="handleViewPlayCard(playCardIdx(data), data)">
{{ data.day.split('-').slice(1).join('-') }}
<div :style="{ background: playCardColor(data) }" v-if="playCardIdx(data) != -1"></div>
</div>
@ -507,6 +486,7 @@ import {
ConstructionUserFileForm,
ConstructionUserFileQuery
} from '@/api/project/constructionUserFile/types';
import { ElLoadingService } from 'element-plus';
import type { CalendarDateType, CalendarInstance } from 'element-plus';
import { AttendanceMonthVO } from '@/api/project/attendance/types';
@ -909,7 +889,7 @@ const downloadTemplate = async () => {
};
//导入资料
const importInformation = async () => {};
const importInformation = async () => { };
/** 人员迁移 */
const handleChange = async (row: ConstructionUserVO) => {
@ -1087,10 +1067,12 @@ onMounted(() => {
margin: 0 15px;
position: relative;
font-size: 12px;
> div {
>div {
margin: 0 15px;
position: relative;
font-size: 12px;
&::before {
position: absolute;
content: '';
@ -1102,30 +1084,36 @@ onMounted(() => {
border-radius: 50%;
}
}
.red {
&::before {
background-color: red;
}
}
.gray {
&::before {
background-color: gray;
}
}
.orange {
&::before {
background-color: orange;
}
}
.green {
&::before {
background-color: green;
}
}
}
.monthDay {
padding: 8px;
> div {
>div {
position: absolute;
width: 20px;
height: 20px;
@ -1135,13 +1123,16 @@ onMounted(() => {
right: 0;
margin: auto;
}
.type2 {
background: rgb(255, 0, 0);
}
.type3 {
background: rgb(0, 128, 0);
}
}
.block_box {
border: 1px solid #9eccfa;
border-radius: 6px;
@ -1155,10 +1146,12 @@ onMounted(() => {
font-size: 14px;
margin-bottom: 10px;
}
.image_upload {
border-bottom: 1px solid #e3e3d7;
padding-bottom: 4px;
}
.title {
font-size: 18px;
font-weight: 700;
@ -1167,12 +1160,15 @@ onMounted(() => {
width: 100%;
font-family: cursive;
}
.information {
display: none;
}
.informationStatus:hover .information {
display: block;
}
::v-deep(.el-calendar) {
.el-calendar-day {
padding: 0;