From 0f409b25f91717e00e10c37738740b22583cb4ff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 08 五月 2024 09:00:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaWtbApplyShopWindow.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index d31b62f..39cddd5 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -271,6 +271,11 @@
<span>{{row.fee!=null?row.fee: '-'}}</span>
</template>
</el-table-column>
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
</el-table>
<el-table
:data="list1"
@@ -326,8 +331,20 @@
:key="Math.random()"
prop="applyStartTime"
align="center"
- label="鎵瑰崟鐢熸晥璧锋湡">
+ label="鎵瑰鐢熸晥鏃ユ湡">
</el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="delValidTime"
+ align="center"
+ label="鎵瑰噺鐢熸晥鏃ユ湡">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
<el-table-column
align="center"
:key="Math.random()"
@@ -387,6 +404,11 @@
label="鎵瑰崟鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
+ <el-table-column
:key="Math.random()"
align="center"
label="鎿嶄綔">
@@ -432,7 +454,7 @@
<!-- 浼佷笟鐢宠閫�鍥� -->
<applyReturn ref="applyReturn" @success="successEvent" />
<!-- 鏂板鎶曚繚 -->
- <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
+ <OperaInsuranceApplyWindow ref="OperaInsuranceApply" @success="successEvent" />
<!-- 鍔犲噺淇濈敵璇� -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
<!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
@@ -485,6 +507,7 @@
import factoryChange from '@/components/enterprise/factoryChange'
import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
+import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
import applyReturn from '@/components/enterprise/applyReturn'
@@ -500,7 +523,6 @@
import { findListByDTO } from '@/api/business/dispatchUnit'
import { fetchList } from '@/api/business/applyChange'
import { findListByDTO as worktypeFindListByDTO } from '@/api/business/worktype'
-import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
import { mapState } from 'vuex'
import {sendSms} from "@/api/business/smsEmail";
@@ -512,7 +534,7 @@
InsuranceDetails,
OperaWtbApplyCheckWindow,
applyReturn,
- OperaInsuranceApply,
+ OperaInsuranceApplyWindow,
additionSubtractionApplication,
factoryChange,
OperaApplyChangeDetailWindow,
--
Gitblit v1.9.3