From 6a36e6a39dde3633eda48c6c366836e708be82ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=97=9C=E8=A1=80=E9=BE=99=E5=B8=85?= <1493694146@qq.com> Date: Thu, 20 Jul 2023 22:05:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/company/dialog_index_man.vue | 83 ++ src/views/company/edit.vue | 1451 ++++++++++++----------- src/views/company/index.vue | 462 ++++---- src/views/contract/index.vue | 314 ++--- src/views/permission/admin/edit.vue | 1511 ++++++++++++------------ src/views/permission/admin/index.vue | 440 ++++--- 6 files changed, 2175 insertions(+), 2086 deletions(-) create mode 100644 src/views/company/dialog_index_man.vue diff --git a/src/views/company/dialog_index_man.vue b/src/views/company/dialog_index_man.vue new file mode 100644 index 0000000..c094fdd --- /dev/null +++ b/src/views/company/dialog_index_man.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue index 5f20354..87b7d94 100644 --- a/src/views/company/edit.vue +++ b/src/views/company/edit.vue @@ -1,402 +1,402 @@ diff --git a/src/views/company/index.vue b/src/views/company/index.vue index daf2b14..383b0ef 100644 --- a/src/views/company/index.vue +++ b/src/views/company/index.vue @@ -1,311 +1,273 @@ diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index 47efb81..db99116 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -1,193 +1,205 @@ diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue index 690f9a3..b5b8b71 100644 --- a/src/views/permission/admin/edit.vue +++ b/src/views/permission/admin/edit.vue @@ -1,536 +1,507 @@ diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue index 357a100..62d0e47 100644 --- a/src/views/permission/admin/index.vue +++ b/src/views/permission/admin/index.vue @@ -1,253 +1,251 @@ \ No newline at end of file + margin-top: 10vh; + display: flex; + justify-content: space-around; +} + \ No newline at end of file From 0dabadaa64cb9a0802ed9a14e8e5d73c901fcbe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=97=9C=E8=A1=80=E9=BE=99=E5=B8=85?= <1493694146@qq.com> Date: Thu, 20 Jul 2023 22:23:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/company/edit.vue | 4 ++ src/views/permission/admin/edit.vue | 58 ++--------------------------- 2 files changed, 7 insertions(+), 55 deletions(-) diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue index d05df30..87b7d94 100644 --- a/src/views/company/edit.vue +++ b/src/views/company/edit.vue @@ -410,7 +410,10 @@ --> @@ -500,6 +503,7 @@ const formData = reactive({ master_position: "", master_phone: "", master_email: "", + other_contacts: [ { name: "", diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue index 55dc714..b5b8b71 100644 --- a/src/views/permission/admin/edit.vue +++ b/src/views/permission/admin/edit.vue @@ -175,11 +175,11 @@ :style="{ width: '100%' }" clearable > -<<<<<<< HEAD -======= @@ -417,11 +417,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3 >>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3 party_a_name: "", qualification: { id_card: "", @@ -504,10 +497,6 @@ const formData = reactive({ // 合同类型 contract_type: "", file: "", -<<<<<<< HEAD -======= - is_contract: 0, ->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3 role_id: "", avatar: "", multipoint_login: 1, @@ -566,12 +555,8 @@ getcontract_type(); const isCompany = ref(false); function customEvent(data: any) { isCompany.value = false; -<<<<<<< HEAD // formData.contract.party_a = data.id console.log(data); -======= - // formData.contract.party_a = data.id ->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3 formData.party_a_name = data.company_name; } // 表单验证 @@ -764,7 +749,6 @@ const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => { //获取省份 function province_change(value: string) { -<<<<<<< HEAD getCityList(); } function city_change(value: string) { @@ -772,18 +756,6 @@ function city_change(value: string) { } function area_change(value: string) { getStreetList(); -======= - formData.province = value; - getCityList(value); -} -function city_change(value: string) { - formData.city = value; - getAreaList(value); -} -function area_change(value: string) { - formData.area = value; - getStreetList(value); ->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3 } function street_change(value: string) { formData.street = value; @@ -792,7 +764,6 @@ const getProvinceList = async () => { const data = await apiProvinceList({}); datas["provinceOptions"] = data; }; -<<<<<<< HEAD const getCityList = async () => { const data = await apiCityList({ city: formData.province }); datas["cityOptions"] = data; @@ -807,20 +778,6 @@ const getStreetList = async () => { }; getProvinceList(); -======= -const getCityList = async (id: any) => { - const data = await apiCityList({ city: id }); - datas["cityOptions"] = data; -}; -const getAreaList = async (id: any) => { - const data = await apiAreaList({ area: id }); - datas["areaOptions"] = data; -}; -const getStreetList = async (id: any) => { - const data = await apiStreetList({ street: id }); - datas["streetOptions"] = data; -}; ->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3 const setFormData = async (row: any) => { const data = await adminDetail({ id: row.id, @@ -832,16 +789,12 @@ const setFormData = async (row: any) => { key == "role_id" ? (formData[key] = data[key][0]) : (formData[key] = data[key]); -<<<<<<< HEAD if (stringArr.includes(key)) { formData[key] = formData[key].toString(); getCityList(); getAreaList(); getStreetList(); } -======= - if (stringArr.includes(key)) formData[key] = formData[key].toString(); ->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3 } } }; @@ -849,11 +802,6 @@ const setFormData = async (row: any) => { const handleClose = () => { emit("close"); }; -<<<<<<< HEAD -======= -getProvinceList(); - ->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3 defineExpose({ open, setFormData, From 13633e5290fbee80ddad6d2fbf8504c9cf5e891a Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 21 Jul 2023 08:56:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/company/edit.vue | 1470 +++++++++++++-------------- src/views/permission/admin/edit.vue | 1437 +++++++++++++------------- 2 files changed, 1430 insertions(+), 1477 deletions(-) diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue index 87b7d94..f047c11 100644 --- a/src/views/company/edit.vue +++ b/src/views/company/edit.vue @@ -1,402 +1,413 @@ diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue index b5b8b71..24b425a 100644 --- a/src/views/permission/admin/edit.vue +++ b/src/views/permission/admin/edit.vue @@ -1,507 +1,502 @@ From 65cfbf43cffa3c1b31ec6132abb265b60889fd6c Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 21 Jul 2023 11:22:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/company.ts | 7 +- src/views/company/edit.vue | 294 ++++++++--------- src/views/company/index.vue | 456 +++++++++++++++------------ src/views/company/subordinate.vue | 229 ++++++++++++++ src/views/permission/admin/edit.vue | 251 +++++++-------- src/views/permission/admin/index.vue | 451 +++++++++++++------------- 6 files changed, 987 insertions(+), 701 deletions(-) create mode 100644 src/views/company/subordinate.vue diff --git a/src/api/company.ts b/src/api/company.ts index c273ada..eb316b3 100644 --- a/src/api/company.ts +++ b/src/api/company.ts @@ -23,4 +23,9 @@ export function apiCompanyDelete(params: any) { // 公司详情 export function apiCompanyDetail(params: any) { return request.get({ url: '/company/detail', params }) -} \ No newline at end of file +} + +// 下属公司详情 +export function apiSubordinateList(params: any) { + return request.get({ url: '/company/subordinate', params }) +} diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue index f047c11..b73186d 100644 --- a/src/views/company/edit.vue +++ b/src/views/company/edit.vue @@ -181,18 +181,30 @@ > - - + + + + + + +
其他联系人
@@ -266,12 +278,11 @@ -
电子合同
- - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - 上传 - - - - - - + + + + diff --git a/src/views/company/subordinate.vue b/src/views/company/subordinate.vue new file mode 100644 index 0000000..77a03f2 --- /dev/null +++ b/src/views/company/subordinate.vue @@ -0,0 +1,229 @@ + + + + diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue index 24b425a..4a672ff 100644 --- a/src/views/permission/admin/edit.vue +++ b/src/views/permission/admin/edit.vue @@ -188,7 +188,7 @@ /> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - 上传 - - - + + + + 上传 + + + + @@ -497,39 +499,6 @@ const formData = reactive({ multipoint_login: 1, root: 0 }) -// const formData = reactive({ -// id: '', -// sex: '1', -// id_card: '513701200012105613', -// name: 'zmj', -// province: '', -// city: '', -// area: '', -// street: '', -// address: '', -// phone: '15884967539', -// // v-model="formData.party_a_name" - -// party_a_name:"", -// qualification: { -// id_card: '', -// id_card_b: '', -// car_card: '', -// car_card_b: '', -// bank_account: '', -// bank_account_b: '' -// }, -// // 合同类型 -// contract_type: '', -// // 合同 -// contract: '', -// file: '', -// is_contract: 0, -// role_id: "", -// avatar: '', -// multipoint_login: 1, -// root: 0 -// }) // 字典信息 const datas: any = reactive({ provinceOptions: [], diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue index 62d0e47..2367ad8 100644 --- a/src/views/permission/admin/index.vue +++ b/src/views/permission/admin/index.vue @@ -1,251 +1,278 @@ \ No newline at end of file +