diff --git a/src/service/apiurl.js b/src/service/apiurl.js index 4ae6c699c..c75cbcf7e 100644 --- a/src/service/apiurl.js +++ b/src/service/apiurl.js @@ -432,8 +432,8 @@ const apiurl = { zbgl: { zbb: { import: service_fxdd + "/rota/importTemplate", - deptlist: service_fxdd + "/system/dept/list", - userList: service_fxdd + "/system/user/list", + deptlist: service_fxdd + "/deptemp/deptlist", + userList: service_fxdd + "/deptemp/userlist", export:service_fxdd + "/rota/importData" }, zbrz: { diff --git a/src/views/rcgl/wxyh/form.js b/src/views/rcgl/wxyh/form.js index b5f615e9b..dc3f40edf 100644 --- a/src/views/rcgl/wxyh/form.js +++ b/src/views/rcgl/wxyh/form.js @@ -163,7 +163,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { dateString} getValueProps={(value) => ({ value: value ? moment(value) : undefined })} diff --git a/src/views/rcgl/wxyh/index.js b/src/views/rcgl/wxyh/index.js index ffd2a5c45..76fa4b387 100644 --- a/src/views/rcgl/wxyh/index.js +++ b/src/views/rcgl/wxyh/index.js @@ -9,7 +9,7 @@ import apiurl from '../../../service/apiurl'; import usePageTable from '../../../components/crud/usePageTable2'; import { createCrudService } from '../../../components/crud/_'; import {CrudOpRender_text} from '../../../components/crud/CrudOpRender'; - +import moment from 'moment'; const url = "http://223.75.53.141:9102/test.by-lyf.tmp" const Page = () => { const role = useSelector(state => state.auth.role); @@ -33,7 +33,10 @@ const Page = () => { const [videoParams, setVideoParams] = useState({}) const columns = [ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" }, - { title: '上报日期', key: 'reportTime', dataIndex: 'reportTime', width: 140, }, + { + title: '时间', key: 'reportTime', dataIndex: 'reportTime', width: 140, + render: (v) => {v ? moment(v).format('YYYY-MM-DD'):''} + }, { title: '管护类型', key: 'maintainType', dataIndex: 'maintainType', width: 200, render: (value) => {value ? types[value] : ''} diff --git a/src/views/rcgl/wxyh/toolbar.js b/src/views/rcgl/wxyh/toolbar.js index b479927b0..4802e8d19 100644 --- a/src/views/rcgl/wxyh/toolbar.js +++ b/src/views/rcgl/wxyh/toolbar.js @@ -43,7 +43,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { <>
- +