新增客户管理;

新增合同管理
This commit is contained in:
2023-06-10 01:29:51 +08:00
parent 4eca2ea5f5
commit 7f080a4c54
24 changed files with 2017 additions and 447 deletions

View File

@@ -60,7 +60,6 @@
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^9.4.0",
"less": "^4.1.3",
"postcss": "^8.4.16",
"prettier": "^2.7.1",
"rimraf": "^3.0.2",
"terser": "^5.15.0",

View File

@@ -1,13 +1,13 @@
import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api';
import type { Customer, CustomerParam } from './model';
import type {ApiResult, PageResult} from '@/api';
import type {Customer, CustomerParam} from './model';
/**
* 分页查询客户
*/
export async function pageCustomer(params: CustomerParam) {
const res = await request.get<ApiResult<PageResult<Customer>>>(
'/oa/customer/page',
'/tower/tower-customer/page',
{
params
}
@@ -22,9 +22,12 @@ export async function pageCustomer(params: CustomerParam) {
* 查询客户列表
*/
export async function listCustomer(params?: CustomerParam) {
const res = await request.get<ApiResult<Customer[]>>('/oa/customer', {
params
});
const res = await request.get<ApiResult<Customer[]>>(
'/tower/tower-customer',
{
params
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
@@ -35,7 +38,9 @@ export async function listCustomer(params?: CustomerParam) {
* 根据id查询客户
*/
export async function getCustomer(id: number) {
const res = await request.get<ApiResult<Customer>>('/oa/customer/' + id);
const res = await request.get<ApiResult<Customer>>(
'/tower/tower-customer/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
@@ -46,7 +51,10 @@ export async function getCustomer(id: number) {
* 添加客户
*/
export async function addCustomer(data: Customer) {
const res = await request.post<ApiResult<unknown>>('/oa/customer', data);
const res = await request.post<ApiResult<unknown>>(
'/tower/tower-customer',
data
);
if (res.data.code === 0) {
return res.data.message;
}
@@ -57,7 +65,10 @@ export async function addCustomer(data: Customer) {
* 修改客户
*/
export async function updateCustomer(data: Customer) {
const res = await request.put<ApiResult<unknown>>('/oa/customer', data);
const res = await request.put<ApiResult<unknown>>(
'/tower/tower-customer',
data
);
if (res.data.code === 0) {
return res.data.message;
}
@@ -68,7 +79,10 @@ export async function updateCustomer(data: Customer) {
* 批量修改客户
*/
export async function updateBatchCustomer(data: Customer[]) {
const res = await request.put<ApiResult<unknown>>('/oa/customer/batch', data);
const res = await request.put<ApiResult<unknown>>(
'/tower/tower-customer/batch',
data
);
if (res.data.code === 0) {
return res.data.message;
}
@@ -79,7 +93,9 @@ export async function updateBatchCustomer(data: Customer[]) {
* 删除客户
*/
export async function removeCustomer(id?: number) {
const res = await request.delete<ApiResult<unknown>>('/oa/customer/' + id);
const res = await request.delete<ApiResult<unknown>>(
'/tower/tower-customer/' + id
);
if (res.data.code === 0) {
return res.data.message;
}
@@ -90,9 +106,12 @@ export async function removeCustomer(id?: number) {
* 批量删除客户
*/
export async function removeBatchCustomer(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>('/oa/customer/batch', {
data
});
const res = await request.delete<ApiResult<unknown>>(
'/tower/tower-customer/batch',
{
data
}
);
if (res.data.code === 0) {
return res.data.message;
}
@@ -107,9 +126,12 @@ export async function checkExistence(
value: string,
id?: number
) {
const res = await request.get<ApiResult<unknown>>('/oa/customer/existence', {
params: { field, value, id }
});
const res = await request.get<ApiResult<unknown>>(
'/tower/tower-customer/existence',
{
params: {field, value, id}
}
);
if (res.data.code === 0) {
return res.data.message;
}

View File

@@ -6,59 +6,44 @@ import type { PageParam } from '@/api';
export interface Customer {
// 客户id
customerId?: number;
// 客户类型
customerType?: string;
// 客户来源
customerSource?: string;
// 客户标识
customerCode: string;
creditCode: string;
// 客户名称
customerName?: string;
name: string;
// 客户全称
customerFullName?: string;
fullName?: string;
// 客户头像
customerAvatar?: string;
avatar?: string;
// 座机电话
customerPhone?: string;
phone?: string;
// 手机号码
customerMobile?: string;
telPhone?: string;
// 联系人
customerContacts?: string;
contact?: string;
// 联系地址
customerAddress?: string;
customerProvince?: string;
customerCity?: string;
customerRegion?: string;
longitude?: string;
latitude?: string;
// 跟进状态
progress?: string;
address?: string;
// 排序
sortNumber?: number;
// 备注
comments?: string;
// 创建时间
createTime?: string;
// 状态
status?: string;
// 备注
remark?: string;
// 用户ID
userId?: any;
// 发布者昵称
nickname?: string;
projectName?: any;
companyName?: any;
customerName?: any;
}
/**
* 客户搜索条件
*/
export interface CustomerParam extends PageParam {
customerName?: string;
customerCode?: string;
customerType?: string;
name?: string;
creditCode?: string;
createTimeStart?: string;
createTimeEnd?: string;
customerCategory?: string;
progress?: string;
customerSource?: string;
betweenTime?: any;
userId?: number;
nickname?: string;

View File

@@ -0,0 +1,119 @@
import request from '@/utils/request';
import type {ApiResult, PageResult} from '@/api';
import type {Contract, ContractParam} from './model';
/**
* 分页查询合同
*/
export async function pageContract(params: ContractParam) {
const res = await request.get<ApiResult<PageResult<Contract>>>(
'/tower/tower-contract/page',
{
params
}
);
if (res.data.code === 0) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 查询合同列表
*/
export async function listContract(params?: ContractParam) {
const res = await request.get<ApiResult<Contract[]>>(
'/tower/tower-contract',
{
params
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 根据id查询合同
*/
export async function getContract(id: number) {
const res = await request.get<ApiResult<Contract>>(
'/tower/tower-contract/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 添加合同
*/
export async function addContract(data: Contract) {
const res = await request.post<ApiResult<unknown>>(
'/tower/tower-contract',
data
);
if (res.data.code === 0) {
return res.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 修改合同
*/
export async function updateContract(data: Contract) {
const res = await request.put<ApiResult<unknown>>(
'/tower/tower-contract',
data
);
if (res.data.code === 0) {
return res.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量修改合同
*/
export async function updateBatchContract(data: Contract[]) {
const res = await request.put<ApiResult<unknown>>(
'/tower/tower-contract/batch',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 删除合同
*/
export async function removeContract(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
'/tower/tower-contract/' + id
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量删除合同
*/
export async function removeBatchContract(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
'/tower/tower-contract/batch',
{
data
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}

View File

@@ -0,0 +1,46 @@
import type { PageParam } from '@/api';
/**
* 合同
*/
export interface Contract {
// 合同id
contractId?: any;
// 项目id
projectId: any;
// 承租方
companyId: any;
// 出租方
customerId: any;
// 业务负责人
customerContact?: string;
// 合同编号
contactNumber: string;
// 签订日期
signDate?: string;
// 开始日期
startDate?: string;
// 截止日期
endDate?: string;
// 合同金额
contractAmount?: number;
// 合同约定金额
contactAgreeAmount?: string;
// 合同是否已存档
isInStock?: number;
// 是否自动结算
autoSettle?: number;
userId?: any;
}
/**
* 合同搜索条件
*/
export interface ContractParam extends PageParam {
contactNumber?: string;
createTimeStart?: string;
createTimeEnd?: string;
betweenTime?: any;
}

View File

@@ -0,0 +1,133 @@
import request from '@/utils/request';
import type {ApiResult, PageResult} from '@/api';
import type {ContractEquipment, ContractEquipmentParam} from './model';
/**
* 分页查询合同设备
*/
export async function pageContract(params: ContractEquipmentParam) {
const res = await request.get<ApiResult<PageResult<ContractEquipment>>>(
'/tower/tower-contract-equipment/page',
{
params
}
);
if (res.data.code === 0) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 查询合同设备列表
*/
export async function listContractEquipment(params?: ContractEquipmentParam) {
const res = await request.get<ApiResult<ContractEquipment[]>>(
'/tower/tower-contract-equipment',
{
params
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 根据id查询合同设备
*/
export async function getContractEquipment(id: number) {
const res = await request.get<ApiResult<ContractEquipment>>(
'/tower/tower-contract-equipment/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 添加合同设备
*/
export async function addContractEquipment(data: ContractEquipment) {
const res = await request.post<ApiResult<unknown>>(
'/tower/tower-contract-equipment',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 修改合同设备
*/
export async function updateContractEquipment(data: ContractEquipment) {
const res = await request.put<ApiResult<unknown>>(
'/tower/tower-contract-equipment',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量修改合同设备
*/
export async function updateBatchContractEquipment(data: ContractEquipment[]) {
const res = await request.put<ApiResult<unknown>>(
'/tower/tower-contract-equipment/batch',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量添加合同设备
*/
export async function addBatchContractEquipment(data: ContractEquipment[]) {
const res = await request.post<ApiResult<unknown>>(
'/tower/tower-contract-equipment/batch',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 删除合同设备
*/
export async function removeContractEquipment(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
'/tower/tower-contract-equipment/' + id
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量删除合同设备
*/
export async function removeBatchContractEquipment(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
'/tower/tower-contract-equipment/batch',
{
data
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}

View File

@@ -0,0 +1,39 @@
import type { PageParam } from '@/api';
/**
* 合同
*/
export interface ContractEquipment {
contractEquipmentId?: any;
// 合同id
contractId: any;
// 设备名
equipmentName: string;
// 规格
equipmentModel: string;
// 数量
num: any;
// 租期
planRentMonth: any;
// 租金
rentAmount: any;
// 进退场费
inOutAmount: any;
// 劳务费
workerAmount: any;
// 其他费用
otherAmount: any;
// 预埋费
preBuryAmount: any;
// 备注
remark?: any;
userId?: any;
}
/**
* 合同搜索条件
*/
export interface ContractEquipmentParam extends PageParam {
contactId?: string;
}

View File

@@ -0,0 +1,133 @@
import request from "@/utils/request";
import type { ApiResult, PageResult } from "@/api";
import type { ContractFile, ContractFileParam } from "./model";
/**
* 分页查询合同文件
*/
export async function pageContract(params: ContractFileParam) {
const res = await request.get<ApiResult<PageResult<ContractFile>>>(
"/tower/tower-contract/page",
{
params
}
);
if (res.data.code === 0) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 查询合同文件列表
*/
export async function listContractFile(params?: ContractFileParam) {
const res = await request.get<ApiResult<ContractFile[]>>(
"/tower/tower-contract-file",
{
params
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 根据id查询合同文件
*/
export async function getContractFile(id: number) {
const res = await request.get<ApiResult<ContractFile>>(
"/tower/tower-contract-file/" + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 添加合同文件
*/
export async function addContractFile(data: ContractFile) {
const res = await request.post<ApiResult<unknown>>(
"/tower/tower-contract-file",
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 修改合同文件
*/
export async function updateContractFile(data: ContractFile) {
const res = await request.put<ApiResult<unknown>>(
"/tower/tower-contract-file",
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量修改合同文件
*/
export async function updateBatchContractFile(data: ContractFile[]) {
const res = await request.put<ApiResult<unknown>>(
"/tower/tower-contract-file/batch",
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量添加合同文件
*/
export async function addBatchContractFile(data: ContractFile[]) {
const res = await request.post<ApiResult<unknown>>(
"/tower/tower-contract-file/batch",
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 删除合同文件
*/
export async function removeContractFile(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
"/tower/tower-contract-file/" + id
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量删除合同文件
*/
export async function removeBatchContractFile(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
"/tower/tower-contract-file/batch",
{
data
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}

View File

@@ -0,0 +1,24 @@
import type { PageParam } from '@/api';
/**
* 合同
*/
export interface ContractFile {
// 文件id
contractFileId?: any;
// 项目id
contractId?: any;
// 路径
path: string;
// 文件类型
type?: any;
userId?: any;
}
/**
* 合同搜索条件
*/
export interface ContractFileParam extends PageParam {
contactId?: string;
}

View File

@@ -0,0 +1,156 @@
<template>
<ele-modal
:width="750"
:visible="visible"
:maskClosable="false"
:title="title"
:body-style="{ paddingBottom: '28px' }"
@update:visible="updateVisible"
>
<ele-pro-table
ref="tableRef"
row-key="modelId"
:datasource="datasource"
:columns="columns"
:customRow="customRow"
:striped="true"
:pagination="false"
>
<template #toolbar>
<a-input-search
allow-clear
v-model:value="searchText"
placeholder="请输入搜索关键词"
style="width: 200px"
@search="reload"
@pressEnter="reload"
/>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'customerLogo'">
<a-image
v-if="record.customerAvatar"
:src="FILE_THUMBNAIL + record.customerAvatar"
:preview="false"
:width="45"
/>
</template>
<template v-if="column.key === 'action'">
<a-space>
<a-button type="link">选择</a-button>
</a-space>
</template>
</template>
</ele-pro-table>
</ele-modal>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
import { pageProject } from '@/api/tower/project';
import { FILE_THUMBNAIL } from '@/config/setting';
import { EleProTable } from 'ele-admin-pro';
import { TowerModel, TowerModelParam } from '@/api/tower/model/model';
defineProps<{
// 弹窗是否打开
visible: boolean;
// 标题
title?: string;
// 修改回显的数据
data?: TowerModel | null;
selection?: TowerModel[];
}>();
const emit = defineEmits<{
(e: 'done', data: TowerModel): void;
(e: 'update:visible', visible: boolean): void;
}>();
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 搜索内容
const searchText = ref(null);
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
// 表格配置
const columns = ref<ColumnItem[]>([
{
key: 'index',
width: 48,
align: 'center',
fixed: 'left',
hideInSetting: true,
customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
},
{
title: '项目状态',
dataIndex: 'projectStatus'
},
{
title: '项目名称',
dataIndex: 'projectName'
},
{
title: '项目地址',
dataIndex: 'projectAddress'
},
{
title: '承租单位',
dataIndex: 'customerName'
},
{
title: '项目负责人',
dataIndex: 'director'
},
{
title: '是否关联',
dataIndex: 'yearLife'
},
{
title: '操作',
key: 'action',
align: 'center'
}
]);
// 表格数据源
const datasource: DatasourceFunction = ({ page, limit, where, orders }) => {
// 搜索条件
if (searchText.value) {
where.keywords = searchText.value;
}
return pageProject({
...where,
...orders,
page,
limit
});
};
/* 搜索 */
const reload = (where?: TowerModelParam) => {
tableRef?.value?.reload({ page: 1, where });
};
/* 自定义行属性 */
const customRow = (record: TowerModel) => {
return {
// 行点击事件
onClick: () => {
updateVisible(false);
emit('done', record);
}
};
};
</script>
<style lang="less"></style>

View File

@@ -0,0 +1,65 @@
<template>
<div>
<a-input-group compact>
<a-input
disabled
style="width: calc(100% - 32px)"
v-model:value="value"
:placeholder="placeholder"
/>
<a-button @click="openEdit">
<template #icon><BulbOutlined class="ele-text-warning" /></template>
</a-button>
</a-input-group>
<!-- 选择弹窗 -->
<SelectData
v-model:visible="showEdit"
:data="current"
:title="placeholder"
:customer-type="customerType"
@done="onChange"
/>
</div>
</template>
<script lang="ts" setup>
import { BulbOutlined } from '@ant-design/icons-vue';
import { ref } from 'vue';
import SelectData from './components/select-data.vue';
import { Project } from '@/api/tower/project/model';
const props = withDefaults(
defineProps<{
value?: any;
customerType?: string;
placeholder?: string;
index?: number;
}>(),
{
placeholder: '请选择数据'
}
);
const emit = defineEmits<{
(e: 'done', TowerModel): void;
(e: 'clear'): void;
(e: 'multiple', any): void;
}>();
// 是否显示编辑弹窗
const showEdit = ref(false);
// 当前编辑数据
const current = ref<Project | null>(null);
/* 打开编辑弹窗 */
const openEdit = (row?: Project) => {
current.value = row ?? null;
showEdit.value = true;
};
const onChange = (row) => {
// 第几行
row.index = Number(props.index);
emit('done', row);
};
</script>

View File

@@ -94,17 +94,16 @@
customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
},
{
title: '企业名称',
dataIndex: 'customerName'
title: '客户名称',
dataIndex: 'name'
},
{
title: '企业类型',
dataIndex: 'customerType'
title: '联系人',
dataIndex: 'contact'
},
{
title: '企业LOGO',
dataIndex: 'customerLogo',
key: 'customerLogo'
title: '联系电话',
dataIndex: 'telPhone'
},
{
title: '操作',

104
src/styles/common.less Normal file
View File

@@ -0,0 +1,104 @@
.text-white {
color: white;
}
.h-full{
height: 100%;
}
.border{
border: 1px solid #ebeef5;
}
.border-r-white {
border-right: 1px solid white;
}
.p-05{
padding: .5rem 0;
}
.bg-blue {
background-color: #1890ff;
}
.flex {
display: flex;
}
.flex-wrap {
flex-wrap: wrap;
}
.justify-center {
justify-content: center;
}
.justify-start {
justify-content: flex-start;
}
.justify-end {
justify-content: flex-end;
}
.justify-between {
justify-content: space-between;
}
.justify-around {
justify-content: space-around;
}
.items-center {
align-items: center;
}
.items-start {
align-items: flex-start;
}
.items-end {
align-items: flex-end;
}
.flex-col {
flex-direction: column;
}
.flex-1 {
flex: 1;
}
.flex-2 {
flex: 2;
}
.flex-shrink {
flex-shrink: 0;
}
.flex-none {
flex: none;
}
.flex-grow {
flex-grow: 1
}
.flex-grow-0 {
flex-grow: 0
}
.text-center{
text-align: center;
}
.text-grey{
color: #999;
}
.my-05{
margin-top: .5rem;
margin-bottom: .5rem;
}

View File

@@ -2,6 +2,7 @@
@style-entry-file: as-needed;
@import './@{style-entry-file}.less';
@import './transition/index.less';
@import './common.less';
// 主题
@import 'ele-admin-pro/es/style/themes/dynamic.less';

View File

@@ -0,0 +1,139 @@
import request from '@/utils/request';
import type {ApiResult, PageResult} from '@/api';
import type {Customer, CustomerParam} from './model';
/**
* 分页查询客户
*/
export async function pageCustomer(params: CustomerParam) {
const res = await request.get<ApiResult<PageResult<Customer>>>(
'/tower/tower-customer/page',
{
params
}
);
if (res.data.code === 0) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 查询客户列表
*/
export async function listCustomer(params?: CustomerParam) {
const res = await request.get<ApiResult<Customer[]>>(
'/tower/tower-customer',
{
params
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 根据id查询客户
*/
export async function getCustomer(id: number) {
const res = await request.get<ApiResult<Customer>>(
'/tower/tower-customer/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 添加客户
*/
export async function addCustomer(data: Customer) {
const res = await request.post<ApiResult<unknown>>(
'/tower/tower-customer',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 修改客户
*/
export async function updateCustomer(data: Customer) {
const res = await request.put<ApiResult<unknown>>(
'/tower/tower-customer',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量修改客户
*/
export async function updateBatchCustomer(data: Customer[]) {
const res = await request.put<ApiResult<unknown>>(
'/tower/tower-customer/batch',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 删除客户
*/
export async function removeCustomer(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
'/tower/tower-customer/' + id
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量删除客户
*/
export async function removeBatchCustomer(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
'/tower/tower-customer/batch',
{
data
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 检查IP是否存在
*/
export async function checkExistence(
field: string,
value: string,
id?: number
) {
const res = await request.get<ApiResult<unknown>>(
'/tower/tower-customer/existence',
{
params: {field, value, id}
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}

View File

@@ -0,0 +1,49 @@
import type { PageParam } from '@/api';
/**
* 客户
*/
export interface Customer {
// 客户id
customerId?: number;
// 客户标识
creditCode: string;
// 客户名称
name: string;
// 客户全称
fullName?: string;
// 客户头像
avatar?: string;
// 座机电话
phone?: string;
// 手机号码
telPhone?: string;
// 联系人
contact?: string;
// 联系地址
address?: string;
// 排序
sortNumber?: number;
// 创建时间
createTime?: string;
// 备注
remark?: string;
// 用户ID
userId?: any;
}
/**
* 客户搜索条件
*/
export interface CustomerParam extends PageParam {
name?: string;
creditCode?: string;
createTimeStart?: string;
createTimeEnd?: string;
betweenTime?: any;
userId?: number;
nickname?: string;
// 商户编号
merchantCode?: string;
}

View File

@@ -0,0 +1,570 @@
<!-- 用户编辑弹窗 -->
<template>
<ele-modal
:width="'90%'"
:visible="visible"
:confirm-loading="loading"
:maskClosable="false"
:maxable="maxable"
:title="isUpdate ? '编辑合同' : '添加合同'"
:body-style="{ paddingBottom: '8px' }"
@update:visible="updateVisible"
@ok="save"
>
<a-form
:label-col="{ md: { span: 6 }, sm: { span: 20 }, xs: { span: 24 } }"
:wrapper-col="{ md: { span: 24 }, sm: { span: 20 }, xs: { span: 24 } }"
>
<div class="title">填报人信息</div>
<a-row :gutter="16">
<a-col :md="12" :sm="24" :xs="24">
<a-form-item label="填报人">
<a-input disabled v-model:value="loginUser.username" />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24" :xs="24">
<a-form-item label="填报时间">
<a-input disabled v-model:value="now" />
</a-form-item>
</a-col>
</a-row>
<div class="title">合同信息</div>
<a-row :gutter="16">
<a-col :md="8" :sm="24" :xs="24">
<a-form-item label="项目名称" v-bind="validateInfos.projectId">
<ProjectSelectModel
:placeholder="`请选择项目`"
v-model:value="projectName"
@done="chooseProject"
/>
</a-form-item>
<a-form-item label="合同编号" v-bind="validateInfos.contactNumber">
<a-input
allow-clear
:maxlength="20"
placeholder="请输入合同编号"
v-model:value="form.contactNumber"
/>
</a-form-item>
<a-form-item label="开始日期">
<a-date-picker
class="ele-fluid"
placeholder="请选择开始日期"
v-model:value="form.startDate"
valueFormat="YYYY-MM-DD"
/>
</a-form-item>
<a-form-item label="合同存档">
<a-switch :checked="form.isInStock" :checked-value="1" :un-checked-value="0" checked-children="已归档"
un-checked-children="未归档" @change="changeInStock" />
</a-form-item>
</a-col>
<a-col :md="8" :sm="24" :xs="24">
<a-form-item label="出租单位" v-bind="validateInfos.companyId">
<SelectCompany
:placeholder="`请选择出租单位`"
v-model:value="companyName"
@done="chooseCompany"
/>
</a-form-item>
<a-form-item label="承租单位" v-bind="validateInfos.customerId">
<SelectCustomer
:placeholder="`请选择承租单位`"
v-model:value="customerName"
@done="chooseCustomer"
/>
</a-form-item>
<a-form-item label="合同金额">
<a-input
allow-clear
:maxlength="20"
placeholder="请输入合同金额"
v-model:value="form.contractAmount"
>
<template #addonAfter>
<span></span>
</template>
</a-input>
</a-form-item>
<a-form-item label="截止日期">
<a-date-picker
class="ele-fluid"
placeholder="请选择截止日期"
v-model:value="form.endDate"
valueFormat="YYYY-MM-DD"
/>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24" :xs="24">
<a-form-item label="业务负责人">
<a-input
disabled
placeholder="自动填写"
v-model:value="form.customerContact"
/>
</a-form-item>
<a-form-item label="签订日期">
<a-date-picker
class="ele-fluid"
placeholder="请选择签订日期"
v-model:value="form.signDate"
valueFormat="YYYY-MM-DD"
/>
</a-form-item>
<a-form-item label="合同约定金额">
<a-input
allow-clear
:maxlength="20"
placeholder="请输入合同约定金额"
v-model:value="form.contactAgreeAmount"
>
<template #addonAfter>
<span></span>
</template>
</a-input>
</a-form-item>
<a-form-item label="是否自动结算">
<a-switch :checked="form.autoSettle" :checked-value="1" :un-checked-value="0" checked-children=""
un-checked-children="" @change="changeAutoSettle" />
</a-form-item>
</a-col>
</a-row>
</a-form>
<div class="flex flex-col justify-start justify-start"
style="padding: 1rem 0;border-top: 1px solid #dcdfe6; border-bottom: 1px solid #dcdfe6">
<div class="flex justify-between items-center">
<span>合同电子存档</span>
<UploadFile @update:value="uploadFile" />
</div>
<div class="flex justify-start flex-wrap items-start">
<a-tag closable @close="delFile(index)" v-for="(item, index) in contractFileList" :key="index">{{ item.path }}
</a-tag>
</div>
</div>
<div class="flex justify-start items-center"
style="padding: 1rem 0;border-top: 1px solid #dcdfe6;">
<div class="flex justify-start items-center">
<unordered-list-outlined />
<span>合同签订设备清单</span>
</div>
</div>
<div>
<a-row class="bg-blue text-white text-center">
<a-col :span="3" class="p-05 border-r-white">
<span>设备名称</span>
</a-col>
<a-col :span="3" class="p-05 border-r-white">
<span>规格型号</span>
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<span>签订数量</span>
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<span>计划租期()</span>
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<span>租金()</span>
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<span>进退场费()</span>
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<span>劳务费用()</span>
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<span>其他费用()</span>
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<span>预埋费()</span>
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<span>备注</span>
</a-col>
<a-col :span="1" class="p-05">
<span>操作</span>
</a-col>
</a-row>
<div style="min-height: 10rem">
<div class=" p-05 flex justify-center items-center" v-if="contractEquipmentList.length === 0">
<span class="text-grey">暂无数据</span>
</div>
<template v-else>
<a-row class="text-center" v-for="(item, index) in contractEquipmentList"
:key="index">
<a-col :span="3" class="p-05 border-r-white">
<a-select placeholder="必选项" style="width: 100%" size="small"
v-model:value="contractEquipmentList[index].equipmentName">
<a-select-option v-for="(item, index) in equipmentList" :key="index" :value="item.name">{{ item.name
}}
</a-select-option>
</a-select>
</a-col>
<a-col :span="3" class="p-05 border-r-white">
<a-select placeholder="必选项" style="width: 100%" size="small"
v-model:value="contractEquipmentList[index].equipmentModel">
<a-select-option v-for="(item, index) in equipmentList" :key="index" :value="item.model">{{ item.model
}}
</a-select-option>
</a-select>
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<a-input v-model:value="contractEquipmentList[index].num" size="small" placeholder="必填项" type="number">
<template #suffix></template>
</a-input>
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<a-input v-model:value="contractEquipmentList[index].planRentMonth" size="small" placeholder="必填项"
type="number" />
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<a-input v-model:value="contractEquipmentList[index].rentAmount" size="small" placeholder="必填项"
type="number" />
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<a-input v-model:value="contractEquipmentList[index].inOutAmount" size="small" placeholder="必填项"
type="number" />
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<a-input v-model:value="contractEquipmentList[index].workerAmount" size="small" placeholder="必填项"
type="number" />
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<a-input v-model:value="contractEquipmentList[index].otherAmount" size="small" placeholder="必填项"
type="number" />
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<a-input v-model:value="contractEquipmentList[index].preBuryAmount" size="small" placeholder="必填项"
type="number" />
</a-col>
<a-col :span="2" class="p-05 border-r-white">
<a-input v-model:value="contractEquipmentList[index].remark" size="small" placeholder="可选项" />
</a-col>
<a-col :span="1" class="p-05">
<div class="flex justify-center items-center">
<close-circle-outlined style="font-size: 1.5rem; color: pink;cursor: pointer"
@click.native="delEquipment(index)" />
</div>
</a-col>
</a-row>
</template>
</div>
<div class="my-05">
<a-button type="primary" @click.native="addEquipment">
<template #icon>
<PlusOutlined />
</template>
添加
</a-button>
</div>
</div>
</ele-modal>
</template>
<script lang="ts" setup>
import { ref, reactive, watch, computed } from "vue";
import { Form, message } from "ant-design-vue";
import { assignObject } from "ele-admin-pro";
import { updateContract, addContract } from "@/api/tower/contract";
import type { Customer } from "@/api/oa/customer/model";
import { useUserStore } from "@/store/modules/user";
import { Contract } from "@/api/tower/contract/model";
import dayjs from "dayjs";
import { ContractFile } from "@/api/tower/contractFile/model";
import {
PlusOutlined,
UnorderedListOutlined,
CloseCircleOutlined
} from "@ant-design/icons-vue";
import { ContractEquipment } from "@/api/tower/contractEquipment/model";
import { TowerModel } from "@/api/tower/model/model";
import { listTowerModel } from "@/api/tower/model";
import { addBatchContractFile } from "@/api/tower/contractFile";
import { addBatchContractEquipment } from "@/api/tower/contractEquipment";
const userStore = useUserStore();
// 当前用户信息
const loginUser = computed(() => userStore.info ?? {});
const now = dayjs().format("YYYY-MM-DD HH:mm:ss");
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: Customer | null;
}>();
const emit = defineEmits<{
(e: "done"): void;
(e: "update:visible", visible: boolean): void;
}>();
// 提交状态
const loading = ref(false);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 用户信息
const form = reactive<Contract>({
contractId: undefined,
projectId: undefined,
companyId: undefined,
customerId: undefined,
customerContact: "",
contactNumber: "",
signDate: "",
startDate: "",
endDate: "",
contractAmount: undefined,
contactAgreeAmount: undefined,
isInStock: 0,
autoSettle: 0
});
/* 更新visible */
const updateVisible = (value: boolean) => {
emit("update:visible", value);
};
// 表单验证规则
const rules = reactive({
projectId: [
{
required: true,
message: "请选择项目",
trigger: "blur"
}
],
contactNumber: [
{
required: true,
message: "请输入合同编号",
trigger: "blur"
}
],
companyId: [
{
required: true,
message: "请选择出租单位",
trigger: "blur"
}
],
customerId: [
{
required: true,
message: "请选择承租单位",
trigger: "blur"
}
]
});
const projectName = ref<string>("");
const chooseProject = (res) => {
projectName.value = res.projectName;
form.projectId = res.projectId;
};
const companyName = ref<string>("");
const chooseCompany = (res) => {
companyName.value = res.companyName;
form.companyId = res.companyId;
};
const customerName = ref<string>("");
const chooseCustomer = (res) => {
customerName.value = res.name;
form.customerId = res.customerId;
form.customerContact = res.contact;
};
const changeInStock = (checked) => {
form.isInStock = checked;
};
const changeAutoSettle = (checked) => {
form.autoSettle = checked;
};
const contractFileList = ref<ContractFile[]>([]);
const uploadFile = path => {
contractFileList.value.push({ path, contractId: 0, userId: loginUser.value.userId });
};
const delFile = index => {
contractFileList.value.splice(index, 1);
};
const getContractFileList = async () => {
};
const equipmentList = ref<TowerModel[]>([]);
const getEquipmentList = async () => {
equipmentList.value = await listTowerModel();
};
const contractEquipmentList = ref<ContractEquipment[]>([]);
const getContractEquipmentList = async () => {
};
const chooseEquipmentName = (res, index) => {
contractEquipmentList.value[index].equipmentName = res.name;
};
const delEquipment = index => {
contractEquipmentList.value.splice(index, 1);
};
const addEquipment = () => {
contractEquipmentList.value.push({
contractEquipmentId: null,
contractId: null,
equipmentName: "",
equipmentModel: "",
num: null,
planRentMonth: null,
rentAmount: null,
inOutAmount: null,
workerAmount: null,
otherAmount: null,
preBuryAmount: null,
remark: null
});
};
const { resetFields, validate, validateInfos } = useForm(form, rules);
/* 保存编辑 */
const save = () => {
validate()
.then(async () => {
loading.value = true;
// 去除空格
form.contactNumber = form.contactNumber?.replace(/\s*/g, "");
// 判断权限
// if (loginUser.value.roles?.[0].roleCode != 'admin'){
// form.status = '1';
// }
const data = {
...form
};
console.log(contractEquipmentList.value)
for (let i = 0; i < contractEquipmentList.value.length; i++) {
if (!contractEquipmentList.value[i].equipmentName) {
console.log(contractEquipmentList.value[i].equipmentName)
loading.value = false;
message.error("请选择设备");
return;
}
if (!contractEquipmentList.value[i].equipmentModel) {
loading.value = false;
message.error("请选择设备型号");
return;
}
if (!contractEquipmentList.value[i].num) {
loading.value = false;
message.error("请输入签订数量");
return;
}
if (contractEquipmentList.value[i].planRentMonth === null) {
loading.value = false;
message.error("请输入计划租期");
return;
}
if (contractEquipmentList.value[i].rentAmount === null) {
loading.value = false;
message.error("请输入租金");
return;
}
if (contractEquipmentList.value[i].inOutAmount === null) {
loading.value = false;
message.error("请输入进退场费");
return;
}
if (contractEquipmentList.value[i].workerAmount === null) {
loading.value = false;
message.error("请输入劳务费用");
return;
}
if (contractEquipmentList.value[i].otherAmount === null) {
loading.value = false;
message.error("请输入其他费用");
return;
}
if (contractEquipmentList.value[i].preBuryAmount === null) {
loading.value = false;
message.error("请输入预埋费");
return;
}
}
// 转字符串
const saveOrUpdate = isUpdate.value ? updateContract : addContract;
const res = await saveOrUpdate(data).catch((e) => {
loading.value = false;
message.error(e.message);
});
const contractId = res.data;
if (contractFileList.value.length > 0) await saveFileList(contractId);
if (contractEquipmentList.value.length > 0) await saveEquipmentList(contractId);
loading.value = false;
message.success(res.message);
updateVisible(false);
emit("done");
})
.catch(() => {
});
};
const saveFileList = async (contractId) => {
contractFileList.value.forEach((item, index) => {
contractFileList.value[index].contractId = contractId;
});
await addBatchContractFile(contractFileList.value);
};
const saveEquipmentList = async (contractId) => {
contractEquipmentList.value.forEach((item, index) => {
contractEquipmentList.value[index].contractId = contractId;
});
await addBatchContractEquipment(contractEquipmentList.value);
};
watch(
() => props.visible,
(visible) => {
if (visible) {
getEquipmentList();
if (props.data) {
loading.value = false;
assignObject(form, props.data);
isUpdate.value = true;
getContractFileList();
projectName.value = props.data.projectName;
customerName.value = props.data.customerName;
companyName.value = props.data.companyName;
} else {
isUpdate.value = false;
}
} else {
resetFields();
}
}
);
</script>
<style lang="less">
.title {
font-weight: bold;
font-size: 1.1rem;
padding-bottom: 10px;
border-bottom: 1px solid #dcdfe6;
color: #494949;
margin-bottom: 10px;
}
</style>

View File

@@ -1,266 +0,0 @@
<!-- 用户编辑弹窗 -->
<template>
<ele-modal
:width="750"
:visible="visible"
:confirm-loading="loading"
:maskClosable="false"
:maxable="maxable"
:title="isUpdate ? '编辑合同' : '添加合同'"
:body-style="{ paddingBottom: '8px' }"
@update:visible="updateVisible"
@ok="save"
>
<a-form
:label-col="{ md: { span: 6 }, sm: { span: 20 }, xs: { span: 24 } }"
:wrapper-col="{ md: { span: 24 }, sm: { span: 20 }, xs: { span: 24 } }"
>
<a-row :gutter="16">
<a-col :md="12" :sm="24" :xs="24">
<a-form-item label="合同名称" v-bind="validateInfos.customerName">
<a-input
allow-clear
:maxlength="30"
placeholder="请输入合同名称"
v-model:value="form.customerName"
@blur="
validate('customerName', { trigger: 'blur' }).catch(() => {})
"
/>
</a-form-item>
<a-form-item label="合同标识" v-bind="validateInfos.customerCode">
<a-input
allow-clear
:maxlength="20"
placeholder="请输入社会统一信用代码"
v-model:value="form.customerCode"
/>
</a-form-item>
<a-form-item label="联系人" v-bind="validateInfos.customerContacts">
<a-input
allow-clear
:maxlength="20"
placeholder="请填写联系人"
v-model:value="form.customerContacts"
/>
</a-form-item>
<a-form-item label="手机号码" v-bind="validateInfos.customerMobile">
<a-input
allow-clear
:maxlength="20"
placeholder="请填写联系人手机号码"
v-model:value="form.customerMobile"
/>
</a-form-item>
<a-form-item label="头像" v-bind="validateInfos.customerAvatar">
<ele-image-upload
v-model:value="images"
:item-style="{ width: '90px', height: '90px' }"
:limit="1"
@upload="onUpload"
/>
</a-form-item>
</a-col>
<a-col :md="12" :sm="24" :xs="24">
<a-form-item label="合同全称" v-bind="validateInfos.customerFullName">
<a-input
allow-clear
:maxlength="30"
placeholder="请输入合同全称"
v-model:value="form.customerFullName"
@blur="
validate('customerFullName', { trigger: 'blur' }).catch(() => {})
"
/>
</a-form-item>
<a-form-item
label="联系地址"
v-bind="validateInfos.customerAddress"
>
<a-input
allow-clear
placeholder="请填写联系地址"
v-model:value="form.customerAddress"
/>
</a-form-item>
<a-form-item label="公司座机" v-bind="validateInfos.customerPhone">
<a-input
allow-clear
:maxlength="20"
placeholder="请填写公司座机电话"
v-model:value="form.customerPhone"
/>
</a-form-item>
<a-form-item label="排序" v-bind="validateInfos.sortNumber">
<a-input
allow-clear
:maxlength="20"
placeholder="排序"
v-model:value="form.sortNumber"
/>
</a-form-item>
<a-form-item label="备注" v-bind="validateInfos.comments">
<a-textarea
:rows="4"
:maxlength="200"
placeholder="请输入备注"
v-model:value="form.comments"
/>
</a-form-item>
</a-col>
</a-row>
</a-form>
</ele-modal>
</template>
<script lang="ts" setup>
import {ref, reactive, watch, computed} from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject } from 'ele-admin-pro';
import { addCustomer, updateCustomer } from '@/api/oa/customer';
import type { Customer } from '@/api/oa/customer/model';
import { createCode } from '@/utils/common';
import { uploadFile } from '@/api/system/file';
import type { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FILE_SERVER } from '@/config/setting';
import { useUserStore } from '@/store/modules/user';
const userStore = useUserStore();
// 当前用户信息
const loginUser = computed(() => userStore.info ?? {});
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: Customer | null;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
// 提交状态
const loading = ref(false);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 用户信息
const form = reactive<Customer>({
customerCode: '',
customerName: '',
customerFullName: '',
customerType: undefined,
progress: undefined,
customerMobile: '',
customerAvatar: '',
customerPhone: '',
customerSource: '',
customerContacts: '',
customerAddress: '',
comments: '',
status: '0',
sortNumber: 100,
customerId: 0,
userId: '',
});
// 已上传数据, 可赋初始值用于回显
const images = ref(<any>[]);
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
customerName: [
{
required: true,
type: 'string',
message: '请输入合同名称',
trigger: 'blur'
}
],
customerCode: [
{
required: true,
type: 'string',
message: '请输入合法的IP地址',
trigger: 'blur'
}
]
});
const { resetFields, validate, validateInfos } = useForm(form, rules);
/* 保存编辑 */
const save = () => {
validate()
.then(() => {
loading.value = true;
// 去除空格
form.customerName = form.customerName?.replace(/\s*/g, '');
// 判断权限
// if (loginUser.value.roles?.[0].roleCode != 'admin'){
// form.status = '1';
// }
const data = {
...form
};
// 转字符串
const saveOrUpdate = isUpdate.value ? updateCustomer : addCustomer;
saveOrUpdate(data)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {});
};
// 上传文件
const onUpload = (d: ItemType) => {
uploadFile(<File>d.file)
.then((result) => {
form.customerAvatar = result.path;
message.success('上传成功');
})
.catch((e) => {
message.error(e.message);
});
};
watch(
() => props.visible,
(visible) => {
if (visible) {
if (props.data) {
loading.value = false;
// 头像赋值
images.value = [];
if(props.data.customerAvatar){
images.value.push({ uid:1, url: FILE_SERVER + props.data.customerAvatar, status: '' });
}
assignObject(form, props.data);
isUpdate.value = true;
} else {
isUpdate.value = false;
}
} else {
resetFields();
}
}
);
</script>
<style lang="less"></style>

View File

@@ -66,9 +66,8 @@
// 表单数据
const { where } = useSearch<CustomerParam>({
customerName: '',
customerCode: '',
nickname: '',
name: '',
creditCode: '',
keywords: '',
userId: undefined
});

View File

@@ -22,45 +22,6 @@
/>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'customerName'">
<a-avatar
:size="30"
:src="`${record.customerAvatar}`"
style="margin-right: 4px"
:srcset="`https://file.wsdns.cn/${record.customerAvatar}`"
>
<template #icon>
<UserOutlined />
</template>
</a-avatar>
<a-tooltip title="查看详情">
<a href="#" @click="openInfo(record)">{{
record.customerName
}}</a>
</a-tooltip>
</template>
<template v-if="column.key === 'progress'">
<div v-for="(d, i) in progressDict" :key="i">
<span v-if="d.value === record.progress">{{ d.label }}</span>
</div>
</template>
<template v-if="column.key === 'customerType'">
<div v-for="(d, i) in JSON.parse(customerType)" :key="i">
<span v-if="d.value === record.customerType">{{
d.value
}}</span>
</div>
</template>
<template v-if="column.key === 'status'">
<a-tag v-if="record.status === 0" color="green">正常</a-tag>
<a-tag v-if="record.status === 1" color="red">待审核</a-tag>
<a-tag v-if="record.status === 2" color="purple">已驳回</a-tag>
</template>
<template v-if="column.key === 'nickname'">
<a-tooltip :title="`${record.nickname}`">
<a-avatar :src="record.userAvatar" size="small" />
</a-tooltip>
</template>
<template v-if="column.key === 'createTime'">
<a-tooltip :title="`${toDateString(record.createTime)}`">
{{ timeAgo(record.createTime) }}
@@ -83,9 +44,9 @@
</a-card>
<!-- 编辑弹窗 -->
<CustomerEdit v-model:visible="showEdit" :data="current" @done="reload" />
<ContractEdit v-model:visible="showEdit" :data="current" @done="reload" />
<!-- 合同详情弹窗 -->
<CustomerInfo v-model:visible="showInfo" :data="current" @done="reload" />
<ContractInfo v-model:visible="showInfo" :data="current" @done="reload" />
<!-- 批量转移弹窗 -->
<!-- <CustomerMove v-model:visible="showMove" :data="selection" @done="batchMove" />-->
</div>
@@ -106,13 +67,13 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import { toDateString } from 'ele-admin-pro';
import Search from './components/search.vue';
import CustomerEdit from './components/customer-edit.vue';
import CustomerInfo from './components/customer-info.vue';
import ContractEdit from './components/contract-edit.vue';
import ContractInfo from './components/contract-info.vue';
import {
pageCustomer,
removeCustomer,
removeBatchCustomer
} from '@/api/oa/customer';
pageContract,
removeContract,
removeBatchContract
} from '@/api/tower/contract';
import { timeAgo } from 'ele-admin-pro';
import type { Customer, CustomerParam } from '@/api/oa/customer/model';
import { useUserStore } from '@/store/modules/user';
@@ -151,7 +112,7 @@
where.customerType = filters.customerType;
where.status = filters.status;
}
return pageCustomer({
return pageContract({
...where,
...orders,
page,
@@ -171,33 +132,33 @@
},
{
title: '合同编号',
dataIndex: 'contractNo',
key: 'contractNo',
dataIndex: 'contractNumber',
key: 'contractNumber',
ellipsis: true
},
{
title: '项目名称',
dataIndex: 'customerContacts'
dataIndex: 'projectName'
},
{
title: '预计产值',
dataIndex: 'customerContacts'
dataIndex: ''
},
{
title: '结算产值',
dataIndex: 'customerContacts'
dataIndex: ''
},
{
title: '业务联系人',
dataIndex: 'customerContacts'
dataIndex: 'customerContact'
},
{
title: '签订日期',
dataIndex: 'customerContacts'
dataIndex: 'signDate'
},
{
title: '已生成结算次数',
dataIndex: 'customerContacts'
dataIndex: 'settleNum'
},
{
title: '操作',
@@ -235,7 +196,7 @@
/* 删除单个 */
const remove = (row: Customer) => {
const hide = message.loading('请求中..', 0);
removeCustomer(row.customerId)
removeContract(row.customerId)
.then((msg) => {
hide();
message.success(msg);
@@ -266,7 +227,7 @@
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
removeBatchCustomer(
removeBatchContract(
selection.value.map((d) => {
if (loginUser.value.userId === d.userId) {
return d.customerId;

View File

@@ -17,23 +17,23 @@
>
<a-row :gutter="16">
<a-col :md="12" :sm="24" :xs="24">
<a-form-item label="客户名称" v-bind="validateInfos.customerName">
<a-form-item label="客户名称" v-bind="validateInfos.name">
<a-input
allow-clear
:maxlength="30"
placeholder="请输入客户名称"
v-model:value="form.customerName"
v-model:value="form.name"
@blur="
validate('customerName', { trigger: 'blur' }).catch(() => {})
"
/>
</a-form-item>
<a-form-item label="客户标识" v-bind="validateInfos.customerCode">
<a-form-item label="客户标识" v-bind="validateInfos.creditCode">
<a-input
allow-clear
:maxlength="20"
placeholder="请输入社会统一信用代码"
v-model:value="form.customerCode"
v-model:value="form.creditCode"
/>
</a-form-item>
<a-form-item label="联系人" v-bind="validateInfos.customerContacts">
@@ -41,7 +41,7 @@
allow-clear
:maxlength="20"
placeholder="请填写联系人"
v-model:value="form.customerContacts"
v-model:value="form.contact"
/>
</a-form-item>
<a-form-item label="手机号码" v-bind="validateInfos.phone">
@@ -49,7 +49,7 @@
allow-clear
:maxlength="20"
placeholder="请填写联系人手机号码"
v-model:value="form.phone"
v-model:value="form.telPhone"
/>
</a-form-item>
<a-form-item label="头像" v-bind="validateInfos.customerAvatar">
@@ -67,7 +67,7 @@
allow-clear
:maxlength="30"
placeholder="请输入客户全称"
v-model:value="form.customerFullName"
v-model:value="form.fullName"
@blur="
validate('customerFullName', { trigger: 'blur' }).catch(() => {})
"
@@ -80,7 +80,7 @@
<a-input
allow-clear
placeholder="请填写联系地址"
v-model:value="form.customerAddress"
v-model:value="form.address"
/>
</a-form-item>
<a-form-item label="公司座机" v-bind="validateInfos.customerPhone">
@@ -88,7 +88,7 @@
allow-clear
:maxlength="20"
placeholder="请填写公司座机电话"
v-model:value="form.customerPhone"
v-model:value="form.phone"
/>
</a-form-item>
<a-form-item label="排序" v-bind="validateInfos.sortNumber">
@@ -104,7 +104,7 @@
:rows="4"
:maxlength="200"
placeholder="请输入备注"
v-model:value="form.comments"
v-model:value="form.remark"
/>
</a-form-item>
</a-col>
@@ -150,22 +150,19 @@ import {ref, reactive, watch, computed} from 'vue';
// 用户信息
const form = reactive<Customer>({
customerCode: '',
customerName: '',
customerFullName: '',
customerType: undefined,
progress: undefined,
customerMobile: '',
customerAvatar: '',
customerPhone: '',
customerSource: '',
customerContacts: '',
customerAddress: '',
comments: '',
status: '0',
customerId: undefined,
creditCode: '',
name: '',
fullName: '',
avatar: '',
phone: '',
telPhone: '',
contact: '',
address: '',
remark: '',
sortNumber: 100,
customerId: 0,
userId: '',
createTime: undefined,
userId: 0,
});
// 已上传数据, 可赋初始值用于回显
@@ -178,7 +175,7 @@ import {ref, reactive, watch, computed} from 'vue';
// 表单验证规则
const rules = reactive({
customerName: [
name: [
{
required: true,
type: 'string',
@@ -186,11 +183,11 @@ import {ref, reactive, watch, computed} from 'vue';
trigger: 'blur'
}
],
customerCode: [
creditCode: [
{
required: true,
type: 'string',
message: '请输入合法的IP地址',
message: '请输入客户标识',
trigger: 'blur'
}
]
@@ -204,7 +201,7 @@ import {ref, reactive, watch, computed} from 'vue';
.then(() => {
loading.value = true;
// 去除空格
form.customerName = form.customerName?.replace(/\s*/g, '');
form.name = form.name?.replace(/\s*/g, '');
// 判断权限
// if (loginUser.value.roles?.[0].roleCode != 'admin'){
// form.status = '1';
@@ -233,7 +230,7 @@ import {ref, reactive, watch, computed} from 'vue';
const onUpload = (d: ItemType) => {
uploadFile(<File>d.file)
.then((result) => {
form.customerAvatar = result.path;
form.avatar = result.path;
message.success('上传成功');
})
.catch((e) => {
@@ -249,8 +246,8 @@ import {ref, reactive, watch, computed} from 'vue';
loading.value = false;
// 头像赋值
images.value = [];
if(props.data.customerAvatar){
images.value.push({ uid:1, url: FILE_SERVER + props.data.customerAvatar, status: '' });
if(props.data.avatar){
images.value.push({ uid:1, url: FILE_SERVER + props.data.avatar, status: '' });
}
assignObject(form, props.data);
isUpdate.value = true;

View File

@@ -22,12 +22,12 @@
/>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'customerName'">
<template v-if="column.key === 'name'">
<a-avatar
:size="30"
:src="`${record.customerAvatar}`"
:src="`${record.avatar}`"
style="margin-right: 4px"
:srcset="`https://file.wsdns.cn/${record.customerAvatar}`"
:srcset="`https://file.wsdns.cn/${record.avatar}`"
>
<template #icon>
<UserOutlined />
@@ -35,32 +35,10 @@
</a-avatar>
<a-tooltip title="查看详情">
<a href="#" @click="openInfo(record)">{{
record.customerName
record.name
}}</a>
</a-tooltip>
</template>
<template v-if="column.key === 'progress'">
<div v-for="(d, i) in progressDict" :key="i">
<span v-if="d.value === record.progress">{{ d.label }}</span>
</div>
</template>
<template v-if="column.key === 'customerType'">
<div v-for="(d, i) in JSON.parse(customerType)" :key="i">
<span v-if="d.value === record.customerType">{{
d.value
}}</span>
</div>
</template>
<template v-if="column.key === 'status'">
<a-tag v-if="record.status === 0" color="green">正常</a-tag>
<a-tag v-if="record.status === 1" color="red">待审核</a-tag>
<a-tag v-if="record.status === 2" color="purple">已驳回</a-tag>
</template>
<template v-if="column.key === 'nickname'">
<a-tooltip :title="`${record.nickname}`">
<a-avatar :src="record.userAvatar" size="small" />
</a-tooltip>
</template>
<template v-if="column.key === 'createTime'">
<a-tooltip :title="`${toDateString(record.createTime)}`">
{{ timeAgo(record.createTime) }}
@@ -171,18 +149,18 @@
},
{
title: '客户名称',
dataIndex: 'customerName',
key: 'customerName',
dataIndex: 'name',
key: 'name',
width: 280,
ellipsis: true
},
{
title: '联系人',
dataIndex: 'customerContacts'
dataIndex: 'contact'
},
{
title: '联系电话',
dataIndex: 'customerMobile'
dataIndex: 'telPhone'
},
{
title: '操作',

322
yarn.lock
View File

@@ -2,6 +2,11 @@
# yarn lockfile v1
"@alloc/quick-lru@^5.2.0":
version "5.2.0"
resolved "https://registry.npmmirror.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
"@amap/amap-jsapi-loader@^1.0.1":
version "1.0.1"
resolved "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz"
@@ -197,6 +202,15 @@
"@jridgewell/sourcemap-codec" "^1.4.10"
"@jridgewell/trace-mapping" "^0.3.9"
"@jridgewell/gen-mapping@^0.3.2":
version "0.3.3"
resolved "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
dependencies:
"@jridgewell/set-array" "^1.0.1"
"@jridgewell/sourcemap-codec" "^1.4.10"
"@jridgewell/trace-mapping" "^0.3.9"
"@jridgewell/resolve-uri@^3.0.3":
version "3.1.0"
resolved "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
@@ -691,6 +705,11 @@ ant-design-vue@^3.2.11:
vue-types "^3.0.0"
warning "^4.0.0"
any-promise@^1.0.0:
version "1.3.0"
resolved "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
anymatch@~3.1.2:
version "3.1.2"
resolved "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.2.tgz"
@@ -728,6 +747,11 @@ archiver@^5.0.0:
tar-stream "^2.2.0"
zip-stream "^4.1.0"
arg@^5.0.2:
version "5.0.2"
resolved "https://registry.npmmirror.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
argparse@^2.0.1:
version "2.0.1"
resolved "https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz"
@@ -758,6 +782,18 @@ asynckit@^0.4.0:
resolved "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz"
integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
autoprefixer@^10.4.14:
version "10.4.14"
resolved "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d"
integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==
dependencies:
browserslist "^4.21.5"
caniuse-lite "^1.0.30001464"
fraction.js "^4.2.0"
normalize-range "^0.1.2"
picocolors "^1.0.0"
postcss-value-parser "^4.2.0"
axios@^0.27.2:
version "0.27.2"
resolved "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz"
@@ -840,6 +876,16 @@ braces@^3.0.2, braces@~3.0.2:
dependencies:
fill-range "^7.0.1"
browserslist@^4.21.5:
version "4.21.7"
resolved "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.7.tgz#e2b420947e5fb0a58e8f4668ae6e23488127e551"
integrity sha512-BauCXrQ7I2ftSqd2mvKHGo85XR0u7Ru3C/Hxsy/0TkfCtjrmAbPdzLGasmoiBxplpDXlPvdjX9u7srIMfgasNA==
dependencies:
caniuse-lite "^1.0.30001489"
electron-to-chromium "^1.4.411"
node-releases "^2.0.12"
update-browserslist-db "^1.0.11"
buffer-crc32@^0.2.1, buffer-crc32@^0.2.13:
version "0.2.13"
resolved "https://registry.npmmirror.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
@@ -899,6 +945,16 @@ callsites@^3.0.0:
resolved "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz"
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
camelcase-css@^2.0.1:
version "2.0.1"
resolved "https://registry.npmmirror.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001489:
version "1.0.30001497"
resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001497.tgz#0e5387b98e7dbf9c4f743fb16e92cbf0ca780714"
integrity sha512-I4/duVK4wL6rAK/aKZl3HXB4g+lIZvaT4VLAn2rCgJ38jVLb0lv2Xug6QuqmxXFVRJMF74SPPWPJ/1Sdm3vCzw==
ccount@^2.0.0:
version "2.0.1"
resolved "https://registry.npmmirror.com/ccount/-/ccount-2.0.1.tgz"
@@ -1017,6 +1073,11 @@ commander@^2.15.1, commander@^2.20.0:
resolved "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
commander@^4.0.0:
version "4.1.1"
resolved "https://registry.npmmirror.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
compress-commons@^4.1.0:
version "4.1.1"
resolved "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.1.tgz"
@@ -1152,6 +1213,11 @@ dequal@^2.0.0:
resolved "https://registry.npmmirror.com/dequal/-/dequal-2.0.3.tgz"
integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
didyoumean@^1.2.2:
version "1.2.2"
resolved "https://registry.npmmirror.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==
diff@^5.0.0:
version "5.1.0"
resolved "https://registry.npmmirror.com/diff/-/diff-5.1.0.tgz"
@@ -1164,6 +1230,11 @@ dir-glob@^3.0.1:
dependencies:
path-type "^4.0.0"
dlv@^1.1.3:
version "1.1.3"
resolved "https://registry.npmmirror.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
doctrine@^3.0.0:
version "3.0.0"
resolved "https://registry.npmmirror.com/doctrine/-/doctrine-3.0.0.tgz"
@@ -1219,6 +1290,11 @@ ele-admin-pro@^1.10.1:
resolved "https://registry.npmmirror.com/ele-admin-pro/-/ele-admin-pro-1.10.1.tgz"
integrity sha512-EiNJcfGGA/4F20cuHlz7bxr2UJ1RdQGM3+MA7dsiNOp7DxLpP3dOo8wgg+MKyMUZUM2dcpp+Dmz94Q5VDpr44Q==
electron-to-chromium@^1.4.411:
version "1.4.425"
resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.425.tgz#399df13091b836d28283a545c25c8e4d9da86da8"
integrity sha512-wv1NufHxu11zfDbY4fglYQApMswleE9FL/DSeyOyauVXDZ+Kco96JK/tPfBUaDqfRarYp2WH2hJ/5UnVywp9Jg==
end-of-stream@^1.4.1:
version "1.4.4"
resolved "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz"
@@ -1386,6 +1462,11 @@ esbuild@^0.14.47:
esbuild-windows-64 "0.14.54"
esbuild-windows-arm64 "0.14.54"
escalade@^3.1.1:
version "3.1.1"
resolved "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
@@ -1631,6 +1712,17 @@ fast-glob@^3.2.11, fast-glob@^3.2.9:
merge2 "^1.3.0"
micromatch "^4.0.4"
fast-glob@^3.2.12:
version "3.2.12"
resolved "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
glob-parent "^5.1.2"
merge2 "^1.3.0"
micromatch "^4.0.4"
fast-json-stable-stringify@^2.0.0:
version "2.1.0"
resolved "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
@@ -1714,6 +1806,11 @@ frac@~1.1.2:
resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz"
integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
fraction.js@^4.2.0:
version "4.2.0"
resolved "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
fs-constants@^1.0.0:
version "1.0.0"
resolved "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz"
@@ -1792,13 +1889,25 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
dependencies:
is-glob "^4.0.1"
glob-parent@^6.0.1:
glob-parent@^6.0.1, glob-parent@^6.0.2:
version "6.0.2"
resolved "https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz"
integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
dependencies:
is-glob "^4.0.3"
glob@7.1.6:
version "7.1.6"
resolved "https://registry.npmmirror.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
minimatch "^3.0.4"
once "^1.3.0"
path-is-absolute "^1.0.0"
glob@^7.1.3, glob@^7.1.4:
version "7.2.3"
resolved "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz"
@@ -2057,6 +2166,13 @@ is-buffer@^2.0.0:
resolved "https://registry.npmmirror.com/is-buffer/-/is-buffer-2.0.5.tgz"
integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
is-core-module@^2.11.0:
version "2.12.1"
resolved "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
dependencies:
has "^1.0.3"
is-core-module@^2.9.0:
version "2.10.0"
resolved "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.10.0.tgz"
@@ -2106,6 +2222,11 @@ isexe@^2.0.0:
resolved "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz"
integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
jiti@^1.18.2:
version "1.18.2"
resolved "https://registry.npmmirror.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd"
integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==
js-md5@^0.7.3:
version "0.7.3"
resolved "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz"
@@ -2208,6 +2329,16 @@ lie@~3.3.0:
dependencies:
immediate "~3.0.5"
lilconfig@^2.0.5, lilconfig@^2.1.0:
version "2.1.0"
resolved "https://registry.npmmirror.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
lines-and-columns@^1.1.6:
version "1.2.4"
resolved "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
listenercount@~1.0.1:
version "1.0.1"
resolved "https://registry.npmmirror.com/listenercount/-/listenercount-1.0.1.tgz"
@@ -2773,7 +2904,7 @@ micromark@^3.0.0:
micromark-util-types "^1.0.1"
uvu "^0.5.0"
micromatch@^4.0.4:
micromatch@^4.0.4, micromatch@^4.0.5:
version "4.0.5"
resolved "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz"
integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -2834,11 +2965,25 @@ ms@2.1.2, ms@^2.1.1:
resolved "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
mz@^2.7.0:
version "2.7.0"
resolved "https://registry.npmmirror.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
dependencies:
any-promise "^1.0.0"
object-assign "^4.0.1"
thenify-all "^1.0.0"
nanoid@^3.3.4:
version "3.3.4"
resolved "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz"
integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
nanoid@^3.3.6:
version "3.3.6"
resolved "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
nanopop@^2.1.0:
version "2.1.0"
resolved "https://registry.npmmirror.com/nanopop/-/nanopop-2.1.0.tgz"
@@ -2863,11 +3008,21 @@ next-tick@^1.1.0:
resolved "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz"
integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
node-releases@^2.0.12:
version "2.0.12"
resolved "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
normalize-path@^3.0.0, normalize-path@~3.0.0:
version "3.0.0"
resolved "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz"
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
normalize-range@^0.1.2:
version "0.1.2"
resolved "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
nprogress@^0.2.0:
version "0.2.0"
resolved "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz"
@@ -2880,6 +3035,16 @@ nth-check@^2.0.1:
dependencies:
boolbase "^1.0.0"
object-assign@^4.0.1:
version "4.1.1"
resolved "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
object-hash@^3.0.0:
version "3.0.0"
resolved "https://registry.npmmirror.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
once@^1.3.0, once@^1.4.0:
version "1.4.0"
resolved "https://registry.npmmirror.com/once/-/once-1.4.0.tgz"
@@ -2970,6 +3135,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:
resolved "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz"
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
pify@^2.3.0:
version "2.3.0"
resolved "https://registry.npmmirror.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
pify@^4.0.1:
version "4.0.1"
resolved "https://registry.npmmirror.com/pify/-/pify-4.0.1.tgz"
@@ -2983,6 +3153,50 @@ pinia@^2.0.21:
"@vue/devtools-api" "^6.2.1"
vue-demi "*"
pirates@^4.0.1:
version "4.0.5"
resolved "https://registry.npmmirror.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
postcss-import@^15.1.0:
version "15.1.0"
resolved "https://registry.npmmirror.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70"
integrity sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==
dependencies:
postcss-value-parser "^4.0.0"
read-cache "^1.0.0"
resolve "^1.1.7"
postcss-js@^4.0.1:
version "4.0.1"
resolved "https://registry.npmmirror.com/postcss-js/-/postcss-js-4.0.1.tgz#61598186f3703bab052f1c4f7d805f3991bee9d2"
integrity sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==
dependencies:
camelcase-css "^2.0.1"
postcss-load-config@^4.0.1:
version "4.0.1"
resolved "https://registry.npmmirror.com/postcss-load-config/-/postcss-load-config-4.0.1.tgz#152383f481c2758274404e4962743191d73875bd"
integrity sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==
dependencies:
lilconfig "^2.0.5"
yaml "^2.1.1"
postcss-nested@^6.0.1:
version "6.0.1"
resolved "https://registry.npmmirror.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c"
integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==
dependencies:
postcss-selector-parser "^6.0.11"
postcss-selector-parser@^6.0.11:
version "6.0.13"
resolved "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
dependencies:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
postcss-selector-parser@^6.0.9:
version "6.0.10"
resolved "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"
@@ -2991,6 +3205,11 @@ postcss-selector-parser@^6.0.9:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0:
version "4.2.0"
resolved "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
postcss@^8.1.10, postcss@^8.4.16:
version "8.4.16"
resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.16.tgz"
@@ -3000,6 +3219,15 @@ postcss@^8.1.10, postcss@^8.4.16:
picocolors "^1.0.0"
source-map-js "^1.0.2"
postcss@^8.4.23, postcss@^8.4.24:
version "8.4.24"
resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
dependencies:
nanoid "^3.3.6"
picocolors "^1.0.0"
source-map-js "^1.0.2"
prelude-ls@^1.2.1:
version "1.2.1"
resolved "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz"
@@ -3042,6 +3270,13 @@ queue-microtask@^1.2.2:
resolved "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz"
integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
read-cache@^1.0.0:
version "1.0.0"
resolved "https://registry.npmmirror.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==
dependencies:
pify "^2.3.0"
readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@~2.3.6:
version "2.3.8"
resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz"
@@ -3170,6 +3405,15 @@ resolve-from@^4.0.0:
resolved "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz"
integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
resolve@^1.1.7, resolve@^1.22.2:
version "1.22.2"
resolved "https://registry.npmmirror.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
dependencies:
is-core-module "^2.11.0"
path-parse "^1.0.7"
supports-preserve-symlinks-flag "^1.0.0"
resolve@^1.22.1:
version "1.22.1"
resolved "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz"
@@ -3390,6 +3634,19 @@ style-to-object@^0.3.0:
dependencies:
inline-style-parser "0.1.1"
sucrase@^3.32.0:
version "3.32.0"
resolved "https://registry.npmmirror.com/sucrase/-/sucrase-3.32.0.tgz#c4a95e0f1e18b6847127258a75cf360bc568d4a7"
integrity sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==
dependencies:
"@jridgewell/gen-mapping" "^0.3.2"
commander "^4.0.0"
glob "7.1.6"
lines-and-columns "^1.1.6"
mz "^2.7.0"
pirates "^4.0.1"
ts-interface-checker "^0.1.9"
supports-color@^5.3.0:
version "5.5.0"
resolved "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz"
@@ -3414,6 +3671,35 @@ systemjs@^6.12.1:
resolved "https://registry.npmmirror.com/systemjs/-/systemjs-6.12.6.tgz"
integrity sha512-SawLiWya8/uNR4p12OggSYZ35tP4U4QTpfV57DdZEOPr6+J6zlLSeeEpMmzYTEoBAsMhctdEE+SWJUDYX4EaKw==
tailwindcss@^3.3.2:
version "3.3.2"
resolved "https://registry.npmmirror.com/tailwindcss/-/tailwindcss-3.3.2.tgz#2f9e35d715fdf0bbf674d90147a0684d7054a2d3"
integrity sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==
dependencies:
"@alloc/quick-lru" "^5.2.0"
arg "^5.0.2"
chokidar "^3.5.3"
didyoumean "^1.2.2"
dlv "^1.1.3"
fast-glob "^3.2.12"
glob-parent "^6.0.2"
is-glob "^4.0.3"
jiti "^1.18.2"
lilconfig "^2.1.0"
micromatch "^4.0.5"
normalize-path "^3.0.0"
object-hash "^3.0.0"
picocolors "^1.0.0"
postcss "^8.4.23"
postcss-import "^15.1.0"
postcss-js "^4.0.1"
postcss-load-config "^4.0.1"
postcss-nested "^6.0.1"
postcss-selector-parser "^6.0.11"
postcss-value-parser "^4.2.0"
resolve "^1.22.2"
sucrase "^3.32.0"
tar-stream@^2.2.0:
version "2.2.0"
resolved "https://registry.npmmirror.com/tar-stream/-/tar-stream-2.2.0.tgz"
@@ -3440,6 +3726,20 @@ text-table@^0.2.0:
resolved "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz"
integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
thenify-all@^1.0.0:
version "1.6.0"
resolved "https://registry.npmmirror.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==
dependencies:
thenify ">= 3.1.0 < 4"
"thenify@>= 3.1.0 < 4":
version "3.3.1"
resolved "https://registry.npmmirror.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
dependencies:
any-promise "^1.0.0"
tinymce@^5.10.5:
version "5.10.5"
resolved "https://registry.npmmirror.com/tinymce/-/tinymce-5.10.5.tgz"
@@ -3481,6 +3781,11 @@ trough@^2.0.0:
resolved "https://registry.npmmirror.com/trough/-/trough-2.1.0.tgz"
integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==
ts-interface-checker@^0.1.9:
version "0.1.13"
resolved "https://registry.npmmirror.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
tslib@2.3.0, tslib@^2.3.0:
version "2.3.0"
resolved "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz"
@@ -3660,6 +3965,14 @@ unzipper@^0.10.11:
readable-stream "~2.3.6"
setimmediate "~1.0.4"
update-browserslist-db@^1.0.11:
version "1.0.11"
resolved "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
dependencies:
escalade "^3.1.1"
picocolors "^1.0.0"
uri-js@^4.2.2:
version "4.4.1"
resolved "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz"
@@ -3914,6 +4227,11 @@ yallist@^4.0.0:
resolved "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz"
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
yaml@^2.1.1:
version "2.3.1"
resolved "https://registry.npmmirror.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
yocto-queue@^0.1.0:
version "0.1.0"
resolved "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz"