mkm/TaskSystem-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

页面优化

Browse Source
This commit is contained in:
THK3121 2023-07-22 09:38:43 +08:00
commit 62780e0328
7 changed files with 1248 additions and 1265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/perms/admin.ts
View File

@ -27,3 +27,11 @@ export function adminDelete(params: any) {
export function adminDetail(params: any) { export function adminDetail(params: any) {
return request.get({ url: '/auth.admin/detail', params }) return request.get({ url: '/auth.admin/detail', params })
} }
// 生成合同
export function generateGontract(params: any) {
return request.get({ url: '/auth.admin/Draftingcontracts', params })
}
// 发送短信
export function sendMsgApi(params: any) {
return request.get({ url: '/auth.admin/postsms', params })
}

430
src/views/company/edit.vue
View File

@ -1,12 +1,6 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<!-- <popup ref="popupRef" :title="popupTitle" :async="true" width="70%" @confirm="handleSubmit" @close="handleClose"> --> <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form
ref="formRef"
:model="formData"
label-width="90px"
:rules="formRules"
>
<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">
<el-row> <el-row>
@ -93,7 +87,7 @@
<el-select <el-select
:disabled="isDisabled" :disabled="isDisabled"
v-model="formData.area" v-model="formData.area"
placeholder="请选择镇" placeholder="请选择区"
clearable clearable
@change="area_change" @change="area_change"
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -215,10 +209,7 @@
<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">
<el-row> <el-row>
<template <template v-for="(item, index) in formData.other_contacts" :key="index">
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
@ -363,28 +354,24 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<template v-if="userStore.userInfo.root == 1"> <template v-if="userStore.userInfo.root == 0">
<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">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="签约方" prop="field130"> <el-form-item label="签约方" prop="field130">
<el-input <el-input
:disabled="isDisabled"
v-model="formData.party_a_name" v-model="formData.party_a_name"
placeholder="请选择签约方" placeholder="请选择签约方"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
@click="openCompany" @click="openCompany"
:disabled="userStore.userInfo.root == 0 ? true : false"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label-width="100px" label="被签约公司" prop="field131">
label-width="100px"
label="被签约公司"
prop="field131"
>
<el-input <el-input
:disabled="true" :disabled="true"
v-model="formData.company_name" v-model="formData.company_name"
@ -395,11 +382,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label-width="100px" label="合同类型" prop="contract_type">
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"
@ -418,11 +401,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label-width="100px" label="合同编号" prop="field133">
label-width="100px"
label="合同编号"
prop="field133"
>
<el-input <el-input
placeholder="系统自动生成" placeholder="系统自动生成"
v-model="formData.contract.contract_no" v-model="formData.contract.contract_no"
@ -440,7 +419,7 @@
<el-form-item label="合同上传" required> <el-form-item label="合同上传" required>
<el-upload <el-upload
:disabled="isDisabled" :disabled="isDisabled"
v-model="formData.contract.file" v-model:file-list="fileList"
:headers="{ Token: userStore.token }" :headers="{ Token: userStore.token }"
class="upload-demo" class="upload-demo"
action="https://worker-task.lihaink.cn/adminapi/upload/file" action="https://worker-task.lihaink.cn/adminapi/upload/file"
@ -487,80 +466,64 @@
</template> </template>
<script lang="ts" setup name="companyEdit"> <script lang="ts" setup name="companyEdit">
import type { import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus'
FormInstance, import Popup from '@/components/popup/index.vue'
UploadProps, import { apiCompanyAdd, apiCompanyEdit, apiCompanyDetail, apiCompanyLists } from '@/api/company'
ElMessage, import { apiCityList, apiAreaList, apiStreetList, apiProvinceList } from '@/api/common'
UploadUserFile, import { dictDataLists } from '@/api/setting/dict'
} from "element-plus"; import { timeFormat } from '@/utils/util'
import Popup from "@/components/popup/index.vue"; import DialogIndex from './dialog_index.vue'
import { import DialogIndexMan from './dialog_index_man.vue'
apiCompanyAdd, import type { PropType } from 'vue'
apiCompanyEdit, import useMultipleTabs from '@/hooks/useMultipleTabs'
apiCompanyDetail, import useUserStore from '@/stores/modules/user'
apiCompanyLists, const userStore = useUserStore()
} from "@/api/company";
import { const { removeTab } = useMultipleTabs()
apiCityList, const router = useRouter()
apiAreaList, const route = useRoute()
apiStreetList, let isDisabled = ref(false)
apiProvinceList, let isEdit = ref(false)
} 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 router = useRouter();
const route = useRoute();
let isDisabled = 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: '',
@ -569,117 +532,122 @@ 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: "", party_a: 0,
file: "", file: '',
contract_no: "系统自动生成", contract_no: '系统自动生成'
}, },
//签约方 //签约方
party_a_name: "", party_a_name: '',
file_image: "", file_image: ''
// status: '' // status: ''
}); })
if (userStore.userInfo.root == 0) {
formData.contract.party_a = userStore.userInfo.company?.id
formData.party_a_name = userStore.userInfo.company?.company_name
}
const datas = reactive({ const datas = reactive({
provinceOptions: [], provinceOptions: [],
cityOptions: [], cityOptions: [],
areaOptions: [], areaOptions: [],
streetOptions: [], streetOptions: [],
dictTypeLists: [], dictTypeLists: [],
contract_type: [], contract_type: []
}); })
const fileList = ref<UploadUserFile[]>([ const fileList = ref<UploadUserFile[]>([
{ {
name: "", name: '',
url: "", url: ''
}, }
]); ])
// 表单验证 // 表单验证
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']
}, }
], ],
master_email: [ master_email: [
{ {
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
} }
// 获取详情 // 获取详情
@ -687,124 +655,108 @@ 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"] = ( const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) => {
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"] = ( const handleAvatarSuccessB: UploadProps['onSuccess'] = (response, uploadFile) => {
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"] = ( const handleAvatarSuccess_two: UploadProps['onSuccess'] = (response, uploadFile) => {
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"] = ( const handleAvatarSuccess_twoB: UploadProps['onSuccess'] = (response, uploadFile) => {
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"] = ( const handleAvatarSuccess_three: UploadProps['onSuccess'] = (response, uploadFile) => {
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 = '合同文件'
console.log(response); }
};
//增加其他联系人 //增加其他联系人
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({
@ -829,22 +781,22 @@ 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>
.avatar-uploader .el-upload { .avatar-uploader .el-upload {

98
src/views/company/index.vue
View File

@ -49,8 +49,13 @@
placeholder="请输入片区经理" placeholder="请输入片区经理"
/> />
</el-form-item> </el-form-item>
<el-form-item label="是否签约" class="w-[308px]" prop="is_contract"> <el-form-item label="是否签约" prop="is_contract">
<el-select v-model="queryParams.is_contract" placeholder="是否签约" clearable :style="{ width: '100%' }"> <el-select
v-model="queryParams.is_contract"
placeholder="是否签约"
clearable
:style="{ width: '100%' }"
>
<el-option label="已签约" value="1"></el-option> <el-option label="已签约" value="1"></el-option>
<el-option label="未签约" value="0"></el-option> <el-option label="未签约" value="0"></el-option>
</el-select> </el-select>
@ -62,14 +67,8 @@
</el-form> </el-form>
</el-card> </el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
<!-- <el-button v-perms="['company/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>-->
<router-link <router-link
v-perms="['company/add', 'company/edit']" v-perms="['company/add:edit']"
:to="{ :to="{
path: getRoutePath('company/add:edit') path: getRoutePath('company/add:edit')
}" }"
@ -96,31 +95,16 @@
<template #default="{ row }"> <template #default="{ row }">
<div style="display: flex"> <div style="display: flex">
<el-button type="primary" link> <el-button type="primary" link>
<router-link :to="{ <router-link
:to="{
path: getRoutePath('auth.admin/lists'), path: getRoutePath('auth.admin/lists'),
query: { query: {
company_id: row.id, company_id: row.id,
read: true read: true
} }
}">查看成员</router-link> }"
</el-button> >查看成员</router-link
<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/edit', 'company/add']" type="primary" link>
<router-link :to="{
path: getRoutePath('company/add:edit'),
query: {
id: row.id,
read: true
}
}">详情</router-link>
</el-button> </el-button>
<el-button type="primary" link> <el-button type="primary" link>
<router-link <router-link
@ -134,12 +118,51 @@
>下属公司</router-link >下属公司</router-link
> >
</el-button> </el-button>
<el-button v-perms="['company/delete']" type="danger" link <el-button v-perms="['company/add:edit']" type="primary" link>
@click="handleDelete(row.id)">删除</el-button> <router-link
<el-button v-perms="['company/edit', 'company/add']" type="primary" link :to="{
@click="showCreateConctPop(row)">生成合同</el-button> path: getRoutePath('company/add:edit'),
<el-button v-perms="['company/edit', 'company/add']" type="primary" link query: {
@click="; (showPop = true), (contractId = row.id)">发送短信</el-button> 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-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
>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -171,7 +194,8 @@
<script lang="ts" setup name="companyLists"> <script lang="ts" setup name="companyLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { apiCompanyLists, apiCompanyDelete, generateGontract, sendMsgApi } from '@/api/company' import { apiCompanyLists, apiCompanyDelete } from '@/api/company'
import { generateGontract, sendMsgApi } from '@/api/perms/admin'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import { dictDataLists } from '@/api/setting/dict' import { dictDataLists } from '@/api/setting/dict'
@ -190,7 +214,7 @@ const offPop = () => {
// 创建合同的id // 创建合同的id
const contractId = ref('') const contractId = ref('')
const showCreateConctPop = (row) => { 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 = () => { const creContct = () => {
generateGontract({ id: contractId.value }) generateGontract({ id: contractId.value })

71
src/views/company/subordinate.vue
View File

@ -16,38 +16,70 @@
<template #default="{ row }"> <template #default="{ row }">
<div style="display: flex"> <div style="display: flex">
<el-button type="primary" link> <el-button type="primary" link>
<router-link :to="{ <router-link
:to="{
path: getRoutePath('auth.admin/lists'), path: getRoutePath('auth.admin/lists'),
query: { query: {
company_id: row.id, company_id: row.id,
read: true read: true
} }
}">查看成员</router-link> }"
>查看成员</router-link
>
</el-button> </el-button>
<el-button v-perms="['company/edit', 'company/add']" type="primary" link> <el-button
<router-link :to="{ v-perms="['company/edit', 'company/add']"
type="primary"
link
>
<router-link
:to="{
path: getRoutePath('company/add:edit'), path: getRoutePath('company/add:edit'),
query: { query: {
id: row.id, id: row.id,
read: true read: true
} }
}">详情</router-link> }"
>详情</router-link
>
</el-button> </el-button>
<el-button v-perms="['company/edit', 'company/add']" type="primary" link> <el-button
<router-link :to="{ v-perms="['company/edit', 'company/add']"
type="primary"
link
>
<router-link
:to="{
path: getRoutePath('company/add:edit'), path: getRoutePath('company/add:edit'),
query: { query: {
id: row.id, id: row.id,
edit: true edit: true
} }
}">编辑</router-link> }"
>编辑</router-link
>
</el-button> </el-button>
<el-button v-perms="['company/delete']" type="danger" link <el-button
@click="handleDelete(row.id)">删除</el-button> v-perms="['company/delete']"
<el-button v-perms="['company/edit', 'company/add']" type="primary" link type="danger"
@click="showCreateConctPop(row)">生成合同</el-button> link
<el-button v-perms="['company/edit', 'company/add']" type="primary" link @click="handleDelete(row.id)"
@click="; (showPop = true), (contractId = row.id)">发送短信</el-button> >删除</el-button
>
<el-button
v-perms="['company/edit', 'company/add']"
type="primary"
link
@click="showCreateConctPop(row)"
>生成合同</el-button
>
<el-button
v-perms="['company/edit', 'company/add']"
type="primary"
link
@click=";(showPop = true), (contractId = row.id)"
>发送短信</el-button
>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -66,7 +98,9 @@
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div> </div>
<p class="btn_menu"> <p class="btn_menu">
<el-button type="primary" size="large" v-if="showConctactPop" @click="creContct">确认创建</el-button> <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="primary" size="large" v-else @click="sendMsg">确认</el-button>
<el-button type="info" size="large" @click="offPop">返回</el-button> <el-button type="info" size="large" @click="offPop">返回</el-button>
</p> </p>
@ -77,8 +111,8 @@
<script lang="ts" setup name="companyLists"> <script lang="ts" setup name="companyLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { apiCompanyLists, apiCompanyDelete, apiSubordinateList, generateGontract, sendMsgApi } from '@/api/company' import { apiCompanyLists, apiCompanyDelete, apiSubordinateList } from '@/api/company'
import { generateGontract, sendMsgApi } from '@/api/perms/admin'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import { dictDataLists } from '@/api/setting/dict' import { dictDataLists } from '@/api/setting/dict'
@ -98,7 +132,7 @@ const offPop = () => {
// 创建合同的id // 创建合同的id
const contractId = ref('') const contractId = ref('')
const showCreateConctPop = (row) => { 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 = () => { const creContct = () => {
generateGontract({ id: contractId.value }) generateGontract({ id: contractId.value })
@ -167,7 +201,6 @@ getLists()
.btn { .btn {
position: absolute; position: absolute;
} }
h1 { h1 {
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;

7
src/views/contract/contractDetil.vue
View File

@ -5,8 +5,6 @@
<el-input v-model="formData.company_id" :disabled="true" clearable placeholder="请输入公司" /> <el-input v-model="formData.company_id" :disabled="true" clearable placeholder="请输入公司" />
</el-form-item> </el-form-item>
<el-form-item label="合同类型" prop="contract_type"> <el-form-item label="合同类型" prop="contract_type">
<el-input v-model="formData.contract_type" :disabled="true" clearable placeholder="请输入合同类型" /> <el-input v-model="formData.contract_type" :disabled="true" clearable placeholder="请输入合同类型" />
</el-form-item> </el-form-item>
<el-form-item label="合同编号" prop="contract_no"> <el-form-item label="合同编号" prop="contract_no">
@ -32,8 +30,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn_men"> <div class="btn_men">
<el-button @click="show = false">取消</el-button> <el-button @click="show=false">取消</el-button>
<el-button type="primary" @click="show = false">确定</el-button> <el-button type="primary" @click="show=false" >确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
@ -63,7 +61,6 @@ const setFormData = async (data) => {
formData[key] = data[key]; formData[key] = data[key];
} }
} }
console.log(formData)
}; };
defineExpose({ defineExpose({

118
src/views/permission/admin/edit.vue
View File

@ -21,7 +21,6 @@
:disabled="isCheck" :disabled="isCheck"
v-model="formData.avatar" v-model="formData.avatar"
class="avatar-uploader-head" class="avatar-uploader-head"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image" action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccessAvatar" :on-success="handleAvatarSuccessAvatar"
@ -33,9 +32,9 @@
</el-upload> </el-upload>
</div> </div>
<el-col class="pt-6 !border-none"> <el-col style="flex: 8" class="pt-6 !border-none">
<el-row> <el-row>
<el-col :span="11"> <el-col :span="12">
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
<el-input <el-input
:disabled="isCheck" :disabled="isCheck"
@ -46,7 +45,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="12">
<el-form-item label="性别" prop="sex"> <el-form-item label="性别" prop="sex">
<el-select <el-select
v-model="formData.sex" v-model="formData.sex"
@ -61,7 +60,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="11"> <el-col :span="12">
<el-form-item label="身份证号" prop="id_card"> <el-form-item label="身份证号" prop="id_card">
<el-input <el-input
:disabled="isCheck" :disabled="isCheck"
@ -72,7 +71,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="12">
<el-form-item label="联系电话" prop="account"> <el-form-item label="联系电话" prop="account">
<el-input <el-input
:disabled="isCheck" :disabled="isCheck"
@ -120,6 +119,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</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" :disabled="isCheck"
@ -166,10 +166,9 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="24">
<el-col :span="24" style="margin-top: 1vh">
<el-row> <el-row>
<el-col :span="12" v-if="userStore.userInfo.root == 0"> <el-col :span="12">
<el-form-item label="授权身份" prop="role_id"> <el-form-item label="授权身份" prop="role_id">
<el-select <el-select
v-model="formData.role_id" v-model="formData.role_id"
@ -192,32 +191,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-else> <el-col :span="12">
<el-form-item label="授权身份" prop="role_id">
<el-select
v-model="formData.role_id"
:disabled="formData.root == 1 || isCheck"
placeholder="请选择授权身份"
:style="{ width: '100%' }"
clearable
>
<el-option
v-if="formData.root == 1"
label="系统管理员"
:value="0"
/>
<el-option
v-for="(item, index) in optionsData.role"
:key="index"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="userStore.userInfo.root == 0">
<!-- <el-col :span="12" v-if="true"> -->
<el-form-item label="签约方" prop="field130"> <el-form-item label="签约方" prop="field130">
<el-input <el-input
:disabled="isCheck" :disabled="isCheck"
@ -232,13 +206,14 @@
</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>
<div style="display: flex; justify-content: space-between"> <el-col :span="24">
<div> <el-row>
<el-col :span="8">
<el-form-item label="身份证" prop="id_card"> <el-form-item label="身份证" prop="id_card">
<el-upload <el-upload
:disabled="isCheck" :disabled="isCheck"
v-model="formData.qualification.id_card" v-model="formData.qualification.id_card"
class="avatar-uploader pl-3" class="avatar-uploader"
:data="{ cid: 1 }" :data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image" action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false" :show-file-list="false"
@ -256,7 +231,7 @@
<el-upload <el-upload
:disabled="isCheck" :disabled="isCheck"
v-model="formData.qualification.id_card_b" v-model="formData.qualification.id_card_b"
class="avatar-uploader pl-3" class="avatar-uploader"
:data="{ cid: 1 }" :data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image" action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false" :show-file-list="false"
@ -272,13 +247,13 @@
</el-icon> </el-icon>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</div> </el-col>
<div> <el-col :span="8">
<el-form-item label="行驶证" prop="car_card"> <el-form-item label="行驶证" prop="car_card">
<el-upload <el-upload
:disabled="isCheck" :disabled="isCheck"
v-model="formData.qualification.car_card" v-model="formData.qualification.car_card"
class="avatar-uploader pl-3" class="avatar-uploader"
:data="{ cid: 1 }" :data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image" action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false" :show-file-list="false"
@ -296,7 +271,7 @@
<el-upload <el-upload
:disabled="isCheck" :disabled="isCheck"
v-model="formData.qualification.car_card_b" v-model="formData.qualification.car_card_b"
class="avatar-uploader pl-3" class="avatar-uploader"
:data="{ cid: 1 }" :data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image" action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false" :show-file-list="false"
@ -313,13 +288,13 @@
</el-icon> </el-icon>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</div> </el-col>
<div> <el-col :span="8">
<el-form-item label="银行卡号" prop="bank_account"> <el-form-item label="银行卡号" prop="bank_account">
<el-upload <el-upload
:disabled="isCheck" :disabled="isCheck"
v-model="formData.qualification.bank_account" v-model="formData.qualification.bank_account"
class="avatar-uploader pl-3" class="avatar-uploader"
:data="{ cid: 1 }" :data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image" action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false" :show-file-list="false"
@ -338,7 +313,7 @@
<el-upload <el-upload
:disabled="isCheck" :disabled="isCheck"
v-model="formData.qualification.bank_account_b" v-model="formData.qualification.bank_account_b"
class="avatar-uploader pl-3" class="avatar-uploader"
:data="{ cid: 1 }" :data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image" action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false" :show-file-list="false"
@ -355,10 +330,9 @@
</el-icon> </el-icon>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</div> </el-col>
</div> </el-row>
<template v-if="userStore.userInfo.root == 0"> </el-col>
<!-- <template v-if="true"> -->
<el-col :span="24"> <el-col :span="24">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@ -447,7 +421,6 @@
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="24" v-if="!isCheck"> <el-col :span="24" v-if="!isCheck">
<el-form-item label="合同上传" prop="field127"> <el-form-item label="合同上传" prop="field127">
<el-upload <el-upload
@ -463,7 +436,6 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template>
</el-form> </el-form>
</popup> </popup>
<el-dialog v-model="isCompany" title="选择签约方" width="60%"> <el-dialog v-model="isCompany" title="选择签约方" width="60%">
@ -475,7 +447,12 @@
import type { FormInstance, UploadProps } from "element-plus"; import type { FormInstance, UploadProps } from "element-plus";
import Popup from "@/components/popup/index.vue"; import Popup from "@/components/popup/index.vue";
import { useDictOptions } from "@/hooks/useDictOptions"; import { useDictOptions } from "@/hooks/useDictOptions";
import { adminAdd, adminDetail, adminEdit } from "@/api/perms/admin"; import {
adminAdd,
adminDetail,
adminEdit,
generateGontract,
} from "@/api/perms/admin";
import { roleAll } from "@/api/perms/role"; import { roleAll } from "@/api/perms/role";
import { jobsAll } from "@/api/org/post"; import { jobsAll } from "@/api/org/post";
import { deptAll } from "@/api/org/department"; import { deptAll } from "@/api/org/department";
@ -488,14 +465,15 @@ import {
import { dictDataLists } from "@/api/setting/dict"; import { dictDataLists } from "@/api/setting/dict";
import DialogIndex from "./dialog_index.vue"; import DialogIndex from "./dialog_index.vue";
import useUserStore from "@/stores/modules/user"; import useUserStore from "@/stores/modules/user";
const isCheck = ref(false); defineProps({
const isCheckFn = (flag: boolean) => { isCheck: {},
isCheck.value = flag; });
};
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("add"); const mode = ref("add");
console.log(mode);
const popupTitle = computed(() => { const popupTitle = computed(() => {
return mode.value == "edit" ? "编辑管理员" : "新增管理员"; return mode.value == "edit" ? "编辑管理员" : "新增管理员";
}); });
@ -550,7 +528,8 @@ getcontract_type();
const isCompany = ref(false); const isCompany = ref(false);
function customEvent(data: any) { function customEvent(data: any) {
isCompany.value = false; isCompany.value = false;
formData.party_a = data.id; // formData.contract.party_a = data.id
console.log(data);
formData.party_a_name = data.company_name; formData.party_a_name = data.company_name;
} }
// 表单验证 // 表单验证
@ -671,11 +650,8 @@ const { optionsData } = useDictOptions<{
api: deptAll, api: deptAll,
}, },
}); });
const handleSubmit = async () => { const handleSubmit = async () => {
if (isCheck.value) {
popupRef.value?.close();
return;
}
await formRef.value?.validate(); await formRef.value?.validate();
mode.value == "edit" mode.value == "edit"
? await adminEdit(formData) ? await adminEdit(formData)
@ -683,6 +659,7 @@ const handleSubmit = async () => {
popupRef.value?.close(); popupRef.value?.close();
emit("success"); emit("success");
}; };
const open = (type = "add") => { const open = (type = "add") => {
mode.value = type; mode.value = type;
popupRef.value?.open(); popupRef.value?.open();
@ -799,22 +776,21 @@ const handleClose = () => {
defineExpose({ defineExpose({
open, open,
setFormData, setFormData,
isCheckFn,
}); });
</script> </script>
<style lang="scss"> <style lang="scss">
.headimg { .headimg {
margin-top: 24px; width: 6.5vw;
width: 6.2vw; height: 8vw;
height: 7.2vw;
float: left;
overflow: hidden; overflow: hidden;
float: left;
margin-top: 24px;
} }
.avatar-uploader-head .el-upload { .avatar-uploader-head .el-upload {
width: 6.2vw; width: 7vw;
height: 7.2vw; height: 8.5vw;
background-color: #fff; background-color: #fff;
border: 1px dashed var(--el-border-color); border: 1px dashed var(--el-border-color);
border-radius: 6px; border-radius: 6px;
@ -825,7 +801,7 @@ defineExpose({
} }
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
width: 9.9vw; width: 10vw;
height: 6.3vw; height: 6.3vw;
background-color: #fff; background-color: #fff;
border: 1px dashed var(--el-border-color); border: 1px dashed var(--el-border-color);

127
src/views/permission/admin/index.vue
View File

@ -56,13 +56,10 @@
@click="handleEdit(row)">编辑</el-button> @click="handleEdit(row)">编辑</el-button>
<el-button v-if="row.root != 1" v-perms="['auth.admin/delete']" type="danger" link <el-button v-if="row.root != 1" v-perms="['auth.admin/delete']" type="danger" link
@click="handleDelete(row.id)">删除</el-button> @click="handleDelete(row.id)">删除</el-button>
<el-button v-perms="['company/edit', 'company/add']" type="primary" link @click="
; (showPop = true),
(showConctactPop = true),
(contractId = row.id)
">生成合同</el-button>
<el-button v-perms="['company/edit', 'company/add']" type="primary" link <el-button v-perms="['company/edit', 'company/add']" type="primary" link
@click="; (showPop = true), (contractId = row.id)">发送短信</el-button> @click="showPop = true, showConctactPop = true, contractId = row.id">生成个人合同</el-button>
<el-button v-perms="['company/edit', 'company/add']" type="primary" link
@click=" showPop = true, contractId = row.id">发送短信</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -75,12 +72,8 @@
<edit-popup v-if="showEdit" ref="editRef" :isCheck="isCheck" @success="getLists" @close="showEdit = false" /> <edit-popup v-if="showEdit" ref="editRef" :isCheck="isCheck" @success="getLists" @close="showEdit = false" />
<el-dialog v-model="showPop" @close="offPop"> <el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1> <h1>重要提醒</h1>
<div class="content" v-if="showConctactPop"> <div class="content" v-if="showConctactPop">请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.</div>
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送. <div class="content" v-else>确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约</div>
</div>
<div class="content" v-else>
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu"> <p class="btn_menu">
<el-button type="primary" size="large" v-if="showConctactPop" @click="creContct">确认创建</el-button> <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="primary" size="large" v-else @click="sendMsg">确认</el-button>
@ -91,42 +84,47 @@
</template> </template>
<script lang="ts" setup name="admin"> <script lang="ts" setup name="admin">
import { adminEdit, adminLists, adminDelete } from '@/api/perms/admin' import {
import { generateGontract, sendMsgApi } from '@/api/company' adminEdit,
import { roleAll } from '@/api/perms/role' adminLists,
import { useDictOptions } from '@/hooks/useDictOptions' adminDelete,
import { usePaging } from '@/hooks/usePaging' generateGontract,
import feedback from '@/utils/feedback' sendMsgApi,
import EditPopup from './edit.vue' } from "@/api/perms/admin";
const editRef = shallowRef<InstanceType<typeof EditPopup>>() import { roleAll } from "@/api/perms/role";
const route = useRoute() import { useDictOptions } from "@/hooks/useDictOptions";
import { usePaging } from "@/hooks/usePaging";
import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue";
const editRef = shallowRef<InstanceType<typeof EditPopup>>();
// 表单数据 // 表单数据
const formData = reactive({ const formData = reactive({
name: '', name: "",
role_id: '', role_id: "",
company_id: route.query.company_id || '' });
}) const contractId = ref("");
const contractId = ref('')
// 弹窗 // 弹窗
const showPop = ref(false) const showPop = ref(false);
const showConctactPop = ref(false) const showConctactPop = ref(false);
const offPop = () => { const offPop = () => {
showPop.value = false showPop.value = false;
showConctactPop.value = false showConctactPop.value = false;
} };
const creContct = () => { const creContct = () => {
generateGontract({ id: contractId.value }) // feedback.msgSuccess("复制成功");
offPop() generateGontract({ id: contractId.value }).then(() => {
} feedback.msgSuccess("发送成功");
});
offPop();
};
const sendMsg = () => { const sendMsg = () => {
sendMsgApi({ id: contractId.value }).then((res) => { sendMsgApi({ id: contractId.value }).then((res) => {
console.log(res) feedback.msgSuccess("发送成功");
}) });
offPop() offPop();
} };
// //
const showEdit = ref(false) const showEdit = ref(false);
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: adminLists, fetchFun: adminLists,
params: formData, params: formData,
@ -145,39 +143,34 @@ const changeStatus = (data: any) => {
}); });
}; };
// 查看 // 查看
const isCheck = ref(false) const isCheck = ref(false);
const handleCheck = async (data: any) => { const handleCheck = async (data: any) => {
isCheck.value = true isCheck.value = true;
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);
editRef.value?.isCheckFn(true) };
}
const handleAdd = async () => { const handleAdd = async () => {
isCheck.value = false isCheck.value = false;
showEdit.value = true showEdit.value = true;
await nextTick() await nextTick();
editRef.value?.open('add') editRef.value?.open("add");
editRef.value?.isCheckFn(false) };
}
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
isCheck.value = false isCheck.value = false;
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);
editRef.value?.isCheckFn(false) };
}
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
await feedback.confirm('确定要删除？') await feedback.confirm("确定要删除？");
await adminDelete({ id }) await adminDelete({ id });
getLists() getLists();
} };
const { optionsData } = useDictOptions<{ const { optionsData } = useDictOptions<{
role: any[]; role: any[];