ZhongRui/ALDbanyunxiangmu.git

			@@ -104,7 +104,7 @@
			title: "ä¸å¡ç±»å",
			field: "businessType",
			type: "select",
			dataKey: "documentTypeEmun",
			dataKey: "outboundbusinessType",
			data: [],
			},
			{
			@@ -117,13 +117,14 @@
			],
			[
			{
			title: "åå»ºæ¹å¼",
			field: "createType",
			title: "åä¼ MESç¶æ",
			field: "returnToMESStatus",
			type: "select",
			dataKey: "createType",
			dataKey: "outboundReturnToMESStatus",
			data: [],
			},
			{ title: "åå»ºè", field: "creater", type: "like" },
			{ title: "ç©æç¼å·", field: "materielCode", type: "like" },
			{ title: "æçº¿åç§°", field: "departmentName", type: "like" },
			{ title: "åå»ºæ¶é´", field: "createDate", type: "datetime" },
			],
			]);
			@@ -196,11 +197,18 @@
			field: "returnToMESStatus",
			title: "åä¼ MESç¶æ",
			width: 120,
			bind: { key: "createType", data: [{ key: 0, value: "æªåä¼ " }, { key: 1, value: "å·²åä¼ æå" }, { key: 2, value: "åä¼ å¤±è´¥" },{ key: 3, value: "é¨ååä¼ æå" },{ key: 4, value: "é¨ååä¼ å¤±è´¥" },{ key: 5, value: "æ éåä¼ " }] },
			bind: { key: "outboundReturnToMESStatus", data: [{ key: 0, value: "æªåä¼ " }, { key: 1, value: "å·²åä¼ æå" }, { key: 2, value: "åä¼ å¤±è´¥" },{ key: 3, value: "é¨ååä¼ æå" },{ key: 4, value: "é¨ååä¼ å¤±è´¥" },{ key: 5, value: "æ éåä¼ " }] },
			},
			{
			field: "factoryArea",
			title: "ååº",
			type: "string",
			width: 120,
			align: "left"
			},
			{
			field: "departmentName",
			title: "æçº¿åç§°",
			type: "string",
			width: 120,
			align: "left"
			@@ -333,6 +341,15 @@
			required: true,
			},
			{
			field: "warehouseCode",
			title: "ä»åºç¼å·",
			type: "string",
			width: 90,
			align: "left",
			edit: { type: "string" },
			required: true,
			},
			{
			field: "lineNo",
			title: "è¡å·",
			type: "string",