From 7ed4a895c9bf3d1d81fa947a1638de399ec92f2e Mon Sep 17 00:00:00 2001 From: guoxin Date: Thu, 28 Dec 2023 12:28:40 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonMgm/AuditMgm/AuditCheck/loadable.jsx | 107 +++++++++++++++++---- src/pages/SystemMgm/RoleMgm/loadable.jsx | 107 ++++++++++++++------- 2 files changed, 160 insertions(+), 54 deletions(-) diff --git a/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx index 57c3d25..ebe3a23 100644 --- a/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx @@ -92,18 +92,6 @@ function AuditCheck() { align: "center" }, { - title: "处理人", - dataIndex: "deal_user", - key: "deal_user", - align: "center" - }, - { - title: "处理时间", - dataIndex: "deal_time", - key: "deal_time", - align: "center" - }, - { title: "状态", dataIndex: "status", key: "status", @@ -118,7 +106,7 @@ function AuditCheck() { key: "address", align: "center", render: (_, record) => { - return type === "1" ? ( + return ( - ) : ( + ) + + }, + }, + ]; + // const columns2 = columns1 + const columns2 = [ + { + title: "序号", + dataIndex: "index", + key: "index", + render: (text, record, index) => index + 1, + }, + { + title: "记录编号", + dataIndex: "number_code", + key: "number_code", + align: "center" + }, + { + title: "违规人员名称", + dataIndex: "inspected_person", + key: "inspected_person", + align: "center" + }, + { + title: "违规类型", + dataIndex: "type_name", + key: "type_name", + align: "center" + }, + { + title: "稽查员", + dataIndex: "inspect_person", + key: "inspect_person", + align: "center" + }, + { + title: "所属运营商", + dataIndex: "operator", + key: "operator", + align: "center" + }, + { + title: "所属路段", + dataIndex: "road_name", + key: "road_name", + align: "center" + }, + { + title: "上报时间", + dataIndex: "insert_time", + key: "insert_time", + align: "center" + }, + { + title: "处理人", + dataIndex: "deal_user", + key: "deal_user", + align: "center" + }, + { + title: "处理时间", + dataIndex: "deal_time", + key: "deal_time", + align: "center" + }, + { + title: "状态", + dataIndex: "status", + key: "status", + align: "center", + render: (text) => { + return {text}; + }, + }, + { + title: "操作", + dataIndex: "address", + key: "address", + align: "center", + render: (_, record) => { + return ( + - ); + ) + + }, }, ]; - const columns2 = columns1 useEffect(() => { if (type === "1") { setColumns(columns1); @@ -344,6 +416,7 @@ function AuditCheck() { showSearch placeholder="请选择违规类型" options={inspectType} + defaultValue={'0'} filterOption={(input, option) => { return option.label.indexOf(input) >= 0; }} @@ -462,7 +535,7 @@ function AuditCheck() { {renderSearch()}
-
diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx index a5f35f1..1feb2a5 100644 --- a/src/pages/SystemMgm/RoleMgm/loadable.jsx +++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx @@ -39,7 +39,7 @@ function RoleMgm(props) { setFormData({ ...parameter }) - getData({...parameter,pn: 1} ) + getData({ ...parameter, pn: 1 }) } //添加 const [addManage, setAddManage] = useState({ @@ -185,11 +185,11 @@ function RoleMgm(props) { const placeSaveBtn = () => { let arr = addManage.depart_id let lastElement = arr[arr.length - 1]; - let str =arr.toString(); + let str = arr.toString(); let data = { ...addManage, - depart_id:lastElement, - depart_arr:str + depart_id: lastElement, + depart_arr: str } let reg = /^\S*$/; @@ -305,7 +305,7 @@ function RoleMgm(props) { let strArr = str.split(","); let num = strArr.map(Number) setCheckedKeys(num) - let newArr=record.depart_arr.split(',') + let newArr = record.depart_arr.split(',') setGetImg(Object.assign({}, getImg, { name: record.name, remark: record.remark, @@ -457,7 +457,7 @@ function RoleMgm(props) { ...getImg, auth: str, id: getAdminId.id, - depart_id:lastElement + depart_id: lastElement } if (getImg.name == "") { @@ -467,7 +467,7 @@ function RoleMgm(props) { message.error('请选择所属部门') return } - + ajax.editChange(data).then(res => { if (res.status === 20000) { setEditVisible(false) @@ -508,35 +508,68 @@ function RoleMgm(props) { let lastElement = addManage[arrStr.length - 1]; // console.log(addManage); if (getGovernment != 0) { - let data = { - id: getGovernment, - auth:getAuthId - } - ajax.getDepartId(data).then(res => { - if (res.status === 20000) { - if (res.status == []) { - message.error('部门没有配置对应菜单权限') - } else { - setGetGovernmentArea(res.data) - // 递归把所有的id放到setAllGover这个数组里 - // console.log(digui(res.data)) - let data = JSON.parse(JSON.stringify(res.data)) - const arr = flatten(data) - const length = calculateArrayLength(res.data); - let key = arr.filter(item => { - return item.key - }) - let arr_id = key.map(item => item.id) - console.log(arr_id); - setCheckedKeys(arr_id); - let str =arr_id.toString() - setAddManage({ ...addManage, auth: str }) - setRoleLength(length) - // console.log(arr); - setAllGover(arr) + let emptyString = JSON.stringify(getAuthId); + if (emptyString == '{}') { + let data = { + id: getGovernment + } + ajax.getDepartId(data).then(res => { + if (res.status === 20000) { + if (res.status == []) { + message.error('部门没有配置对应菜单权限') + } else { + setGetGovernmentArea(res.data) + // 递归把所有的id放到setAllGover这个数组里 + // console.log(digui(res.data)) + let data = JSON.parse(JSON.stringify(res.data)) + const arr = flatten(data) + const length = calculateArrayLength(res.data); + let key = arr.filter(item => { + return item.key + }) + let arr_id = key.map(item => item.id) + console.log(arr_id); + setCheckedKeys(arr_id); + let str = arr_id.toString() + setAddManage({ ...addManage, auth: str }) + setRoleLength(length) + // console.log(arr); + setAllGover(arr) + } } + }) + } else { + let data = { + id: getGovernment, + auth: getAuthId } - }) + ajax.getDepartId(data).then(res => { + if (res.status === 20000) { + if (res.status == []) { + message.error('部门没有配置对应菜单权限') + } else { + setGetGovernmentArea(res.data) + // 递归把所有的id放到setAllGover这个数组里 + // console.log(digui(res.data)) + let data = JSON.parse(JSON.stringify(res.data)) + const arr = flatten(data) + const length = calculateArrayLength(res.data); + let key = arr.filter(item => { + return item.key + }) + let arr_id = key.map(item => item.id) + console.log(arr_id); + setCheckedKeys(arr_id); + let str = arr_id.toString() + setAddManage({ ...addManage, auth: str }) + setRoleLength(length) + // console.log(arr); + setAllGover(arr) + } + } + }) + } + } }, [getGovernment]) useEffect(() => { @@ -634,7 +667,7 @@ function RoleMgm(props) {
-
+
*
-
+
*