new

src/pages/Printer/index.jsx

@@ -59,7 +59,7 @@ const Station = (props) => {
         search: false,
       },
       {
-        title: "批号",
+        title: "批次号",
         dataIndex: "materieControlNo",
         key: "materieControlNo",
       },

src/pages/findstore/Storesearch/index.jsx

@@ -115,8 +115,8 @@ function Instore(props) {
     },
     {
       title: "库存单位",
-      dataIndex: "productionUnit",
-      key: "productionUnit",
+      dataIndex: "productionUnitName",
+      key: "productionUnitName",
       search: false,
     },
     {

src/pages/insertstore/Instore/index.jsx

@@ -451,6 +451,7 @@ function Outstore(props) {
                     ),
                     dataIndex: "materieId",
                     key: "materieId",
+                    width:250,
                     valueType: "select",
                     fieldProps: {
                       allowClear: true,

src/pages/insertstore/Otherinstore/index.jsx

@@ -301,7 +301,7 @@ function Instore(props) {
               dataIndex: "labelId",
               key: "labelId",
               valueType: "select",
-              width: 220,
+              width: 180,
               request: async () => {
                 let res = await doFetch({
                   url: "/ngic-workmanship/wmsMaterieLabel/selectionByStatus",
@@ -327,6 +327,7 @@ function Instore(props) {
               ),
               dataIndex: "materieCode",
               key: "materieCode",
+              width: 160,
               valueType: "select",
               readonly: true,
             },
@@ -335,6 +336,7 @@ function Instore(props) {
               dataIndex: "specificationModel",
               key: "specificationModel",
               readonly: true,
+              width: 140,
             },
 
             {
@@ -933,12 +935,16 @@ function Instore(props) {
           valueType: "select",
           options: [
             {
-              label: "待上架",
-              value: "0",
+              label: "待分配",
+              value: "5",
             },
             {
-              label: "上架中",
-              value: "1",
+              label: "待执行",
+              value: "6",
+            },
+            {
+              label: "执行中",
+              value: "7",
             },
           ],
         },
@@ -987,7 +993,7 @@ function Instore(props) {
                   });
                 },
               }),
-              record.status == 0 &&
+
               getPrem("equipmentCustomer_deleteById", action, "删除", null, {
                 title: "确认删除？",
                 onConfirm: () => {

src/pages/outsetstore/Otheroutstore/index.jsx

@@ -147,6 +147,7 @@ const defaultFields = {
           dataIndex: "materieId",
           key: "materieId",
           valueType: "select",
+          width: 160,
           fieldProps: {
             allowClear: true,
             showSearch: true,
@@ -579,6 +580,7 @@ function Outstore(props) {
               width: "width",
               weight: "weight",
               holdNum: "holdNum",
+              storePositionName: "storePositionName",
             },
           },
         },
@@ -593,6 +595,14 @@ function Outstore(props) {
             key: "materieCode",
             valueType: "select",
             readonly: true,
+            width: 180,
+            renderFormItem: ({ entry }) => {
+              return (
+                <span>
+                  {entry?.materieCode}-{entry?.materieName}
+                </span>
+              );
+            },
           },
           {
             title: (