zhulu vor 1 Jahr
Ursprung
Commit
f8ac262c97

+ 31 - 0
src/components/dateCell/index.vue

@@ -16,6 +16,7 @@
         :type="dateType"
         :columns="columns"
         :formatter="formatter"
+        :max-date="dataMaxDate"
         @cancel="cancelPicker"
         @confirm="pickerConfirm"
         confirm-button-text="确定"
@@ -64,9 +65,21 @@ export default {
       type: [Boolean,String],
       default: false,
     },
+    updateMaxDateNow:{
+      type: Boolean,
+      default: false,
+    },
+    MaxDate:{
+      type:Date,
+      default:function(){
+        let time =new Date();
+        return new Date(time.setFullYear(time.getFullYear()+10))
+      },
+    }
   },
   data(){
     return{
+      dataMaxDate:this.getDeafultMaxDate(),
       showPicker:false,
       selected:null,
       columns: [],
@@ -97,6 +110,15 @@ export default {
         }
       },
       immediate: true
+    },
+    MaxDate:{
+      handler (val) {
+        if(val)
+        {
+          this.dataMaxDate=val;
+        }
+      },
+      immediate: true
     }
   },
   created() {
@@ -132,8 +154,17 @@ export default {
       this.$emit('change',this.label)
     },
     clickItem(){
+      if(this.updateMaxDateNow)
+      {
+        this.dataMaxDate=new Date();
+      }
       this.showPicker = true;
     },
+    getDeafultMaxDate()
+    {
+      let time =new Date();
+      return time.setFullYear(time.getFullYear()+10)
+    }
   },
   model:{
     prop: 'value',

+ 1 - 0
src/components/peopleList/index.vue

@@ -9,6 +9,7 @@
       :label="inpitLabel"
       placeholder="请选择人员"
       @click="show = true"
+      :type="peoples&&peoples.length>=15?'textarea':''"
     />
 
     <van-dialog v-model="show" width="95%" title="选择人员" @confirm="submitHandler" confirm-button-color="#1989fa" show-cancel-button>

+ 3 - 3
src/views/menu/visitRecord/detail.vue

@@ -83,8 +83,8 @@
                 </div>
               </van-cell>
             </div>
-            <date-cell v-if="canRecord() && !selectedUser.arrivalTime" required title="进入时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" />
-            <date-cell v-if="canRecord() && selectedUser.arrivalTime && !selectedUser.departureTime" required title="离开时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.departureTime" date-type="datetime" />
+            <date-cell v-if="canRecord() && !selectedUser.arrivalTime" required title="进入时间" :max-date="maxDate" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" />
+            <date-cell v-if="canRecord() && selectedUser.arrivalTime && !selectedUser.departureTime" required title="离开时间" :max-date.sync="maxDate" :updateMaxDateNow="true" :min-date='minDate' :is-row="true"  v-model="formData.departureTime" date-type="datetime" />
           </div>
 
           <van-action-sheet v-model="showSign" title="安全员签名" class="sheet">
@@ -122,7 +122,7 @@ export default {
   components: {Uploader, DateCell,writingPad,imgCom},
   data(){
     return {
-      maxData:new Date(),
+      maxDate:new Date(),
       minDate:null,
       visitId:null,
       userList:[],