From d654db7fff80b2a9764897859e3e3a5fe23422d1 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 11 Aug 2023 18:23:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/editTow.vue | 93 ++++++++ src/views/task/taskCalendar.vue | 41 +++- src/views/task_scheduling/index.vue | 352 ++++++++++++++++------------ 3 files changed, 328 insertions(+), 158 deletions(-) create mode 100644 src/views/task/editTow.vue diff --git a/src/views/task/editTow.vue b/src/views/task/editTow.vue new file mode 100644 index 0000000..3fbc829 --- /dev/null +++ b/src/views/task/editTow.vue @@ -0,0 +1,93 @@ + + + + diff --git a/src/views/task/taskCalendar.vue b/src/views/task/taskCalendar.vue index a7de82b..05fc778 100644 --- a/src/views/task/taskCalendar.vue +++ b/src/views/task/taskCalendar.vue @@ -1,12 +1,12 @@ - +
@@ -653,7 +663,7 @@ const formData = reactive({ qualification: { business_license: "", business_licenseB: "", - qualifications: [], + other_qualifications: [], bank_accountB: [], bank_account: [], }, @@ -816,7 +826,8 @@ const handleAvatarSuccess_two: UploadProps["onSuccess"] = ( ElMessage.error(response.msg); return; } - formData.qualification.qualifications.push(response.data.uri); + formData.qualification.other_qualifications.push(response.data.uri); + // console.log(formData.qualification.other_qualifications); }; const handleAvatarSuccess_twoB: UploadProps["onSuccess"] = ( response, @@ -981,23 +992,30 @@ const getDetails = async () => { ]; if (data[key] != null && data[key] != undefined) { formData[key] = data[key]; - if (key == "qualification" && formData.qualification.qualifications) { - try { - if (Array.isArray(JSON.parse(formData.qualification.qualifications))) { - formData.qualification.qualifications = JSON.parse( - formData.qualification.qualifications - ); - } else { - const str = formData.qualification.qualifications; - formData.qualification.qualifications = []; - formData.qualification.qualifications.push(str); - } - } catch (error) { - const str = formData.qualification.qualifications; - formData.qualification.qualifications = []; - formData.qualification.qualifications.push(str); - } - } + // if ( + // key == "qualification" && + // formData.qualification.other_qualifications + // ) { + // try { + // if ( + // Array.isArray( + // JSON.parse(formData.qualification.other_qualifications) + // ) + // ) { + // formData.qualification.other_qualifications = JSON.parse( + // formData.qualification.other_qualifications + // ); + // } else { + // const str = formData.qualification.other_qualifications; + // formData.qualification.other_qualifications = []; + // formData.qualification.other_qualifications.push(str); + // } + // } catch (error) { + // const str = formData.qualification.other_qualifications; + // formData.qualification.other_qualifications = []; + // formData.qualification.other_qualifications.push(str); + // } + // } } if (stringArr.includes(key)) formData[key] = formData[key].toString(); }); @@ -1017,7 +1035,7 @@ const getDetails = async () => { }; const clickdelete = (index) => { if (!route.query.read) { - formData.qualification.qualifications.splice(index, 1); + formData.qualification.other_qualifications.splice(index, 1); } }; @@ -1037,8 +1055,8 @@ const handleAvatarSuccessAvatar: UploadProps["onSuccess"] = ( const create = async () => { await formRef.value?.validate(); const data = JSON.parse(JSON.stringify({ ...formData })); - data.qualification.qualifications = JSON.stringify( - data.qualification.qualifications + data.qualification.other_qualifications = JSON.stringify( + data.qualification.other_qualifications ); if (route.query.id) { await apiCompanyEdit(data); @@ -1075,9 +1093,9 @@ defineExpose({ .headimg { margin-left: 18px; + margin-bottom: 18px; width: 120px; height: 140px; - float: left; overflow: hidden; } diff --git a/src/views/company/index.vue b/src/views/company/index.vue index e757016..e829c11 100644 --- a/src/views/company/index.vue +++ b/src/views/company/index.vue @@ -1,7 +1,7 @@