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
1bf77dfc91
commit
49a3002e99
8 changed files with 195 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
  2. 6
      src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx
  3. 2
      src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx
  4. 132
      src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx
  5. 4
      src/pages/InRoadMgm/Stuff/ModelConf/index.scss
  6. 21
      src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
  7. 76
      src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
  8. 51
      src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx

7
src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
View File

@ -796,7 +796,7 @@ const FormModal = (props) => {
label="时段"
className="yisa-label"
>
<TimePicker format={format} style={{ marginLeft: 10 }}
<TimePicker format={format} allowClear={false} style={{ marginLeft: 10 }}
onChange={handleChangeStartTime}
/>
</Form.Item>
@ -806,7 +806,7 @@ const FormModal = (props) => {
name={[name, "end"]}
label=""
>
<TimePicker format={format} onChange={handleChangeEndTime} />
<TimePicker format={format} allowClear={false} onChange={handleChangeEndTime} />
</Form.Item>
<Form.Item
className="btm-box"
@ -977,7 +977,7 @@ const FormModal = (props) => {
label="时段"
className="yisa-label"
>
<TimePicker format={format} style={{ marginLeft: 10 }}
<TimePicker format={format} allowClear={false} style={{ marginLeft: 10 }}
onChange={handleChangeStartTime} />
</Form.Item>
<label className="mid">to</label>
@ -987,6 +987,7 @@ const FormModal = (props) => {
label=""
>
<TimePicker format={format}
allowClear={false}
onChange={handleChangeEndTime} />
</Form.Item>

6
src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx
View File

@ -776,7 +776,7 @@ const FormModal = (props) => {
label="时段"
className="yisa-label"
>
<TimePicker format={format} style={{ marginLeft: 10 }}
<TimePicker format={format} allowClear={false} style={{ marginLeft: 10 }}
onChange={handleChangeStartTime} />
</Form.Item>
<label className="mid">to</label>
@ -786,6 +786,7 @@ const FormModal = (props) => {
label=""
>
<TimePicker format={format}
allowClear={false}
onChange={handleChangeEndTime} />
</Form.Item>
@ -958,7 +959,7 @@ const FormModal = (props) => {
label="时段"
className="yisa-label"
>
<TimePicker format={format} style={{ marginLeft: 10 }}
<TimePicker format={format} allowClear={false} style={{ marginLeft: 10 }}
onChange={handleChangeStartTime} />
</Form.Item>
<label className="mid">to</label>
@ -968,6 +969,7 @@ const FormModal = (props) => {
label=""
>
<TimePicker format={format}
allowClear={false}
onChange={handleChangeEndTime} />
</Form.Item>

2
src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx
View File

@ -26,7 +26,7 @@ function WorkerStat(props) {
operator: '0',//商户名称
username: '',//登录名
user_id: '0',//姓名
job_status: '0',//在职状态
job_status: '1',//在职状态
start: moment().subtract(1, 'days').format('YYYY-MM-DD'),
end: moment().subtract(1, 'days').format('YYYY-MM-DD'),
pn: 1,

132
src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx
View File

@ -18,7 +18,7 @@ function CategroyConf(props) {
export_url: '',
process_url: ""
})
const parameter={
const parameter = {
brand_id: '0',//物品类型
operatorid: '0',//商户名称
pn: 1,
@ -31,14 +31,34 @@ function CategroyConf(props) {
const [editVisible, setEditVisible] = useState(false)
const [addVisible, setAddVisible] = useState(false)
const [deleteVisible, setDeleteVisible] = useState(false)
const [getOperatorid, setGetOperatorid] = useState(true)
//物品类型
const handleOperator = (v) => {
setFormData({ ...formData, brand_id: v })
}
//商户名称
const [getOperationName, setGetOperationName] = useState([])
const [getOperatorValue, setGetOperatorValue] = useState('')
const handleDeployType = (value) => {
setFormData({ ...formData, operatorid: value })
setGetOperatorValue(value)
if (value) {
setGetOperatorid(false)
}
setFormData({ ...formData, operatorid: value, brand_id: '' })
setGetOperationName([])
}
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)
})
}
}, [getOperatorValue])
//列表
const handleColumns = (tab) => {
let result = [...deployListColumns];
@ -99,9 +119,9 @@ function CategroyConf(props) {
const checkModal = () => {
setCheckVisible(false)
}
const [getRecord,setGetRecord]=useState({})
const deleteModalBtn=()=>{
let data ={
const [getRecord, setGetRecord] = useState({})
const deleteModalBtn = () => {
let data = {
id: getRecord
}
ajax.saveGoodDeleteData(data).then((res) => {
@ -109,7 +129,7 @@ function CategroyConf(props) {
message.success('删除成功')
setDeleteVisible(false)
getData(formData)
}else{
} else {
message.error(res.message)
}
})
@ -141,7 +161,7 @@ function CategroyConf(props) {
setFormData({
...parameter
})
getData({...parameter,pn: 1} )
getData({ ...parameter, pn: 1 })
}
const handleDetail = () => {
let result = [...handleDeColumns];
@ -197,16 +217,16 @@ function CategroyConf(props) {
const changePn = (pn, length) => {
if (formData.page_size === length) {
setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
setLastFormData(Object.assign({}, lastFormData, { pn: pn , page_size: length }))
lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
getData(Object.assign({}, formData, { pn: pn, page_size: length }))
setLastFormData(Object.assign({}, lastFormData, { pn: pn, page_size: length }))
lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length })
getData(Object.assign({}, formData, { pn: pn, page_size: length }))
}
}
//切换每页条数
const changeLength = (pn, length) => {
setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length })
getData(Object.assign({}, formData, { pn: 1, page_size: length }))
}
//检索数据
@ -214,12 +234,6 @@ function CategroyConf(props) {
setFormData({ ...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 [getNewMerchantDataName, setNewGetMerchantDataName] = useState([])
const merchantDataName = () => {
@ -273,7 +287,7 @@ function CategroyConf(props) {
brand_name: '',
remarks: ''
})
}else{
} else {
message.error(res.message)
}
})
@ -283,7 +297,7 @@ function CategroyConf(props) {
const editBtn = () => {
let data = {
...getEditData,
id:getRecord
id: getRecord
}
if (getEditData.name == '') {
message.error('请选择商户')
@ -299,18 +313,18 @@ function CategroyConf(props) {
brand_name: '',
remarks: ''
})
}else{
} else {
message.error(res.message)
}
})
}
}
const placeBtn = () => {
setDeleteVisible(false)
}
const addPlaceBtn=()=>{
const addPlaceBtn = () => {
setAddVisible(false)
setCheckData({
name: '',
@ -318,7 +332,7 @@ function CategroyConf(props) {
remarks: ''
})
}
const editPlaceBtn=()=>{
const editPlaceBtn = () => {
setEditVisible(false)
setGetEditData({
name: '',
@ -326,33 +340,38 @@ function CategroyConf(props) {
remarks: ''
})
}
const [sessionTabList, setSessionTabList] = useSessionStorageState('categroyConf', {
value: {
}
})
useEffect(() => {
console.log(location)
if (sessionTabList && Object.values(sessionTabList).length > 0) {
setFormData({
brand_id: sessionTabList?.brand_id,
operatorid: sessionTabList?.operatorid,
pn: sessionTabList?.pn,
page_size: sessionTabList?.page_size,
})
}
}, [])
useEffect(() => {
setSessionTabList({
...formData
})
}, [formData])
// const [sessionTabList, setSessionTabList] = useSessionStorageState('categroyConf', {
// value: {
// }
// })
// useEffect(() => {
// console.log(location)
// if (sessionTabList && Object.values(sessionTabList).length > 0) {
// setFormData({
// brand_id: sessionTabList?.brand_id,
// operatorid: sessionTabList?.operatorid,
// pn: sessionTabList?.pn,
// page_size: sessionTabList?.page_size,
// })
// }
// }, [])
// useEffect(() => {
// setSessionTabList({
// ...formData
// })
// }, [formData])
//删除功能
const deleteModal = () => {
setDeleteVisible(false)
}
const getOperName = () => {
ajax.assetsType().then(res => {
setGetOperationName(res.data)
})
}
useEffect(() => {
getData()
name()
getOperName()
merchantDataName()
}, [])
return <>
@ -373,6 +392,7 @@ function CategroyConf(props) {
<label>物品类型</label>
<Select
style={{ width: 220 }}
disabled={getOperatorid}
value={formData.brand_id}
options={getOperationName}
onChange={handleOperator}
@ -380,14 +400,14 @@ function CategroyConf(props) {
</div>
<div className="timePicker yisa-search">
<div className="btnBox">
<Button className="yisa-btn colorReset reset" onClick={() => { getResetData() }}>
<Button className="yisa-btn colorReset reset" onClick={() => { getResetData() }}>
重置
</Button>
<Button type="primary" className="yisa-btn colorBtn submit" onClick={() => { getSearchData() }}>
查询
<Button type="primary" className="yisa-btn colorBtn submit" onClick={() => { getSearchData() }}>
查询
</Button>
</div>
</div>
</div>
@ -457,7 +477,7 @@ function CategroyConf(props) {
>
<div className="add">
<div className="yisa-search">
<div className="redLogo">*</div>
<div className="redLogo">*</div>
<label>所属商户</label>
<Select
style={{ width: 180, marginLeft: 20 }}
@ -467,7 +487,7 @@ function CategroyConf(props) {
/>
</div>
<div className="yisa-search">
<div className="redLogo">*</div>
<div className="redLogo">*</div>
<label>类型名称</label>
<Input
value={checkData.brand_name}
@ -476,7 +496,7 @@ function CategroyConf(props) {
onChange={handleAddOperator}
/>
</div>
<div className="yisa-search" style={{marginLeft:15}}>
<div className="yisa-search" style={{ marginLeft: 15 }}>
<label>备注</label>
<TextArea
placeholder="请输入"
@ -503,7 +523,7 @@ function CategroyConf(props) {
>
<div className="add">
<div className="yisa-search">
<div className="redLogo">*</div>
<div className="redLogo">*</div>
<label>所属商户</label>
<Select
style={{ width: 180, marginLeft: 20 }}
@ -517,7 +537,7 @@ function CategroyConf(props) {
/>
</div>
<div className="yisa-search">
<div className="redLogo">*</div>
<div className="redLogo">*</div>
<label>类型名称</label>
<Input
value={getEditData.brand_name}
@ -530,7 +550,7 @@ function CategroyConf(props) {
}}
/>
</div>
<div className="yisa-search" style={{marginLeft:15}}>
<div className="yisa-search" style={{ marginLeft: 15 }}>
<label>备注</label>
<TextArea
placeholder="请输入"

4
src/pages/InRoadMgm/Stuff/ModelConf/index.scss
View File

@ -283,10 +283,10 @@ $color-primary : var(--color-primary);
.cancel{
width: 80px;
height: 35px;
background: #fff;
background: #3e4557;
border: none;
border-radius: 4px;
color: #3e4557;
color: #fff;
cursor: pointer;
margin-left: 20px;
}

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

@ -153,6 +153,7 @@ function ModelConf(props) {
const translateBtn = (record) => {
setGetRecord(record.id)
setEditVisible(true)
setGetOperatorValue( record.operatorid)
setGetEditData(Object.assign({}, getEditData, {
name: record.operatorid,
brand_name: record.brand_id,
@ -162,6 +163,7 @@ function ModelConf(props) {
}
const editModal = () => {
setEditVisible(false)
setGetChange(true)
}
//重置数据
const getResetData = () => {
@ -266,6 +268,12 @@ function ModelConf(props) {
}
const addModal = () => {
setAddVisible(false)
setCheckData({
name: '',
brand_name: '',
remarks: '',
model_name: ''
})
}
let param = {
name: '',
@ -322,6 +330,12 @@ function ModelConf(props) {
if (res.status === 20000) {
setAddVisible(false)
getData(formData)
setCheckData({
name: '',
brand_name: '',
remarks: '',
model_name: ''
})
}
})
}
@ -343,13 +357,12 @@ function ModelConf(props) {
if (res.status === 20000) {
setEditVisible(false)
getData(formData)
setGetChange(true)
}
})
}
}
const placeBtn = () => {
setAddVisible(false)
setEditVisible(false)
setDeleteVisible(false)
}
//删除功能
@ -535,7 +548,7 @@ function ModelConf(props) {
<button type="primary" className="submit" onClick={() => { placeSaveBtn() }}>
提交
</button>
<button type="primary" className="cancel colorReset" onClick={() => { placeBtn() }}>
<button type="primary" className="cancel colorReset" onClick={() => { addModal() }}>
取消
</button>
</div>
@ -612,7 +625,7 @@ function ModelConf(props) {
<button type="primary" className="submit" onClick={() => { editBtn() }}>
提交
</button>
<button type="primary" className="cancel colorReset" onClick={() => { placeBtn() }}>
<button type="primary" className="cancel colorReset" onClick={() => { editModal() }}>
取消
</button>
</div>

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

@ -27,7 +27,7 @@ function StuffMgm(props) {
region_id: ['0'],//区域
code: '',//物品编号
brand_id: '0',//物品类型
model_id: '',//物品型号
model_id: '0',//物品型号
operatorid: '0',//商户名称
name: '',//物品名称
status: '3',//状态
@ -57,22 +57,30 @@ function StuffMgm(props) {
const [getBrandId, setGetBrandId] = useState('')
const handleOperator = (v) => {
setGetBrandId(v)
setFormData({ ...formData, brand_id: v })
setFormData({ ...formData, brand_id: v, model_id: '' })
setGetAssetsModel([])
}
//商户名称
const handleDeployType = (value) => {
setFormData({ ...formData, operatorid: value })
setGetOperatorValue(value)
if (value) {
setGetOperatorid(false)
}
setFormData({ ...formData, operatorid: value, brand_id: '', model_id: '' })
setGetOperationName([])
setGetAssetsModel([])
}
//区域
const [getOption,setGetOption]=useState(['0'])
const onChangeList = (value,options) => {
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);
let last = options[options.length - 1];
if (last.children) {
addChild(last, res);
}
res.push(last.id);
}
setGetOption(res)
setFormData({ ...formData, region_id: value })
@ -224,7 +232,7 @@ function StuffMgm(props) {
})
const [getId, setGetId] = useState({})
function findParents(treeData, id) {
console.log(treeData, id);
console.log(treeData, id);
let allparents = []
if (treeData.length == 0) {
@ -305,10 +313,7 @@ function StuffMgm(props) {
setFormData({
...parameter,
})
setTimeout(()=>{
getData({ ...parameter, pn: 1})
},800)
getData({ ...parameter, pn: 1 }, [])
}
//检索数据
const getSearchData = (data = formData) => {
@ -358,17 +363,17 @@ function StuffMgm(props) {
]
const addChild = (child, res) => {
if (child.children) {
child.children.forEach((item) => {
addChild(item, res);
});
child.children.forEach((item) => {
addChild(item, res);
});
} else {
res.push(child.id);
res.push(child.id);
}
};
};
// 获取列表数据
const getData = (data = formData) => {
const getData = (data = formData, region_id = getOption) => {
setAjaxLoading(true)
ajax.assetsList({ ...data,region_id:getOption}).then(res => {
ajax.assetsList({ ...data, region_id }).then(res => {
setAjaxLoading(false)
if (res.status === 20000) {
utils.tableScrollTop()
@ -413,9 +418,13 @@ function StuffMgm(props) {
const [getRecipient, setGetRecipient] = useState([])
const [getNewRecipient, setNewGetRecipient] = useState([])
const recipientName = () => {
ajax.recipient().then(res => {
let arr = res.data
let newArr = arr.slice(1)
setGetRecipient(res.data)
setNewGetRecipient(newArr)
})
}
//添加
@ -473,7 +482,7 @@ function StuffMgm(props) {
if (value) {
setGetOperatorid(false)
}
setCheckData({ ...checkData, operatorid: value, brand_id: '',model_id:'' })
setCheckData({ ...checkData, operatorid: value, brand_id: '', model_id: '' })
setNewGetOperationName([])
setNewGetAssetsModel([])
}
@ -551,7 +560,7 @@ function StuffMgm(props) {
status: '',
uid: ''
})
setGetSelectStatus(false)
setGetSelectStatus(true)
setGetUid({
uid: ''
})
@ -642,6 +651,8 @@ function StuffMgm(props) {
// }, [])
const [getNewOperationName, setNewGetOperationName] = useState([])
const [getOperationName, setGetOperationName] = useState([])
useEffect(() => {
if (getOperatorValue != '') {
let data = {
@ -696,7 +707,13 @@ function StuffMgm(props) {
// sessionStorage.removeItem('stuffMgm')
// }
// }, [])
const [getOperationName, setGetOperationName] = useState([])
const getAssetData=()=>{
ajax.assetsModel().then(res => {
let arr = res.data
let newArr = arr.slice(1)
setGetAssetsModel(res.data)
})
}
const getOperName = () => {
ajax.assetsType().then(res => {
setGetOperationName(res.data)
@ -707,6 +724,7 @@ function StuffMgm(props) {
operatorid()
getOperName()
merchantDataName()
getAssetData()
recipientName()
getCascaderList()
}, [])
@ -762,6 +780,7 @@ function StuffMgm(props) {
<Select
style={{ width: 220 }}
value={formData.brand_id}
disabled={getOperatorid}
options={getOperationName}
onChange={handleOperator}
/>
@ -773,6 +792,7 @@ function StuffMgm(props) {
placeholder="请选择"
value={formData.model_id}
options={getAssetsModel}
disabled={getOperatorid}
onChange={handleJobStatus}
/>
</div>
@ -814,7 +834,7 @@ function StuffMgm(props) {
</div>
<div className="timePicker yisa-search">
<div className="btnBox">
<Button className="yisa-btn colorReset reset" onClick={() => { getResetData() }}>
<Button className="yisa-btn colorReset reset" onClick={() => { getResetData() }}>
重置
</Button>
<Button type="primary" className="yisa-btn colorBtn submit" onClick={() => { getSearchData() }}>
@ -986,7 +1006,7 @@ function StuffMgm(props) {
placeholder="请选择"
disabled={getSelectStatus}
value={getUid.uid}
options={getRecipient}
options={getNewRecipient}
onChange={handleAddRecipient}
/>
</div>
@ -1145,7 +1165,7 @@ function StuffMgm(props) {
placeholder="请选择"
disabled={getSelectStatus}
value={getEditData.uid}
options={getRecipient}
options={getNewRecipient}
onChange={(v) => {
setGetEditData(
Object.assign({}, getEditData, { uid: v })

51
src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx
View File

@ -27,6 +27,9 @@ function StuffStat(props) {
const [formData, setFormData] = useState(parameter)
const lastFormDataRef = useRef(formData)
const [lastFormData, setLastFormData] = useState(formData)
const [getOperatorid, setGetOperatorid] = useState(true)
const [getOperationName, setGetOperationName] = useState([])
//物品型号
const handleJobStatus = (value) => {
setFormData({ ...formData, model_id: value })
@ -35,12 +38,46 @@ function StuffStat(props) {
const [getBrandId, setGetBrandId] = useState({})
const handleOperator = (v) => {
setGetBrandId(v)
setFormData({ ...formData, brand_id: v })
setFormData({ ...formData, brand_id: v ,model_id:''})
setGetAssetsModel([])
}
const [getAssetsModel, setGetAssetsModel] = useState([])
useEffect(() => {
if (getBrandId != '') {
let data = {
brand_id: getBrandId,
operator_id: getOperatorValue
}
ajax.assetsModel(data).then(res => {
let arr = res.data
let newArr = arr.slice(1)
setGetAssetsModel(res.data)
})
}
}, [getBrandId])
//商户名称
const [getOperatorValue, setGetOperatorValue] = useState('')
const handleDeployType = (value) => {
setFormData({ ...formData, operatorid: value })
setGetOperatorValue(value)
if (value) {
setGetOperatorid(false)
}
setFormData({ ...formData, operatorid: value,brand_id:'', model_id:''})
setGetOperationName([])
setGetAssetsModel([])
}
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)
})
}
}, [getOperatorValue])
//列表
const handleColumns = (tab) => {
let result = [...deployListColumns];
@ -153,7 +190,6 @@ function StuffStat(props) {
getData(Object.assign({}, formData, { pn: 1 }))
}
const [getOperationName, setGetOperationName] = useState([])
const operationName = () => {
ajax.assetsType().then(res => {
setGetOperationName(res.data)
@ -165,7 +201,6 @@ function StuffStat(props) {
setGetMerchantDataName(res.data)
})
}
const [getAssetsModel, setGetAssetsModel] = useState([])
const assetsModelName = () => {
let data = {
brand_id: getBrandId
@ -174,9 +209,6 @@ function StuffStat(props) {
setGetAssetsModel(res.data)
})
}
useEffect(() => {
assetsModelName()
}, [getBrandId])
const [sessionTabList, setSessionTabList] = useSessionStorageState('stuffStat', {
@ -203,8 +235,9 @@ function StuffStat(props) {
}, [formData])
useEffect(() => {
getData()
merchantDataName()
operationName()
merchantDataName()
assetsModelName()
}, [])
return <>
<div className="paid-StuffStat">
@ -226,6 +259,7 @@ function StuffStat(props) {
style={{ width: 220 }}
value={formData.brand_id}
options={getOperationName}
disabled={getOperatorid}
onChange={handleOperator}
/>
</div>
@ -235,6 +269,7 @@ function StuffStat(props) {
style={{ width: 220 }}
placeholder="请选择"
value={formData.model_id}
disabled={getOperatorid}
options={getAssetsModel}
onChange={handleJobStatus}
/>

Write Preview
Loading…
Cancel
Save