From 13f457c98e6f71dedf27656c434b26c1e67c894d Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Wed, 22 Oct 2025 11:17:34 +0800 Subject: [PATCH] =?UTF-8?q?v1.9=20=E4=BC=98=E5=8C=96OA=E6=B5=8B=E8=AF=95bu?= =?UTF-8?q?g=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/oa/newOaWorkflowForm.vue | 7 +- src/views/fee/roomFeeImportDetail.md | 212 ----------------------- src/views/fee/roomFeeImportList.vue | 2 +- src/views/fee/staffFeeManageList.vue | 7 +- src/views/oa/newOaWorkflowDetailList.vue | 2 +- src/views/oa/newOaWorkflowList.vue | 7 +- src/views/user/login/Login.vue | 4 +- 7 files changed, 17 insertions(+), 224 deletions(-) delete mode 100644 src/views/fee/roomFeeImportDetail.md diff --git a/src/components/oa/newOaWorkflowForm.vue b/src/components/oa/newOaWorkflowForm.vue index a910359f6..6a8bb1081 100644 --- a/src/components/oa/newOaWorkflowForm.vue +++ b/src/components/oa/newOaWorkflowForm.vue @@ -213,11 +213,14 @@ export default { if (res.code === 0) { this.$message.success(this.$t('common.operationSuccess')) this.resetForm() - this.$emit('switch-tab', 'newOaWorkflowPool') + console.log('子组件准备发出 success 事件', 'newOaWorkflowUndo') + this.$emit('success', 'newOaWorkflowUndo') + console.log('子组件已发出 success 事件') } else { this.$message.error(res.msg || this.$t('common.submitFailed')) } } catch (error) { + console.log('提交表单失败，错误信息:', error) if (error.message) { // 表单验证错误 return @@ -249,7 +252,7 @@ export default { resetForm() { this.$refs.form.resetFields() - if (this.$refs.uploadFile) { + if (this.$refs.uploadFile && this.$refs.uploadFile.clear) { this.$refs.uploadFile.clear() } this.fileName = '' diff --git a/src/views/fee/roomFeeImportDetail.md b/src/views/fee/roomFeeImportDetail.md deleted file mode 100644 index b1f504801..000000000 --- a/src/views/fee/roomFeeImportDetail.md +++ /dev/null @@ -1,212 +0,0 @@ -```html -
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
- -
-
- -
-
-
-
-
-
-
-
-
- -
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
{{detail.floorNum}}{{detail.unitNum}}{{detail.roomNum}}{{detail.feeName}}{{detail.startTime}}{{detail.endTime}}{{detail.amount}}{{detail.remark}} - - - - - - -
-
    -
    - - -
    -
    -
    -
    -
    -``` -```js -/** - 入驻小区 - **/ -(function (vc) { - var DEFAULT_PAGE = 1; - var DEFAULT_ROWS = 10; - vc.extends({ - data: { - roomFeeImportDetailInfo: { - importFeeDetails: [], - total: 0, - records: 1, - moreCondition: false, - conditions: { - floorNum: '', - unitNum: '', - roomNum: '', - importFeeId: '' - } - } - }, - _initMethod: function () { - $that.roomFeeImportDetailInfo.conditions.importFeeId = vc.getParam('importFeeId'); - $that._listImportFeeDetails(DEFAULT_PAGE, DEFAULT_ROWS); - }, - _initEvent: function () { - vc.on('pagination', 'page_event', function (_currentPage) { - vc.component._listImportFeeDetails(_currentPage, DEFAULT_ROWS); - }); - }, - methods: { - _listImportFeeDetails: function (_page, _rows) { - vc.component.roomFeeImportDetailInfo.conditions.page = _page; - vc.component.roomFeeImportDetailInfo.conditions.row = _rows; - vc.component.roomFeeImportDetailInfo.conditions.communityId = vc.getCurrentCommunity().communityId; - var param = { - params: vc.component.roomFeeImportDetailInfo.conditions - }; - //发送get请求 - vc.http.apiGet('/importFee/queryImportFeeDetail', - param, - function (json, res) { - var _roomFeeImportDetailInfo = JSON.parse(json); - vc.component.roomFeeImportDetailInfo.total = _roomFeeImportDetailInfo.total; - vc.component.roomFeeImportDetailInfo.records = _roomFeeImportDetailInfo.records; - vc.component.roomFeeImportDetailInfo.importFeeDetails = _roomFeeImportDetailInfo.data; - vc.emit('pagination', 'init', { - total: vc.component.roomFeeImportDetailInfo.records, - currentPage: _page - }); - }, function (errInfo, error) { - console.log('请求失败处理'); - } - ); - }, - _openBillDetail: function () { - }, - _queryFeeDetailMethod: function () { - vc.component._listImportFeeDetails(DEFAULT_PAGE, DEFAULT_ROWS); - }, - _moreCondition: function () { - if (vc.component.roomFeeImportDetailInfo.moreCondition) { - vc.component.roomFeeImportDetailInfo.moreCondition = false; - } else { - vc.component.roomFeeImportDetailInfo.moreCondition = true; - } - }, - _goBack: function () { - vc.goBack(); - } - } - }); -})(window.vc); -``` \ No newline at end of file diff --git a/src/views/fee/roomFeeImportList.vue b/src/views/fee/roomFeeImportList.vue index 948d0ade2..dc70ec083 100644 --- a/src/views/fee/roomFeeImportList.vue +++ b/src/views/fee/roomFeeImportList.vue @@ -28,7 +28,7 @@
    {{ $t('roomFeeImport.table.title') }} - + {{ $t('roomFeeImport.button.import') }}
    diff --git a/src/views/fee/staffFeeManageList.vue b/src/views/fee/staffFeeManageList.vue index 60c4ca6a2..9fa66182d 100644 --- a/src/views/fee/staffFeeManageList.vue +++ b/src/views/fee/staffFeeManageList.vue @@ -35,9 +35,9 @@
    {{ $t('staffFeeManage.list.title') }} - +
    @@ -122,9 +122,6 @@ export default { this.pagination.current = 1 this.getList() }, - handleExport() { - // 导出逻辑 - }, handleSizeChange(val) { this.pagination.size = val this.getList() diff --git a/src/views/oa/newOaWorkflowDetailList.vue b/src/views/oa/newOaWorkflowDetailList.vue index 32844a5fe..96b85e44d 100644 --- a/src/views/oa/newOaWorkflowDetailList.vue +++ b/src/views/oa/newOaWorkflowDetailList.vue @@ -185,7 +185,7 @@ export default { comments: [], action: '', audit: { - auditCode: '1100', + auditCode: '', auditMessage: '', staffId: '', staffName: '', diff --git a/src/views/oa/newOaWorkflowList.vue b/src/views/oa/newOaWorkflowList.vue index 79050c740..f6fb0d7aa 100644 --- a/src/views/oa/newOaWorkflowList.vue +++ b/src/views/oa/newOaWorkflowList.vue @@ -23,7 +23,7 @@
    - +
    @@ -69,12 +69,17 @@ export default { } }, switchTab(tab) { + console.log('父组件 switchTab 被调用，参数 tab:', tab) if (this.activeTab === tab) return this.activeTab = tab setTimeout(() => { this.$refs[tab].open({ flowId: this.flowId }) }, 500) }, + handleFormSuccess(targetTab) { + console.log('父组件收到 success 事件，目标 tab:', targetTab) + this.switchTab(targetTab) + } } } diff --git a/src/views/user/login/Login.vue b/src/views/user/login/Login.vue index 981d0aeab..22a967158 100644 --- a/src/views/user/login/Login.vue +++ b/src/views/user/login/Login.vue @@ -44,8 +44,8 @@ export default { logo: '', companyName:'', loginForm: { - username: 'wuxw', - passwd: 'admin', + username: '', + passwd: '', validateCode: '' }, captchaUrl: '',