U审批初代版本0223

uas-office-web/wxuasapproval/config-overrides.js

@@ -1,41 +1,72 @@
-const { injectBabelPlugin } = require('react-app-rewired')
+const {
+  override,
+  fixBabelImports,
+  addLessLoader,
+  addWebpackAlias
+} = require(
+  'customize-cra')
 const rewireLess = require('react-app-rewire-less')
 const path = require('path')
 
-module.exports = function override (config, env) {
+//执行npm run build不产生map文件
+process.env.GENERATE_SOURCEMAP = 'false'
 
-  config = injectBabelPlugin(
-    [
-      'import',
-      {
-        libraryName: 'antd',
-        libraryDirectory: 'es',
-        style: true,
-      }, 'ant',
-    ],
-    config,
-  )
+module.exports = override(
+  fixBabelImports('import-antd', {
+    libraryName: 'antd',
+    libraryDirectory: 'es',
+    style: true,
+  }),
 
-  config = injectBabelPlugin(
-    [
-      'import',
-      {
-        libraryName: 'antd-mobile',
-        libraryDirectory: 'lib',
-        style: true,
-      }, 'ant-mobile',
-    ],
-    config,
-  )
+  fixBabelImports('import-ant-mobile', {
+    libraryName: 'antd-mobile',
+    libraryDirectory: 'lib',
+    style: true,
+  }),
 
-  config = rewireLess.withLoaderOptions({
-    modifyVars: { '@primary-color': '#1DA57A' },
+  addLessLoader({
     javascriptEnabled: true,
-  })(config, env)
+    modifyVars: { '@primary-color': '#1DA57A' },
+  }),
 
-  config.resolve.alias = {
+  addWebpackAlias({
     '@': path.join(__dirname, './src'),
-  }
-
-  return config
-}
+  })
+)
+// module.exports = function override (config, env) {
+//
+//   config = injectBabelPlugin(
+//     [
+//       'import',
+//       {
+//         libraryName: 'antd',
+//         libraryDirectory: 'es',
+//         style: true,
+//       }, 'ant',
+//     ],
+//     config,
+//   )
+//
+//   config = injectBabelPlugin(
+//     [
+//       'import',
+//       {
+//         libraryName: 'antd-mobile',
+//         libraryDirectory: 'lib',
+//         style: true,
+//       }, 'ant-mobile',
+//     ],
+//     config,
+//   )
+//
+//   config = rewireLess.withLoaderOptions({
+//     modifyVars: { '@primary-color': '#1DA57A' },
+//     javascriptEnabled: true,
+//   })(config, env)
+//
+//   config.resolve.alias = {
+//     '@': path.join(__dirname, './src'),
+//   }
+//
+//   return config
+// }

uas-office-web/wxuasapproval/package.json

@@ -12,9 +12,9 @@
     "react-app-rewire-less": "^2.1.3",
     "react-dom": "^16.5.2",
     "react-file-viewer": "^1.2.1",
-    "react-redux": "^5.0.7",
-    "react-router-dom": "^4.3.1",
-    "react-scripts": "2.0.5",
+    "react-redux": "^7.2.0",
+    "react-router-dom": "^5.1.2",
+    "react-scripts": "3.4.0",
     "redux": "^4.0.1",
     "redux-persist": "^6.0.0",
     "redux-thunk": "^2.3.0",
@@ -39,11 +39,12 @@
   ],
   "devDependencies": {
     "antd": "^3.26.11",
-    "axios": "^0.18.0",
+    "axios": "^0.19.2",
     "babel-plugin-import": "^1.10.0",
-    "react-app-rewired": "^1.6.2",
-    "react-router": "^4.3.1",
+    "customize-cra": "^0.9.1",
+    "react-app-rewired": "^2.1.5",
+    "react-router": "^5.1.2",
     "redux-logger": "^3.0.6",
-    "semantic-ui-react": "^0.82.5"
+    "semantic-ui-react": "^0.88.2"
   }
 }

uas-office-web/wxuasapproval/src/pages/approval/Approval.jsx

@@ -80,8 +80,9 @@ export default class Approval extends Component {
     }
   }
 
-  componentWillMount () {
+  componentDidMount () {
     document.title = '审批单据'
+    this.initData()
     let paramsStr = this.props.match.params.paramsStr
     if (isObjEmpty(paramsStr)) {
       let storage = window.localStorage
@@ -94,8 +95,8 @@ export default class Approval extends Component {
 
         paramsJson.baseUrl
           ? (mBaseUrl = decodeURIComponent(paramsJson.baseUrl))
-          : (mBaseUrl = window.location.origin +
-          process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP')
+          : (mBaseUrl = window.location.origin
+          + (process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP'))
         mMaster = paramsJson.master
         mNodeId = paramsJson.nodeId
         mType = paramsJson.type
@@ -120,11 +121,27 @@ export default class Approval extends Component {
       })
       message.error('参数获取失败')
     }
-
   }
 
-  componentDidMount () {
+  componentWillUnmount () {
+    Toast.hide()
+  }
 
+  initData = () => {
+    mCachePoints = ''
+    mApprovalRecord = new ApprovalRecordBean()
+    mTitleApproval = new ApprovalBean()
+    mParams = []
+    mFormStore = new Map()
+    mHineApprovals = []//隐藏字段
+    mShowApprovals = []//显示字段
+    mHistoryNodes = []//历史审批
+    mMainList = []//主表
+    mDetailList = []//从表
+    mSetuptasList = []//历史审批要点
+    mEnclosureList = []//附件
+    mNodeList = []//审批节点
+    mPointsList = []//要点
   }
 
   getSessionId () {
@@ -414,20 +431,7 @@ export default class Approval extends Component {
   }
 
   initPageState = () => {
-    mCachePoints = ''
-    mApprovalRecord = new ApprovalRecordBean()
-    mTitleApproval = new ApprovalBean()
-    mParams = []
-    mFormStore = new Map()
-    mHineApprovals = []//隐藏字段
-    mShowApprovals = []//显示字段
-    mHistoryNodes = []//历史审批
-    mMainList = []//主表
-    mDetailList = []//从表
-    mSetuptasList = []//历史审批要点
-    mEnclosureList = []//附件
-    mNodeList = []//审批节点
-    mPointsList = []//要点
+    this.initData()
     this.setState({
         approvalContent: '',
         fastModalOpen: false,

uas-office-web/wxuasapproval/src/pages/approval/ApprovalAdd.jsx

@@ -34,8 +34,8 @@ let mDefaultMap
 
 let mShowBillModels, mFormBillModels, mUpdateBillModels, mAllBillModels
 
-let mBaseUrl = window.location.origin +
-  process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP'
+let mBaseUrl = window.location.origin
+  + (process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP')
   // && 'http://29226oq576.qicp.vip/uas/'
 
 export default class ApprovalAdd extends Component {

uas-office-web/wxuasapproval/src/pages/approval/ApprovalHome.jsx

@@ -33,10 +33,11 @@ let mTodoIndex = 0
 let mDoneIndex = 0
 let mSendIndex = 0
 
-let mBaseUrl = window.location.origin +
-  process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP'
+let mBaseUrl = window.location.origin
+  + (process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP')
+// && 'http://29226oq576.qicp.vip/erp'
 
-// && 'http://29226oq576.qicp.vip/uas/'
+// process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP'
 
 class ApprovalHome extends Component {
 

uas-office-web/wxuasapproval/src/pages/approval/UasApproval.jsx

@@ -21,7 +21,8 @@ export default class UasApproval extends Component {
 
     clearHomeState()()
 
-    this.props.history.push('/approvalHome/' + master + '/' + pageType)
+    this.props.history.push(
+      '/approvalHome/' + master + (pageType ? ('/' + pageType) : ''))
   }
 
   componentWillUnmount () {