From 68bffb1927df90548f7674f4a9e0f3e8c26a7f1f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 19:28:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/enterprise/additionSubtractionApplication.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 647d7a6..8409f63 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -12,6 +12,9 @@
<el-form-item label="淇濋櫓鏂规">
<span>{{form.solutionsName}}</span>
</el-form-item>
+ <el-form-item label=" ">
+ <span style="color: #F95601; font-size: 14px;">鎵规敼鎻愮ず锛氾紙娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
+ </el-form-item>
<!-- <el-form-item label="鐢宠鏃ユ湡" prop="applyStartTime">
<div style="display: flex; flex-direction: column;">
<el-date-picker
@@ -187,7 +190,7 @@
<!-- 璇︽儏 -->
<ApplyChangeDetails1 ref="ApplyChangeDetails1" @success="success" />
<!-- 鍔犲噺淇濊鎯� -->
- <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" />
+<!-- <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" />-->
</GlobalWindow>
</template>
@@ -199,7 +202,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 OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import { all } from '@/api/business/solutions'
import { getDetail } from '@/api/business/insuranceApply'
import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
@@ -208,7 +211,15 @@
export default {
name: 'additionSubtractionApplication',
extends: BaseOpera,
- components: { GlobalWindow, selectEmployees, OperaApplyChangeDetailWindow, addEmployee, importEmployees, confirmJobType, ApplyChangeDetails1 },
+ components: {
+ GlobalWindow,
+ selectEmployees,
+ // OperaApplyChangeDetailWindow,
+ addEmployee,
+ importEmployees,
+ confirmJobType,
+ ApplyChangeDetails1
+ },
data () {
return {
form: {
@@ -407,8 +418,8 @@
}).then(res => {
this.visible = false
this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- this.$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { applyId: this.form.id, id: res })
- this.$emit('success')
+ // this.$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { applyId: this.form.id, id: res })
+ this.$emit('success', { applyId: this.form.id, id: res })
}).catch(e => {
this.$tip.apiFailed(e)
}).finally(() => {
--
Gitblit v1.9.3