MeiRuiAn/HuaiAn.git

			@@ -38,9 +38,27 @@
			});
			const editFormOptions = ref([
			[
			{field:'palletCode',title:'æçç¼å·',type:'string'},
			{field:'locationCode',title:'è´§ä½ç¼å·',type:'string'},
			{field:'isFull',title:'æ¯å¦æ»¡ç',type:'select',dataKey:"yesno",data:[]},
			{ title: "æçç¼å·", field: "palletCode", type :"string"},
			{ title: "è´§ä½ç¼å·", field: "locationCode",type:"string",readonly: true, },
			{ title: "æå±ä»åº", field: "warehouseId",type: "select",dataKey: "warehouses",data: [],readonly: true,},
			{title: "åºåæç»ç¶æ",field: "stockStatus",type: "select",dataKey:"stockStatusEmun", data: [],readonly: true,},

			],
			[
			{ title: "æçç±»å", field: "palletType", type :"select",dataKey:"locationTypeEnum",data:[]},
			{
			field: "modifier",
			title: "ä¿®æ¹äºº",
			type: "string",
			readonly: true,
			},
			{
			field: "modifyDate",
			title: "ä¿®æ¹æ¶é´",
			type: "datetime",
			readonly: true,
			},

			]
			]);
			const searchFormFields = ref({
			@@ -49,8 +67,10 @@
			});
			const searchFormOptions = ref([
			[
			{ title: "æçç¼å·", field: "palletCode" },
			{ title: "è´§ä½ç¼å·", field: "locationCode" },
			{ title: "æçç¼å·", field: "palletCode", type :"like"},
			{ title: "è´§ä½ç¼å·", field: "locationCode",type:"like" },
			{ title: "æå±ä»åº", field: "warehouseId",type: "select",dataKey: "warehouses",data: [],},
			{title: "åºåæç»ç¶æ",field: "status",type: "select",dataKey:"stockStatusEmun", data: []},
			],
			]);
			const columns = ref([
			@@ -65,12 +85,27 @@
			align: "left",
			},
			{
			field: "id",
			title: "åºåä¸»é®",
			type: "string",
			width: 90,
			align: "left",
			},
			{
			field: "palletCode",
			title: "æçç¼å·",
			type: "string",
			width: 90,
			align: "left",
			},
			{
			field: "palletType",
			title: "æçç±»å",
			type: "select",
			width: 120,
			align: "left",
			bind: { key: "locationTypeEnum", data: [] },
			},
			{
			field: "locationCode",
			title: "è´§ä½ç¼å·",
			@@ -79,12 +114,28 @@
			align: "left",
			},
			{
			field: "isFull",
			title: "æ¯å¦æ»¡ç",
			type: "string",
			width: 150,
			field: "stockStatus",
			title: "åºåæç»ç¶æ",
			type: "string",
			width: 120,
			align: "left",
			bind: { key: "stockStatusEmun", data: [] },
			},
			// {
			// field: "isFull",
			// title: "æ¯å¦æ»¡ç",
			// type: "string",
			// width: 150,
			// align: "left",
			// bind: { key: "yesno", data: [] },
			// },
			{
			field: "warehouseId",
			title: "ä»åº",
			type: "select",
			width: 100,
			align: "left",
			bind: { key: "yesno", data: [] },
			bind: { key: "warehouses", data: [] },
			},
			{
			field: "creater",
			@@ -120,26 +171,14 @@
			type: "string",
			width: 100,
			align: "left",
			hidden:true
			},
			]);
			const detail = ref({
			cnName: "åå²åºåä¿¡æ¯",
			table: "StockInfo_Hty",
			columns: [
			{field:'id',title:'ä¸»é®',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
			{field:'palletCode',title:'æçç¼å·',type:'string',width:110,require:true,align:'left',sort:true},
			{field:'locationCode',title:'è´§ä½ç¼å·',type:'string',width:110,align:'left'},
			{field:'isFull',title:'æ¯å¦æ»¡ç',type:'bool',width:110,require:true,align:'left'},
			{field:'stockStatus',title:'åºåç¶æ',type:'int',width:110,require:true,align:'left'},
			{field:'remark',title:'å¤æ³¨',type:'string',width:220,align:'left'},
			{field:'sourceId',title:'æºä¸»é®',type:'int',width:110,require:true,align:'left'},
			{field:'operateType',title:'å¤æ³¨',type:'string',width:110,require:true,align:'left'},
			{field:'creater',title:'åå»ºäºº',type:'string',width:110,require:true,align:'left'},
			{field:'createDate',title:'åå»ºæ¶é´',type:'datetime',width:150,require:true,align:'left',sort:true},
			{field:'modifier',title:'ä¿®æ¹äºº',type:'string',width:100,align:'left'},
			{field:'modifyDate',title:'ä¿®æ¹æ¥æ',type:'datetime',width:150,align:'left',sort:true}
			],
			sortName: "id",
			cnName: "#detailCnName",
			table: "",
			columns: [],
			sortName: "",
			});
			return {
			table,