pu428f3pz
/
NewEduCoderBuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto Submit

Browse Source
dev_local_v9_test2
autosubmit 2 years ago
parent cdf53046f2
commit 2493273e08
5 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
index.html
Unescape View File

@ -27,7 +27,7 @@
display: block !important;
}
</style><script>if(document.domain !== "www.educoder.net") document.title = '';</script>
<script src="/react/build/umi.3ac8b791.js"></script>
<script src="/react/build/umi.098650bb.js"></script>
<script src="/react/build/js/public.js"></script>
</body>
</html>

64
p__Materials__ItemAssets__AddReceive__index.503669bd.async.js → p__Materials__ItemAssets__AddReceive__index.13e5a69a.async.js
Unescape View File

@ -270,14 +270,14 @@ var Navigation = function Navigation(_ref) {
render: function render(text) {
return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
placement: "bottomLeft",
title: text == '0' ? '可申请' : '不可用',
title: text == '1' ? '可申请' : '不可用',
children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
children: [text == '0' && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
children: [text == '1' && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
style: {
color: "#2EC25B"
},
children: "\u53EF\u7533\u8BF7"
}), text == '1' && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
}), text == '0' && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
style: {
color: "#FA6400"
},
@ -421,7 +421,7 @@ var Navigation = function Navigation(_ref) {
(0,materials/* receives_info */.Os)({
id: params === null || params === void 0 ? void 0 : params.receiveId
}).then(function (res) {
var _res$data4, _res$data5, _res$data6, _res$data7, _res$data8, _res$data9, _res$data10, _res$data11, _res$data12, _res$data13, _res$data14, _res$data15, _res$data16, _res$data17, _res$data19;
var _res$data4, _res$data5, _res$data6, _res$data7, _res$data8, _res$data9, _res$data10, _res$data11, _res$data12, _res$data13, _res$data14, _res$data15, _res$data16, _res$data17, _res$data18, _res$data19, _res$data20, _res$data21, _res$data23;
myForm.setFieldsValue({
number: res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.number,
attachment_ids: (res === null || res === void 0 || (_res$data5 = res.data) === null || _res$data5 === void 0 || (_res$data5 = _res$data5.attachments) === null || _res$data5 === void 0 ? void 0 : _res$data5.length) > 0 ? (0,MultiUpload/* coverToFileList */.z)(res === null || res === void 0 || (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.attachments) : [],
@ -430,22 +430,26 @@ var Navigation = function Navigation(_ref) {
mail: res === null || res === void 0 || (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.mail,
reason: res === null || res === void 0 || (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : _res$data10.reason,
container_type: res === null || res === void 0 || (_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : _res$data11.container_type,
container_id: res === null || res === void 0 || (_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : _res$data12.container_id,
description: res === null || res === void 0 || (_res$data13 = res.data) === null || _res$data13 === void 0 ? void 0 : _res$data13.description,
substances: (res === null || res === void 0 || (_res$data14 = res.data) === null || _res$data14 === void 0 || (_res$data14 = _res$data14.substances) === null || _res$data14 === void 0 ? void 0 : _res$data14.length) > 0 ? res === null || res === void 0 || (_res$data15 = res.data) === null || _res$data15 === void 0 ? void 0 : _res$data15.substances : []
start_time: dayjs_min_default()(res === null || res === void 0 || (_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : _res$data12.start_time),
end_time: dayjs_min_default()(res === null || res === void 0 || (_res$data13 = res.data) === null || _res$data13 === void 0 ? void 0 : _res$data13.end_time),
classroom_place_id: res === null || res === void 0 || (_res$data14 = res.data) === null || _res$data14 === void 0 ? void 0 : _res$data14.classroom_place_id,
place_id: res === null || res === void 0 || (_res$data15 = res.data) === null || _res$data15 === void 0 ? void 0 : _res$data15.place_id,
container_id: res === null || res === void 0 || (_res$data16 = res.data) === null || _res$data16 === void 0 ? void 0 : _res$data16.container_id,
description: res === null || res === void 0 || (_res$data17 = res.data) === null || _res$data17 === void 0 ? void 0 : _res$data17.description,
substances: (res === null || res === void 0 || (_res$data18 = res.data) === null || _res$data18 === void 0 || (_res$data18 = _res$data18.substances) === null || _res$data18 === void 0 ? void 0 : _res$data18.length) > 0 ? res === null || res === void 0 || (_res$data19 = res.data) === null || _res$data19 === void 0 ? void 0 : _res$data19.substances : []
});
setFormTableData(toConsumableArray_default()(res === null || res === void 0 || (_res$data16 = res.data) === null || _res$data16 === void 0 ? void 0 : _res$data16.substances));
setFormTableData(toConsumableArray_default()(res === null || res === void 0 || (_res$data20 = res.data) === null || _res$data20 === void 0 ? void 0 : _res$data20.substances));
//实验室房间
(0,laboratory/* user_substance_classroom_rooms */.Zd)({
classroom_id: res === null || res === void 0 || (_res$data17 = res.data) === null || _res$data17 === void 0 ? void 0 : _res$data17.classroom_id
classroom_id: res === null || res === void 0 || (_res$data21 = res.data) === null || _res$data21 === void 0 ? void 0 : _res$data21.classroom_place_id
}).then(function (res) {
var _res$data18;
var _res$data22;
setRoomList([{
id: '',
title: '全部'
}].concat(toConsumableArray_default()(res === null || res === void 0 || (_res$data18 = res.data) === null || _res$data18 === void 0 ? void 0 : _res$data18.list)));
}].concat(toConsumableArray_default()(res === null || res === void 0 || (_res$data22 = res.data) === null || _res$data22 === void 0 ? void 0 : _res$data22.list)));
});
getContainerList(res === null || res === void 0 || (_res$data19 = res.data) === null || _res$data19 === void 0 ? void 0 : _res$data19.container_type);
getContainerList(res === null || res === void 0 || (_res$data23 = res.data) === null || _res$data23 === void 0 ? void 0 : _res$data23.container_type);
});
} else {
myForm.setFieldValue('start_time', dayjs_min_default()(new Date()));
@ -456,8 +460,8 @@ var Navigation = function Navigation(_ref) {
(0,laboratory/* user_substance_classrooms */.y8)({
type: 1
}).then(function (res) {
var _res$data20;
setLaboratoryLists(res === null || res === void 0 || (_res$data20 = res.data) === null || _res$data20 === void 0 ? void 0 : _res$data20.list);
var _res$data24;
setLaboratoryLists(res === null || res === void 0 || (_res$data24 = res.data) === null || _res$data24 === void 0 ? void 0 : _res$data24.list);
});
//物资分类
(0,materials/* substance_categories_query */.xb)({
@ -466,11 +470,11 @@ var Navigation = function Navigation(_ref) {
keyword: '',
is_public: 1
}).then(function (res) {
var _res$data21;
var _res$data25;
setSubstanceList([{
id: '',
title: '全部'
}].concat(toConsumableArray_default()(res === null || res === void 0 || (_res$data21 = res.data) === null || _res$data21 === void 0 ? void 0 : _res$data21.list)));
}].concat(toConsumableArray_default()(res === null || res === void 0 || (_res$data25 = res.data) === null || _res$data25 === void 0 ? void 0 : _res$data25.list)));
});
dispatch({
type: 'globalSetting/headerFooterToggle',
@ -500,10 +504,14 @@ var Navigation = function Navigation(_ref) {
});
};
(0,_react_17_0_2_react.useEffect)(function () {
getData(false);
if (openRuleModal) {
getData(false);
}
}, [page]);
(0,_react_17_0_2_react.useEffect)(function () {
getData(true);
if (openRuleModal) {
getData(true);
}
}, [keyword, classroomRoomId, substanceCategoryId, myForm.getFieldValue('classroom_id'), limit]);
var getData = function getData(flag) {
if (flag) {
@ -518,12 +526,12 @@ var Navigation = function Navigation(_ref) {
substance_category_id: substanceCategoryId,
scrapped: 0
}).then(function (res) {
var _res$data22, _res$data23;
setTableData(res === null || res === void 0 || (_res$data22 = res.data) === null || _res$data22 === void 0 || (_res$data22 = _res$data22.list) === null || _res$data22 === void 0 ? void 0 : _res$data22.map(function (item) {
var _res$data26, _res$data27;
setTableData(res === null || res === void 0 || (_res$data26 = res.data) === null || _res$data26 === void 0 || (_res$data26 = _res$data26.list) === null || _res$data26 === void 0 ? void 0 : _res$data26.map(function (item) {
item.key = item === null || item === void 0 ? void 0 : item.id;
return item;
}));
setTotal(res === null || res === void 0 || (_res$data23 = res.data) === null || _res$data23 === void 0 ? void 0 : _res$data23.count);
setTotal(res === null || res === void 0 || (_res$data27 = res.data) === null || _res$data27 === void 0 ? void 0 : _res$data27.count);
});
};
var onShowSizeChange = function onShowSizeChange(page, size) {
@ -627,7 +635,7 @@ var Navigation = function Navigation(_ref) {
children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
colon: false,
label: "\u4F7F\u7528\u5730\u70B9",
name: "place_parent_id",
name: "classroom_place_id",
rules: [{
required: true,
message: '必填项'
@ -643,8 +651,8 @@ var Navigation = function Navigation(_ref) {
(0,laboratory/* user_substance_classroom_rooms */.Zd)({
classroom_id: e
}).then(function (res) {
var _res$data24;
setLaboratoryRooms(toConsumableArray_default()(res === null || res === void 0 || (_res$data24 = res.data) === null || _res$data24 === void 0 ? void 0 : _res$data24.list));
var _res$data28;
setLaboratoryRooms(toConsumableArray_default()(res === null || res === void 0 || (_res$data28 = res.data) === null || _res$data28 === void 0 ? void 0 : _res$data28.list));
});
},
children: laboratoryLists === null || laboratoryLists === void 0 ? void 0 : laboratoryLists.map(function (item, index) {
@ -751,11 +759,11 @@ var Navigation = function Navigation(_ref) {
(0,laboratory/* user_substance_classroom_rooms */.Zd)({
classroom_id: e
}).then(function (res) {
var _res$data25;
var _res$data29;
setRoomList([{
id: '',
title: '全部'
}].concat(toConsumableArray_default()(res === null || res === void 0 || (_res$data25 = res.data) === null || _res$data25 === void 0 ? void 0 : _res$data25.list)));
}].concat(toConsumableArray_default()(res === null || res === void 0 || (_res$data29 = res.data) === null || _res$data29 === void 0 ? void 0 : _res$data29.list)));
});
setFormTableData([]);
},
@ -890,7 +898,7 @@ var Navigation = function Navigation(_ref) {
receive_id: params === null || params === void 0 ? void 0 : params.receiveId
}).then(function (res) {
if ((res === null || res === void 0 ? void 0 : res.status) == 0) {
var _res$data26;
var _res$data30;
modal/* default */.Z.confirm({
title: "确认申请",
icon: null,
@ -945,7 +953,7 @@ var Navigation = function Navigation(_ref) {
style: {
width: '750px'
},
dataSource: res === null || res === void 0 || (_res$data26 = res.data) === null || _res$data26 === void 0 ? void 0 : _res$data26.list,
dataSource: res === null || res === void 0 || (_res$data30 = res.data) === null || _res$data30 === void 0 ? void 0 : _res$data30.list,
pagination: false,
bordered: true,
columns: columns,

10
p__Materials__ItemAssets__Info__index.e7f9fedb.async.js → p__Materials__ItemAssets__Info__index.804199f3.async.js
Unescape View File

@ -471,14 +471,14 @@ var Navigation = function Navigation(_ref) {
render: function render(text) {
return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
placement: "bottomLeft",
title: text == '0' ? '可申请' : '不可用',
title: text == '1' ? '可申请' : '不可用',
children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
children: [text == '0' && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
children: [text == '1' && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
style: {
color: "#2EC25B"
},
children: "\u53EF\u7533\u8BF7"
}), text == '1' && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
}), text == '0' && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
style: {
color: "#FA6400"
},
@ -913,10 +913,10 @@ var Navigation = function Navigation(_ref) {
value: '',
children: "\u5168\u90E8"
}), /*#__PURE__*/(0,jsx_runtime.jsx)(es_select["default"].Option, {
value: 0,
value: 1,
children: "\u53EF\u7533\u8BF7"
}), /*#__PURE__*/(0,jsx_runtime.jsx)(es_select["default"].Option, {
value: 1,
value: 0,
children: "\u4E0D\u53EF\u7528"
})]
})

42
p__Materials__Receive__index.2186a408.async.js → p__Materials__Receive__index.175fe895.async.js
Unescape View File

@ -425,35 +425,41 @@ var ReturnModal_ViewModal = function ViewModal(_ref) {
if ((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.length) == 0) {
message/* default */.ZP.error('请选择需要归还的资产');
} else {
var flag = true;
for (var i in rowSelection) {
if (!regex.test(rowSelection[i].return_num)) {
message/* default */.ZP.error("请检查归还数量，必须大于0且最多只能一位小数");
flag = false;
return false;
} else if (Number(rowSelection[i].return_num) > Number(rowSelection[i].apply_num)) {
message/* default */.ZP.error("归还数量必须小于等于领用数量");
flag = false;
return false;
} else {
console.log(rowSelection);
console.log(viewInfo);
(0,materials/* receives_return */.nX)({
id: viewInfo === null || viewInfo === void 0 ? void 0 : viewInfo.id,
substance_details: rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.map(function (item) {
return {
id: item.id,
return_num: Number(item.return_num)
};
})
}).then(function (res) {
if (res.status == 0) {
message/* default */.ZP.success('归还成功');
_onCancel();
}
});
}
}
if (flag) {
(0,materials/* receives_return */.nX)({
id: viewInfo === null || viewInfo === void 0 ? void 0 : viewInfo.id,
substance_details: rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.map(function (item) {
return {
id: item.id,
return_num: Number(item.return_num)
};
})
}).then(function (res) {
if (res.status == 0) {
message/* default */.ZP.success('归还成功');
setSelectedRowKeys([]);
setRowSelection([]);
_onCancel();
}
});
}
}
},
onCancel: function onCancel(e) {
setSelectedRowKeys([]);
setRowSelection([]);
_onCancel();
},
children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@ -481,7 +487,7 @@ var ReturnModal_ViewModal = function ViewModal(_ref) {
},
getCheckboxProps: function getCheckboxProps(record) {
return {
disabled: (record === null || record === void 0 ? void 0 : record.status) == 0 ? false : true
disabled: (record === null || record === void 0 ? void 0 : record.status) == 'unreturned' || (record === null || record === void 0 ? void 0 : record.status) == 0 ? false : true
};
}
}

2
umi.3ac8b791.js → umi.098650bb.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save