MingHeZhiNeng/DuiDuoJiLiKu.git

			@@ -5,7 +5,7 @@
			*ä¸å¡è¯·å¨@/extension/widesea_wms/stock/Dt_BillGroupStock.jsæ¤å¤ç¼å
			-->

			<template>
			<template>
			<view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
			:editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
			:table="table" :extend="extend">
			@@ -19,24 +19,16 @@
			const table = ref({
			key: 'id',
			footer: "Foots",
			cnName: 'åºååå²ä¿¡æ¯',
			cnName: 'åºåä¿¡æ¯',
			name: 'stock/Dt_BillGroupStock_Hty',
			url: "/StockInfoHty/",
			sortName: "createDate"
			});
			const editFormFields = ref({
			"palletCode": "",
			"productionLine": "",
			"outboundTime": "",
			// "groupType": ""

			});
			const editFormOptions = ref([
			[
			{ "title": "æçæ¡ç ", "field": "palletCode", type: "text" },
			{ "title": "çäº§äº§çº¿", "field": "productionLine", type: "text" },
			{ "title": "åºåºåºæ¶é´", "field": "outboundTime", type: "datetime" },
			// { "title": "ç»çç±»å", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
			]

			]);
			const searchFormFields = ref({});
			const searchFormOptions = ref([
			@@ -48,35 +40,161 @@
			], [
			{ "title": "åºä½å·", "field": "locationCode", type: "text" },
			{ "title": "å··é", "field": "roadwayNo", type: "text" },
			{ "title": "ç©æç¼ç ", "field": "materielCode", type: "text"},
			{ "title": "è´§ä½ç¶æ", "field": "locationStatus", type: "select", dataKey: "LocationState", data: [] },
			{ "title": "ç©æç¼ç ", "field": "materielCode", type: "text" },
			]
			]);
			const columns = ref(
			[{ field: 'id', title: 'åºåID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
			{ field: 'palletCode', title: 'æçæ¡ç ', type: 'string', width: 110, align: 'left', link: true, },
			{ field: 'locationCode', title: 'åºä½', type: 'string', width: 100, align: 'left', },
			{ field: 'palletCode', title: 'æçæ¡ç ', type: 'string', width: 110, align: 'left', },
			{ field: 'isFull', title: 'åºåç±»å', type: 'bool', width: 60, align: 'left', bind: { key: "isFull", data: [{ key: false, value: 'ç©ºç' }, { key: true, value: 'å®ç' }] }, },
			{ field: 'linedProcessFeedbackTime', title: 'å·¥èºå¼å§æ¶é´', type: 'string', width: 110, align: 'left', },
			{ field: 'roadwayNo', title: 'å··é', type: 'string', width: 60, align: 'left', sort: true },
			{ field: 'materielCode', title: 'ç©æç¼ç ', type: 'string', width: 90, align: 'left', sort: true },
			// { field: 'locationStatus', title: 'è´§ä½ç¶æ', type: 'int', width: 60, align: 'left', bind: { key: "LocationState", data: [] } },
			{ field: 'specialParameterDuration', title: 'å·¥èºæ¶é¿', type: 'string', width: 60, align: 'left', sort: true },
			{ field: 'outboundTime', title: 'åºåºåºæ¶é´', type: 'string', width: 110, align: 'left', sort: true },
			{ field: 'productionLine', title: 'çäº§äº§çº¿', type: 'string', width: 60, align: 'left', bind: { key: "ProductionLine", data: [] } },
			{ field: 'areaCode', title: 'åºåº', type: 'string', width: 60, align: 'left', bind: { key: "AreaType", data: [] } },
			{ field: 'remark', title: 'çµè¯æ°é', type: 'string', width: 60, align: 'left', },
			{ field: 'creater', title: 'åå»ºäºº', type: 'string', sort: true, width: 110, align: 'left' },
			{ field: 'remark', title: 'å¤æ³¨', type: 'string', width: 60, align: 'left', },
			{ field: 'creater', title: 'åå»ºäºº', type: 'string', sort: true, width: 110, align: 'left', hidden: true },
			{ field: 'createDate', title: 'åå»ºæ¶é´', type: 'datetime', sort: true, width: 150, align: 'left', },
			{ field: 'modifier', title: 'æåä¿®æ¹äºº', type: 'string', sort: true, width: 100, hidden: true, align: 'left' },
			// { field: 'modifyDate', title: 'æåä¿®æ¹æ¶é´', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
			]
			);
			const detail = ref({
			cnName: "#detailCnName",
			table: "#detailTable",
			columns: [],
			sortName: "",
			key: ""
			cnName: "åºåæç»ä¿¡æ¯",
			table: "StockInfoDetails",
			columns: [
			{
			field: "id",
			title: "Id",
			type: "int",
			width: 90,
			hidden: true,
			readonly: true,
			require: true,
			align: "left",
			},
			{
			field: "stockId",
			title: "åºåä¿¡æ¯ä¸»é®",
			type: "string",
			width: 90,
			align: "left",
			hidden: true,
			},
			{
			field: "materielCode",
			title: "ç©æç¼å·",
			type: "string",
			width: 150,
			align: "left",
			},
			{
			field: "materielName",
			title: "ç©æåç§°",
			type: "string",
			width: 150,
			align: "left",
			},
			{
			field: "orderNo",
			title: "åæ®ç¼å·",
			type: "decimal",
			width: 180,
			align: "left",
			},
			{
			field: "warehouse",
			title: "ä»åºåç§°",
			type: "string",
			width: 120,
			align: "left",
			},
			{
			field: "quantity",
			title: "æ°é",
			type: "int",
			width: 90,
			align: "left",
			},
			{
			field: "unit",
			title: "åä½",
			type: "int",
			width: 90,
			align: "left",
			},
			{
			field: "specs",
			title: "è§æ ¼",
			type: "string",
			width: 120,
			align: "left",
			},
			{
			field: "weight",
			title: "åé",
			type: "string",
			width: 90,
			align: "left",
			},
			{
			field: "drawingNumber",
			title: "å¾å·",
			type: "string",
			width: 120,
			align: "left",
			},
			{
			field: "date",
			title: "æ¥æ",
			type: "string",
			width: 120,
			align: "left",
			},
			{
			field: "status",
			title: "åºåæç»ç¶æ",
			type: "string",
			width: 120,
			align: "left",
			hidden:true,
			},
			{
			field: "creater",
			title: "åå»ºäºº",
			type: "string",
			width: 90,
			align: "left",
			},
			{
			field: "createDate",
			title: "åå»ºæ¶é´",
			type: "datetime",
			width: 160,
			align: "left",
			},
			{
			field: "modifier",
			title: "ä¿®æ¹äºº",
			type: "string",
			width: 100,
			align: "left",
			hidden:true,
			},
			{
			field: "modifyDate",
			title: "ä¿®æ¹æ¶é´",
			type: "datetime",
			width: 160,
			align: "left",
			hidden:true,
			},
			{
			field: "remark",
			title: "å¤æ³¨",
			type: "string",
			width: 100,
			align: "left",
			hidden:true,
			},
			],
			sortName: "id",
			key: "id",
			});
			return {
			table,