diff --git a/.gitignore b/.gitignore index 365ba09..487e841 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ pnpm-debug.log* lerna-debug.log* node_modules +.vscode .DS_Store dist dist-ssr diff --git a/src/api/perms/admin.ts b/src/api/perms/admin.ts index d1d0e7f..b0c611e 100644 --- a/src/api/perms/admin.ts +++ b/src/api/perms/admin.ts @@ -34,4 +34,4 @@ export function generateGontract(params: any) { // 发送短信 export function sendMsgApi(params: any) { return request.get({ url: '/company/postsms', params }) -} \ No newline at end of file +} diff --git a/src/views/company/dialog_index_personnel.vue b/src/views/company/dialog_index_personnel.vue new file mode 100644 index 0000000..c094fdd --- /dev/null +++ b/src/views/company/dialog_index_personnel.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue index 2136ac1..120918b 100644 --- a/src/views/company/edit.vue +++ b/src/views/company/edit.vue @@ -7,129 +7,65 @@ - + - + - - + + - - + + - - + + - - + + - - + + - + @@ -139,70 +75,32 @@ - + - + - + - + - - - - - - - - + + + @@ -213,59 +111,33 @@ - 其他联系人 + 其他联系人 @@ -275,38 +147,22 @@ - - + + - - + + @@ -315,38 +171,22 @@ - - + + - - + + @@ -401,68 +241,55 @@ - - - - - - - - - - - - - 上传 - - - - - - + + + + + + + + + + + + + + + + + + 上传 + + + + + - 修改 - 创建 + 修改 + 创建 - + - - - @@ -499,11 +326,8 @@ isDisabled = route.query.read isEdit = route.query.edit // 表单数据 const formData = reactive({ - admin_id: '', - admin_name: '', - area_manager: '', - area_manager_name: '', - id: '', + man: "", + id: "", // level_two: '', // level_one: '', company_name: '', @@ -520,11 +344,11 @@ const formData = reactive({ master_email: '', other_contacts: [ { - name: '', - position: '', - phone: '', - email: '' - } + name: "", + position: "", + phone: "", + email: "", + }, ], // area_manager: '', // is_contract: '', @@ -533,10 +357,10 @@ 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: '', @@ -545,8 +369,8 @@ const formData = reactive({ contract_no: '系统自动生成' }, //签约方 - party_a_name: '', - file_image: '' + party_a_name: "", + file_image: "", // status: '' }) @@ -560,95 +384,83 @@ const datas = reactive({ areaOptions: [], streetOptions: [], dictTypeLists: [], - contract_type: [] -}) -const fileList = ref([ - { - name: '', - url: '' - } -]) + contract_type: [], +}); // 表单验证 const formRules = reactive({ 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) + 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 -} -//区域管理人员 -function EventAreaManager(data: any) { - isAreaManager.value = false - formData.area_manager_name = data.name - formData.area_manager = data.id + isMan.value = false; + console.log(data) + // formData.contract.party_a = data.id; + formData.man = data.name; } function openCompany() { - isCompany.value = true + isCompany.value = true; } // 获取详情 @@ -656,150 +468,172 @@ const setFormData = async (data: Record) => { 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) => { const data = await apiCompanyDetail({ - id: row.id - }) - setFormData(data) -} + id: row.id, + }); + setFormData(data); +}; //上传图片1 -const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) => { - if (response.code == 0) { - ElMessage.error(response.msg) - return - } - 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 -} +const handleAvatarSuccess: UploadProps["onSuccess"] = ( + response, + uploadFile +) => { + formData.qualification.business_license = response.data.uri; +}; +const handleAvatarSuccessB: UploadProps["onSuccess"] = ( + response, + uploadFile +) => { + formData.qualification.business_licenseB = response.data.uri; +}; +const beforeAvatarUpload: UploadProps["beforeUpload"] = (rawFile) => { + // if (rawFile.type !== 'image/jpeg') { + // ElMessage.error('Avatar picture must be JPG format!') + // return false + // } else if (rawFile.size / 1024 / 1024 > 2) { + // ElMessage.error('Avatar picture size can not exceed 2MB!') + // return false + // } + return true; +}; //上传图片2 -const handleAvatarSuccess_two: UploadProps['onSuccess'] = (response, uploadFile) => { - if (response.code == 0) { - ElMessage.error(response.msg) - return - } - 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 -} +const handleAvatarSuccess_two: UploadProps["onSuccess"] = ( + response, + uploadFile +) => { + formData.qualification.bank_account = response.data.uri; +}; +const handleAvatarSuccess_twoB: UploadProps["onSuccess"] = ( + response, + uploadFile +) => { + formData.qualification.bank_accountB = response.data.uri; +}; +const beforeAvatarUpload_two: UploadProps["beforeUpload"] = (rawFile) => { + // if (rawFile.type !== 'image/jpeg') { + // ElMessage.error('Avatar picture must be JPG format!') + // return false + // } else if (rawFile.size / 1024 / 1024 > 2) { + // ElMessage.error('Avatar picture size can not exceed 2MB!') + // return false + // } + return true; +}; //上传文件3 -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 = '合同文件' -} +const handleAvatarSuccess_three: UploadProps["onSuccess"] = ( + response, + uploadFile +) => { + formData.file_image = response.data.uri; + formData.contract.file = response.data.uri; +}; +const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => { + // if (rawFile.type !== 'application/msword') { + // ElMessage.error('请选择word格式的文件!') + // return false + // } + // else if (rawFile.size / 1024 / 1024 > 2) { + // ElMessage.error('Avatar picture size can not exceed 2MB!') + // return false + // } + return true; +}; //增加其他联系人 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({ - id: route.query.id - }) + id: route.query.id, + }); Object.keys(formData).forEach((key) => { - const stringArr = ['province', 'city', 'area', 'street'] + const stringArr = ["province", "city", "area", "street"]; //@ts-ignore - formData[key] = data[key] + formData[key] = data[key]; if (stringArr.includes(key)) { - formData[key] = formData[key].toString() - getCityList() - getAreaList() - getStreetList() + formData[key] = formData[key].toString(); + getCityList(); + getAreaList(); + getStreetList(); } - }) - formData['party_a_name'] = data['contract']['party_a_name'] - formData['file_image'] = data['contract']['file'] - fileList.value[0].url = data['contract']['file'] - fileList.value[0].name = '合同文件' -} -getProvinceList() -getdictTypeLists() -getcontract_type() + }); + formData["party_a_name"] = data["contract"]["party_a_name"]; + formData["file_image"] = data["contract"]["file"]; +}; +getProvinceList(); +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, +}); \ No newline at end of file diff --git a/src/views/contract/edit.vue b/src/views/contract/edit.vue index 9db2cba..1614d4d 100644 --- a/src/views/contract/edit.vue +++ b/src/views/contract/edit.vue @@ -1,6 +1,9 @@ diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue index 53a6934..07fc1b9 100644 --- a/src/views/permission/admin/edit.vue +++ b/src/views/permission/admin/edit.vue @@ -10,185 +10,183 @@ >
基本信息创建
-
-

- - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - -

- - +
+ + + + + +
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + :label="item.province_name" + :value="item.province_code" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - +
资质信息
- @@ -211,7 +208,7 @@ - + > + + + + + + + + + + + 上传 + + + @@ -492,8 +486,8 @@ const formData = reactive({ }, // 合同类型 contract_type: '', - party_a: '', file: '', + // 授权身份 role_id: '', avatar: '', multipoint_login: 1, @@ -520,7 +514,8 @@ getcontract_type() const isCompany = ref(false) function customEvent(data: any) { isCompany.value = false - formData.party_a = data.id + // formData.contract.party_a = data.id + console.log(data) formData.party_a_name = data.company_name } // 表单验证 @@ -734,8 +729,16 @@ defineExpose({