Skip to content

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

new

parent 85ecd57b
Show whitespace changes
Inline Side-by-side
Showing with 626 additions and 555 deletions
src/pages/Printer/index.jsx
View file @ af55289a
......@@ -124,12 +124,17 @@ const Station = (props) => {
cancelText: "取消",
onOk() {
formRef?.current?.validateFields().then((formData) => {
start("/ngic-workmanship/wmsMaterieLabel/save", formData);
start("/ngic-workmanship/wmsMaterieLabel/save", formData).then(
(res) => {
console.log(res);
setDrawer((v) => ({
...v,
visible: false,
}));
message.success("保存成功！", 2);
reload();
}
);
});
},
onCancel() {
......@@ -154,8 +159,8 @@ const Station = (props) => {
}
});
} else {
message.destroy()
message.warning("请添加列表数据！",2);
message.destroy();
message.warning("请添加列表数据！", 2);
}
});
} else {
......
src/pages/craft/Materiel/index.jsx
View file @ af55289a
......@@ -281,6 +281,7 @@ const Materiel = (props) => {
url: "/ngic-workmanship/pmMaterieChar/queryCommonList",
params: {},
}).then((res) => {
console.log("第一次获取的", res?.data?.dataList);
setdefaultSpecificFileds(res?.data?.dataList);
});
}, []);
......@@ -366,10 +367,13 @@ const Materiel = (props) => {
formRef
.validateFields()
.then((firstValues) => {
console.log(firstValues);
formRefs
.validateFields()
.then((secondFields) => {
console.log(secondFields);
let secondFieldsKeys = Object.keys(secondFields);
console.log("defaultSpecificFileds", defaultSpecificFileds);
let materieCharList = defaultSpecificFileds.map((it) => {
if (secondFieldsKeys.indexOf(it.fieldsKey) != -1) {
it.fieldRealValue = secondFields[it.fieldsKey];
......@@ -451,6 +455,7 @@ const Materiel = (props) => {
let data = res?.data?.dataList,
otherFields = formatFieds(data, "common")?.obj,
newData = formatFieds(data, "common")?.data;
console.log("点击新增获取的，", data);
for (let i in defaultFields) {
defaultFields[i].value = null;
defaultFields[i].disabled = false;
......
src/pages/findstore/Storesearch/index.jsx
View file @ af55289a
......@@ -76,8 +76,8 @@ function Instore(props) {
},
{
title: "库位名称",
dataIndex: "stockNum",
key: "stockNum",
dataIndex: "storePositionName",
key: "storePositionName",
search: false,
},
{
......
src/pages/insertstore/Otherinstore/index.jsx
View file @ af55289a
......@@ -99,9 +99,10 @@ const EditUpload = ({ record, fid, storeId }) => {
search: false,
valueType: "select",
request: async (params) => {
let newParams = JSON.parse(JSON.stringify(params));
let res = await doFetch({
url: "/ngic-auth/sysStorePosition/queryUseAbleSelection",
params: { storeId: params.storeId },
params: { storeId: newParams.storeId },
});
return res?.data?.dataList;
},
......@@ -182,7 +183,50 @@ const EditUpload = ({ record, fid, storeId }) => {
);
};
const defaultFields = {
function Instore(props) {
const { initialState, setInitialState } = useModel("@@initialState");
const [activeTabKey, onTabChange] = useState("1");
const [selectKeys, setSelectKeys] = useState([]);
let [drawprops, setdrawprops] = useState({
title: "",
visible: false,
onClose: () => {
setdrawprops((s) => ({
...s,
visible: false,
fields: {},
}));
},
fields: {},
width: 1200,
}),
actionRef = useRef(),
ChildRef = null,
printRef = useRef(),
mutiPrintRef = useRef();
//操作完成后刷新
function reload() {
actionRef.current.reload();
ChildRef?.onRefresh();
message.success("操作成功");
setdrawprops((s) => ({
...s,
visible: false,
fields: {},
}));
}
const handlePrint = useReactToPrint({
content: () => printRef.current.dom.current,
});
const mutiPrint = useReactToPrint({
content: () => mutiPrintRef.current.dom.current,
});
const defaultFields = useMemo(() => {
return {
four: {
materieInstoreNo: {
value: null,
......@@ -417,7 +461,9 @@ const defaultFields = {
search: false,
render: (dom, row) => {
return (
(row.materieCode ?? "") + " - " + (row.materieName ?? "")
(row.materieCode ?? "") +
" - " +
(row.materieName ?? "")
);
},
},
......@@ -428,7 +474,9 @@ const defaultFields = {
search: false,
render: (dom, row) => {
return (
(row.supplierNo ?? "") + " - " + (row.supplierName ?? "")
(row.supplierNo ?? "") +
" - " +
(row.supplierName ?? "")
);
},
},
......@@ -470,7 +518,9 @@ const defaultFields = {
search: false,
formItemProps: () => {
return {
rules: [{ required: true, message: "此项为必填项" }],
rules: [
{ required: true, message: "此项为必填项" },
],
};
},
},
......@@ -481,7 +531,9 @@ const defaultFields = {
search: false,
formItemProps: () => {
return {
rules: [{ required: true, message: "此项为必填项" }],
rules: [
{ required: true, message: "此项为必填项" },
],
};
},
},
......@@ -530,7 +582,9 @@ const defaultFields = {
search: false,
render: (dom, row) => {
return (
(row.materieCode ?? "") + " - " + (row.materieName ?? "")
(row.materieCode ?? "") +
" - " +
(row.materieName ?? "")
);
},
},
......@@ -541,7 +595,9 @@ const defaultFields = {
search: false,
render: (dom, row) => {
return (
(row.supplierNo ?? "") + " - " + (row.supplierName ?? "")
(row.supplierNo ?? "") +
" - " +
(row.supplierName ?? "")
);
},
},
......@@ -577,7 +633,9 @@ const defaultFields = {
search: false,
formItemProps: () => {
return {
rules: [{ required: true, message: "此项为必填项" }],
rules: [
{ required: true, message: "此项为必填项" },
],
};
},
},
......@@ -588,7 +646,9 @@ const defaultFields = {
search: false,
formItemProps: () => {
return {
rules: [{ required: true, message: "此项为必填项" }],
rules: [
{ required: true, message: "此项为必填项" },
],
};
},
},
......@@ -680,7 +740,9 @@ const defaultFields = {
search: false,
render: (dom, row) => {
return (
(row.materieCode ?? "") + " - " + (row.materieName ?? "")
(row.materieCode ?? "") +
" - " +
(row.materieName ?? "")
);
},
},
......@@ -691,7 +753,9 @@ const defaultFields = {
search: false,
render: (dom, row) => {
return (
(row.supplierNo ?? "") + " - " + (row.supplierName ?? "")
(row.supplierNo ?? "") +
" - " +
(row.supplierName ?? "")
);
},
},
......@@ -731,51 +795,8 @@ const defaultFields = {
},
],
}),
};
function Instore(props) {
const { initialState, setInitialState } = useModel("@@initialState");
const [activeTabKey, onTabChange] = useState("1");
const [selectKeys, setSelectKeys] = useState([]);
let [drawprops, setdrawprops] = useState({
title: "",
visible: false,
onClose: () => {
setdrawprops((s) => ({
...s,
visible: false,
fields: {},
}));
},
fields: {},
width: 1200,
}),
actionRef = useRef(),
ChildRef = null,
printRef = useRef(),
mutiPrintRef = useRef();
//操作完成后刷新
function reload() {
actionRef.current.reload();
ChildRef?.onRefresh();
message.success("操作成功");
setdrawprops((s) => ({
...s,
visible: false,
fields: {},
}));
}
const handlePrint = useReactToPrint({
content: () => printRef.current.dom.current,
});
const mutiPrint = useReactToPrint({
content: () => mutiPrintRef.current.dom.current,
});
};
}, [drawprops.visible]);
const PrintButton = (
<Button
disabled={!selectKeys.length}
......@@ -1119,7 +1140,7 @@ function Instore(props) {
setdrawprops((s) => ({
...s,
visible: true,
title: "新增" + itemz["four"],
title: itemz["four"],
fields: defaultFields["four"],
instoreType: keytoval["four"],
val: "add", //类型
......
src/pages/outsetstore/Otheroutstore/index.jsx
View file @ af55289a
......@@ -537,11 +537,11 @@ function Outstore(props) {
required: true,
disabled: true,
},
storeId: {
storeCode: {
value: null,
title: "出库仓库",
type: "input",
name: ["storeId"],
name: ["storeCode"],
required: true,
disabled: true,
},
......@@ -1033,7 +1033,7 @@ function Outstore(props) {
setdrawprops((s) => ({
...s,
visible: true,
title: "新增" + itemz["four"],
title: itemz["four"],
fields: defaultFields["four"],
outstoreType: keytoval["four"],
val: "add", //类型
......
src/utils/detailTotalCard.js
View file @ af55289a
......@@ -711,6 +711,19 @@ const materielDetail = [
title: "管控方式",
key: "materieControlName",
},
{
title: "规格型号",
key: "specificationModel",
},
{
title: "发料类型",
key: "issueTypeName",
},
],
},
{
cardTitle: "生产属性",
itemData: [
{
title: "铁损",
key: "ironLoss",
......@@ -719,6 +732,23 @@ const materielDetail = [
title: "片厚",
key: "sheetThickness",
},
{
title: "牌号",
key: "shopSign",
},
],
},
{
cardTitle: "仓库属性",
itemData: [
{
title: "库存单位",
key: "productionUnitName",
},
{
title: "默认仓库",
key: "storeName",
},
{
title: "默认库区",
key: "storeAreaName",
......
src/utils/printHandle.js
View file @ af55289a
......@@ -27,6 +27,16 @@ export async function start(url, params) {
// LODOP.PREVIEW();
LODOP.PRINT();
}
return new Promise(
(resolve, reject) => {
if (res) {
resolve(data);
} else {
reject();
}
},
(err) => {}
);
}
} catch (err) {
alert("系统检测当前环境未安装相关插件，请先安装C-Lodop插件！");
......
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