zhulu 5 днів тому
батько
коміт
5f8f8f6326

+ 16 - 3
src/components/upload/idCardPhotoUploader.vue

@@ -13,7 +13,8 @@
         :max-size="maxSize * 1024*1024">
         <template #preview-cover="{ file }">
           <div v-if="!showUpload" class="image-zoom-icon">
-            <van-icon name="search" size="30px" color="#fff"/>
+            <img src="../../assets/svg/glass.svg" width="30px" height="30px" color="#fff"/>
+            <!-- <van-icon name="search" size="30px" color="#fff"/> -->
           </div>
         </template>
       </van-uploader>
@@ -266,19 +267,31 @@ export default {
     // height: 100% !important;
     width: 330px !important;
     height: 186px !important;
-    max-height: 26vw;
+    max-height: 26vw;    
+    object-fit: cover;
+    .van-image__img{
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      border-radius: 10px;
+      overflow: hidden;
+    }
   }
   .IdCardImg{
     width: 100%;  
     height: 100%;  
     object-fit: cover;  
     border-radius: 10px;
-    max-height: 26vw;
+    overflow: hidden;
+    // max-height: 26vw;
   }
+
 }
 
 </style>
 <style lang="scss" scoped>
+
+
  .image-zoom-icon {
   position: absolute;
   top: 50%;

+ 2 - 1
src/views/menu/NFCmanage/index.vue

@@ -101,6 +101,7 @@ export default {
     //自定义nfc回调
     openNFCScanCallBack(nfcStr){
       //nfcStr = '{"content":"123456789"}';
+      // alert(nfcStr)
       let nfcCode;
       try{
         let nfc = JSON.parse(nfcStr);
@@ -108,7 +109,7 @@ export default {
       }catch (e) {
         nfcCode = nfcStr.content;
       }
-      //alert(nfcCode)
+      // alert(nfcCode)
       this.nfcMsg = '读取中...';
       if(!nfcCode) {
         this.$toast({

+ 1 - 1
src/views/menu/introduceLetter/letter/addOutInRequest.vue

@@ -139,7 +139,7 @@ export default {
     ...mapGetters(['orgId','id','dictionary'])
   },
   mounted(){
-   
+    this.oldSignatureSeal = JSON.parse(window.sessionStorage.getItem('SET_MASTER_SIGNATURE_SEAL')) + '';
     this.letterId = this.$route.query.letterId;
     // console.log(this.$route.query,this.$route.query.letterId,this.letterId)
     this.getInfo();

+ 8 - 2
src/views/menu/introduceLetter/letter/approvalOutInRequest.vue

@@ -194,7 +194,7 @@ export default {
     ...mapGetters(['orgId','id','dictionary'])
   },
   mounted(){
-   
+    this.oldSignatureSeal = JSON.parse(window.sessionStorage.getItem('SET_MASTER_SIGNATURE_SEAL')) + '';
     this.outInRequestId = this.$route.query.outInRequestId;
     this.getInfo();
   },
@@ -206,7 +206,13 @@ export default {
     },
     confirmSignImg(){
       this.cancelSign();
-      this.submitOutInrRequest(this.oldSignatureSeal);
+      let data = {
+        approveStatus:1,
+        id:this.outInRequestId,
+        approveSignImg:this.oldSignatureSeal,
+        status:this.outInRequestInfo.status
+      }
+      this.submitOutInRequestApproveData(data);
     },
     //取消出入申请
     onCancelOutInRequest()

+ 1 - 1
src/views/menu/introduceLetter/letter/index.vue

@@ -385,7 +385,7 @@ export default {
 }
  .card-list{
     padding:0 5px 0px 5px;
-    height: calc(100vh - 370px);
+    height: calc(100vh - 480px);
     overflow: auto;
   }
 .list-section {

+ 1 - 1
src/views/menu/introduceLetter/outIn/index.vue

@@ -319,7 +319,7 @@ export default {
 }
  .card-list{
     padding:0 5px 0px 5px;
-    height: calc(100vh - 370px);
+    height: calc(100vh - 570px);
     overflow: auto;
   }
 .list-section {