页面修改

This commit is contained in:
THK3121 2023-08-03 17:34:37 +08:00
parent 0e217c3647
commit 2903f6ac4e
20 changed files with 2457 additions and 2003 deletions

View File

@ -34,3 +34,7 @@ export function upContact(params: any) {
export function creatContact(params: any) {
return request.post({ url: "/user.user/Draftingcontracts", params });
}
//发送短息
export function sendMsgApi(params: any) {
return request.get({ url: "/contract.contract/postsms", params });
}

26
src/api/withdraw.ts Normal file
View File

@ -0,0 +1,26 @@
import request from "@/utils/request";
// 提现申请列表
export function apiWithdrawLists(params: any) {
return request.get({ url: "/withdraw/index", params });
}
// 添加提现申请
export function apiWithdrawAdd(params: any) {
return request.post({ url: "/withdraw/add", params });
}
// 编辑提现申请
export function apiWithdrawEdit(params: any) {
return request.post({ url: "/withdraw/edit", params });
}
// 删除提现申请
export function apiWithdrawDelete(params: any) {
return request.post({ url: "/withdraw/delete", params });
}
// 提现申请详情
export function apiWithdrawDetail(params: any) {
return request.get({ url: "/withdraw/detail", params });
}

View File

@ -47,21 +47,29 @@ export const constantRoutes: Array<RouteRecordRaw> = [
},
},
{
path: "b",
component: () => import("@/views/fileManagement/index.vue"),
path: "user_informationgdetil",
component: () => import("@/views/user_informationg/detil.vue"),
name: Symbol(),
meta: {
title: "个人设置",
},
},
{
path: "a",
component: () => import("@/views/fileManagement/detil.vue"),
name: Symbol(),
meta: {
title: "个人设置",
title: "档案详情",
},
},
// {
// path: "b",
// component: () => import("@/views/fileManagement/index.vue"),
// name: Symbol(),
// meta: {
// title: "个人设置",
// },
// },
// {
// path: "a",
// component: () => import("@/views/fileManagement/detil.vue"),
// name: Symbol(),
// meta: {
// title: "个人设置",
// },
// },
],
},
// {

View File

@ -7,8 +7,9 @@
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form ref="formRef" :model="formData" label-width="90px" :disabled="mode=='check'" :rules="formRules">
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" clearable placeholder="请输入名称" />
</el-form-item>

View File

@ -74,8 +74,25 @@
<dict-value :options="dictData.show_status" :value="row.status" />
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<el-table-column
label="操作"
width="180"
align="center"
fixed="right"
>
<template #default="{ row }">
<el-button
v-perms="[
'category_business.category_business/edit',
'category_business.category_business/delete',
'category_business.category_business/edit',
]"
type="primary"
link
@click="handleCheck(row)"
>
详情
</el-button>
<el-button
v-perms="['category_business.category_business/edit']"
type="primary"
@ -155,7 +172,13 @@ const handleAdd = async () => {
await nextTick();
editRef.value?.open("add");
};
//
const handleCheck = async (data: any) => {
showEdit.value = true;
await nextTick();
editRef.value?.open("check");
editRef.value?.setFormData(data);
};
//
const handleEdit = async (data: any) => {
showEdit.value = true;

View File

@ -810,15 +810,15 @@ const getDetails = async () => {
}
if (stringArr.includes(key)) formData[key] = formData[key].toString();
});
await getCityList();
await getAreaList();
await getStreetList();
formData["party_a_name"] = data.contract?.party_a_name;
formData["file_image"] = data.contract?.file;
if (data.contract?.file) {
fileList.value[0].url = data.contract?.file;
fileList.value[0].name = "合同文件";
}
await getCityList();
await getAreaList();
await getStreetList();
};
getdictTypeLists();

View File

@ -1,334 +1,398 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="公司名称" prop="company_name">
<el-input
class="w-[280px]"
v-model="queryParams.company_name"
clearable
placeholder="请输入公司名称"
/>
</el-form-item>
<el-form-item label="区" prop="area" v-show="company_type_show">
<el-input
class="w-[280px]"
v-model="queryParams.area"
clearable
placeholder="请输入区"
/>
</el-form-item>
<el-form-item label="镇" prop="street" v-show="company_type_show">
<el-input
class="w-[280px]"
v-model="queryParams.street"
clearable
placeholder="请输入镇"
/>
</el-form-item>
<el-form-item label="公司类型" prop="company_type" v-show="company_type_show">
<el-select
v-model="queryParams.company_type"
placeholder="请选择公司类型"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.dictTypeLists"
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="片区经理" prop="area_manager">
<el-input
class="w-[280px]"
v-model="queryParams.area_manager"
clearable
placeholder="请输入片区经理"
/>
</el-form-item>
<el-form-item label="是否签约" prop="is_contract">
<el-select
v-model="queryParams.is_contract"
placeholder="是否签约"
clearable
:style="{ width: '100%' }"
>
<el-option label="已签约" value="1"></el-option>
<el-option label="未签约" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<router-link
v-perms="['company/add:edit']"
:to="{
path: getRoutePath('company/add:edit')
}"
>
<el-button type="primary" class="mb-4">
<template #icon>
<icon name="el-icon-Plus" />
</template>
创建
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="公司名称" prop="company_name">
<el-input
class="w-[280px]"
v-model="queryParams.company_name"
clearable
placeholder="请输入公司名称"
/>
</el-form-item>
<el-form-item label="区" prop="area" v-show="company_type_show">
<el-input
class="w-[280px]"
v-model="queryParams.area"
clearable
placeholder="请输入区"
/>
</el-form-item>
<el-form-item label="镇" prop="street" v-show="company_type_show">
<el-input
class="w-[280px]"
v-model="queryParams.street"
clearable
placeholder="请输入镇"
/>
</el-form-item>
<el-form-item
label="公司类型"
prop="company_type"
v-show="company_type_show"
>
<el-select
v-model="queryParams.company_type"
placeholder="请选择公司类型"
clearable
class="w-[280px]"
>
<el-option
v-for="(item, index) in datas.dictTypeLists"
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="片区经理" prop="area_manager">
<el-input
class="w-[280px]"
v-model="queryParams.area_manager"
clearable
placeholder="请输入片区经理"
/>
</el-form-item>
<el-form-item label="是否签约" prop="is_contract">
<el-select
v-model="queryParams.is_contract"
placeholder="是否签约"
clearable
class="w-[240px]"
>
<el-option label="已签约" value="1"></el-option>
<el-option label="未签约" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<router-link
v-perms="['company/add:edit']"
:to="{
path: getRoutePath('company/add:edit'),
}"
>
<el-button type="primary" class="mb-4">
<template #icon>
<icon name="el-icon-Plus" />
</template>
创建
</el-button>
</router-link>
&nbsp; &nbsp;
<router-link
:to="{
path: getRoutePath('company/add:edit'),
query: {
id: userStore.userInfo.company_id,
read: true,
},
}"
>
<el-button type="primary" class="mb-4">
我的公司
</el-button></router-link
>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column
label="id"
prop="id"
show-overflow-tooltip
width="60"
/>
<el-table-column
label="公司名称"
prop="company_name"
show-overflow-tooltip
/>
<el-table-column
label="公司类型"
prop="company_type"
show-overflow-tooltip
/>
<el-table-column label="区县" prop="area" show-overflow-tooltip />
<el-table-column label="乡镇" prop="street" show-overflow-tooltip />
<el-table-column
label="主联系人"
prop="master_name"
show-overflow-tooltip
/>
<el-table-column
label="联系方式"
prop="master_phone"
show-overflow-tooltip
/>
<el-table-column
label="片区经理"
prop="area_manager"
show-overflow-tooltip
/>
<el-table-column
label="是否签约"
prop="is_contract"
show-overflow-tooltip
>
<template #default="{ row }">
<span v-if="row.is_contract == 1" style="color: #67c23a"
>已签约</span
>
<span v-else style="color: #fe0000">未签约</span>
</template></el-table-column
>
<el-table-column
label="操作"
align="center"
width="500"
fixed="right"
>
<template #default="{ row }">
<div style="display: flex">
<el-button type="primary" link>
<router-link
:to="{
path: getRoutePath('auth.admin/lists'),
query: {
company_id: row.id,
read: true,
},
}"
>查看成员</router-link
>
</el-button>
</router-link>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
<el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
<el-table-column label="公司类型" prop="company_type" show-overflow-tooltip />
<el-table-column label="区县" prop="area" show-overflow-tooltip />
<el-table-column label="乡镇" prop="street" show-overflow-tooltip />
<el-table-column label="主联系人" prop="master_name" show-overflow-tooltip />
<el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
<el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
<el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
<template #default="{ row }">
<span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
<span v-else style="color: #fe0000">未签约</span>
</template></el-table-column
>
<el-table-column label="操作" align="center" width="500" fixed="right">
<template #default="{ row }">
<div style="display: flex">
<el-button type="primary" link>
<router-link
:to="{
path: getRoutePath('auth.admin/lists'),
query: {
company_id: row.id,
read: true
}
}"
>查看成员</router-link
>
</el-button>
<el-button type="primary" link>
<router-link
:to="{
path: getRoutePath('company/subordinate/lists'),
query: {
company_id: row.id,
read: true
}
}"
>下属公司</router-link
>
</el-button>
<el-button v-perms="['company/add:edit']" type="primary" link>
<router-link
:to="{
path: getRoutePath('company/add:edit'),
query: {
id: row.id,
read: true
}
}"
>详情</router-link
>
</el-button>
<el-button v-perms="['company/add:edit']" type="primary" link>
<router-link
:to="{
path: getRoutePath('company/add:edit'),
query: {
id: row.id,
edit: true
}
}"
>编辑</router-link
>
</el-button>
<el-button
v-perms="['company/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>删除</el-button
>
<el-button
v-if="row.is_authentication == 0"
v-perms="['company/authentication']"
type="primary"
link
@click="handleAuthentication(row.id)"
>企业认证</el-button
>
<template v-if="row.is_contract == 0">
<el-button
v-perms="['company/Draftingcontracts']"
type="primary"
link
@click="showCreateConctPop(row)"
>生成合同</el-button
>
<el-button
v-perms="['company/postsms']"
type="primary"
link
@click=";(showPop = true), (contractId = row.id)"
>发送短信</el-button
>
</template>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1>
<div class="content" v-if="showConctactPop">
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
</div>
<div class="content" v-else>
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu">
<el-button type="primary" size="large" v-if="showConctactPop" @click="creContct"
>确认创建</el-button
<el-button type="primary" link>
<router-link
:to="{
path: getRoutePath('company/subordinate/lists'),
query: {
company_id: row.id,
read: true,
},
}"
>下属公司</router-link
>
</el-button>
<el-button v-perms="['company/add:edit']" type="primary" link>
<router-link
:to="{
path: getRoutePath('company/add:edit'),
query: {
id: row.id,
read: true,
},
}"
>详情</router-link
>
</el-button>
<el-button v-perms="['company/add:edit']" type="primary" link>
<router-link
:to="{
path: getRoutePath('company/add:edit'),
query: {
id: row.id,
edit: true,
},
}"
>编辑</router-link
>
</el-button>
<el-button
v-perms="['company/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>删除</el-button
>
<el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
<el-button type="info" size="large" @click="offPop">返回</el-button>
</p>
</el-dialog>
</div>
<el-button
v-if="row.is_authentication == 0"
v-perms="['company/authentication']"
type="primary"
link
@click="handleAuthentication(row.id)"
>企业认证</el-button
>
<template v-if="row.is_contract == 0">
<el-button
v-perms="['company/Draftingcontracts']"
type="primary"
link
@click="showCreateConctPop(row)"
>生成合同</el-button
>
<el-button
v-perms="['company/postsms']"
type="primary"
link
@click="(showPop = true), (contractId = row.id)"
>发送短信</el-button
>
</template>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1>
<div class="content" v-if="showConctactPop">
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
</div>
<div class="content" v-else>
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu">
<el-button
type="primary"
size="large"
v-if="showConctactPop"
@click="creContct"
>确认创建</el-button
>
<el-button type="primary" size="large" v-else @click="sendMsg"
>确认</el-button
>
<el-button type="info" size="large" @click="offPop">返回</el-button>
</p>
</el-dialog>
</div>
</template>
<script lang="ts" setup name="companyLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import useUserStore from '@/stores/modules/user'
import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions";
import useUserStore from "@/stores/modules/user";
import {
apiCompanyLists,
apiCompanyDelete,
generateGontract,
sendMsgApi,
authentication
} from '@/api/company'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import { dictDataLists } from '@/api/setting/dict'
import { getRoutePath } from '@/router'
apiCompanyLists,
apiCompanyDelete,
generateGontract,
sendMsgApi,
authentication,
} from "@/api/company";
import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
import { dictDataLists } from "@/api/setting/dict";
import { getRoutePath } from "@/router";
const userStore = useUserStore()
const route = useRoute()
const company_type_show = ref(true)
const userStore = useUserStore();
console.log(userStore.userInfo.company_id);
const route = useRoute();
const company_type_show = ref(true);
//
//
const showPop = ref(false)
const showConctactPop = ref(false)
const showPop = ref(false);
const showConctactPop = ref(false);
const offPop = () => {
showPop.value = false
showConctactPop.value = false
}
showPop.value = false;
showConctactPop.value = false;
};
// id
const contractId = ref('')
const contractId = ref("");
const showCreateConctPop = (row) => {
;(showPop.value = true), (showConctactPop.value = true), (contractId.value = row.id)
}
(showPop.value = true),
(showConctactPop.value = true),
(contractId.value = row.id);
};
const creContct = () => {
generateGontract({ id: contractId.value })
offPop()
}
generateGontract({ id: contractId.value });
offPop();
};
const sendMsg = () => {
sendMsgApi({ id: contractId.value })
offPop()
}
sendMsgApi({ id: contractId.value });
offPop();
};
//
//
const queryParams = reactive({
company_name: '',
area: '',
street: '',
company_type: '',
area_manager: '',
//
is_contract: ''
})
company_name: "",
area: "",
street: "",
company_type: "",
area_manager: "",
//
is_contract: "",
});
if (route.query.company_type) {
company_type_show.value = false
queryParams['company_type'] = route.query.company_type?.toString() || ''
company_type_show.value = false;
queryParams["company_type"] = route.query.company_type?.toString() || "";
}
const datas = reactive({
dictTypeLists: []
})
dictTypeLists: [],
});
const getdictTypeLists = async () => {
const data = await dictDataLists({ type_id: 6 })
datas['dictTypeLists'] = data['lists']
}
getdictTypeLists()
const data = await dictDataLists({ type_id: 6 });
datas["dictTypeLists"] = data["lists"];
};
getdictTypeLists();
//
const selectData = ref<any[]>([])
const selectData = ref<any[]>([]);
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
selectData.value = val.map(({ id }) => id);
};
//
const { dictData } = useDictData('')
const { dictData } = useDictData("");
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiCompanyLists,
params: queryParams
})
fetchFun: apiCompanyLists,
params: queryParams,
});
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiCompanyDelete({ id })
getLists()
}
await feedback.confirm("确定要删除?");
await apiCompanyDelete({ id });
getLists();
};
const handleAuthentication = async (id: number | any[]) => {
await feedback.confirm('确定要认证?')
await authentication({ id })
getLists()
}
await feedback.confirm("确定要认证?");
await authentication({ id });
getLists();
};
getLists()
getLists();
</script>
<style lang="scss">
.btn {
position: absolute;
position: absolute;
}
h1 {
text-align: center;
font-weight: bold;
font-size: 30px;
color: red;
margin-bottom: 10px;
text-align: center;
font-weight: bold;
font-size: 30px;
color: red;
margin-bottom: 10px;
}
.content {
font-size: 20px;
font-size: 20px;
}
.info {
color: red;
font-weight: bold;
font-size: 18px;
display: inline-block;
margin: 0 5px;
color: red;
font-weight: bold;
font-size: 18px;
display: inline-block;
margin: 0 5px;
}
.btn_menu {
margin-top: 10vh;
display: flex;
justify-content: space-around;
margin-top: 10vh;
display: flex;
justify-content: space-around;
}
</style>

View File

@ -1,194 +1,204 @@
<template>
<div>
<el-card class="!border-none" shadow="never">
<el-page-header content="用户详情" @back="$router.back()" />
</el-card>
<el-card class="mt-4 !border-none" header="基本资料" shadow="never">
<el-form ref="formRef" class="ls-form" :model="formData" label-width="120px">
<div class="bg-page flex py-5 mb-10 items-center">
<div class="basis-40 flex flex-col justify-center items-center">
<div class="mb-2 text-tx-regular">用户头像</div>
<el-avatar :src="formData.avatar" :size="58" />
</div>
<div class="basis-40 flex flex-col justify-center items-center">
<div class="text-tx-regular">账户余额</div>
<div class="mt-2 flex items-center">
¥{{ formData.user_money }}
<el-button
v-perms="['user.user/adjustMoney']"
type="primary"
link
@click="handleAdjust(formData.user_money)"
>
调整
</el-button>
</div>
</div>
</div>
<el-col :span="24" class="el-card pt-6">
<el-row>
<el-col :span="12">
<el-form-item label="用户编号:"> {{ formData.sn }} </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户昵称:">
{{ formData.nickname }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="账号:">
{{ formData.account }}
<popover-input
class="ml-[10px]"
@confirm="handleEdit($event, 'account')"
:limit="32"
v-perms="['user.user/edit']"
>
<el-button type="primary" link>
<icon name="el-icon-EditPen" />
</el-button>
</popover-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="真实姓名:">
{{ formData.real_name || '-' }}
<popover-input
class="ml-[10px]"
@confirm="handleEdit($event, 'real_name')"
:limit="32"
v-perms="['user.user/edit']"
>
<el-button type="primary" link>
<icon name="el-icon-EditPen" />
</el-button>
</popover-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别:">
{{ formData.sex }}
<popover-input
class="ml-[10px]"
type="select"
:options="[
{
label: '未知',
value: 0
},
{
label: '男',
value: 1
},
{
label: '女',
value: 2
}
]"
@confirm="handleEdit($event, 'sex')"
v-perms="['user.user/edit']"
>
<el-button type="primary" link>
<icon name="el-icon-EditPen" />
</el-button>
</popover-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话:">
{{ formData.mobile || '-' }}
<popover-input
class="ml-[10px]"
type="number"
@confirm="handleEdit($event, 'mobile')"
v-perms="['user.user/edit']"
>
<el-button type="primary" link>
<icon name="el-icon-EditPen" />
</el-button>
</popover-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="注册来源:"> {{ formData.channel }} </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="注册时间:">
{{ formData.create_time }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最近登录时间:">
{{ formData.login_time }}
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-form>
</el-card>
<div>
<el-card class="!border-none" shadow="never">
<el-page-header content="用户详情" @back="$router.back()" />
</el-card>
<el-card class="mt-4 !border-none" header="基本资料" shadow="never">
<el-form
ref="formRef"
class="ls-form"
:model="formData"
label-width="120px"
>
<div class="bg-page flex py-5 mb-10 items-center">
<div class="basis-40 flex flex-col justify-center items-center">
<div class="mb-2 text-tx-regular">用户头像</div>
<el-avatar :src="formData.avatar" :size="58" />
</div>
<div class="basis-40 flex flex-col justify-center items-center">
<div class="text-tx-regular">账户余额</div>
<div class="mt-2 flex items-center">
¥{{ formData.user_money }}
<el-button
v-perms="['user.user/adjustMoney']"
type="primary"
link
@click="handleAdjust(formData.user_money)"
>
调整
</el-button>
</div>
</div>
</div>
<el-col :span="24" class="el-card pt-6">
<el-row>
<el-col :span="12">
<el-form-item label="用户编号:">
{{ formData.sn }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户昵称:">
{{ formData.nickname }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="账号:">
{{ formData.account }}
<popover-input
class="ml-[10px]"
@confirm="handleEdit($event, 'account')"
:limit="32"
v-perms="['user.user/edit']"
>
<el-button type="primary" link>
<icon name="el-icon-EditPen" />
</el-button>
</popover-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="真实姓名:">
{{ formData.real_name || "-" }}
<popover-input
class="ml-[10px]"
@confirm="handleEdit($event, 'real_name')"
:limit="32"
v-perms="['user.user/edit']"
>
<el-button type="primary" link>
<icon name="el-icon-EditPen" />
</el-button>
</popover-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别:">
{{ formData.sex }}
<popover-input
class="ml-[10px]"
type="select"
:options="[
{
label: '未知',
value: 0,
},
{
label: '男',
value: 1,
},
{
label: '女',
value: 2,
},
]"
@confirm="handleEdit($event, 'sex')"
v-perms="['user.user/edit']"
>
<el-button type="primary" link>
<icon name="el-icon-EditPen" />
</el-button>
</popover-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话:">
{{ formData.mobile || "-" }}
<popover-input
class="ml-[10px]"
type="number"
@confirm="handleEdit($event, 'mobile')"
v-perms="['user.user/edit']"
>
<el-button type="primary" link>
<icon name="el-icon-EditPen" />
</el-button>
</popover-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="注册来源:">
{{ formData.channel }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="注册时间:">
{{ formData.create_time }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最近登录时间:">
{{ formData.login_time }}
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-form>
</el-card>
<account-adjust
v-model:show="adjustState.show"
:value="adjustState.value"
@confirm="handleConfirmAdjust"
/>
</div>
<account-adjust
v-model:show="adjustState.show"
:value="adjustState.value"
@confirm="handleConfirmAdjust"
/>
</div>
</template>
<script lang="ts" setup name="consumerDetail">
import type { FormInstance } from 'element-plus'
import { adjustMoney, getUserDetail, userEdit } from '@/api/consumer'
import { isEmpty } from '@/utils/util'
import AccountAdjust from '../components/account-adjust.vue'
const route = useRoute()
import type { FormInstance } from "element-plus";
import { adjustMoney, getUserDetail, userEdit } from "@/api/consumer";
import { isEmpty } from "@/utils/util";
import AccountAdjust from "../components/account-adjust.vue";
const route = useRoute();
const formData = reactive({
avatar: '',
channel: '',
create_time: '',
login_time: '',
mobile: '',
nickname: '',
real_name: 0,
sex: 0,
sn: '',
account: '',
user_money: ''
})
avatar: "",
channel: "",
create_time: "",
login_time: "",
mobile: "",
nickname: "",
real_name: 0,
sex: 0,
sn: "",
account: "",
user_money: "",
});
const adjustState = reactive({
show: false,
value: ''
})
const formRef = shallowRef<FormInstance>()
show: false,
value: "",
});
const formRef = shallowRef<FormInstance>();
const getDetails = async () => {
const data = await getUserDetail({
id: route.query.id
})
Object.keys(formData).forEach((key) => {
//@ts-ignore
formData[key] = data[key]
})
}
const data = await getUserDetail({
id: route.query.id,
});
Object.keys(formData).forEach((key) => {
//@ts-ignore
formData[key] = data[key];
key == "sex" ? (formData[key] = Number(data[key])) : "";
});
};
const handleEdit = async (value: string, field: string) => {
if (isEmpty(value)) return
await userEdit({
id: route.query.id,
field,
value
})
getDetails()
}
if (isEmpty(value)) return;
await userEdit({
id: route.query.id,
field,
value,
});
getDetails();
};
const handleAdjust = (value: string) => {
adjustState.show = true
adjustState.value = value
}
adjustState.show = true;
adjustState.value = value;
};
const handleConfirmAdjust = async (value: any) => {
await adjustMoney({ user_id: route.query.id, ...value })
adjustState.show = false
getDetails()
}
getDetails()
await adjustMoney({ user_id: route.query.id, ...value });
adjustState.show = false;
getDetails();
};
getDetails();
</script>

View File

@ -5,13 +5,12 @@
</el-card>
<el-card class="mt-4 !border-none" shadow="never">
<el-form ref="formRef" :model="formData" label-width="84px">
<div style="font-size: 1.2rem; margin: 10px 0">
基本信息创建{{ mode }}
</div>
<div style="font-size: 1.2rem; margin: 10px 0">基本信息创建</div>
<div class="headimg">
<el-upload
v-model="formData.avatar"
class="avatar-uploader-head"
:disabled="flag"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false"
@ -29,6 +28,7 @@
<el-form-item label="姓名" prop="nickname">
<el-input
v-model="formData.nickname"
:disabled="flag"
placeholder="请输入姓名"
clearable
:style="{ width: '100%' }"
@ -39,11 +39,12 @@
<el-form-item label="性别" prop="sex">
<el-select
v-model="formData.sex"
:disabled="flag"
placeholder="请选择性别"
:style="{ width: '100%' }"
>
<el-option label="男" value="1" />
<el-option label="女" value="2" />
<el-option label="男" :value="1" />
<el-option label="女" :value="2" />
</el-select>
</el-form-item>
</el-col>
@ -53,6 +54,7 @@
<el-form-item label="身份证号" prop="id_card">
<el-input
v-model="formData.id_card"
:disabled="flag"
placeholder="请输入身份证号"
clearable
:style="{ width: '100%' }"
@ -64,6 +66,7 @@
<el-input
v-model="formData.account"
placeholder="请输入联系电话"
:disabled="flag"
clearable
:style="{ width: '100%' }"
></el-input>
@ -75,6 +78,7 @@
<el-select
v-model="formData.province"
placeholder="请选择省"
:disabled="flag"
clearable
@change="province_change"
:style="{ width: '100%' }"
@ -92,6 +96,7 @@
v-model="formData.city"
placeholder="请选择市"
clearable
:disabled="flag"
@change="city_change"
:style="{ width: '100%' }"
>
@ -107,6 +112,7 @@
<el-select
v-model="formData.area"
placeholder="请选择区"
:disabled="flag"
clearable
@change="area_change"
:style="{ width: '100%' }"
@ -124,6 +130,7 @@
<el-select
v-model="formData.street"
placeholder="请选择镇"
:disabled="flag"
clearable
@change="street_change"
:style="{ width: '100%' }"
@ -139,6 +146,7 @@
<el-form-item label="村社小队" prop="address" style="flex: 1.5">
<el-input
v-model="formData.address"
:disabled="flag"
placeholder="请输入村社小队"
clearable
:style="{ width: '100%' }"
@ -148,7 +156,7 @@
</el-col>
<el-col :span="24" style="margin-top: 1vh">
<el-row>
<!-- <el-row>
<el-col :span="12" v-if="mode == 'initiate' || formData.party_b">
<el-form-item label="签约方" prop="field130">
<el-input
@ -161,7 +169,7 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-row> -->
</el-col>
<div style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
<div style="display: flex; justify-content: space-between">
@ -169,6 +177,7 @@
<el-form-item label="身份证" prop="id_card">
<el-upload
v-model="formData.qualification.id_card"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
@ -186,6 +195,7 @@
</el-upload>
<el-upload
v-model="formData.qualification.id_card_b"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
@ -207,6 +217,7 @@
<el-form-item label="行驶证" prop="car_card">
<el-upload
v-model="formData.qualification.car_card"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
@ -224,6 +235,7 @@
</el-upload>
<el-upload
v-model="formData.qualification.car_card_b"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
@ -246,6 +258,7 @@
<el-form-item label="银行卡号" prop="bank_account">
<el-upload
v-model="formData.qualification.bank_account"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
@ -264,6 +277,7 @@
</el-upload>
<el-upload
v-model="formData.qualification.bank_account_b"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
@ -350,25 +364,6 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="合同类型" prop="contract_type">
<el-col :span="24">
<el-select
v-model="formData.contract_type"
placeholder="请选择合同类型"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.contract_type"
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-col>
</el-form-item>
</el-col>
</el-row>
</el-col>
</template>
@ -387,33 +382,49 @@
</el-upload>
</el-form-item>
</el-col>
<!-- <el-col :span="24">
<!-- <el-col :span="24" v-if="formData.contract">
<el-form-item label="合同地址">
<el-link
type="success"
:href="formData.contract.url"
:href="formData.contract.file"
target="_blank"
>在线查看</el-link
>
</el-form-item>
</el-col> -->
<el-col :span="24" class="pt-6">
<el-form-item label prop="field139">
<!-- <el-button
type="primary"
:disabled="isDisabled"
size="medium"
@click="create"
>创建</el-button
> -->
<el-button
type="primary"
v-if="mode == 'initiate'"
@click="initiateContactFn"
>发起合同</el-button
>
</el-form-item>
<el-col :span="24" v-if="mode == 'initiate'" class="pt-6">
<el-row>
<el-col :span="8">
<el-form-item label="合同类型" prop="contract_type">
<el-col :span="24">
<el-select
v-model="formData.contract_type"
placeholder="请选择合同类型"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.contract_type"
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-col>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item prop="field139">
<el-button
type="primary"
v-if="mode == 'initiate'"
@click="initiateContactFn"
>发起合同</el-button
>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-form>
</el-card>
@ -423,9 +434,9 @@
:value="adjustState.value"
@confirm="handleConfirmAdjust"
/>
<el-dialog v-model="isCompany" title="选择签约方" width="60%">
<!-- <el-dialog v-model="isCompany" title="选择签约方" width="60%">
<DialogIndex @customEvent="customEvent" />
</el-dialog>
</el-dialog> -->
</div>
</template>
@ -459,8 +470,8 @@ import useUserStore from "@/stores/modules/user";
import feedback from "@/utils/feedback";
const { removeTab } = useMultipleTabs();
const router = useRouter();
const route = useRoute();
const flag = ref(true);
const formData = reactive({
id: "",
sex: "",
@ -650,12 +661,15 @@ const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
return;
}
formData.file = response.data.uri;
fileList.value[0].url = response.data.uri;
fileList.value[0].name = "合同文件";
console.log(formData.file.substring(8));
upContact({ file: formData.file.substring(8), id: route.query.id }).then(
(res) => [console.log(res)]
);
// fileList.value[0].url = response.data.uri;
// fileList.value[0].name = "";
// upContact({ file: formData.file.substring(8), id: route.query.id }).then(
// (res) => [console.log(res)]
// );
upContact({ file: formData.file, id: route.query.mdoeid }).then((res) => [
console.log(res),
]);
};
const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => {
return true;
@ -701,27 +715,17 @@ const handleConfirmAdjust = async (value: any) => {
};
//
const initiateContactFn = () => {
const { party_b, contract_type } = formData;
const { contract_type } = formData;
// console.log(party_b, contract_type);
initiateContact({ party_b, contract_type, type: 2 }).then((res) => {
console.log(res);
feedback.msgSuccess("发起成功,等待平台风控部上传合同");
});
};
const create = async () => {
await formRef.value?.validate();
const data = { ...formData };
// mode.value = route.query.mode;
// if (route.query.id) {
// await apiCompanyEdit(data)
// } else {
// await apiCompanyAdd(data)
// }
removeTab();
router.back();
initiateContact({ party_b: route.query.id, contract_type, type: 2 }).then(
(res) => {
feedback.msgSuccess("发起成功,等待平台风控部上传合同");
}
);
};
getDetails();
getProvinceList();
console.log(formData);
</script>
<style lang="scss">

View File

@ -87,11 +87,12 @@
详情
</router-link>
</el-button>
<template v-if="row.company_id != 0 && row.is_contract == 0">
<template v-if="row.is_contract == 0">
<el-button
v-perms="['auth.admin/Draftingcontracts']"
v-perms="['user.user/launch']"
type="primary"
link
v-if="!row.contract"
>
<router-link
:to="{
@ -107,9 +108,10 @@
</el-button>
<el-button
v-perms="['auth.admin/Draftingcontracts']"
v-perms="['user.user/uplode']"
type="primary"
link
v-if="row.contract?.check_status == 1"
>
<router-link
:to="{
@ -117,6 +119,7 @@
query: {
id: row.id,
mode: 'uplode',
mdoeid: row.contract.id,
},
}"
>
@ -124,8 +127,9 @@
</router-link>
</el-button>
<el-button
v-perms="['auth.admin/Draftingcontracts']"
v-perms="['user.user/launch']"
type="primary"
v-if="row.contract?.check_status == 2"
link
@click="
(showPop = true),
@ -135,49 +139,14 @@
>生成个人合同</el-button
>
<el-button
v-perms="['auth.admin/postsms']"
v-if="row.contract?.check_status == 2"
v-perms="['user.user/launch']"
type="primary"
link
@click="(showPop = true), (contractId = row.id)"
>重新短信</el-button
>
</template>
<!-- <el-button
v-if="row.root != 1"
v-perms="['auth.admin/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>删除</el-button
>
<el-button
v-if="row.is_contract == 1"
v-perms="['auth.admin/abolition']"
type="danger"
link
@click="handleAbolition(row.id)"
>废除合同</el-button
>
<template v-if="row.company_id != 0 && row.is_contract == 0">
<el-button
v-perms="['auth.admin/Draftingcontracts']"
type="primary"
link
@click="
;(showPop = true),
(showConctactPop = true),
(contractId = row.id)
"
>生成个人合同</el-button
>
<el-button
v-perms="['auth.admin/postsms']"
type="primary"
link
@click=";(showPop = true), (contractId = row.id)"
>重新短信</el-button
>
</template> -->
</template>
</el-table-column>
</el-table>
@ -213,12 +182,7 @@
<script lang="ts" setup name="consumerLists">
import { usePaging } from "@/hooks/usePaging";
import { getRoutePath } from "@/router";
import {
getUserList,
creatContact,
initiateContact,
upContact,
} from "@/api/consumer";
import { getUserList, creatContact, sendMsgApi } from "@/api/consumer";
import { ClientMap } from "@/enums/appEnums";
import feedback from "@/utils/feedback";
@ -236,6 +200,7 @@ const offPop = () => {
showConctactPop.value = false;
};
const creContct = () => {
console.log(contractId.value);
// feedback.msgSuccess("");
creatContact({ id: contractId.value }).then(() => {
feedback.msgSuccess("发送成功");
@ -243,9 +208,10 @@ const creContct = () => {
offPop();
};
const sendMsg = () => {
// sendMsgApi({ id: contractId.value }).then((res) => {
// feedback.msgSuccess("");
// });
sendMsgApi({ id: contractId.value }).then((res) => {
feedback.msgSuccess("发送成功");
});
offPop();
};
// const handleDelete = async (id: number) => {
@ -268,7 +234,7 @@ onActivated(() => {
getLists();
</script>
<style>
<style scoped>
h1 {
text-align: center;
font-weight: bold;

View File

@ -0,0 +1,185 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="订单编号" prop="order_sn">
<el-input
class="w-[280px]"
v-model="queryParams.order_sn"
clearable
placeholder="请输入订单编号"
/>
</el-form-item>
<el-form-item label="" prop="user_id">
<el-input
class="w-[280px]"
v-model="queryParams.user_id"
clearable
placeholder="请输入"
/>
</el-form-item>
<el-form-item label="" prop="admin_id">
<el-input
class="w-[280px]"
v-model="queryParams.admin_id"
clearable
placeholder="请输入"
/>
</el-form-item>
<el-form-item label="提现金额" prop="amount">
<el-input
class="w-[280px]"
v-model="queryParams.amount"
clearable
placeholder="请输入提现金额"
/>
</el-form-item>
<el-form-item
label="状态0待审核1通过2拒绝3已转账"
prop="status"
>
<el-input
class="w-[280px]"
v-model="queryParams.status"
clearable
placeholder="请输入状态0待审核1通过2拒绝3已转账"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['withdraw/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['withdraw/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column
label="订单编号"
prop="order_sn"
show-overflow-tooltip
/>
<el-table-column label="" prop="user_id" show-overflow-tooltip />
<el-table-column label="" prop="admin_id" show-overflow-tooltip />
<el-table-column
label="提现金额"
prop="amount"
show-overflow-tooltip
/>
<el-table-column
label="状态0待审核1通过2拒绝3已转账"
prop="status"
show-overflow-tooltip
/>
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['withdraw/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['withdraw/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup
v-if="showEdit"
ref="editRef"
:dict-data="dictData"
@success="getLists"
@close="showEdit = false"
/>
</div>
</template>
<script lang="ts" setup name="withdrawLists">
import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions";
import { apiWithdrawLists, apiWithdrawDelete } from "@/api/withdraw";
import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue";
const editRef = shallowRef<InstanceType<typeof EditPopup>>();
//
const showEdit = ref(false);
//
const queryParams = reactive({
order_sn: "",
user_id: "",
admin_id: "",
amount: "",
status: "",
});
//
const selectData = ref<any[]>([]);
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id);
};
//
const { dictData } = useDictData("");
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiWithdrawLists,
params: queryParams,
});
//
const handleAdd = async () => {
showEdit.value = true;
await nextTick();
editRef.value?.open("add");
};
//
const handleEdit = async (data: any) => {
showEdit.value = true;
await nextTick();
editRef.value?.open("edit");
editRef.value?.setFormData(data);
};
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm("确定要删除?");
await apiWithdrawDelete({ id });
getLists();
};
getLists();
</script>

175
src/views/finance/edit.vue Normal file
View File

@ -0,0 +1,175 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form
ref="formRef"
:model="formData"
label-width="90px"
:rules="formRules"
>
<el-form-item label="订单编号" prop="order_sn">
<el-input
v-model="formData.order_sn"
clearable
placeholder="请输入订单编号"
/>
</el-form-item>
<el-form-item label="" prop="user_id">
<el-input v-model="formData.user_id" clearable placeholder="请输入" />
</el-form-item>
<el-form-item label="" prop="admin_id">
<el-input
v-model="formData.admin_id"
clearable
placeholder="请输入"
/>
</el-form-item>
<el-form-item label="提现金额" prop="amount">
<el-input
v-model="formData.amount"
clearable
placeholder="请输入提现金额"
/>
</el-form-item>
<el-form-item
label="状态0待审核1通过2拒绝3已转账"
prop="status"
>
<el-input
v-model="formData.status"
clearable
placeholder="请输入状态0待审核1通过2拒绝3已转账"
/>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="withdrawEdit">
import type { FormInstance } from "element-plus";
import Popup from "@/components/popup/index.vue";
import {
apiWithdrawAdd,
apiWithdrawEdit,
apiWithdrawDetail,
} from "@/api/withdraw";
import { timeFormat } from "@/utils/util";
import type { PropType } from "vue";
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({}),
},
});
const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref("add");
//
const popupTitle = computed(() => {
return mode.value == "edit" ? "编辑提现申请" : "新增提现申请";
});
//
const formData = reactive({
id: "",
order_sn: "",
user_id: "",
admin_id: "",
amount: "",
status: "",
});
//
const formRules = reactive<any>({
order_sn: [
{
required: true,
message: "请输入订单编号",
trigger: ["blur"],
},
],
user_id: [
{
required: true,
message: "请输入",
trigger: ["blur"],
},
],
admin_id: [
{
required: true,
message: "请输入",
trigger: ["blur"],
},
],
amount: [
{
required: true,
message: "请输入提现金额",
trigger: ["blur"],
},
],
status: [
{
required: true,
message: "请输入状态0待审核1通过2拒绝3已转账",
trigger: ["blur"],
},
],
});
//
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key];
}
}
};
const getDetail = async (row: Record<string, any>) => {
const data = await apiWithdrawDetail({
id: row.id,
});
setFormData(data);
};
//
const handleSubmit = async () => {
await formRef.value?.validate();
const data = { ...formData };
mode.value == "edit"
? await apiWithdrawEdit(data)
: await apiWithdrawAdd(data);
popupRef.value?.close();
emit("success");
};
//
const open = (type = "add") => {
mode.value = type;
popupRef.value?.open();
};
//
const handleClose = () => {
emit("close");
};
defineExpose({
open,
setFormData,
getDetail,
});
</script>

View File

@ -82,7 +82,7 @@ const checkMobile = (rule: any, value: any, callback: any) => {
return callback()
} else {
const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/
console.log(reg.test(value))
if (reg.test(value)) {
callback()
} else {

View File

@ -159,5 +159,5 @@ const toggleExpand = (children: any[], unfold = true) => {
getLists().then((res) => {
console.log(res);
});
console.log(556666666666665);
</script>

View File

@ -10,7 +10,7 @@
<div class="mt-4">
<el-calendar v-model="dateValue">
<template #dateCell="{ data }">
<div style="width: 100%; height: 100%" @click="test(data)">
<div style="width: 100%; height: 100%">
<p :class="data.isSelected ? 'is-selected' : ''">
{{ data.day.split("-").slice(1).join("-") }}
<!-- {{ data.isSelected ? '✔️' : '' }} -->
@ -23,6 +23,7 @@
the: item.priority == 3,
}"
v-if="taskList[data.day]"
@click="handleEdit(item)"
v-for="(item, index) in taskList[data.day]"
:key="index"
>
@ -140,11 +141,11 @@ const handleEdit = async (data: any) => {
};
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm("确定要删除?");
await apiFlowTypeDelete({ id });
getLists();
};
// const handleDelete = async (id: number | any[]) => {
// await feedback.confirm("");
// await apiFlowTypeDelete({ id });
// getLists();
// };
// getLists();
</script>

View File

@ -1,18 +1,37 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="1000px" @confirm="handleSubmit" @close="handleClose">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="1000px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="84px">
<el-col class="pt-6 !border-none">
<el-row>
<el-col :span="16">
<el-form-item label="任务主题" prop="title">
<el-input v-model="formData.title" placeholder="请输入任务主题" clearable></el-input>
<el-input
v-model="formData.title"
placeholder="请输入任务主题"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="优先级" prop="name">
<el-select v-model="formData.priority" placeholder="请输入优先级">
<el-option v-for="item in priorityList" :key="item.value" :value="item.value" :label="item.label"/>
<el-select
v-model="formData.priority"
placeholder="请输入优先级"
>
<el-option
v-for="item in priorityList"
:key="item.value"
:value="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-col>
@ -20,13 +39,22 @@
<el-row>
<el-col :span="8">
<el-form-item label="工作类型" prop="icon">
<el-select v-model="formData.type" placeholder="请选择工作类型" >
<el-option v-for="item in taskTypeList" :key="item.label" :value="item.value" :label="item.label"/>
<el-select v-model="formData.type" placeholder="请选择工作类型">
<el-option
v-for="item in taskTypeList"
:key="item.label"
:value="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否为修复BUG" label-width="auto" prop="icon">
<el-form-item
label="是否为修复BUG"
label-width="auto"
prop="icon"
>
<el-radio-group v-model="formData.is_bug">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
@ -37,43 +65,75 @@
<el-row>
<el-col :span="8">
<el-form-item label="负责人" prop="icon">
<el-input v-model="formData.director_name" placeholder="请选择负责人" clearable @click="isMan = true"></el-input>
<el-input
v-model="formData.director_name"
placeholder="请选择负责人"
clearable
@click="isMan = true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="协作人" prop="icon">
<el-input v-model="formData.assist_admin_names" placeholder="请选择协作人" clearable
@click="isManTow = true"></el-input>
<el-input
v-model="formData.assist_admin_names"
placeholder="请选择协作人"
clearable
@click="isManTow = true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审查人" prop="icon">
<el-input v-model="formData.assist_check_names" placeholder="请选择审查人" clearable @click="isManThe = true"></el-input>
<el-input
v-model="formData.assist_check_names"
placeholder="请选择审查人"
clearable
@click="isManThe = true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="icon">
<el-date-picker type="date" placeholder="开始时间" value-format="YYYY-MM-DD" v-model="formData.start_time" />
<el-date-picker
type="date"
placeholder="开始时间"
value-format="YYYY-MM-DD"
v-model="formData.start_time"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="icon">
<el-date-picker type="date" placeholder="预计结束时间" value-format="YYYY-MM-DD" v-model="formData.end_time" />
<el-date-picker
type="date"
placeholder="预计结束时间"
value-format="YYYY-MM-DD"
v-model="formData.end_time"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="验收时间" prop="icon">
<el-date-picker type="date" placeholder="预计验收时间" value-format="YYYY-MM-DD" v-model="formData.check_time" />
<el-date-picker
type="date"
placeholder="预计验收时间"
value-format="YYYY-MM-DD"
v-model="formData.check_time"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="详细描述" prop="icon">
<editor v-model="formData.content" :height="500" />
</el-form-item></el-col>
<editor
v-model="formData.content"
:height="500"
/> </el-form-item
></el-col>
</el-row>
</el-col>
</el-form>
@ -93,19 +153,19 @@
<script lang="ts" setup name="taskEidt">
import type { FormInstance } from "element-plus";
import Popup from "@/components/popup/index.vue";
import { apiTaskCreat } from "@/api/task";
import { apiTaskCreat, apiTaskView } from "@/api/task";
import { timeFormat } from "@/utils/util";
import { reactive, onMounted, type PropType } from "vue";
import DialogIndexMan from './dialog_index_man.vue'
import DialogIndexMan from "./dialog_index_man.vue";
const props = defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({}),
},
dateValue:{
dateValue: {
type: Date,
default: () => (null),
}
default: () => null,
},
});
const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>();
@ -117,64 +177,66 @@ const popupTitle = computed(() => {
return mode.value == "edit" ? "编辑任务" : "新增任务";
});
onMounted(()=>{
props.dateValue?.toDateString()?formData.start_time = props.dateValue.toDateString():null;
})
onMounted(() => {
props.dateValue?.toDateString()
? (formData.start_time = props.dateValue.toDateString())
: null;
});
const priorityList = reactive([
{
value: 1,
label: "低"
label: "低",
},
{
value: 2,
label: "中"
label: "中",
},
{
value: 3,
label: "高"
label: "高",
},
{
value: 4,
label: "紧急"
}
])
label: "紧急",
},
]);
const taskTypeList = reactive([
{
value: 0,
label: "测试"
label: "测试",
},
{
value: 1,
label: "修复"
label: "修复",
},
{
value: 2,
label: "新增"
}
])
label: "新增",
},
]);
// const timeList = reactive([1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24])
//
const formData = reactive({
id: "",
title: "",//
priority: "",//
type: "",//
is_bug: "",//bug
start_time: "",//
end_time: "",//
check_time: "",//
director_name: "",//
director_uid: "",//id
assist_admin_names: "",//
assist_admin_ids: "",//id
assist_check_names: "",//
assist_check_ids: "",//id
content: "",//
project_id: ""//id
title: "", //
priority: "", //
type: "", //
is_bug: "", //bug
start_time: "", //
end_time: "", //
check_time: "", //
director_name: "", //
director_uid: "", //id
assist_admin_names: "", //
assist_admin_ids: "", //id
assist_check_names: "", //
assist_check_ids: "", //id
content: "", //
project_id: "", //id
});
//
@ -187,11 +249,11 @@ const setFormData = async (data: Record<any, any>) => {
}
};
const getDetail = async (row: Record<string, any>) => {
const data = await apiFlowTypeDetail({
id: row.id,
const getDetail = async (id: number) => {
const data = await apiTaskView({
id,
});
setFormData(data);
setFormData(data.detail);
};
//
@ -201,17 +263,17 @@ const isManTow = ref(false);
//
const isManThe = ref(false);
function customEvent(data: any) {
isMan.value = false
isMan.value = false;
formData.director_name = data.name;
formData.director_uid = data.id;
}
function customEventMan(data: any) {
isManTow.value = false
isManTow.value = false;
formData.assist_admin_names = data.name;
formData.assist_admin_ids = data.id;
}
function customEventManThe(data: any) {
isManThe.value = false
isManThe.value = false;
formData.assist_check_names = data.name;
formData.assist_check_ids = data.id;
}

File diff suppressed because it is too large Load Diff

View File

@ -1,45 +1,26 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="84px">
<el-col class="pt-6 !border-none">
<el-row>
<el-col>
<el-form-item label="名称" prop="title">
<el-input
v-model="formData.title"
placeholder="请输入名称"
clearable
></el-input>
<el-input v-model="formData.title" placeholder="请输入名称" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="标识" prop="name">
<el-input
v-model="formData.name"
placeholder="请输入审批类型标识"
clearable
></el-input>
<el-input v-model="formData.name" placeholder="请输入审批类型标识" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="图标" prop="icon">
<el-input
v-model="formData.icon"
placeholder="请输入审批类型图标"
clearable
></el-input>
<el-input v-model="formData.icon" placeholder="请输入审批类型图标" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
@ -56,6 +37,8 @@ import { apiCateCreat } from "@/api/examined";
import { timeFormat } from "@/utils/util";
import type { PropType } from "vue";
import { fileManagelist, fileManageDetil } from "@/api/informationg";
import { getUserList } from "@/api/consumer";
defineProps({
dictData: {
@ -94,12 +77,12 @@ const setFormData = async (data: Record<any, any>) => {
}
};
const getDetail = async (row: Record<string, any>) => {
const data = await apiFlowTypeDetail({
id: row.id,
});
setFormData(data);
};
// const getDetail = async (row: Record<string, any>) => {
// const data = await apiFlowTypeDetail({
// id: row.id,
// });
// setFormData(data);
// };
//
const handleSubmit = async () => {

View File

@ -3,22 +3,19 @@
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-form class="mb-[-16px]" inline>
<el-form-item label="公司名称" prop="company_id">
<el-input class="w-[280px]" clearable placeholder="请输入公司" />
</el-form-item>
<el-form-item label="合同类型" prop="contract_type">
<el-input class="w-[280px]" clearable placeholder="请输入合同类型" />
<el-input
class="w-[280px]"
v-model="queryParams.name"
clearable
placeholder="请输入公司"
/>
</el-form-item>
<el-form-item>
<el-button type="primary">查询</el-button>
<el-button>重置</el-button>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
<el-button v-perms="['flow_type/add']" type="primary" @click="">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column label="用户编号" prop="id" show-overflow-tooltip />
@ -70,7 +67,7 @@
<el-button v-perms="['flow/edit']" type="primary" link>
<router-link
:to="{
path: getRoutePath('user.user/detil'),
path: 'user/user_informationgdetil',
query: {
id: row.id,
},
@ -100,26 +97,22 @@
<script lang="ts" setup name="flowTypeLists">
import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions";
import { apiCateLists, apiCateStatus } from "@/api/examined";
// import { apiCateLists, apiCateStatus } from "@/api/examined";
import { fileManagelist, fileManageDetil } from "@/api/informationg";
import { getRoutePath } from "@/router";
import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
// import { timeFormat } from "@/utils/util";
// import feedback from "@/utils/feedback";
// import { getRoutePath } from "router";
import EditPopup from "./editCate.vue";
console.log(getRoutePath);
const editRef = shallowRef<InstanceType<typeof EditPopup>>();
//
const showEdit = ref(false);
//
const queryParams = reactive({
type: "",
title: "",
name: "",
icon: "",
department_ids: "",
status: "",
});
//
@ -139,20 +132,21 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
params: queryParams,
});
//
const handleAdd = async () => {
showEdit.value = true;
await nextTick();
editRef.value?.open("add");
};
//
const handleEdit = async (data: any) => {
showEdit.value = true;
await nextTick();
editRef.value?.open("edit");
editRef.value?.setFormData(data);
};
//
// const handleAdd = async () => {
// showEdit.value = true;
// await nextTick();
// editRef.value?.open("add");
// };
// //
// const handleEdit = async (data: any) => {
// showEdit.value = true;
// await nextTick();
// editRef.value?.open("edit");
// editRef.value?.setFormData(data);
// };
//
// const handleDelete = async (id: number | any[]) => {
@ -161,8 +155,8 @@ const handleEdit = async (data: any) => {
// getLists();
// };
//
const changeStatus = (row: any) => {
apiCateStatus({ id: row.id, status: row.status });
};
// const changeStatus = (row: any) => {
// apiCateStatus({ id: row.id, status: row.status });
// };
getLists();
</script>