diff --git a/weapp/src/packages/components/inputPicker/index.jsx b/weapp/src/packages/components/inputPicker/index.jsx index c28d1d87..24d06ded 100644 --- a/weapp/src/packages/components/inputPicker/index.jsx +++ b/weapp/src/packages/components/inputPicker/index.jsx @@ -6,19 +6,19 @@ import { View, Picker, Image, Input, Text } from '@tarojs/components' import arrowIcon from '../../../static/img/patrol/arrow-down.svg' import './index.scss' -export default function InputPicker(props) { - const { title, placeholder, selector, value, onInput, isView } = props +export default function InputPicker (props) { + const { title, placeholder, selector, value, onInput, isView, onlySelect } = props const [curSelector, setCurSelector] = useState([]) useEffect(() => { setCurSelector(selector) }, []) - useEffect(()=>{ + useEffect(() => { handleInput({ detail: { value: value } }) - },[value]) + }, [value]) - function handleInput({ detail: { value: v } }) { + function handleInput ({ detail: { value: v } }) { onInput(v) if (v) { setCurSelector(selector.filter(item => item && item.includes(v))) @@ -30,7 +30,7 @@ export default function InputPicker(props) { const handlePickerChange = (e) => { onInput(curSelector[e.detail.value]) } - +console.log(onlySelect); return ( @@ -42,7 +42,7 @@ export default function InputPicker(props) { border={false} value={value} onInput={handleInput} - disabled={isView} + disabled={isView || onlySelect} /> { diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx index d7e752ae..458d2a53 100644 --- a/weapp/src/packages/patrol/index.jsx +++ b/weapp/src/packages/patrol/index.jsx @@ -215,7 +215,7 @@ const Index = () => { return } - if (isPatrol && prjTypeSelector.indexOf(projectType) === -1) { + if ((isPatrol || isAnomaly) && prjTypeSelector.indexOf(projectType) === -1) { Taro.showToast({ title: isAnomaly ? '反馈类型错误' : '工程类型错误', icon: 'none' }) return } @@ -490,6 +490,7 @@ const Index = () => { onInput={setProjectType} selector={prjTypeSelector} isView={isView} + onlySelect={true} /> : '' }