Browse Source

出入登记新增修改点

zhulu 1 year ago
parent
commit
4fd7e4ec96

+ 2 - 2
src/views/menu/visitRecord/index.vue

@@ -41,8 +41,8 @@
                     已失效
                   </span>
                 <van-button v-if="v.approveStatus==0" @click.stop="cancelOutInRequest(v.id)" type="info" size="mini">取消出入申请</van-button>
-                <van-button v-if="v.approveStatus==1 && v.status!=3 &&!v.arrivalTime" type="info" size="mini">登记入时间</van-button>
-                <van-button v-if="v.approveStatus==1 && v.status!=3 && v.arrivalTime&&!v.departureTime" type="info" size="mini">登记离开时间</van-button>
+                <van-button v-if="v.approveStatus==1 && v.status!=3 &&!v.arrivalTime" type="info" size="mini">登记入时间</van-button>
+                <van-button v-if="v.approveStatus==1 && v.status!=3 && v.arrivalTime&&!v.departureTime" type="info" size="mini">登记出入时间</van-button>
               </template>
             </van-cell>
             <van-cell

+ 4 - 3
src/views/menu/visitRegister/add.vue

@@ -124,7 +124,7 @@
       </div>
 
       <div class="big-btn-box" >
-        <van-button  type="info" size="large" @click="onSubmit">提交</van-button>
+        <van-button  type="info" size="large" @click="onSubmit">保存</van-button>
       </div>
     </div>
 <!--    <van-calendar-->
@@ -295,7 +295,8 @@ export default {
     changeType(){
       this.formData.startTime = dayjs(new Date()).format('YYYY-MM-DD');
       this.formData.effectiveDays = 1;
-      this.formData.endTime = dayjs(this.formData.startTime).add(this.formData.effectiveDays, 'day');
+      this.formData.endTime = dayjs(new Date()).format('YYYY-MM-DD');
+      // console.log("changeType",this.formData.endTime)
     },
     onSubmit(){
       // if(this.visitType ==  '1'){
@@ -393,7 +394,7 @@ export default {
         //alert(JSON.stringify(data));
         // return;
         visitAdd(data).then(res=>{
-          this.$toast.success('提交成功');
+          this.$toast.success('保存成功');
           this.$router.replace({
             name:'visitRegister',
             path:'/visitRegister',

+ 8 - 3
src/views/menu/visitRegister/addOutInRequest.vue

@@ -23,10 +23,10 @@
             <van-cell title="有效天数" v-if="visitInfo.effectiveDays"  :value="`${visitInfo.effectiveDays}天`"></van-cell>
             <van-cell title="介绍信附件"  v-if="visitInfo.letterFile && visitInfo.letterFile.length > 0">
               <template #right-icon>
-                <div class="file-box">
+                <div class="file-box" @click="previewFile(visitInfo.letterFile)">
                   <p class="van-ellipsis" v-for="(v, i) in visitInfo.letterFile"
                      :key="v.url"
-                     @click="previewFile(v)">{{v.name}}</p>
+                     >{{v.name}}</p>
                 </div>
               </template>
             </van-cell>
@@ -200,7 +200,12 @@ export default {
       })
     },
     previewFile(file){
-      this.openFilePreview(file);
+      if(!file || file.length==0) 
+        return;      
+      let imgArr = file.map(v=>{            
+            return v.imgPath;
+          });
+      ImagePreview(imgArr);
     },
     preView(val) {
       if(Array.isArray(val)){