Skip to content

W
wms
Commit 7daae505 authored by krysent's avatar krysent
Browse files
Options

bug

parent 66b2a489
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 202 deletions
src/components/PrintCode/index.jsx
View file @ 7daae505
...@@ -68,7 +68,7 @@ let PrintQrCode = forwardRef(({ selectedItems }, ref) => { ...@@ -68,7 +68,7 @@ let PrintQrCode = forwardRef(({ selectedItems }, ref) => {
<b>物料名称: </b> <span>{item.materieName}</span> <b>物料名称: </b> <span>{item.materieName}</span>
</p> </p>
<p> <p>
<b>批次号/SN号: </b> <span>{item.materieControlNo}</span> <b>批次号: </b> <span>{item.materieControlNo}</span>
</p> </p>
<p> <p>
<b>供应商: </b> <span>{item.supplierName}</span> <b>供应商: </b> <span>{item.supplierName}</span>
......
src/pages/Movestore/fields.js
View file @ 7daae505
...@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId }) => { ...@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId }) => {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -804,7 +804,7 @@ const one = { ...@@ -804,7 +804,7 @@ const one = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -917,7 +917,7 @@ const one = { ...@@ -917,7 +917,7 @@ const one = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
......
src/pages/Movestore/index.jsx
View file @ 7daae505
...@@ -107,42 +107,8 @@ function Outstore(props) { ...@@ -107,42 +107,8 @@ function Outstore(props) {
return [ return [
{ {
title: "单据编号", title: "单据编号",
dataIndex: "materieInstoreNo", dataIndex: "documentsCode",
key: "materieInstoreNo", key: "documentsCode",
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/wmsMaterieInstore/getInStoreInfoById",
totalParams: { id: record.id },
extra: (
<Button
onClick={async () => {
handlePrint();
}}
>
打印
</Button>
),
}));
}}
>
{dom}
</a>
);
},
}, },
{ {
title: "操作时间", title: "操作时间",
...@@ -150,7 +116,6 @@ function Outstore(props) { ...@@ -150,7 +116,6 @@ function Outstore(props) {
key: "operateTimeList", key: "operateTimeList",
width: 300, width: 300,
valueType: "dateRange", valueType: "dateRange",
search: false,
render: (_, row) => { render: (_, row) => {
return <div>{row.operateTime}</div>; return <div>{row.operateTime}</div>;
}, },
...@@ -163,181 +128,114 @@ function Outstore(props) { ...@@ -163,181 +128,114 @@ function Outstore(props) {
{ {
title: "单据类型", title: "单据类型",
dataIndex: "instoreTypeName", dataIndex: "instoreTypeName",
search: false,
key: "instoreType", key: "instoreType",
}, },
{ {
title: "物料编码", title: "物料编码",
dataIndex: "materieCode", dataIndex: "materieCode",
search: false,
key: "materieCode", key: "materieCode",
}, },
{ {
title: "物料名称", title: "物料名称",
dataIndex: "materieName", dataIndex: "materieName",
search: false,
key: "materieName", key: "materieName",
}, },
{ {
title: "批次号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
search: false,
key: "materieControlNo", key: "materieControlNo",
}, },
{ {
title: "库存数量", title: "库存数量",
dataIndex: "stockNum", dataIndex: "stockNumNow",
key: "stockNum", key: "stockNumNow",
search: false, search: false,
}, },
{ {
title: "来源库位", title: "来源库位",
dataIndex: "storeName", dataIndex: "sourceStorePositionName",
search: false, search: false,
key: "storeId", key: "sourceStorePositionName",
fieldProps: {
allowClear: true,
showSearch: true,
},
}, },
{ {
title: "目标库位", title: "目标库位",
dataIndex: "remark", dataIndex: "targetStorePositionName",
search: false, key: "targetStorePositionName",
key: "remark",
search: false,
}, },
{ {
title: "单据状态", title: "单据状态",
dataIndex: "statusName", dataIndex: "documentsState",
key: "status", key: "documentsState",
valueType: "select", search: false,
options: [
{
label: "执行中",
value: "7",
},
{
label: "待分配",
value: "5",
},
{
label: "待执行",
value: "6",
},
],
}, },
]; ];
} else { } else {
return [ return [
{ {
title: "入库单号", title: "单据编号",
dataIndex: "materieInstoreNo", dataIndex: "documentsCode",
key: "materieInstoreNo", key: "documentsCode",
render: (dom, record) => { },
return ( {
<a title: "完成时间",
onClick={() => { dataIndex: "finishTime",
const detail = defaultFields.detail( key: "finishTimeRange",
setSelectKeys, width: 300,
PrintButton valueType: "dateRange",
); render: (_, row) => {
setdrawprops((s) => ({ return <div>{row.operateTime}</div>;
...s,
visible: true,
//查看详情 props
val: "detail",
title: `查看详情`,
...detail,
totalPath:
"/ngic-workmanship/wmsMaterieInstoreHis/getInStoreInfoById",
totalParams: { id: record.id },
extra: (
<Button
onClick={async () => {
handlePrint();
}}
>
打印
</Button>
),
}));
}}
>
{dom}
</a>
);
}, },
}, },
{ {
title: "入库类型", title: "操作人",
dataIndex: "instoreTypeName", dataIndex: "operateUserName",
key: "instoreType", key: "operateUserName",
valueType: "select",
options: [
{
label: "来料入库",
value: "2",
},
{
label: "退料入库",
value: "3",
},
],
}, },
{ {
title: "入库仓库", title: "物料编码",
dataIndex: "storeName", dataIndex: "materieCode",
search: false, search: false,
key: "storeId", key: "materieCode",
fieldProps: {
allowClear: true,
showSearch: true,
},
}, },
{ {
title: "备注", title: "物料名称",
dataIndex: "remark", dataIndex: "materieName",
key: "remark",
search: false, search: false,
key: "materieName",
}, },
{ {
title: "创建人", title: "批次号",
dataIndex: "createUserName", dataIndex: "materieControlNo",
key: "createUserName",
search: false, search: false,
key: "materieControlNo",
}, },
{ {
title: "创建时间", title: "库存数量",
dataIndex: "createTime", dataIndex: "stockNumNow",
key: "createTimeList", key: "stockNumNow",
search: false, search: false,
valueType: "dateRange",
formItemProps: {
name: "createTimeList",
},
}, },
{ {
title: "完成时间", title: "来源库位",
dataIndex: "finishTime", dataIndex: "sourceStorePositionName",
search: false, search: false,
key: "finishTime", key: "sourceStorePositionName",
valueType: "dateRange", },
formItemProps: { {
name: "finishTimeList", title: "目标库位",
}, dataIndex: "targetStorePositionName",
key: "targetStorePositionName",
}, },
{ {
title: "状态", title: "单据状态",
dataIndex: "statusName", dataIndex: "documentsState",
key: "status", key: "documentsState",
valueType: "select", search: false,
options: [
{
label: "已关单",
value: "4",
},
{
label: "已完成",
value: "8",
},
],
}, },
]; ];
} }
...@@ -386,8 +284,8 @@ function Outstore(props) { ...@@ -386,8 +284,8 @@ function Outstore(props) {
columns, columns,
path: path:
activeTabKey == "1" activeTabKey == "1"
? "/ngic-workmanship/wmsMaterieInstore/queryList" ? "/ngic-workmanship/wmsMoveStock/queryList"
: "/ngic-workmanship/wmsMaterieInstoreHis/queryList", : "/ngic-workmanship/wmsMoveStockHis/queryList",
}; };
return ( return (
......
src/pages/Task/fields.js
View file @ 7daae505
...@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId }) => { ...@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId }) => {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -831,7 +831,7 @@ const one = { ...@@ -831,7 +831,7 @@ const one = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -933,7 +933,7 @@ const one = { ...@@ -933,7 +933,7 @@ const one = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
......
src/pages/findstore/Storesearch/indexcopy.jsx
View file @ 7daae505
...@@ -86,7 +86,7 @@ const Storesearch = (props) => { ...@@ -86,7 +86,7 @@ const Storesearch = (props) => {
// "key": "storePositionName" // "key": "storePositionName"
// }, // },
// { // {
// "title": "批次号/SN号", // "title": "批次号",
// "dataIndex": "materieControlNo", // "dataIndex": "materieControlNo",
// "key": "materieControlNo" // "key": "materieControlNo"
// }, // },
......
src/pages/insertstore/Instore/fields.js
View file @ 7daae505
...@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId }) => { ...@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId }) => {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -804,7 +804,7 @@ const one = { ...@@ -804,7 +804,7 @@ const one = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -917,7 +917,7 @@ const one = { ...@@ -917,7 +917,7 @@ const one = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
......
src/pages/insertstore/Otherinstore/fields.js
View file @ 7daae505
...@@ -222,7 +222,7 @@ const one = { ...@@ -222,7 +222,7 @@ const one = {
}, },
}, },
{ {
"title": "批次号/SN号", "title": "批次号",
"dataIndex": "materieControlNo", "dataIndex": "materieControlNo",
"key": "materieControlNo" "key": "materieControlNo"
}, },
...@@ -360,7 +360,7 @@ const one = { ...@@ -360,7 +360,7 @@ const one = {
}, },
}, },
{ {
"title": "批次号/SN号", "title": "批次号",
"dataIndex": "materieControlNo", "dataIndex": "materieControlNo",
"key": "materieControlNo" "key": "materieControlNo"
}, },
...@@ -503,7 +503,7 @@ const one = { ...@@ -503,7 +503,7 @@ const one = {
}, },
}, },
{ {
"title": "批次号/SN号", "title": "批次号",
"dataIndex": "materieControlNo", "dataIndex": "materieControlNo",
"key": "materieControlNo" "key": "materieControlNo"
}, },
...@@ -646,7 +646,7 @@ const one = { ...@@ -646,7 +646,7 @@ const one = {
}, },
}, },
{ {
"title": "批次号/SN号", "title": "批次号",
"dataIndex": "materieControlNo", "dataIndex": "materieControlNo",
"key": "materieControlNo" "key": "materieControlNo"
}, },
...@@ -761,7 +761,7 @@ const one = { ...@@ -761,7 +761,7 @@ const one = {
} }
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -868,7 +868,7 @@ const one = { ...@@ -868,7 +868,7 @@ const one = {
} }
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -1014,7 +1014,7 @@ const one = { ...@@ -1014,7 +1014,7 @@ const one = {
} }
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
......
src/pages/insertstore/Otherinstore/index.jsx
View file @ 7daae505
...@@ -330,6 +330,13 @@ function Instore(props) { ...@@ -330,6 +330,13 @@ function Instore(props) {
width: 160, width: 160,
valueType: "select", valueType: "select",
readonly: true, readonly: true,
renderFormItem: ({ entry }) => {
return (
<span>
{entry?.materieCode}-{entry?.materieName}
</span>
);
},
}, },
{ {
title: "规格型号", title: "规格型号",
...@@ -479,7 +486,7 @@ function Instore(props) { ...@@ -479,7 +486,7 @@ function Instore(props) {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -600,7 +607,7 @@ function Instore(props) { ...@@ -600,7 +607,7 @@ function Instore(props) {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -990,19 +997,27 @@ function Instore(props) { ...@@ -990,19 +997,27 @@ function Instore(props) {
}, },
}), }),
getPrem("equipmentCustomer_deleteById", action, "删除", null, { record?.status === 7
title: "确认删除？", ? null
onConfirm: () => { : getPrem(
doFetch({ "equipmentCustomer_deleteById",
url: "/ngic-workmanship/wmsMaterieInstore/deleteById", action,
params: { id: record.id }, "删除",
}).then((res) => { null,
if (res.code == "0000") { {
reload(); title: "确认删除？",
onConfirm: () => {
doFetch({
url: "/ngic-workmanship/wmsMaterieInstore/deleteById",
params: { id: record.id },
}).then((res) => {
if (res.code == "0000") {
reload();
}
});
},
} }
}); ),
},
}),
]; ];
}, },
}, },
......
src/pages/insertstore/Otherinstore/printdom.jsx
View file @ 7daae505
...@@ -66,7 +66,7 @@ let columns = [ ...@@ -66,7 +66,7 @@ let columns = [
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
......
src/pages/outsetstore/Otheroutstore/fields.js
View file @ 7daae505
...@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId, formRef }) => { ...@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId, formRef }) => {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -831,7 +831,7 @@ const one = { ...@@ -831,7 +831,7 @@ const one = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -933,7 +933,7 @@ const one = { ...@@ -933,7 +933,7 @@ const one = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
......
src/pages/outsetstore/Otheroutstore/index.jsx
View file @ 7daae505
...@@ -337,7 +337,7 @@ const defaultFields = { ...@@ -337,7 +337,7 @@ const defaultFields = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -439,7 +439,7 @@ const defaultFields = { ...@@ -439,7 +439,7 @@ const defaultFields = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -818,11 +818,11 @@ function Outstore(props) { ...@@ -818,11 +818,11 @@ function Outstore(props) {
valueType: "select", valueType: "select",
options: [ options: [
{ {
label: "待下架", label: "待执行",
value: "0", value: "0",
}, },
{ {
label: "下架中", label: "执行中",
value: "1", value: "1",
}, },
], ],
......
src/pages/outsetstore/Outstore/fields.js
View file @ 7daae505
...@@ -79,7 +79,7 @@ const EditUpload = ({ record, fid, storeId }) => { ...@@ -79,7 +79,7 @@ const EditUpload = ({ record, fid, storeId }) => {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -753,7 +753,7 @@ const one = { ...@@ -753,7 +753,7 @@ const one = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
...@@ -848,7 +848,7 @@ const one = { ...@@ -848,7 +848,7 @@ const one = {
}, },
}, },
{ {
title: "批次号/SN号", title: "批次号",
dataIndex: "materieControlNo", dataIndex: "materieControlNo",
key: "materieControlNo", key: "materieControlNo",
search: false, search: false,
......
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