ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -89,7 +89,7 @@
			[
			{
			field: "taskType",
			title: "ä»»å¡ç±»å",
			title: "åæ®ç±»å",
			type: "select",
			span: 12,
			dataKey:"TaskTypeEnum",
			@@ -174,15 +174,12 @@
			});
			const searchFormOptions = ref([
			[
			{ title: "ä»»å¡å·", field: "taskNum", type: "int" },
			{ title: "æçç¼å·", field: "palletCode", type: "like" },
			// { title: "ä»»å¡å·", field: "taskNum", type: "int" },
			{ title: "åæ®ç¼å·", field: "orderNo", type: "like" },
			// { title: "æçç¼å·", field: "palletCode", type: "like" },
			{ title: "æ¹æ¬¡å·", field: "batchNo", type: "like" },
			],
			[
			{ title: "ç©æç¼å·", field: "materielCode", type: "like" },
			{ title: "ç©æåç§°", field: "materielName", type: "like" },
			{
			title: "ä»»å¡ç±»å",
			{
			title: "åæ®ç±»å",
			field: "taskType",
			type: "select",
			data: [],
			@@ -190,25 +187,15 @@
			},
			],
			[
			{
			title: "ä»»å¡ç¶æ",
			field: "taskStatus",
			type: "select",
			dataKey: "taskStatusEnum",
			data: []
			},
			{
			title: "åºæ¿ç¼å·",
			field: "warehouseCode",
			type: "select",
			dataKey: "warehouseNuber",
			data: [],
			},
			{ title: "è´§ä½ç¼å·", field: "locationCode", type: "like" },
			],
			[
			{ title: "åæ®ç¼å·", field: "orderNo", type: "like" },
			{ title: "åå»ºäºº", field: "creater", type: "like" },
			{ title: "ç©æç¼å·", field: "materielCode", type: "like" },
			{ title: "ç©æåç§°", field: "materielName", type: "like" },
			{
			field: "materielSpec",
			title: "ç©æè§æ ¼",
			type: "string",
			width: 120,
			align: "left",
			},
			],
			]);
			const columns = ref([
			@@ -266,7 +253,7 @@
			},
			{
			field: "taskType",
			title: "ä»»å¡ç±»å",
			title: "åæ®ç±»å",
			type: "select",
			width: 100,
			align: "left",