Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

src/components/dateCell/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="date-cell" >
-    <van-cell v-if="disabled" :required="required" :title="title"  :value="isRow?label:''" :label="!isRow?label:''" />
+    <van-cell v-if="disabled" :title="title"  :value="isRow?label:''" :label="!isRow?label:''" />
     <van-cell v-else :title="title" :required="required" :value="isRow?label:''" :label="!isRow?label:''"  @click="clickItem">
       <template #right-icon>
         <van-icon name="notes-o" class="date-icon"/>

src/components/upload/gxuploader.vue

@@ -220,6 +220,12 @@ export default {
   }
 };
 </script>
+<style lang="scss">
+.van-uploader__upload{
+  //width: 140px;
+  //height: 140px;
+}
+</style>
 <style lang="scss" scoped>
 .upload-text {
   font-size: 18px;

src/views/menu/visitCheck/detail.vue

@@ -26,9 +26,9 @@
                 <div
                   class="nfc-img van-hairline--surround"
                   v-for="(v, i) in visitInfo.letterFile"
-                  :key="v.imgPath"
-                  @click="preView(v.imgPath)">
-                  <img :src="imgUrl(v.imgPath)" alt="" />
+                  :key="v.url"
+                  @click="preView(v.url)">
+                  <img :src="imgUrl(v.url)" alt="" />
                 </div>
                 <!--                      <img class="nfc-img" v-for="v in item.imgData" :src="imgUrl(v.imgPath)" alt="" :key="v.id">-->
               </van-cell>

src/views/menu/visitRecord/add.vue

@@ -5,6 +5,9 @@
       <!--   基本信息   -->
       <div class="card">
         <van-panel title="来访信息" >
+          <template #header>
+            <span></span>
+          </template>
 <!--          <template #header>-->
 <!--            <van-cell title="状态">-->
 <!--              <template #extra>-->
@@ -62,10 +65,12 @@
               label="陪同人员"></van-field>
             <div class="upload-box" >
               <span class="required">核验结果</span>
-              <uploader :maxCount="2" v-model="formData.checkImage"/>
+              <van-cell>
+                <uploader :maxCount="2" v-model="formData.checkImage"/>
+              </van-cell>
             </div>
-            <date-cell required title="到达时间"  v-model="formData.arrivalTime" date-type="datetime" />
-            <date-cell title="离开时间"  v-model="formData.departureTime" date-type="datetime" />
+            <date-cell required title="到达时间" :max-date="maxData" v-model="formData.arrivalTime" date-type="datetime" />
+<!--            <date-cell title="离开时间" :max-date="maxData" v-model="formData.departureTime" date-type="datetime" />-->
           </div>
           <div class="big-btn-box" >
             <van-button  type="info" size="large" @click="onSubmit">确认保存</van-button>
@@ -90,6 +95,7 @@ export default {
   components: {Uploader, DateCell},
   data(){
     return {
+      maxData:new Date(),
       visitId:null,
       userList:[],
       selectedUser:{},
@@ -167,7 +173,7 @@ export default {
       })
     },
     preView(val) {
-      ImagePreview(val);
+      ImagePreview(imgUrl(val));
     },
   }
 }
@@ -241,7 +247,7 @@ export default {
   align-items: center;
 }
 .upload-box{
-  padding: 20px 30px;
+  padding: 0 30px;
   display: flex;
   >span{
     display: inline-block;

src/views/menu/visitRecord/detail.vue

@@ -39,8 +39,9 @@
             </div>
             <van-cell title="出入类型" :value="getDictLabel(selectedUser.type,'out_in_type')"></van-cell>
             <van-cell title="陪同人员" :value="selectedUser.accompanyingPerson"></van-cell>
-            <div class="upload-box" >
+            <div class="upload-box" v-if="selectedUser.checkImage && selectedUser.checkImage.length > 0">
               <span>核验结果</span>
+              <van-cell >
               <div
                 class="nfc-img van-hairline--surround"
                 v-for="(v, i) in selectedUser.checkImage"
@@ -48,11 +49,12 @@
                 @click="preView(v)">
                 <img :src="imgUrl(v)" alt="" />
               </div>
+              </van-cell>
             </div>
-            <date-cell required title="到达时间" :is-row="true"  v-model="selectedUser.arrivalTime" date-type="datetime" />
-            <date-cell required title="离开时间" :is-row="true"  v-model="selectedUser.departureTime" date-type="datetime" />
+            <date-cell :disabled="selectedUser.departureTime" required title="到达时间" :max-date="maxData" :is-row="true"  v-model="selectedUser.arrivalTime" date-type="datetime" />
+            <date-cell :disabled="selectedUser.departureTime" required title="离开时间" :max-date="maxData" :is-row="true"  v-model="selectedUser.departureTime" date-type="datetime" />
           </div>
-          <div  class="big-btn-box" >
+          <div v-if="!selectedUser.departureTime" class="big-btn-box" >
             <van-button  type="info" size="large" @click="onSubmit">确认登记</van-button>
           </div>
         </van-panel>
@@ -75,6 +77,7 @@ export default {
   components: {Uploader, DateCell},
   data(){
     return {
+      maxData:new Date(),
       visitId:null,
       userList:[],
       selectedUser:{},
@@ -83,11 +86,8 @@ export default {
         value:'id'
       },
       formData:{
-        letterUserId:null,
         arrivalTime:null,
         departureTime:null,
-        accompanyingPerson:null,
-        checkImage:null,
       },
       dicts:['out_in_approve_status','out_in_type']
     }
@@ -102,12 +102,19 @@ export default {
   methods:{
     imgUrl,formatDate,
     onSubmit(){
+      let {arrivalTime,departureTime} = this.selectedUser;
+      if(!arrivalTime){
+        this.$toast('请选择到达时间');
+        return
+      }
+      if(!departureTime){
+        this.$toast('请选择离开时间');
+        return
+      }
       let data = {
-        ...this.formData,
-        letterId:this.selectedUser.letterId,
-        checkImage:this.formData.checkImage.map(v=>{return v.imgPath}).toString(','),
-        letterUserId:this.selectedUser.id,
-        orgId:this.orgId,
+        id:this.selectedUser.id,
+        arrivalTime,
+        departureTime,
       }
       alert(JSON.stringify(data))
       userDepart(data).then(res=>{
@@ -118,7 +125,6 @@ export default {
       })
     },
     getUserInfo(){
-
       userDetails(this.visitId).then(res=>{
         let checkImage = res.data.checkImage.split(',');
         let imgFile = res.data.imgFile.split(',');
@@ -132,7 +138,7 @@ export default {
       })
     },
     preView(val) {
-      ImagePreview(val);
+      ImagePreview(imgUrl(val));
     },
   }
 }

src/views/menu/visitRegister/add.vue

@@ -76,7 +76,7 @@
         <van-swipe-cell>
           <div class="goods-card">
            <div class="card-img-box" @click="preView(v.imgFile)">
-             <p>{{v.imgFile[0].imgPath}}</p>
+<!--             <p>{{v.imgFile[0].imgPath}}</p>-->
              <img :src="imgUrl(v.imgFile[0].imgPath)" alt="">
            </div>
            <div class="card-cell-box">
@@ -259,7 +259,7 @@ export default {
       this.formData.receptionOrgIds = [this.orgId];
       this.formData.userInfos = this.pList;
       let data = this.formData;
-      alert(JSON.stringify(data))
+      //alert(JSON.stringify(data))
       if(this.visitType ==  '2'){
         data.letterFile = this.formData.letterFile.map(v=>{
           return JSON.stringify(v);

src/views/menu/visitRegister/detail.vue

@@ -20,9 +20,9 @@
             <van-cell title="出入事由" :value="visitInfo.reasons"></van-cell>
             <van-cell title="访问日期" :value="visitInfo.startTimeStr"></van-cell>
             <van-cell title="结束日期" :value="visitInfo.endTimeStr"></van-cell>
-            <div class="upload-box">
+            <div class="upload-box" v-if="visitInfo.letterFile && visitInfo.letterFile.length > 0">
               <span>介绍信文件</span>
-              <van-cell v-if="visitInfo.letterFile">
+              <van-cell>
                 <div
                   class="nfc-img van-hairline--surround"
                   v-for="(v, i) in visitInfo.letterFile"
@@ -204,10 +204,6 @@ export default {
     line-height: 160px;
     font-size: 28px;
     color:#999;
-    >i{
-      font-style: normal;
-      color: #ee0a24;
-    }
   }
 }
 .goods-card{

yarn.lock

@@ -3154,13 +3154,12 @@ easy-stack@1.0.1:
   resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz#8afe4264626988cabb11f3c704ccd0c835411066"
   integrity sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==
 
-echarts@^5.4.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.4.3.tgz#f5522ef24419164903eedcfd2b506c6fc91fb20c"
-  integrity sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==
+echarts@^4.9.0:
+  version "4.9.0"
+  resolved "https://registry.npmmirror.com/echarts/-/echarts-4.9.0.tgz#a9b9baa03f03a2a731e6340c55befb57a9e1347d"
+  integrity sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==
   dependencies:
-    tslib "2.3.0"
-    zrender "5.4.4"
+    zrender "4.3.2"
 
 ee-first@1.1.1:
   version "1.1.1"
@@ -5873,11 +5872,6 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
-tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
 tslib@^2.0.3:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
@@ -6394,9 +6388,7 @@ yargs@^16.0.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-zrender@5.4.4:
-  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.4.4.tgz#8854f1d95ecc82cf8912f5a11f86657cb8c9e261"
-  integrity sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==
-  dependencies:
-    tslib "2.3.0"
+zrender@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz#ec7432f9415c82c73584b6b7b8c47e1b016209c6"
+  integrity sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==