Merge branch 'lsf-dev'

src/views/fxzb/hsybjs/page2/form.js

@@ -25,9 +25,13 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
   console.log(checked);
 
   const onFinish = (values) => {
+    const userId = localStorage.getItem("userId");
+    const userName = localStorage.getItem("userName");
+
     const params = {
       ...values,
-      status:checked?'0':'1'
+      status:checked?'0':'1',
+      userId:userId+'_'+userName
     }
 
     console.log(params);

src/views/fxzb/hsybjs/page2/index.js

@@ -36,8 +36,8 @@ const Page = () => {
           checked={v==='0'?true:false}
         />
     },
-    { title: '创建日期', key: 'stationCode', dataIndex: 'stationCode', width: 140,align:"center", },
-    { title: '创建人', key: 'stationCode', dataIndex: 'stationCode', width: 140,align:"center", },
+    { title: '创建日期', key: 'updateTm', dataIndex: 'updateTm', width: 140,align:"center", },
+    { title: '创建人', key: 'userId', dataIndex: 'userId', width: 140,align:"center",render:(v)=>v?.split('_')?.[1] },
     {
       title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
       render: (value, row, index) => (<CrudOpRender_text edit={true} del={true} command={(cmd) => () => command(cmd)(row)} />)