outaozhen 5 tahun lalu
induk
melakukan
936760fe8b

+ 12 - 0
dist/css/global.css

@@ -0,0 +1,12 @@
+.width100{
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: stretch;
+  -ms-flex-align: stretch;
+  align-items: stretch;
+  -webkit-box-flex: 1;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  width: 100%;
+}

+ 2 - 1
public/index.html

@@ -22,6 +22,7 @@
   <link rel="stylesheet" media="screen, print" href="http://localhost:9090/css/fa-regular.css">
   <link rel="stylesheet" media="screen, print" href="http://localhost:9090/css/fa-solid.css">
   <link rel="stylesheet" media="screen, print" href="http://localhost:9090/css/fa-brands.css">
+  <link rel="stylesheet" media="screen, print" href="http://localhost:9090/css/global.css">
 
 
 
@@ -81,7 +82,7 @@
   <!-- BEGIN Page Wrapper -->
   <div class="page-wrapper">
     <div class="page-inner">
-      <div id="root"></div>
+      <div id="root" class="width100"></div>
     </div>
   </div>
   <!-- END Page Wrapper -->

+ 2 - 1
public/sub_index.html

@@ -22,6 +22,7 @@
   <link rel="stylesheet" media="screen, print" href="../../css/fa-regular.css">
   <link rel="stylesheet" media="screen, print" href="../../css/fa-solid.css">
   <link rel="stylesheet" media="screen, print" href="../../css/fa-brands.css">
+  <link rel="stylesheet" media="screen, print" href="../../css/global.css">
 
 
 
@@ -80,7 +81,7 @@
   <!-- BEGIN Page Wrapper -->
   <div class="page-wrapper">
     <div class="page-inner">
-      <div id="root"></div>
+      <div id="root" class="width100"></div>
     </div>
   </div>
   <!-- END Page Wrapper -->

+ 1 - 1
src/product/common/store/reducer.js

@@ -4,7 +4,7 @@ import { fromJS } from 'immutable';
 
 
 const defaultState = fromJS({
-    menuActive: 'lock_count',
+    menuActive: 'lock_store',
 });
 
 

+ 240 - 1
src/product/lock_store/index.js

@@ -30,7 +30,246 @@ class lock_store extends PureComponent {
     render() {
         //const { inputValue, handleInputFocus,handleInputChange, menu, list } = this.props;
         return (
-            <div>lock_store</div>
+            <div>
+                <header className="page-header" role="banner">
+          {/* <!-- DOC: 侧栏收起工具 --> */}
+          <div className="hidden-md-down dropdown-icon-menu position-relative">
+            <a href="#" className="header-btn btn js-waves-off" data-action="toggle" data-class="nav-function-hidden" title="隐藏侧栏">
+     						<i className="ni ni-menu"></i>
+     					</a>
+            <ul>
+              <li>
+                <a href="#" className="btn js-waves-off" data-action="toggle" data-class="nav-function-minify" title="迷你侧栏">
+     								<i className="ni ni-minify-nav"></i>
+     							</a>
+              </li>
+            </ul>
+          </div>
+          <div className="hidden-lg-up">
+            <a href="#" className="header-btn btn press-scale-down waves-effect waves-themed" data-action="toggle" data-class="mobile-nav-on">
+     						<i className="ni ni-menu"></i>
+     					</a>
+          </div>
+          {/* <!--页面标题--> */}
+          <h1 className="subheader-title">
+     					公共锁库
+     				</h1>
+          {/* <!--顶部右栏--> */}
+          <div className="ml-auto d-flex">
+            {/* <!-- 信息提示 -->
+            <!--信息提示被移除-->
+            <!-- 用户菜单 --> */}
+            <div>
+              <a href="#" data-toggle="dropdown" title="drlantern@gotbootstrap.com" className="header-icon d-flex align-items-center justify-content-center ml-2">
+     							<img src="img/demo/avatars/avatar-admin.png" className="profile-image rounded-circle" alt="Dr. Codex Lantern"/>
+                                {/* <!-- you can also add username next to the avatar with the codes below:
+                                <span className="ml-1 mr-1 text-truncate text-truncate-header hidden-xs-down">Me</span>
+                                <i className="ni ni-chevron-down hidden-xs-down"></i> --> */}
+                            </a>
+              <div className="dropdown-menu dropdown-menu-animated dropdown-lg">
+                <div className="dropdown-header bg-trans-gradient d-flex flex-row py-4 rounded-top">
+                  <div className="d-flex flex-row align-items-center mt-1 mb-1 color-white">
+                    <span className="mr-2">
+                            				<img src="img/demo/avatars/avatar-admin.png" className="rounded-circle profile-image" alt="Dr. Codex Lantern"/>
+                            			</span>
+                    <div className="info-card-text">
+                      <div className="fs-lg text-truncate text-truncate-lg">张三</div>
+                      <span className="text-truncate text-truncate-md opacity-80">工号:0001</span>
+                    </div>
+                  </div>
+                </div>
+                <div className="dropdown-divider m-0"></div>
+                <a href="#" className="dropdown-item" data-action="app-fullscreen">
+                            		<span>员工信息</span>
+                            	</a>
+                <div className="dropdown-divider m-0"></div>
+                <a href="#" className="dropdown-item" data-action="app-fullscreen">
+                            		<span>全屏</span>
+                            		<i className="float-right text-muted fw-n">F11</i>
+                            	</a>
+                <div className="dropdown-divider m-0"></div>
+                <a className="dropdown-item fw-500 pt-3 pb-3" href="page_login_alt.html">
+                            		<span>退出登录</span>
+                            	</a>
+              </div>
+            </div>
+          </div>
+        </header>
+        <main id="js-page-content" role="main" className="page-content">
+          <div className="row">
+            <div className="col-xl-12">
+              <div id="panel-1" className="panel">
+                <div className="panel-hdr">
+                  <div className="col-auto pr-0">
+                    <div className="input-group input-group-sm bg-white shadow-inset-2">
+                      <input type="text" className="form-control bg-transparent" placeholder="锁号"/>
+                      <div className="input-group-append">
+                        <button className="btn btn-default waves-effect waves-themed" type="button" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="搜索"><i className="fal fa-search"></i></button>
+                      </div>
+                    </div>
+                  </div>
+                  <div className="col-auto pr-0">
+                    <button className="btn btn-sm btn-default" type="button" data-toggle="modal" data-target="#filter"><i className="fal fa-filter"></i> 筛选</button>
+                  </div>
+                  <div className="col-auto ml-auto">
+                      <button className="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">已显示7列</button>
+                      <div className="dropdown-menu">
+                        <ul className="list-unstyled px-3 pt-2 mb-0">
+                          <li className="mb-2">
+                            <div className="custom-control custom-switch">
+                              <input type="checkbox" className="custom-control-input" id="lie1" checked=""/>
+                              <label className="custom-control-label" >锁号</label>
+                            </div>
+                          </li>
+                          <li className="mb-2">
+                            <div className="custom-control custom-switch">
+                              <input type="checkbox" className="custom-control-input" id="lie2" checked=""/>
+                              <label className="custom-control-label">产品</label>
+                            </div>
+                          </li>
+                          <li className="mb-2">
+                            <div className="custom-control custom-switch">
+                              <input type="checkbox" className="custom-control-input" id="lie3" checked=""/>
+                              <label className="custom-control-label" >办事处</label>
+                            </div>
+                          </li>
+                          <li className="mb-2">
+                            <div className="custom-control custom-switch">
+                              <input type="checkbox" className="custom-control-input" id="lie4" checked=""/>
+                              <label className="custom-control-label" >出库时间</label>
+                            </div>
+                          </li>
+                          <li className="mb-2">
+                            <div className="custom-control custom-switch">
+                              <input type="checkbox" className="custom-control-input" id="lie5" checked=""/>
+                              <label className="custom-control-label">责任人</label>
+                            </div>
+                          </li>
+                          <li className="mb-2">
+                            <div className="custom-control custom-switch">
+                              <input type="checkbox" className="custom-control-input" id="lie6" checked=""/>
+                              <label className="custom-control-label" >状态</label>
+                            </div>
+                          </li>
+                          <li className="mb-2">
+                            <div className="custom-control custom-switch">
+                              <input type="checkbox" className="custom-control-input" id="lie7" checked=""/>
+                              <label className="custom-control-label">客户</label>
+                            </div>
+                          </li>
+                          <li className="mb-2">
+                            <div className="custom-control custom-switch">
+                              <input type="checkbox" className="custom-control-input" id="lie8"/>
+                              <label className="custom-control-label">客户</label>
+                            </div>
+                          </li>
+                        </ul>
+                      </div>
+                  </div>
+                  <div className="col-auto pl-0">
+                    <button className="btn btn-sm btn-default" data-toggle="dropdown"><i className="fal fa-sort-amount-down"></i> 排序</button>
+                    <div className="dropdown-menu dropdown-menu-right" id="paixu">
+                      <ul className="list-unstyled px-3 pt-2 mb-0">
+                        <li className="mb-2">
+                          <div className="custom-control custom-radio">
+                            <input type="radio" className="custom-control-input" id="pai1" name="paizhi" checked=""/>
+                            <label className="custom-control-label" >锁号</label>
+                          </div>
+                        </li>
+                        <li className="mb-2">
+                          <div className="custom-control custom-radio">
+                            <input type="radio" className="custom-control-input" id="pai2" name="paizhi"/>
+                            <label className="custom-control-label" >出库时间</label>
+                          </div>
+                        </li>
+                      </ul>
+                      <ul className="list-unstyled px-3 pt-2 mb-0 border-top">
+                        <li className="mb-2">
+                          <div className="custom-control custom-radio">
+                            <input type="radio" className="custom-control-input" id="pdown" name="paixu" checked=""/>
+                            <label className="custom-control-label">降序</label>
+                          </div>
+                        </li>
+                        <li className="mb-2">
+                          <div className="custom-control custom-radio">
+                            <input type="radio" className="custom-control-input" id="pup" name="paixu"/>
+                            <label className="custom-control-label" >升序</label>
+                          </div>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                </div>
+                <div className="panel-container show">
+                  {/* <!--数据内容区--> */}
+                  <div className="panel-content">
+                    <table className="table table-bordered table-hover table-striped">
+                      <thead>
+                        <tr>
+                          <th>锁号</th>
+                          <th>产品</th>
+                          <th>办事处</th>
+                          <th>出库时间</th>
+                          <th>销售/借出/赠送时间</th>
+                          <th>责任人</th>
+                          <th>状态</th>
+                          <th>联系人</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr>
+                          <td><a href="#lock-detail" data-toggle="modal" data-target="#lock-detail">HNYH-0654</a></td>
+                          <td><span className="badge badge-primary mr-1">固化清单全功能</span><span className="badge badge-primary mr-1">全国专业</span><span className="badge badge-primary">全国专业(新定额)</span></td>
+                          {/* <!-- <td>固化清单全功能+全国专业+全国专业(新定额)</td> --> */}
+                          <td>总部</td>
+                          <td>2019年5月6日 14:55</td>
+                          <td>2019年5月7日 14:55</td>
+                          <td><a href="#compe-detail" data-toggle="modal" data-target="#compe-detail">陈特</a></td>
+                          <td>销售</td>
+                          <td><a href="#detail" data-toggle="modal" data-target="#detail">张三8</a></td>
+                        </tr>
+                        <tr>
+                          <td><a href="#lock-detail" data-toggle="modal" data-target="#lock-detail">HNYH-0654</a></td>
+                          <td><span className="badge badge-primary mr-1">固化清单全功能</span><span className="badge badge-primary mr-1">全国专业</span><span className="badge badge-primary">全国专业(新定额)</span></td>
+                          <td>总部</td>
+                          <td>2019年5月6日 14:55</td>
+                          <td>2019年5月7日 14:55</td>
+                          <td><a href="#compe-detail" data-toggle="modal" data-target="#compe-detail">陈特</a></td>
+                          <td>销售</td>
+                          <td><a href="#detail" data-toggle="modal" data-target="#detail">张三8</a></td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    {/* <!--翻页--> */}
+                    <div className="d-flex justify-content-center">
+                      <ul className="pagination pagination-sm">
+                        <li className="page-item disabled">
+                          <a className="page-link" href="#" aria-label="Previous">
+                											<span aria-hidden="true"><i className="fal fa-chevron-left"></i></span>
+                										</a>
+                        </li>
+                        <li className="page-item active" aria-current="page">
+                          <span className="page-link">
+                											1
+                											<span className="sr-only">(current)</span>
+                          </span>
+                        </li>
+                        <li className="page-item"><a className="page-link" href="#">2</a></li>
+                        <li className="page-item"><a className="page-link" href="#">3</a></li>
+                        <li className="page-item">
+                          <a className="page-link" href="#" aria-label="Next">
+                											<span aria-hidden="true"><i className="fal fa-chevron-right"></i></span>
+                										</a>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </main>
+            </div>
         );
     }
 

+ 2 - 2
src/product/product.js

@@ -40,12 +40,12 @@ class product extends Component {
                   </a>
                   <ul>
                       <li className={menuActive=='lock_store'?'active':''} onClick={()=>handleMenuActive('lock_store')} >
-                        <Link to='/lock_store'>
+                        <Link to='/product'>
                           <span className="nav-link-text">公共锁库 {} </span>
                         </Link>
                       </li>
                       <li className={menuActive=='lock_count'?'active':''} onClick={()=>handleMenuActive('lock_count')} >
-                        <Link to='/lock_count'>
+                        <Link to='/product/lock_count'>
                           <span className="nav-link-text">使用统计 {} </span>
                         </Link>
                       </li>

+ 3 - 4
src/product/store/reducer.js

@@ -1,14 +1,13 @@
 import { combineReducers } from 'redux-immutable';
-import { reducer as clientReducer } from '../lock_count/store';
-import { reducer as commonReducer } from '../lock_store/store';
+import { reducer as commonReducer } from '../common/store';
+// import { reducer as clientReducer } from '../lock_count/store';
 
 
 
 
 const reducer = combineReducers({
     common: commonReducer,
-    client: clientReducer,
-
+    // client: clientReducer,
 });
 
 export default reducer;