new

src/pages/Printer/index.jsx

@@ -124,12 +124,17 @@ const Station = (props) => {
       cancelText: "取消",
       onOk() {
         formRef?.current?.validateFields().then((formData) => {
-          start("/ngic-workmanship/wmsMaterieLabel/save", formData);
-          setDrawer((v) => ({
-            ...v,
-            visible: false,
-          }));
-          message.success("保存成功！", 2);
+          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

@@ -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;
@@ -559,7 +564,7 @@ const Materiel = (props) => {
           />
         </div>
       </AutoTable>
-     
+
       <Drawer
         title={iftype.title}
         visible={vs}

src/pages/findstore/Storesearch/index.jsx

@@ -76,8 +76,8 @@ function Instore(props) {
     },
     {
       title: "库位名称",
-      dataIndex: "stockNum",
-      key: "stockNum",
+      dataIndex: "storePositionName",
+      key: "storePositionName",
       search: false,
     },
     {

src/pages/outsetstore/Otheroutstore/index.jsx

@@ -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

@@ -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

@@ -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插件！");