分包管理
This commit is contained in:
@ -40,7 +40,7 @@
|
|||||||
"file-saver": "2.0.5",
|
"file-saver": "2.0.5",
|
||||||
"fuse.js": "7.0.0",
|
"fuse.js": "7.0.0",
|
||||||
"gcoord": "^1.0.7",
|
"gcoord": "^1.0.7",
|
||||||
"geotiff": "^2.1.4-beta.0",
|
"geotiff": "^2.1.3",
|
||||||
"highlight.js": "11.9.0",
|
"highlight.js": "11.9.0",
|
||||||
"image-conversion": "2.1.1",
|
"image-conversion": "2.1.1",
|
||||||
"js-cookie": "3.0.5",
|
"js-cookie": "3.0.5",
|
||||||
|
@ -28,6 +28,10 @@ export interface ContractorVO {
|
|||||||
* 管理人联系电话
|
* 管理人联系电话
|
||||||
*/
|
*/
|
||||||
custodianPhone: string;
|
custodianPhone: string;
|
||||||
|
/**
|
||||||
|
* 分包类型
|
||||||
|
*/
|
||||||
|
contractorType?: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 公司相关文件
|
* 公司相关文件
|
||||||
@ -80,7 +84,10 @@ export interface ContractorForm extends BaseEntity {
|
|||||||
* 管理人联系电话
|
* 管理人联系电话
|
||||||
*/
|
*/
|
||||||
custodianPhone?: string;
|
custodianPhone?: string;
|
||||||
|
/**
|
||||||
|
* 分包类型
|
||||||
|
*/
|
||||||
|
contractorType?: string;
|
||||||
/**
|
/**
|
||||||
* 公司相关文件
|
* 公司相关文件
|
||||||
*/
|
*/
|
||||||
@ -120,6 +127,10 @@ export interface ContractorQuery extends PageQuery {
|
|||||||
* 管理人联系电话
|
* 管理人联系电话
|
||||||
*/
|
*/
|
||||||
custodianPhone?: string;
|
custodianPhone?: string;
|
||||||
|
/**
|
||||||
|
* 分包类型
|
||||||
|
*/
|
||||||
|
contractorType?: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 日期范围参数
|
* 日期范围参数
|
||||||
|
63
src/api/project/subcontract/index.ts
Normal file
63
src/api/project/subcontract/index.ts
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
import request from '@/utils/request';
|
||||||
|
import { AxiosPromise } from 'axios';
|
||||||
|
import { SubcontractVO, SubcontractForm, SubcontractQuery } from '@/api/project/subcontract/types';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询分包合同列表
|
||||||
|
* @param query
|
||||||
|
* @returns {*}
|
||||||
|
*/
|
||||||
|
|
||||||
|
export const listSubcontract = (query?: SubcontractQuery): AxiosPromise<SubcontractVO[]> => {
|
||||||
|
return request({
|
||||||
|
url: '/project/subcontract/list',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询分包合同详细
|
||||||
|
* @param id
|
||||||
|
*/
|
||||||
|
export const getSubcontract = (id: string | number): AxiosPromise<SubcontractVO> => {
|
||||||
|
return request({
|
||||||
|
url: '/project/subcontract/' + id,
|
||||||
|
method: 'get'
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增分包合同
|
||||||
|
* @param data
|
||||||
|
*/
|
||||||
|
export const addSubcontract = (data: SubcontractForm) => {
|
||||||
|
return request({
|
||||||
|
url: '/project/subcontract',
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改分包合同
|
||||||
|
* @param data
|
||||||
|
*/
|
||||||
|
export const updateSubcontract = (data: SubcontractForm) => {
|
||||||
|
return request({
|
||||||
|
url: '/project/subcontract',
|
||||||
|
method: 'put',
|
||||||
|
data: data
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除分包合同
|
||||||
|
* @param id
|
||||||
|
*/
|
||||||
|
export const delSubcontract = (id: string | number | Array<string | number>) => {
|
||||||
|
return request({
|
||||||
|
url: '/project/subcontract/' + id,
|
||||||
|
method: 'delete'
|
||||||
|
});
|
||||||
|
};
|
136
src/api/project/subcontract/types.ts
Normal file
136
src/api/project/subcontract/types.ts
Normal file
@ -0,0 +1,136 @@
|
|||||||
|
export interface SubcontractVO {
|
||||||
|
/**
|
||||||
|
* 项目id
|
||||||
|
*/
|
||||||
|
projectId: string | number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分包方id
|
||||||
|
*/
|
||||||
|
contractorId: string | number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同文件id
|
||||||
|
*/
|
||||||
|
contractFileId: string | number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同编号
|
||||||
|
*/
|
||||||
|
contractNumber: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同名称
|
||||||
|
*/
|
||||||
|
contractName: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同类型
|
||||||
|
*/
|
||||||
|
contractType: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同金额
|
||||||
|
*/
|
||||||
|
contractAmount: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同时间
|
||||||
|
*/
|
||||||
|
contractTime: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 备注
|
||||||
|
*/
|
||||||
|
remark: string;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SubcontractForm extends BaseEntity {
|
||||||
|
/**
|
||||||
|
* 主键id
|
||||||
|
*/
|
||||||
|
id?: string | number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 项目id
|
||||||
|
*/
|
||||||
|
projectId?: string | number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分包方id
|
||||||
|
*/
|
||||||
|
contractorId?: string | number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同文件id
|
||||||
|
*/
|
||||||
|
contractFileId?: string | number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同编号
|
||||||
|
*/
|
||||||
|
contractNumber?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同名称
|
||||||
|
*/
|
||||||
|
contractName?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同类型
|
||||||
|
*/
|
||||||
|
contractType?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同金额
|
||||||
|
*/
|
||||||
|
contractAmount?: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同时间
|
||||||
|
*/
|
||||||
|
contractTime?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 备注
|
||||||
|
*/
|
||||||
|
remark?: string;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SubcontractQuery extends PageQuery {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 项目id
|
||||||
|
*/
|
||||||
|
projectId?: string | number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分包方id
|
||||||
|
*/
|
||||||
|
contractorId?: string | number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同编号
|
||||||
|
*/
|
||||||
|
contractNumber?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同名称
|
||||||
|
*/
|
||||||
|
contractName?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同类型
|
||||||
|
*/
|
||||||
|
contractType?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 日期范围参数
|
||||||
|
*/
|
||||||
|
params?: any;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
|||||||
import copyText from './common/copyText';
|
import copyText from './common/copyText';
|
||||||
import { hasPermi, hasRoles } from './permission';
|
import { hasPermi, hasRoles } from './permission';
|
||||||
import { App } from 'vue';
|
import { App } from 'vue';
|
||||||
|
|
||||||
export default (app: App) => {
|
export default (app: App) => {
|
||||||
app.directive('copyText', copyText);
|
app.directive('copyText', copyText);
|
||||||
app.directive('hasPermi', hasPermi);
|
app.directive('hasPermi', hasPermi);
|
||||||
|
@ -194,7 +194,7 @@
|
|||||||
<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-card>
|
||||||
<!-- 添加或修改施工人员对话框 -->
|
<!-- 添加或修改施工人员对话框 -->
|
||||||
<el-dialog :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>
|
||||||
<el-form ref="constructionUserFormRef" :model="form" :rules="rules" label-width="130px" :inline="true">
|
<el-form ref="constructionUserFormRef" :model="form" :rules="rules" label-width="130px" :inline="true">
|
||||||
<div class="block_box">
|
<div class="block_box">
|
||||||
<div class="msg">用户信息</div>
|
<div class="msg">用户信息</div>
|
||||||
@ -337,10 +337,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog title="施工人员详情" v-model="showDetailDrawer" width="800px">
|
<el-dialog draggable title="施工人员详情" v-model="showDetailDrawer" width="800px">
|
||||||
<construction-user-detail :user-id="currentUserId" />
|
<construction-user-detail :user-id="currentUserId" />
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog :title="skipName + '-人员迁移'" v-model="skip" width="500px">
|
<el-dialog draggable :title="skipName + '-人员迁移'" v-model="skip" width="500px">
|
||||||
<el-form-item label="所属项目" label-width="130px">
|
<el-form-item label="所属项目" label-width="130px">
|
||||||
<el-select v-model="skipObject.projectId" @change="selectProject" placeholder="请选择所属项目" style="width: 240px">
|
<el-select v-model="skipObject.projectId" @change="selectProject" placeholder="请选择所属项目" style="width: 240px">
|
||||||
<el-option v-for="item in skipOptions" :key="item.id" :label="item.projectName" :value="item.id" />
|
<el-option v-for="item in skipOptions" :key="item.id" :label="item.projectName" :value="item.id" />
|
||||||
@ -358,7 +358,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog title="上传文件" v-model="fileStatus" width="770px">
|
<el-dialog draggable title="上传文件" v-model="fileStatus" width="770px">
|
||||||
<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">
|
||||||
@ -372,7 +372,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog :title="skipName + '-切换人脸'" v-model="showFaceDrawer" width="770px">
|
<el-dialog draggable :title="skipName + '-切换人脸'" v-model="showFaceDrawer" width="770px">
|
||||||
<div class="flex items-center justify-center">
|
<div class="flex items-center justify-center">
|
||||||
<el-form :model="form" ref="constructionUserFormRef" :rules="rules">
|
<el-form :model="form" ref="constructionUserFormRef" :rules="rules">
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
@ -387,7 +387,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog title="修改在职状态" v-model="statusDialog" width="30%">
|
<el-dialog draggable title="修改在职状态" v-model="statusDialog" width="30%">
|
||||||
<el-form-item label="在职状态">
|
<el-form-item label="在职状态">
|
||||||
<el-select v-model="vocationalStatus" placeholder="请选择状态">
|
<el-select v-model="vocationalStatus" placeholder="请选择状态">
|
||||||
<el-option v-for="item in user_status_type" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in user_status_type" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
@ -400,7 +400,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog title="温馨提示" v-model="salaryStatus" width="30%">
|
<el-dialog draggable title="温馨提示" v-model="salaryStatus" width="30%">
|
||||||
<span>请输入薪资</span>
|
<span>请输入薪资</span>
|
||||||
<el-input class="mt-xl" v-model="changeSalary" placeholder="" clearable @change=""></el-input>
|
<el-input class="mt-xl" v-model="changeSalary" placeholder="" clearable @change=""></el-input>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
@ -410,7 +410,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog title="入场退场记录" v-model="exitStatus" width="600px">
|
<el-dialog draggable title="入场退场记录" v-model="exitStatus" width="600px">
|
||||||
<div v-for="(item, index) in exitList">
|
<div v-for="(item, index) in exitList">
|
||||||
<el-timeline>
|
<el-timeline>
|
||||||
<el-timeline-item color="#0bbd87" class="mb">
|
<el-timeline-item color="#0bbd87" class="mb">
|
||||||
@ -435,7 +435,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog :title="`打卡记录`" v-model="playCardCalendar" width="770px" :close-on-click-modal="false">
|
<el-dialog draggable :title="`打卡记录`" v-model="playCardCalendar" width="770px" :close-on-click-modal="false">
|
||||||
<el-calendar ref="calendar" v-model="calendarDay">
|
<el-calendar ref="calendar" v-model="calendarDay">
|
||||||
<template #header="{ date }">
|
<template #header="{ date }">
|
||||||
<span>{{ date }}</span>
|
<span>{{ date }}</span>
|
||||||
|
@ -7,6 +7,11 @@
|
|||||||
<el-form-item label="公司名称" prop="name">
|
<el-form-item label="公司名称" prop="name">
|
||||||
<el-input v-model="queryParams.name" placeholder="请输入公司名称" clearable @keyup.enter="handleQuery" />
|
<el-input v-model="queryParams.name" placeholder="请输入公司名称" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="分包类型" prop="contractorType">
|
||||||
|
<el-select v-model="queryParams.contractorType" filterable placeholder="请选择类型">
|
||||||
|
<el-option v-for="(item, i) of dictList" :key="i" :label="item.dictLabel" :value="item.dictValue"> </el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||||
@ -32,9 +37,9 @@
|
|||||||
>删除
|
>删除
|
||||||
</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" v-hasPermi="['project:contractor:export']">导出 </el-button>
|
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:contractor:export']">导出 </el-button>
|
||||||
</el-col>
|
</el-col> -->
|
||||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
</template>
|
</template>
|
||||||
@ -43,6 +48,11 @@
|
|||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column label="序号" type="index" width="60" align="center" />
|
<el-table-column label="序号" type="index" width="60" align="center" />
|
||||||
<el-table-column label="公司名称" align="center" prop="name" />
|
<el-table-column label="公司名称" align="center" prop="name" />
|
||||||
|
<el-table-column label="分包类型" align="center">
|
||||||
|
<template #default="scope">
|
||||||
|
<span>{{ filterType(scope.row.contractorType) }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="负责人" align="center" prop="principal" />
|
<el-table-column label="负责人" align="center" prop="principal" />
|
||||||
<el-table-column label="负责人联系电话" align="center" prop="principalPhone" />
|
<el-table-column label="负责人联系电话" align="center" prop="principalPhone" />
|
||||||
<el-table-column label="管理人" align="center" prop="custodian" />
|
<el-table-column label="管理人" align="center" prop="custodian" />
|
||||||
@ -61,11 +71,10 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</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-card>
|
||||||
<!-- 添加或修改分包单位对话框 -->
|
<!-- 添加或修改分包单位对话框 -->
|
||||||
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
|
<el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
|
||||||
<el-form ref="contractorFormRef" :model="form" :rules="rules" label-width="120px">
|
<el-form ref="contractorFormRef" :model="form" :rules="rules" label-width="120px">
|
||||||
<el-form-item label="公司名称" prop="name">
|
<el-form-item label="公司名称" prop="name">
|
||||||
<el-input v-model="form.name" placeholder="请输入公司名称" />
|
<el-input v-model="form.name" placeholder="请输入公司名称" />
|
||||||
@ -82,6 +91,11 @@
|
|||||||
<el-form-item label="管理人联系电话" prop="custodianPhone">
|
<el-form-item label="管理人联系电话" prop="custodianPhone">
|
||||||
<el-input v-model="form.custodianPhone" placeholder="请输入管理人联系电话" />
|
<el-input v-model="form.custodianPhone" placeholder="请输入管理人联系电话" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="分包类型" prop="contractorType">
|
||||||
|
<el-select v-model="form.contractorType" filterable placeholder="请选择类型">
|
||||||
|
<el-option v-for="(item, i) of dictList" :key="i" :label="item.dictLabel" :value="item.dictValue"> </el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="备注" prop="remark">
|
||||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -93,7 +107,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog title="上传文件" v-model="visible" width="800px">
|
<el-dialog draggable title="上传文件" v-model="visible" width="800px">
|
||||||
<contractor-file-dialog :contractor-id="currentContractorId" />
|
<contractor-file-dialog :contractor-id="currentContractorId" />
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
@ -104,6 +118,7 @@ import { addContractor, delContractor, getContractor, listContractor, updateCont
|
|||||||
import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/contractor/types';
|
import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/contractor/types';
|
||||||
import ContractorFileDialog from '@/views/project/contractor/component/ContractorFileDialog.vue';
|
import ContractorFileDialog from '@/views/project/contractor/component/ContractorFileDialog.vue';
|
||||||
import { useUserStoreHook } from '@/store/modules/user';
|
import { useUserStoreHook } from '@/store/modules/user';
|
||||||
|
import { listData } from '@/api/system/dict/data';
|
||||||
|
|
||||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||||
|
|
||||||
@ -120,6 +135,7 @@ const queryFormRef = ref<ElFormInstance>();
|
|||||||
const contractorFormRef = ref<ElFormInstance>();
|
const contractorFormRef = ref<ElFormInstance>();
|
||||||
// 获取用户 store
|
// 获取用户 store
|
||||||
const userStore = useUserStoreHook();
|
const userStore = useUserStoreHook();
|
||||||
|
const dictList = ref([]); //字典列表
|
||||||
// 从 store 中获取项目列表和当前选中的项目
|
// 从 store 中获取项目列表和当前选中的项目
|
||||||
const currentProject = computed(() => userStore.selectedProject);
|
const currentProject = computed(() => userStore.selectedProject);
|
||||||
const dialog = reactive<DialogOption>({
|
const dialog = reactive<DialogOption>({
|
||||||
@ -134,6 +150,7 @@ const initFormData: ContractorForm = {
|
|||||||
principalPhone: undefined,
|
principalPhone: undefined,
|
||||||
custodian: undefined,
|
custodian: undefined,
|
||||||
custodianPhone: undefined,
|
custodianPhone: undefined,
|
||||||
|
contractorType: undefined,
|
||||||
fileMap: undefined,
|
fileMap: undefined,
|
||||||
remark: undefined,
|
remark: undefined,
|
||||||
projectId: currentProject.value.id
|
projectId: currentProject.value.id
|
||||||
@ -150,6 +167,7 @@ const data = reactive<PageData<ContractorForm, ContractorQuery>>({
|
|||||||
principalPhone: undefined,
|
principalPhone: undefined,
|
||||||
custodian: undefined,
|
custodian: undefined,
|
||||||
custodianPhone: undefined,
|
custodianPhone: undefined,
|
||||||
|
contractorType: undefined,
|
||||||
projectId: currentProject.value.id,
|
projectId: currentProject.value.id,
|
||||||
params: {}
|
params: {}
|
||||||
},
|
},
|
||||||
@ -159,7 +177,27 @@ const data = reactive<PageData<ContractorForm, ContractorQuery>>({
|
|||||||
});
|
});
|
||||||
|
|
||||||
const { queryParams, form, rules } = toRefs(data);
|
const { queryParams, form, rules } = toRefs(data);
|
||||||
|
/** 查询字典数据列表 */
|
||||||
|
const getDictList = async () => {
|
||||||
|
const res = await listData({
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
dictName: '',
|
||||||
|
dictType: 'contractor_type',
|
||||||
|
dictLabel: ''
|
||||||
|
});
|
||||||
|
dictList.value = res.rows;
|
||||||
|
};
|
||||||
|
// 分包类型
|
||||||
|
const filterType=(val)=>{
|
||||||
|
let label='';
|
||||||
|
dictList.value.forEach(item=>{
|
||||||
|
if(item.dictValue==val){
|
||||||
|
label=item.dictLabel
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return label;
|
||||||
|
}
|
||||||
/** 查询分包单位列表 */
|
/** 查询分包单位列表 */
|
||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
@ -278,6 +316,7 @@ onUnmounted(() => {
|
|||||||
listeningProject();
|
listeningProject();
|
||||||
});
|
});
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
getDictList();
|
||||||
getList();
|
getList();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
299
src/views/project/subcontract/index.vue
Normal file
299
src/views/project/subcontract/index.vue
Normal file
@ -0,0 +1,299 @@
|
|||||||
|
<template>
|
||||||
|
<div class="p-2">
|
||||||
|
<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">
|
||||||
|
<el-form-item label="分包方" prop="contractorId">
|
||||||
|
<el-select v-model="queryParams.contractorId" filterable placeholder="请选择分包方">
|
||||||
|
<el-option v-for="(item, i) of contractorList" :key="i" :label="item.name" :value="item.id"> </el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同编号" prop="contractNumber">
|
||||||
|
<el-input v-model="queryParams.contractNumber" placeholder="请输入合同编号" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同名称" prop="contractName">
|
||||||
|
<el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同类型" prop="contractType">
|
||||||
|
<el-select v-model="queryParams.contractType" placeholder="请选择合同类型" clearable>
|
||||||
|
<el-option v-for="dict in subcontract_type" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||||
|
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
</el-card>
|
||||||
|
</div>
|
||||||
|
</transition>
|
||||||
|
|
||||||
|
<el-card shadow="never">
|
||||||
|
<template #header>
|
||||||
|
<el-row :gutter="10" class="mb8">
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:subcontract:add']">新增</el-button>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:subcontract:edit']"
|
||||||
|
>修改</el-button
|
||||||
|
>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:subcontract:remove']"
|
||||||
|
>删除</el-button
|
||||||
|
>
|
||||||
|
</el-col>
|
||||||
|
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
|
</el-row>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<el-table v-loading="loading" :data="subcontractList" @selection-change="handleSelectionChange">
|
||||||
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
|
<el-table-column label="分包方" align="center" prop="contractorName" />
|
||||||
|
<el-table-column label="合同编号" align="center" prop="contractNumber" />
|
||||||
|
<el-table-column label="合同名称" align="center" prop="contractName" />
|
||||||
|
<el-table-column label="合同类型" align="center" prop="contractType">
|
||||||
|
<template #default="scope">
|
||||||
|
<dict-tag :options="subcontract_type" :value="scope.row.contractType" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="合同金额" align="center" prop="contractAmount" />
|
||||||
|
<el-table-column label="合同时间" align="center" prop="contractTime" width="180">
|
||||||
|
<template #default="scope">
|
||||||
|
<span>{{ parseTime(scope.row.contractTime, '{y}-{m}-{d}') }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
|
<template #default="scope">
|
||||||
|
<el-tooltip content="修改" placement="top">
|
||||||
|
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:subcontract:edit']"></el-button>
|
||||||
|
</el-tooltip>
|
||||||
|
<el-tooltip content="删除" placement="top">
|
||||||
|
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:subcontract:remove']"></el-button>
|
||||||
|
</el-tooltip>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<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="500px" append-to-body>
|
||||||
|
<el-form ref="subcontractFormRef" :model="form" :rules="rules" label-width="110px">
|
||||||
|
<el-form-item label="分包方" prop="contractorId">
|
||||||
|
<el-select v-model="form.contractorId" filterable placeholder="请选择分包方">
|
||||||
|
<el-option v-for="(item, i) of contractorList" :key="i" :label="item.name" :value="item.id"> </el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同文件" prop="contractFileId">
|
||||||
|
<file-upload fileSize="" :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'png', 'jpg', 'jpeg']" v-model="form.contractFileId" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同名称" prop="contractName">
|
||||||
|
<el-input v-model="form.contractName" placeholder="请输入合同名称" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同编号" prop="contractNumber">
|
||||||
|
<el-input v-model="form.contractNumber" placeholder="请输入合同编号" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同类型" prop="contractType">
|
||||||
|
<el-select v-model="form.contractType" placeholder="请选择合同类型">
|
||||||
|
<el-option v-for="dict in subcontract_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同金额(元)" prop="contractAmount">
|
||||||
|
<el-input v-model="form.contractAmount" type="number" placeholder="请输入合同金额" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同日期" prop="contractTime">
|
||||||
|
<el-date-picker clearable v-model="form.contractTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择合同日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="备注" prop="remark">
|
||||||
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
<template #footer>
|
||||||
|
<div class="dialog-footer">
|
||||||
|
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup name="Subcontract" lang="ts">
|
||||||
|
import { listSubcontract, getSubcontract, delSubcontract, addSubcontract, updateSubcontract } from '@/api/project/subcontract';
|
||||||
|
import { SubcontractVO, SubcontractQuery, SubcontractForm } from '@/api/project/subcontract/types';
|
||||||
|
import { listContractor, } from '@/api/project/contractor';
|
||||||
|
import { useUserStoreHook } from '@/store/modules/user';
|
||||||
|
|
||||||
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||||
|
// 获取用户 store
|
||||||
|
const userStore = useUserStoreHook();
|
||||||
|
const { subcontract_type } = toRefs<any>(proxy?.useDict('subcontract_type'));
|
||||||
|
const currentProject = computed(() => userStore.selectedProject);
|
||||||
|
const subcontractList = ref<SubcontractVO[]>([]);
|
||||||
|
const buttonLoading = ref(false);
|
||||||
|
const loading = ref(true);
|
||||||
|
const showSearch = ref(true);
|
||||||
|
const ids = ref<Array<string | number>>([]);
|
||||||
|
const single = ref(true);
|
||||||
|
const multiple = ref(true);
|
||||||
|
const total = ref(0);
|
||||||
|
const contractorList=ref([]);//分包列表
|
||||||
|
const queryFormRef = ref<ElFormInstance>();
|
||||||
|
const subcontractFormRef = ref<ElFormInstance>();
|
||||||
|
|
||||||
|
const dialog = reactive<DialogOption>({
|
||||||
|
visible: false,
|
||||||
|
title: ''
|
||||||
|
});
|
||||||
|
|
||||||
|
const initFormData: SubcontractForm = {
|
||||||
|
id: undefined,
|
||||||
|
projectId: currentProject.value.id,
|
||||||
|
contractorId: undefined,
|
||||||
|
contractFileId: undefined,
|
||||||
|
contractNumber: undefined,
|
||||||
|
contractName: undefined,
|
||||||
|
contractType: undefined,
|
||||||
|
contractAmount: undefined,
|
||||||
|
contractTime: undefined,
|
||||||
|
remark: undefined
|
||||||
|
};
|
||||||
|
const data = reactive<PageData<SubcontractForm, SubcontractQuery>>({
|
||||||
|
form: { ...initFormData },
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
projectId: currentProject.value.id,
|
||||||
|
contractorId: undefined,
|
||||||
|
contractNumber: undefined,
|
||||||
|
contractName: undefined,
|
||||||
|
contractType: undefined,
|
||||||
|
params: {}
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
contractorId: [{ required: true, message: '分包方不能为空', trigger: 'blur' }],
|
||||||
|
contractFileId: [{ required: true, message: '合同文件不能为空', trigger: 'blur' }],
|
||||||
|
contractType: [{ required: true, message: '合同类型不能为空', trigger: 'change' }],
|
||||||
|
contractNumber: [{ required: true, message: '合同编号不能为空', trigger: 'change' }],
|
||||||
|
contractName: [{ required: true, message: '合同名称不能为空', trigger: 'change' }],
|
||||||
|
contractAmount: [{ required: true, message: '合同金额不能为空', trigger: 'change' }],
|
||||||
|
contractTime: [{ required: true, message: '合同时间不能为空', trigger: 'change' }],
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const { queryParams, form, rules } = toRefs(data);
|
||||||
|
|
||||||
|
/** 查询分包合同列表 */
|
||||||
|
const getList = async () => {
|
||||||
|
loading.value = true;
|
||||||
|
const res = await listSubcontract(queryParams.value);
|
||||||
|
subcontractList.value = res.rows;
|
||||||
|
total.value = res.total;
|
||||||
|
loading.value = false;
|
||||||
|
};
|
||||||
|
/** 查询分包单位列表 */
|
||||||
|
const getSubList = async () => {
|
||||||
|
const res = await listContractor({
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10000,
|
||||||
|
projectId: currentProject.value.id,
|
||||||
|
});
|
||||||
|
contractorList.value = res.rows;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 取消按钮 */
|
||||||
|
const cancel = () => {
|
||||||
|
reset();
|
||||||
|
dialog.visible = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 表单重置 */
|
||||||
|
const reset = () => {
|
||||||
|
form.value = { ...initFormData };
|
||||||
|
subcontractFormRef.value?.resetFields();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 搜索按钮操作 */
|
||||||
|
const handleQuery = () => {
|
||||||
|
queryParams.value.pageNum = 1;
|
||||||
|
getList();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 重置按钮操作 */
|
||||||
|
const resetQuery = () => {
|
||||||
|
queryFormRef.value?.resetFields();
|
||||||
|
handleQuery();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 多选框选中数据 */
|
||||||
|
const handleSelectionChange = (selection: SubcontractVO[]) => {
|
||||||
|
ids.value = selection.map((item) => item.id);
|
||||||
|
single.value = selection.length != 1;
|
||||||
|
multiple.value = !selection.length;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 新增按钮操作 */
|
||||||
|
const handleAdd = () => {
|
||||||
|
reset();
|
||||||
|
dialog.visible = true;
|
||||||
|
dialog.title = '添加分包合同';
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 修改按钮操作 */
|
||||||
|
const handleUpdate = async (row?: SubcontractVO) => {
|
||||||
|
reset();
|
||||||
|
const _id = row?.id || ids.value[0];
|
||||||
|
const res = await getSubcontract(_id);
|
||||||
|
Object.assign(form.value, res.data);
|
||||||
|
dialog.visible = true;
|
||||||
|
dialog.title = '修改分包合同';
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 提交按钮 */
|
||||||
|
const submitForm = () => {
|
||||||
|
subcontractFormRef.value?.validate(async (valid: boolean) => {
|
||||||
|
if (valid) {
|
||||||
|
buttonLoading.value = true;
|
||||||
|
if (form.value.id) {
|
||||||
|
await updateSubcontract(form.value).finally(() => (buttonLoading.value = false));
|
||||||
|
} else {
|
||||||
|
await addSubcontract(form.value).finally(() => (buttonLoading.value = false));
|
||||||
|
}
|
||||||
|
proxy?.$modal.msgSuccess('操作成功');
|
||||||
|
dialog.visible = false;
|
||||||
|
await getList();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 删除按钮操作 */
|
||||||
|
const handleDelete = async (row?: SubcontractVO) => {
|
||||||
|
const _ids = row?.id || ids.value;
|
||||||
|
await proxy?.$modal.confirm('是否确认删除分包合同编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
|
||||||
|
await delSubcontract(_ids);
|
||||||
|
proxy?.$modal.msgSuccess('删除成功');
|
||||||
|
await getList();
|
||||||
|
};
|
||||||
|
|
||||||
|
//监听项目id刷新数据
|
||||||
|
const listeningProject = watch(
|
||||||
|
() => currentProject.value.id,
|
||||||
|
(nid, oid) => {
|
||||||
|
queryParams.value.projectId = nid;
|
||||||
|
form.value.projectId = nid;
|
||||||
|
getList();
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
listeningProject();
|
||||||
|
});
|
||||||
|
onMounted(() => {
|
||||||
|
getSubList();
|
||||||
|
getList();
|
||||||
|
});
|
||||||
|
</script>
|
Reference in New Issue
Block a user