bugfixed p_account meeting_add
このコミットが含まれているのは:
コミット
a3d97fe2f4
|
@ -47499,79 +47499,68 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
_400error = _useState18[0],
|
||||
set400Error = _useState18[1];
|
||||
|
||||
var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
|
||||
var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
|
||||
_useState20 = _slicedToArray(_useState19, 2),
|
||||
_success = _useState20[0],
|
||||
setSuccess = _useState20[1];
|
||||
loaded = _useState20[0],
|
||||
setLoaded = _useState20[1];
|
||||
|
||||
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
|
||||
_useState22 = _slicedToArray(_useState21, 2),
|
||||
loaded = _useState22[0],
|
||||
setLoaded = _useState22[1];
|
||||
submit = _useState22[0],
|
||||
setSubmit = _useState22[1];
|
||||
|
||||
var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
|
||||
var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
|
||||
_useState24 = _slicedToArray(_useState23, 2),
|
||||
submit = _useState24[0],
|
||||
setSubmit = _useState24[1];
|
||||
|
||||
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
|
||||
_useState26 = _slicedToArray(_useState25, 2),
|
||||
check_radio = _useState26[0],
|
||||
setCheckRadio = _useState26[1];
|
||||
check_radio = _useState24[0],
|
||||
setCheckRadio = _useState24[1];
|
||||
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
setLoaded(false);
|
||||
setCheckRadio('false');
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', {
|
||||
params: {
|
||||
father_id: father_id
|
||||
}
|
||||
}).then(function (response) {
|
||||
setLoaded(false);
|
||||
var state = props.history.location.state;
|
||||
console.log(state);
|
||||
|
||||
if (state) {
|
||||
setLoaded(true);
|
||||
setNotice(response.data.notice);
|
||||
console.log(response.data);
|
||||
setTitle(state === null || state === void 0 ? void 0 : state.title);
|
||||
setMemo(state === null || state === void 0 ? void 0 : state.memo);
|
||||
setText(state === null || state === void 0 ? void 0 : state.text);
|
||||
setMeetingImages(state === null || state === void 0 ? void 0 : state.meeting_image);
|
||||
setPdf(state === null || state === void 0 ? void 0 : state.pdf);
|
||||
var list = state.children;
|
||||
var arr = [];
|
||||
|
||||
if (response.data.status_code == 200) {
|
||||
var list = response.data.params;
|
||||
var arr = [];
|
||||
|
||||
for (var i in list) {
|
||||
arr.push(_objectSpread(_objectSpread({}, list[i]), {}, {
|
||||
checked: false
|
||||
}));
|
||||
}
|
||||
|
||||
setChildrenList(arr);
|
||||
console.log(arr);
|
||||
for (var i in list) {
|
||||
arr.push(_objectSpread(_objectSpread({}, list[i]), {}, {
|
||||
checked: false
|
||||
}));
|
||||
}
|
||||
});
|
||||
}, []); // useEffect(() => {
|
||||
// setLoaded(false);
|
||||
// axios.get(`/api/fathers/meetings/detail/${meeting_id}`, {params: { father_id: father_id}})
|
||||
// .then(response => {
|
||||
// setLoaded(true);
|
||||
// setNotice(response.data.notice)
|
||||
// if(response.data.status_code==200){
|
||||
// setTitle(response.data.params?.title);
|
||||
// setMemo(response.data.params?.memo);
|
||||
// setText(response.data.params?.text);
|
||||
// setMeetingImages(response.data.params?.meeting_image);
|
||||
// setApproval(response.data.params?.approval);
|
||||
// setPdf(response.data.params?.pdf);
|
||||
// setChildren(response.data.params?.children);
|
||||
// var list = [...response.data.params?.children];
|
||||
// var approval = [...response.data.params?.approval];
|
||||
// var arr = [];
|
||||
// for(var i=0; i<list.length; i++){
|
||||
// if(approval.findIndex(ele=>ele.child_id == list[i].child_id) >= 0)
|
||||
// arr.push({...list[i], checked: true});
|
||||
// else arr.push({...list[i], checked: false});
|
||||
// }
|
||||
// setChildrenList(arr);
|
||||
// }
|
||||
// });
|
||||
// }, []);
|
||||
//--------------------------------------------------------
|
||||
|
||||
setChildrenList(arr);
|
||||
} else {
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', {
|
||||
params: {
|
||||
father_id: father_id
|
||||
}
|
||||
}).then(function (response) {
|
||||
setLoaded(true);
|
||||
setNotice(response.data.notice);
|
||||
|
||||
if (response.data.status_code == 200) {
|
||||
var list = response.data.params;
|
||||
var arr = [];
|
||||
|
||||
for (var i in list) {
|
||||
arr.push(_objectSpread(_objectSpread({}, list[i]), {}, {
|
||||
checked: false
|
||||
}));
|
||||
}
|
||||
|
||||
setChildrenList(arr);
|
||||
}
|
||||
});
|
||||
}
|
||||
}, []); //--------------------------------------------------------
|
||||
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
if (!loaded) return; //if dont load data
|
||||
|
@ -48271,10 +48260,6 @@ var MeetingDetail = function MeetingDetail(props) {
|
|||
});
|
||||
};
|
||||
|
||||
var handleCopy = function handleCopy() {// const data = {
|
||||
// }
|
||||
};
|
||||
|
||||
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
|
||||
className: "l-content",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
|
||||
|
@ -48369,8 +48354,13 @@ var MeetingDetail = function MeetingDetail(props) {
|
|||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", {
|
||||
className: "p-article-btn__item",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Link, {
|
||||
onClick: handleCopy,
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", {
|
||||
onClick: function onClick() {
|
||||
return history.push({
|
||||
pathname: "/p-account/meeting/new",
|
||||
state: meeting
|
||||
});
|
||||
},
|
||||
className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48",
|
||||
children: "\u8907\u88FD"
|
||||
})
|
||||
|
|
|
@ -28,7 +28,6 @@ const MeetingAdd = (props) => {
|
|||
|
||||
const [_422errors, set422Errors] = useState({title:'', text:'', memo:'', pdf:'', image:''})
|
||||
const [_400error, set400Error] = useState('');
|
||||
const [_success, setSuccess] = useState('');
|
||||
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const [submit, setSubmit] = useState(false);
|
||||
|
@ -37,54 +36,40 @@ const MeetingAdd = (props) => {
|
|||
|
||||
|
||||
useEffect(()=>{
|
||||
setLoaded(false);
|
||||
setCheckRadio('false');
|
||||
axios.get('/api/fathers/children/listOfFather', {params:{father_id: father_id}})
|
||||
.then(response=>{
|
||||
setLoaded(true);
|
||||
setNotice(response.data.notice);
|
||||
console.log(response.data)
|
||||
if(response.data.status_code == 200){
|
||||
var list = response.data.params;
|
||||
var arr = [];
|
||||
for(var i in list){
|
||||
arr.push({...list[i], checked: false})
|
||||
}
|
||||
setChildrenList(arr);
|
||||
console.log(arr)
|
||||
setCheckRadio('false');
|
||||
setLoaded(false);
|
||||
const state = props.history.location.state;
|
||||
console.log(state);
|
||||
if(state){
|
||||
setLoaded(true);
|
||||
setTitle(state?.title);
|
||||
setMemo(state?.memo);
|
||||
setText(state?.text);
|
||||
setMeetingImages(state?.meeting_image);
|
||||
setPdf(state?.pdf);
|
||||
var list = state.children;
|
||||
var arr = [];
|
||||
for(var i in list){
|
||||
arr.push({...list[i], checked: false})
|
||||
}
|
||||
setChildrenList(arr);
|
||||
}
|
||||
else{
|
||||
axios.get('/api/fathers/children/listOfFather', {params:{father_id: father_id}})
|
||||
.then(response=>{
|
||||
setLoaded(true);
|
||||
setNotice(response.data.notice);
|
||||
if(response.data.status_code == 200){
|
||||
var list = response.data.params;
|
||||
var arr = [];
|
||||
for(var i in list){
|
||||
arr.push({...list[i], checked: false})
|
||||
}
|
||||
setChildrenList(arr);
|
||||
}})
|
||||
}
|
||||
})
|
||||
},[])
|
||||
|
||||
|
||||
// useEffect(() => {
|
||||
// setLoaded(false);
|
||||
// axios.get(`/api/fathers/meetings/detail/${meeting_id}`, {params: { father_id: father_id}})
|
||||
// .then(response => {
|
||||
// setLoaded(true);
|
||||
// setNotice(response.data.notice)
|
||||
// if(response.data.status_code==200){
|
||||
// setTitle(response.data.params?.title);
|
||||
// setMemo(response.data.params?.memo);
|
||||
// setText(response.data.params?.text);
|
||||
// setMeetingImages(response.data.params?.meeting_image);
|
||||
// setApproval(response.data.params?.approval);
|
||||
// setPdf(response.data.params?.pdf);
|
||||
// setChildren(response.data.params?.children);
|
||||
// var list = [...response.data.params?.children];
|
||||
// var approval = [...response.data.params?.approval];
|
||||
// var arr = [];
|
||||
// for(var i=0; i<list.length; i++){
|
||||
// if(approval.findIndex(ele=>ele.child_id == list[i].child_id) >= 0)
|
||||
// arr.push({...list[i], checked: true});
|
||||
// else arr.push({...list[i], checked: false});
|
||||
// }
|
||||
// setChildrenList(arr);
|
||||
// }
|
||||
// });
|
||||
// }, []);
|
||||
|
||||
|
||||
//--------------------------------------------------------
|
||||
useEffect(()=>{
|
||||
if(!loaded) return; //if dont load data
|
||||
|
|
|
@ -118,11 +118,6 @@ const MeetingDetail = (props) => {
|
|||
});
|
||||
}
|
||||
|
||||
const handleCopy = () => {
|
||||
// const data = {
|
||||
|
||||
// }
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="l-content">
|
||||
|
@ -179,8 +174,12 @@ const MeetingDetail = (props) => {
|
|||
<a onClick={()=>setShowDelete(true)} className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">削除</a>
|
||||
</li>
|
||||
<li className="p-article-btn__item">
|
||||
<Link onClick={handleCopy}
|
||||
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">複製</Link>
|
||||
<a onClick={()=>
|
||||
history.push({
|
||||
pathname: "/p-account/meeting/new",
|
||||
state: meeting
|
||||
})}
|
||||
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">複製</a>
|
||||
</li>
|
||||
<li className="p-article-btn__item">
|
||||
<a onClick={()=>setShowNotify(true)} className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">再通知</a>
|
||||
|
|
新しいイシューから参照