Commit a143c19d3aa8cc49d929a2547db881d3586bdd93

Authored by chenxt
1 parent 1343e97a

颜色选择

src/mes/common/commonModelComponent/index.js
@@ -3142,18 +3142,21 @@ const TaskConfirmModal = props => { @@ -3142,18 +3142,21 @@ const TaskConfirmModal = props => {
3142 const SisColorChooseComponent = props => { 3142 const SisColorChooseComponent = props => {
3143 const { sisColorChooseVisible, sisColorField, sisTableName, controlSelectedRowId } = props; 3143 const { sisColorChooseVisible, sisColorField, sisTableName, controlSelectedRowId } = props;
3144 3144
3145 - const [rightData, setRightData] = useState([]);  
3146 - 3145 + const [rightData, setRightData] = useState(props?.sisColorSelectedData?.filter(item => item.bSelected) || []);
  3146 + useEffect(() => {
  3147 + if (props.sisColorSelectedData && props.sisColorSelectedData.length > 0) {
  3148 + setRightData(props?.sisColorSelectedData?.filter(item => item.bSelected) || []);
  3149 + } else {
  3150 + setRightData([]);
  3151 + }
  3152 + }, [props.sisColorSelectedData, props.sisColorChooseVisible])
3147 if (!sisColorChooseVisible) return ""; 3153 if (!sisColorChooseVisible) return "";
3148 3154
3149 const handleClose = () => { 3155 const handleClose = () => {
3150 3156
3151 props.onSaveState({ 3157 props.onSaveState({
3152 sisColorChooseVisible: false, 3158 sisColorChooseVisible: false,
3153 - sisColorSelectedData: []  
3154 }); 3159 });
3155 -  
3156 - setRightData([]);  
3157 }; 3160 };
3158 3161
3159 const handelSubmit = () => { 3162 const handelSubmit = () => {
@@ -3179,8 +3182,6 @@ const SisColorChooseComponent = props => { @@ -3179,8 +3182,6 @@ const SisColorChooseComponent = props => {
3179 [sisColorField]: JSON.stringify(colorList), 3182 [sisColorField]: JSON.stringify(colorList),
3180 iOutsideQty: totalDColor 3183 iOutsideQty: totalDColor
3181 } 3184 }
3182 - console.log("🚀 ~ handelSubmit ~ tableData[iIndex]:", totalDColor);  
3183 -  
3184 props.onSaveState({ 3185 props.onSaveState({
3185 [`${sisTableName}Data`]: [...tableData], 3186 [`${sisTableName}Data`]: [...tableData],
3186 sisColorChooseVisible: false, 3187 sisColorChooseVisible: false,