Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

66136186 · chase · da9f5117 · 601da161 · 66136186 · 66136186
Commit 66136186 authored Apr 16, 2019 by chase
Show whitespace changes
Inline Side-by-side

Showing with 62 additions and 3 deletions

vat-preview-invoice-record.ctrl.js ...preview-invoice-record/vat-preview-invoice-record.ctrl.js +1 -1

index.html atms-web/src/main/webapp/orangeweb/index.html +61 -2

No files found.
--- a/atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-record/vat-preview-invoice-record.ctrl.js
+++ b/atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-record/vat-preview-invoice-record.ctrl.js
@@ -314,7 +314,7 @@
                 { name: $translate.instant('InvoicePaperNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoicesAmount}}</span></div>' },
                 { name: $translate.instant('CustomerCompanyTaxNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.customerCompanyTaxNum}}</span></div>' },
                 { name: $translate.instant('CustomerSourceSystem'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.contractSourceSystem}}</span></div>' },
-                 { name: $translate.instant('TaxRate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxRate}}</span></div>' },
+                 { name: $translate.instant('TaxRate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxRate*100+"%"}}</span></div>' },
                 { name: $translate.instant('TaxAmount'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxAmount}}</span></div>' },
                 { name: $translate.instant('InvoiceStatus'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceStatus}}</span></div>' },
                 { name: $translate.instant('InvoiceSource'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.source}}</span></div>' },

--- a/atms-web/src/main/webapp/orangeweb/index.html
+++ b/atms-web/src/main/webapp/orangeweb/index.html
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.c8b0fed0.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.c8b0fed0.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html>
+<html lang=en>
+<head>
+    <meta charset=utf-8>
+    <meta http-equiv=X-UA-Compatible content="IE=edge">
+    <meta name=viewport content="width=device-width,initial-scale=1">
+    <link rel=icon href=favicon.ico>
+    <title>didi2</title>
+    <link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
+    <link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons">
+    <link href=js/about.17654e8a.js rel=prefetch>
+    <link href=css/app.cf16809e.css rel=preload as=style>
+    <link href=css/chunk-vendors.2f35f377.css rel=preload as=style>
+    <link href=js/app.c8b0fed0.js rel=preload as=script>
+    <link href=js/chunk-vendors.39b13767.js rel=preload as=script>
+    <link href=css/chunk-vendors.2f35f377.css rel=stylesheet>
+    <link href=css/app.cf16809e.css rel=stylesheet>
+    </head>
+    <body>
+    <noscript>
+        <strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <script src=js/chunk-vendors.39b13767.js></script>
+    <script src=js/app.c8b0fed0.js></script>
+    <script>
+        //获取地址栏参数，name:参数名称
+        var z =function getUrlParms(name){
+            var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+            var r = window.location.search.substr(1).match(reg);
+            if(r!=null)
+                return unescape(r[2]);
+            return null;
+        }
+        var code = z("code");
+        var ticket=z("ticketStr");
+        var sc= function setCookie(name,value) {
+            var Days = 30;
+            var exp = new Date();
+            exp.setTime(exp.getTime() + Days*24*60*60*1000);
+            document.cookie = name + "="+ escape (value) + ";expires=" + exp.toGMTString();
+        }
+
+        sc("ddCode",code);
+        sc("ddTicket",ticket );
+       var gc= function getCookie(name)
+       {
+
+           var arr,reg=new RegExp("(^| )"+name+"=([^;]*)(;|$)");
+
+           if(arr=document.cookie.match(reg))
+               return unescape(arr[2]);
+           else
+               return null;
+
+       }
+
+    </script>
+    </body>
+    </html>
\ No newline at end of file