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 10:05:06 +08:00
parent 62780e0328
commit 2b0b343544
2 changed files with 1065 additions and 992 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,11 @@
<template>
<div class="edit-popup">
<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>
<el-col :span="24" class="el-card pt-6">
<el-row>
@ -209,7 +214,10 @@
<div style="font-size: 1.2rem; margin: 10px 0">其他联系人</div>
<el-col :span="24" class="el-card pt-6">
<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-form-item label="姓名" prop="field120">
<el-input
@ -371,7 +379,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label-width="100px" label="被签约公司" prop="field131">
<el-form-item
label-width="100px"
label="被签约公司"
prop="field131"
>
<el-input
:disabled="true"
v-model="formData.company_name"
@ -382,7 +394,11 @@
</el-form-item>
</el-col>
<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
:disabled="isDisabled"
v-model="formData.contract.contract_type"
@ -401,7 +417,11 @@
</el-col>
<el-col :span="12">
<el-form-item label-width="100px" label="合同编号" prop="field133">
<el-form-item
label-width="100px"
label="合同编号"
prop="field133"
>
<el-input
placeholder="系统自动生成"
v-model="formData.contract.contract_no"
@ -466,64 +486,79 @@
</template>
<script lang="ts" setup name="companyEdit">
import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiCompanyAdd, apiCompanyEdit, apiCompanyDetail, 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()
import type {
FormInstance,
UploadProps,
ElMessage,
UploadUserFile,
} from "element-plus";
import Popup from "@/components/popup/index.vue";
import {
apiCompanyAdd,
apiCompanyEdit,
apiCompanyDetail,
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 router = useRouter()
const route = useRoute()
let isDisabled = ref(false)
let isEdit = ref(false)
const { removeTab } = useMultipleTabs();
const router = useRouter();
const route = useRoute();
let isDisabled = ref(false);
let isEdit = ref(false);
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref()
isDisabled = route.query.read
isEdit = route.query.edit
default: () => ({}),
},
});
const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref();
isDisabled = route.query.read;
isEdit = route.query.edit;
// 表单数据
const formData = reactive({
admin_id: '',
admin_name: '',
area_manager: '',
area_manager_name: '',
id: '',
admin_id: "",
admin_name: "",
area_manager: "",
area_manager_name: "",
id: "",
// level_two: '',
// level_one: '',
company_name: '',
organization_code: '',
province: '',
city: '',
area: '',
street: '',
address: '',
company_type: '',
master_name: '',
master_position: '',
master_phone: '',
master_email: '',
company_name: "",
organization_code: "",
province: "",
city: "",
area: "",
street: "",
address: "",
company_type: "",
master_name: "",
master_position: "",
master_phone: "",
master_email: "",
other_contacts: [
{
name: '',
position: '',
phone: '',
email: ''
}
name: "",
position: "",
phone: "",
email: "",
},
],
// area_manager: '',
// is_contract: '',
@ -532,26 +567,26 @@ const formData = reactive({
// deposit: '',
// deposit_time: '',
qualification: {
business_license: '',
business_licenseB: '',
bank_account: '',
bank_accountB: ''
business_license: "",
business_licenseB: "",
bank_account: "",
bank_accountB: "",
},
contract: {
contract_type: '',
contract_type: "",
party_a: 0,
file: '',
contract_no: '系统自动生成'
file: "",
contract_no: "系统自动生成",
},
//签约方
party_a_name: '',
file_image: ''
party_a_name: "",
file_image: "",
// status: ''
})
});
if (userStore.userInfo.root == 0) {
formData.contract.party_a = userStore.userInfo.company?.id
formData.party_a_name = userStore.userInfo.company?.company_name
formData.contract.party_a = userStore.userInfo.company?.id;
formData.party_a_name = userStore.userInfo.company?.company_name;
}
const datas = reactive({
provinceOptions: [],
@ -559,95 +594,95 @@ const datas = reactive({
areaOptions: [],
streetOptions: [],
dictTypeLists: [],
contract_type: []
})
contract_type: [],
});
const fileList = ref<UploadUserFile[]>([
{
name: '',
url: ''
}
])
name: "",
url: "",
},
]);
// 表单验证
const formRules = reactive<any>({
company_name: [
{
required: true,
message: '请输入公司名称',
trigger: ['blur']
}
message: "请输入公司名称",
trigger: ["blur"],
},
],
organization_code: [
{
required: true,
message: '请输入组织机构代码',
trigger: ['blur']
}
message: "请输入组织机构代码",
trigger: ["blur"],
},
],
master_name: [
{
required: true,
message: '请输入主联系人姓名',
trigger: ['blur']
}
message: "请输入主联系人姓名",
trigger: ["blur"],
},
],
master_position: [
{
required: true,
message: '请输入主联系人职务',
trigger: ['blur']
}
message: "请输入主联系人职务",
trigger: ["blur"],
},
],
master_phone: [
{
required: true,
message: '请输入主联系人手机',
trigger: ['blur']
}
message: "请输入主联系人手机",
trigger: ["blur"],
},
],
master_email: [
{
required: true,
message: '请输入主联系人邮箱',
trigger: ['blur']
}
message: "请输入主联系人邮箱",
trigger: ["blur"],
},
],
account: [
{
required: true,
message: '请输入账号',
trigger: ['blur']
}
message: "请输入账号",
trigger: ["blur"],
},
],
password: [
{
required: true,
message: '请输入密码',
trigger: ['blur']
}
]
})
const isCompany = ref(false)
const isMan = ref(false)
const isAreaManager = ref(false)
message: "请输入密码",
trigger: ["blur"],
},
],
});
const isCompany = ref(false);
const isMan = ref(false);
const isAreaManager = ref(false);
function customEvent(data: any) {
isCompany.value = false
formData.contract.party_a = data.id
formData.party_a_name = data.company_name
isCompany.value = false;
formData.contract.party_a = data.id;
formData.party_a_name = data.company_name;
}
function customEventMan(data: any) {
isMan.value = false
formData.admin_name = data.name
formData.admin_id = data.id
isMan.value = false;
formData.admin_name = data.name;
formData.admin_id = data.id;
}
//区域管理人员
function EventAreaManager(data: any) {
isAreaManager.value = false
formData.area_manager_name = data.name
formData.area_manager = data.id
isAreaManager.value = false;
formData.area_manager_name = data.name;
formData.area_manager = data.id;
}
function openCompany() {
isCompany.value = true
isCompany.value = true;
}
// 获取详情
@ -655,108 +690,123 @@ const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
formData[key] = data[key];
}
}
};
const getDetail = async (row: Record<string, any>) => {
const data = await apiCompanyDetail({
id: row.id
})
setFormData(data)
}
id: row.id,
});
setFormData(data);
};
//上传图片1
const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) => {
const handleAvatarSuccess: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
ElMessage.error(response.msg);
return;
}
formData.qualification.business_license = response.data.uri
}
const handleAvatarSuccessB: UploadProps['onSuccess'] = (response, uploadFile) => {
formData.qualification.business_license = response.data.uri;
};
const handleAvatarSuccessB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.qualification.business_licenseB = response.data.uri
ElMessage.error(response.msg);
return;
}
formData.qualification.business_licenseB = response.data.uri;
};
//上传图片2
const handleAvatarSuccess_two: UploadProps['onSuccess'] = (response, uploadFile) => {
const handleAvatarSuccess_two: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
ElMessage.error(response.msg);
return;
}
formData.qualification.bank_account = response.data.uri
}
const handleAvatarSuccess_twoB: UploadProps['onSuccess'] = (response, uploadFile) => {
formData.qualification.bank_account = response.data.uri;
};
const handleAvatarSuccess_twoB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.qualification.bank_accountB = response.data.uri
ElMessage.error(response.msg);
return;
}
formData.qualification.bank_accountB = response.data.uri;
};
//上传文件3
const handleAvatarSuccess_three: UploadProps['onSuccess'] = (response, uploadFile) => {
const handleAvatarSuccess_three: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.file_image = response.data.uri
formData.contract.file = response.data.uri
fileList.value[0].url = response.data.uri
fileList.value[0].name = '合同文件'
ElMessage.error(response.msg);
return;
}
formData.file_image = response.data.uri;
formData.contract.file = response.data.uri;
fileList.value[0].url = response.data.uri;
fileList.value[0].name = "合同文件";
};
//增加其他联系人
function other() {
formData.other_contacts.push({
name: '',
position: '',
phone: '',
email: ''
})
name: "",
position: "",
phone: "",
email: "",
});
}
//获取省份
function province_change(value: string) {
getCityList()
getCityList();
}
function city_change(value: string) {
getAreaList()
getAreaList();
}
function area_change(value: string) {
getStreetList()
getStreetList();
}
function street_change(value: string) {
formData.street = value
formData.street = value;
}
const getProvinceList = async () => {
const data = await apiProvinceList({})
datas['provinceOptions'] = data
}
const data = await apiProvinceList({});
datas["provinceOptions"] = data;
};
const getCityList = async () => {
const data = await apiCityList({ city: formData.province })
datas['cityOptions'] = data
}
const data = await apiCityList({ city: formData.province });
datas["cityOptions"] = data;
};
const getAreaList = async () => {
const data = await apiAreaList({ area: formData.city })
datas['areaOptions'] = data
}
const data = await apiAreaList({ area: formData.city });
datas["areaOptions"] = data;
};
const getStreetList = async () => {
const data = await apiStreetList({ street: formData.area })
datas['streetOptions'] = data
}
getProvinceList()
const data = await apiStreetList({ street: formData.area });
datas["streetOptions"] = data;
};
getProvinceList();
const getcontract_type = async () => {
const data = await dictDataLists({ type_id: 7 })
datas['contract_type'] = data['lists']
}
const data = await dictDataLists({ type_id: 7 });
datas["contract_type"] = data["lists"];
};
const getdictTypeLists = async () => {
const data = await dictDataLists({ type_id: 6 })
datas['dictTypeLists'] = data['lists']
}
const data = await dictDataLists({ type_id: 6 });
datas["dictTypeLists"] = data["lists"];
};
const getDetails = async () => {
const data = await apiCompanyDetail({
@ -781,22 +831,22 @@ getdictTypeLists();
getcontract_type();
const create = async () => {
await formRef.value?.validate()
const data = { ...formData }
await formRef.value?.validate();
const data = { ...formData };
if (route.query.id) {
await apiCompanyEdit(data)
await apiCompanyEdit(data);
} else {
await apiCompanyAdd(data)
await apiCompanyAdd(data);
}
removeTab()
router.back()
}
route.query.id && getDetails()
removeTab();
router.back();
};
route.query.id && getDetails();
defineExpose({
open,
setFormData,
getDetail
})
getDetail,
});
</script>
<style>
.avatar-uploader .el-upload {

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

@ -15,12 +15,12 @@
:rules="formRules"
>
<div style="font-size: 1.2rem; margin: 10px 0">基本信息创建</div>
<div class="headimg">
<el-upload
:disabled="isCheck"
v-model="formData.avatar"
class="avatar-uploader-head"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false"
:on-success="handleAvatarSuccessAvatar"
@ -32,9 +32,9 @@
</el-upload>
</div>
<el-col style="flex: 8" class="pt-6 !border-none">
<el-col class="pt-6 !border-none">
<el-row>
<el-col :span="12">
<el-col :span="11">
<el-form-item label="姓名" prop="name">
<el-input
:disabled="isCheck"
@ -45,7 +45,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="13">
<el-form-item label="性别" prop="sex">
<el-select
v-model="formData.sex"
@ -60,7 +60,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="11">
<el-form-item label="身份证号" prop="id_card">
<el-input
:disabled="isCheck"
@ -71,7 +71,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="13">
<el-form-item label="联系电话" prop="account">
<el-input
:disabled="isCheck"
@ -119,7 +119,6 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="区" prop="area" style="flex: 1">
<el-select
:disabled="isCheck"
@ -166,9 +165,10 @@
</el-form-item>
</el-row>
</el-col>
<el-col :span="24">
<el-col :span="24" style="margin-top: 1vh">
<el-row>
<el-col :span="12">
<el-col :span="12" v-if="userStore.userInfo.root == 0">
<el-form-item label="授权身份" prop="role_id">
<el-select
v-model="formData.role_id"
@ -191,7 +191,32 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="24" v-else>
<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-input
:disabled="isCheck"
@ -206,14 +231,13 @@
</el-row>
</el-col>
<div style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
<el-col :span="24">
<el-row>
<el-col :span="8">
<div style="display: flex; justify-content: space-between">
<div>
<el-form-item label="身份证" prop="id_card">
<el-upload
:disabled="isCheck"
v-model="formData.qualification.id_card"
class="avatar-uploader"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false"
@ -231,7 +255,7 @@
<el-upload
:disabled="isCheck"
v-model="formData.qualification.id_card_b"
class="avatar-uploader"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false"
@ -247,13 +271,13 @@
</el-icon>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="8">
</div>
<div>
<el-form-item label="行驶证" prop="car_card">
<el-upload
:disabled="isCheck"
v-model="formData.qualification.car_card"
class="avatar-uploader"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false"
@ -271,7 +295,7 @@
<el-upload
:disabled="isCheck"
v-model="formData.qualification.car_card_b"
class="avatar-uploader"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false"
@ -288,13 +312,13 @@
</el-icon>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="8">
</div>
<div>
<el-form-item label="银行卡号" prop="bank_account">
<el-upload
:disabled="isCheck"
v-model="formData.qualification.bank_account"
class="avatar-uploader"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false"
@ -313,7 +337,7 @@
<el-upload
:disabled="isCheck"
v-model="formData.qualification.bank_account_b"
class="avatar-uploader"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false"
@ -330,9 +354,10 @@
</el-icon>
</el-upload>
</el-form-item>
</el-col>
</el-row>
</el-col>
</div>
</div>
<template v-if="userStore.userInfo.root == 0">
<!-- <template v-if="true"> -->
<el-col :span="24">
<el-row>
<el-col :span="12">
@ -421,6 +446,7 @@
</el-col>
</el-row>
</el-col>
<el-col :span="24" v-if="!isCheck">
<el-form-item label="合同上传" prop="field127">
<el-upload
@ -436,6 +462,7 @@
</el-upload>
</el-form-item>
</el-col>
</template>
</el-form>
</popup>
<el-dialog v-model="isCompany" title="选择签约方" width="60%">
@ -447,12 +474,7 @@
import type { FormInstance, UploadProps } from "element-plus";
import Popup from "@/components/popup/index.vue";
import { useDictOptions } from "@/hooks/useDictOptions";
import {
adminAdd,
adminDetail,
adminEdit,
generateGontract,
} from "@/api/perms/admin";
import { adminAdd, adminDetail, adminEdit } from "@/api/perms/admin";
import { roleAll } from "@/api/perms/role";
import { jobsAll } from "@/api/org/post";
import { deptAll } from "@/api/org/department";
@ -465,15 +487,14 @@ import {
import { dictDataLists } from "@/api/setting/dict";
import DialogIndex from "./dialog_index.vue";
import useUserStore from "@/stores/modules/user";
defineProps({
isCheck: {},
});
const isCheck = ref(false);
const isCheckFn = (flag: boolean) => {
isCheck.value = flag;
};
const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref("add");
console.log(mode);
const popupTitle = computed(() => {
return mode.value == "edit" ? "编辑管理员" : "新增管理员";
});
@ -482,7 +503,7 @@ const formData = reactive({
sex: "",
id_card: "",
name: "",
province: "120000",
province: "",
city: "",
area: "",
street: "",
@ -528,8 +549,7 @@ getcontract_type();
const isCompany = ref(false);
function customEvent(data: any) {
isCompany.value = false;
// formData.contract.party_a = data.id
console.log(data);
formData.party_a = data.id;
formData.party_a_name = data.company_name;
}
// 表单验证
@ -650,8 +670,11 @@ const { optionsData } = useDictOptions<{
api: deptAll,
},
});
const handleSubmit = async () => {
if (isCheck.value) {
popupRef.value?.close();
return;
}
await formRef.value?.validate();
mode.value == "edit"
? await adminEdit(formData)
@ -659,7 +682,6 @@ const handleSubmit = async () => {
popupRef.value?.close();
emit("success");
};
const open = (type = "add") => {
mode.value = type;
popupRef.value?.open();
@ -776,21 +798,22 @@ const handleClose = () => {
defineExpose({
open,
setFormData,
isCheckFn,
});
</script>
<style lang="scss">
.headimg {
width: 6.5vw;
height: 8vw;
overflow: hidden;
float: left;
margin-top: 24px;
width: 6.2vw;
height: 7.2vw;
float: left;
overflow: hidden;
}
.avatar-uploader-head .el-upload {
width: 7vw;
height: 8.5vw;
width: 6.2vw;
height: 7.2vw;
background-color: #fff;
border: 1px dashed var(--el-border-color);
border-radius: 6px;
@ -801,7 +824,7 @@ defineExpose({
}
.avatar-uploader .el-upload {
width: 10vw;
width: 9.9vw;
height: 6.3vw;
background-color: #fff;
border: 1px dashed var(--el-border-color);