Merge remote-tracking branch 'origin/master'

7e6019ba · zhangyanni · 06855163 · e6240974 · 7e6019ba · 7e6019ba
Commit 7e6019ba authored Oct 31, 2019 by zhangyanni
Showing with 7 additions and 4 deletions

index.html dist/index.html +2 -2

demandinside.vue src/views/innovatecompany/demandaudit/demandinside.vue +3 -1

registeruserlist.vue src/views/innovatecompany/registeruser/registeruserlist.vue +2 -1

No files found.
--- a/dist/index.html
+++ b/dist/index.html
@@ -29,4 +29,4 @@
            plusReady();
        }else{
            document.addEventListener('plusready', plusReady, false);
-        }</script><link href=/css/chunk-0133d00c.css rel=prefetch><link href=/css/chunk-01d2032c.css rel=prefetch><link href=/css/chunk-0712aaa3.css rel=prefetch><link href=/css/chunk-162251fa.css rel=prefetch><link href=/css/chunk-1800bd57.css rel=prefetch><link href=/css/chunk-189b6bbe.css rel=prefetch><link href=/css/chunk-1ac04e33.css rel=prefetch><link href=/css/chunk-22afc774.css rel=prefetch><link href=/css/chunk-23a16a6b.css rel=prefetch><link href=/css/chunk-2c7bea92.css rel=prefetch><link href=/css/chunk-2e6d7338.css rel=prefetch><link href=/css/chunk-330cd3f5.css rel=prefetch><link href=/css/chunk-371a869e.css rel=prefetch><link href=/css/chunk-39ab6ed0.css rel=prefetch><link href=/css/chunk-408adce2.css rel=prefetch><link href=/css/chunk-49d760f0.css rel=prefetch><link href=/css/chunk-4a72ceba.css rel=prefetch><link href=/css/chunk-5a170ca4.css rel=prefetch><link href=/css/chunk-6b7ffc28.css rel=prefetch><link href=/css/chunk-6d5eb006.css rel=prefetch><link href=/css/chunk-703a878d.css rel=prefetch><link href=/css/chunk-748af5b4.css rel=prefetch><link href=/css/chunk-78ed64e2.css rel=prefetch><link href=/css/chunk-7b8f3f9c.css rel=prefetch><link href=/css/chunk-7e2abe0e.css rel=prefetch><link href=/css/chunk-964615c6.css rel=prefetch><link href=/css/chunk-a84a21c8.css rel=prefetch><link href=/css/chunk-edc13622.css rel=prefetch><link href=/css/chunk-f08ab008.css rel=prefetch><link href=/css/chunk-f1e84836.css rel=prefetch><link href=/css/chunk-fea54fc8.css rel=prefetch><link href=/js/chunk-0133d00c.js rel=prefetch><link href=/js/chunk-01d2032c.js rel=prefetch><link href=/js/chunk-027016ef.js rel=prefetch><link href=/js/chunk-0712aaa3.js rel=prefetch><link href=/js/chunk-0aa6f0cb.js rel=prefetch><link href=/js/chunk-162251fa.js rel=prefetch><link href=/js/chunk-1800bd57.js rel=prefetch><link href=/js/chunk-189b6bbe.js rel=prefetch><link href=/js/chunk-1ac04e33.js rel=prefetch><link href=/js/chunk-1bd9d14a.js rel=prefetch><link href=/js/chunk-22afc774.js rel=prefetch><link href=/js/chunk-23a16a6b.js rel=prefetch><link href=/js/chunk-2c7bea92.js rel=prefetch><link href=/js/chunk-2d0baae5.js rel=prefetch><link href=/js/chunk-2d0c571c.js rel=prefetch><link href=/js/chunk-2e6d7338.js rel=prefetch><link href=/js/chunk-330cd3f5.js rel=prefetch><link href=/js/chunk-371a869e.js rel=prefetch><link href=/js/chunk-37e1131f.js rel=prefetch><link href=/js/chunk-39ab6ed0.js rel=prefetch><link href=/js/chunk-408adce2.js rel=prefetch><link href=/js/chunk-49d760f0.js rel=prefetch><link href=/js/chunk-4a72ceba.js rel=prefetch><link href=/js/chunk-5a170ca4.js rel=prefetch><link href=/js/chunk-661def58.js rel=prefetch><link href=/js/chunk-6b7ffc28.js rel=prefetch><link href=/js/chunk-6b8ebd78.js rel=prefetch><link href=/js/chunk-6d5eb006.js rel=prefetch><link href=/js/chunk-703a878d.js rel=prefetch><link href=/js/chunk-748af5b4.js rel=prefetch><link href=/js/chunk-74d279a8.js rel=prefetch><link href=/js/chunk-78ed64e2.js rel=prefetch><link href=/js/chunk-7b8f3f9c.js rel=prefetch><link href=/js/chunk-7e2abe0e.js rel=prefetch><link href=/js/chunk-964615c6.js rel=prefetch><link href=/js/chunk-a84a21c8.js rel=prefetch><link href=/js/chunk-b5301014.js rel=prefetch><link href=/js/chunk-ec956c32.js rel=prefetch><link href=/js/chunk-edc13622.js rel=prefetch><link href=/js/chunk-f08ab008.js rel=prefetch><link href=/js/chunk-f1e84836.js rel=prefetch><link href=/js/chunk-fea54fc8.js rel=prefetch><link href=/css/app.css rel=preload as=style><link href=/css/chunk-vendors.css rel=preload as=style><link href=/js/app.js rel=preload as=script><link href=/js/chunk-vendors.js rel=preload as=script><link href=/css/chunk-vendors.css rel=stylesheet><link href=/css/app.css rel=stylesheet></head><body><noscript><strong>We're sorry but techcode doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><div style="display: none;"><script src="https://s4.cnzz.com/z_stat.php?id=1278059642&web_id=1278059642"></script></div><script src=/js/chunk-vendors.js></script><script src=/js/app.js></script></body></html>
+        }</script><link href=/css/chunk-0133d00c.css rel=prefetch><link href=/css/chunk-01d2032c.css rel=prefetch><link href=/css/chunk-0712aaa3.css rel=prefetch><link href=/css/chunk-10b63119.css rel=prefetch><link href=/css/chunk-162251fa.css rel=prefetch><link href=/css/chunk-1800bd57.css rel=prefetch><link href=/css/chunk-184f930e.css rel=prefetch><link href=/css/chunk-18f74e74.css rel=prefetch><link href=/css/chunk-1ac04e33.css rel=prefetch><link href=/css/chunk-22afc774.css rel=prefetch><link href=/css/chunk-23a16a6b.css rel=prefetch><link href=/css/chunk-26809a36.css rel=prefetch><link href=/css/chunk-2e6d7338.css rel=prefetch><link href=/css/chunk-330cd3f5.css rel=prefetch><link href=/css/chunk-371a869e.css rel=prefetch><link href=/css/chunk-39ab6ed0.css rel=prefetch><link href=/css/chunk-3bb09dd0.css rel=prefetch><link href=/css/chunk-408adce2.css rel=prefetch><link href=/css/chunk-49d760f0.css rel=prefetch><link href=/css/chunk-4a72ceba.css rel=prefetch><link href=/css/chunk-5624cd81.css rel=prefetch><link href=/css/chunk-5a170ca4.css rel=prefetch><link href=/css/chunk-682e36ab.css rel=prefetch><link href=/css/chunk-6b7ffc28.css rel=prefetch><link href=/css/chunk-78ed64e2.css rel=prefetch><link href=/css/chunk-7b8f3f9c.css rel=prefetch><link href=/css/chunk-a84a21c8.css rel=prefetch><link href=/css/chunk-d22c676a.css rel=prefetch><link href=/css/chunk-edc13622.css rel=prefetch><link href=/css/chunk-f1e84836.css rel=prefetch><link href=/css/chunk-fea54fc8.css rel=prefetch><link href=/js/chunk-0133d00c.js rel=prefetch><link href=/js/chunk-01d2032c.js rel=prefetch><link href=/js/chunk-027016ef.js rel=prefetch><link href=/js/chunk-0712aaa3.js rel=prefetch><link href=/js/chunk-0aa6f0cb.js rel=prefetch><link href=/js/chunk-10b63119.js rel=prefetch><link href=/js/chunk-162251fa.js rel=prefetch><link href=/js/chunk-1800bd57.js rel=prefetch><link href=/js/chunk-184f930e.js rel=prefetch><link href=/js/chunk-18f74e74.js rel=prefetch><link href=/js/chunk-1ac04e33.js rel=prefetch><link href=/js/chunk-1bd9d14a.js rel=prefetch><link href=/js/chunk-22afc774.js rel=prefetch><link href=/js/chunk-23a16a6b.js rel=prefetch><link href=/js/chunk-26809a36.js rel=prefetch><link href=/js/chunk-2d0baae5.js rel=prefetch><link href=/js/chunk-2d0c571c.js rel=prefetch><link href=/js/chunk-2e6d7338.js rel=prefetch><link href=/js/chunk-330cd3f5.js rel=prefetch><link href=/js/chunk-371a869e.js rel=prefetch><link href=/js/chunk-37e1131f.js rel=prefetch><link href=/js/chunk-39ab6ed0.js rel=prefetch><link href=/js/chunk-3bb09dd0.js rel=prefetch><link href=/js/chunk-408adce2.js rel=prefetch><link href=/js/chunk-49d760f0.js rel=prefetch><link href=/js/chunk-4a72ceba.js rel=prefetch><link href=/js/chunk-5624cd81.js rel=prefetch><link href=/js/chunk-5a170ca4.js rel=prefetch><link href=/js/chunk-661def58.js rel=prefetch><link href=/js/chunk-682e36ab.js rel=prefetch><link href=/js/chunk-6b7ffc28.js rel=prefetch><link href=/js/chunk-6b8ebd78.js rel=prefetch><link href=/js/chunk-74d279a8.js rel=prefetch><link href=/js/chunk-78ed64e2.js rel=prefetch><link href=/js/chunk-7b8f3f9c.js rel=prefetch><link href=/js/chunk-a84a21c8.js rel=prefetch><link href=/js/chunk-b5301014.js rel=prefetch><link href=/js/chunk-d22c676a.js rel=prefetch><link href=/js/chunk-ec956c32.js rel=prefetch><link href=/js/chunk-edc13622.js rel=prefetch><link href=/js/chunk-f1e84836.js rel=prefetch><link href=/js/chunk-fea54fc8.js rel=prefetch><link href=/css/app.css rel=preload as=style><link href=/css/chunk-vendors.css rel=preload as=style><link href=/js/app.js rel=preload as=script><link href=/js/chunk-vendors.js rel=preload as=script><link href=/css/chunk-vendors.css rel=stylesheet><link href=/css/app.css rel=stylesheet></head><body><noscript><strong>We're sorry but techcode doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><div style="display: none;"><script src="https://s4.cnzz.com/z_stat.php?id=1278059642&web_id=1278059642"></script></div><script src=/js/chunk-vendors.js></script><script src=/js/app.js></script></body></html>
\ No newline at end of file
--- a/src/views/innovatecompany/demandaudit/demandinside.vue
+++ b/src/views/innovatecompany/demandaudit/demandinside.vue
@@ -185,7 +185,9 @@
            };
            return {
                activeName:'first',
-                addData:{},
+                addData:{
+                    requirementContacts:{}
+                },
                stateName:'',
                stateIf:true,
                rejectDesc:{},

--- a/src/views/innovatecompany/registeruser/registeruserlist.vue
+++ b/src/views/innovatecompany/registeruser/registeruserlist.vue
@@ -146,7 +146,8 @@
            next(vm=>{          //  这里的vm指的就是vue实例，可以用来当做this使用
                vm.pathfrom = from.path;
                if(vm.pathfrom == '/aggregatetab'){
-                    vm.search = JSON.parse(window.sessionStorage.getItem("aggregatetab"));
+                    vm.search = JSON.parse(window.localStorage.getItem("aggregatetab"));
+                    console.log(vm.search)
                    vm.registerTypeed.push(vm.search.registerType)
                    vm.empTypeed.push(vm.search.empType)
                    vm.authenticationStateed.push(vm.search.authenticationState)