diff --git a/src/views/gxsl/gsnlfx/KrLine.js b/src/views/gxsl/gsnlfx/KrLine.js index a08769f01..e5406ddf8 100644 --- a/src/views/gxsl/gsnlfx/KrLine.js +++ b/src/views/gxsl/gsnlfx/KrLine.js @@ -41,8 +41,15 @@ export default function KrLine({ record }) { }; const doSearch = () => { - search({ search: params }) - getData(params) + const exportParams={ + ...params, + stm: params.tm[0].format("YYYY-MM-DD HH:mm:ss"), + etm: params.tm[1].format("YYYY-MM-DD HH:mm:ss"), + tm:params.tm, + } + search({ search: exportParams }) + // debugger; + getData(exportParams) } @@ -53,7 +60,8 @@ export default function KrLine({ record }) { const params = { search: { stm, - etm + etm, + stcd:record.stcd } } if (record?.stcd) { diff --git a/src/views/sz/pxjlgl/form.js b/src/views/sz/pxjlgl/form.js index df8789b34..88cc1e97b 100644 --- a/src/views/sz/pxjlgl/form.js +++ b/src/views/sz/pxjlgl/form.js @@ -372,7 +372,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { label="参训人员" name="trainees" > - + diff --git a/src/views/sz/pxjlgl/options.js b/src/views/sz/pxjlgl/options.js index a87590454..d17c2932d 100644 --- a/src/views/sz/pxjlgl/options.js +++ b/src/views/sz/pxjlgl/options.js @@ -36,18 +36,18 @@ export default function options(data={}) { }, xAxis: { data:xAxisData, - axisLine: { - show: true // 隐藏X轴轴线 - }, - axisTick: { - show: true // 隐藏X轴轴线 - }, + // axisLine: { + // show: false // 隐藏X轴轴线 + // }, + // axisTick: { + // show: false // 隐藏X轴轴线 + // }, - axisLabel: { - show: true, - margin: 14, - // formatter: '{value}月' - } + // axisLabel: { + // show: true, + // margin: 14, + // // formatter: '{value}月' + // } }, yAxis: [ { @@ -55,6 +55,7 @@ export default function options(data={}) { offset: 10, min: minCount, max: maxCount, + // splitLine:false, axisTick: { show: false }, @@ -71,6 +72,7 @@ export default function options(data={}) { { type: 'value', name: '(%)', + splitLine:false, min: minRate, max: maxRate, diff --git a/src/views/sz/pxjlgl/toolbar.js b/src/views/sz/pxjlgl/toolbar.js index 9734131fb..5dd553ed8 100644 --- a/src/views/sz/pxjlgl/toolbar.js +++ b/src/views/sz/pxjlgl/toolbar.js @@ -36,8 +36,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role = [],callback,exportFil let dateSo; if (values.tm) { dateSo = { - stm: moment(values.tm[0]).format('YYYY'), - etm: moment(values.tm[1]).format('YYYY') + stm: moment(values.tm[0]), + etm: moment(values.tm[1]) } } delete values.tm diff --git a/src/views/sz/szzf/ajdj/config.js b/src/views/sz/szzf/ajdj/config.js index 0cd4f13be..a0c6a5881 100644 --- a/src/views/sz/szzf/ajdj/config.js +++ b/src/views/sz/szzf/ajdj/config.js @@ -290,7 +290,7 @@ const clqkData = [ { label: '结案时间', key: 'closeDate', - type: 'input', + type: 'DatePicker', span: 12 }, { diff --git a/src/views/sz/szzf/ajdj/editTabs.js b/src/views/sz/szzf/ajdj/editTabs.js index 36622e842..f046b572e 100644 --- a/src/views/sz/szzf/ajdj/editTabs.js +++ b/src/views/sz/szzf/ajdj/editTabs.js @@ -62,9 +62,9 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => { ...formData, ...e, caseDate: dayjs(e.caseDate).format("YYYY-MM-DD HH:mm:ss"), - illegalDate: e.illegalDate ? dayjs(e.v).format("YYYY-MM-DD HH:mm:ss") : e.illegalDate, + illegalDate: e.illegalDate ? dayjs(e.illegalDate).format("YYYY-MM-DD HH:mm:ss") : null, + closeDate:e.closeDate ? dayjs(e.closeDate).format("YYYY-MM-DD HH:mm:ss") :null, } - if (mode == 'save') { addBasic(params) } else if (mode == 'edit') { @@ -105,7 +105,10 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => { } if(res.data?.illegalDate){ obj.illegalDate=dayjs(res.data.illegalDate) - } + } + if(res.data?.closeDate){ + obj.closeDate=dayjs(res.data.closeDate) + } setFormData({...res.data,...obj}) }) }else if(mode == 'save'){ diff --git a/src/views/zbgl/zbrz/toolbar.js b/src/views/zbgl/zbrz/toolbar.js index fdbd94c96..4b664bea7 100644 --- a/src/views/zbgl/zbrz/toolbar.js +++ b/src/views/zbgl/zbrz/toolbar.js @@ -20,7 +20,7 @@ const ToolBar = ({ setSearchVal, onSave, exportFile,role }) => { } } delete values.tm - setSearchVal({...values, startTime:dateSo?.start,endTime:dateSo?.end}); + setSearchVal({...values, dateSo}); } @@ -31,7 +31,7 @@ const ToolBar = ({ setSearchVal, onSave, exportFile,role }) => { end:moment(time[1]).format('YYYY-MM-DD 23:59:59'), } form.setFieldValue("tm",time) - setSearchVal(dateSo) + setSearchVal({dateSo}) }, []) return ( <>