Skip to content

W
wms
Commit 8c29991e authored by krysent's avatar krysent
Browse files
Options

bug

parent 7daae505
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 56 deletions
src/pages/Movestore/index.jsx
View file @ 8c29991e
......@@ -125,12 +125,12 @@ function Outstore(props) {
dataIndex: "operateUserName",
key: "operateUserName",
},
{
title: "单据类型",
dataIndex: "instoreTypeName",
search: false,
key: "instoreType",
},
// {
// title: "单据类型",
// dataIndex: "instoreTypeName",
// search: false,
// key: "instoreType",
// },
{
title: "物料编码",
dataIndex: "materieCode",
......@@ -171,6 +171,15 @@ function Outstore(props) {
dataIndex: "documentsState",
key: "documentsState",
search: false,
render: (_, row) => {
if (row?.documentsState == "0") {
return "待执行";
} else if (row?.documentsState == "1") {
return "执行中";
} else if (row?.documentsState == "2") {
return "已执行";
}
},
},
];
} else {
......@@ -236,6 +245,9 @@ function Outstore(props) {
dataIndex: "documentsState",
key: "documentsState",
search: false,
render: (_, row) => {
return "已完成";
},
},
];
}
......
src/pages/Printer/fields.js
View file @ 8c29991e
......@@ -94,6 +94,10 @@ export function getColumns(setDrawer, formRef) {
key: "unilateralThickness",
dataIndex: "unilateralThickness",
valueType: "digit",
fieldProps: {
precision: 3,
max: 999999,
},
},
{
title: "备注",
......@@ -122,7 +126,7 @@ export function getColumns(setDrawer, formRef) {
},
columns: [
{
title: "重量",
title: "数量",
dataIndex: "weight",
key: "weight",
valueType: "digit",
......
src/pages/Task/index.jsx
View file @ 8c29991e
......@@ -79,40 +79,40 @@ function Outstore(props) {
dataIndex: "taskNo",
key: "taskNo",
search: false,
render: (dom, record) => {
return (
<a
onClick={() => {
const detail = defaultFields.detail(
setSelectKeys,
PrintButton
);
setdrawprops((s) => ({
...s,
visible: true,
//查看详情 props
val: "detail",
title: `查看详情`,
...detail,
totalPath:
"/ngic-workmanship/wmsMaterieOutstore/getOutStoreInfoById",
totalParams: { id: record.id },
extra: (
<Button
onClick={async () => {
handlePrint();
}}
>
打印
</Button>
),
}));
}}
>
{dom}
</a>
);
},
// render: (dom, record) => {
// return (
// <a
// onClick={() => {
// const detail = defaultFields.detail(
// setSelectKeys,
// PrintButton
// );
// setdrawprops((s) => ({
// ...s,
// visible: true,
// //查看详情 props
// val: "detail",
// title: `查看详情`,
// ...detail,
// totalPath:
// "/ngic-workmanship/wmsMaterieOutstore/getOutStoreInfoById",
// totalParams: { id: record.id },
// extra: (
// <Button
// onClick={async () => {
// handlePrint();
// }}
// >
// 打印
// </Button>
// ),
// }));
// }}
// >
// {dom}
// </a>
// );
// },
},
{
title: "物料名称",
......@@ -145,13 +145,13 @@ function Outstore(props) {
search: false,
},
{
title: "来源库位",
title: "来源位置",
dataIndex: "sourceStorePositionName",
key: "sourceStorePositionName",
search: false,
},
{
title: "目标库位",
title: "目标位置",
dataIndex: "targetStorePositionName",
key: "targetStorePositionName",
search: false,
......@@ -307,13 +307,13 @@ function Outstore(props) {
key: "materieControlNo",
},
{
title: "来源库位",
title: "来源位置",
dataIndex: "sourceStorePositionName",
key: "sourceStorePositionName",
search: false,
},
{
title: "目标库位",
title: "目标位置",
dataIndex: "targetStorePositionName",
key: "targetStorePositionName",
search: false,
......
src/pages/insertstore/Otherinstore/index.jsx
View file @ 8c29991e
......@@ -40,7 +40,9 @@ const keytoval = {
three: "退料入库",
four: "其他入库",
};
const EditUpload = ({ record, fid, storeId }) => {
console.log(123);
const [value, setvalue] = useState({
[record.id]: record.uploadList,
});
......@@ -99,6 +101,7 @@ const EditUpload = ({ record, fid, storeId }) => {
search: false,
valueType: "select",
request: async (params) => {
console.log(5555);
let newParams = JSON.parse(JSON.stringify(params));
let res = await doFetch({
url: "/ngic-auth/sysStorePosition/queryUseAbleSelection",
......@@ -226,6 +229,7 @@ function Instore(props) {
content: () => mutiPrintRef.current.dom.current,
});
const defaultFields = useMemo(() => {
console.log(1);
return {
four: {
materieInstoreNo: {
......
src/pages/outsetstore/Otheroutstore/index.jsx
View file @ 8c29991e
......@@ -799,16 +799,16 @@ function Outstore(props) {
},
{
title: "创建人",
dataIndex: "createUserName",
key: "createUserName",
dataIndex: "applyUserName",
key: "applyUserName",
},
{
title: "创建时间",
dataIndex: "createTime",
key: "createTime",
dataIndex: "applyTime",
key: "applyTime",
valueType: "dateRange",
formItemProps: {
name: "createTimeList",
name: "applyTimeList",
},
},
{
......@@ -981,16 +981,16 @@ function Outstore(props) {
},
{
title: "创建人",
dataIndex: "createUserName",
key: "createUserName",
dataIndex: "applyUserName",
key: "applyUserName",
},
{
title: "创建时间",
dataIndex: "createTime",
key: "createTime",
dataIndex: "applyTime",
key: "applyTime",
valueType: "dateRange",
formItemProps: {
name: "createTimeList",
name: "applyTimeList",
},
},
{
......
src/utils/mymodelhtml.js
View file @ 8c29991e
......@@ -70,7 +70,7 @@ export function str(data) {
<div style="flex:3">片厚：${data?.sheetThickness ?? "--"}mm</div>
</div>
<div style="display:flex; flex-direction: row;flex:1;">
<div style="flex:2">重量：${data?.weight ?? "--"}KG</div>
<div style="flex:2">数量：${data?.weight ?? "--"}KG</div>
<div style="flex:3">米数：${data?.length ?? "--"}M</div>
</div>
......
src/utils/request.js
View file @ 8c29991e
......@@ -106,6 +106,7 @@ request.interceptors.response.use(async (response, options) => {
message.destroy();
message.warn(data?.msg);
if (data?.code == "0001" && window.location.href.indexOf("login") == -1) {
console.log("跳转");
localStorage.clear();
history.replace("/user/login");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment