From a4945c89ee72aa8b6f2c0a75653a3256a2b30b4f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 五月 2024 19:02:57 +0800
Subject: [PATCH] 提交一把

---
 company/src/components/business/OpearaUnionChange.vue |   73 +++++++++++++++++++++++++++++-------
 1 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/company/src/components/business/OpearaUnionChange.vue b/company/src/components/business/OpearaUnionChange.vue
index b8285f9..6282bed 100644
--- a/company/src/components/business/OpearaUnionChange.vue
+++ b/company/src/components/business/OpearaUnionChange.vue
@@ -15,16 +15,18 @@
             <span style="color: #F95601; font-size: 14px;">锛�1. 璇烽�夋嫨淇濋櫓鍗曞悗杩涜鎿嶄綔锛�</span>
           </div>
         </el-form-item>
-        <el-form-item label="鎵瑰崟鐢熸晥璧锋湡锛�" prop="applyDate" style="margin-left: 40px">
+<!--        <el-form-item label="鐢宠鏃ユ湡锛�" prop="applyDate" style="margin-left: 40px">
           <div style="display: flex; flex-direction: column;">
             <el-date-picker
                 v-model="form.applyDate"
                 type="date"
-                format="yyyy 骞� MM 鏈� dd 鏃�"
+                :picker-options="pickerOptions"
+                format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨鏃ユ湡"
                 value-format="yyyy-MM-dd" />
             <span style="color: #F95601; font-size: 14px;">锛�2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
           </div>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="璐圭敤" v-if="model">
           <span>{{model.price}}鍏�</span>
           <span v-if="model.timeUnit === 0">/澶�</span>
@@ -64,7 +66,11 @@
       </el-table-column>
       <el-table-column
           prop="applyStartTime"
-          label="鏈熸湜淇濋櫓鐢熸晥璧锋湡">
+          label="鎵瑰鐢熸晥鏃ユ湡">
+      </el-table-column>
+      <el-table-column
+          prop="delValidTime"
+          label="鎵瑰噺鐢熸晥鏃ユ湡">
       </el-table-column>
       <el-table-column
           prop="addNum"
@@ -85,23 +91,23 @@
         </template>
       </el-table-column>
     </el-table>
-    <div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">锛�3. 璇峰厛閫夋嫨鑷冲皯涓�鏉$敵璇峰悗鎻愪氦鎶曚繚鐢宠锛�</div>
+    <div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">锛�2. 璇峰厛閫夋嫨鑷冲皯涓�鏉$敵璇峰悗鎻愪氦鎶曚繚鐢宠锛�</div>
     <div class="info" v-if="model">
-      <span v-if="model.specialAgreement">{{model.specialAgreement}}</span>
-      <span v-if="model.specialInfo">{{model.specialInfo}}</span>
-      <span v-if="model.ortherInfo">{{model.ortherInfo}}</span>
+      <span v-if="model.specialAgreement" v-html="model.specialAgreement"></span>
+      <span v-if="model.specialInfo" v-html="model.specialInfo"> </span>
+      <span v-if="model.ortherInfo" v-html="model.ortherInfo"> </span>
     </div>
     <!--    閫夋嫨鐢宠鍗�    -->
     <ApplyChangeDetails ref="ApplyChangeDetails" @success="getValue" />
     <el-dialog
         title="閫夋嫨淇濋櫓鍗�"
         :visible.sync="visibleSelect"
-        width="70%"
+        width="80%"
         :modal="true"
         :show-close="false"
         append-to-body
         center>
-      <div class="desc_item_from">
+      <div class="desc_item_from" id="selectTable">
         <el-table
             ref="multipleTable1"
             v-loading="isWorking.search"
@@ -114,7 +120,7 @@
          <el-table-column
             type="selection"
             width="55">
-        </el-table-column>
+         </el-table-column>
           <el-table-column label="搴忓彿" width="80px">
             <template slot-scope="scope">
               <span>{{scope.$index + 1}}</span>
@@ -128,6 +134,7 @@
           <el-table-column prop="code" label="淇濆崟鍙�" min-width="100px"></el-table-column>
           <el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
           <el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+          <el-table-column prop="addApplyNum" label="鐢宠鍗曟暟" min-width="100px"></el-table-column>
           <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
           <el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
         </el-table>
@@ -159,6 +166,7 @@
 import ApplyChangeDetails from '@/components/business/ApplyChangeDetails'
 import { fetchList as pageUnionList } from '@/api/business/unionApply'
 import {getDetail} from "@/api/business/insuranceApply";
+import {compareDates, getDate, getTomorrow} from "@/utils/util";
 export default {
   name: 'add_subtract_entrust',
   extends: BaseOpera,
@@ -171,6 +179,7 @@
         applyDate: null,
         businessType: 0
       },
+      pickerOptions: {},
       visibleSelect:false,
       solutions: [],
       currentPage:0,
@@ -186,9 +195,9 @@
         unionApplyId: [
           { required: true, message: '璇烽�夋嫨淇濋櫓鍗�' }
         ],
-        applyDate: [
-          { required: true, message: '璇烽�夋嫨淇濋櫓鐢熸晥璧锋湡' }
-        ]
+        // applyDate: [
+        //   { required: true, message: '璇烽�夋嫨淇濋櫓鐢熸晥璧锋湡' }
+        // ]
       }
     }
   },
@@ -197,6 +206,15 @@
       api: '/business/insuranceApply',
       'field.id': 'id'
     })
+ /*   var now = new Date()
+    var start = now.setDate(now.getDate()+1)
+    var end = now.setDate(now.getDate()+10)
+    this.pickerOptions = {
+      disabledDate (time) {
+        console.log(( time.getTime() < start.getTime() ||  time.getTime()>end.getTime()))
+        return ( time.getTime() < start.getTime() ||  time.getTime()>end.getTime())
+      }
+    }*/
   },
   methods: {
     rowselect(row){
@@ -236,6 +254,16 @@
         this.model = null
       }
     },
+    convertToDate(dateString) {
+      try {
+        const parts = dateString.split(/[- : \/]/);
+        const monthIndex = parts[1] - 1
+        const convertedDate = new Date( parts[0], monthIndex, parts[2], parts[3], parts[5], parts[6] )
+        return convertedDate
+      }catch (e) {
+        return new Date()
+      }
+    },
     selectDo(){
       if(!this.model){
         this.$tip.apiFailed({
@@ -244,8 +272,21 @@
         })
         return
       }
+      this.form.applyDate=null
       this.visibleSelect=false
       this.form.unionApplyId = this.model.id
+       var that =this
+      this.pickerOptions = {
+        disabledDate (time) {
+          var start = new Date(that.model.startTime)
+          start.setDate(start.getDate() + 1);
+          var end = new Date(that.model.endTime)
+          // console.log(end )
+          // console.log(time )
+          return ( time.getTime() < start.getTime() ||  time.getTime()>end.getTime())
+        }
+      }
+
       this.getList();
     },
     confirm () {
@@ -321,6 +362,7 @@
         capacity: 10,
         page: this.currentPage,
         model: {
+          queryFlag:1,
           status: 3,
         }
       }).then(res => {
@@ -372,6 +414,9 @@
     align-items: center;
   }
 }
+::v-deep .desc_item_from .el-table__header .el-checkbox{
+  display:none!important;
+}
 .submit {
   width: 100%;
   display: flex;

--
Gitblit v1.9.3