From 0fee90a21561f4d7f1bfe4343e5a82cd06b50758 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 18:11:38 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OperaUnionChangeCheckWindow.vue | 152 ++++++++++++++++++++++----------------------------
1 files changed, 67 insertions(+), 85 deletions(-)
diff --git a/company/src/components/business/OperaUnionChangeCheckWindow.vue b/company/src/components/business/OperaUnionChangeCheckWindow.vue
index 18b87b7..36247c2 100644
--- a/company/src/components/business/OperaUnionChangeCheckWindow.vue
+++ b/company/src/components/business/OperaUnionChangeCheckWindow.vue
@@ -14,36 +14,59 @@
</el-form>
<!-- 涓婁紶鎵瑰崟 -->
<el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
- <el-form-item >
- <div style="display: inline;margin-right: 50px;" >
- 鏈熸湜鎵瑰鐢熸晥鏈燂細 {{( form.applyTime|| '-')}}
- </div>
- <div style="display: inline" >
- 鏈熸湜鎵瑰噺鐢熸晥鏈燂細 {{( form.delValidTime|| '-')}}
- </div>
- </el-form-item>
- <el-form-item label="" >
- <el-radio-group v-model="form.selectRadio" @change="selectChange">
- <el-radio :label="0" >涓庝繚鍗曚竴鑷�</el-radio>
- <el-radio :label="1" >涓庝繚鍗曚笉涓�鑷�</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鎵瑰鐢熸晥鏃ユ湡锛�" prop="applyTime" v-if="form.selectRadio === 1">
- <el-date-picker
- v-model="form.applyTime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鎵瑰噺鐢熸晥鏃ユ湡锛�" prop="delValidTime" v-if="form.selectRadio === 1">
- <el-date-picker
- v-model="form.delValidTime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
+ <template v-if="model.delOnlyReplace != 1">
+ <el-form-item >
+ <div style="display: inline;margin-right: 50px;" >
+ 鏈熸湜鎵瑰鐢熸晥鏈燂細 {{( form.applyTime|| '-')}}
+ </div>
+ <div style="display: inline" >
+ 鏈熸湜鎵瑰噺鐢熸晥鏈燂細 {{( form.delValidTime|| '-')}}
+ </div>
+ </el-form-item>
+ <el-form-item label="" >
+ <el-radio-group v-model="form.selectRadio" @change="selectChange">
+ <el-radio :label="0" >涓庝繚鍗曚竴鑷�</el-radio>
+ <el-radio :label="1" >涓庝繚鍗曚笉涓�鑷�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="鎵瑰鐢熸晥鏃ユ湡锛�" prop="applyTime" v-if="form.selectRadio === 1">
+ <el-date-picker
+ v-model="form.applyTime"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鎵瑰噺鐢熸晥鏃ユ湡锛�" prop="delValidTime" v-if="form.selectRadio === 1">
+ <el-date-picker
+ v-model="form.delValidTime"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </template>
+ <template v-else>
+ <el-form-item >
+ <div style="display: inline;margin-right: 50px;" >
+ 鏈熸湜鎵规敼鐢熸晥鏈燂細{{( form.delValidTime|| '-')}}
+ </div>
+ </el-form-item>
+ <el-form-item label="" >
+ <el-radio-group v-model="form.selectRadio" @change="selectChange">
+ <el-radio :label="0" >涓庝繚鍗曚竴鑷�</el-radio>
+ <el-radio :label="1" >涓庝繚鍗曚笉涓�鑷�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="鎵规敼鐢熸晥鏃ユ湡锛�" prop="delValidTime" v-if="form.selectRadio === 1">
+ <el-date-picker
+ v-model="form.delValidTime"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </template>
<el-form-item label="鎵瑰崟鍙凤細" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
@@ -240,8 +263,8 @@
this.isWorking = true
var param ={
id: this.model.id,
- applyDate: this.form.applyTime,
- delValidTime: this.form.delValidTime,
+ applyDate: (this.model.delOnlyReplace != 1 ? this.form.applyTime : this.form.delValidTime),
+ delValidTime:this.form.delValidTime,
code: this.form.code,
fileurl: this.form.baoxianFile.fileurl,
name: this.form.baoxianFile.name,
@@ -411,19 +434,6 @@
width: 100%;
display: flex;
align-items: center;
- .box_table_head_item1 {
- flex: 1;
- height: 50px;
- background: #f2f2f2;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 14px;
- color: black;
- border-right: 1px solid #b4bbc5;
- border-bottom: 1px solid #b4bbc5;
- box-sizing: border-box;
- }
.box_table_head_item {
flex: 1;
height: 50px;
@@ -431,39 +441,17 @@
display: flex;
align-items: center;
justify-content: center;
+ padding: 10px;
font-size: 14px;
color: black;
border-right: 1px solid #b4bbc5;
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
&:nth-child(1) {
- flex: 0.5;;
- }
- &:nth-child(2) {
- flex:1.5;
- }
- &:nth-child(4) {
- flex:1.5;
- }
- &:nth-child(5) {
- flex: 1.5;;
- }
- }
- .box_table_head_item5 {
- flex: 1;
- height: 50px;
- background: #f2f2f2;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 14px;
- color: black;
- border-right: 1px solid #b4bbc5;
- border-bottom: 1px solid #b4bbc5;
- box-sizing: border-box;
- &:nth-child(2) {
- flex: 5;
- }
+ flex: 0.5;
+ } &:nth-child(2) {
+ flex: 1.5;
+ }
}
.box_form_item {
flex: 1;
@@ -490,9 +478,10 @@
border-bottom: 0px solid #b4bbc5 !important;
}
.box_table_content_item {
- //white-space: nowrap;
overflow: hidden;
- //text-overflow: ellipsis;
+ display: block;
+ white-space: nowrap;
+ text-overflow: ellipsis;
flex: 1;
height: 50px;
padding: 10px;
@@ -506,17 +495,10 @@
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
&:nth-child(1) {
- flex: 0.5;;
- }
- &:nth-child(2) {
- flex:1.5;
- }
- &:nth-child(4) {
- flex: 1.5;
- }
- &:nth-child(5) {
- flex: 1.5;
- }
+ flex: 0.5;
+ }&:nth-child(2) {
+ flex: 1.5;
+ }
span{
width: 100%;
white-space: nowrap;
--
Gitblit v1.9.3