ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -37,19 +37,30 @@
			locationType: "",
			locationStatus: "",
			enableStatus: "",
			remark: ""
			remark: "",
			warehouseCode:"",
			});
			const editFormOptions = ref([
			[
			{
			field: "warehouseId",
			// {
			// field: "warehouseId",
			// title: "åºæ¿ç¼å·",
			// type: "select",
			// required: true,
			// span: 12,
			// dataKey: "warehouseNuber",
			// data: []
			// },
			{
			field: "warehouseCode",
			title: "åºæ¿ç¼å·",
			type: "select",
			required: true,
			span: 12,
			data: [],
			bind: { key: "warehouses", data: [] }
			dataKey: "warehouseNuber",
			data: []
			},

			{
			field: "locationCode",
			title: "è´§ä½ç¼å·",
			@@ -104,7 +115,7 @@
			type: "select",
			span: 12,
			data: [],
			bind: { key: "locationTypeEnum", data: [] }
			dataKey: "locationTypeEnum",
			}
			],
			[
			@@ -114,15 +125,15 @@
			type: "select",
			span: 12,
			data: [],
			bind: { key: "locationStatusEnum", data: [] }
			dataKey: "locationStatusEnum",
			},
			{
			field: "enableStatus",
			title: "ç¦ç¨ç¶æ",
			type: "select",
			span: 12,
			dataKey:"EnableStatusEnum",
			data: [],
			bind: { key: "status", data: [] }
			}
			],
			[
			@@ -135,7 +146,7 @@
			]
			]);
			const searchFormFields = ref({
			warehouseId: "",
			// warehouseId: "",
			locationCode: "",
			locationName: "",
			roadwayNo: "",
			@@ -145,20 +156,24 @@
			row: "",
			column: "",
			layer: "",
			warehouseCode: ""
			});
			const searchFormOptions = ref([
			[
			{ title: "åºæ¿ç¼å·", field: "warehouseId", type: "select", data: [], bind: { key: "warehouses", data: [] } },
			// { title: "åºæ¿ç¼å·", field: "warehouseId", type: "select", dataKey: "warehouseNuber", data: [] } ,
			{ title: "åºæ¿ç¼å·", field: "warehousecode", type: "select", dataKey: "warehouseNuber", data: [] } ,
			{ title: "è´§ä½ç¼å·", field: "locationCode", type: "like" },
			{ title: "è´§ä½åç§°", field: "locationName", type: "like" },
			],
			[
			{ title: "å··éç¼å·", field: "roadwayNo", type: "like" },
			{ title: "è´§ä½ç±»å", field: "locationType", type: "select", data: [], bind: { key: "locationTypeEnum", data: [] } },
			{ title: "è´§ä½ç¶æ", field: "locationStatus", type: "select", data: [], bind: { key: "locationStatusEnum", data: [] } },
			{ title: "è´§ä½ç±»å", field: "locationType", type: "select", dataKey: "locationTypeEnum", data: [] },
			{ title: "è´§ä½ç¶æ", field: "locationStatus", type: "select", dataKey: "locationStatusEnum",data: []},

			],
			[
			{ title: "ç¦ç¨ç¶æ", field: "enableStatus", type: "select", data: [], bind: { key: "status", data: [] } },

			{ title: "ç¦ç¨ç¶æ", field: "enableStatus", type: "select", data: [], dataKey:"status" },
			{ title: "è¡", field: "row", type: "int" },
			{ title: "å", field: "column", type: "int" },
			{ title: "å±", field: "layer", type: "int" }
			@@ -175,8 +190,17 @@
			require: true,
			align: "left",
			},
			// {
			// field: "warehouseId",
			// title: "åºæ¿ç¼å·",
			// type: "select",
			// width: 120,
			// align: "left",
			// data: [],
			// bind: { key: "warehouses", data: [] }
			// },
			{
			field: "warehouseId",
			field: "warehouseCode",
			title: "åºæ¿ç¼å·",
			type: "select",
			width: 120,