ZhongRui/ALDbanyunxiangmu.git

			@@ -37,7 +37,7 @@
			const searchFormOptions = ref([
			[
			{ title: "æçç¼å·", field: "palletCode",type: "like" },
			// { title: "è´§ä½ç¼å·", field: "locationCode",type: "like" },
			{ title: "è´§ä½ç¼å·", field: "locationCode",type: "like" },
			{ title: "è´§ä½ç¶æ", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
			{ title: "åºåç¶æ", field: "stockStatus",type: "selectList",dataKey: "stockStatusEmun",data: [],},
			],
			@@ -77,16 +77,10 @@
			field: "locationName",
			title: "è´§ä½åç§°",
			type: "string",
			width: 270,
			width: 150,
			align: "left",
			},
			{
			field: "warehouseId",
			title: "æå±ä»åº",
			type: "string",
			width: 80,
			align: "left",
			},

			{
			field: "roadwayNo",
			title: "å··éç¼å·",
			@@ -96,15 +90,22 @@
			hidden:true
			},
			{
			field: "materielCode",
			title: "æå«ç©æç¼å·",
			field: "orderStatistics",
			title: "æå«ç©ææç»",
			type: "string",
			width: 120,
			width: 240,
			align: "left",
			},
			{
			field: "sumStock",
			title: "æ»åºå",
			type: "string",
			width: 140,
			align: "left",
			},
			{
			field: "stockOrderNo",
			title: "æå«åæ®",
			type: "string",
			width: 140,
			align: "left",
			@@ -125,6 +126,45 @@
			align: "left",
			},
			{
			field: "enalbeStatus",
			title: "è´§ä½ç¦ç¨ç¶æ",
			type: "string",
			width: 140,
			align: "left",
			bind: { key: "enableStatusEnum", data: [] },
			},
			{
			field: "locationStatus",
			title: "è´§ä½ç¶æ",
			type: "string",
			width: 140,
			align: "left",
			bind: { key: "locationStatusEnum", data: [] },
			},
			{
			field: "locationType",
			title: "è´§ä½ç±»å",
			type: "string",
			width: 140,
			align: "left",
			bind:{key: "locationTypeEnum", data: []}
			},
			{
			field: "stockStatus",
			title: "åºåç¶æ",
			type: "string",
			width: 140,
			align: "left",
			bind:{key: "stockStatusEmun", data: []}
			},
			{
			field: "warehouseId",
			title: "æå±ä»åº",
			type: "string",
			width: 80,
			align: "left",
			},
			{
			field: "modifier",
			title: "ä¿®æ¹äºº",
			type: "string",