Home Esplora Aiuto
Accedi
caipin
/
cld2_react
1
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

Merge remote-tracking branch 'remotes/origin/master'

caipin 4 anni fa
parent
95f18b32f4 eb75cc649d
commit
c4920ba4de
28 ha cambiato i file con 67488 aggiunte e 73 eliminazioni
Visualizzazione unificata Mostra Diff Stats
  1. 264 0
      dist/contact/index.html
  2. 27844 0
      dist/css/vendor.d919b9206a46f65a9f0b.css
  3. 264 0
      dist/hr/index.html
  4. 215 0
      dist/index.html
  5. 215 0
      dist/login.html
  6. 1 0
      dist/nodecss/hr.d919b9206a46f65a9f0b.css
  7. 752 0
      dist/nodejs/contact.d919b9206a46f65a9f0b.bundle.js
  8. 563 0
      dist/nodejs/framework.d919b9206a46f65a9f0b.bundle.js
  9. 193 0
      dist/nodejs/hr.d919b9206a46f65a9f0b.bundle.js
  10. 369 0
      dist/nodejs/login.d919b9206a46f65a9f0b.bundle.js
  11. 529 0
      dist/nodejs/product.d919b9206a46f65a9f0b.bundle.js
  12. 182 0
      dist/nodejs/staff.d919b9206a46f65a9f0b.bundle.js
  13. 35073 0
      dist/nodejs/vendor.d919b9206a46f65a9f0b.bundle.js
  14. 266 0
      dist/nodejs/workbench.d919b9206a46f65a9f0b.bundle.js
  15. 264 0
      dist/product/index.html
  16. 264 0
      dist/staff/index.html
  17. 0 25
      src/common/popupslockDetail/store/actionCreators.js
  18. 41 12
      src/common/popupslockDetail/index.js
  19. 37 0
      src/common/popupstockDetail/store/actionCreators.js
  20. 1 0
      src/common/popupslockDetail/store/constants.js
  21. 0 0
      src/common/popupstockDetail/store/index.js
  22. 5 6
      src/common/popupslockDetail/store/reducer.js
  23. 1 1
      src/product/lock_count/index.js
  24. 17 7
      src/product/lock_store/index.js
  25. 19 3
      src/product/lock_store/store/actionCreators.js
  26. 2 1
      src/product/lock_store/store/constants.js
  27. 105 17
      src/product/lock_store/store/reducer.js
  28. 2 1
      src/product/store/reducer.js

+ 264 - 0
dist/contact/index.html
Vedi File 

@@ -0,0 +1,264 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+  <meta charset="utf-8">
 
+  <title>
 
+    联系人-纵横CLD v2.0-subindex
 
+  </title>
 
+  <meta name="description" content="Page Titile">
 
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no, minimal-ui">
 
+  <!-- Call App Mode on ios devices -->
 
+  <meta name="apple-mobile-web-app-capable" content="yes" />
 
+  <!-- Remove Tap Highlight on Windows Phone IE -->
 
+  <meta name="msapplication-tap-highlight" content="no">
 
+  <!-- base css -->
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/vendors.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/app.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/cld-custom.css">
 
+  <!-- Place favicon.ico in the root directory -->
 
+  <link rel="shortcut icon" href="http://cld2.com:9090/img/favicon/favicon.ico">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-regular.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-solid.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-brands.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/global.css">
 
+
 
+
 
+
 
+<link href="http://cld2.com:9090/css/vendor.d919b9206a46f65a9f0b.css" rel="stylesheet"></head>
 
+
 
+<body class="mod-bg-1 nav-function-fixed header-function-fixed">
 
+  <!-- DOC: script to save and load page settings -->
 
+  <script>
 
+    /**
 
+     *	This script should be placed right after the body tag for fast execution
 
+     *	Note: the script is written in pure javascript and does not depend on thirdparty library
 
+     **/
 
+    'use strict';
 
+    var classHolder = document.getElementsByTagName("BODY")[0],
 
+      /**
 
+       * Load from localstorage
 
+       **/
 
+      themeSettings = (localStorage.getItem('themeSettings')) ? JSON.parse(localStorage.getItem('themeSettings')) : {},
 
+      themeURL = themeSettings.themeURL || '',
 
+      themeOptions = themeSettings.themeOptions || '';
 
+    /**
 
+     * Load theme options
 
+     **/
 
+    if (themeSettings.themeOptions) {
 
+      classHolder.className = themeSettings.themeOptions;
 
+      
+    } else {
 
+     
+    }
 
+    if (themeSettings.themeURL && !document.getElementById('mytheme')) {
 
+      var cssfile = document.createElement('link');
 
+      cssfile.id = 'mytheme';
 
+      cssfile.rel = 'stylesheet';
 
+      cssfile.href = themeURL;
 
+      document.getElementsByTagName('head')[0].appendChild(cssfile);
 
+    }
 
+    /**
 
+     * Save to localstorage
 
+     **/
 
+    var saveSettings = function () {
 
+      themeSettings.themeOptions = String(classHolder.className).split(/[^\w-]+/).filter(function (item) {
 
+        return /^(nav|header|mod|display)-/i.test(item);
 
+      }).join(' ');
 
+      if (document.getElementById('mytheme')) {
 
+        themeSettings.themeURL = document.getElementById('mytheme').getAttribute("href");
 
+      };
 
+      localStorage.setItem('themeSettings', JSON.stringify(themeSettings));
 
+    }
 
+    /**
 
+     * Reset settings
 
+     **/
 
+    var resetSettings = function () {
 
+      localStorage.setItem("themeSettings", "");
 
+    }
 
+  </script>
 
+  <!-- BEGIN Page Wrapper -->
 
+  <div class="page-wrapper">
 
+    <div class="page-inner">
 
+      <div id="root" class="width100"></div>
 
+    </div>
 
+  </div>
 
+  <!-- END Page Wrapper -->
 
+  <!-- BEGIN应用切换 -->
 
+  <div class="modal fade modal-backdrop-transparent" id="modal-shortcut" tabindex="-1" role="dialog"
 
+    aria-labelledby="modal-shortcut" aria-hidden="true">
 
+    <div class="modal-dialog modal-dialog-top modal-transparent" role="document">
 
+      <div class="modal-content">
 
+        <div class="modal-body">
 
+          <ul class="app-list w-auto h-auto p-0 text-left">
 
+            <li>
 
+              <a href="/" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-11 icon-stack-3x opacity-100 color-primary-700"></i> <i
 
+                    class="base base-7 icon-stack-2x opacity-100 color-primary-500"></i> <i
 
+                    class="fas fa-chess icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  工作台
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/contact" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-4 icon-stack-3x opacity-100 color-info-700"></i> <i
 
+                    class="base base-12 icon-stack-2x opacity-100 color-info-500"></i> <i
 
+                    class="fas fa-address-book icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  客户
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/product" class="app-list-item text-white">
 
+                <span class="icon-stack">
 
+                  <i class="base base-7 icon-stack-3x opacity-100 color-danger-900 "></i>
 
+                  <i class="base base-4 icon-stack-2x opacity-100 color-danger-600 "></i>
 
+                  <i class="fal fa-box icon-stack-1x text-white"></i>
 
+                </span>
 
+                <span class="app-list-name">
 
+                  产品
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-9 icon-stack-3x opacity-100 color-success-700"></i> <i
 
+                    class="base base-14 icon-stack-2x opacity-100 color-success-500"></i> <i
 
+                    class="fas fa-clipboard-list icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  费用
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-3 icon-stack-3x opacity-100 color-warning-700"></i> <i
 
+                    class="base base-9 icon-stack-2x opacity-100 color-warning-500"></i> <i
 
+                    class="fas fa-credit-card-front icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  开票
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class="icon-stack">
 
+                  <i class="base-18 icon-stack-3x color-info-300"></i>
 
+                  <span class="position-absolute pos-top pos-left pos-right color-white fs-md mt-2 fw-400">Zz..</span>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  假期
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/hr" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-15 icon-stack-3x opacity-100 color-fusion-200"></i> <i
 
+                    class="base base-10 icon-stack-2x opacity-100 color-fusion-500"></i> <i
 
+                    class="fas fa-users icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  人资
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-5 icon-stack-3x opacity-100 color-danger-300"></i> <i
 
+                    class="base base-14 icon-stack-2x opacity-100 color-danger-200"></i> <i
 
+                    class="fas fa-id-card icon-stack-2x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  我的纵横
 
+                </span>
 
+              </a>
 
+            </li>
 
+          </ul>
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </div>
 
+<script src="http://cld2.com:9090/nodejs/framework.d919b9206a46f65a9f0b.bundle.js"></script><script src="http://cld2.com:9090/nodejs/vendor.d919b9206a46f65a9f0b.bundle.js"></script><script src="http://cld2.com:9090/nodejs/contact.d919b9206a46f65a9f0b.bundle.js"></script></body>
 
+
 
+<script src="http://cld2.com:9090/js/vendors.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/app.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/cld-custom.js"></script>
 
+
 
+
 
+<script type="text/javascript">
 
+
 
+
 
+  // $(document).ready(function () {
 
+  //   $('#dt-basic-example').dataTable(
 
+  //     {
 
+  //       responsive: true,
 
+  //       autoWidth: true,
 
+  //       info: false,
 
+  //       searching: false,
 
+  //       lengthChange: false,
 
+  //       "ajax": {
 
+  //         "url": "http://cld2.com:9090/cld2/contact/client",
 
+  //         "dataSrc": "list"
 
+  //       }
 
+  //       //scrollX: true,
 
+  //     });
 
+
 
+  //   $('.js-thead-colors a').on('click', function () {
 
+  //     var theadColor = $(this).attr("data-bg");
 
+  //     console.log(theadColor);
 
+  //     $('#dt-basic-example thead').removeClassPrefix('bg-').addClass(theadColor);
 
+  //   });
 
+
 
+  //   $('.js-tbody-colors a').on('click', function () {
 
+  //     var theadColor = $(this).attr("data-bg");
 
+  //     console.log(theadColor);
 
+  //     $('#dt-basic-example').removeClassPrefix('bg-').addClass(theadColor);
 
+  //   });
 
+
 
+  // });
 
+
 
+
 
+
 
+
 
+  autoFlashHeight();
 
+  $('.slimScroll1').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol2').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol3').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol4').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+</script>
 
+<script>
 
+
 
+
 
+</script>
 
+
 
+</html>

File diff suppressed because it is too large
+ 27844 - 0
dist/css/vendor.d919b9206a46f65a9f0b.css


+ 264 - 0
dist/hr/index.html
Vedi File 

@@ -0,0 +1,264 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+  <meta charset="utf-8">
 
+  <title>
 
+    联系人-纵横CLD v2.0-subindex
 
+  </title>
 
+  <meta name="description" content="Page Titile">
 
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no, minimal-ui">
 
+  <!-- Call App Mode on ios devices -->
 
+  <meta name="apple-mobile-web-app-capable" content="yes" />
 
+  <!-- Remove Tap Highlight on Windows Phone IE -->
 
+  <meta name="msapplication-tap-highlight" content="no">
 
+  <!-- base css -->
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/vendors.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/app.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/cld-custom.css">
 
+  <!-- Place favicon.ico in the root directory -->
 
+  <link rel="shortcut icon" href="http://cld2.com:9090/img/favicon/favicon.ico">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-regular.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-solid.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-brands.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/global.css">
 
+
 
+
 
+
 
+<link href="http://cld2.com:9090/nodecss/hr.d919b9206a46f65a9f0b.css" rel="stylesheet"></head>
 
+
 
+<body class="mod-bg-1 nav-function-fixed header-function-fixed">
 
+  <!-- DOC: script to save and load page settings -->
 
+  <script>
 
+    /**
 
+     *	This script should be placed right after the body tag for fast execution
 
+     *	Note: the script is written in pure javascript and does not depend on thirdparty library
 
+     **/
 
+    'use strict';
 
+    var classHolder = document.getElementsByTagName("BODY")[0],
 
+      /**
 
+       * Load from localstorage
 
+       **/
 
+      themeSettings = (localStorage.getItem('themeSettings')) ? JSON.parse(localStorage.getItem('themeSettings')) : {},
 
+      themeURL = themeSettings.themeURL || '',
 
+      themeOptions = themeSettings.themeOptions || '';
 
+    /**
 
+     * Load theme options
 
+     **/
 
+    if (themeSettings.themeOptions) {
 
+      classHolder.className = themeSettings.themeOptions;
 
+      
+    } else {
 
+     
+    }
 
+    if (themeSettings.themeURL && !document.getElementById('mytheme')) {
 
+      var cssfile = document.createElement('link');
 
+      cssfile.id = 'mytheme';
 
+      cssfile.rel = 'stylesheet';
 
+      cssfile.href = themeURL;
 
+      document.getElementsByTagName('head')[0].appendChild(cssfile);
 
+    }
 
+    /**
 
+     * Save to localstorage
 
+     **/
 
+    var saveSettings = function () {
 
+      themeSettings.themeOptions = String(classHolder.className).split(/[^\w-]+/).filter(function (item) {
 
+        return /^(nav|header|mod|display)-/i.test(item);
 
+      }).join(' ');
 
+      if (document.getElementById('mytheme')) {
 
+        themeSettings.themeURL = document.getElementById('mytheme').getAttribute("href");
 
+      };
 
+      localStorage.setItem('themeSettings', JSON.stringify(themeSettings));
 
+    }
 
+    /**
 
+     * Reset settings
 
+     **/
 
+    var resetSettings = function () {
 
+      localStorage.setItem("themeSettings", "");
 
+    }
 
+  </script>
 
+  <!-- BEGIN Page Wrapper -->
 
+  <div class="page-wrapper">
 
+    <div class="page-inner">
 
+      <div id="root" class="width100"></div>
 
+    </div>
 
+  </div>
 
+  <!-- END Page Wrapper -->
 
+  <!-- BEGIN应用切换 -->
 
+  <div class="modal fade modal-backdrop-transparent" id="modal-shortcut" tabindex="-1" role="dialog"
 
+    aria-labelledby="modal-shortcut" aria-hidden="true">
 
+    <div class="modal-dialog modal-dialog-top modal-transparent" role="document">
 
+      <div class="modal-content">
 
+        <div class="modal-body">
 
+          <ul class="app-list w-auto h-auto p-0 text-left">
 
+            <li>
 
+              <a href="/" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-11 icon-stack-3x opacity-100 color-primary-700"></i> <i
 
+                    class="base base-7 icon-stack-2x opacity-100 color-primary-500"></i> <i
 
+                    class="fas fa-chess icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  工作台
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/contact" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-4 icon-stack-3x opacity-100 color-info-700"></i> <i
 
+                    class="base base-12 icon-stack-2x opacity-100 color-info-500"></i> <i
 
+                    class="fas fa-address-book icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  客户
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/product" class="app-list-item text-white">
 
+                <span class="icon-stack">
 
+                  <i class="base base-7 icon-stack-3x opacity-100 color-danger-900 "></i>
 
+                  <i class="base base-4 icon-stack-2x opacity-100 color-danger-600 "></i>
 
+                  <i class="fal fa-box icon-stack-1x text-white"></i>
 
+                </span>
 
+                <span class="app-list-name">
 
+                  产品
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-9 icon-stack-3x opacity-100 color-success-700"></i> <i
 
+                    class="base base-14 icon-stack-2x opacity-100 color-success-500"></i> <i
 
+                    class="fas fa-clipboard-list icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  费用
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-3 icon-stack-3x opacity-100 color-warning-700"></i> <i
 
+                    class="base base-9 icon-stack-2x opacity-100 color-warning-500"></i> <i
 
+                    class="fas fa-credit-card-front icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  开票
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class="icon-stack">
 
+                  <i class="base-18 icon-stack-3x color-info-300"></i>
 
+                  <span class="position-absolute pos-top pos-left pos-right color-white fs-md mt-2 fw-400">Zz..</span>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  假期
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/hr" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-15 icon-stack-3x opacity-100 color-fusion-200"></i> <i
 
+                    class="base base-10 icon-stack-2x opacity-100 color-fusion-500"></i> <i
 
+                    class="fas fa-users icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  人资
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-5 icon-stack-3x opacity-100 color-danger-300"></i> <i
 
+                    class="base base-14 icon-stack-2x opacity-100 color-danger-200"></i> <i
 
+                    class="fas fa-id-card icon-stack-2x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  我的纵横
 
+                </span>
 
+              </a>
 
+            </li>
 
+          </ul>
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </div>
 
+<script src="http://cld2.com:9090/nodejs/framework.d919b9206a46f65a9f0b.bundle.js"></script><script src="http://cld2.com:9090/nodejs/hr.d919b9206a46f65a9f0b.bundle.js"></script></body>
 
+
 
+<script src="http://cld2.com:9090/js/vendors.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/app.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/cld-custom.js"></script>
 
+
 
+
 
+<script type="text/javascript">
 
+
 
+
 
+  // $(document).ready(function () {
 
+  //   $('#dt-basic-example').dataTable(
 
+  //     {
 
+  //       responsive: true,
 
+  //       autoWidth: true,
 
+  //       info: false,
 
+  //       searching: false,
 
+  //       lengthChange: false,
 
+  //       "ajax": {
 
+  //         "url": "http://cld2.com:9090/cld2/contact/client",
 
+  //         "dataSrc": "list"
 
+  //       }
 
+  //       //scrollX: true,
 
+  //     });
 
+
 
+  //   $('.js-thead-colors a').on('click', function () {
 
+  //     var theadColor = $(this).attr("data-bg");
 
+  //     console.log(theadColor);
 
+  //     $('#dt-basic-example thead').removeClassPrefix('bg-').addClass(theadColor);
 
+  //   });
 
+
 
+  //   $('.js-tbody-colors a').on('click', function () {
 
+  //     var theadColor = $(this).attr("data-bg");
 
+  //     console.log(theadColor);
 
+  //     $('#dt-basic-example').removeClassPrefix('bg-').addClass(theadColor);
 
+  //   });
 
+
 
+  // });
 
+
 
+
 
+
 
+
 
+  autoFlashHeight();
 
+  $('.slimScroll1').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol2').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol3').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol4').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+</script>
 
+<script>
 
+
 
+
 
+</script>
 
+
 
+</html>

+ 215 - 0
dist/index.html
Vedi File 

@@ -0,0 +1,215 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+  <meta charset="utf-8">
 
+  <title>
 
+    联系人-纵横CLD v2.0-index
 
+  </title>
 
+  <meta name="description" content="Page Titile">
 
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no, minimal-ui">
 
+  <!-- Call App Mode on ios devices -->
 
+  <meta name="apple-mobile-web-app-capable" content="yes" />
 
+  <!-- Remove Tap Highlight on Windows Phone IE -->
 
+  <meta name="msapplication-tap-highlight" content="no">
 
+  <!-- base css -->
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/vendors.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/app.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/cld-custom.css">
 
+  <!-- Place favicon.ico in the root directory -->
 
+  <link rel="shortcut icon" href="http://cld2.com:9090/img/favicon/favicon.ico">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-regular.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-solid.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-brands.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/global.css">
 
+
 
+
 
+
 
+
 
+<link href="http://cld2.com:9090/css/vendor.d919b9206a46f65a9f0b.css" rel="stylesheet"></head>
 
+
 
+<body class="mod-bg-1 nav-function-fixed header-function-fixed">
 
+  <!-- DOC: script to save and load page settings -->
 
+  <script>
 
+    /**
 
+     *	This script should be placed right after the body tag for fast execution
 
+     *	Note: the script is written in pure javascript and does not depend on thirdparty library
 
+     **/
 
+    'use strict';
 
+    var classHolder = document.getElementsByTagName("BODY")[0],
 
+      /**
 
+       * Load from localstorage
 
+       **/
 
+      themeSettings = (localStorage.getItem('themeSettings')) ? JSON.parse(localStorage.getItem('themeSettings')) : {},
 
+      themeURL = themeSettings.themeURL || '',
 
+      themeOptions = themeSettings.themeOptions || '';
 
+    /**
 
+     * Load theme options
 
+     **/
 
+    if (themeSettings.themeOptions) {
 
+      classHolder.className = themeSettings.themeOptions;
 
+      console.log("%c✔ Theme settings loaded", "color: #148f32");
 
+    } else {
 
+      console.log("Heads up! Theme settings is empty or does not exist, loading default settings...");
 
+    }
 
+    if (themeSettings.themeURL && !document.getElementById('mytheme')) {
 
+      var cssfile = document.createElement('link');
 
+      cssfile.id = 'mytheme';
 
+      cssfile.rel = 'stylesheet';
 
+      cssfile.href = themeURL;
 
+      document.getElementsByTagName('head')[0].appendChild(cssfile);
 
+    }
 
+    /**
 
+     * Save to localstorage
 
+     **/
 
+    var saveSettings = function() {
 
+      themeSettings.themeOptions = String(classHolder.className).split(/[^\w-]+/).filter(function(item) {
 
+        return /^(nav|header|mod|display)-/i.test(item);
 
+      }).join(' ');
 
+      if (document.getElementById('mytheme')) {
 
+        themeSettings.themeURL = document.getElementById('mytheme').getAttribute("href");
 
+      };
 
+      localStorage.setItem('themeSettings', JSON.stringify(themeSettings));
 
+    }
 
+    /**
 
+     * Reset settings
 
+     **/
 
+    var resetSettings = function() {
 
+      localStorage.setItem("themeSettings", "");
 
+    }
 
+  </script>
 
+  <!-- BEGIN Page Wrapper -->
 
+  <div class="page-wrapper">
 
+    <div class="page-inner">
 
+      <div id="root" class="width100"></div>
 
+    </div>
 
+  </div>
 
+  <!-- END Page Wrapper -->
 
+  <!-- BEGIN应用切换 -->
 
+  <div class="modal fade modal-backdrop-transparent" id="modal-shortcut" tabindex="-1" role="dialog" aria-labelledby="modal-shortcut" aria-hidden="true">
 
+      <div class="modal-dialog modal-dialog-top modal-transparent" role="document">
 
+          <div class="modal-content">
 
+              <div class="modal-body">
 
+                  <ul class="app-list w-auto h-auto p-0 text-left">
 
+                    <li>
 
+                      <a href="/" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-11 icon-stack-3x opacity-100 color-primary-700"></i> <i class="base base-7 icon-stack-2x opacity-100 color-primary-500"></i> <i class="fas fa-chess icon-stack-1x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                          工作台
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="/contact" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-4 icon-stack-3x opacity-100 color-info-700"></i> <i class="base base-12 icon-stack-2x opacity-100 color-info-500"></i> <i class="fas fa-address-book icon-stack-1x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                         客户
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="/product" class="app-list-item text-white">
 
+                          <span class="icon-stack">
 
+                            <i class="base base-7 icon-stack-3x opacity-100 color-danger-900 "></i>
 
+                            <i class="base base-4 icon-stack-2x opacity-100 color-danger-600 "></i>
 
+                            <i class="fal fa-box icon-stack-1x text-white"></i>
 
+                          </span>
 
+                          <span class="app-list-name">
 
+                            产品
 
+                          </span>
 
+                        </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="#" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-9 icon-stack-3x opacity-100 color-success-700"></i> <i class="base base-14 icon-stack-2x opacity-100 color-success-500"></i> <i class="fas fa-clipboard-list icon-stack-1x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                            费用
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="#" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-3 icon-stack-3x opacity-100 color-warning-700"></i> <i class="base base-9 icon-stack-2x opacity-100 color-warning-500"></i> <i class="fas fa-credit-card-front icon-stack-1x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                            开票
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="#" class="app-list-item text-white">
 
+                        <div class="icon-stack">
 
+                          <i class="base-18 icon-stack-3x color-info-300"></i>
 
+                          <span class="position-absolute pos-top pos-left pos-right color-white fs-md mt-2 fw-400">Zz..</span>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                            假期
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="/hr" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-15 icon-stack-3x opacity-100 color-fusion-200"></i> <i class="base base-10 icon-stack-2x opacity-100 color-fusion-500"></i> <i class="fas fa-users icon-stack-1x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                            人资
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="#" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-5 icon-stack-3x opacity-100 color-danger-300"></i> <i class="base base-14 icon-stack-2x opacity-100 color-danger-200"></i> <i class="fas fa-id-card icon-stack-2x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                            我的纵横
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                  </ul>
 
+              </div>
 
+          </div>
 
+      </div>
 
+  </div>
 
+<script src="http://cld2.com:9090/nodejs/framework.d919b9206a46f65a9f0b.bundle.js"></script><script src="http://cld2.com:9090/nodejs/vendor.d919b9206a46f65a9f0b.bundle.js"></script><script src="http://cld2.com:9090/nodejs/workbench.d919b9206a46f65a9f0b.bundle.js"></script></body>
 
+
 
+  
+<script src="http://cld2.com:9090/js/vendors.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/app.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/cld-custom.js"></script>
 
+
 
+<script type="text/javascript">
 
+  autoFlashHeight();
 
+  $('.slimScroll1').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol2').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol3').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol4').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+</script>
 
+<script>
 
+  </script>
 
+</html>

+ 215 - 0
dist/login.html
Vedi File 

@@ -0,0 +1,215 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+  <meta charset="utf-8">
 
+  <title>
 
+    联系人-纵横CLD v2.0-index
 
+  </title>
 
+  <meta name="description" content="Page Titile">
 
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no, minimal-ui">
 
+  <!-- Call App Mode on ios devices -->
 
+  <meta name="apple-mobile-web-app-capable" content="yes" />
 
+  <!-- Remove Tap Highlight on Windows Phone IE -->
 
+  <meta name="msapplication-tap-highlight" content="no">
 
+  <!-- base css -->
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/vendors.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/app.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/cld-custom.css">
 
+  <!-- Place favicon.ico in the root directory -->
 
+  <link rel="shortcut icon" href="http://cld2.com:9090/img/favicon/favicon.ico">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-regular.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-solid.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-brands.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/global.css">
 
+
 
+
 
+
 
+
 
+<link href="http://cld2.com:9090/css/vendor.d919b9206a46f65a9f0b.css" rel="stylesheet"></head>
 
+
 
+<body class="mod-bg-1 nav-function-fixed header-function-fixed">
 
+  <!-- DOC: script to save and load page settings -->
 
+  <script>
 
+    /**
 
+     *	This script should be placed right after the body tag for fast execution
 
+     *	Note: the script is written in pure javascript and does not depend on thirdparty library
 
+     **/
 
+    'use strict';
 
+    var classHolder = document.getElementsByTagName("BODY")[0],
 
+      /**
 
+       * Load from localstorage
 
+       **/
 
+      themeSettings = (localStorage.getItem('themeSettings')) ? JSON.parse(localStorage.getItem('themeSettings')) : {},
 
+      themeURL = themeSettings.themeURL || '',
 
+      themeOptions = themeSettings.themeOptions || '';
 
+    /**
 
+     * Load theme options
 
+     **/
 
+    if (themeSettings.themeOptions) {
 
+      classHolder.className = themeSettings.themeOptions;
 
+      console.log("%c✔ Theme settings loaded", "color: #148f32");
 
+    } else {
 
+      console.log("Heads up! Theme settings is empty or does not exist, loading default settings...");
 
+    }
 
+    if (themeSettings.themeURL && !document.getElementById('mytheme')) {
 
+      var cssfile = document.createElement('link');
 
+      cssfile.id = 'mytheme';
 
+      cssfile.rel = 'stylesheet';
 
+      cssfile.href = themeURL;
 
+      document.getElementsByTagName('head')[0].appendChild(cssfile);
 
+    }
 
+    /**
 
+     * Save to localstorage
 
+     **/
 
+    var saveSettings = function() {
 
+      themeSettings.themeOptions = String(classHolder.className).split(/[^\w-]+/).filter(function(item) {
 
+        return /^(nav|header|mod|display)-/i.test(item);
 
+      }).join(' ');
 
+      if (document.getElementById('mytheme')) {
 
+        themeSettings.themeURL = document.getElementById('mytheme').getAttribute("href");
 
+      };
 
+      localStorage.setItem('themeSettings', JSON.stringify(themeSettings));
 
+    }
 
+    /**
 
+     * Reset settings
 
+     **/
 
+    var resetSettings = function() {
 
+      localStorage.setItem("themeSettings", "");
 
+    }
 
+  </script>
 
+  <!-- BEGIN Page Wrapper -->
 
+  <div class="page-wrapper">
 
+    <div class="page-inner">
 
+      <div id="root" class="width100"></div>
 
+    </div>
 
+  </div>
 
+  <!-- END Page Wrapper -->
 
+  <!-- BEGIN应用切换 -->
 
+  <div class="modal fade modal-backdrop-transparent" id="modal-shortcut" tabindex="-1" role="dialog" aria-labelledby="modal-shortcut" aria-hidden="true">
 
+      <div class="modal-dialog modal-dialog-top modal-transparent" role="document">
 
+          <div class="modal-content">
 
+              <div class="modal-body">
 
+                  <ul class="app-list w-auto h-auto p-0 text-left">
 
+                    <li>
 
+                      <a href="/" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-11 icon-stack-3x opacity-100 color-primary-700"></i> <i class="base base-7 icon-stack-2x opacity-100 color-primary-500"></i> <i class="fas fa-chess icon-stack-1x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                          工作台
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="/contact" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-4 icon-stack-3x opacity-100 color-info-700"></i> <i class="base base-12 icon-stack-2x opacity-100 color-info-500"></i> <i class="fas fa-address-book icon-stack-1x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                         客户
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="/product" class="app-list-item text-white">
 
+                          <span class="icon-stack">
 
+                            <i class="base base-7 icon-stack-3x opacity-100 color-danger-900 "></i>
 
+                            <i class="base base-4 icon-stack-2x opacity-100 color-danger-600 "></i>
 
+                            <i class="fal fa-box icon-stack-1x text-white"></i>
 
+                          </span>
 
+                          <span class="app-list-name">
 
+                            产品
 
+                          </span>
 
+                        </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="#" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-9 icon-stack-3x opacity-100 color-success-700"></i> <i class="base base-14 icon-stack-2x opacity-100 color-success-500"></i> <i class="fas fa-clipboard-list icon-stack-1x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                            费用
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="#" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-3 icon-stack-3x opacity-100 color-warning-700"></i> <i class="base base-9 icon-stack-2x opacity-100 color-warning-500"></i> <i class="fas fa-credit-card-front icon-stack-1x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                            开票
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="#" class="app-list-item text-white">
 
+                        <div class="icon-stack">
 
+                          <i class="base-18 icon-stack-3x color-info-300"></i>
 
+                          <span class="position-absolute pos-top pos-left pos-right color-white fs-md mt-2 fw-400">Zz..</span>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                            假期
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="/hr" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-15 icon-stack-3x opacity-100 color-fusion-200"></i> <i class="base base-10 icon-stack-2x opacity-100 color-fusion-500"></i> <i class="fas fa-users icon-stack-1x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                            人资
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                    <li>
 
+                      <a href="#" class="app-list-item text-white">
 
+                        <div class='icon-stack'>
 
+                          <i class="base base-5 icon-stack-3x opacity-100 color-danger-300"></i> <i class="base base-14 icon-stack-2x opacity-100 color-danger-200"></i> <i class="fas fa-id-card icon-stack-2x opacity-100 color-white"></i>
 
+                        </div>
 
+                        <span class="app-list-name">
 
+                            我的纵横
 
+                          </span>
 
+                      </a>
 
+                    </li>
 
+                  </ul>
 
+              </div>
 
+          </div>
 
+      </div>
 
+  </div>
 
+<script src="http://cld2.com:9090/nodejs/framework.d919b9206a46f65a9f0b.bundle.js"></script><script src="http://cld2.com:9090/nodejs/vendor.d919b9206a46f65a9f0b.bundle.js"></script><script src="http://cld2.com:9090/nodejs/login.d919b9206a46f65a9f0b.bundle.js"></script></body>
 
+
 
+  
+<script src="http://cld2.com:9090/js/vendors.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/app.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/cld-custom.js"></script>
 
+
 
+<script type="text/javascript">
 
+  autoFlashHeight();
 
+  $('.slimScroll1').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol2').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol3').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol4').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+</script>
 
+<script>
 
+  </script>
 
+</html>

+ 1 - 0
dist/nodecss/hr.d919b9206a46f65a9f0b.css
Vedi File 

@@ -0,0 +1 @@
 
+

File diff suppressed because it is too large
+ 752 - 0
dist/nodejs/contact.d919b9206a46f65a9f0b.bundle.js


File diff suppressed because it is too large
+ 563 - 0
dist/nodejs/framework.d919b9206a46f65a9f0b.bundle.js


File diff suppressed because it is too large
+ 193 - 0
dist/nodejs/hr.d919b9206a46f65a9f0b.bundle.js


File diff suppressed because it is too large
+ 369 - 0
dist/nodejs/login.d919b9206a46f65a9f0b.bundle.js


File diff suppressed because it is too large
+ 529 - 0
dist/nodejs/product.d919b9206a46f65a9f0b.bundle.js


File diff suppressed because it is too large
+ 182 - 0
dist/nodejs/staff.d919b9206a46f65a9f0b.bundle.js


File diff suppressed because it is too large
+ 35073 - 0
dist/nodejs/vendor.d919b9206a46f65a9f0b.bundle.js


File diff suppressed because it is too large
+ 266 - 0
dist/nodejs/workbench.d919b9206a46f65a9f0b.bundle.js


+ 264 - 0
dist/product/index.html
Vedi File 

@@ -0,0 +1,264 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+  <meta charset="utf-8">
 
+  <title>
 
+    联系人-纵横CLD v2.0-subindex
 
+  </title>
 
+  <meta name="description" content="Page Titile">
 
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no, minimal-ui">
 
+  <!-- Call App Mode on ios devices -->
 
+  <meta name="apple-mobile-web-app-capable" content="yes" />
 
+  <!-- Remove Tap Highlight on Windows Phone IE -->
 
+  <meta name="msapplication-tap-highlight" content="no">
 
+  <!-- base css -->
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/vendors.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/app.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/cld-custom.css">
 
+  <!-- Place favicon.ico in the root directory -->
 
+  <link rel="shortcut icon" href="http://cld2.com:9090/img/favicon/favicon.ico">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-regular.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-solid.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-brands.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/global.css">
 
+
 
+
 
+
 
+<link href="http://cld2.com:9090/css/vendor.d919b9206a46f65a9f0b.css" rel="stylesheet"></head>
 
+
 
+<body class="mod-bg-1 nav-function-fixed header-function-fixed">
 
+  <!-- DOC: script to save and load page settings -->
 
+  <script>
 
+    /**
 
+     *	This script should be placed right after the body tag for fast execution
 
+     *	Note: the script is written in pure javascript and does not depend on thirdparty library
 
+     **/
 
+    'use strict';
 
+    var classHolder = document.getElementsByTagName("BODY")[0],
 
+      /**
 
+       * Load from localstorage
 
+       **/
 
+      themeSettings = (localStorage.getItem('themeSettings')) ? JSON.parse(localStorage.getItem('themeSettings')) : {},
 
+      themeURL = themeSettings.themeURL || '',
 
+      themeOptions = themeSettings.themeOptions || '';
 
+    /**
 
+     * Load theme options
 
+     **/
 
+    if (themeSettings.themeOptions) {
 
+      classHolder.className = themeSettings.themeOptions;
 
+      
+    } else {
 
+     
+    }
 
+    if (themeSettings.themeURL && !document.getElementById('mytheme')) {
 
+      var cssfile = document.createElement('link');
 
+      cssfile.id = 'mytheme';
 
+      cssfile.rel = 'stylesheet';
 
+      cssfile.href = themeURL;
 
+      document.getElementsByTagName('head')[0].appendChild(cssfile);
 
+    }
 
+    /**
 
+     * Save to localstorage
 
+     **/
 
+    var saveSettings = function () {
 
+      themeSettings.themeOptions = String(classHolder.className).split(/[^\w-]+/).filter(function (item) {
 
+        return /^(nav|header|mod|display)-/i.test(item);
 
+      }).join(' ');
 
+      if (document.getElementById('mytheme')) {
 
+        themeSettings.themeURL = document.getElementById('mytheme').getAttribute("href");
 
+      };
 
+      localStorage.setItem('themeSettings', JSON.stringify(themeSettings));
 
+    }
 
+    /**
 
+     * Reset settings
 
+     **/
 
+    var resetSettings = function () {
 
+      localStorage.setItem("themeSettings", "");
 
+    }
 
+  </script>
 
+  <!-- BEGIN Page Wrapper -->
 
+  <div class="page-wrapper">
 
+    <div class="page-inner">
 
+      <div id="root" class="width100"></div>
 
+    </div>
 
+  </div>
 
+  <!-- END Page Wrapper -->
 
+  <!-- BEGIN应用切换 -->
 
+  <div class="modal fade modal-backdrop-transparent" id="modal-shortcut" tabindex="-1" role="dialog"
 
+    aria-labelledby="modal-shortcut" aria-hidden="true">
 
+    <div class="modal-dialog modal-dialog-top modal-transparent" role="document">
 
+      <div class="modal-content">
 
+        <div class="modal-body">
 
+          <ul class="app-list w-auto h-auto p-0 text-left">
 
+            <li>
 
+              <a href="/" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-11 icon-stack-3x opacity-100 color-primary-700"></i> <i
 
+                    class="base base-7 icon-stack-2x opacity-100 color-primary-500"></i> <i
 
+                    class="fas fa-chess icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  工作台
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/contact" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-4 icon-stack-3x opacity-100 color-info-700"></i> <i
 
+                    class="base base-12 icon-stack-2x opacity-100 color-info-500"></i> <i
 
+                    class="fas fa-address-book icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  客户
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/product" class="app-list-item text-white">
 
+                <span class="icon-stack">
 
+                  <i class="base base-7 icon-stack-3x opacity-100 color-danger-900 "></i>
 
+                  <i class="base base-4 icon-stack-2x opacity-100 color-danger-600 "></i>
 
+                  <i class="fal fa-box icon-stack-1x text-white"></i>
 
+                </span>
 
+                <span class="app-list-name">
 
+                  产品
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-9 icon-stack-3x opacity-100 color-success-700"></i> <i
 
+                    class="base base-14 icon-stack-2x opacity-100 color-success-500"></i> <i
 
+                    class="fas fa-clipboard-list icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  费用
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-3 icon-stack-3x opacity-100 color-warning-700"></i> <i
 
+                    class="base base-9 icon-stack-2x opacity-100 color-warning-500"></i> <i
 
+                    class="fas fa-credit-card-front icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  开票
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class="icon-stack">
 
+                  <i class="base-18 icon-stack-3x color-info-300"></i>
 
+                  <span class="position-absolute pos-top pos-left pos-right color-white fs-md mt-2 fw-400">Zz..</span>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  假期
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/hr" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-15 icon-stack-3x opacity-100 color-fusion-200"></i> <i
 
+                    class="base base-10 icon-stack-2x opacity-100 color-fusion-500"></i> <i
 
+                    class="fas fa-users icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  人资
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-5 icon-stack-3x opacity-100 color-danger-300"></i> <i
 
+                    class="base base-14 icon-stack-2x opacity-100 color-danger-200"></i> <i
 
+                    class="fas fa-id-card icon-stack-2x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  我的纵横
 
+                </span>
 
+              </a>
 
+            </li>
 
+          </ul>
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </div>
 
+<script src="http://cld2.com:9090/nodejs/framework.d919b9206a46f65a9f0b.bundle.js"></script><script src="http://cld2.com:9090/nodejs/vendor.d919b9206a46f65a9f0b.bundle.js"></script><script src="http://cld2.com:9090/nodejs/product.d919b9206a46f65a9f0b.bundle.js"></script></body>
 
+
 
+<script src="http://cld2.com:9090/js/vendors.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/app.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/cld-custom.js"></script>
 
+
 
+
 
+<script type="text/javascript">
 
+
 
+
 
+  // $(document).ready(function () {
 
+  //   $('#dt-basic-example').dataTable(
 
+  //     {
 
+  //       responsive: true,
 
+  //       autoWidth: true,
 
+  //       info: false,
 
+  //       searching: false,
 
+  //       lengthChange: false,
 
+  //       "ajax": {
 
+  //         "url": "http://cld2.com:9090/cld2/contact/client",
 
+  //         "dataSrc": "list"
 
+  //       }
 
+  //       //scrollX: true,
 
+  //     });
 
+
 
+  //   $('.js-thead-colors a').on('click', function () {
 
+  //     var theadColor = $(this).attr("data-bg");
 
+  //     console.log(theadColor);
 
+  //     $('#dt-basic-example thead').removeClassPrefix('bg-').addClass(theadColor);
 
+  //   });
 
+
 
+  //   $('.js-tbody-colors a').on('click', function () {
 
+  //     var theadColor = $(this).attr("data-bg");
 
+  //     console.log(theadColor);
 
+  //     $('#dt-basic-example').removeClassPrefix('bg-').addClass(theadColor);
 
+  //   });
 
+
 
+  // });
 
+
 
+
 
+
 
+
 
+  autoFlashHeight();
 
+  $('.slimScroll1').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol2').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol3').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol4').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+</script>
 
+<script>
 
+
 
+
 
+</script>
 
+
 
+</html>

+ 264 - 0
dist/staff/index.html
Vedi File 

@@ -0,0 +1,264 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+  <meta charset="utf-8">
 
+  <title>
 
+    联系人-纵横CLD v2.0-subindex
 
+  </title>
 
+  <meta name="description" content="Page Titile">
 
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no, minimal-ui">
 
+  <!-- Call App Mode on ios devices -->
 
+  <meta name="apple-mobile-web-app-capable" content="yes" />
 
+  <!-- Remove Tap Highlight on Windows Phone IE -->
 
+  <meta name="msapplication-tap-highlight" content="no">
 
+  <!-- base css -->
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/vendors.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/app.bundle.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/cld-custom.css">
 
+  <!-- Place favicon.ico in the root directory -->
 
+  <link rel="shortcut icon" href="http://cld2.com:9090/img/favicon/favicon.ico">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-regular.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-solid.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/fa-brands.css">
 
+  <link rel="stylesheet" media="screen, print" href="http://cld2.com:9090/css/global.css">
 
+
 
+
 
+
 
+</head>
 
+
 
+<body class="mod-bg-1 nav-function-fixed header-function-fixed">
 
+  <!-- DOC: script to save and load page settings -->
 
+  <script>
 
+    /**
 
+     *	This script should be placed right after the body tag for fast execution
 
+     *	Note: the script is written in pure javascript and does not depend on thirdparty library
 
+     **/
 
+    'use strict';
 
+    var classHolder = document.getElementsByTagName("BODY")[0],
 
+      /**
 
+       * Load from localstorage
 
+       **/
 
+      themeSettings = (localStorage.getItem('themeSettings')) ? JSON.parse(localStorage.getItem('themeSettings')) : {},
 
+      themeURL = themeSettings.themeURL || '',
 
+      themeOptions = themeSettings.themeOptions || '';
 
+    /**
 
+     * Load theme options
 
+     **/
 
+    if (themeSettings.themeOptions) {
 
+      classHolder.className = themeSettings.themeOptions;
 
+      
+    } else {
 
+     
+    }
 
+    if (themeSettings.themeURL && !document.getElementById('mytheme')) {
 
+      var cssfile = document.createElement('link');
 
+      cssfile.id = 'mytheme';
 
+      cssfile.rel = 'stylesheet';
 
+      cssfile.href = themeURL;
 
+      document.getElementsByTagName('head')[0].appendChild(cssfile);
 
+    }
 
+    /**
 
+     * Save to localstorage
 
+     **/
 
+    var saveSettings = function () {
 
+      themeSettings.themeOptions = String(classHolder.className).split(/[^\w-]+/).filter(function (item) {
 
+        return /^(nav|header|mod|display)-/i.test(item);
 
+      }).join(' ');
 
+      if (document.getElementById('mytheme')) {
 
+        themeSettings.themeURL = document.getElementById('mytheme').getAttribute("href");
 
+      };
 
+      localStorage.setItem('themeSettings', JSON.stringify(themeSettings));
 
+    }
 
+    /**
 
+     * Reset settings
 
+     **/
 
+    var resetSettings = function () {
 
+      localStorage.setItem("themeSettings", "");
 
+    }
 
+  </script>
 
+  <!-- BEGIN Page Wrapper -->
 
+  <div class="page-wrapper">
 
+    <div class="page-inner">
 
+      <div id="root" class="width100"></div>
 
+    </div>
 
+  </div>
 
+  <!-- END Page Wrapper -->
 
+  <!-- BEGIN应用切换 -->
 
+  <div class="modal fade modal-backdrop-transparent" id="modal-shortcut" tabindex="-1" role="dialog"
 
+    aria-labelledby="modal-shortcut" aria-hidden="true">
 
+    <div class="modal-dialog modal-dialog-top modal-transparent" role="document">
 
+      <div class="modal-content">
 
+        <div class="modal-body">
 
+          <ul class="app-list w-auto h-auto p-0 text-left">
 
+            <li>
 
+              <a href="/" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-11 icon-stack-3x opacity-100 color-primary-700"></i> <i
 
+                    class="base base-7 icon-stack-2x opacity-100 color-primary-500"></i> <i
 
+                    class="fas fa-chess icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  工作台
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/contact" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-4 icon-stack-3x opacity-100 color-info-700"></i> <i
 
+                    class="base base-12 icon-stack-2x opacity-100 color-info-500"></i> <i
 
+                    class="fas fa-address-book icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  客户
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/product" class="app-list-item text-white">
 
+                <span class="icon-stack">
 
+                  <i class="base base-7 icon-stack-3x opacity-100 color-danger-900 "></i>
 
+                  <i class="base base-4 icon-stack-2x opacity-100 color-danger-600 "></i>
 
+                  <i class="fal fa-box icon-stack-1x text-white"></i>
 
+                </span>
 
+                <span class="app-list-name">
 
+                  产品
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-9 icon-stack-3x opacity-100 color-success-700"></i> <i
 
+                    class="base base-14 icon-stack-2x opacity-100 color-success-500"></i> <i
 
+                    class="fas fa-clipboard-list icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  费用
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-3 icon-stack-3x opacity-100 color-warning-700"></i> <i
 
+                    class="base base-9 icon-stack-2x opacity-100 color-warning-500"></i> <i
 
+                    class="fas fa-credit-card-front icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  开票
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class="icon-stack">
 
+                  <i class="base-18 icon-stack-3x color-info-300"></i>
 
+                  <span class="position-absolute pos-top pos-left pos-right color-white fs-md mt-2 fw-400">Zz..</span>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  假期
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="/hr" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-15 icon-stack-3x opacity-100 color-fusion-200"></i> <i
 
+                    class="base base-10 icon-stack-2x opacity-100 color-fusion-500"></i> <i
 
+                    class="fas fa-users icon-stack-1x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  人资
 
+                </span>
 
+              </a>
 
+            </li>
 
+            <li>
 
+              <a href="#" class="app-list-item text-white">
 
+                <div class='icon-stack'>
 
+                  <i class="base base-5 icon-stack-3x opacity-100 color-danger-300"></i> <i
 
+                    class="base base-14 icon-stack-2x opacity-100 color-danger-200"></i> <i
 
+                    class="fas fa-id-card icon-stack-2x opacity-100 color-white"></i>
 
+                </div>
 
+                <span class="app-list-name">
 
+                  我的纵横
 
+                </span>
 
+              </a>
 
+            </li>
 
+          </ul>
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </div>
 
+<script src="http://cld2.com:9090/nodejs/framework.d919b9206a46f65a9f0b.bundle.js"></script><script src="http://cld2.com:9090/nodejs/staff.d919b9206a46f65a9f0b.bundle.js"></script></body>
 
+
 
+<script src="http://cld2.com:9090/js/vendors.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/app.bundle.js"></script>
 
+<script src="http://cld2.com:9090/js/cld-custom.js"></script>
 
+
 
+
 
+<script type="text/javascript">
 
+
 
+
 
+  // $(document).ready(function () {
 
+  //   $('#dt-basic-example').dataTable(
 
+  //     {
 
+  //       responsive: true,
 
+  //       autoWidth: true,
 
+  //       info: false,
 
+  //       searching: false,
 
+  //       lengthChange: false,
 
+  //       "ajax": {
 
+  //         "url": "http://cld2.com:9090/cld2/contact/client",
 
+  //         "dataSrc": "list"
 
+  //       }
 
+  //       //scrollX: true,
 
+  //     });
 
+
 
+  //   $('.js-thead-colors a').on('click', function () {
 
+  //     var theadColor = $(this).attr("data-bg");
 
+  //     console.log(theadColor);
 
+  //     $('#dt-basic-example thead').removeClassPrefix('bg-').addClass(theadColor);
 
+  //   });
 
+
 
+  //   $('.js-tbody-colors a').on('click', function () {
 
+  //     var theadColor = $(this).attr("data-bg");
 
+  //     console.log(theadColor);
 
+  //     $('#dt-basic-example').removeClassPrefix('bg-').addClass(theadColor);
 
+  //   });
 
+
 
+  // });
 
+
 
+
 
+
 
+
 
+  autoFlashHeight();
 
+  $('.slimScroll1').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol2').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol3').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+  $('.slimScrol4').slimScroll({
 
+    position: 'right',
 
+    height: 'auto',
 
+    railVisible: true
 
+  });
 
+</script>
 
+<script>
 
+
 
+
 
+</script>
 
+
 
+</html>

+ 0 - 25
src/common/popupslockDetail/store/actionCreators.js
Vedi File 

@@ -1,25 +0,0 @@
 
-import * as constants from './constants';
 
-import { fromJS } from 'immutable';
 
-
 
-import axios from '../../../common/axios_auth.js';
 
-// import axios from 'axios';
 
-
 
-
 
-export const getlocksotreDetail = (key,error) => {
 
-    return (dispatch) => {
 
-        axios.get(config.CLD2API + '/product/longle/'+key).then((res) => {
 
-            const data = res.data;
 
-            if (data.code === 200) {
 
-                dispatch({
 
-                    type: constants.CHANGE_LOCK_DETAIL,
 
-                    data: data.data,
 
-                });
 
-            } else {
 
-                error('公司详情请求失败');
 
-            }
 
-        }).catch((e) => {
 
-            error('公司详情请求失败');
 
-        })
 
-    }
 
-};
 
-

+ 41 - 12
src/common/popupslockDetail/index.js
Vedi File 

@@ -1,13 +1,37 @@
 
 import React, { PureComponent } from 'react';
 
 import React, { PureComponent } from 'react';
 
 import { connect } from 'react-redux';
 
 import { connect } from 'react-redux';
 
 // import { BrowserRouter, Route,Link } from 'react-router-dom';
 
 // import { BrowserRouter, Route,Link } from 'react-router-dom';
 
+
 
 import { actionCreators } from './store';
 
 import { actionCreators } from './store';
 
+import { message,Tag,Spin } from 'antd';
 
+
 
+const error = (msg) => {
 
+  message.error(msg);
 
+};
 
 
 
 class lockDetailPopups extends PureComponent {
 
 class lockDetailPopups extends PureComponent {
 
 
 
+  getTag(productList) {
 
+    if(typeof productList==='undefined'){
 
+      return null
 
+    }else{
 
+      return (
 
+        <>
 
+            {
 
+              productList.map((item,index) => {
 
+                return <Tag color="#886ab5" key={index}>{item}</Tag>
 
+              })
 
+            }
 
+        </>
 
+      );
 
+    }
 
+
 
+  }
 
+
 
   render() {
 
   render() {
 
-    const {locksotreDetail} = this.props;
 
-    // let lockDetail2 = lockDetail.toJS();
 
+    const {locksotreDetail,loading} = this.props;
 
+    let lockDetail2 = locksotreDetail.toJS();
 
+    // console.log(lockDetail2)
 
     return (
 
     return (
 
       <div className="modal fade" id="lockDetail" role="dialog" aria-hidden="true" data-backdrop="static">
 
       <div className="modal fade" id="lockDetail" role="dialog" aria-hidden="true" data-backdrop="static">
 
     <div className="modal-dialog modal-xl">
 
     <div className="modal-dialog modal-xl">
 
@@ -16,6 +40,7 @@ class lockDetailPopups extends PureComponent {
 
           <button type="button" className="close" data-dismiss="modal" aria-label="Close">
 
           <button type="button" className="close" data-dismiss="modal" aria-label="Close">
 
               <span aria-hidden="true"><i className="fal fa-times"></i></span>
 
               <span aria-hidden="true"><i className="fal fa-times"></i></span>
 
           </button>
 
           </button>
 
+          <Spin size="large" spinning={loading} >
 
           <div className="sheet-box row m-0">
 
           <div className="sheet-box row m-0">
 
             <div className="sheet-left-panel">
 
             <div className="sheet-left-panel">
 
               <div className="sheet-panel-header d-flex justify-content-between mx-4">
 
               <div className="sheet-panel-header d-flex justify-content-between mx-4">
 
@@ -30,50 +55,51 @@ class lockDetailPopups extends PureComponent {
 
               <div className="sheet-panel-content">
 
               <div className="sheet-panel-content">
 
                 <div className="sheet-panel-form slimScroll1 mx-4">
 
                 <div className="sheet-panel-form slimScroll1 mx-4">
 
                   <div className="form-header mt-3">
 
                   <div className="form-header mt-3">
 
-                    <div className="d-flex justify-content-between"><span className="text-muted">软件锁</span><span className="text-muted">出库于 2019年5月6日 14:55</span></div>
 
-                    {/* <legend>{lockDetail2.key_num}</legend> */}
 
+                    <div className="d-flex justify-content-between"><span className="text-muted">软件锁</span><span className="text-muted">出库于 {lockDetail2.make_day}</span></div>
 
+                    <legend>{lockDetail2.key_num}</legend>
 
                   </div>
 
                   </div>
 
                   <div className="cldform clearfix">
 
                   <div className="cldform clearfix">
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-item">
 
                     <div className="cldform-item">
 
                       <div className="cldform-label">锁号</div>
 
                       <div className="cldform-label">锁号</div>
 
                       <div className="cldform-control">
 
                       <div className="cldform-control">
 
-                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span>HNYH-0654</span></div>
 
+                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span>{lockDetail2.key_num}</span></div>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-item">
 
                     <div className="cldform-item">
 
                       <div className="cldform-label">产品</div>
 
                       <div className="cldform-label">产品</div>
 
                       <div className="cldform-control">
 
                       <div className="cldform-control">
 
-                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span className="badge badge-primary mr-1">固化清单全功能</span><span className="badge badge-primary mr-1">全国专业</span><span className="badge badge-primary">全国专业（新定额）</span></div>
 
+                      {/* <Tag color="#886ab5">{lockDetail2.productList}</Tag> */}
 
+                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank">{this.getTag(lockDetail2.productList)}</div>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-item">
 
                     <div className="cldform-item">
 
                       <div className="cldform-label">期限</div>
 
                       <div className="cldform-label">期限</div>
 
                       <div className="cldform-control">
 
                       <div className="cldform-control">
 
-                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span></span></div>
 
+                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span>{lockDetail2.alloted_time}</span></div>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-item">
 
                     <div className="cldform-item">
 
                       <div className="cldform-label">使用状态</div>
 
                       <div className="cldform-label">使用状态</div>
 
                       <div className="cldform-control">
 
                       <div className="cldform-control">
 
-                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span>销售</span></div>
 
+                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span>{lockDetail2.statusT}</span></div>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-item">
 
                     <div className="cldform-item">
 
                       <div className="cldform-label">负责人</div>
 
                       <div className="cldform-label">负责人</div>
 
                       <div className="cldform-control">
 
                       <div className="cldform-control">
 
-                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span><a href="#">@陈特</a></span></div>
 
+                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span><a href="#">@{lockDetail2.responsible}</a></span></div>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-item">
 
                     <div className="cldform-item">
 
                       <div className="cldform-label">联系人</div>
 
                       <div className="cldform-label">联系人</div>
 
                       <div className="cldform-control">
 
                       <div className="cldform-control">
 
-                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span><a href="#">张三</a></span></div>
 
+                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span><a href="#">{lockDetail2.client}</a></span></div>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                     <div className="cldform-line"></div>
 
                     <div className="cldform-line"></div>
 
@@ -180,6 +206,7 @@ class lockDetailPopups extends PureComponent {
 
               </div>
 
               </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
+          </Spin>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
@@ -199,14 +226,16 @@ class lockDetailPopups extends PureComponent {
 
 
 
 const mapStateToProps = (state) => {
 
 const mapStateToProps = (state) => {
 
   return {
 
   return {
 
-    locksotreDetail: state.getIn(['lockDetailPopups', 'locksotreDetail']),
 
+    locksotreDetail: state.getIn(['popupstock', 'locksotreDetail']),
 
+    loading: state.getIn(['popupstock', 'loading']),
 
   }
 
   }
 
 }
 
 }
 
 
 
 const mapDispathToProps = (dispatch) => {
 
 const mapDispathToProps = (dispatch) => {
 
   return {
 
   return {
 
     handlelockDetailPopups(key) {
 
     handlelockDetailPopups(key) {
 
-      // console.log('dndn');
 
+      //  console.log('dndn');
 
+      dispatch(actionCreators.changeLoading());
 
       dispatch(actionCreators.getlocksotreDetail(key,error));
 
       dispatch(actionCreators.getlocksotreDetail(key,error));
 
     },
 
     },
 
   }
 
   }

+ 37 - 0
src/common/popupstockDetail/store/actionCreators.js
Vedi File 

@@ -0,0 +1,37 @@
 
+import * as constants from './constants';
 
+import { fromJS } from 'immutable';
 
+import * as config from '../../../common/config.js';
 
+import axios from '../../axios_auth.js';
 
+// import axios from 'axios';
 
+
 
+//Loading
 
+export const changeLoading = () => {
 
+    return (dispatch) => {
 
+        dispatch({
 
+            type: constants.CHANGE_LOCK_DETAIL_LOADING,
 
+            data: true,
 
+        });
 
+    }
 
+}
 
+
 
+export const getlocksotreDetail = (key,error) => {
 
+    return (dispatch) => {
 
+        // console.log(key)
 
+        axios.get(config.CLD2API + '/product/longleDetail/'+key).then((res) => {
 
+            const data = res.data;
 
+            if (data.code === 200) {
 
+                data.data.productList=data.data.product.split("+");
 
+                //console.log(data.data.productList);
 
+                dispatch({
 
+                    type: constants.CHANGE_LOCK_DETAIL,
 
+                    data: data.data,
 
+                });
 
+            } else {
 
+                error('软件锁详情请求失败');
 
+            }
 
+        }).catch((e) => {
 
+            error('软件锁详情请求失败');
 
+        })
 
+    }
 
+};
 
+

+ 1 - 0
src/common/popupslockDetail/store/constants.js
Vedi File 

@@ -1,2 +1,3 @@
 
 export const CHANGE_LOCK_DETAIL = 'lockDetail/change_lock_detail';
 
 export const CHANGE_LOCK_DETAIL = 'lockDetail/change_lock_detail';
 
 export const CHANGE_INPUT_VALUE = 'lockDetail/value';
 
 export const CHANGE_INPUT_VALUE = 'lockDetail/value';
 
+export const CHANGE_LOCK_DETAIL_LOADING = 'lockDetail/change_lock_detail_loading';

src/common/popupslockDetail/store/index.js → src/common/popupstockDetail/store/index.js
Vedi File


+ 5 - 6
src/common/popupslockDetail/store/reducer.js
Vedi File 

@@ -4,21 +4,20 @@ import { fromJS } from 'immutable';
 
 
 
 
 
 const defaultState = fromJS({
 
 const defaultState = fromJS({
 
-    locksotreDetail: { staffDetial: {} },
 
+	locksotreDetail: {},
 
+	loading: true,
 
 });
 
 });
 
 
 
 
 
 export default (state = defaultState, action) => {
 
 export default (state = defaultState, action) => {
 
-	// let locksotreDetail = state.get('locksotreDetail').toJS();
 
     switch (action.type) {
 
     switch (action.type) {
 
+		case constants.CHANGE_LOCK_DETAIL_LOADING:
 
+			return state.set('loading', action.data);
 
 		case constants.CHANGE_LOCK_DETAIL:
 
 		case constants.CHANGE_LOCK_DETAIL:
 
 			return state.merge({
 
 			return state.merge({
 
+				loading: false,
 
 				locksotreDetail: fromJS(action.data)
 
 				locksotreDetail: fromJS(action.data)
 
 			});
 
 			});
 
-		// case constants.CHANGE_INPUT_VALUE:
 
-		// 	let condition={[action.data.field]:action.data.value};
 
-		// 	Object.assign(lockDetail, condition);
 
-		// 	return state.set('lockDetail', fromJS(lockDetail));
 
 		default:
 
 		default:
 
 			return state;
 
 			return state;
 
 	}
 
 	}

+ 1 - 1
src/product/lock_count/index.js
Vedi File 

@@ -10,7 +10,7 @@ class lock_count extends PureComponent {
 
       const { lockCount } = this.props;
 
       const { lockCount } = this.props;
 
         return (
 
         return (
 
             <div>
 
             <div>
 
-                <StaffHeader />
 
+                {/* <StaffHeader /> */}
 
                 <main id="js-page-content" role="main" className="page-content">
 
                 <main id="js-page-content" role="main" className="page-content">
 
           <div className="row">
 
           <div className="row">
 
             <div className="col-xl-12">
 
             <div className="col-xl-12">

+ 17 - 7
src/product/lock_store/index.js
Vedi File 

@@ -2,10 +2,10 @@ import React, { PureComponent } from 'react';
 
 import { connect } from 'react-redux';
 
 import { connect } from 'react-redux';
 
 //import { BrowserRouter, Route,Link } from 'react-router-dom';
 
 //import { BrowserRouter, Route,Link } from 'react-router-dom';
 
 import StaffHeader from '../../common/staffHeader'
 
 import StaffHeader from '../../common/staffHeader'
 
-import { Table, Input,Radio } from 'antd';
 
+import { Table, Input,Radio} from 'antd';
 
 import 'antd/dist/antd.css';
 
 import 'antd/dist/antd.css';
 
 import { actionCreators } from './store';
 
 import { actionCreators } from './store';
 
-import Popups from '../../common/popupslockDetail';
 
+import Popups from '../../common/popupstockDetail';
 
 //import { AudioOutlined } from '@ant-design/icons';
 
 //import { AudioOutlined } from '@ant-design/icons';
 
 
 
 const radioStyle = {
 
 const radioStyle = {
 
@@ -18,11 +18,11 @@ let popupsObj = null;
 
 
 
 class lock_store extends PureComponent {
 
 class lock_store extends PureComponent {
 
     render() {
 
     render() {
 
-      const {dataSource,columns,pagination,handleLockstoreList,handleSearch,columnsData,columnsNum,handleInputChange,handleColumnsShow,sortField,sort,handleLockstoreSortField,handleLockstoreSort} = this.props;
 
+      const {dataSource,columns,pagination,handleLockstoreList,loading,handleSearch,columnsData,columnsNum,handleInputChange,handleColumnsShow,sortField,sort,handleLockstoreSortField,handleLockstoreSort} = this.props;
 
      
      
         return (
 
         return (
 
         <div>
 
         <div>
 
-        <StaffHeader />
 
+        {/* <StaffHeader /> */}
 
         <main id="js-page-content" role="main" className="page-content">
 
         <main id="js-page-content" role="main" className="page-content">
 
           <div className="row">
 
           <div className="row">
 
             <div className="col-xl-12">
 
             <div className="col-xl-12">
 
@@ -35,6 +35,7 @@ class lock_store extends PureComponent {
 
                         onSearch={value => handleSearch(pagination.toJS(),this.props,value)}
 
                         onSearch={value => handleSearch(pagination.toJS(),this.props,value)}
 
                         onKeyUp={(e) => handleSearch(pagination.toJS(),this.props,e.target.value,'keyup')}
 
                         onKeyUp={(e) => handleSearch(pagination.toJS(),this.props,e.target.value,'keyup')}
 
                         style={{ width: 200 }}
 
                         style={{ width: 200 }}
 
+                        loading={loading}
 
                       />
 
                       />
 
                     </div>
 
                     </div>
 
                   </div>
 
                   </div>
 
@@ -51,7 +52,7 @@ class lock_store extends PureComponent {
 
                               <li key={index} className="mb-2">
 
                               <li key={index} className="mb-2">
 
                                 <div className="custom-control custom-switch">
 
                                 <div className="custom-control custom-switch">
 
                                   <input type="checkbox" name={index} onChange={(e) => handleInputChange(e, index)} value={item.get('columnsValue')} checked={item.get('columnsValue')} className="custom-control-input" id={"lie" + index} />
 
                                   <input type="checkbox" name={index} onChange={(e) => handleInputChange(e, index)} value={item.get('columnsValue')} checked={item.get('columnsValue')} className="custom-control-input" id={"lie" + index} />
 
-                                  <label onClick={() => handleColumnsShow(index)} htmlFor={"lie" + index} className="custom-control-label" >{item.get('columnsName')}</label>
 
+                                  <label onClick={() => handleColumnsShow(index,this.props)} htmlFor={"lie" + index} className="custom-control-label" >{item.get('columnsName')}</label>
 
                                 </div>
 
                                 </div>
 
                               </li>
 
                               </li>
 
                             )
 
                             )
 
@@ -96,6 +97,7 @@ class lock_store extends PureComponent {
 
                    <Table
 
                    <Table
 
                     onChange={(pagination,sorter) => handleLockstoreList(pagination,this.props)}
 
                     onChange={(pagination,sorter) => handleLockstoreList(pagination,this.props)}
 
                     pagination={pagination.toJS()}
 
                     pagination={pagination.toJS()}
 
+                    loading={loading}
 
                     bordered
 
                     bordered
 
                     dataSource={dataSource.toJS()}
 
                     dataSource={dataSource.toJS()}
 
                     columns={columns.toJS()}
 
                     columns={columns.toJS()}
 
@@ -129,6 +131,7 @@ let delaySwitch = null;
 
 const mapStateToProps = (state) => {
 
 const mapStateToProps = (state) => {
 
     return {
 
     return {
 
       dataSource: state.getIn(['lockstore', 'dataSource']),
 
       dataSource: state.getIn(['lockstore', 'dataSource']),
 
+      loading: state.getIn(['lockstore', 'loading']),
 
       columns: state.getIn(['lockstore', 'columns']),
 
       columns: state.getIn(['lockstore', 'columns']),
 
       pagination: state.getIn(['lockstore', 'pagination']),
 
       pagination: state.getIn(['lockstore', 'pagination']),
 
       searchValue: state.getIn(['lockstore', 'searchValue']),
 
       searchValue: state.getIn(['lockstore', 'searchValue']),
 
@@ -146,28 +149,35 @@ const mapStateToProps = (state) => {
 
  */
 
  */
 
 const mapDispathToProps = (dispatch) => {
 
 const mapDispathToProps = (dispatch) => {
 
     return {
 
     return {
 
-      handleColumnsShow(index) {
 
-        dispatch(actionCreators.toggleColumns(index));
 
+      //列隐藏显示
 
+      handleColumnsShow(index,support) {
 
+        dispatch(actionCreators.toggleColumns(index,support));
 
       },
 
       },
 
       initData(){
 
       initData(){
 
         dispatch(actionCreators.toggleColumnsAll());
 
         dispatch(actionCreators.toggleColumnsAll());
 
         dispatch(actionCreators.toggleSorter());
 
         dispatch(actionCreators.toggleSorter());
 
       },
 
       },
 
+      //获得表格数据
 
       handleLockstoreList(pagination,support){
 
       handleLockstoreList(pagination,support){
 
         // console.log(support)
 
         // console.log(support)
 
+        dispatch(actionCreators.changeLoading());
 
         dispatch(actionCreators.getLockstoreList(pagination,support));
 
         dispatch(actionCreators.getLockstoreList(pagination,support));
 
         
         
       },
 
       },
 
       //排序设置
 
       //排序设置
 
     handleLockstoreSortField(pagination, support, e) {
 
     handleLockstoreSortField(pagination, support, e) {
 
+      dispatch(actionCreators.changeLoading());
 
       dispatch(actionCreators.changeSortField(e.target.value));
 
       dispatch(actionCreators.changeSortField(e.target.value));
 
       dispatch(actionCreators.getLockstoreList(pagination, support));
 
       dispatch(actionCreators.getLockstoreList(pagination, support));
 
     },
 
     },
 
     handleLockstoreSort(pagination, support, e) {
 
     handleLockstoreSort(pagination, support, e) {
 
+      dispatch(actionCreators.changeLoading());
 
       dispatch(actionCreators.changeSort(e.target.value));
 
       dispatch(actionCreators.changeSort(e.target.value));
 
       dispatch(actionCreators.getLockstoreList(pagination, support));
 
       dispatch(actionCreators.getLockstoreList(pagination, support));
 
     },
 
     },
 
+    //搜索
 
       handleSearch(pagination,support,searchValue,keyup){
 
       handleSearch(pagination,support,searchValue,keyup){
 
+        dispatch(actionCreators.changeLoading());
 
         if(keyup === 'keyup'){
 
         if(keyup === 'keyup'){
 
           if(delaySwitch != null){
 
           if(delaySwitch != null){
 
             clearTimeout(delaySwitch);
 
             clearTimeout(delaySwitch);

+ 19 - 3
src/product/lock_store/store/actionCreators.js
Vedi File 

@@ -3,11 +3,12 @@ import { fromJS } from 'immutable';
 
 import * as config from '../../../common/config.js';
 
 import * as config from '../../../common/config.js';
 
 import axios from '../../../common/axios_auth.js';
 
 import axios from '../../../common/axios_auth.js';
 
 
 
-export const toggleColumns = (index) => {
 
+export const toggleColumns = (index,support) => {
 
     return (dispatch) => {
 
     return (dispatch) => {
 
         dispatch({
 
         dispatch({
 
             type: constants.TOGGLE_COLUMNS,
 
             type: constants.TOGGLE_COLUMNS,
 
             data: index,
 
             data: index,
 
+            support:support,
 
         });
 
         });
 
     }
 
     }
 
 };
 
 };
 
@@ -43,12 +44,22 @@ export const changeSort = (sort) => {
 
         });
 
         });
 
     }
 
     }
 
 }
 
 }
 
+//Loading
 
+export const changeLoading = () => {
 
+    return (dispatch) => {
 
+        dispatch({
 
+            type: constants.CHANGE_LOCKSTORE_LOADING,
 
+            data: true,
 
+        });
 
+    }
 
+}
 
 
 
 export const getLockstoreList = (pagination,support,searchValue) =>{
 
 export const getLockstoreList = (pagination,support,searchValue) =>{
 
     return(dispatch) =>{
 
     return(dispatch) =>{
 
         // console.log('searchValue:'+searchValue);
 
         // console.log('searchValue:'+searchValue);
 
         // console.log('support:'+searchValue);
 
         // console.log('support:'+searchValue);
 
         // console.log('typeof:'+typeof searchValue);
 
         // console.log('typeof:'+typeof searchValue);
 
+        //console.log(support);
 
         let sortField = localStorage.getItem("product_lock_store_sortField");
 
         let sortField = localStorage.getItem("product_lock_store_sortField");
 
         if(sortField===null){
 
         if(sortField===null){
 
             sortField = support.sortField;
 
             sortField = support.sortField;
 
@@ -60,8 +71,6 @@ export const getLockstoreList = (pagination,support,searchValue) =>{
 
         if(typeof searchValue === 'undefined'){
 
         if(typeof searchValue === 'undefined'){
 
             searchValue = support.searchValue;
 
             searchValue = support.searchValue;
 
         }
 
         }
 
-        // console.log();
 
-        // console.log(config.CLD2API + '/contact/company')
 
         axios.get(config.CLD2API + '/product/longle', {
 
         axios.get(config.CLD2API + '/product/longle', {
 
             params: {
 
             params: {
 
                 current: pagination.current,
 
                 current: pagination.current,
 
@@ -73,6 +82,13 @@ export const getLockstoreList = (pagination,support,searchValue) =>{
 
             },
 
             },
 
         }).then((res) => {
 
         }).then((res) => {
 
             const data = res.data;
 
             const data = res.data;
 
+            //字符串转数组
 
+            // console.log(data.data[0].product.split("+"));
 
+            for(var i=0;i < data.data.length;i++){
 
+                //  console.log(data.data[i].product);
 
+                //  console.log(data.data[i].product.split("+"));
 
+                data.data[i].productList=data.data[i].product.split("+");
 
+            }
 
             if (data.code === 200) {
 
             if (data.code === 200) {
 
                 // console.log(searchValue);
 
                 // console.log(searchValue);
 
                 dispatch({
 
                 dispatch({

+ 2 - 1
src/product/lock_store/store/constants.js
Vedi File 

@@ -3,4 +3,5 @@ export const TOGGLE_COLUMNS = 'product/toggle_columns';
 
 export const TOGGLE_COLUMNS_ALL = 'product/toggle_columns_all';
 
 export const TOGGLE_COLUMNS_ALL = 'product/toggle_columns_all';
 
 export const TOGGLE_SORTER= 'product/toggle_sorter';
 
 export const TOGGLE_SORTER= 'product/toggle_sorter';
 
 export const CHANGE_LOCKSTORE_SORTFIELD= 'product/change_lockstore_sortField';
 
 export const CHANGE_LOCKSTORE_SORTFIELD= 'product/change_lockstore_sortField';
 
-export const CHANGE_LOCKSTORE_SORT= 'product/change_lockstore_sort';
 
+export const CHANGE_LOCKSTORE_SORT= 'product/change_lockstore_sort';
 
+export const CHANGE_LOCKSTORE_LOADING= 'product/change_lockstore_loading';

+ 105 - 17
src/product/lock_store/store/reducer.js
Vedi File 

@@ -3,6 +3,8 @@ import React from 'react';
 
 //锁定state不可修改，导致错误y
 
 //锁定state不可修改，导致错误y
 
 import { fromJS } from 'immutable';
 
 import { fromJS } from 'immutable';
 
 
 
+import { Tag } from 'antd';
 
+
 
 const defaultState = fromJS({
 
 const defaultState = fromJS({
 
 	pagination: {
 
 	pagination: {
 
 		current: 1,
 
 		current: 1,
 
@@ -10,6 +12,7 @@ const defaultState = fromJS({
 
 		position: ['bottomCenter'],
 
 		position: ['bottomCenter'],
 
 		showSizeChanger: false
 
 		showSizeChanger: false
 
 	},
 
 	},
 
+	loading: false,
 
 	columnsNum: 0,
 
 	columnsNum: 0,
 
 	searchValue: '',
 
 	searchValue: '',
 
 	dataSource: [],
 
 	dataSource: [],
 
@@ -88,12 +91,39 @@ export default (state = defaultState, action) => {
 
 			countFalse = 0;
 
 			countFalse = 0;
 
 			for (var i = 0; i < columnsData.length; i++) {
 
 			for (var i = 0; i < columnsData.length; i++) {
 
 				var isAccept = localStorage.getItem("product_lock_store_Column_" + i);
 
 				var isAccept = localStorage.getItem("product_lock_store_Column_" + i);
 
-				if (isAccept === "true") {
 
+				if (isAccept === "false") {
 
 					countFalse++;
 
 					countFalse++;
 
 				}
 
 				}
 
 			}
 
 			}
 
+			columnNumData = columnsData.length - countFalse;
 
+			// console.log(columnsData);
 
+			// console.log(columnsData.length);
 
 			// console.log(countFalse);
 
 			// console.log(countFalse);
 
-			columnNumData = countFalse;
 
+			// columnNumData = countFalse;
 
+			let tagIndex='';
 
+			columnsBak.forEach((element,value) => {
 
+				if(element.title==='产品'){
 
+					tagIndex=value;
 
+				}
 
+				//console.log(value)
 
+			});
 
+			//console.log(columnsBak);
 
+			if(tagIndex!==''){
 
+				columnsBak[tagIndex]=renderTag(columnsBak[tagIndex]);
 
+			}
 
+
 
+			let atextIndex='';
 
+			columnsBak.forEach((element,value) => {
 
+				if(element.title==='锁号'){
 
+					atextIndex=value;
 
+				}
 
+				//console.log(value)
 
+			});
 
+			//console.log(columnsBak);
 
+			if(atextIndex!==''){
 
+				columnsBak[atextIndex]=renderAtext(columnsBak[atextIndex],action);
 
+			}
 
+
 
 			return state.merge({
 
 			return state.merge({
 
 				columnsData: fromJS(columnsData),
 
 				columnsData: fromJS(columnsData),
 
 				columns: fromJS(columnsBak),
 
 				columns: fromJS(columnsBak),
 
@@ -101,7 +131,6 @@ export default (state = defaultState, action) => {
 
 			});
 
 			});
 
 		case constants.TOGGLE_COLUMNS_ALL:
 
 		case constants.TOGGLE_COLUMNS_ALL:
 
 			countFalse = 0;
 
 			countFalse = 0;
 
-			//console.log(columns.length)
 
 			for (var i = 0; i <= columnsData.length; i++) {
 
 			for (var i = 0; i <= columnsData.length; i++) {
 
 				var isAccept = localStorage.getItem("product_lock_store_Column_" + i);
 
 				var isAccept = localStorage.getItem("product_lock_store_Column_" + i);
 
 				if (isAccept === "false") {
 
 				if (isAccept === "false") {
 
@@ -110,23 +139,25 @@ export default (state = defaultState, action) => {
 
 				}
 
 				}
 
 			}
 
 			}
 
 			columnNumData = columnsData.length - countFalse;
 
 			columnNumData = columnsData.length - countFalse;
 
+			//console.log(refreshColumns(columnsData));
 
 			var columnsBak = refreshColumns(columnsData, columns);
 
 			var columnsBak = refreshColumns(columnsData, columns);
 
 			return state.merge({
 
 			return state.merge({
 
-				columnsNum: columnNumData,
 
 				columnsData: fromJS(columnsData),
 
 				columnsData: fromJS(columnsData),
 
+				columnsNum: columnNumData,
 
+				columns: fromJS(columnsBak),
 
 			});
 
 			});
 
 		//排序
 
 		//排序
 
 		case constants.TOGGLE_SORTER:
 
 		case constants.TOGGLE_SORTER:
 
 			var sortField = localStorage.getItem("product_lock_store_sortField");
 
 			var sortField = localStorage.getItem("product_lock_store_sortField");
 
 			var sort = localStorage.getItem("product_lock_store_sort");
 
 			var sort = localStorage.getItem("product_lock_store_sort");
 
-			if(sortField!==null&&sort!==null){
 
+			if (sortField !== null && sort !== null) {
 
 				return state.merge({
 
 				return state.merge({
 
 					sortField: sortField,
 
 					sortField: sortField,
 
 					sort: sort
 
 					sort: sort
 
 				});
 
 				});
 
-			}else if(sortField!==null){
 
+			} else if (sortField !== null) {
 
 				return state.set('sortField', sortField);
 
 				return state.set('sortField', sortField);
 
-			}else if(sort!==null){
 
+			} else if (sort !== null) {
 
 				return state.set('sort', sort);
 
 				return state.set('sort', sort);
 
 			}
 
 			}
 
 		case constants.CHANGE_LOCKSTORE_SORTFIELD:
 
 		case constants.CHANGE_LOCKSTORE_SORTFIELD:
 
@@ -136,14 +167,41 @@ export default (state = defaultState, action) => {
 
 		case constants.CHANGE_LOCKSTORE_SORT:
 
 		case constants.CHANGE_LOCKSTORE_SORT:
 
 			localStorage.setItem('product_lock_store_sort', action.data);
 
 			localStorage.setItem('product_lock_store_sort', action.data);
 
 			return state.set('sort', action.data);
 
 			return state.set('sort', action.data);
 
+		case constants.CHANGE_LOCKSTORE_LOADING:
 
+			return state.set('loading', action.data);
 
 		//表格
 
 		//表格
 
 		case constants.CHANGE_LOCKSTORE_DATA:
 
 		case constants.CHANGE_LOCKSTORE_DATA:
 
-			let columnsDetail={
 
-				...columns[0],
 
-				render: (text, record) => <a onClick={() => action.support.handlelockDetailPopups(record.key)} href="#lockDetail" data-toggle="modal" data-target="#lockDetail"  >{text}</a>,
 
-			}
 
-			columns[0] = columnsDetail;
 
-			// console.log(columnsDetail);
 
+			// console.log(columns[1])
 
+			// let columnsDetail = {
 
+			// 	...columns[0],
 
+			// 	render: (text, record) => <a onClick={() => action.support.handlelockDetailPopups(record.key)} href="#lockDetail" data-toggle="modal" data-target="#lockDetail"  >{text}</a>,
 
+			// }
 
+			// columns[0] = columnsDetail;
 
+			columns[0]=renderAtext(columns[0],action);
 
+			// let columnsProduct = {
 
+			// 	...columns[1],
 
+			// 	render: (text, record) =>(
 
+			// 		<>
 
+			// 			{record.productList.map((tag,index) => (
 
+			// 				<Tag color="#886ab5" key={tag+index}>{tag}</Tag>
 
+			// 			))}
 
+			// 		</>
 
+			// 	)
 
+			// }
 
+			// columns[1] = columnsProduct;
 
+			// if(columns[1].title==='产品'){
 
+			// 	columns[1]=renderTag(columns[1]);
 
+			// }
 
+
 
+			//console.log(columns)
 
+			var ti=0;
 
+			columns.forEach((element,value) => {
 
+				if(element.title==='产品'){
 
+					ti=value;
 
+				}
 
+			});
 
+
 
+			columns[ti]=renderTag(columns[ti]);
 
 			let pagination = {
 
 			let pagination = {
 
 				...action.pagination,
 
 				...action.pagination,
 
 				total: action.recordsTotal,
 
 				total: action.recordsTotal,
 
@@ -154,14 +212,13 @@ export default (state = defaultState, action) => {
 
 					columnsData[i].columnsValue = false;
 
 					columnsData[i].columnsValue = false;
 
 				}
 
 				}
 
 			}
 
 			}
 
-			//var columnsBak = refreshColumns(columnsData, columns);
 
-			// console.log(columnsBak);
 
+			var columnsBak = refreshColumns(columnsData, columns);
 
 			// return state.set('dataSource', action.data);
 
 			// return state.set('dataSource', action.data);
 
 			return state.merge({
 
 			return state.merge({
 
 				pagination: fromJS(pagination),
 
 				pagination: fromJS(pagination),
 
 				dataSource: fromJS(action.data),
 
 				dataSource: fromJS(action.data),
 
+				loading: false,
 
 				searchValue: action.searchValue,
 
 				searchValue: action.searchValue,
 
-				// columns: fromJS(columnsBak),
 
 				columns: fromJS(columns),
 
 				columns: fromJS(columns),
 
 			});
 
 			});
 
 		default:
 
 		default:
 
@@ -181,4 +238,35 @@ function refreshColumns(columnsData) {
 
 		}
 
 		}
 
 	}
 
 	}
 
 	return columnsBak;
 
 	return columnsBak;
 
-};
 
+};
 
+
 
+function renderTag(columns){
 
+	//console.log(columns.title)
 
+	let columnsProduct=columns;
 
+	if(columns.title==='产品'){
 
+		columnsProduct = {
 
+			...columns,
 
+			render: (text, record) =>(
 
+				<>
 
+					{record.productList.map((tag,index) => (
 
+						<Tag color="#886ab5" key={tag+index}>{tag}</Tag>
 
+					))}
 
+				</>
 
+			)
 
+		}
 
+	}
 
+	return columnsProduct;
 
+}
 
+
 
+function renderAtext(columns,action){
 
+	//console.log(columns.title);
 
+
 
+	let columnsDetail=columns;
 
+	if(columns.title==='锁号'){
 
+		columnsDetail = {
 
+			...columns,
 
+			render: (text, record) => <a onClick={() => action.support.handlelockDetailPopups(record.key)} href="#lockDetail" data-toggle="modal" data-target="#lockDetail">{text}</a>,
 
+		}
 
+	}
 
+	return columnsDetail;
 
+}

+ 2 - 1
src/product/store/reducer.js
Vedi File 

@@ -2,7 +2,7 @@ import { combineReducers } from 'redux-immutable';
 
 import { reducer as commonReducer } from '../common/store';
 
 import { reducer as commonReducer } from '../common/store';
 
 import { reducer as lockStoreReducer } from '../lock_store/store';
 
 import { reducer as lockStoreReducer } from '../lock_store/store';
 
 import { reducer as lockCountReducer } from '../lock_count/store';
 
 import { reducer as lockCountReducer } from '../lock_count/store';
 
-
 
+import { reducer as popupstockReducer } from '../../common/popupstockDetail/store';
 
 
 
 
 
 
 
@@ -10,6 +10,7 @@ const reducer = combineReducers({
 
     common: commonReducer,
 
     common: commonReducer,
 
     lockstore: lockStoreReducer,
 
     lockstore: lockStoreReducer,
 
     lockcount: lockCountReducer,
 
     lockcount: lockCountReducer,
 
+    popupstock:popupstockReducer,
 
 });
 
 });
 
 
 
 export default reducer;
 
 export default reducer;