Merge branch 'mcd' of http://132.232.112.242:7090/zcx/szse into mcd

src/view/Manage/AssetManage/Component/AssetAction.jsx

@@ -343,16 +343,21 @@ const AssetAction = (props) => {
   }
 
   const getElements = ( cb = null ) => {
+    console.log('data',templateType)
+    const tempinfo = {}
+    if(templateType){
+      tempinfo.templateType =templateType
+    }
     dispatch({
       type: (currentAction==='add')?'assetmanage.listElementsAndFillValue':'assetmanage.listElements',
       payload: (currentAction==='add')?{
         params: {
           dirId,
-          templateType
+          ...tempinfo
         }
       }:{
         params:{
-          templateType
+          ...tempinfo
         }
       },
       callback: data => {