From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把

---
 company/src/components/business/OperaUnionChangeCheckWindow.vue |   41 +++++++++++++++++++++++++++++++++++------
 1 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/company/src/components/business/OperaUnionChangeCheckWindow.vue b/company/src/components/business/OperaUnionChangeCheckWindow.vue
index 367b56b..18b87b7 100644
--- a/company/src/components/business/OperaUnionChangeCheckWindow.vue
+++ b/company/src/components/business/OperaUnionChangeCheckWindow.vue
@@ -12,10 +12,15 @@
             <el-input type="textarea" v-model="form.backCheckInfo" placeholder="璇疯緭鍏�" v-trim/>
           </el-form-item>
         </el-form>
-        <!--    涓婁紶淇濋櫓鍗�    -->
+        <!--    涓婁紶鎵瑰崟    -->
       <el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
-        <el-form-item label="鏈熸湜淇濋櫓鐢熸晥鏈燂細">
-          <span >{{( form.applyTime|| '-')}} </span>
+        <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">
@@ -23,7 +28,7 @@
             <el-radio :label="1" >涓庝繚鍗曚笉涓�鑷�</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�" prop="applyTime" v-if="form.selectRadio === 1">
+        <el-form-item label="鎵瑰鐢熸晥鏃ユ湡锛�" prop="applyTime" v-if="form.selectRadio === 1">
           <el-date-picker
               v-model="form.applyTime"
               type="date"
@@ -31,10 +36,18 @@
               placeholder="閫夋嫨鏃ユ湡">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="淇濆崟鍙凤細" prop="code">
+        <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>
+        <el-form-item label="鎵瑰崟鍙凤細" prop="code">
           <el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
         </el-form-item>
-        <el-form-item label="涓婁紶淇濋櫓鍗曪細" prop="baoxianFile">
+        <el-form-item label="涓婁紶鎵瑰崟锛�" prop="baoxianFile">
           <UploadFile @remove="dele3"  :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
         </el-form-item>
         <div class="box_table">
@@ -107,6 +120,7 @@
         id: null,
         backCheckInfo: '',
         applyTime: null,
+        delValidTime: null,
         code: null,
         baoxianFile: null,
         bxdMultifileList: [],
@@ -146,6 +160,7 @@
         startTime: null,
         code: null,
         baoxianFile: null,
+        delValidTime: null,
         bxdMultifileList:[],
         fileList1: [],
         selectRadio: 0,
@@ -154,6 +169,7 @@
 
       this.model = target
       this.form.applyTime = target.applyStartTime
+      this.form.delValidTime = target.delValidTime
       this.title = title
       this.flag = flag
       this.visible1 = false
@@ -195,6 +211,7 @@
     selectChange () {
       if (this.form.selectRadio == 0) {
         this.form.applyTime = this.model.applyStartTime
+        this.form.delValidTime = this.model.delValidTime
       }
     },
     baoxianFileUploaded (data) {
@@ -224,6 +241,7 @@
           var param ={
             id: this.model.id,
             applyDate: this.form.applyTime,
+            delValidTime: this.form.delValidTime,
             code: this.form.code,
             fileurl: this.form.baoxianFile.fileurl,
             name: this.form.baoxianFile.name,
@@ -472,8 +490,12 @@
           border-bottom: 0px solid #b4bbc5 !important;
         }
         .box_table_content_item {
+          //white-space: nowrap;
+          overflow: hidden;
+          //text-overflow: ellipsis;
           flex: 1;
           height: 50px;
+          padding: 10px;
           background: #ffffff;
           display: flex;
           align-items: center;
@@ -495,6 +517,13 @@
           &:nth-child(5) {
             flex: 1.5;
           }
+          span{
+            width: 100%;
+            white-space: nowrap;
+            word-wrap: break-word;
+            text-overflow: ellipsis;
+            overflow: hidden;
+          }
         }
       }
     }

--
Gitblit v1.9.3