Merge branch 'develop-zhouyi' into 'develop'

Develop zhouyi

See merge request GFP/RBC/rbc-frontend!59

develop/@gms/gms-plugin-billexpand/src/query-actions/voucherQueryTYAction.js

@@ -32,10 +32,8 @@ export default {
     showVchrAsync(obj,context){
         GMS.$http.post('/mechanismVchr/showVchr',obj).then(res => {
             if (res.status === 200) {
-                if(res.data.data.showVoucher){//展示凭证
-                    let resObj = res.data.data;
-                    resObj.previewState = 'readonly';
-                    GMS.vbus.$emit('previewVoucher',res.data.data);
+                if(res.data.data){//展示凭证
+                    GMS.vbus.$emit('previewVoucherTY',res.data.data);
                 }else{
                     context.dom.$Modal.warning({
                         title: '信息提示',

develop/@rbc/rbc-login/src/views/login/index.vue

@@ -156,7 +156,22 @@ export default {
   },
   watch: {
   },
+  created() {
+    this.getLoginAssetsInfo();
+  },
+  mounted() {
+    document.addEventListener('keyup', this.onKeyUp)
+    this.getVerificationCode();
+  },
+  beforeUnmount() {
+    document.removeEventListener('keyup', this.onKeyUp)
+  },
   methods: {
+    onKeyUp(event) {
+      if (event.keyCode == 13) {
+        this.submit()
+      }
+    },
     getImgUrl(imgCode) {
       const time = Date.now()
       return window.GMS.$http.get(`/homepage/downloadFile/${imgCode}`, {
@@ -277,12 +292,6 @@ export default {
       }
     },
   },
-  mounted() {
-    this.getVerificationCode();
-  },
-  created() {
-    this.getLoginAssetsInfo();
-  },
 };
 </script>
 

develop/@rbc/voucher-center/app.config.json

@@ -32,6 +32,16 @@
           "titleColumn": "title",
           "valueColumn": "name"
         }
+      },
+      {
+        "title": "凭证打开方式",
+        "key": "voucherShowType",
+        "type": "array",
+        "dataSource": {
+          "api": "/mechanismVchr/configOptions",
+          "titleColumn": "title",
+          "valueColumn": "name"
+        }
       }
     ]
   },

develop/@rbc/voucher-center/src/views/voucher-center.vue

@@ -148,11 +148,26 @@ export default {
         this.jumpToVoucher(param.voucher.id,param.voucher.acctYear,param.previewState);
       })
     })
+    window.GMS.vbus.$on('previewVoucherTY', (param) => {
+      if (this.config.voucherShowType == 'modal') {
+        this.showVoucher = true;
+        this.$nextTick(() => {
+          let iframe0 = document.getElementById("iframe0");
+          if (iframe0) {
+              iframe0.src = param
+          }
+        })
+      }
+      else {
+        window.open(param, '_blank');
+      }
+    })
     this.getCerSerName();
     this.searchAllQueryAsync();
   },
   beforeDestroy() {
     window.GMS.vbus.$off("previewVoucher");
+    window.GMS.vbus.$off("previewVoucherTY");
   },
 };
 </script>