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"> diff --git a/pages/eight_assignments/blind_board/apply.vue b/pages/eight_assignments/blind_board/apply.vue index 331ac23..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: '', @@ -304,8 +304,8 @@ export default { } }) }, - fnSign(event) { - this.form.SIGN = event.filePath + fnSign({ path }) { + this.form.SIGN = path }, async fnSubmit() { try { 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']}], 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;