From c921c6590db4b3204c7aeefdd4ee1e5f6b5c6e91 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 4 Dec 2024 17:04:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E6=9C=AA?= =?UTF-8?q?=E4=BC=A0=E9=83=A8=E9=97=A8id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/eight_assignments/to_do_list.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/eight_assignments/to_do_list.vue b/pages/eight_assignments/to_do_list.vue index 338ac6b..a622dcb 100644 --- a/pages/eight_assignments/to_do_list.vue +++ b/pages/eight_assignments/to_do_list.vue @@ -78,7 +78,8 @@ export default { currentPage: this.currentPage, TYPE: this.type, vectors: '0', - REQUEST_SOURCE: '2' + REQUEST_SOURCE: '1', + DEPARTMENT_ID: this.$store.state.userInfo.DEPARTMENT_ID }); this.list = [...this.list, ...resData.list.list]; this.totalPage = resData.list.totalPage; From 87003da2d109b1873e9236a518fd0271f1b7f72d Mon Sep 17 00:00:00 2001 From: shanao Date: Wed, 4 Dec 2024 17:07:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90bug=E3=80=91=201.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9B=B2=E6=9D=BF=E7=94=B3=E8=AF=B7=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=AD=BE=E5=AD=97=E5=90=8E=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/eight_assignments/blind_board/apply.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/eight_assignments/blind_board/apply.vue b/pages/eight_assignments/blind_board/apply.vue index 331ac23..0884f3c 100644 --- a/pages/eight_assignments/blind_board/apply.vue +++ b/pages/eight_assignments/blind_board/apply.vue @@ -304,8 +304,8 @@ export default { } }) }, - fnSign(event) { - this.form.SIGN = event.filePath + fnSign({ path }) { + this.form.SIGN = path }, async fnSubmit() { try { From 6739da17338a333413e81b5d3e304379304ede0e Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 4 Dec 2024 17:26:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E9=BB=98=E8=AE=A4=E5=80=BC=E6=B8=85?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/eight_assignments/blind_board/apply.vue | 4 ++-- pages/eight_assignments/break_ground/apply.vue | 4 ++-- pages/eight_assignments/confined_space/apply.vue | 4 ++-- pages/eight_assignments/cut_road/apply.vue | 4 ++-- pages/eight_assignments/electricity/apply.vue | 4 ++-- pages/eight_assignments/high_work/apply.vue | 4 ++-- pages/eight_assignments/hoisting/apply.vue | 4 ++-- pages/eight_assignments/hot_work/select_position.vue | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pages/eight_assignments/blind_board/apply.vue b/pages/eight_assignments/blind_board/apply.vue index 0884f3c..b3efdaf 100644 --- a/pages/eight_assignments/blind_board/apply.vue +++ b/pages/eight_assignments/blind_board/apply.vue @@ -175,8 +175,8 @@ export default { BOARD_INSTALL_TIME: '', WORK_END_DATE: '', WORK_USER: '', - WORK_LONGITUDE: '1', - WORK_LATITUDE: '1', + WORK_LONGITUDE: '', + WORK_LATITUDE: '', MEDIUM: '', TEMPERATURE: '', PRESSURE: '', diff --git a/pages/eight_assignments/break_ground/apply.vue b/pages/eight_assignments/break_ground/apply.vue index 46c83cd..d5e3aee 100644 --- a/pages/eight_assignments/break_ground/apply.vue +++ b/pages/eight_assignments/break_ground/apply.vue @@ -128,8 +128,8 @@ export default { CORP_NAME: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '1', - WORK_LATITUDE: '1', + WORK_LONGITUDE: '', + WORK_LATITUDE: '', WORK_PLACE: '', JOB_CONTENT: '', WORK_CONTENT: '', diff --git a/pages/eight_assignments/confined_space/apply.vue b/pages/eight_assignments/confined_space/apply.vue index b75af3b..0b520ee 100644 --- a/pages/eight_assignments/confined_space/apply.vue +++ b/pages/eight_assignments/confined_space/apply.vue @@ -119,8 +119,8 @@ export default { WORK_CONTENT: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '1', - WORK_LATITUDE: '1', + WORK_LONGITUDE: '', + WORK_LATITUDE: '', WORK_USER: '', SPECIAL_WORK: '', RISK_IDENTIFICATION: '', diff --git a/pages/eight_assignments/cut_road/apply.vue b/pages/eight_assignments/cut_road/apply.vue index 9c82fe3..bb3d4d3 100644 --- a/pages/eight_assignments/cut_road/apply.vue +++ b/pages/eight_assignments/cut_road/apply.vue @@ -128,8 +128,8 @@ export default { CORP_NAME: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '1', - WORK_LATITUDE: '1', + WORK_LONGITUDE: '', + WORK_LATITUDE: '', OTHER_DEPT: '', WORK_REASON: '', WORK_CONTENT: '', diff --git a/pages/eight_assignments/electricity/apply.vue b/pages/eight_assignments/electricity/apply.vue index 1292a2d..8acb5b0 100644 --- a/pages/eight_assignments/electricity/apply.vue +++ b/pages/eight_assignments/electricity/apply.vue @@ -132,8 +132,8 @@ export default { CORP_NAME: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '1', - WORK_LATITUDE: '1', + WORK_LONGITUDE: '', + WORK_LATITUDE: '', WORK_PLACE: '', WORK_CONTENT: '', WORK_USER: '', diff --git a/pages/eight_assignments/high_work/apply.vue b/pages/eight_assignments/high_work/apply.vue index 8422cce..edc6d29 100644 --- a/pages/eight_assignments/high_work/apply.vue +++ b/pages/eight_assignments/high_work/apply.vue @@ -121,8 +121,8 @@ export default { WORK_CONTENT: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '1', - WORK_LATITUDE: '1', + WORK_LONGITUDE: '', + WORK_LATITUDE: '', SPECIAL_WORK: '', RISK_IDENTIFICATION: '', }, diff --git a/pages/eight_assignments/hoisting/apply.vue b/pages/eight_assignments/hoisting/apply.vue index 52322a7..983c723 100644 --- a/pages/eight_assignments/hoisting/apply.vue +++ b/pages/eight_assignments/hoisting/apply.vue @@ -136,8 +136,8 @@ export default { WORK_CONTENT: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '1', - WORK_LATITUDE: '1', + WORK_LONGITUDE: '', + WORK_LATITUDE: '', SPECIAL_WORK: '', RISK_IDENTIFICATION: '', }, diff --git a/pages/eight_assignments/hot_work/select_position.vue b/pages/eight_assignments/hot_work/select_position.vue index 7d6b9d5..309443a 100644 --- a/pages/eight_assignments/hot_work/select_position.vue +++ b/pages/eight_assignments/hot_work/select_position.vue @@ -43,8 +43,8 @@ export default { {name: '纬度', key_name: 'WORK_LATITUDE', type: 0} ], form: { - WORK_LONGITUDE: '1', - WORK_LATITUDE: '1' + WORK_LONGITUDE: '', + WORK_LATITUDE: '' }, rules: { WORK_LONGITUDE: [{type: 'string', required: true, message: '请输入经度', trigger: ['blur', 'change']}], From 10542eabc429f298409de5a35aaade4230ac5e59 Mon Sep 17 00:00:00 2001 From: shanao Date: Wed, 4 Dec 2024 18:26:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90bug=E3=80=91=201.=20=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=85=B6=E4=BB=96=E4=BD=9C=E4=B8=9A=E7=A5=A8=20?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/other-select/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/other-select/index.vue b/components/other-select/index.vue index c71159f..b76a1c3 100644 --- a/components/other-select/index.vue +++ b/components/other-select/index.vue @@ -4,8 +4,8 @@ + :label="type === 'assignments' ? item.ID : item.NAME" + :name="type === 'assignments' ? item.ID : item.NAME">