来料入库

src/pages/insertstore/Instore/index.jsx

@@ -41,8 +41,6 @@ const keytoval = {
     four: "其他出库",
   };
 
-  
-
 function Outstore(props) {
   const { initialState, setInitialState } = useModel("@@initialState");
   const [activeTabKey, onTabChange] = useState("1");
@@ -160,10 +158,6 @@ function Outstore(props) {
               label: "退料入库",
               value: "3",
             },
-            {
-              label: "其他入库",
-              value: "4",
-            },
           ],
         },
         {
@@ -194,6 +188,7 @@ function Outstore(props) {
           dataIndex: "createTime",
           key: "createTimeList",
           valueType: "dateRange",
+          search: false,
           formItemProps: {
             name: "createTimeList",
           },
@@ -205,12 +200,8 @@ function Outstore(props) {
           valueType: "select",
           options: [
             {
-              label: "待下架",
-              value: "0",
-            },
-            {
-              label: "下架中",
-              value: "2",
+              label: "执行中",
+              value: "7",
             },
             {
               label: "待分配",
@@ -278,10 +269,6 @@ function Outstore(props) {
               label: "退料入库",
               value: "3",
             },
-            {
-              label: "其他入库",
-              value: "4",
-            },
           ],
         },
         {
@@ -297,7 +284,6 @@ function Outstore(props) {
         {
           title: "备注",
           dataIndex: "remark",
-          search: false,
           key: "remark",
           search: false,
         },
@@ -311,6 +297,7 @@ function Outstore(props) {
           title: "创建时间",
           dataIndex: "createTime",
           key: "createTimeList",
+          search: false,
           valueType: "dateRange",
           formItemProps: {
             name: "createTimeList",

src/pages/insertstore/Otherinstore/fields.js

@@ -735,7 +735,7 @@ const one = {
       },
       {
         cardTitle: "物料信息列表",
-        extraContent: dom,
+        extraContent: "",
         itemData: [
           {
             key: "materialList",

src/pages/insertstore/Otherinstore/index.jsx

 import React, { useEffect, useMemo, useRef, useState } from "react";
-import { Dropdown, Menu, Button, message } from "antd";
+import { Dropdown, Menu, Button, message, Table } from "antd";
 import AutoTable from "@/components/AutoTable";
 // import defaultFields from "./fields";
 import { doFetch } from "@/utils/doFetch";
@@ -85,7 +85,7 @@ const EditUpload = ({ record, fid, storeId }) => {
   return (
     <EditableProTable
       rowKey={"id"}
-      maxLength={1000}
+      maxLength={1}
       style={{ marginLeft: 48 }}
       columns={[
         {
@@ -100,7 +100,7 @@ const EditUpload = ({ record, fid, storeId }) => {
           valueType: "select",
           request: async (params) => {
             let res = await doFetch({
-              url: "/ngic-auth/sysStorePosition/queryByStoreId/selection",
+              url: "/ngic-auth/sysStorePosition/queryUseAbleSelection",
               params: { storeId: params.storeId },
             });
             return res?.data?.dataList;
@@ -403,7 +403,7 @@ const defaultFields = {
       },
       {
         cardTitle: "物料信息列表",
-        extraContent: dom,
+        extraContent: "",
         itemData: [
           {
             key: "materialList",
@@ -663,9 +663,9 @@ const defaultFields = {
         ],
       },
       {
-        cardTitle: "物料信息列表",
+        cardTitle: "物料信息",
         extra: true,
-        extrapath: "/ngic-workmanship/wmsMaterieInstore/upload",
+        extrapath: "/ngic-workmanship/wmsMaterieInstore/uploadOtherInstore",
         extrakey: "submit", //redux key
         itemData: [
           {
@@ -696,7 +696,7 @@ const defaultFields = {
                 },
               },
               {
-                title: "批次号/SN号",
+                title: "批次号",
                 dataIndex: "materieControlNo",
                 key: "materieControlNo",
                 search: false,
@@ -802,6 +802,7 @@ function Instore(props) {
           title: "入库单号",
           dataIndex: "materieInstoreNo",
           key: "materieInstoreNo",
+          search: false,
           render: (dom, record) => {
             return (
               <a
@@ -841,6 +842,7 @@ function Instore(props) {
           title: "入库类型",
           dataIndex: "instoreTypeName",
           key: "instoreType",
+          search: false,
           valueType: "select",
           options: [
             {
@@ -863,6 +865,7 @@ function Instore(props) {
         },
         {
           title: "入库仓库",
+          search: false,
           dataIndex: "storeName",
           key: "storeId",
           fieldProps: {
@@ -879,11 +882,7 @@ function Instore(props) {
           },
           valueType: "select",
         },
-        {
-          title: "相关单号",
-          dataIndex: "businessNo",
-          key: "businessNo",
-        },
+
         {
           title: "备注",
           dataIndex: "remark",
@@ -893,6 +892,7 @@ function Instore(props) {
         {
           title: "创建人",
           dataIndex: "createUserName",
+          search: false,
           key: "createUserName",
         },
         {
@@ -907,6 +907,7 @@ function Instore(props) {
         {
           title: "状态",
           dataIndex: "statusName",
+          search: false,
           key: "status",
           valueType: "select",
           options: [
@@ -1015,6 +1016,7 @@ function Instore(props) {
         {
           title: "入库类型",
           dataIndex: "instoreTypeName",
+          search: false,
           key: "instoreType",
           valueType: "select",
           options: [
@@ -1038,6 +1040,7 @@ function Instore(props) {
         },
         {
           title: "入库仓库",
+          search: false,
           dataIndex: "storeName",
           key: "storeId",
           fieldProps: {
@@ -1054,11 +1057,7 @@ function Instore(props) {
           },
           valueType: "select",
         },
-        {
-          title: "相关单号",
-          dataIndex: "businessNo",
-          key: "businessNo",
-        },
+
         {
           title: "备注",
           dataIndex: "remark",
@@ -1066,6 +1065,7 @@ function Instore(props) {
           search: false,
         },
         {
+          search: false,
           title: "创建人",
           dataIndex: "createUserName",
           key: "createUserName",
@@ -1091,6 +1091,7 @@ function Instore(props) {
         {
           title: "状态",
           dataIndex: "statusName",
+          search: false,
           key: "status",
           valueType: "select",
           options: [

src/pages/outsetstore/Outstore/fields.js

@@ -699,7 +699,8 @@ const one = {
       },
       {
         cardTitle: "物料信息列表",
-        extraContent: dom,
+        extraContent: "",
+
         itemData: [
           {
             key: "materialList",