chenglb
/
PMS_Frontend_v1.0.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix():修改路内BUG

tags/PMS_V1.0.0_Alpha5
guoxin 1 year ago
parent
392dcc2089
commit
1edf31b91e
6 changed files with 153 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
  2. 111
      src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
  3. 36
      src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
  4. 9
      src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
  5. 20
      src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
  6. 7
      src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx

6
src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
View File

@ -313,8 +313,9 @@ function SalesStat(props) {
useEffect(() => { useEffect(() => {
getData() getData()
}, []) }, [])
const [getTextValue,setGetTextValue]=useState({})
const onClickData = (item) => { const onClickData = (item) => {
setGetTextValue(item.text);
setGetValue(item.value); setGetValue(item.value);
setCheckData(item.children) setCheckData(item.children)
setGetTotal(item.total_records) setGetTotal(item.total_records)
@ -401,7 +402,7 @@ function SalesStat(props) {
footer={null} footer={null}
className="revenueModal" className="revenueModal"
> >
<div className="tab-title">{getTabTitle.date}营收情况</div>
<div className="tab-title">{getTabTitle.date}营收情况（{getTextValue}）</div>
<div className="tab-index"> <div className="tab-index">
<div style={{ display: "flex" }}> <div style={{ display: "flex" }}>
<div style={{ lineHeight: 4 }} className="curpoint" onClick={() => { <div style={{ lineHeight: 4 }} className="curpoint" onClick={() => {
@ -428,6 +429,7 @@ function SalesStat(props) {
setGetValue(getValue + 1) setGetValue(getValue + 1)
let Arritem = getTabData.filter((item) => item.value == getValue + 1)[0] let Arritem = getTabData.filter((item) => item.value == getValue + 1)[0]
setTextL(Arritem.text.length) setTextL(Arritem.text.length)
setGetTextValue(Arritem.text)
console.log(textL); console.log(textL);
setCheckData(Arritem.children) setCheckData(Arritem.children)
setGetTotal(Arritem.total_records) setGetTotal(Arritem.total_records)

111
src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
View File

@ -32,17 +32,35 @@ function ModelConf(props) {
const [editVisible, setEditVisible] = useState(false) const [editVisible, setEditVisible] = useState(false)
const [addVisible, setAddVisible] = useState(false) const [addVisible, setAddVisible] = useState(false)
const [deleteVisible, setDeleteVisible] = useState(false) const [deleteVisible, setDeleteVisible] = useState(false)
const [getModal, setGetModal] = useState(true)
const [getChange, setGetChange] = useState(true)
//物品类型 //物品类型
const handleOperator = (v) => { const handleOperator = (v) => {
setFormData({ ...formData, model_id: v }) setFormData({ ...formData, model_id: v })
} }
//商户名称 //商户名称
const handleDeployType = (value) => { const handleDeployType = (value) => {
setFormData({ ...formData, operator_id: value })
setFormData({ ...formData, operator_id: value, model_id: '' })
setGetModal(false)
} }
const handleLoginName = (v) => { const handleLoginName = (v) => {
setFormData({ ...formData, model_name: v.target.value }) setFormData({ ...formData, model_name: v.target.value })
} }
const [getOperationName, setGetOperationName] = useState([])
const [getNewOperationName, setNewGetOperationName] = useState([])
useEffect(() => {
if (formData.operator_id) {
let data = {
operator_id: formData.operator_id
}
ajax.assetsType(data).then(res => {
let arr = res.data
let newArr = arr.slice(1)
setGetOperationName(res.data)
setNewGetOperationName(newArr)
})
}
}, [formData.operator_id])
//列表 //列表
const handleColumns = (tab) => { const handleColumns = (tab) => {
let result = [...deployListColumns]; let result = [...deployListColumns];
@ -231,16 +249,15 @@ function ModelConf(props) {
}) })
getData(Object.assign({}, formData, { pn: 1 })) getData(Object.assign({}, formData, { pn: 1 }))
} }
const [getOperationName, setGetOperationName] = useState([])
const name = () => {
ajax.assetsType().then(res => {
setGetOperationName(res.data)
})
}
const [getMerchantDataName, setGetMerchantDataName] = useState([]) const [getMerchantDataName, setGetMerchantDataName] = useState([])
const [getNewMerchantDataName, setGetNewMerchantDataName] = useState([])
const merchantDataName = () => { const merchantDataName = () => {
ajax.getOperator().then(res => { ajax.getOperator().then(res => {
let arr = res.data
let newArr = arr.slice(1)
setGetMerchantDataName(res.data) setGetMerchantDataName(res.data)
setGetNewMerchantDataName(newArr)
}) })
} }
//添加 //添加
@ -258,9 +275,27 @@ function ModelConf(props) {
} }
const [checkData, setCheckData] = useState(param) const [checkData, setCheckData] = useState(param)
//商户名称 //商户名称
const [getOperatorValue, setGetOperatorValue] = useState('')
const handleAddDeployType = (value) => { const handleAddDeployType = (value) => {
setCheckData({ ...checkData, name: value })
setGetOperatorValue(value)
if (value) {
setGetChange(false)
}
setCheckData({ ...checkData, name: value, brand_name: '' })
} }
useEffect(() => {
if (getOperatorValue != '') {
let data = {
operator_id: getOperatorValue
}
ajax.assetsType(data).then(res => {
let arr = res.data
let newArr = arr.slice(1)
setGetOperationName(res.data)
setNewGetOperationName(newArr)
})
}
}, [getOperatorValue])
//物品编号 //物品编号
const handleAddLoginName = (v) => { const handleAddLoginName = (v) => {
setCheckData({ ...checkData, remarks: v.target.value }) setCheckData({ ...checkData, remarks: v.target.value })
@ -321,29 +356,28 @@ function ModelConf(props) {
const deleteModal = () => { const deleteModal = () => {
setDeleteVisible(false) setDeleteVisible(false)
} }
const [sessionTabList, setSessionTabList] = useSessionStorageState('modelConf', {
value: {
}
})
useEffect(() => {
if (sessionTabList && Object.values(sessionTabList).length > 0) {
setFormData({
model_id: sessionTabList?.model_id,
operator_id: sessionTabList?.operator_id,
model_name: sessionTabList?.model_name,
pn: sessionTabList?.pn,
page_size: sessionTabList?.page_size,
})
}
}, [])
useEffect(() => {
setSessionTabList({
...formData
})
}, [formData])
// const [sessionTabList, setSessionTabList] = useSessionStorageState('modelConf', {
// value: {
// }
// })
// useEffect(() => {
// if (sessionTabList && Object.values(sessionTabList).length > 0) {
// setFormData({
// model_id: sessionTabList?.model_id,
// operator_id: sessionTabList?.operator_id,
// model_name: sessionTabList?.model_name,
// pn: sessionTabList?.pn,
// page_size: sessionTabList?.page_size,
// })
// }
// }, [])
// useEffect(() => {
// setSessionTabList({
// ...formData
// })
// }, [formData])
useEffect(() => { useEffect(() => {
getData() getData()
name()
merchantDataName() merchantDataName()
}, []) }, [])
return <> return <>
@ -364,6 +398,7 @@ function ModelConf(props) {
<label>物品类型</label> <label>物品类型</label>
<Select <Select
style={{ width: 220 }} style={{ width: 220 }}
disabled={getModal}
value={formData.model_id} value={formData.model_id}
options={getOperationName} options={getOperationName}
onChange={handleOperator} onChange={handleOperator}
@ -462,7 +497,7 @@ function ModelConf(props) {
<Select <Select
style={{ width: 180, marginLeft: 20 }} style={{ width: 180, marginLeft: 20 }}
value={checkData.name} value={checkData.name}
options={getMerchantDataName}
options={getNewMerchantDataName}
onChange={handleAddDeployType} onChange={handleAddDeployType}
/> />
</div> </div>
@ -470,9 +505,10 @@ function ModelConf(props) {
<div className="redLogo">*</div> <div className="redLogo">*</div>
<label>所属类型</label> <label>所属类型</label>
<Select <Select
value={checkData.model_id}
value={checkData.brand_name}
disabled={getChange}
style={{ width: 180, marginLeft: 20 }} style={{ width: 180, marginLeft: 20 }}
options={getOperationName}
options={getNewOperationName}
onChange={handleAddOperator} onChange={handleAddOperator}
/> />
</div> </div>
@ -518,10 +554,14 @@ function ModelConf(props) {
<Select <Select
style={{ width: 180, marginLeft: 20 }} style={{ width: 180, marginLeft: 20 }}
value={getEditData.name} value={getEditData.name}
options={getMerchantDataName}
options={getNewMerchantDataName}
onChange={(value) => { onChange={(value) => {
setGetOperatorValue(value)
if (value) {
setGetChange(false)
}
setGetEditData( setGetEditData(
Object.assign({}, getEditData, { name: value })
Object.assign({}, getEditData, { name: value, brand_name: '' })
); );
}} }}
/> />
@ -532,7 +572,8 @@ function ModelConf(props) {
<Select <Select
value={getEditData.brand_name} value={getEditData.brand_name}
style={{ width: 180, marginLeft: 20 }} style={{ width: 180, marginLeft: 20 }}
options={getOperationName}
options={getNewOperationName}
disabled={getChange}
onChange={(v) => { onChange={(v) => {
setGetEditData( setGetEditData(
Object.assign({}, getEditData, { brand_name: v }) Object.assign({}, getEditData, { brand_name: v })

36
src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
View File

@ -64,16 +64,19 @@ function StuffMgm(props) {
setFormData({ ...formData, operatorid: value }) setFormData({ ...formData, operatorid: value })
} }
//区域 //区域
const onChangeList = (value) => {
// // console.log(value);
// let arr = value
// let arrStr = []
// let newArr = arr[arr.length - 1]
// arrStr.push(newArr)
// console.log(arrStr);
const [getOption,setGetOption]=useState(['0'])
const onChangeList = (value,options) => {
let res = [];
if (options) {
let last = options[options.length - 1];
if (last.children) {
addChild(last, res);
}
res.push(last.id);
}
setGetOption(res)
setFormData({ ...formData, region_id: value }) setFormData({ ...formData, region_id: value })
} }
//状态 //状态
const handleStatus = (v) => { const handleStatus = (v) => {
setFormData({ ...formData, status: v }) setFormData({ ...formData, status: v })
@ -348,12 +351,19 @@ function StuffMgm(props) {
key: 'use_name', key: 'use_name',
}, },
] ]
const addChild = (child, res) => {
if (child.children) {
child.children.forEach((item) => {
addChild(item, res);
});
} else {
res.push(child.id);
}
};
// 获取列表数据 // 获取列表数据
const getData = (data = formData) => { const getData = (data = formData) => {
setAjaxLoading(true) setAjaxLoading(true)
let arr = data.region_id
let newArr = arr[arr.length - 1];
ajax.assetsList({ ...data}).then(res => {
ajax.assetsList({ ...data,region_id:getOption}).then(res => {
setAjaxLoading(false) setAjaxLoading(false)
if (res.status === 20000) { if (res.status === 20000) {
utils.tableScrollTop() utils.tableScrollTop()
@ -458,7 +468,9 @@ function StuffMgm(props) {
if (value) { if (value) {
setGetOperatorid(false) setGetOperatorid(false)
} }
setCheckData({ ...checkData, operatorid: value, brand_id: '' })
setCheckData({ ...checkData, operatorid: value, brand_id: '',model_id:'' })
setNewGetOperationName([])
setNewGetAssetsModel([])
} }
//物品编号 //物品编号
const handleAddLoginName = (v) => { const handleAddLoginName = (v) => {

9
src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
View File

@ -438,7 +438,8 @@ function CallbackSuggestion(props) {
change_content: '', change_content: '',
update_value: '', update_value: '',
plate_type: '', plate_type: '',
deal_reason: ''
deal_reason: '',
adjustTime:1
}) })
//提交审核 //提交审核
const onChangeReason = (value) => { const onChangeReason = (value) => {
@ -937,7 +938,7 @@ function CallbackSuggestion(props) {
<div className="title">处理方式</div> <div className="title">处理方式</div>
<div className="yisa-search"> <div className="yisa-search">
<div className="redLogo">*</div> <div className="redLogo">*</div>
<label>更改项</label>
<label style={{width:56}}> 更改项</label>
<Select <Select
style={{ width: 200 }} style={{ width: 200 }}
placeholder="请选择" placeholder="请选择"
@ -969,7 +970,7 @@ function CallbackSuggestion(props) {
/> />
{getValueList === 1 ? {getValueList === 1 ?
<> <>
<label style={{ marginLeft: 30 }}>调整基于：</label>
<label style={{width:76,marginLeft: 30 }}>调整基于：</label>
<Select <Select
style={{ width: 200 }} style={{ width: 200 }}
placeholder="请选择" placeholder="请选择"
@ -988,7 +989,7 @@ function CallbackSuggestion(props) {
onChange={handleAdjust} onChange={handleAdjust}
/> />
<div className="redLogo" style={{ marginLeft: 30 }}>*</div> <div className="redLogo" style={{ marginLeft: 30 }}>*</div>
<label >调整为：</label>
<label style={{width:60}}>调整为：</label>
{ {
getAdjustTimeValue === 1 ? getAdjustTimeValue === 1 ?
<DatePicker <DatePicker

20
src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
View File

@ -36,8 +36,8 @@ function StaggeredMgm(props) {
const [editVisible, setEditVisible] = useState(false) const [editVisible, setEditVisible] = useState(false)
const [addVisible, setAddVisible] = useState(false) const [addVisible, setAddVisible] = useState(false)
let infoData = { let infoData = {
start_date: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD'),
end_date: moment().format('YYYY-MM-DD'),
start_date: moment().format('YYYY-MM-DD'),
end_date: moment().subtract(-30, 'days').startOf('day').format('YYYY-MM-DD'),
start_time: '00:00:00', start_time: '00:00:00',
end_time: '23:59:59', end_time: '23:59:59',
week: '', week: '',
@ -895,9 +895,9 @@ function StaggeredMgm(props) {
/> />
</div> </div>
</div> </div>
<div>
{/* <div>
<PlusCircleOutlined style={{ fontSize: 34, marginRight: 64, color: "#409eff", cursor: "pointer" }} onClick={getSale} /> <PlusCircleOutlined style={{ fontSize: 34, marginRight: 64, color: "#409eff", cursor: "pointer" }} onClick={getSale} />
</div>
</div> */}
</div> </div>
{getSaleMsg && getSaleMsg.length ? {getSaleMsg && getSaleMsg.length ?
@ -1005,11 +1005,11 @@ function StaggeredMgm(props) {
</TextArea> </TextArea>
</div> </div>
</div> </div>
<div>
{/* <div>
<CloseCircleOutlined <CloseCircleOutlined
style={{ fontSize: 34, marginRight: 64, color: "#d9001b", cursor: "pointer" }} style={{ fontSize: 34, marginRight: 64, color: "#d9001b", cursor: "pointer" }}
onClick={() => deleteSale(item, index)} /> onClick={() => deleteSale(item, index)} />
</div>
</div> */}
</div> </div>
</> </>
) )
@ -1084,9 +1084,9 @@ function StaggeredMgm(props) {
/> />
</div> </div>
</div> </div>
<div>
{/* <div>
<PlusCircleOutlined style={{ fontSize: 34, marginRight: 64, color: "#409eff", cursor: "pointer" }} onClick={getSale} /> <PlusCircleOutlined style={{ fontSize: 34, marginRight: 64, color: "#409eff", cursor: "pointer" }} onClick={getSale} />
</div>
</div> */}
</div> </div>
{getSaleMsg && getSaleMsg.length ? {getSaleMsg && getSaleMsg.length ?
@ -1198,11 +1198,11 @@ function StaggeredMgm(props) {
</TextArea> </TextArea>
</div> </div>
</div> </div>
<div>
{/* <div>
<CloseCircleOutlined <CloseCircleOutlined
style={{ fontSize: 34, marginRight: 64, color: "#d9001b", cursor: "pointer" }} style={{ fontSize: 34, marginRight: 64, color: "#d9001b", cursor: "pointer" }}
onClick={() => deleteSale(item, index)} /> onClick={() => deleteSale(item, index)} />
</div>
</div> */}
</div> </div>
</> </>
) )

7
src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
View File

@ -355,8 +355,6 @@ function BusinessConf(props) {
setGetMessage({}) setGetMessage({})
} }
const cancelImg = () => { const cancelImg = () => {
setEditVisible(false)
setPasswordVisible(false) setPasswordVisible(false)
} }
@ -412,6 +410,7 @@ function BusinessConf(props) {
//编辑关闭 //编辑关闭
const editModal = () => { const editModal = () => {
setEditVisible(false) setEditVisible(false)
setGetMessage(0)
} }
//编辑提交 //编辑提交
const placeEditBtn = () => { const placeEditBtn = () => {
@ -855,7 +854,7 @@ function BusinessConf(props) {
</Radio.Group> </Radio.Group>
</div> </div>
} }
<div className="font-size" dangerouslySetInnerHTML={{ __html: showMessage?.message || showMessage }}>
<div className="font-size" dangerouslySetInnerHTML={{ __html: getMessage?.parameter_dsc || getMessage?.message }}>
{/* {getMessage.message} */} {/* {getMessage.message} */}
</div> </div>
</div> </div>
@ -863,7 +862,7 @@ function BusinessConf(props) {
<button type="primary" className="submit" onClick={() => { placeEditBtn() }}> <button type="primary" className="submit" onClick={() => { placeEditBtn() }}>
提交 提交
</button> </button>
<button type="primary" className="cancel" onClick={() => { cancelImg() }}>
<button type="primary" className="cancel" onClick={() => { editModal() }}>
取消 取消
</button> </button>
</div> </div>

Write Preview
Loading…
Cancel
Save