bug

src/pages/spare/instore/columns.js

@@ -275,6 +275,9 @@ function getcolumns(setdrawer) {
           title: '入库单号',
           dataIndex: 'taskNo',
           key: 'taskNo',
+          fieldProps: {
+            placeholder: '不填系统自动生成',
+          },
         },
         {
           title: '入库类型',
@@ -405,6 +408,22 @@ function getcolumns(setdrawer) {
             return <span>{row?.completeTime}</span>;
           },
         },
+        {
+          title: '状态',
+          dataIndex: 'statusName',
+          key: 'status',
+          hideInForm: true,
+          hideInDescriptions: true,
+          valueType: 'select',
+          fieldProps: {
+            dropdownMatchSelectWidth: 120,
+          },
+          width: 120,
+          options: [
+            { label: '已入库', value: 2 },
+            { label: '已关单', value: 3 },
+          ],
+        },
         {
           title: '备件信息',
           dataIndex: 'details',
@@ -438,7 +457,8 @@ function getcolumns(setdrawer) {
         {
           dataIndex: 'splias',
           valueType: 'split',
-          title: '入库/关单信息',
+          title: '入库信息',
+          hideInForm: true,
           key: 'splisa',
         },
         {
@@ -446,6 +466,9 @@ function getcolumns(setdrawer) {
           dataIndex: 'statusName',
           key: 'status',
           hideInForm: true,
+          span: 1,
+          hideInTable: true,
+          search: false,
           valueType: 'select',
           fieldProps: {
             dropdownMatchSelectWidth: 120,
@@ -455,6 +478,9 @@ function getcolumns(setdrawer) {
             { label: '已入库', value: 2 },
             { label: '已关单', value: 3 },
           ],
+          render: (_, row) => {
+            return row?.status == 2 ? '已入库' : '--';
+          },
         },
         {
           title: '操作人',
@@ -463,6 +489,9 @@ function getcolumns(setdrawer) {
           hideInSearch: true,
           hideInTable: true,
           hideInForm: true,
+          render: (_, row) => {
+            return row?.status == 2 ? row?.operateUserName : '--';
+          },
         },
         {
           title: '操作时间',
@@ -471,6 +500,59 @@ function getcolumns(setdrawer) {
           hideInSearch: true,
           hideInTable: true,
           hideInForm: true,
+          render: (_, row) => {
+            return row?.status == 2 ? row?.operateTime : '--';
+          },
+        },
+        {
+          dataIndex: 'splias',
+          valueType: 'split',
+          hideInForm: true,
+          title: '关单信息',
+          key: 'splisa',
+        },
+        {
+          title: '状态',
+          dataIndex: 'statusName',
+          key: 'status',
+          hideInForm: true,
+          hideInTable: true,
+          span: 1,
+          search: false,
+          valueType: 'select',
+          fieldProps: {
+            dropdownMatchSelectWidth: 120,
+          },
+          width: 120,
+          options: [
+            { label: '已入库', value: 2 },
+            { label: '已关单', value: 3 },
+          ],
+          render: (_, row) => {
+            return row?.status == 3 ? '已关单' : '--';
+          },
+        },
+        {
+          title: '操作人',
+          dataIndex: 'operateUserName',
+          key: 'operateUserName',
+          hideInSearch: true,
+          hideInTable: true,
+          hideInForm: true,
+          render: (_, row) => {
+            return row?.status == 3 ? row?.operateUserName : '--';
+          },
+        },
+        {
+          title: '操作时间',
+          dataIndex: 'operateTime',
+          key: 'operateTime',
+          hideInSearch: true,
+          hideInTable: true,
+          hideInForm: true,
+          render: (_, row) => {
+            return row?.status == 3 ? row?.operateTime : '--';
+          },
         },
       ],
       pathconfig: {

src/pages/spare/outstore/columns.js

@@ -76,6 +76,9 @@ function getcolumns(setdrawer) {
           title: '出库单号',
           dataIndex: 'taskNo',
           key: 'taskNo',
+          fieldProps: {
+            placeholder: '不填系统自动生成',
+          },
         },
         {
           title: '出库类型',
@@ -207,7 +210,6 @@ function getcolumns(setdrawer) {
           valueType: 'split',
         },
         {
-          title: '备件',
           dataIndex: 'taskSpareList',
           key: 'taskSpareList',
           valueType: 'formSelectList',
@@ -261,6 +263,9 @@ function getcolumns(setdrawer) {
           title: '出库单号',
           dataIndex: 'taskNo',
           key: 'taskNo',
+          fieldProps: {
+            placeholder: '不填系统自动生成',
+          },
         },
         {
           title: '出库类型',

src/pages/spare/requisition/columns.js

@@ -54,6 +54,9 @@ function getcolumns(type, fullName) {
         {
           title: '领用单号',
           dataIndex: 'taskNo',
+          fieldProps: {
+            placeholder: '不填系统自动生成',
+          },
           key: 'taskNo',
         },
         {
@@ -181,7 +184,6 @@ function getcolumns(type, fullName) {
           valueType: 'split',
         },
         {
-          title: '备件',
           dataIndex: 'detailsList',
           key: 'detailsList',
           valueType: 'formSelectList',
@@ -267,6 +269,9 @@ function getcolumns(type, fullName) {
         {
           title: '领用单号',
           dataIndex: 'taskNo',
+          fieldProps: {
+            placeholder: '不填系统自动生成',
+          },
           key: 'taskNo',
         },
         {

src/pages/spare/spareback/columns.js

@@ -67,6 +67,9 @@ function getcolumns(type, fullName) {
           title: '回冲单号',
           dataIndex: 'taskNo',
           key: 'taskNo',
+          fieldProps: {
+            placeholder: '不填系统自动生成',
+          },
         },
         {
           title: '申请原因',
@@ -196,7 +199,6 @@ function getcolumns(type, fullName) {
           valueType: 'split',
         },
         {
-          title: '备件',
           dataIndex: 'detailsList',
           key: 'detailsList',
           valueType: 'formSelectList',
@@ -294,6 +296,9 @@ function getcolumns(type, fullName) {
           title: '回冲单号',
           dataIndex: 'taskNo',
           key: 'taskNo',
+          fieldProps: {
+            placeholder: '不填系统自动生成',
+          },
         },
         {
           title: '申请原因',