From 9748f3f74f9f5d49d23528e9005bd82577591992 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 10 四月 2024 18:24:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 company/src/components/business/OpearaUnionChange.vue |   48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/company/src/components/business/OpearaUnionChange.vue b/company/src/components/business/OpearaUnionChange.vue
index 7bff961..94d9c61 100644
--- a/company/src/components/business/OpearaUnionChange.vue
+++ b/company/src/components/business/OpearaUnionChange.vue
@@ -20,7 +20,8 @@
             <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>
@@ -97,12 +98,12 @@
     <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"
@@ -115,7 +116,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>
@@ -129,6 +130,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>
@@ -160,6 +162,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,
@@ -172,6 +175,7 @@
         applyDate: null,
         businessType: 0
       },
+      pickerOptions: {},
       visibleSelect:false,
       solutions: [],
       currentPage:0,
@@ -198,6 +202,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){
@@ -237,6 +250,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({
@@ -245,8 +268,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 () {
@@ -322,6 +358,7 @@
         capacity: 10,
         page: this.currentPage,
         model: {
+          queryFlag:1,
           status: 3,
         }
       }).then(res => {
@@ -373,6 +410,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