From 71e2d06dfa28d3bd60b0d9fa6d6c7ff32884a1a9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 14:04:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OpearaUnionChangeUnit.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/company/src/components/business/OpearaUnionChangeUnit.vue b/company/src/components/business/OpearaUnionChangeUnit.vue
index 25ff19a..61c4110 100644
--- a/company/src/components/business/OpearaUnionChangeUnit.vue
+++ b/company/src/components/business/OpearaUnionChangeUnit.vue
@@ -19,6 +19,7 @@
<div style="display: flex; flex-direction: column;">
<el-date-picker
v-model="form.applyDate"
+ placeholder="鍓嶉�夋嫨鏃ユ湡"
type="date"
format="yyyy 骞� MM 鏈� dd 鏃�"
value-format="yyyy-MM-dd" />
@@ -63,20 +64,20 @@
label="琚繚闄╀汉">
</el-table-column>
<el-table-column
- prop="applyStartTime"
- label="鏈熸湜淇濋櫓鐢熸晥璧锋湡">
+ prop="validCode"
+ label="淇濆崟鍙�">
</el-table-column>
<el-table-column
- prop="addNum"
- label="鍔犱繚浜烘暟">
+ prop="startTime"
+ label="淇濋櫓鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
- prop="delNum"
- label="鍑忎繚浜烘暟">
+ prop="endTime"
+ label="淇濋櫓鐢熸晥姝㈡湡">
</el-table-column>
<el-table-column
- prop="fee"
- label="璐圭敤鍙樻洿">
+ prop="changeNum"
+ label="鎹㈠巶浜烘暟">
</el-table-column>
<el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
@@ -156,7 +157,7 @@
import selectApplicationForm from '@/components/business/selectApplicationForm'
import { listAll } from '@/api/business/applyChange'
import { merge } from '@/api/business/unionChange'
-import ApplyChangeDetails from '@/components/business/ApplyChangeDetails'
+import ApplyChangeDetails from '@/components/business/ApplyChangeUnitDetails'
import { fetchList as pageUnionList } from '@/api/business/unionApply'
import {getDetail} from "@/api/business/insuranceApply";
export default {
@@ -208,7 +209,7 @@
checkDetial(row){
getDetail(row.applyId).then(res => {
// this.apply = res
- this.$refs.ApplyChangeDetails.open('鍔犲噺淇濅汉鍛樺悕鍗�',res, row,2)
+ this.$refs.ApplyChangeDetails.open('鏇存崲娲鹃仯鍗曚綅浜哄憳',res, row,2)
}).catch(err => {
})
},
--
Gitblit v1.9.3