From f2aed121822999a8b3a7a10147bd5cb5d920bae5 Mon Sep 17 00:00:00 2001 From: qzc Date: Wed, 16 Oct 2024 17:52:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/homePanelsLayoutPage/item_xunchaxunjian.js | 2 +- src/views/gxsl/gstjfx/tjOption.js | 4 ++-- src/views/gxsl/gstjfx/toolbar1.js | 3 ++- src/views/rcgl/jdkh/khrwgl/PfDetail.js | 12 ++++++++++++ src/views/rcgl/jdkh/khzbgl/form.js | 1 + src/views/rcgl/xcxj/xjrw/index.js | 2 +- src/views/rcgl/xcxj/xjwtcl/toolbar.js | 2 +- src/views/rcgl/xcxj/xjxpz/form.js | 1 + src/views/sz/pxjlgl/options.js | 2 +- 9 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js index 0b58f4b57..46d77809e 100644 --- a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js +++ b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js @@ -37,7 +37,7 @@ const Page = ({mySetTms}) => { const columns2 = [ { title: '上报时间', key: 'finishTime', dataIndex: 'finishTime',align: "center", ellipsis: true }, - { title: '巡检问题描述', key: 'itemDesc', dataIndex: 'itemDesc',align: "center" }, + { title: '巡检问题描述', key: 'problemDesc', dataIndex: 'problemDesc',align: "center" }, ]; useEffect(()=>{ diff --git a/src/views/gxsl/gstjfx/tjOption.js b/src/views/gxsl/gstjfx/tjOption.js index 5ecd75da1..867e19933 100644 --- a/src/views/gxsl/gstjfx/tjOption.js +++ b/src/views/gxsl/gstjfx/tjOption.js @@ -4,11 +4,11 @@ let color = ["#73a0fa", "#52c1f5"]; let echartData = [ { name: "生活供水", - value: obj?.shgs + value: parseFloat(obj?.shgs?.toFixed(2)) }, { name: "生态供水", - value: obj?.stgs, + value: parseFloat(obj?.stgs?.toFixed(2)), }, ]; diff --git a/src/views/gxsl/gstjfx/toolbar1.js b/src/views/gxsl/gstjfx/toolbar1.js index 28589a901..3fc6c9c47 100644 --- a/src/views/gxsl/gstjfx/toolbar1.js +++ b/src/views/gxsl/gstjfx/toolbar1.js @@ -7,7 +7,8 @@ const ToolBar = ({ setSearchVal, exportFile, role }) => { const exportBtn = role?.rule?.find(item => item.menuName == "导出"); const [form] = Form.useForm(); const onFinish = (values) => { - setSearchVal({...values,year: String(values.year)}); + // setSearchVal({...values,year: String(values.year)}); + setSearchVal({...values,year: moment(values.year).format("YYYY")}); } useEffect(() => { diff --git a/src/views/rcgl/jdkh/khrwgl/PfDetail.js b/src/views/rcgl/jdkh/khrwgl/PfDetail.js index 2636c553f..41b108fc2 100644 --- a/src/views/rcgl/jdkh/khrwgl/PfDetail.js +++ b/src/views/rcgl/jdkh/khrwgl/PfDetail.js @@ -373,6 +373,18 @@ const EditableRow = ({ index, ...props }) => { rectifyStatus:0 })) } + if(tableData.length>0){ + let flag = true //fasle有位评分的 + params.ratings?.map((item)=>{ + if(item.assessScore==null){ + flag = false + } + }) + if(!flag){ + message.error('请输入全部考核评分') + return + } + } try { const res = await httppost2(apiurl.rcgl.jdkh.khrwgl.confirmpf, params) if (res.code == 200) { diff --git a/src/views/rcgl/jdkh/khzbgl/form.js b/src/views/rcgl/jdkh/khzbgl/form.js index 5d901f703..8bd69afaa 100644 --- a/src/views/rcgl/jdkh/khzbgl/form.js +++ b/src/views/rcgl/jdkh/khzbgl/form.js @@ -206,6 +206,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { values.standardScore = standardScore1; if (mode === 'edit') { values.id = record.id; + values.status = record.status; onEdit(apiurl.rcgl.jdkh.khzbgl.edit,values) } if (mode === 'save') { diff --git a/src/views/rcgl/xcxj/xjrw/index.js b/src/views/rcgl/xcxj/xjrw/index.js index 64f70cfc7..3297dd4e9 100644 --- a/src/views/rcgl/xcxj/xjrw/index.js +++ b/src/views/rcgl/xcxj/xjrw/index.js @@ -65,7 +65,7 @@ const Page = () => { {title: '开始日期', key: 'startDate', dataIndex: 'startDate', width: 200}, {title: '结束日期', key: 'endDate', dataIndex: 'endDate', width: 200}, {title: '问题数量', key: 'problemNum', dataIndex: 'problemNum', width: 100,align: 'center'}, - { title: '待处理', key: 'handleNum ', dataIndex: 'handleNum ', width: 100,align: 'center'}, + { title: '待处理', key: 'handleNum', dataIndex: 'handleNum', width: 100,align: 'center'}, { title: '创建时间', key: 'createTime', dataIndex: 'createTime', width: 200 }, { title: '创建人', key: 'createUserName', dataIndex: 'createUserName', width: 150 }, diff --git a/src/views/rcgl/xcxj/xjwtcl/toolbar.js b/src/views/rcgl/xcxj/xjwtcl/toolbar.js index 802cad9ed..6ee70c06e 100644 --- a/src/views/rcgl/xcxj/xjwtcl/toolbar.js +++ b/src/views/rcgl/xcxj/xjwtcl/toolbar.js @@ -5,7 +5,7 @@ import moment from 'moment'; import NormalSelect from '../../../../components/Form/NormalSelect'; const { RangePicker } = DatePicker; const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { - const searchBtn = role?.rule?.find(item => item.menuName == "查询"); + const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true; const [form] = Form.useForm(); const onFinish = (values) => { diff --git a/src/views/rcgl/xcxj/xjxpz/form.js b/src/views/rcgl/xcxj/xjxpz/form.js index 70e17abdd..48ca5bb90 100644 --- a/src/views/rcgl/xcxj/xjxpz/form.js +++ b/src/views/rcgl/xcxj/xjxpz/form.js @@ -18,6 +18,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { values.pointId = record.code; if (mode === 'edit') { values.id = record.id; + values.status = record.status; onEdit(apiurl.rcgl.xcxj.xjxpz.edit,values) } if (mode === 'save') { diff --git a/src/views/sz/pxjlgl/options.js b/src/views/sz/pxjlgl/options.js index 73a9c43aa..4a7fbca99 100644 --- a/src/views/sz/pxjlgl/options.js +++ b/src/views/sz/pxjlgl/options.js @@ -105,7 +105,7 @@ export default function options(data={},teamName) { } }, { - name: teamName===1?'实际期人次':'实际期数', + name: teamName===1?'实际人次':'实际期数', type: 'bar', barWidth: 25, data: data?.list?.map(item =>item.num1),