diff --git a/pages/eight_assignments/confined_space/gas/list.vue b/pages/eight_assignments/confined_space/gas/list.vue index f2bb2a5..63f665a 100644 --- a/pages/eight_assignments/confined_space/gas/list.vue +++ b/pages/eight_assignments/confined_space/gas/list.vue @@ -29,7 +29,7 @@ 分析人:{{ item.ANALYZE_USER_NAME }} - + - + - + - + - + - + - + - + - + @@ -77,37 +77,53 @@ export default { this.form = resData.data.aux[0] || {} }, async fnSubmit() { - if (!this.form.GAS_NAME1 && !this.form.GAS_NAME2 && !this.form.GAS_NAME3 && !this.form.GAS_NAME4) { - uni.$u.toast('最少填写一项气体名称') - return - } - for (let i = 0; i < 4; i++) { - if (this.form['GAS_NAME' + (i + 1)] && !this.form['GAS_STANDARD' + (i + 1)]) { - uni.$u.toast('请填写气体名称(' + this.form['GAS_NAME' + (i + 1)] + ')的合格标准') + if (this.isView === '1') { + uni.$u.route({ + url: '/pages/eight_assignments/confined_space/gas/list', + params: { + isView: this.isView, + GAS_NAME1: this.form.GAS_NAME1, + GAS_NAME2: this.form.GAS_NAME2, + GAS_NAME3: this.form.GAS_NAME3, + GAS_NAME4: this.form.GAS_NAME4, + EW_RU_TASK_ID: this.EW_RU_TASK_ID, + EW_RU_JOB_ID: this.EW_RU_JOB_ID + } + }) + } else { + if (!this.form.GAS_NAME1 && !this.form.GAS_NAME2 && !this.form.GAS_NAME3 && !this.form.GAS_NAME4) { + uni.$u.toast('最少填写一项气体名称') return } - if (this.form['GAS_STANDARD' + (i + 1)] && !this.form['GAS_NAME' + (i + 1)]) { - uni.$u.toast('请填写合格标准(' + this.form['GAS_STANDARD' + (i + 1)] + ')的气体名称') - return + for (let i = 0; i < 4; i++) { + if (this.form['GAS_NAME' + (i + 1)] && !this.form['GAS_STANDARD' + (i + 1)]) { + uni.$u.toast('请填写气体名称(' + this.form['GAS_NAME' + (i + 1)] + ')的合格标准') + return + } + if (this.form['GAS_STANDARD' + (i + 1)] && !this.form['GAS_NAME' + (i + 1)]) { + uni.$u.toast('请填写合格标准(' + this.form['GAS_STANDARD' + (i + 1)] + ')的气体名称') + return + } } - } - await setConfinedSpaceGasInfoSave({ - wh: {...this.form}, - EW_RU_TASK_ID: this.EW_RU_TASK_ID, - EW_RU_JOB_ID: this.EW_RU_JOB_ID, - postMethod: 'application/json', - }) - uni.$u.route({ - url: '/pages/eight_assignments/confined_space/gas/list', - params: { - GAS_NAME1: this.form.GAS_NAME1, - GAS_NAME2: this.form.GAS_NAME2, - GAS_NAME3: this.form.GAS_NAME3, - GAS_NAME4: this.form.GAS_NAME4, + await setConfinedSpaceGasInfoSave({ + wh: {...this.form}, EW_RU_TASK_ID: this.EW_RU_TASK_ID, EW_RU_JOB_ID: this.EW_RU_JOB_ID, - } - }) + postMethod: 'application/json', + }) + uni.$u.route({ + url: '/pages/eight_assignments/confined_space/gas/list', + params: { + GAS_NAME1: this.form.GAS_NAME1, + GAS_NAME2: this.form.GAS_NAME2, + GAS_NAME3: this.form.GAS_NAME3, + GAS_NAME4: this.form.GAS_NAME4, + EW_RU_TASK_ID: this.EW_RU_TASK_ID, + EW_RU_JOB_ID: this.EW_RU_JOB_ID, + } + }) + } + } }, }