new

src/components/AutoTable/mtable.jsx

@@ -184,11 +184,11 @@ const Mtable = (props) => {
   };
 
   //调用重新渲染表格
-  useAsyncEffect(async () => {
-    console.log(history?.location?.pathname);
+  useEffect(async () => {
+    // console.log(history?.location?.pathname);
     await initDrage();
-  }, [columns, extraparams, path, activeTabKey, refreshDep]);
-
+  }, []);
+  // columns, extraparams, path, activeTabKey, refreshDep
   //缩放表格
   const handleResize =
     (index) =>

src/components/InitForm/index.jsx

@@ -142,6 +142,9 @@ let InitForm = ({
     [ind, cind] = useState(0);
 
   form = formRef ? formRef : form;
+
+  
+
   useEffect(() => {
     let Doms = [],
       klink = {},
@@ -1249,7 +1252,12 @@ let InitForm = ({
               } else if (item.type == "split") {
                 return !extraprops.hides ? (
                   <Col key={i} {...getCol(item.col)}>
-                    <Divider orientation="left"   style={{fontWeight:600,fontSize:14}}>{item.title}</Divider>
+                    <Divider
+                      orientation="left"
+                      style={{ fontWeight: 600, fontSize: 14 }}
+                    >
+                      {item.title}
+                    </Divider>
                   </Col>
                 ) : null;
               }

src/pages/craft/Materiel/fields.js

@@ -104,7 +104,7 @@ export default {
   unilateralThickness: {
     value: 0,
     type: "inputnumber",
-    title: "宽度",
+    title: "单边厚度",
     name: ["unilateralThickness"],
     required: false,
     precision: 3,

src/pages/craft/Materiel/index.jsx

@@ -255,15 +255,10 @@ const Materiel = (props) => {
         key: "sheetThickness",
       },
       {
-        title: "宽度",
+        title: "单边厚度",
         dataIndex: "unilateralThickness",
         key: "unilateralThickness",
       },
-      {
-        title: "牌号",
-        dataIndex: "shopSign",
-        key: "shopSign",
-      },
 
       {
         title: "默认库区",
@@ -370,27 +365,13 @@ const Materiel = (props) => {
       formRef
         .validateFields()
         .then((firstValues) => {
-          formRefs
-            .validateFields()
-            .then((secondFields) => {
-              let secondFieldsKeys = Object.keys(secondFields);
-              let materieProductUnitList =
-                firstValues?.materieProductUnitList?.map((it) => {
-                  return {
-                    productionUnit: it.productionUnit,
-                    conversionRate: it.conversionRate,
-                  };
-                });
-
-              params = {
-                ...firstValues,
-                ...difrid,
-                materieProductUnitList,
-              };
-              url = "/ngic-workmanship/pmMaterie/save";
-              run({ url, params });
-            })
-            .catch((error) => {});
+          console.log("1231231", firstValues);
+          params = {
+            ...firstValues,
+            ...difrid,
+          };
+          url = "/ngic-workmanship/pmMaterie/save";
+          run({ url, params });
         })
         .catch((error) => {});
     } else {

src/pages/system/Reservoir/fields.js

@@ -82,6 +82,23 @@ export default {
       },
     ],
   },
+  isMovePosition: {
+    value: 1,
+    type: "radio",
+    name: ["isMovePosition"],
+    title: "是否为移库库位",
+    required: false,
+    options: [
+      {
+        label: "是",
+        value: 1,
+      },
+      {
+        label: "否",
+        value: 0,
+      },
+    ],
+  },
   wzpz: {
     type: "split",
     title: "位置配置",

src/pages/system/Reservoir/index.jsx

@@ -11,7 +11,7 @@ import InitForm from "@/components/InitForm";
 import moment from "moment";
 import TreeRender from "@/components/TreeRender";
 import { useEffect } from "react";
-import {storeselectionBoxAll} from '@/services/system.js'
+import { storeselectionBoxAll } from "@/services/system.js";
 
 const initState = {
     vs: false,
@@ -226,7 +226,7 @@ const Materiel = (props) => {
         title: "所属仓库",
         dataIndex: "storeName",
         key: "storeName",
-        valueType:'select',
+        valueType: "select",
         options: {
           database: storeselectionBoxAll,
         },
@@ -284,6 +284,23 @@ const Materiel = (props) => {
         title: "更新时间",
         dataIndex: "updateTime",
         key: "updateTime",
+        search:false
+      },
+      {
+        title: "是否为移库仓位",
+        dataIndex: "isMovePosition",
+        key: "isMovePosition",
+        valueType: 'select',
+        options: [{
+          value: '1',
+          label:'是'
+        }, {
+          value: '2',
+          label:'否'
+        }],
+        render: (_, row) => {
+          return row?.isMovePosition ? "是" : "否";
+        },
       },
 
       {

src/pages/system/Staff/index.jsx

@@ -109,6 +109,7 @@ function reducer(state, action) {
 }
 
 const Staff = (props) => {
+  
   let actionRef = useRef(),
     ChildRef = null;
   function reload() {
@@ -476,6 +477,7 @@ const Staff = (props) => {
       新增
     </Button>,
   ];
+ 
   return (
     <div>
       {extraparams.orderType == "1" && (

src/pages/system/Station/fields.js

@@ -32,11 +32,11 @@ export default {
     },
     linked: true,
   },
-  remark: {
+  status: {
     value: null,
     type: "select",
     title: "启用状态",
-    name: ["remark"],
+    name: ["status"],
     required: false,
     options: [
       {
@@ -45,10 +45,9 @@ export default {
       },
       {
         label: "停用",
-        value: 2,
+        value: 0,
       },
     ],
-    col: { span: 24 },
   },
   remark: {
     value: null,