非生产类别更新

fe/PC/src/filters/status.js

@@ -2392,3 +2392,33 @@ export function deliverRequestType(index, prop) {
     default:return '已打印';
   }
 }
+
+// 非生产领料类别
+export function unplannedIssueType(index, prop) {
+  let type = {
+    1: {
+      value: 1,
+      label: '原料 非生产领料'
+    },
+    2: {
+      value: 2,
+      label: '线边 非生产领料'
+    },
+  }
+  return Enum(type, index, prop)
+}
+
+// 非生产退料类别
+export function unplannedReceiptType(index, prop) {
+  let type = {
+    1: {
+      value: 1,
+      label: '原料 非生产退料'
+    },
+    2: {
+      value: 2,
+      label: '线边 非生产退料'
+    },
+  }
+  return Enum(type, index, prop)
+}

fe/PC/src/utils/tableColumns/index.js

@@ -2852,6 +2852,7 @@ export const pickingRequest =  [
     type: "name", 
     width: orderWidth
   },
+  { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
   { label: "状态", prop: 'requestStatus',type: "tagFilter",  filters: "requestStatus" },
   { label: "建档日期", prop: "buildDate", type: "dateTime" },
   { label: "操作员", prop: "worker" },
@@ -2881,6 +2882,7 @@ export const pickingApproval =  [
     type: "name", 
     width: orderWidth
   },
+  { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
   { label: "状态", prop: 'requestStatus',type: "tagFilter",  filters: "requestStatus" },
   { label: "建档日期", prop: "buildDate", type: "dateTime" },
   { label: "操作员", prop: "worker" },
@@ -2910,6 +2912,7 @@ export const pickingNote =  [
     type: "name",
     width: orderWidth
   },
+  { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
   { label: "建档日期", prop: "buildDate", type: "dateTime" },
   { label: "请求单号", prop: 'unplannedIssueRequestNumber',width: orderWidth},
   { label: "操作员", prop: "worker" },
@@ -2934,6 +2937,7 @@ export const materialReturnRequest =  [
     type: "name", 
     width: orderWidth
   },
+  { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
   { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
   { label: "建档日期", prop: "buildDate", type: "dateTime" },
   { label: "操作员", prop: "worker" },
@@ -2963,6 +2967,7 @@ export const materialReturnApproval =  [
     type: "name", 
     width: orderWidth
   },
+  { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
   { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
   { label: "建档日期", prop: "buildDate", type: "dateTime" },
   { label: "操作员", prop: "worker" },
@@ -2992,6 +2997,7 @@ export const materialReturnNote =  [
     type: "name", 
     width: orderWidth
   },
+  { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
   { label: "建档日期", prop: "buildDate", type: "dateTime" },
   { label: "请求单号", prop: 'unplannedReceiptRequestNumber',width: orderWidth },
   { label: "操作员", prop: "worker" },