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

合并

Browse Source
This commit is contained in:
taoge1020
2025-09-09 09:12:18 +08:00
parent cd9e00fc33 0c3ea8fe73
commit ee849ba62a
13 changed files with 189 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@ -7,12 +7,13 @@ VITE_APP_ENV = 'development'
# 开发环境 # 开发环境
VITE_APP_BASE_API = 'http://192.168.110.180:8899' VITE_APP_BASE_API = 'http://192.168.110.180:8899'
# 李陈杰 209 # 李陈杰 209
# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
# 曾涛 # 曾涛
# VITE_APP_BASE_API = 'http://192.168.110.180:8899' # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
# 罗成 # 罗成
# VITE_APP_BASE_API = 'http://192.168.110.188:8899' # VITE_APP_BASE_API = 'http://192.168.110.188:8899'
# 朱银 # 朱银
# VITE_APP_BASE_API = 'http://192.168.110.180:8899' # VITE_APP_BASE_API = 'http://192.168.110.149:8899'
#曾涛 #曾涛
# VITE_APP_BASE_API = 'http://192.168.110.171:8899' # VITE_APP_BASE_API = 'http://192.168.110.171:8899'

7
src/api/progress/progressCategory/index.ts
View File

@ -8,10 +8,11 @@ import { ProgressCategoryVO, ProgressCategoryForm, ProgressCategoryQuery } from
* @returns {*} * @returns {*}
*/ */
export const listProgressCategory = (id?: string | number): AxiosPromise<any[]> => { export const listProgressCategory = (parentId?: string | number,name?:string): AxiosPromise<any[]> => {
return request({ return request({
url: '/progress/progressCategory/listByParent/' + id, url: '/progress/progressCategory/listByParent',
method: 'get' method: 'get',
params:{parentId,name}
}); });
}; };

7
src/api/progress/progressCategoryTemplate/index.ts
View File

@ -78,9 +78,10 @@ export const getTabList = (id: string) => {
* @param parentId * @param parentId
* @returns {*} * @returns {*}
*/ */
export const listProgressCategoryTemplateByParent = (parentId: string | number): AxiosPromise<ProgressCategoryTemplateVO[]> => { export const listProgressCategoryTemplateByParent = (parentId: string | number,name:string): AxiosPromise<ProgressCategoryTemplateVO[]> => {
return request({ return request({
url: '/progress/progressCategoryTemplate/listByParent/' + parentId, url: '/progress/progressCategoryTemplate/listByParent' ,
method: 'get' method: 'get',
params:{parentId,name}
}); });
}; };

3
src/api/project/constructionUser/index.ts
View File

@ -164,7 +164,7 @@ export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) =
*/ */
export const getConstructionUserExit = (query: ConstructionUserExitForm) => { export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
return request({ return request({
url: '/contractor/constructionUserExit/list', url: '/project/constructionUserExit/list',
method: 'get', method: 'get',
params: query params: query
}); });
@ -204,7 +204,6 @@ export const importConstructionUserInfo = (file: string) => {
}); });
}; };
// 获取项目列表 // 获取项目列表
export const ProjectList = (query) => { export const ProjectList = (query) => {
return request({ return request({

6
src/api/project/constructionUserFile/index.ts
View File

@ -10,7 +10,7 @@ import { ConstructionUserFileVO, ConstructionUserFileForm, ConstructionUserFileQ
export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise<ConstructionUserFileVO[]> => { export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise<ConstructionUserFileVO[]> => {
return request({ return request({
url: '/project/constructionUserFile/list', url: '/contractor/constructionUserFile/list',
method: 'get', method: 'get',
params: query params: query
}); });
@ -22,7 +22,7 @@ export const listConstructionUserFile = (query?: ConstructionUserFileQuery): Axi
*/ */
export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPromise<string | number> => { export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPromise<string | number> => {
return request({ return request({
url: '/project/constructionUserFile/save', url: '/contractor/constructionUserFile/save',
method: 'post', method: 'post',
data data
}); });
@ -34,7 +34,7 @@ export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPr
*/ */
export const delConstructionUserFile = (id: string | number | Array<string | number>) => { export const delConstructionUserFile = (id: string | number | Array<string | number>) => {
return request({ return request({
url: '/project/constructionUserFile/' + id, url: '/contractor/constructionUserFile/' + id,
method: 'delete' method: 'delete'
}); });
}; };

3
src/components/FileUpload/index.vue
View File

@ -203,6 +203,7 @@ watch(
}); });
} else { } else {
fileList.value = []; fileList.value = [];
return []; return [];
} }
}, },
@ -293,7 +294,7 @@ const handleChange = (file: any, filelist: any) => {
} }
} }
// 记录 status = 'ready' 的文件 // 记录 status = 'ready' 的文件
if (file.status === 'ready') { if (file.status === 'ready' && !props.isConstruction) {
pendingFiles.value.push(file); pendingFiles.value.push(file);
fileList.value = pendingFiles.value; fileList.value = pendingFiles.value;
} }

115
src/views/design/appointment/index.vue
View File

@ -47,9 +47,9 @@
<el-row :gutter="8" class="mb-3 font-medium text-gray-700 whitespace-nowrap"> <el-row :gutter="8" class="mb-3 font-medium text-gray-700 whitespace-nowrap">
<el-col :span="4">专业</el-col> <el-col :span="4">专业</el-col>
<el-col :span="5">设计人员（可多选）</el-col> <el-col :span="5">设计人员（可多选）</el-col>
<el-col :span="5">校审人员</el-col> <el-col :span="5">校审人员</el-col> <el-col :span="4">审核人员</el-col>
<el-col :span="5">审定人员</el-col> <el-col :span="5">审定人员</el-col>
<el-col :span="4">审核人员</el-col>
<el-col :span="3"></el-col> <el-col :span="3"></el-col>
</el-row> </el-row>
@ -209,61 +209,7 @@
</el-col> </el-col>
<!-- 4. 审定人员 --> <!-- 4. 审定人员 -->
<el-col :span="5" class="mb-4 sm:mb-0">
<div class="pl-2 border-l-2 border-orange-200 py-2">
<div class="space-y-3">
<div
v-for="(person, personIndex) in majorConfig.approvedPersons"
:key="`approved-${configIndex}-${personIndex}`"
class="flex items-center"
>
<el-form-item
:prop="`approved.${configIndex}.persons.${personIndex}.userId`"
:rules="{ required: true, message: '请选择审定人员', trigger: 'change' }"
class="flex-1 mr-2 mb-0"
label="审定"
label-width="50px"
>
<el-select
filterable
v-model="person.userId"
placeholder="选择人员"
class="w-full transition-all duration-300 border-gray-300"
@change="() => checkDuplicate(person, 'approved', configIndex, personIndex)"
>
<el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
</el-select>
</el-form-item>
<!-- <div class="flex gap-1">
<el-button
type="danger"
size="small"
@click="removePerson('approved', configIndex, personIndex)"
class="transition-all duration-300 hover:bg-red-600"
:disabled="majorConfig.approvedPersons.length <= 1 || disabledForm"
>
<el-icon :size="14"><Delete /></el-icon>
</el-button>
<el-button
type="success"
size="small"
@click="addPerson('approved', configIndex)"
class="transition-all duration-300 transform hover:scale-105"
:disabled="!form.designers[configIndex].userMajor || disabledForm"
>
<el-icon :size="14"><Plus /></el-icon>
</el-button>
</div> -->
</div>
</div>
<div
v-if="majorConfig.approvedPersons.length == 0"
class="text-gray-500 text-xs py-2 bg-gray-100 rounded border border-dashed border-gray-200"
>
点击"添加"
</div>
</div>
</el-col>
<!-- 5. 审核人员 --> <!-- 5. 审核人员 -->
<el-col :span="5" class="mb-4 sm:mb-0"> <el-col :span="5" class="mb-4 sm:mb-0">
@ -321,6 +267,61 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="5" class="mb-4 sm:mb-0">
<div class="pl-2 border-l-2 border-orange-200 py-2">
<div class="space-y-3">
<div
v-for="(person, personIndex) in majorConfig.approvedPersons"
:key="`approved-${configIndex}-${personIndex}`"
class="flex items-center"
>
<el-form-item
:prop="`approved.${configIndex}.persons.${personIndex}.userId`"
:rules="{ required: true, message: '请选择审定人员', trigger: 'change' }"
class="flex-1 mr-2 mb-0"
label="审定"
label-width="50px"
>
<el-select
filterable
v-model="person.userId"
placeholder="选择人员"
class="w-full transition-all duration-300 border-gray-300"
@change="() => checkDuplicate(person, 'approved', configIndex, personIndex)"
>
<el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
</el-select>
</el-form-item>
<!-- <div class="flex gap-1">
<el-button
type="danger"
size="small"
@click="removePerson('approved', configIndex, personIndex)"
class="transition-all duration-300 hover:bg-red-600"
:disabled="majorConfig.approvedPersons.length <= 1 || disabledForm"
>
<el-icon :size="14"><Delete /></el-icon>
</el-button>
<el-button
type="success"
size="small"
@click="addPerson('approved', configIndex)"
class="transition-all duration-300 transform hover:scale-105"
:disabled="!form.designers[configIndex].userMajor || disabledForm"
>
<el-icon :size="14"><Plus /></el-icon>
</el-button>
</div> -->
</div>
</div>
<div
v-if="majorConfig.approvedPersons.length == 0"
class="text-gray-500 text-xs py-2 bg-gray-100 rounded border border-dashed border-gray-200"
>
点击"添加"
</div>
</div>
</el-col>
<!-- 操作列 --> <!-- 操作列 -->
<el-col :span="2" class="pr-4 mt-2 text-right"> <el-col :span="2" class="pr-4 mt-2 text-right">

9
src/views/out/outTable/index.vue
View File

@ -85,7 +85,7 @@ const handleQuery = () => {
/** 重置按钮操作 */ /** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
queryParams.value.month = ''; resetMonth();
handleQuery(); handleQuery();
}; };
// 获取列表 // 获取列表
@ -102,14 +102,17 @@ const getList = async () => {
total.value = res.total; total.value = res.total;
} }
}; };
onMounted(() => { const resetMonth=()=>{
const currentDate = new Date(); const currentDate = new Date();
const year = currentDate.getFullYear(); const year = currentDate.getFullYear();
const month = currentDate.getMonth() + 1; // 月份从0开始，所以需要加1 const month = currentDate.getMonth() + 1; // 月份从0开始，所以需要加1
// 形成"YYYY-M"格式 // 形成"YYYY-M"格式
const formattedDate = `${year}-${String(month).padStart(2, '0')}`; const formattedDate = `${year}-${String(month).padStart(2, '0')}`;
queryParams.value.month = formattedDate; queryParams.value.month = formattedDate;
}
onMounted(() => {
resetMonth();
getList(); getList();
}); });

12
src/views/progress/constructionSchedulePlan/index.vue
View File

@ -120,17 +120,17 @@
<!-- <el-input v-model="form.projectStructure" placeholder="请输入对应项目结构" /> --> <!-- <el-input v-model="form.projectStructure" placeholder="请输入对应项目结构" /> -->
</el-form-item> </el-form-item>
<el-form-item label="预计开始时间" prop="planStartDate"> <el-form-item label="预计开始时间" prop="planStartDate">
<el-date-picker clearable v-model="form.planStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择预计开始时间" /> <el-date-picker clearable v-model="form.planStartDate" type="date" value-format="YYYY-MM-DD" placeholder="选择预计开始时间" />
</el-form-item> </el-form-item>
<el-form-item label="预计结束时间" prop="planEndDate"> <el-form-item label="预计结束时间" prop="planEndDate">
<el-date-picker clearable v-model="form.planEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择预计结束时间" /> <el-date-picker clearable v-model="form.planEndDate" type="date" value-format="YYYY-MM-DD" placeholder="选择预计结束时间" />
</el-form-item> </el-form-item>
<el-form-item label="实际开始时间" prop="practicalStartDate"> <el-form-item label="实际开始时间" prop="practicalStartDate">
<el-date-picker <el-date-picker
clearable clearable
v-model="form.practicalStartDate" v-model="form.practicalStartDate"
type="datetime" type="date"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD"
placeholder="选择实际开始时间" placeholder="选择实际开始时间"
/> />
</el-form-item> </el-form-item>
@ -138,8 +138,8 @@
<el-date-picker <el-date-picker
clearable clearable
v-model="form.practicalEndDate" v-model="form.practicalEndDate"
type="datetime" type="date"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD"
placeholder="选择实际结束时间" placeholder="选择实际结束时间"
/> />
</el-form-item> </el-form-item>

2
src/views/progress/progressCategoryTemplate/index.vue
View File

@ -216,7 +216,7 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询进度类别模版列表 */ /** 查询进度类别模版列表 */
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
const res = await listProgressCategoryTemplateByParent(activeTab.value); const res = await listProgressCategoryTemplateByParent(activeTab.value,queryParams.value.name);
const data = proxy?.handleTree<ProgressCategoryTemplateVO>(res.data, 'id', 'parentId'); const data = proxy?.handleTree<ProgressCategoryTemplateVO>(res.data, 'id', 'parentId');
if (data) { if (data) {
progressCategoryTemplateList.value = data; progressCategoryTemplateList.value = data;

6
src/views/project/constructionUser/component/ConstructionUserDetail.vue
View File

@ -44,11 +44,11 @@
{{ userDetail?.sfzNumber }} {{ userDetail?.sfzNumber }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="身份证号码"> <el-form-item label="身份证号码">
{{ userDetail?.sfzNumber }} {{ userDetail?.sfzNumber }}
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证有效开始期"> <el-form-item label="身份证有效开始期">
{{ dayjs(userDetail?.sfzStart).format('YYYY 年 MM 月 DD 日') }} {{ dayjs(userDetail?.sfzStart).format('YYYY 年 MM 月 DD 日') }}
@ -59,7 +59,7 @@
{{ dayjs(userDetail?.sfzEnd).format('YYYY 年 MM 月 DD 日') }} {{ dayjs(userDetail?.sfzEnd).format('YYYY 年 MM 月 DD 日') }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="24">
<el-form-item label="身份证地址"> <el-form-item label="身份证地址">
{{ userDetail?.sfzSite }} {{ userDetail?.sfzSite }}
</el-form-item> </el-form-item>

6
src/views/project/projectUser/component/ConstructionUserDetail.vue
View File

@ -44,14 +44,14 @@
{{ userDetail?.sfzNumber }} {{ userDetail?.sfzNumber }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="身份证号码"> <el-form-item label="身份证号码">
{{ userDetail?.sfzNumber }} {{ userDetail?.sfzNumber }}
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证有效开始期"> <el-form-item label="身份证有效开始期">
{{ dayjs(userDetail?.sfzStart).format('YYYY 年 MM 月 DD 日') }} {{ dayjs(userDetail?.sfzStart).format('YYYY年 MM 月 DD 日') }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

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

@ -1,7 +1,6 @@
<template> <template>
<div class="p-2"> <div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]"> <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@ -46,43 +45,59 @@
<template #header> <template #header>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" <el-button
v-hasPermi="['contractor:constructionUser:remove']"> type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete()"
v-hasPermi="['contractor:constructionUser:remove']"
>
删除 删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['contractor:constructionUser:export']"
v-hasPermi="['contractor:constructionUser:export']">导出 >导出
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑 <el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑 </el-button>
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-switch v-model="playCardStatus" class="ml-2" inline-prompt <el-switch
style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" :loading="playCardLoding" v-model="playCardStatus"
@change="handlePlayCardStatus" inactive-text="一键关闭打卡" active-text="一键开启打卡" /> 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-col>
<el-row @mouseover="informationStatus = true" :gutter="10" @mouseout="informationStatus = false"> <el-row @mouseover="informationStatus = true" :gutter="10" @mouseout="informationStatus = false">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain>员工资料 </el-button> <el-button type="success" plain>员工资料 </el-button>
</el-col> </el-col>
<el-col :span="1.5" v-show="informationStatus"> <el-col :span="1.5" v-show="informationStatus">
<el-button type="primary" plain icon="Edit" @click="downloadTemplate" <el-button type="primary" plain icon="Edit" @click="downloadTemplate" v-hasPermi="['contractor:constructionUserFile:download']"
v-hasPermi="['contractor:constructionUserFile:download']">下载资料模板 >下载资料模板
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5" v-show="informationStatus"> <el-col :span="1.5" v-show="informationStatus">
<file-upload v-model="filePath" isImportInfo :isShowTip="false" <file-upload
uploadUrl="/project/constructionUserFile/upload/zip" :limit="1" :file-size="50"> v-model="filePath"
<el-button type="warning" plain icon="Edit" isImportInfo
v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button> :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> </file-upload>
</el-col> </el-col>
</el-row> </el-row>
@ -120,9 +135,18 @@
</el-table-column> </el-table-column>
<el-table-column label="打卡状态" align="center" prop="clock"> <el-table-column label="打卡状态" align="center" prop="clock">
<template #default="scope"> <template #default="scope">
<el-switch v-model="scope.row.clock" class="ml-2" inline-prompt <el-switch
style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" active-text="开启" inactive-text="禁用" v-model="scope.row.clock"
:loading="playCardLoding" active-value="0" inactive-value="1" @change="handleClockStatus(scope.row)" /> 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> </template>
</el-table-column> </el-table-column>
<el-table-column label="薪水" align="center" min-width="180"> <el-table-column label="薪水" align="center" min-width="180">
@ -131,8 +155,7 @@
{{ scope.row.salary ? scope.row.salary : scope.row.standardSalary }} {{ scope.row.salary ? scope.row.salary : scope.row.standardSalary }}
(<dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit"></dict-tag>) (<dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit"></dict-tag>)
</span> </span>
<div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">{{ scope.row.salary ? <div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">{{ scope.row.salary ? '取消变更' : '变更' }}</div>
'取消变更' : '变更' }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入场时间" align="center" prop="entryDate" min-width="180" /> <el-table-column label="入场时间" align="center" prop="entryDate" min-width="180" />
@ -146,30 +169,31 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="300"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="300">
<template #default="scope"> <template #default="scope">
<el-space wrap> <el-space wrap>
<el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['contractor:constructionUser:query']">
v-hasPermi="['contractor:constructionUser:query']">
详情 详情
</el-button> </el-button>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['contractor:constructionUser:edit']">
v-hasPermi="['contractor:constructionUser:edit']">
修改 修改
</el-button> </el-button>
<el-button link type="warning" icon="Female" @click="handlePlayCard(scope.row)"> 打卡 </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)" <el-button
v-hasPermi="['contractor:constructionBlacklist:add']"> link
type="danger"
icon="Avatar"
@click="handleJoinBlacklist(scope.row)"
v-hasPermi="['contractor:constructionBlacklist:add']"
>
黑名单 黑名单
</el-button> </el-button>
<!-- <el-button link type="primary" icon="Switch" @click="handleToggle(scope.row)"> 切换人脸 </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="Switch" @click="handleChange(scope.row)"> 人员迁移 </el-button>
<el-button link type="primary" icon="Switch" @click="handleAssign(scope.row)"> 分配班组 </el-button> <el-button link type="primary" icon="Switch" @click="handleAssign(scope.row)"> 分配班组 </el-button>
<el-button link type="primary" icon="ChatLineSquare" @click="handleExit(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)" <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['contractor:constructionUser:remove']">
v-hasPermi="['contractor:constructionUser:remove']">
删除 删除
</el-button> </el-button>
<el-tooltip content="红点：部分上传，绿点：已上传，无点：未上传" placement="right" effect="dark"> <el-tooltip content="红点：部分上传，绿点：已上传，无点：未上传" placement="right" effect="dark">
<el-badge :is-dot="scope.row.fileUploadStatus != '1'" <el-badge :is-dot="scope.row.fileUploadStatus != '1'" :type="uploadStatusColor(scope.row.fileUploadStatus)">
:type="uploadStatusColor(scope.row.fileUploadStatus)">
<el-button link type="primary" icon="FolderAdd" @click="handleUpload(scope.row)">文件上传 </el-button> <el-button link type="primary" icon="FolderAdd" @click="handleUpload(scope.row)">文件上传 </el-button>
</el-badge> </el-badge>
</el-tooltip> </el-tooltip>
@ -178,8 +202,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card> </el-card>
<!-- 添加或修改施工人员对话框 --> <!-- 添加或修改施工人员对话框 -->
<el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="930px" append-to-body> <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="930px" append-to-body>
@ -231,14 +254,12 @@
</div> </div>
<div class="el-col el-col-12"> <div class="el-col el-col-12">
<el-form-item label="身份证有效开始期" prop="sfzStart"> <el-form-item label="身份证有效开始期" prop="sfzStart">
<el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" <el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效开始期" />
placeholder="请输入身份证有效开始期" />
</el-form-item> </el-form-item>
</div> </div>
<div class="el-col el-col-12"> <div class="el-col el-col-12">
<el-form-item label="身份证有效结束期" prop="sfzEnd"> <el-form-item label="身份证有效结束期" prop="sfzEnd">
<el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" <el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效结束期" />
placeholder="请输入身份证有效结束期" />
</el-form-item> </el-form-item>
</div> </div>
<div class="el-col el-col-12"> <div class="el-col el-col-12">
@ -248,8 +269,7 @@
</div> </div>
<div class="el-col el-col-12"> <div class="el-col el-col-12">
<el-form-item label="身份证出生日期" prop="sfzBirth"> <el-form-item label="身份证出生日期" prop="sfzBirth">
<el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" <el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证出生日期" />
placeholder="请输入身份证出生日期" />
</el-form-item> </el-form-item>
</div> </div>
<div class="el-col el-col-12"> <div class="el-col el-col-12">
@ -302,16 +322,14 @@
<div class="el-col el-col-12"> <div class="el-col el-col-12">
<el-form-item label="打卡" prop="clock"> <el-form-item label="打卡" prop="clock">
<el-select v-model="form.clock" clearable placeholder="请选择打卡状态"> <el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
<el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" <el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
:value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
<div class="el-col el-col-12"> <div class="el-col el-col-12">
<el-form-item label="结算方式" prop="wageMeasureUnit"> <el-form-item label="结算方式" prop="wageMeasureUnit">
<el-select v-model="form.wageMeasureUnit" clearable placeholder="请选择结算方式"> <el-select v-model="form.wageMeasureUnit" clearable placeholder="请选择结算方式">
<el-option v-for="item in wage_measure_unit_type" :key="item.value" :label="item.label" <el-option v-for="item in wage_measure_unit_type" :key="item.value" :label="item.label" :value="item.value" />
:value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
@ -340,8 +358,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="分包单位" label-width="130px"> <el-form-item label="分包单位" label-width="130px">
<el-select v-model="skipObject.contractorId" :disabled="!skipObject.projectId" placeholder="请选择分包单位" <el-select v-model="skipObject.contractorId" :disabled="!skipObject.projectId" placeholder="请选择分包单位" style="width: 240px">
style="width: 240px">
<el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -356,8 +373,7 @@
<div class="image_upload" v-for="(item, index) in uploadPath" :key="item.value"> <div class="image_upload" v-for="(item, index) in uploadPath" :key="item.value">
<div class="title">{{ item.label }}</div> <div class="title">{{ item.label }}</div>
<div class="file_upload_all" v-if="item.value != 7"> <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-upload v-model="item.path" isConstruction show-file-list :isShowTip="false" :limit="10" :file-type="['pdf']" :file-size="50" />
:file-size="50" />
</div> </div>
</div> </div>
<template #footer> <template #footer>
@ -376,7 +392,8 @@
</el-form> </el-form>
</div> </div>
<template #footer> <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> <el-button @click="showFaceDrawer = false">取消</el-button>
</span> </span>
</template> </template>
@ -388,7 +405,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<template #footer> <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> <el-button @click="statusDialog = false">取消</el-button>
</span> </span>
</template> </template>
@ -412,8 +430,8 @@
<el-timeline-item color="rgb(255, 73, 73)"> <el-timeline-item color="rgb(255, 73, 73)">
<div class="mb">{{ '退场时间：' + item.entryDate }}</div> <div class="mb">{{ '退场时间：' + item.entryDate }}</div>
<div class="pl-xl"> <div class="pl-xl">
<span class="text-coolgray font-bold">退场文件：<image-preview v-for="itm in item.pathUrl" :src="itm" <span class="text-coolgray font-bold">退场文件：<image-preview v-for="itm in item.pathUrl" :src="itm" width="100px" class="mr" /></span
width="100px" class="mr" /></span><br /> ><br />
<p class="mt text-coolgray"> <p class="mt text-coolgray">
备注：<span class="text-blue">{{ item.remark }}</span> 备注：<span class="text-blue">{{ item.remark }}</span>
</p> </p>
@ -441,8 +459,11 @@
<el-date-picker v-model="monthValue" type="month" placeholder="请选择月份" @change="handleMonth" /> <el-date-picker v-model="monthValue" type="month" placeholder="请选择月份" @change="handleMonth" />
</template> </template>
<template #date-cell="{ data }"> <template #date-cell="{ data }">
<div class="w100% h100% position-relative m-0 monthDay" :class="data.isSelected ? 'is-selected' : ''" <div
@click="handleViewPlayCard(playCardIdx(data), data)"> class="w100% h100% position-relative m-0 monthDay"
:class="data.isSelected ? 'is-selected' : ''"
@click="handleViewPlayCard(playCardIdx(data), data)"
>
{{ data.day.split('-').slice(1).join('-') }} {{ data.day.split('-').slice(1).join('-') }}
<div :style="{ background: playCardColor(data) }" v-if="playCardIdx(data) != -1"></div> <div :style="{ background: playCardColor(data) }" v-if="playCardIdx(data) != -1"></div>
</div> </div>
@ -461,8 +482,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="班组" label-width="130px"> <el-form-item label="班组" label-width="130px">
<el-select v-model="personnelAllocationObject.teamId" :disabled="!personnelAllocationObject.projectId" placeholder="请选择分包单位" <el-select
style="width: 240px"> v-model="personnelAllocationObject.teamId"
:disabled="!personnelAllocationObject.projectId"
placeholder="请选择班组"
style="width: 240px"
>
<el-option v-for="item in teamList" :key="item.id" :label="item.teamName" :value="item.id" /> <el-option v-for="item in teamList" :key="item.id" :label="item.teamName" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -527,8 +552,8 @@ import { parseTime } from '@/utils/ruoyi';
const calendar = ref<CalendarInstance>(); const calendar = ref<CalendarInstance>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type,user_post_type } = toRefs<any>( const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type, user_post_type } = toRefs<any>(
proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type','user_post_type') proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type', 'user_post_type')
); );
// 获取用户 store // 获取用户 store
const userStore = useUserStoreHook(); const userStore = useUserStoreHook();
@ -586,7 +611,7 @@ const personnelAllocationObject = reactive({
memberId: null, memberId: null,
projectId: '', projectId: '',
teamId: '', teamId: '',
postId: '', postId: ''
}); });
const contractorList = ref<Array<skipTeamType>>([]); const contractorList = ref<Array<skipTeamType>>([]);
@ -942,7 +967,7 @@ const downloadTemplate = async () => {
}; };
//导入资料 //导入资料
const importInformation = async () => { }; const importInformation = async () => {};
/** 人员迁移 */ /** 人员迁移 */
const handleChange = async (row: ConstructionUserVO) => { const handleChange = async (row: ConstructionUserVO) => {
@ -974,7 +999,7 @@ const handleExit = async (row: ConstructionUserVO) => {
//上传按钮 //上传按钮
const handleUpload = async (row: ConstructionUserVO) => { const handleUpload = async (row: ConstructionUserVO) => {
const _id = row?.id || ids.value[0]; const _id = row?.sysUserId;
currentUserId.value = _id; currentUserId.value = _id;
const res = await listConstructionUserFile({ userId: _id }); const res = await listConstructionUserFile({ userId: _id });
fileList.value = res.data; fileList.value = res.data;
@ -1110,14 +1135,17 @@ const listeningProject = watch(
const handleAssign = async (row: ConstructionUserVO) => { const handleAssign = async (row: ConstructionUserVO) => {
const _id = row?.id || ids.value[0]; const _id = row?.id || ids.value[0];
currentUserId.value = _id; currentUserId.value = _id;
personnelAllocationObject.projectId = '';
personnelAllocationObject.postId = '';
personnelAllocationObject.teamId = '';
personnelAllocationObject.memberId = row?.sysUserId; personnelAllocationObject.memberId = row?.sysUserId;
skipName.value = row?.userName;
personnelAllocation.value = true; personnelAllocation.value = true;
}; };
// 选择项目1 // 选择项目1
const selectProject1 = (e: any) => { const selectProject1 = (e: any) => {
// 请求班组 // 请求班组
getTeamList(personnelAllocationObject.projectId); getTeamList(personnelAllocationObject.projectId);
}; };
const getTeamList = async (projectId) => { const getTeamList = async (projectId) => {
const res = await TeamList({ const res = await TeamList({
@ -1152,7 +1180,7 @@ onMounted(() => {
position: relative; position: relative;
font-size: 12px; font-size: 12px;
>div { > div {
margin: 0 15px; margin: 0 15px;
position: relative; position: relative;
font-size: 12px; font-size: 12px;
@ -1197,7 +1225,7 @@ onMounted(() => {
.monthDay { .monthDay {
padding: 8px; padding: 8px;
>div { > div {
position: absolute; position: absolute;
width: 20px; width: 20px;
height: 20px; height: 20px;