From 529d0b8982cf30f57ba7e366c0f822c1d82c0b69 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 五月 2024 13:37:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/enterprise/additionSubtractionApplication.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index d021461..224afe6 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -2,7 +2,7 @@
<GlobalWindow
:title="title"
width="100%"
- text="鎶曚繚鐢宠"
+ text="鎵规敼鐢宠"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
@@ -173,6 +173,8 @@
<confirmJobType ref="confirmJobType" @result="getUser" />
<!-- 璇︽儏 -->
<ApplyChangeDetails1 ref="ApplyChangeDetails1" @success="success" />
+ <!-- 鍔犲噺淇濊鎯� -->
+ <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" />
</GlobalWindow>
</template>
@@ -184,6 +186,7 @@
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
import ApplyChangeDetails1 from '@/components/business/ApplyChangeDetails1'
+import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import { all } from '@/api/business/solutions'
import { getDetail } from '@/api/business/insuranceApply'
import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
@@ -192,7 +195,7 @@
export default {
name: 'additionSubtractionApplication',
extends: BaseOpera,
- components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, ApplyChangeDetails1 },
+ components: { GlobalWindow, selectEmployees, OperaApplyChangeDetailWindow, addEmployee, importEmployees, confirmJobType, ApplyChangeDetails1 },
data () {
return {
form: {
@@ -380,10 +383,11 @@
delDetailList: this.form.delDetailList,
validTime: this.form.applyStartTime,
type: 0
- }).then(() => {
+ }).then(res => {
this.visible = false
this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- this.$emit('success')
+ this.$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { applyId: this.form.id, id: res })
+ // this.$emit('success')
}).catch(e => {
this.$tip.apiFailed(e)
}).finally(() => {
--
Gitblit v1.9.3