弹窗软件详情

src/common/popupslockDetail/index.js

@@ -1,13 +1,20 @@
 import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
 // import { BrowserRouter, Route,Link } from 'react-router-dom';
+
 import { actionCreators } from './store';
+import { message } from 'antd';
+
+const error = (msg) => {
+  message.error(msg);
+};
 
 class lockDetailPopups extends PureComponent {
 
   render() {
     const {locksotreDetail} = this.props;
-    // let lockDetail2 = lockDetail.toJS();
+    let lockDetail2 = locksotreDetail.toJS();
+    // console.log(lockDetail2.key_num)
     return (
       <div className="modal fade" id="lockDetail" role="dialog" aria-hidden="true" data-backdrop="static">
     <div className="modal-dialog modal-xl">
@@ -31,49 +38,50 @@ class lockDetailPopups extends PureComponent {
                 <div className="sheet-panel-form slimScroll1 mx-4">
                   <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> */}
+                    <legend>{lockDetail2.key_num}</legend>
                   </div>
                   <div className="cldform clearfix">
                     <div className="cldform-line"></div>
                     <div className="cldform-item">
                       <div className="cldform-label">锁号</div>
                       <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 className="cldform-line"></div>
                     <div className="cldform-item">
                       <div className="cldform-label">产品</div>
                       <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>
+                        <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank">{lockDetail2.product}</div>
+                        {/* <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> */}
                       </div>
                     </div>
                     <div className="cldform-line"></div>
                     <div className="cldform-item">
                       <div className="cldform-label">期限</div>
                       <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 className="cldform-line"></div>
                     <div className="cldform-item">
                       <div className="cldform-label">使用状态</div>
                       <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 className="cldform-line"></div>
                     <div className="cldform-item">
                       <div className="cldform-label">负责人</div>
                       <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 className="cldform-line"></div>
                     <div className="cldform-item">
                       <div className="cldform-label">联系人</div>
                       <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 className="cldform-line"></div>
@@ -199,14 +207,14 @@ class lockDetailPopups extends PureComponent {
 
 const mapStateToProps = (state) => {
   return {
-    locksotreDetail: state.getIn(['lockDetailPopups', 'locksotreDetail']),
+    locksotreDetail: state.getIn(['popupstock', 'locksotreDetail']),
   }
 }
 
 const mapDispathToProps = (dispatch) => {
   return {
     handlelockDetailPopups(key) {
-      // console.log('dndn');
+      //  console.log('dndn');
       dispatch(actionCreators.getlocksotreDetail(key,error));
     },
   }

src/common/popupslockDetail/store/actionCreators.js

@@ -1,13 +1,14 @@
 import * as constants from './constants';
 import { fromJS } from 'immutable';
-
-import axios from '../../../common/axios_auth.js';
+import * as config from '../../../common/config.js';
+import axios from '../../axios_auth.js';
 // import axios from 'axios';
 
 
 export const getlocksotreDetail = (key,error) => {
     return (dispatch) => {
-        axios.get(config.CLD2API + '/product/longle/'+key).then((res) => {
+        // console.log(key)
+        axios.get(config.CLD2API + '/product/longleDetail/'+key).then((res) => {
             const data = res.data;
             if (data.code === 200) {
                 dispatch({

src/common/popupslockDetail/store/reducer.js

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

src/product/lock_store/index.js

@@ -5,7 +5,7 @@ import StaffHeader from '../../common/staffHeader'
 import { Table, Input,Radio } from 'antd';
 import 'antd/dist/antd.css';
 import { actionCreators } from './store';
-import Popups from '../../common/popupslockDetail';
+import Popups from '../../common/popupstockDetail';
 //import { AudioOutlined } from '@ant-design/icons';
 
 const radioStyle = {
@@ -22,7 +22,7 @@ class lock_store extends PureComponent {
      
         return (
         <div>
-        <StaffHeader />
+        {/* <StaffHeader /> */}
         <main id="js-page-content" role="main" className="page-content">
           <div className="row">
             <div className="col-xl-12">

src/product/store/reducer.js

@@ -2,7 +2,7 @@ import { combineReducers } from 'redux-immutable';
 import { reducer as commonReducer } from '../common/store';
 import { reducer as lockStoreReducer } from '../lock_store/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,
     lockstore: lockStoreReducer,
     lockcount: lockCountReducer,
+    popupstock:popupstockReducer,
 });
 
 export default reducer;