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/ApplyChangeDetails.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/company/src/components/business/ApplyChangeDetails.vue b/company/src/components/business/ApplyChangeDetails.vue
index c6725e8..19f6125 100644
--- a/company/src/components/business/ApplyChangeDetails.vue
+++ b/company/src/components/business/ApplyChangeDetails.vue
@@ -19,7 +19,8 @@
<div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
<div class="box_table_head_item">鍔犱繚浜烘暟</div>
<div class="box_table_head_item">鍑忎繚浜烘暟</div>
- <div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
+ <div class="box_table_head_item">鎵瑰鐢熸晥鏃ユ湡</div>
+ <div class="box_table_head_item">鎵瑰噺鐢熸晥鏃ユ湡</div>
</div>
<div class="box_table_content " >
<div class="box_table_content_item box_table_content_header">{{ apply.companyName }}</div>
@@ -30,6 +31,7 @@
<div class="box_table_content_item box_table_content_header">{{ model.addNum}}</div>
<div class="box_table_content_item box_table_content_header">{{ model.delNum}}</div>
<div class="box_table_content_item box_table_content_header">{{ model.applyStartTime}}</div>
+ <div class="box_table_content_item box_table_content_header">{{ model.delValidTime}}</div>
</div>
</div>
<div class="box_table">
@@ -41,29 +43,41 @@
<div class="box_table_head_item">搴忓彿</div>
<div class="box_table_head_item">鍛樺伐濮撳悕</div>
<div class="box_table_head_item">韬唤璇佸彿</div>
+<!--
<div class="box_table_head_item">鎬у埆</div>
+-->
<div class="box_table_head_item">娲鹃仯鍗曚綅</div>
<div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ <div class="box_table_head_item">澶囨敞</div>
<div class="box_table_head_item">搴忓彿</div>
<div class="box_table_head_item">鍛樺伐濮撳悕</div>
<div class="box_table_head_item">韬唤璇佸彿</div>
+<!--
<div class="box_table_head_item">鎬у埆</div>
+-->
<div class="box_table_head_item">娲鹃仯鍗曚綅</div>
<div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ <div class="box_table_head_item">澶囨敞</div>
</div>
<div class="box_table_content" v-for="(item, index) in detailList" :key="index">
<div class="box_table_content_item">{{item.add.id!=null?(index + 1):''}}</div>
<div class="box_table_content_item" >{{ item.add.memberName }}</div>
<div class="box_table_content_item">{{ item.add.memberIdcardNo }}</div>
+<!--
<div class="box_table_content_item">{{ item.add.sex==0?"鐢�":(item.add.sex==1?"濂�":"" )}}</div>
+-->
<div class="box_table_content_item">{{ item.add.duName }}</div>
<div class="box_table_content_item">{{item.add.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.add.remark}}</div>
<div class="box_table_content_item">{{item.del.id!=null?(index + 1):''}}</div>
<div class="box_table_content_item" >{{ item.del.memberName }}</div>
<div class="box_table_content_item">{{ item.del.memberIdcardNo }}</div>
+<!--
<div class="box_table_content_item">{{ item.del.sex==0?"鐢�":(item.del.sex==1?"濂�":"" ) }}</div>
+-->
<div class="box_table_content_item">{{ item.del.duName }}</div>
<div class="box_table_content_item">{{item.del.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.del.remark}}</div>
</div>
</div>
<div class="box_table" v-if="type==1" style="border-top: 0px solid #b4bbc5;" >
@@ -134,7 +148,9 @@
this.model = target2
this.form.id = target2.id
this.type = target3
- this.getDetailListDo()
+ if(this.form.id){
+ this.getDetailListDo()
+ }
},
check (type) {
this.form.dealBackApply = type
@@ -314,12 +330,12 @@
border-right: 1px solid #b4bbc5;
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
- &:nth-child(3) {
- flex: 1.5;;
- }
- &:nth-child(9) {
- flex: 1.5;;
- }
+ //&:nth-child(3) {
+ // flex: 1.5;;
+ //}
+ //&:nth-child(9) {
+ // flex: 1.5;;
+ //}
}
.box_table_head_item5 {
flex: 1;
@@ -334,7 +350,7 @@
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
&:nth-child(2) {
- flex: 5.5;
+ flex: 5;
}
}
.box_form_item {
@@ -370,15 +386,17 @@
justify-content: center;
font-size: 14px;
color: black;
+ word-wrap: break-word;
+ word-break: break-all;
border-right: 1px solid #b4bbc5;
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
- &:nth-child(3) {
- flex: 1.5;
- }
- &:nth-child(9) {
- flex: 1.5;
- }
+ //&:nth-child(3) {
+ // flex: 1.5;
+ //}
+ //&:nth-child(9) {
+ // flex: 1.5;
+ //}
}
}
}
--
Gitblit v1.9.3