ZhongRui/ALDbanyunxiangmu.git

			@@ -79,7 +79,7 @@
			const searchFormFields = ref({
			inboundOrderNo: "",
			upperOrderNo: "",
			orderType: "0",
			orderType: "",
			orderStatus: "",
			createType: "",
			creater: "",
			@@ -87,15 +87,14 @@
			});
			const searchFormOptions = ref([
			[
			{ title: "åæ®ç¼å·", field: "inboundOrderNo", type: "like" },
			{ title: "æ«æåæ®ç¼å·ææ¡ç ", field: "inboundOrderNo", type: "like" },
			{ title: "ä¸æ¸¸åæ®ç¼å·", field: "upperOrderNo", type: "like" },
			{
			title: "åæ®ç±»å",
			field: "orderType",
			title: "ä¸å¡ç±»å",
			field: "businessType",
			type: "select",
			dataKey: "inOrderType",
			data: [0],
			hidden:true
			dataKey: "documentTypeEmun",
			data: [],
			},
			{
			title: "åæ®ç¶æ",
			@@ -169,12 +168,32 @@
			bind: { key: "inboundState", data: [] },
			},
			{
			field: "orderStatistics",
			title: "åæ®ç©æç»è®¡",
			type: "string",
			width: 230,
			align: "left",
			},
			{
			field: "createType",
			title: "åå»ºæ¹å¼",
			type: "string",
			width: 120,
			align: "left",
			bind: { key: "createType", data: [] },
			},
			{
			field: "remark",
			title: "å¤æ³¨",
			type: "string",
			width: 180,
			align: "left"
			},
			{
			field: "returnToMESStatus",
			title: "åä¼ MESç¶æ",
			width: 120,
			bind: { key: "createType", data:[{key:0, value:"æªåä¼ "},{key:1, value:"å·²åä¼ æå"},{key:2, value:"åä¼ å¤±è´¥"}]},
			},
			{
			field: "factoryArea",
			@@ -209,13 +228,6 @@
			title: "ä¿®æ¹æ¶é´",
			type: "datetime",
			width: 160,
			align: "left",
			},
			{
			field: "remark",
			title: "å¤æ³¨",
			type: "string",
			width: 100,
			align: "left",
			},
			]);