页面修改

This commit is contained in:
嗜血龙帅 2023-08-01 21:33:30 +08:00
parent e551ac611a
commit 301aded17b
12 changed files with 2453 additions and 2059 deletions

View File

@ -1,21 +1,36 @@
import request from '@/utils/request' import request from "@/utils/request";
// 用户列表 // 用户列表
export function getUserList(params: any) { export function getUserList(params: any) {
return request.get({ url: '/user.user/lists', params }, { ignoreCancelToken: true }) return request.get(
{ url: "/user.user/lists", params },
{ ignoreCancelToken: true }
);
} }
// 用户详情 // 用户详情
export function getUserDetail(params: any) { export function getUserDetail(params: any) {
return request.get({ url: '/user.user/detail', params }) return request.get({ url: "/user.user/detail", params });
} }
// 用户编辑 // 用户编辑
export function userEdit(params: any) { export function userEdit(params: any) {
return request.post({ url: '/user.user/edit', params }) return request.post({ url: "/user.user/edit", params });
} }
// 用户编辑 // 用户编辑
export function adjustMoney(params: any) { export function adjustMoney(params: any) {
return request.post({ url: '/user.user/adjustMoney', params }) return request.post({ url: "/user.user/adjustMoney", params });
}
// 发起合同
export function initiateContact(params: any) {
return request.post({ url: "/user.user/initiate_contract", params });
}
// 上传合同
export function upContact(params: any) {
return request.post({ url: "/contract.contract/wind_control", params });
}
//生产个人合同
export function creatContact(params: any) {
return request.post({ url: "/user.user/Draftingcontracts", params });
} }

12
src/api/informationg.ts Normal file
View File

@ -0,0 +1,12 @@
import request from "@/utils/request";
// 档案列表
export function fileManagelist(params: any) {
return request.get({ url: "/informationg.user_informationg/lists", params });
}
// 档案详情
export function fileManageDetil(params: any) {
return request.get({ url: "/informationg.user_informationg/detail", params });
}

View File

@ -45,7 +45,23 @@ export const constantRoutes: Array<RouteRecordRaw> = [
meta: { 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

@ -59,8 +59,12 @@
删除 删除
</el-button> </el-button>
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table
<el-table-column type="selection" width="55" /> :data="pager.lists"
@selection-change="handleSelectionChange"
row-key="id"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column label="id" prop="id" show-overflow-tooltip /> <el-table-column label="id" prop="id" show-overflow-tooltip />
<el-table-column label="名称" prop="name" show-overflow-tooltip /> <el-table-column label="名称" prop="name" show-overflow-tooltip />
<el-table-column label="上级id" prop="pid" show-overflow-tooltip /> <el-table-column label="上级id" prop="pid" show-overflow-tooltip />
@ -107,62 +111,67 @@
</template> </template>
<script lang="ts" setup name="categoryBusinessLists"> <script lang="ts" setup name="categoryBusinessLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from "@/hooks/usePaging";
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from "@/hooks/useDictOptions";
import { apiCategoryBusinessLists, apiCategoryBusinessDelete } from '@/api/category_business' import {
import { timeFormat } from '@/utils/util' apiCategoryBusinessLists,
import feedback from '@/utils/feedback' apiCategoryBusinessDelete,
import EditPopup from './edit.vue' } from "@/api/category_business";
import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue";
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const editRef = shallowRef<InstanceType<typeof EditPopup>>();
// //
const showEdit = ref(false) const showEdit = ref(false);
// //
const queryParams = reactive({ const queryParams = reactive({
name: '', name: "",
sort: '', sort: "",
status: '' status: "",
}) });
// //
const selectData = ref<any[]>([]) const selectData = ref<any[]>([]);
// //
const handleSelectionChange = (val: any[]) => { const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id) selectData.value = val.map(({ id }) => id);
} };
// //
const { dictData } = useDictData('show_status') const { dictData } = useDictData("show_status");
// //
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiCategoryBusinessLists, fetchFun: apiCategoryBusinessLists,
params: queryParams params: queryParams,
}) });
// //
const handleAdd = async () => { const handleAdd = async () => {
showEdit.value = true showEdit.value = true;
await nextTick() await nextTick();
editRef.value?.open('add') editRef.value?.open("add");
} };
// //
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
showEdit.value = true showEdit.value = true;
await nextTick() await nextTick();
editRef.value?.open('edit') editRef.value?.open("edit");
editRef.value?.setFormData(data) editRef.value?.setFormData(data);
} };
// //
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?') await feedback.confirm("确定要删除?");
await apiCategoryBusinessDelete({ id }) await apiCategoryBusinessDelete({ id });
getLists() getLists();
} };
getLists() getLists().then((res) => {
console.log(res);
});
</script> </script>

View File

@ -1,8 +1,15 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules"> <el-form
<div style="font-size: 1.2rem; margin: 10px 0">公司基本信息创建</div> ref="formRef"
:model="formData"
label-width="90px"
:rules="formRules"
>
<!-- <div style="font-size: 1.2rem; margin: 10px 0">公司基本信息创建</div> -->
<el-col :span="24" class="el-card pt-6"> <el-col :span="24" class="el-card pt-6">
<div class="tit">公司基本信息创建</div>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="公司名称" prop="company_name"> <el-form-item label="公司名称" prop="company_name">
@ -133,8 +140,9 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<div style="font-size: 1.2rem; margin: 10px 0">主要联系人</div>
<el-col :span="24" class="el-card pt-6"> <el-col :span="24" class="el-card pt-6">
<div class="tit">主要联系人</div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" prop="master_name"> <el-form-item label="姓名" prop="master_name">
@ -206,10 +214,14 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<div style="font-size: 1.2rem; margin: 10px 0">其他联系人</div>
<el-col :span="24" class="el-card pt-6"> <el-col :span="24" class="el-card pt-6">
<div class="tit">其他联系人</div>
<el-row> <el-row>
<template v-for="(item, index) in formData.other_contacts" :key="index"> <template
v-for="(item, index) in formData.other_contacts"
:key="index"
>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" prop="field120"> <el-form-item label="姓名" prop="field120">
<el-input <el-input
@ -269,8 +281,10 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<div style="font-size: 1.2rem; margin: 10px 0">资质信息</div> <!-- <div style="font-size: 1.2rem; margin: 10px 0">资质信息</div> -->
<el-col :span="24" class="el-card pt-6"> <el-col :span="24" class="el-card pt-6">
<div class="tit">资质信息</div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公司资质" required> <el-form-item label="公司资质" required>
@ -354,8 +368,10 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<div style="font-size: 1.2rem; margin: 10px 0">电子合同</div> <!-- <div style="font-size: 1.2rem; margin: 10px 0">电子合同</div> -->
<el-col :span="24" class="el-card pt-6"> <el-col :span="24" class="el-card pt-6">
<div class="tit">电子合同</div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="签约方" prop="field130"> <el-form-item label="签约方" prop="field130">
@ -370,7 +386,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label-width="100px" label="被签约公司" prop="field131"> <el-form-item
label-width="100px"
label="被签约公司"
prop="field131"
>
<el-input <el-input
:disabled="true" :disabled="true"
v-model="formData.company_name" v-model="formData.company_name"
@ -381,7 +401,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label-width="100px" label="合同类型" prop="contract_type"> <el-form-item
label-width="100px"
label="合同类型"
prop="contract_type"
>
<el-select <el-select
:disabled="isDisabled" :disabled="isDisabled"
v-model="formData.contract.contract_type" v-model="formData.contract.contract_type"
@ -426,7 +450,9 @@
:limit="1" :limit="1"
:on-success="handleAvatarSuccess_three" :on-success="handleAvatarSuccess_three"
> >
<el-button :disabled="isDisabled" type="primary">上传</el-button> <el-button :disabled="isDisabled" type="primary"
>上传</el-button
>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -462,64 +488,79 @@
</template> </template>
<script lang="ts" setup name="companyEdit"> <script lang="ts" setup name="companyEdit">
import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus' import type {
import Popup from '@/components/popup/index.vue' FormInstance,
import { apiCompanyAdd, apiCompanyEdit, apiCompanyDetail, apiCompanyLists } from '@/api/company' UploadProps,
import { apiCityList, apiAreaList, apiStreetList, apiProvinceList } from '@/api/common' ElMessage,
import { dictDataLists } from '@/api/setting/dict' UploadUserFile,
import { timeFormat } from '@/utils/util' } from "element-plus";
import DialogIndex from './dialog_index.vue' import Popup from "@/components/popup/index.vue";
import DialogIndexMan from './dialog_index_man.vue' import {
import type { PropType } from 'vue' apiCompanyAdd,
import useMultipleTabs from '@/hooks/useMultipleTabs' apiCompanyEdit,
import useUserStore from '@/stores/modules/user' apiCompanyDetail,
const userStore = useUserStore() apiCompanyLists,
} from "@/api/company";
import {
apiCityList,
apiAreaList,
apiStreetList,
apiProvinceList,
} from "@/api/common";
import { dictDataLists } from "@/api/setting/dict";
import { timeFormat } from "@/utils/util";
import DialogIndex from "./dialog_index.vue";
import DialogIndexMan from "./dialog_index_man.vue";
import type { PropType } from "vue";
import useMultipleTabs from "@/hooks/useMultipleTabs";
import useUserStore from "@/stores/modules/user";
const userStore = useUserStore();
const { removeTab } = useMultipleTabs() const { removeTab } = useMultipleTabs();
const router = useRouter() const router = useRouter();
const route = useRoute() const route = useRoute();
let isDisabled = ref(false) let isDisabled = ref(false);
let isEdit = ref(false) let isEdit = ref(false);
defineProps({ defineProps({
dictData: { dictData: {
type: Object as PropType<Record<string, any[]>>, type: Object as PropType<Record<string, any[]>>,
default: () => ({}) default: () => ({}),
} },
}) });
const emit = defineEmits(['success', 'close']) const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>() const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>() const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref() const mode = ref();
isDisabled = route.query.read isDisabled = route.query.read;
isEdit = route.query.edit isEdit = route.query.edit;
// //
const formData = reactive({ const formData = reactive({
admin_id: '', admin_id: "",
admin_name: '', admin_name: "",
area_manager: '', area_manager: "",
area_manager_name: '', area_manager_name: "",
id: '', id: "",
// level_two: '', // level_two: '',
// level_one: '', // level_one: '',
company_name: '', company_name: "",
organization_code: '', organization_code: "",
province: '', province: "",
city: '', city: "",
area: '', area: "",
street: '', street: "",
address: '', address: "",
company_type: '', company_type: "",
master_name: '', master_name: "",
master_position: '', master_position: "",
master_phone: '', master_phone: "",
master_email: '', master_email: "",
other_contacts: [ other_contacts: [
{ {
name: '', name: "",
position: '', position: "",
phone: '', phone: "",
email: '' email: "",
} },
], ],
// area_manager: '', // area_manager: '',
// is_contract: '', // is_contract: '',
@ -528,27 +569,27 @@ const formData = reactive({
// deposit: '', // deposit: '',
// deposit_time: '', // deposit_time: '',
qualification: { qualification: {
business_license: '', business_license: "",
business_licenseB: '', business_licenseB: "",
bank_account: '', bank_account: "",
bank_accountB: '' bank_accountB: "",
}, },
contract: { contract: {
contract_type: '', contract_type: "",
party_a: 0, party_a: 0,
file: '', file: "",
contract_no: '系统自动生成', contract_no: "系统自动生成",
type: 1 type: 1,
}, },
// //
party_a_name: '', party_a_name: "",
file_image: '' file_image: "",
// status: '' // status: ''
}) });
if (userStore.userInfo.root == 0) { if (userStore.userInfo.root == 0) {
formData.contract.party_a = userStore.userInfo.company?.id formData.contract.party_a = userStore.userInfo.company?.id;
formData.party_a_name = userStore.userInfo.company?.company_name formData.party_a_name = userStore.userInfo.company?.company_name;
} }
const datas = reactive({ const datas = reactive({
provinceOptions: [], provinceOptions: [],
@ -556,83 +597,83 @@ const datas = reactive({
areaOptions: [], areaOptions: [],
streetOptions: [], streetOptions: [],
dictTypeLists: [], dictTypeLists: [],
contract_type: [] contract_type: [],
}) });
const fileList = ref<UploadUserFile[]>([]) const fileList = ref<UploadUserFile[]>([]);
// //
const formRules = reactive<any>({ const formRules = reactive<any>({
company_name: [ company_name: [
{ {
required: true, required: true,
message: '请输入公司名称', message: "请输入公司名称",
trigger: ['blur'] trigger: ["blur"],
} },
], ],
organization_code: [ organization_code: [
{ {
required: true, required: true,
message: '请输入组织机构代码', message: "请输入组织机构代码",
trigger: ['blur'] trigger: ["blur"],
} },
], ],
master_name: [ master_name: [
{ {
required: true, required: true,
message: '请输入主联系人姓名', message: "请输入主联系人姓名",
trigger: ['blur'] trigger: ["blur"],
} },
], ],
master_position: [ master_position: [
{ {
required: true, required: true,
message: '请输入主联系人职务', message: "请输入主联系人职务",
trigger: ['blur'] trigger: ["blur"],
} },
], ],
master_phone: [ master_phone: [
{ {
required: true, required: true,
message: '请输入主联系人手机', message: "请输入主联系人手机",
trigger: ['blur'] trigger: ["blur"],
} },
], ],
account: [ account: [
{ {
required: true, required: true,
message: '请输入账号', message: "请输入账号",
trigger: ['blur'] trigger: ["blur"],
} },
], ],
password: [ password: [
{ {
required: true, required: true,
message: '请输入密码', message: "请输入密码",
trigger: ['blur'] trigger: ["blur"],
} },
] ],
}) });
const isCompany = ref(false) const isCompany = ref(false);
const isMan = ref(false) const isMan = ref(false);
const isAreaManager = ref(false) const isAreaManager = ref(false);
function customEvent(data: any) { function customEvent(data: any) {
isCompany.value = false isCompany.value = false;
formData.contract.party_a = data.id formData.contract.party_a = data.id;
formData.party_a_name = data.company_name formData.party_a_name = data.company_name;
} }
function customEventMan(data: any) { function customEventMan(data: any) {
isMan.value = false isMan.value = false;
formData.admin_name = data.name formData.admin_name = data.name;
formData.admin_id = data.id formData.admin_id = data.id;
} }
// //
function EventAreaManager(data: any) { function EventAreaManager(data: any) {
isAreaManager.value = false isAreaManager.value = false;
formData.area_manager_name = data.name formData.area_manager_name = data.name;
formData.area_manager = data.id formData.area_manager = data.id;
} }
function openCompany() { function openCompany() {
isCompany.value = true isCompany.value = true;
} }
// //
@ -640,153 +681,172 @@ const setFormData = async (data: Record<any, any>) => {
for (const key in formData) { for (const key in formData) {
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {
//@ts-ignore //@ts-ignore
formData[key] = data[key] formData[key] = data[key];
} }
} }
} };
const getDetail = async (row: Record<string, any>) => { const getDetail = async (row: Record<string, any>) => {
const data = await apiCompanyDetail({ const data = await apiCompanyDetail({
id: row.id id: row.id,
}) });
setFormData(data) setFormData(data);
} };
//1 //1
const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccess: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.qualification.business_license = response.data.uri formData.qualification.business_license = response.data.uri;
} };
const handleAvatarSuccessB: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccessB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.qualification.business_licenseB = response.data.uri formData.qualification.business_licenseB = response.data.uri;
} };
//2 //2
const handleAvatarSuccess_two: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccess_two: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.qualification.bank_account = response.data.uri formData.qualification.bank_account = response.data.uri;
} };
const handleAvatarSuccess_twoB: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccess_twoB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.qualification.bank_accountB = response.data.uri formData.qualification.bank_accountB = response.data.uri;
} };
//3 //3
const handleAvatarSuccess_three: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccess_three: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.file_image = response.data.uri formData.file_image = response.data.uri;
formData.contract.file = response.data.uri formData.contract.file = response.data.uri;
fileList.value[0].url = response.data.uri fileList.value[0].url = response.data.uri;
fileList.value[0].name = '合同文件' fileList.value[0].name = "合同文件";
} };
// //
function other() { function other() {
formData.other_contacts.push({ formData.other_contacts.push({
name: '', name: "",
position: '', position: "",
phone: '', phone: "",
email: '' email: "",
}) });
} }
// //
function province_change(value: string) { function province_change(value: string) {
getCityList() getCityList();
} }
function city_change(value: string) { function city_change(value: string) {
getAreaList() getAreaList();
} }
function area_change(value: string) { function area_change(value: string) {
getStreetList() getStreetList();
} }
function street_change(value: string) { function street_change(value: string) {
formData.street = value formData.street = value;
} }
const getProvinceList = async () => { const getProvinceList = async () => {
const data = await apiProvinceList({}) const data = await apiProvinceList({});
datas['provinceOptions'] = data datas["provinceOptions"] = data;
} };
const getCityList = async () => { const getCityList = async () => {
const data = await apiCityList({ city: formData.province }) const data = await apiCityList({ city: formData.province });
datas['cityOptions'] = data datas["cityOptions"] = data;
} };
const getAreaList = async () => { const getAreaList = async () => {
const data = await apiAreaList({ area: formData.city }) const data = await apiAreaList({ area: formData.city });
datas['areaOptions'] = data datas["areaOptions"] = data;
} };
const getStreetList = async () => { const getStreetList = async () => {
const data = await apiStreetList({ street: formData.area }) const data = await apiStreetList({ street: formData.area });
datas['streetOptions'] = data datas["streetOptions"] = data;
} };
getProvinceList() getProvinceList();
const getcontract_type = async () => { const getcontract_type = async () => {
const data = await dictDataLists({ type_id: 7 }) const data = await dictDataLists({ type_id: 7 });
datas['contract_type'] = data['lists'] datas["contract_type"] = data["lists"];
} };
const getdictTypeLists = async () => { const getdictTypeLists = async () => {
const data = await dictDataLists({ type_id: 6 }) const data = await dictDataLists({ type_id: 6 });
datas['dictTypeLists'] = data['lists'] datas["dictTypeLists"] = data["lists"];
} };
const getDetails = async () => { const getDetails = async () => {
const data = await apiCompanyDetail({ const data = await apiCompanyDetail({
id: route.query.id id: route.query.id,
}) });
Object.keys(formData).forEach((key) => { Object.keys(formData).forEach((key) => {
const stringArr = ['province', 'city', 'area', 'street'] const stringArr = ["province", "city", "area", "street"];
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {
formData[key] = data[key] formData[key] = data[key];
} }
if (stringArr.includes(key)) formData[key] = formData[key].toString() if (stringArr.includes(key)) formData[key] = formData[key].toString();
}) });
formData['party_a_name'] = data.contract?.party_a_name formData["party_a_name"] = data.contract?.party_a_name;
formData['file_image'] = data.contract?.file formData["file_image"] = data.contract?.file;
if (data.contract?.file) { if (data.contract?.file) {
fileList.value[0].url = data.contract?.file fileList.value[0].url = data.contract?.file;
fileList.value[0].name = '合同文件' fileList.value[0].name = "合同文件";
} }
await getCityList() await getCityList();
await getAreaList() await getAreaList();
await getStreetList() await getStreetList();
} };
getdictTypeLists() getdictTypeLists();
getcontract_type() getcontract_type();
const create = async () => { const create = async () => {
await formRef.value?.validate() await formRef.value?.validate();
const data = { ...formData } const data = { ...formData };
if (route.query.id) { if (route.query.id) {
await apiCompanyEdit(data) await apiCompanyEdit(data);
} else { } else {
await apiCompanyAdd(data) await apiCompanyAdd(data);
} }
removeTab() removeTab();
router.back() router.back();
} };
route.query.id && getDetails() route.query.id && getDetails();
defineExpose({ defineExpose({
open, open,
setFormData, setFormData,
getDetail getDetail,
}) });
</script> </script>
<style> <style>
.tit {
font-size: 1.2rem;
translate: 1vw -1vw;
}
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
width: 10vw; width: 10vw;
height: 6.3vw; height: 6.3vw;

View File

@ -4,11 +4,12 @@
<el-page-header content="用户详情" @back="$router.back()" /> <el-page-header content="用户详情" @back="$router.back()" />
</el-card> </el-card>
<el-card class="mt-4 !border-none" shadow="never"> <el-card class="mt-4 !border-none" shadow="never">
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules"> <el-form ref="formRef" :model="formData" label-width="84px">
<div style="font-size: 1.2rem; margin: 10px 0">基本信息创建</div> <div style="font-size: 1.2rem; margin: 10px 0">
基本信息创建{{ mode }}
</div>
<div class="headimg"> <div class="headimg">
<el-upload <el-upload
:disabled="isCheck"
v-model="formData.avatar" v-model="formData.avatar"
class="avatar-uploader-head" class="avatar-uploader-head"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -27,7 +28,6 @@
<el-col :span="11"> <el-col :span="11">
<el-form-item label="姓名" prop="nickname"> <el-form-item label="姓名" prop="nickname">
<el-input <el-input
:disabled="isCheck"
v-model="formData.nickname" v-model="formData.nickname"
placeholder="请输入姓名" placeholder="请输入姓名"
clearable clearable
@ -40,7 +40,6 @@
<el-select <el-select
v-model="formData.sex" v-model="formData.sex"
placeholder="请选择性别" placeholder="请选择性别"
:disabled="isCheck"
:style="{ width: '100%' }" :style="{ width: '100%' }"
> >
<el-option label="男" value="1" /> <el-option label="男" value="1" />
@ -53,7 +52,6 @@
<el-col :span="11"> <el-col :span="11">
<el-form-item label="身份证号" prop="id_card"> <el-form-item label="身份证号" prop="id_card">
<el-input <el-input
:disabled="isCheck"
v-model="formData.id_card" v-model="formData.id_card"
placeholder="请输入身份证号" placeholder="请输入身份证号"
clearable clearable
@ -64,7 +62,6 @@
<el-col :span="13"> <el-col :span="13">
<el-form-item label="联系电话" prop="account"> <el-form-item label="联系电话" prop="account">
<el-input <el-input
:disabled="isCheck"
v-model="formData.account" v-model="formData.account"
placeholder="请输入联系电话" placeholder="请输入联系电话"
clearable clearable
@ -76,7 +73,6 @@
<el-row> <el-row>
<el-form-item label="省" prop="province" style="flex: 1"> <el-form-item label="省" prop="province" style="flex: 1">
<el-select <el-select
:disabled="isCheck"
v-model="formData.province" v-model="formData.province"
placeholder="请选择省" placeholder="请选择省"
clearable clearable
@ -93,7 +89,6 @@
</el-form-item> </el-form-item>
<el-form-item label="市" prop="city" style="flex: 1"> <el-form-item label="市" prop="city" style="flex: 1">
<el-select <el-select
:disabled="isCheck"
v-model="formData.city" v-model="formData.city"
placeholder="请选择市" placeholder="请选择市"
clearable clearable
@ -110,7 +105,6 @@
</el-form-item> </el-form-item>
<el-form-item label="区" prop="area" style="flex: 1"> <el-form-item label="区" prop="area" style="flex: 1">
<el-select <el-select
:disabled="isCheck"
v-model="formData.area" v-model="formData.area"
placeholder="请选择区" placeholder="请选择区"
clearable clearable
@ -128,7 +122,6 @@
<el-form-item label="镇" prop="street" style="flex: 1"> <el-form-item label="镇" prop="street" style="flex: 1">
<el-select <el-select
:disabled="isCheck"
v-model="formData.street" v-model="formData.street"
placeholder="请选择镇" placeholder="请选择镇"
clearable clearable
@ -145,7 +138,6 @@
</el-form-item> </el-form-item>
<el-form-item label="村社小队" prop="address" style="flex: 1.5"> <el-form-item label="村社小队" prop="address" style="flex: 1.5">
<el-input <el-input
:disabled="isCheck"
v-model="formData.address" v-model="formData.address"
placeholder="请输入村社小队" placeholder="请输入村社小队"
clearable clearable
@ -157,11 +149,10 @@
<el-col :span="24" style="margin-top: 1vh"> <el-col :span="24" style="margin-top: 1vh">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12" v-if="mode == 'initiate' || formData.party_b">
<el-form-item label="签约方" prop="field130"> <el-form-item label="签约方" prop="field130">
<el-input <el-input
:disabled="isCheck" v-model="formData.party_b_name"
v-model="formData.party_a_name"
placeholder="请选择签约方" placeholder="请选择签约方"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -177,7 +168,6 @@
<div> <div>
<el-form-item label="身份证" prop="id_card"> <el-form-item label="身份证" prop="id_card">
<el-upload <el-upload
:disabled="isCheck"
v-model="formData.qualification.id_card" v-model="formData.qualification.id_card"
class="avatar-uploader pl-3" class="avatar-uploader pl-3"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -195,7 +185,6 @@
</el-icon> </el-icon>
</el-upload> </el-upload>
<el-upload <el-upload
:disabled="isCheck"
v-model="formData.qualification.id_card_b" v-model="formData.qualification.id_card_b"
class="avatar-uploader pl-3" class="avatar-uploader pl-3"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -217,7 +206,6 @@
<div> <div>
<el-form-item label="行驶证" prop="car_card"> <el-form-item label="行驶证" prop="car_card">
<el-upload <el-upload
:disabled="isCheck"
v-model="formData.qualification.car_card" v-model="formData.qualification.car_card"
class="avatar-uploader pl-3" class="avatar-uploader pl-3"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -235,7 +223,6 @@
</el-icon> </el-icon>
</el-upload> </el-upload>
<el-upload <el-upload
:disabled="isCheck"
v-model="formData.qualification.car_card_b" v-model="formData.qualification.car_card_b"
class="avatar-uploader pl-3" class="avatar-uploader pl-3"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -258,7 +245,6 @@
<div> <div>
<el-form-item label="银行卡号" prop="bank_account"> <el-form-item label="银行卡号" prop="bank_account">
<el-upload <el-upload
:disabled="isCheck"
v-model="formData.qualification.bank_account" v-model="formData.qualification.bank_account"
class="avatar-uploader pl-3" class="avatar-uploader pl-3"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -277,7 +263,6 @@
</el-icon> </el-icon>
</el-upload> </el-upload>
<el-upload <el-upload
:disabled="isCheck"
v-model="formData.qualification.bank_account_b" v-model="formData.qualification.bank_account_b"
class="avatar-uploader pl-3" class="avatar-uploader pl-3"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -304,7 +289,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="签约姓名" prop="name"> <el-form-item label="签约姓名" prop="name">
<el-input <el-input
v-model="formData.name" v-model="formData.nickname"
placeholder="请输入签约姓名" placeholder="请输入签约姓名"
:disabled="true" :disabled="true"
clearable clearable
@ -319,7 +304,7 @@
:disabled="true" :disabled="true"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
:value="formData.sex == 1 ? '男' : '女'" :value="formData.sex == '1' ? '男' : '女'"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -369,7 +354,6 @@
<el-form-item label="合同类型" prop="contract_type"> <el-form-item label="合同类型" prop="contract_type">
<el-col :span="24"> <el-col :span="24">
<el-select <el-select
:disabled="isCheck"
v-model="formData.contract_type" v-model="formData.contract_type"
placeholder="请选择合同类型" placeholder="请选择合同类型"
clearable clearable
@ -387,7 +371,8 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="24" v-if="!isCheck && mode != 'view'"> </template>
<el-col :span="24" v-if="mode == 'uplode'">
<el-form-item label="合同上传" prop="field127"> <el-form-item label="合同上传" prop="field127">
<el-upload <el-upload
:headers="{ Token: userStore.token }" :headers="{ Token: userStore.token }"
@ -402,26 +387,31 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> <!-- <el-col :span="24">
<el-col :span="24" v-if="mode == 'view'">
<el-form-item label="合同地址"> <el-form-item label="合同地址">
<el-link type="success" :href="formData.contract.url" target="_blank" <el-link
type="success"
:href="formData.contract.url"
target="_blank"
>在线查看</el-link >在线查看</el-link
> >
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="24" class="pt-6"> <el-col :span="24" class="pt-6">
<el-form-item label prop="field139"> <el-form-item label prop="field139">
<el-button v-if="isEdit" type="primary" size="medium" @click="create" <!-- <el-button
>修改</el-button
>
<el-button
v-else
type="primary" type="primary"
:disabled="isDisabled" :disabled="isDisabled"
size="medium" size="medium"
@click="create" @click="create"
>创建</el-button >创建</el-button
> -->
<el-button
type="primary"
v-if="mode == 'initiate'"
@click="initiateContactFn"
>发起合同</el-button
> >
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -440,57 +430,75 @@
</template> </template>
<script lang="ts" setup name="consumerDetail"> <script lang="ts" setup name="consumerDetail">
import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus' import type {
import { adjustMoney, getUserDetail, userEdit } from '@/api/consumer' FormInstance,
import { apiCityList, apiAreaList, apiStreetList, apiProvinceList } from '@/api/common' UploadProps,
import { dictDataLists } from '@/api/setting/dict' ElMessage,
import DialogIndex from '@/components/dialog_index.vue' UploadUserFile,
import { isEmpty } from '@/utils/util' } from "element-plus";
import AccountAdjust from '../components/account-adjust.vue' import {
import useMultipleTabs from '@/hooks/useMultipleTabs' adjustMoney,
import useUserStore from '@/stores/modules/user' getUserDetail,
const { removeTab } = useMultipleTabs() userEdit,
const router = useRouter() creatContact,
initiateContact,
upContact,
} from "@/api/consumer";
import {
apiCityList,
apiAreaList,
apiStreetList,
apiProvinceList,
} from "@/api/common";
import { dictDataLists } from "@/api/setting/dict";
import DialogIndex from "@/components/dialog_index.vue";
import { isEmpty } from "@/utils/util";
import AccountAdjust from "../components/account-adjust.vue";
import useMultipleTabs from "@/hooks/useMultipleTabs";
import useUserStore from "@/stores/modules/user";
import feedback from "@/utils/feedback";
const { removeTab } = useMultipleTabs();
const router = useRouter();
const route = useRoute() const route = useRoute();
const formData = reactive({ const formData = reactive({
id: '', id: "",
sex: '', sex: "",
id_card: '', id_card: "",
nickname: '', nickname: "",
province: '', province: "",
city: '', city: "",
area: '', area: "",
street: '', street: "",
address: '', address: "",
account: '', account: "",
is_contract: 0, is_contract: 0,
// //
party_a_name: '', party_b_name: "",
party_a: '', party_b: "",
qualification: { qualification: {
id_card: '', id_card: "",
id_card_b: '', id_card_b: "",
car_card: '', car_card: "",
car_card_b: '', car_card_b: "",
bank_account: '', bank_account: "",
bank_account_b: '' bank_account_b: "",
}, },
// //
contract_type: '', contract_type: "",
file: '', file: "",
avatar: '', avatar: "",
multipoint_login: 1, multipoint_login: 1,
contract: { contract: {
url: '' url: "",
} },
}) });
const disabledPartyA = ref(false) const disabledPartyA = ref(false);
const adjustState = reactive({ const adjustState = reactive({
show: false, show: false,
value: '' value: "",
}) });
// //
const datas: any = reactive({ const datas: any = reactive({
provinceOptions: [], provinceOptions: [],
@ -499,179 +507,221 @@ const datas: any = reactive({
streetOptions: [], streetOptions: [],
dictTypeLists: [], dictTypeLists: [],
contract_type: [], contract_type: [],
contract: [] contract: [],
}) });
const formRef = shallowRef<FormInstance>() const formRef = shallowRef<FormInstance>();
const isEdit = ref(false) const isEdit = ref(false);
const isCompany = ref(false) const isCompany = ref(false);
const userStore = useUserStore() const userStore = useUserStore();
function customEvent(data: any) { function customEvent(data: any) {
isCompany.value = false isCompany.value = false;
formData.party_a = data.id formData.party_b = data.id;
formData.party_a_name = data.company_name formData.party_b_name = data.company_name;
disabledPartyA.value = true disabledPartyA.value = true;
} }
function clearPartyA() { function clearPartyA() {
formData.party_a = '' formData.party_b = "";
formData.party_a_name = '' formData.party_b_name = "";
} }
const getcontract_type = async () => { const getcontract_type = async () => {
const data = await dictDataLists({ type_id: 7 }) const data = await dictDataLists({ type_id: 7 });
datas['contract_type'] = data['lists'] datas["contract_type"] = data["lists"];
} };
getcontract_type() const mode = ref(null);
getcontract_type();
const getDetails = async () => { const getDetails = async () => {
const data = await getUserDetail({ const data = await getUserDetail({
id: route.query.id id: route.query.id,
}) });
Object.keys(formData).forEach((key) => { Object.keys(formData).forEach((key) => {
//@ts-ignore //@ts-ignore
formData[key] = data[key] formData[key] = data[key];
}) });
formData.contract_type = data.contract?.contract_type mode.value = route.query.mode;
formData.party_a_name = data.contract?.party_a_name
formData.party_a = data.contract?.party_a formData.contract_type = data.contract?.contract_type;
formData.file = data.contract?.file formData.party_b_name = data.contract?.party_b_name;
fileList.value[0] = { formData.party_b = data.contract?.party_b;
formData.file = data.contract?.file;
data.contract
? (fileList.value[0] = {
url: data.contract?.file, url: data.contract?.file,
name: data.contract ?? '合同文件' name: data.contract ?? "合同文件",
} })
await getCityList() : "";
await getAreaList() await getCityList();
await getStreetList() await getAreaList();
} await getStreetList();
};
const handleEdit = async (value: string, field: string) => { const handleEdit = async (value: string, field: string) => {
if (isEmpty(value)) return if (isEmpty(value)) return;
await userEdit({ await userEdit({
id: route.query.id, id: route.query.id,
field, field,
value value,
}) });
getDetails() getDetails();
} };
const fileList = ref<UploadUserFile[]>([]) const fileList = ref<UploadUserFile[]>([]);
// url // url
const handleAvatarSuccessIdA: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccessIdA: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.qualification.id_card = response.data.uri formData.qualification.id_card = response.data.uri;
} };
const handleAvatarSuccessAvatar: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccessAvatar: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.avatar = response.data.uri formData.avatar = response.data.uri;
} };
const handleAvatarSuccessIdB: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccessIdB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.qualification.id_card_b = response.data.uri formData.qualification.id_card_b = response.data.uri;
} };
const handleAvatarSuccessCarA: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccessCarA: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.qualification.car_card = response.data.uri formData.qualification.car_card = response.data.uri;
} };
const handleAvatarSuccessCarB: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccessCarB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.qualification.car_card_b = response.data.uri formData.qualification.car_card_b = response.data.uri;
} };
const beforeAvatarUpload_two: UploadProps['beforeUpload'] = (rawFile) => { const beforeAvatarUpload_two: UploadProps["beforeUpload"] = (rawFile) => {
return true return true;
} };
const handleAvatarSuccessBankA: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccessBankA: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.qualification.bank_account = response.data.uri formData.qualification.bank_account = response.data.uri;
} };
const handleAvatarSuccessBankB: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccessBankB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.qualification.bank_account_b = response.data.uri formData.qualification.bank_account_b = response.data.uri;
} };
const handleAvatarSuccess_four: UploadProps['onSuccess'] = (response, uploadFile) => { const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) { if (response.code == 0) {
ElMessage.error(response.msg) ElMessage.error(response.msg);
return return;
} }
formData.file = response.data.uri formData.file = response.data.uri;
fileList.value[0].url = response.data.uri;
fileList.value[0].url = response.data.uri fileList.value[0].name = "合同文件";
fileList.value[0].name = '合同文件' console.log(formData.file.substring(8));
} upContact({ file: formData.file.substring(8), id: route.query.id }).then(
const beforeAvatarUpload_three: UploadProps['beforeUpload'] = (rawFile) => { (res) => [console.log(res)]
return true );
} };
const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => {
return true;
};
// //
function province_change(value: string) { function province_change(value: string) {
getCityList() getCityList();
} }
function city_change(value: string) { function city_change(value: string) {
getAreaList() getAreaList();
} }
function area_change(value: string) { function area_change(value: string) {
getStreetList() getStreetList();
} }
function street_change(value: string) { function street_change(value: string) {
formData.street = value formData.street = value;
} }
const getProvinceList = async () => { const getProvinceList = async () => {
const data = await apiProvinceList({}) const data = await apiProvinceList({});
datas['provinceOptions'] = data datas["provinceOptions"] = data;
} };
const getCityList = async () => { const getCityList = async () => {
const data = await apiCityList({ city: formData.province }) const data = await apiCityList({ city: formData.province });
datas['cityOptions'] = data datas["cityOptions"] = data;
} };
const getAreaList = async () => { const getAreaList = async () => {
const data = await apiAreaList({ area: formData.city }) const data = await apiAreaList({ area: formData.city });
datas['areaOptions'] = data datas["areaOptions"] = data;
} };
const getStreetList = async () => { const getStreetList = async () => {
const data = await apiStreetList({ street: formData.area }) const data = await apiStreetList({ street: formData.area });
datas['streetOptions'] = data datas["streetOptions"] = data;
} };
const handleAdjust = (value: string) => { const handleAdjust = (value: string) => {
adjustState.show = true adjustState.show = true;
adjustState.value = value adjustState.value = value;
} };
const handleConfirmAdjust = async (value: any) => { const handleConfirmAdjust = async (value: any) => {
await adjustMoney({ user_id: route.query.id, ...value }) await adjustMoney({ user_id: route.query.id, ...value });
adjustState.show = false adjustState.show = false;
getDetails() getDetails();
} };
//
const initiateContactFn = () => {
const { party_b, 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 () => { const create = async () => {
await formRef.value?.validate() await formRef.value?.validate();
const data = { ...formData } const data = { ...formData };
// mode.value = route.query.mode;
// if (route.query.id) { // if (route.query.id) {
// await apiCompanyEdit(data) // await apiCompanyEdit(data)
// } else { // } else {
// await apiCompanyAdd(data) // await apiCompanyAdd(data)
// } // }
removeTab() removeTab();
router.back() router.back();
} };
getDetails() getDetails();
getProvinceList() getProvinceList();
</script> </script>
<style lang="scss"> <style lang="scss">

View File

@ -1,7 +1,12 @@
<template> <template>
<div> <div>
<el-card class="!border-none" shadow="never"> <el-card class="!border-none" shadow="never">
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true"> <el-form
ref="formRef"
class="mb-[-16px]"
:model="queryParams"
:inline="true"
>
<el-form-item label="用户信息"> <el-form-item label="用户信息">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
@ -41,38 +46,102 @@
align="center" align="center"
> >
<template #default="{ row }"> <template #default="{ row }">
{{ row.company?.company_name || '/' }} {{ row.company?.company_name || "/" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所在乡镇" prop="street_name" min-width="120" /> <el-table-column label="所在乡镇" prop="street_name" min-width="120" />
<el-table-column label="授权身份" prop="role_name" min-width="120"> <el-table-column label="授权身份" prop="role_name" min-width="120">
<template #default="{ row }"> <template #default="{ row }">
<span v-if="row.admin_id == row.company?.admin_id" style="color: #67c23a" <span
v-if="row.admin_id == row.company?.admin_id"
style="color: #67c23a"
>公司后台管理人员</span >公司后台管理人员</span
> >
<span v-else style="color: #fe0000"></span> <span v-else style="color: #fe0000"></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否签约" prop="is_contract" align="center" min-width="120"> <el-table-column
label="是否签约"
prop="is_contract"
align="center"
min-width="120"
>
<template #default="{ row }"> <template #default="{ row }">
<span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span> <span v-if="row.is_contract == 1" style="color: #67c23a"
>已签约</span
>
<span v-else style="color: #fe0000">未签约</span> <span v-else style="color: #fe0000">未签约</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="400" align="center" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button v-perms="['user.user/detail']" type="primary" link> <el-button v-perms="['user.user/detail']" type="primary" link>
<router-link <router-link
:to="{ :to="{
path: getRoutePath('user.user/detail'), path: getRoutePath('user.user/detail'),
query: { query: {
id: row.id id: row.id,
} },
}" }"
> >
详情 详情
</router-link> </router-link>
</el-button> </el-button>
<template v-if="row.company_id != 0 && row.is_contract == 0">
<el-button
v-perms="['auth.admin/Draftingcontracts']"
type="primary"
link
>
<router-link
:to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
mode: 'initiate',
},
}"
>
发起合同
</router-link>
</el-button>
<el-button
v-perms="['auth.admin/Draftingcontracts']"
type="primary"
link
>
<router-link
:to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
mode: 'uplode',
},
}"
>
上传合同
</router-link>
</el-button>
<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>
<!-- <el-button <!-- <el-button
v-if="row.root != 1" v-if="row.root != 1"
v-perms="['auth.admin/delete']" v-perms="['auth.admin/delete']"
@ -112,6 +181,29 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<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 class="flex justify-end mt-4"> <div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
@ -119,18 +211,43 @@
</div> </div>
</template> </template>
<script lang="ts" setup name="consumerLists"> <script lang="ts" setup name="consumerLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from "@/hooks/usePaging";
import { getRoutePath } from '@/router' import { getRoutePath } from "@/router";
import { getUserList } from '@/api/consumer' import {
import { ClientMap } from '@/enums/appEnums' getUserList,
import feedback from '@/utils/feedback' creatContact,
initiateContact,
upContact,
} from "@/api/consumer";
import { ClientMap } from "@/enums/appEnums";
import feedback from "@/utils/feedback";
const queryParams = reactive({ const queryParams = reactive({
keyword: '', keyword: "",
channel: '', channel: "",
create_time_start: '', create_time_start: "",
create_time_end: '' create_time_end: "",
}) });
const contractId = ref(0);
const showPop = ref(false);
const showConctactPop = ref(false);
const offPop = () => {
showPop.value = false;
showConctactPop.value = false;
};
const creContct = () => {
// feedback.msgSuccess("");
creatContact({ id: contractId.value }).then(() => {
feedback.msgSuccess("发送成功");
});
offPop();
};
const sendMsg = () => {
// sendMsgApi({ id: contractId.value }).then((res) => {
// feedback.msgSuccess("");
// });
offPop();
};
// const handleDelete = async (id: number) => { // const handleDelete = async (id: number) => {
// await feedback.confirm('') // await feedback.confirm('')
// await adminDelete({ id }) // await adminDelete({ id })
@ -143,11 +260,38 @@ const queryParams = reactive({
// } // }
const { pager, getLists, resetPage, resetParams } = usePaging({ const { pager, getLists, resetPage, resetParams } = usePaging({
fetchFun: getUserList, fetchFun: getUserList,
params: queryParams params: queryParams,
}) });
onActivated(() => { onActivated(() => {
getLists() getLists();
}) });
getLists() getLists();
</script> </script>
<style>
h1 {
text-align: center;
font-weight: bold;
font-size: 30px;
color: red;
margin-bottom: 10px;
}
.content {
font-size: 20px;
}
.info {
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;
}
</style>

View File

@ -205,9 +205,11 @@
</div> </div>
<el-form-item label-width="150px" label="是否有婴幼儿"> <el-form-item label-width="150px" label="是否有婴幼儿">
<el-switch v-model="formData.child"></el-switch> <el-radio-group v-model="formData.child" size="medium">
<el-radio :label="1">是否有婴幼儿</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
<p style="padding: 0 0 20px 10px"> <!-- <p style="padding: 0 0 20px 10px">
<el-button type="primary" size="medium" @click="addFamilyMember"> <el-button type="primary" size="medium" @click="addFamilyMember">
添加家庭成员 添加家庭成员
</el-button> </el-button>
@ -220,7 +222,7 @@
> >
添加婴幼儿 添加婴幼儿
</el-button> </el-button>
</p> </p> -->
</el-col> </el-col>
<div v-for="(item, index) in formData.child_arr" v-if="formData.child"> <div v-for="(item, index) in formData.child_arr" v-if="formData.child">
<el-col> <el-col>
@ -333,21 +335,19 @@
<el-col> <el-col>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item <el-form-item prop="field162" label-width="200px">
label="汽车是否能到家" <el-radio-group v-model="formData.highway" size="medium">
prop="field162" <el-radio :label="1">汽车是否能到家</el-radio>
label-width="200px" </el-radio-group>
> <!-- <el-switch v-model="formData.highway"></el-switch> -->
<el-switch v-model="formData.highway"></el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item <el-form-item prop="smart_phone" label-width="200px">
label="是否使用智能手机" <!-- <el-switch v-model="formData.smart_phone"></el-switch> -->
prop="smart_phone" <el-radio-group v-model="formData.smart_phone" size="medium">
label-width="200px" <el-radio :label="1">是否使用智能手机</el-radio>
> </el-radio-group>
<el-switch v-model="formData.smart_phone"></el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="formData.smart_phone"> <el-col :span="8" v-if="formData.smart_phone">
@ -366,46 +366,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<p class="tit">养殖信息</p> <!--
<el-col>
<el-row>
<el-col :span="8">
<el-form-item label="耕地总面积" prop="field166">
<el-input
v-model="formData.cultivated_area"
placeholder="请输入耕地总面积"
clearable
:style="{ width: '100%' }"
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="土地规划" prop="field167">
<el-checkbox-group v-model="formData.planning" size="medium">
<el-checkbox
v-for="(item, index) in datas.plantList"
:key="index"
:label="item.value"
>{{ item.label }}</el-checkbox
>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="有无种培训/注册成立公司经历"
prop="field168"
label-width="230px"
>
<el-switch v-model="formData.breeding_training"></el-switch>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="24" v-if="formData.breeding_training"> <el-col :span="24" v-if="formData.breeding_training">
<el-form-item label="备注" prop="field169"> <el-form-item label="备注" prop="field169">
<el-input <el-input
@ -416,16 +377,16 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<p class="tit">土地具体信息</p> <p class="tit">土地具体信息</p>
<div v-for="(item, index) in formData.farmland"> <div v-for="(item, index) in formData.datas">
<el-col> <el-col>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="种养殖类别" prop="field171"> <el-form-item label="种养殖类别" prop="field171">
<el-input <el-input
v-model="item.breeding_time" v-model="item.datas.breeding_type"
placeholder="如 土豆" placeholder="如 土豆"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -436,7 +397,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="种养殖面积" prop="field172"> <el-form-item label="种养殖面积" prop="field172">
<el-input <el-input
v-model="item.area" v-model="item.datas.area"
placeholder="请输入面积" placeholder="请输入面积"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -447,7 +408,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="种植开始时" prop="field173" class="dates"> <el-form-item label="种植开始时" prop="field173" class="dates">
<el-date-picker <el-date-picker
v-model="item.breeding_time" v-model="item.datas.breeding_time"
:style="{ width: '100%' }" :style="{ width: '100%' }"
placeholder="请选择种植开始时" placeholder="请选择种植开始时"
clearable clearable
@ -457,7 +418,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="上市时间" prop="field174" class="dates"> <el-form-item label="上市时间" prop="field174" class="dates">
<el-date-picker <el-date-picker
v-model="item.mature_time" v-model="item.datas.mature_time"
:style="{ width: '100%' }" :style="{ width: '100%' }"
placeholder="请选择上市时间" placeholder="请选择上市时间"
clearable clearable
@ -466,10 +427,10 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row <el-row
><el-col :span="8"> ><el-col :span="6">
<el-form-item label="产量" prop="field175"> <el-form-item label="产量" prop="field175">
<el-input <el-input
v-model="item.yield" v-model="item.datas.yield"
placeholder="请输入产量" placeholder="请输入产量"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -477,50 +438,111 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item <el-form-item
label="农资农具使用情况" label="农资农具使用情况"
label-width="150px" label-width="150px"
prop="field176" prop="field176"
> >
<el-input <el-input
v-model="item.farm_tools" v-model="item.datas.farm_tools"
placeholder="请输入农资农具使用情况" placeholder="请输入农资农具使用情况"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="预售卖价格" prop="field177"> <el-form-item label="预售卖价格" prop="field177">
<el-input <el-input
v-model="item.pre_price" v-model="item.datas.pre_price"
placeholder="请输入预售卖价格" placeholder="请输入预售卖价格"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
> >
</el-input> </el-input>
</el-form-item> </el-col </el-form-item>
></el-row>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="耕地总面积" prop="field166">
<el-input
v-model="item.datas.cultivated_area"
placeholder="请输入耕地总面积"
clearable
:style="{ width: '100%' }"
>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-row>
<el-col :span="10">
<el-form-item label="土地规划" prop="field167">
<el-radio-group v-model="item.datas.planning" size="medium">
<el-radio
v-for="(item, index) in datas.plantList"
:key="index"
:label="item.value"
>{{ item.label }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-radio-group
v-model="item.datas.breeding_training"
size="medium"
>
<el-radio label="1">有无种植培训</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-radio-group
v-model="item.datas.planting_company"
size="medium"
>
<el-radio label="1">注册成立公司经历</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="field138">
<el-input
v-model="item.datas.notes"
placeholder="请输入备注"
clearable
:style="{ width: '100%' }"
>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-col> <el-col>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="销售方式" prop="field180"> <el-form-item label="销售方式" prop="field180">
<el-checkbox-group v-model="item.method_sales" size="medium"> <el-radio-group v-model="item.datas.method_sales" size="medium">
<el-checkbox <el-radio
v-for="(items, indexs) in datas.sellType" v-for="(items, indexs) in datas.sellType"
:key="indexs" :key="indexs"
:label="items.value" :label="items.value"
>{{ items.label }}</el-checkbox >{{ items.label }}</el-radio
> >
</el-checkbox-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="100px" prop="field179"> <el-form-item label-width="100px" prop="field179">
<el-radio-group v-model="item.ecological_farming" size="medium"> <el-radio-group
v-model="item.datas.ecological_farming"
size="medium"
>
<el-radio label="1">是否生态种植</el-radio> <el-radio label="1">是否生态种植</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -528,7 +550,7 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="100px" prop="field182"> <el-form-item label-width="100px" prop="field182">
<el-radio-group v-model="item.promote" size="medium"> <el-radio-group v-model="item.datas.promote" size="medium">
<el-radio label="1">有无宣传推广</el-radio> <el-radio label="1">有无宣传推广</el-radio>
> >
@ -538,32 +560,30 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="100px" prop="field181"> <el-form-item label-width="100px" prop="field181">
<el-radio-group v-model="item.processing_storage" size="medium"> <el-radio-group
v-model="item.datas.processing_storage"
size="medium"
>
<el-radio label="1">有无加工仓储</el-radio> <el-radio label="1">有无加工仓储</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="100px" prop="field183"> <el-form-item label-width="100px" prop="field183">
<el-radio-group v-model="item.transportation" size="medium"> <el-radio-group
v-model="item.datas.transportation"
size="medium"
>
<el-radio label="1">有无运输</el-radio> <el-radio label="1">有无运输</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-col>
</div>
<p style="padding: 0 0 20px 10px">
<el-button type="primary" size="medium" @click="addLand">
添加土地信息
</el-button>
</p>
<el-col>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="种植诉求" prop="field189"> <el-form-item label="种植诉求" prop="field189">
<el-input <el-input
v-model="formData.demand" v-model="item.datas.demand"
placeholder="请输入种植诉求" placeholder="请输入种植诉求"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -574,7 +594,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="政策补助" prop="field190"> <el-form-item label="政策补助" prop="field190">
<el-input <el-input
v-model="formData.policy_subsidies" v-model="item.datas.policy_subsidies"
placeholder="请输入政策补助" placeholder="请输入政策补助"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -599,6 +619,17 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<div style="box-sizing: border-box; padding: 0 2vw">
<p
style="
border: 1px solid #bfbfbf;
margin-bottom: 6px;
text-align: center;
"
></p>
</div>
</div>
<p class="tit"> <p class="tit">
更新时间 <span style="font-size: 14px">2022年12月30日</span> 更新时间 <span style="font-size: 14px">2022年12月30日</span>
</p> </p>
@ -1823,6 +1854,8 @@ import {
apiStreetList, apiStreetList,
apiProvinceList, apiProvinceList,
} from "@/api/common"; } from "@/api/common";
import { fileManagelist, fileManageDetil } from "@/api/informationg";
const formData = reactive({ const formData = reactive({
name: undefined, name: undefined,
phone: "", phone: "",
@ -1854,11 +1887,40 @@ const formData = reactive({
highway: undefined, highway: undefined,
smart_phone: undefined, smart_phone: undefined,
wechat: "", wechat: "",
//
datas: [
{
datas: {
cultivated_area: "20", //
planning: 66, //
breeding_training: 1, //
planting_company: 0, //
notes: "试试备注", //
breeding_type: 22, //
area: 20, //
breeding_time: "2022-07-22", //
mature_time: "2022-07-22", //
yield: 600, //
estimated_income: 1500, //
farm_tools: "收割机一台,打米机一台", //使
ecological_farming: 1, //
modernization: 30, //
pre_price: "30.00", //
method_sales: 1, //
processing_storage: 0, //
promote: 0, //广
transportation: 0, //
expand_business_needs: 0, //
demand: "没有述求", //
policy_subsidies: "无补助", //
},
},
],
cultivated_area: "", cultivated_area: "",
planning: "", planning: "",
planting_company: "", planting_company: "",
notes: "", notes: "",
breeding_training: undefined,
farmland: [ farmland: [
{ {
breeding_type: "", breeding_type: "",
@ -1879,6 +1941,7 @@ const formData = reactive({
], ],
expand_business_needs: "", expand_business_needs: "",
demand: "", demand: "",
// sadsadas // sadsadas
// //
housingDecoration: [ housingDecoration: [
@ -2031,19 +2094,19 @@ const datas = reactive({
plantList: [ plantList: [
{ {
label: "自己种", label: "自己种",
value: 1, value: "1",
}, },
{ {
label: "出租", label: "出租",
value: 2, value: "2",
}, },
{ {
label: "代种养", label: "代种养",
value: "", value: "3",
}, },
{ {
label: "租更多地扩大种植", label: "租更多地扩大种植",
value: "", value: "4",
}, },
], ],
// //
@ -2124,11 +2187,11 @@ const datas = reactive({
sellType: [ sellType: [
{ {
label: "自销", label: "自销",
value: 1, value: "1",
}, },
{ {
label: "定点销售", label: "定点销售",
value: 2, value: "2",
}, },
], ],
// //
@ -2295,23 +2358,7 @@ const addKids = () => {
feeding: "", feeding: "",
}); });
}; };
const addLand = () => {
formData.farmland.push({
breeding_type: "",
cultivated_area: "",
breeding_time: "",
mature_time: "",
yield: "",
ecological_farming: "",
farm_tools: "",
pre_price: "",
method_sales: [],
processing_storage: "",
promote: "",
transportation: "",
notes: "",
});
};
// const addDecoration = () => { // const addDecoration = () => {
// formData.housingDecoration.push({ // formData.housingDecoration.push({
// field102: [], // field102: [],
@ -2387,6 +2434,20 @@ const getStreetList = async () => {
const data = await apiStreetList({ street: formData.area }); const data = await apiStreetList({ street: formData.area });
datas["streetOptions"] = data; datas["streetOptions"] = data;
}; };
fileManageDetil({ id: 25 }).then(async (res) => {
// console.log(res);
for (const key in formData) {
if (res[key] != null && res[key] != undefined) {
//@ts-ignore
formData[key] = res[key];
}
}
console.log(formData.datas);
// await getCityList();
// await getAreaList();
// await getStreetList();
});
getProvinceList(); getProvinceList();
</script> </script>
<style lang="scss"> <style lang="scss">

View File

@ -55,6 +55,8 @@ import Popup from "@/components/popup/index.vue";
import { apiCateCreat } from "@/api/examined"; import { apiCateCreat } from "@/api/examined";
import { timeFormat } from "@/utils/util"; import { timeFormat } from "@/utils/util";
import type { PropType } from "vue"; import type { PropType } from "vue";
import { fileManagelist, fileManageDetil } from "@/api/informationg";
defineProps({ defineProps({
dictData: { dictData: {
type: Object as PropType<Record<string, any[]>>, type: Object as PropType<Record<string, any[]>>,
@ -118,6 +120,7 @@ const handleClose = () => {
emit("close"); emit("close");
}; };
defineExpose({ defineExpose({
open, open,
setFormData, setFormData,

View File

@ -21,26 +21,25 @@
</el-button> </el-button>
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column <el-table-column label="用户编号" prop="id" show-overflow-tooltip />
label="用户编号" <el-table-column label="用户名" prop="name" show-overflow-tooltip />
prop="title"
show-overflow-tooltip
/>
<el-table-column
label="用户名"
prop="department"
show-overflow-tooltip
/>
<el-table-column <el-table-column
label="联系方式" label="联系方式"
prop="type_name" prop="phone"
show-overflow-tooltip
/>
<el-table-column
label="地址"
prop="type_name"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column label="地址" show-overflow-tooltip>
<template #default="{ row }">
<!-- <dict-value :options="dictData.show_status" :value="row.status" /> -->
{{
row.area_name +
row.street_name +
row.village_name +
row.brigade_name
}}
</template>
</el-table-column>
<el-table-column <el-table-column
label="所属生产队队长" label="所属生产队队长"
prop="type_name" prop="type_name"
@ -68,21 +67,17 @@
fixed="right" fixed="right"
> >
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button v-perms="['flow/edit']" type="primary" link>
v-perms="['flow/edit']" <router-link
type="primary" :to="{
link path: '/user/a',
@click="handleEdit(row)" query: {
id: row.id,
},
}"
> >
编辑 详情
</el-button> </router-link>
<el-button
v-perms="['flow/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -106,6 +101,9 @@
import { usePaging } from "@/hooks/usePaging"; import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions"; 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 { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback"; import feedback from "@/utils/feedback";
// import { getRoutePath } from "router"; // import { getRoutePath } from "router";
@ -138,7 +136,7 @@ const { dictData } = useDictData("");
// //
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiCateLists, fetchFun: fileManagelist,
params: queryParams, params: queryParams,
}); });
@ -158,11 +156,11 @@ const handleEdit = async (data: any) => {
}; };
// //
const handleDelete = async (id: number | any[]) => { // const handleDelete = async (id: number | any[]) => {
await feedback.confirm("确定要删除?"); // await feedback.confirm("");
await apiFlowTypeDelete({ id }); // await apiFlowTypeDelete({ id });
getLists(); // getLists();
}; // };
// //
const changeStatus = (row: any) => { const changeStatus = (row: any) => {
apiCateStatus({ id: row.id, status: row.status }); apiCateStatus({ id: row.id, status: row.status });

View File

@ -2,7 +2,11 @@
<div class="menu-lists"> <div class="menu-lists">
<el-card class="!border-none" shadow="never"> <el-card class="!border-none" shadow="never">
<div> <div>
<el-button v-perms="['auth.menu/add']" type="primary" @click="handleAdd()"> <el-button
v-perms="['auth.menu/add']"
type="primary"
@click="handleAdd()"
>
<template #icon> <template #icon>
<icon name="el-icon-Plus" /> <icon name="el-icon-Plus" />
</template> </template>
@ -88,64 +92,72 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" /> <edit-popup
v-if="showEdit"
ref="editRef"
@success="getLists"
@close="showEdit = false"
/>
</div> </div>
</template> </template>
<script lang="ts" setup name="menu"> <script lang="ts" setup name="menu">
import { menuDelete, menuLists } from '@/api/perms/menu' import { menuDelete, menuLists } from "@/api/perms/menu";
import type { ElTable } from 'element-plus' import type { ElTable } from "element-plus";
import { usePaging } from '@/hooks/usePaging' import { usePaging } from "@/hooks/usePaging";
import { MenuEnum } from '@/enums/appEnums' import { MenuEnum } from "@/enums/appEnums";
import EditPopup from './edit.vue' import EditPopup from "./edit.vue";
import feedback from '@/utils/feedback' import feedback from "@/utils/feedback";
const tableRef = shallowRef<InstanceType<typeof ElTable>>() const tableRef = shallowRef<InstanceType<typeof ElTable>>();
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const editRef = shallowRef<InstanceType<typeof EditPopup>>();
let isExpand = false let isExpand = false;
const showEdit = ref(false) const showEdit = ref(false);
const { pager, getLists } = usePaging({ const { pager, getLists } = usePaging({
fetchFun: menuLists, fetchFun: menuLists,
params: { params: {
page_type: 0 page_type: 0,
} },
}) });
const handleAdd = async (id?: number) => { const handleAdd = async (id?: number) => {
showEdit.value = true showEdit.value = true;
await nextTick() await nextTick();
if (id) { if (id) {
editRef.value?.setFormData({ editRef.value?.setFormData({
pid: id pid: id,
}) });
} }
editRef.value?.open('add') editRef.value?.open("add");
} };
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
showEdit.value = true showEdit.value = true;
await nextTick() await nextTick();
editRef.value?.open('edit') editRef.value?.open("edit");
editRef.value?.getDetail(data) editRef.value?.getDetail(data);
} };
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
await feedback.confirm('确定要删除?') await feedback.confirm("确定要删除?");
await menuDelete({ id }) await menuDelete({ id });
getLists() getLists();
} };
const handleExpand = () => { const handleExpand = () => {
isExpand = !isExpand isExpand = !isExpand;
toggleExpand(pager.lists, isExpand) toggleExpand(pager.lists, isExpand);
} };
const toggleExpand = (children: any[], unfold = true) => { const toggleExpand = (children: any[], unfold = true) => {
for (const key in children) { for (const key in children) {
tableRef.value?.toggleRowExpansion(children[key], unfold) tableRef.value?.toggleRowExpansion(children[key], unfold);
if (children[key].children) { if (children[key].children) {
toggleExpand(children[key].children!, unfold) toggleExpand(children[key].children!, unfold);
} }
} }
} };
getLists() getLists().then((res) => {
console.log(res);
});
console.log(556666666666665);
</script> </script>

View File

@ -8,14 +8,20 @@
新增 新增
</el-button> </el-button>
<div class="mt-4"> <div class="mt-4">
<el-calendar v-model="dateValue" > <el-calendar v-model="dateValue">
<template #dateCell="{ data }"> <template #dateCell="{ data }">
<div style="width: 100%;height: 100%;" @click="test(data)"> <div style="width: 100%; height: 100%" @click="test(data)">
<p :class="data.isSelected ? 'is-selected' : ''"> <p :class="data.isSelected ? 'is-selected' : ''">
{{ data.day.split('-').slice(1).join('-') }} {{ data.day.split("-").slice(1).join("-") }}
<!-- {{ data.isSelected ? '✔️' : '' }} --> <!-- {{ data.isSelected ? '✔️' : '' }} -->
</p> </p>
<div class="task" :class="{'fou': item.priority==4,'tow':item.priority==2,'the':item.priority==3}" <div
class="task"
:class="{
fou: item.priority == 4,
tow: item.priority == 2,
the: item.priority == 3,
}"
v-if="taskList[data.day]" v-if="taskList[data.day]"
v-for="(item, index) in taskList[data.day]" v-for="(item, index) in taskList[data.day]"
:key="index" :key="index"
@ -29,7 +35,14 @@
</el-calendar> </el-calendar>
</div> </div>
</el-card> </el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" :dateValue="dateValue" @success="loadTask" @close="showEdit = false" /> <edit-popup
v-if="showEdit"
ref="editRef"
:dict-data="dictData"
:dateValue="dateValue"
@success="loadTask"
@close="showEdit = false"
/>
</div> </div>
</template> </template>
@ -47,15 +60,14 @@ const dateValue = ref(new Date());
watch( watch(
() => dateValue, () => dateValue,
(newValue, oldValue) => { (newValue, oldValue) => {
initShowDate(timeFormat(newValue.value.getTime())) initShowDate(timeFormat(newValue.value.getTime()));
},{deep: true} },
{ deep: true }
); );
const test = (e: any) => {
const test = (e:any)=>{
console.log(e); console.log(e);
};
}
// //
const loading = ref(true); const loading = ref(true);
@ -70,42 +82,44 @@ const queryParams = reactive({
end_time: "", end_time: "",
day: 1, day: 1,
page_no: 1, page_no: 1,
pageSize: 150 pageSize: 150,
}); });
const taskList = ref<any>([]) const taskList = ref<any>([]);
// //
const loadTask = async ()=>{ const loadTask = async () => {
let res:any = await apiTaskIndex(queryParams); let res: any = await apiTaskIndex(queryParams);
taskList.value = res.lists; taskList.value = res.lists;
// console.log(taskList.value); // console.log(taskList.value);
loading.value = false; loading.value = false;
} };
const start_date = ref("");
const end_date = ref("");
const start_date = ref('');
const end_date = ref('');
// //
const initShowDate = (dateStr='')=>{ const initShowDate = (dateStr = "") => {
const currentDate = dateStr ? new Date(dateStr): new Date(); const currentDate = dateStr ? new Date(dateStr) : new Date();
const currentYear = currentDate.getFullYear(); const currentYear = currentDate.getFullYear();
const currentMonth = currentDate.getMonth(); const currentMonth = currentDate.getMonth();
const lastDay = new Date(currentYear, currentMonth + 1, 0).getDay();// const lastDay = new Date(currentYear, currentMonth + 1, 0).getDay(); //
const startDay = new Date(currentYear, currentMonth, 1).getDay();// const startDay = new Date(currentYear, currentMonth, 1).getDay(); //
// console.log(new Date(currentYear, currentMonth, 1-startDay).getDate()); // console.log(new Date(currentYear, currentMonth, 1-startDay).getDate());
// console.log(new Date(currentYear, currentMonth + 1, 6-lastDay).getDate()); // console.log(new Date(currentYear, currentMonth + 1, 6-lastDay).getDate());
start_date.value = timeFormat(new Date(currentYear, currentMonth, 1-startDay).getTime());// start_date.value = timeFormat(
end_date.value = timeFormat(new Date(currentYear, currentMonth + 1, 6-lastDay).getTime());// new Date(currentYear, currentMonth, 1 - startDay).getTime()
if(queryParams.start_time!=start_date.value){ ); //
end_date.value = timeFormat(
new Date(currentYear, currentMonth + 1, 6 - lastDay).getTime()
); //
if (queryParams.start_time != start_date.value) {
queryParams.start_time = start_date.value; queryParams.start_time = start_date.value;
queryParams.end_time = end_date.value; queryParams.end_time = end_date.value;
loading.value = true; loading.value = true;
loadTask(); loadTask();
} }
} };
initShowDate() initShowDate();
// //
const { dictData } = useDictData(""); const { dictData } = useDictData("");
@ -139,23 +153,23 @@ const handleDelete = async (id: number | any[]) => {
.is-selected { .is-selected {
color: #1989fa; color: #1989fa;
} }
.el-calendar-table .el-calendar-day{ .el-calendar-table .el-calendar-day {
height: 6.2rem; height: 6.2rem;
} }
.task{ .task {
font-size: 0.8rem; font-size: 0.8rem;
color: #F7BA2A; color: #f7ba2a;
white-space: nowrap; /* 设置文本不换行 */ white-space: nowrap; /* 设置文本不换行 */
overflow: hidden; /* 隐藏溢出的部分 */ overflow: hidden; /* 隐藏溢出的部分 */
text-overflow: ellipsis; /* 在溢出的部分显示省略号 */ text-overflow: ellipsis; /* 在溢出的部分显示省略号 */
} }
.the{ .the {
color: #ff5100; color: #ff5100;
} }
.tow{ .tow {
color: #f38200; color: #f38200;
} }
.fou{ .fou {
color: red; color: red;
} }
</style> </style>