fzzy-igdss.git - Gitblit

sgj

5 小时以前 7ee8e04738786ee7c5ad6cc768cd6072971b4dfa

样式修改

已修改3个文件

	fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml	101 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml	73 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml

@@ -82,7 +82,7 @@
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="padding:5;regionPadding:5">
  <View layout="padding:10">
    <Property name="packages">font-awesome,css-common</Property>
    <Property name="cache">
      <Property name="mode">clientSide</Property>
@@ -97,8 +97,10 @@
      <Property name="dataType">dataTypeC</Property>
      <Property name="dataProvider">quantityDataPR#getQuery</Property>
    </DataSet>
    <Container>
      <Property name="className">c-param</Property>
    <AutoForm>
      <Property name="cols">*,*,*,*</Property>
        <Property name="cols">*,*,*,90,90</Property>
      <Property name="dataSet">dataSetC</Property>
      <Property name="labelSeparator">：</Property>
      <Property name="labelAlign">right</Property>
@@ -120,7 +122,6 @@
        <Property name="property">end</Property>
        <Editor/>
      </AutoFormElement>
      <Container layout="hbox regionPadding:10">
        <Button>
          <ClientEvent name="onClick">var param = view.get(&quot;#dataSetC.data&quot;);&#xD;
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param).flushAsync();&#xD;
@@ -141,61 +142,27 @@
&#xD;
//view.get(&quot;#labelBillUser&quot;).set(&quot;text&quot;,&quot;制表人：&quot;+user);&#xD;
//view.get(&quot;#labelBillCheckDate&quot;).set(&quot;text&quot;,text);</ClientEvent>
          <Property name="caption">查询</Property>
          <Property name="caption">搜索</Property>
          <Property name="iconClass">fa fa-search</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="exClassName">btn-q1</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dataSetC&quot;).flushAsync();</ClientEvent>
          <Property name="caption">重置</Property>
          <Property name="iconClass">fa fa-refresh</Property>
          <Property name="exClassName">btn2</Property>
          <Property name="exClassName">btn-q2</Property>
        </Button>
      </Container>
    </AutoForm>
    <Container layoutConstraint="center">
      <Property name="exClassName">bg-color</Property>
      <DataGrid id="dataGrid1" layoutConstraint="center ">
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <Property name="headerRowHeight">30</Property>
        <RowNumColumn/>
        <DataColumn name="batchId">
          <Property name="property">batchId</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="depotId">
          <Property name="property">depotId</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="weight">
          <Property name="property">weight</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="bulk">
          <Property name="property">bulk</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="receiveDate">
          <Property name="property">receiveDate</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="checkUser">
          <Property name="property">checkUser</Property>
          <Property name="align">center</Property>
          <Property name="visible">false</Property>
        </DataColumn>
        <DataColumn name="remark">
          <Property name="property">remark</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Container>
      <Property name="className">c-data</Property>
      <AutoForm id="autoForm1" layoutConstraint="top">
        <Property name="cols">*,*,*</Property>
        <Property name="dataSet">dataSetC</Property>
        <Property name="labelAlign">right</Property>
        <Property name="showHint">false</Property>
        <AutoFormElement layoutConstraint="colSpan:3">
        <Property name="labelWidth">120</Property>
        <AutoFormElement layoutConstraint="colSpan:4">
          <Property name="name">title</Property>
          <Property name="property">title</Property>
          <Property name="showLabel">false</Property>
@@ -227,13 +194,49 @@
          <Editor/>
        </AutoFormElement>
      </AutoForm>
    </Container>
    <Container layoutConstraint="bottom">
      <Property name="exClassName">bg-color</Property>
      <DataPilot layoutConstraint="right">
      <DataGrid id="dataGrid1" layoutConstraint=" padding:8">
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <Property name="headerRowHeight">30</Property>
        <Property name="rowHeight">50</Property>
        <RowNumColumn/>
        <DataColumn name="batchId">
          <Property name="property">batchId</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="depotId">
          <Property name="property">depotId</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="weight">
          <Property name="property">weight</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="bulk">
          <Property name="property">bulk</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="receiveDate">
          <Property name="property">receiveDate</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="checkUser">
          <Property name="property">checkUser</Property>
          <Property name="align">center</Property>
          <Property name="visible">false</Property>
        </DataColumn>
        <DataColumn name="remark">
          <Property name="property">remark</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>
      <ToolBar layoutConstraint="bottom">
        <Fill/>
        <DataPilot layoutConstraint="right">
        <Property name="itemCodes">pageSize,pages</Property>
          <Property name="dataSet">dsMain</Property>
      </DataPilot>
      </ToolBar>
    </Container>
  </View>
</ViewConfig>

 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml

@@ -383,7 +383,7 @@
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="padding:5;regionPadding:5">
  <View layout="padding:10">
    <ClientEvent name="onReady">//var TYPE = &quot;INOUT_DETAIL&quot;;&#xD;
//页面展示类型，1 正常报表页面；2 监管展示页面&#xD;
var ViewType = &quot;${request.getParameter('viewType')}&quot;;&#xD;
@@ -391,12 +391,14 @@
if(ViewType==1){&#xD;
 view.get(&quot;#form1&quot;).set(&quot;visible&quot;,true);&#xD;
 view.get(&quot;#dataGridMain1&quot;).set(&quot;visible&quot;,true);&#xD;
  view.get(&quot;#tool&quot;).set(&quot;visible&quot;,true);&#xD;
&#xD;
}&#xD;
&#xD;
if(ViewType==2){&#xD;
 view.get(&quot;#form2&quot;).set(&quot;visible&quot;,true);&#xD;
 view.get(&quot;#dataGridMain2&quot;).set(&quot;visible&quot;,true);&#xD;
&#xD;
  view.get(&quot;#tool&quot;).set(&quot;visible&quot;,true);&#xD;
}&#xD;
&#xD;
var deptId = window.parent.DEPT_ID;//父页面中的分库编码&#xD;
@@ -424,14 +426,17 @@
      <Property></Property>
      <Property name="loadMode">manual</Property>
    </DataSet>
    <AutoForm id="form1" layoutConstraint="top">
      <Property name="cols">*,*,*,*</Property>
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm id="form1">
        <Property name="cols">*,*,*,*,90,90,110</Property>
      <Property name="dataSet">dsQuery</Property>
      <Property name="exClassName">bg-color</Property>
      <Property name="labelWidth">100</Property>
        <Property name="labelSeparator">：</Property>
      <Property name="labelAlign">right</Property>
      <Property name="hideMode">display</Property>
        <Property name="labelWidth">110</Property>
        <Property name="exClassName">bg-color</Property>
      <Property name="visible">false</Property>
        <Property name="hideMode">display</Property>
      <AutoFormElement>
        <Property name="name">depotId</Property>
        <Property name="property">depotId</Property>
@@ -452,17 +457,16 @@
        <Property name="property">end</Property>
        <Editor/>
      </AutoFormElement>
      <Container layout="hbox regionPadding:15">
        <Button>
          <ClientEvent name="onClick">    var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
    view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();</ClientEvent>
          <Property name="caption">查询</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="caption">搜索</Property>
          <Property name="exClassName">btn-q1</Property>
          <Property name="iconClass">fa fa-search</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsQuery&quot;).flushAsync();</ClientEvent>
          <Property name="exClassName">btn2</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="iconClass">fa fa-refresh</Property>
          <Property name="caption">重置</Property>
        </Button>
@@ -470,19 +474,17 @@
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="iconClass">fa fa-file-excel-o</Property>
          <Property name="menu">menuExport</Property>
          <Property name="action">exportExcel</Property>
        </Button>
      </Container>
    </AutoForm>
    <AutoForm id="form2" layoutConstraint="top">
      <Property name="cols">*,*,*,*</Property>
      <AutoForm id="form2">
        <Property name="cols">*,*,*,*,90,90,110</Property>
      <Property name="dataSet">dsQuery</Property>
      <Property name="exClassName">bg-color</Property>
      <Property name="labelWidth">100</Property>
        <Property name="labelSeparator">：</Property>
      <Property name="labelAlign">right</Property>
      <Property name="hideMode">display</Property>
        <Property name="labelWidth">110</Property>
        <Property name="exClassName">bg-color</Property>
      <Property name="visible">false</Property>
        <Property name="hideMode">display</Property>
      <AutoFormElement>
        <Property name="name">customerName</Property>
        <Property name="property">customerName</Property>
@@ -506,17 +508,16 @@
        <Property name="property">end</Property>
        <Editor/>
      </AutoFormElement>
      <Container layout="hbox regionPadding:15">
        <Button>
          <ClientEvent name="onClick">    var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
    view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();</ClientEvent>
          <Property name="caption">查询</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="caption">搜索</Property>
          <Property name="exClassName">btn-q1</Property>
          <Property name="iconClass">fa fa-search</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsQuery&quot;).flushAsync();</ClientEvent>
          <Property name="exClassName">btn2</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="iconClass">fa fa-refresh</Property>
          <Property name="caption">重置</Property>
        </Button>
@@ -524,18 +525,17 @@
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="iconClass">fa fa-file-excel-o</Property>
          <Property name="menu">menuExport</Property>
          <Property name="action">exportExcel</Property>
        </Button>
      </Container>
    </AutoForm>
    <Container layoutConstraint="center">
      <Property name="exClassName">bg-color</Property>
    </Container>
    <Container>
      <Property name="className">c-data</Property>
      <AutoForm id="autoForm1" layoutConstraint="top">
        <Property name="cols">*,*,*,*,*,*,*</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelAlign">right</Property>
        <Property name="showHint">false</Property>
        <Property name="labelWidth">120</Property>
        <AutoFormElement layoutConstraint="colSpan:7">
          <Property name="name">title</Property>
          <Property name="property">title</Property>
@@ -588,7 +588,7 @@
          <Editor/>
        </AutoFormElement>
      </AutoForm>
      <DataGrid id="dataGridMain1" layoutConstraint="center">
      <DataGrid id="dataGridMain1" layoutConstraint="padding:8">
        <ClientEvent name="onRenderRow">if(arg.data.get('id') == '合计'){&#xD;
    //arg.dom.style.background = &quot;#fcc5c5&quot;;&#xD;
    arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
@@ -599,6 +599,8 @@
        <Property name="highlightCurrentRow">false</Property>
        <Property name="hideMode">display</Property>
        <Property name="visible">true</Property>
        <Property name="headerRowHeight">30</Property>
        <Property name="rowHeight">50</Property>
        <RowNumColumn/>
        <DataColumn name="id">
          <Property name="property">id</Property>
@@ -657,7 +659,7 @@
          <Property name="caption">离库时间</Property>
        </DataColumn>
      </DataGrid>
      <DataGrid id="dataGridMain2" layoutConstraint="center">
      <DataGrid id="dataGridMain2" layoutConstraint="padding:8">
        <ClientEvent name="onRenderRow">if(arg.data.get('id') == '合计'){&#xD;
    //arg.dom.style.background = &quot;#fcc5c5&quot;;&#xD;
    arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
@@ -668,6 +670,8 @@
        <Property name="highlightCurrentRow">false</Property>
        <Property name="visible">false</Property>
        <Property name="hideMode">display</Property>
        <Property name="headerRowHeight">30</Property>
        <Property name="rowHeight">50</Property>
        <RowNumColumn>
          <Property name="caption">序号</Property>
        </RowNumColumn>
@@ -731,6 +735,15 @@
          <Editor/>
        </DataColumn>
      </DataGrid>
      <ToolBar id="tool" layoutConstraint="bottom">
        <Property name="hideMode">display</Property>
        <Property name="visible">false</Property>
        <Fill/>
        <DataPilot layoutConstraint="right">
          <Property name="itemCodes">pageSize,pages</Property>
          <Property name="dataSet">dsMain</Property>
        </DataPilot>
      </ToolBar>
    </Container>
  </View>
</ViewConfig>

 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml

@@ -383,7 +383,7 @@
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="padding:5;regionPadding:5">
  <View layout="padding:10">
    <ClientEvent name="onReady">//var TYPE = &quot;INOUT_DETAIL&quot;;&#xD;
//页面展示类型，1 正常报表页面；2 监管展示页面&#xD;
var ViewType = &quot;${request.getParameter('viewType')}&quot;;&#xD;
@@ -391,12 +391,13 @@
if(ViewType==1){&#xD;
 view.get(&quot;#form1&quot;).set(&quot;visible&quot;,true);&#xD;
 view.get(&quot;#dataGridMain1&quot;).set(&quot;visible&quot;,true);&#xD;
  view.get(&quot;#tool&quot;).set(&quot;visible&quot;,true);&#xD;
}&#xD;
&#xD;
if(ViewType==2){&#xD;
 view.get(&quot;#form2&quot;).set(&quot;visible&quot;,true);&#xD;
 view.get(&quot;#dataGridMain2&quot;).set(&quot;visible&quot;,true);&#xD;
&#xD;
  view.get(&quot;#tool&quot;).set(&quot;visible&quot;,true);&#xD;
}&#xD;
&#xD;
var deptId = window.parent.DEPT_ID;//父页面中的分库编码&#xD;
@@ -424,11 +425,13 @@
      <Property></Property>
      <Property name="loadMode">manual</Property>
    </DataSet>
    <Container>
      <Property name="className">c-param</Property>
    <AutoForm id="form1" layoutConstraint="top">
      <Property name="cols">*,*,*,*</Property>
        <Property name="cols">*,*,*,*,90,90,110</Property>
      <Property name="dataSet">dsQuery</Property>
      <Property name="exClassName">bg-color</Property>
      <Property name="labelWidth">100</Property>
        <Property name="labelWidth">110</Property>
      <Property name="labelAlign">right</Property>
      <Property name="hideMode">display</Property>
      <Property name="visible">false</Property>
@@ -452,17 +455,16 @@
        <Property name="property">end</Property>
        <Editor/>
      </AutoFormElement>
      <Container layout="hbox regionPadding:15">
        <Button>
          <ClientEvent name="onClick">    var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
    view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();</ClientEvent>
          <Property name="caption">查询</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="caption">搜索</Property>
          <Property name="exClassName">btn-q1</Property>
          <Property name="iconClass">fa fa-search</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsQuery&quot;).flushAsync();</ClientEvent>
          <Property name="exClassName">btn2</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="iconClass">fa fa-refresh</Property>
          <Property name="caption">重置</Property>
        </Button>
@@ -470,16 +472,13 @@
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="iconClass">fa fa-file-excel-o</Property>
          <Property name="menu">menuExport</Property>
          <Property name="action">exportExcel</Property>
        </Button>
      </Container>
    </AutoForm>
    <AutoForm id="form2" layoutConstraint="top">
      <Property name="cols">*,*,*,*</Property>
        <Property name="cols">*,*,*,*,90,90,110</Property>
      <Property name="dataSet">dsQuery</Property>
      <Property name="exClassName">bg-color</Property>
      <Property name="labelWidth">100</Property>
        <Property name="labelWidth">110</Property>
      <Property name="labelAlign">right</Property>
      <Property name="hideMode">display</Property>
      <Property name="visible">false</Property>
@@ -506,17 +505,16 @@
        <Property name="property">end</Property>
        <Editor/>
      </AutoFormElement>
      <Container layout="hbox regionPadding:15">
        <Button>
          <ClientEvent name="onClick">    var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
    view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();</ClientEvent>
          <Property name="caption">查询</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="caption">搜索</Property>
          <Property name="exClassName">btn-q1</Property>
          <Property name="iconClass">fa fa-search</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsQuery&quot;).flushAsync();</ClientEvent>
          <Property name="exClassName">btn2</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="iconClass">fa fa-refresh</Property>
          <Property name="caption">重置</Property>
        </Button>
@@ -524,18 +522,17 @@
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="iconClass">fa fa-file-excel-o</Property>
          <Property name="menu">menuExport</Property>
          <Property name="action">exportExcel</Property>
        </Button>
      </Container>
    </AutoForm>
    </Container>
    <Container layoutConstraint="center">
      <Property name="exClassName">bg-color</Property>
      <Property name="className">c-data</Property>
      <AutoForm id="autoForm1" layoutConstraint="top">
        <Property name="cols">*,*,*,*,*,*,*</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelAlign">right</Property>
        <Property name="showHint">false</Property>
        <Property name="labelWidth">120</Property>
        <AutoFormElement layoutConstraint="colSpan:7">
          <Property name="name">title</Property>
          <Property name="property">title</Property>
@@ -588,7 +585,7 @@
          <Editor/>
        </AutoFormElement>
      </AutoForm>
      <DataGrid id="dataGridMain1" layoutConstraint="center">
      <DataGrid id="dataGridMain1" layoutConstraint="padding:8">
        <ClientEvent name="onRenderRow">if(arg.data.get('id') == '合计'){&#xD;
    //arg.dom.style.background = &quot;#fcc5c5&quot;;&#xD;
    arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
@@ -599,6 +596,8 @@
        <Property name="highlightCurrentRow">false</Property>
        <Property name="hideMode">display</Property>
        <Property name="visible">true</Property>
        <Property name="headerRowHeight">30</Property>
        <Property name="rowHeight">50</Property>
        <RowNumColumn/>
        <DataColumn name="id">
          <Property name="property">id</Property>
@@ -657,7 +656,7 @@
          <Property name="caption">离库时间</Property>
        </DataColumn>
      </DataGrid>
      <DataGrid id="dataGridMain2" layoutConstraint="center">
      <DataGrid id="dataGridMain2" layoutConstraint="padding:8">
        <ClientEvent name="onRenderRow">if(arg.data.get('id') == '合计'){&#xD;
    //arg.dom.style.background = &quot;#fcc5c5&quot;;&#xD;
    arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
@@ -668,6 +667,8 @@
        <Property name="highlightCurrentRow">false</Property>
        <Property name="visible">false</Property>
        <Property name="hideMode">display</Property>
        <Property name="headerRowHeight">30</Property>
        <Property name="rowHeight">50</Property>
        <RowNumColumn>
          <Property name="caption">序号</Property>
        </RowNumColumn>
@@ -731,6 +732,15 @@
          <Editor/>
        </DataColumn>
      </DataGrid>
      <ToolBar id="tool" layoutConstraint="bottom">
        <Property name="hideMode">display</Property>
        <Property name="visible">false</Property>
        <Fill/>
        <DataPilot layoutConstraint="right">
          <Property name="itemCodes">pageSize,pages</Property>
          <Property name="dataSet">dsMain</Property>
        </DataPilot>
      </ToolBar>
    </Container>
  </View>
</ViewConfig>

			@@ -82,7 +82,7 @@
			</PropertyDef>
			</DataType>
			</Model>
			<View layout="padding:5;regionPadding:5">
			<View layout="padding:10">
			<Property name="packages">font-awesome,css-common</Property>
			<Property name="cache">
			<Property name="mode">clientSide</Property>
			@@ -97,8 +97,10 @@
			<Property name="dataType">dataTypeC</Property>
			<Property name="dataProvider">quantityDataPR#getQuery</Property>
			</DataSet>
			<Container>
			<Property name="className">c-param</Property>
			<AutoForm>
			<Property name="cols">,,,</Property>
			<Property name="cols">,,*,90,90</Property>
			<Property name="dataSet">dataSetC</Property>
			<Property name="labelSeparator">：</Property>
			<Property name="labelAlign">right</Property>
			@@ -120,7 +122,6 @@
			<Property name="property">end</Property>
			<Editor/>
			</AutoFormElement>
			<Container layout="hbox regionPadding:10">
			<Button>
			<ClientEvent name="onClick">var param = view.get("#dataSetC.data");
			view.get("#dsMain").set("parameter",param).flushAsync();
			@@ -141,61 +142,27 @@

			//view.get("#labelBillUser").set("text","制表人："+user);
			//view.get("#labelBillCheckDate").set("text",text);</ClientEvent>
			<Property name="caption">查询</Property>
			<Property name="caption">搜索</Property>
			<Property name="iconClass">fa fa-search</Property>
			<Property name="exClassName">btn1</Property>
			<Property name="exClassName">btn-q1</Property>
			</Button>
			<Button>
			<ClientEvent name="onClick">view.get("#dataSetC").flushAsync();</ClientEvent>
			<Property name="caption">重置</Property>
			<Property name="iconClass">fa fa-refresh</Property>
			<Property name="exClassName">btn2</Property>
			<Property name="exClassName">btn-q2</Property>
			</Button>
			</Container>
			</AutoForm>
			<Container layoutConstraint="center">
			<Property name="exClassName">bg-color</Property>
			<DataGrid id="dataGrid1" layoutConstraint="center ">
			<Property name="dataSet">dsMain</Property>
			<Property name="readOnly">true</Property>
			<Property name="headerRowHeight">30</Property>
			<RowNumColumn/>
			<DataColumn name="batchId">
			<Property name="property">batchId</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="depotId">
			<Property name="property">depotId</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="weight">
			<Property name="property">weight</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="bulk">
			<Property name="property">bulk</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="receiveDate">
			<Property name="property">receiveDate</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="checkUser">
			<Property name="property">checkUser</Property>
			<Property name="align">center</Property>
			<Property name="visible">false</Property>
			</DataColumn>
			<DataColumn name="remark">
			<Property name="property">remark</Property>
			<Property name="align">center</Property>
			</DataColumn>
			</DataGrid>
			</Container>
			<Container>
			<Property name="className">c-data</Property>
			<AutoForm id="autoForm1" layoutConstraint="top">
			<Property name="cols">,,*</Property>
			<Property name="dataSet">dataSetC</Property>
			<Property name="labelAlign">right</Property>
			<Property name="showHint">false</Property>
			<AutoFormElement layoutConstraint="colSpan:3">
			<Property name="labelWidth">120</Property>
			<AutoFormElement layoutConstraint="colSpan:4">
			<Property name="name">title</Property>
			<Property name="property">title</Property>
			<Property name="showLabel">false</Property>
			@@ -227,13 +194,49 @@
			<Editor/>
			</AutoFormElement>
			</AutoForm>
			</Container>
			<Container layoutConstraint="bottom">
			<Property name="exClassName">bg-color</Property>
			<DataPilot layoutConstraint="right">
			<DataGrid id="dataGrid1" layoutConstraint=" padding:8">
			<Property name="dataSet">dsMain</Property>
			<Property name="readOnly">true</Property>
			<Property name="headerRowHeight">30</Property>
			<Property name="rowHeight">50</Property>
			<RowNumColumn/>
			<DataColumn name="batchId">
			<Property name="property">batchId</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="depotId">
			<Property name="property">depotId</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="weight">
			<Property name="property">weight</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="bulk">
			<Property name="property">bulk</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="receiveDate">
			<Property name="property">receiveDate</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="checkUser">
			<Property name="property">checkUser</Property>
			<Property name="align">center</Property>
			<Property name="visible">false</Property>
			</DataColumn>
			<DataColumn name="remark">
			<Property name="property">remark</Property>
			<Property name="align">center</Property>
			</DataColumn>
			</DataGrid>
			<ToolBar layoutConstraint="bottom">
			<Fill/>
			<DataPilot layoutConstraint="right">
			<Property name="itemCodes">pageSize,pages</Property>
			<Property name="dataSet">dsMain</Property>
			</DataPilot>
			</ToolBar>
			</Container>
			</View>
			</ViewConfig>

			@@ -383,7 +383,7 @@
			</PropertyDef>
			</DataType>
			</Model>
			<View layout="padding:5;regionPadding:5">
			<View layout="padding:10">
			<ClientEvent name="onReady">//var TYPE = "INOUT_DETAIL";
			//页面展示类型，1 正常报表页面；2 监管展示页面
			var ViewType = "${request.getParameter('viewType')}";
			@@ -391,12 +391,14 @@
			if(ViewType==1){
			view.get("#form1").set("visible",true);
			view.get("#dataGridMain1").set("visible",true);
			view.get("#tool").set("visible",true);

			}

			if(ViewType==2){
			view.get("#form2").set("visible",true);
			view.get("#dataGridMain2").set("visible",true);

			view.get("#tool").set("visible",true);
			}

			var deptId = window.parent.DEPT_ID;//父页面中的分库编码
			@@ -424,14 +426,17 @@
			<Property></Property>
			<Property name="loadMode">manual</Property>
			</DataSet>
			<AutoForm id="form1" layoutConstraint="top">
			<Property name="cols">,,,</Property>
			<Container>
			<Property name="className">c-param</Property>
			<AutoForm id="form1">
			<Property name="cols">,,,,90,90,110</Property>
			<Property name="dataSet">dsQuery</Property>
			<Property name="exClassName">bg-color</Property>
			<Property name="labelWidth">100</Property>
			<Property name="labelSeparator">：</Property>
			<Property name="labelAlign">right</Property>
			<Property name="hideMode">display</Property>
			<Property name="labelWidth">110</Property>
			<Property name="exClassName">bg-color</Property>
			<Property name="visible">false</Property>
			<Property name="hideMode">display</Property>
			<AutoFormElement>
			<Property name="name">depotId</Property>
			<Property name="property">depotId</Property>
			@@ -452,17 +457,16 @@
			<Property name="property">end</Property>
			<Editor/>
			</AutoFormElement>
			<Container layout="hbox regionPadding:15">
			<Button>
			<ClientEvent name="onClick"> var data = view.get("#dsQuery.data");
			view.get("#dsMain").set("parameter",data).flushAsync();</ClientEvent>
			<Property name="caption">查询</Property>
			<Property name="exClassName">btn1</Property>
			<Property name="caption">搜索</Property>
			<Property name="exClassName">btn-q1</Property>
			<Property name="iconClass">fa fa-search</Property>
			</Button>
			<Button>
			<ClientEvent name="onClick">view.get("#dsQuery").flushAsync();</ClientEvent>
			<Property name="exClassName">btn2</Property>
			<Property name="exClassName">btn-q2</Property>
			<Property name="iconClass">fa fa-refresh</Property>
			<Property name="caption">重置</Property>
			</Button>
			@@ -470,19 +474,17 @@
			<Property name="caption">导出EXCEL</Property>
			<Property name="exClassName">btn4</Property>
			<Property name="iconClass">fa fa-file-excel-o</Property>
			<Property name="menu">menuExport</Property>
			<Property name="action">exportExcel</Property>
			</Button>
			</Container>
			</AutoForm>
			<AutoForm id="form2" layoutConstraint="top">
			<Property name="cols">,,,</Property>
			<AutoForm id="form2">
			<Property name="cols">,,,,90,90,110</Property>
			<Property name="dataSet">dsQuery</Property>
			<Property name="exClassName">bg-color</Property>
			<Property name="labelWidth">100</Property>
			<Property name="labelSeparator">：</Property>
			<Property name="labelAlign">right</Property>
			<Property name="hideMode">display</Property>
			<Property name="labelWidth">110</Property>
			<Property name="exClassName">bg-color</Property>
			<Property name="visible">false</Property>
			<Property name="hideMode">display</Property>
			<AutoFormElement>
			<Property name="name">customerName</Property>
			<Property name="property">customerName</Property>
			@@ -506,17 +508,16 @@
			<Property name="property">end</Property>
			<Editor/>
			</AutoFormElement>
			<Container layout="hbox regionPadding:15">
			<Button>
			<ClientEvent name="onClick"> var data = view.get("#dsQuery.data");
			view.get("#dsMain").set("parameter",data).flushAsync();</ClientEvent>
			<Property name="caption">查询</Property>
			<Property name="exClassName">btn1</Property>
			<Property name="caption">搜索</Property>
			<Property name="exClassName">btn-q1</Property>
			<Property name="iconClass">fa fa-search</Property>
			</Button>
			<Button>
			<ClientEvent name="onClick">view.get("#dsQuery").flushAsync();</ClientEvent>
			<Property name="exClassName">btn2</Property>
			<Property name="exClassName">btn-q2</Property>
			<Property name="iconClass">fa fa-refresh</Property>
			<Property name="caption">重置</Property>
			</Button>
			@@ -524,18 +525,17 @@
			<Property name="caption">导出EXCEL</Property>
			<Property name="exClassName">btn4</Property>
			<Property name="iconClass">fa fa-file-excel-o</Property>
			<Property name="menu">menuExport</Property>
			<Property name="action">exportExcel</Property>
			</Button>
			</Container>
			</AutoForm>
			<Container layoutConstraint="center">
			<Property name="exClassName">bg-color</Property>
			</Container>
			<Container>
			<Property name="className">c-data</Property>
			<AutoForm id="autoForm1" layoutConstraint="top">
			<Property name="cols">,,,,,,*</Property>
			<Property name="dataSet">dsQuery</Property>
			<Property name="labelAlign">right</Property>
			<Property name="showHint">false</Property>
			<Property name="labelWidth">120</Property>
			<AutoFormElement layoutConstraint="colSpan:7">
			<Property name="name">title</Property>
			<Property name="property">title</Property>
			@@ -588,7 +588,7 @@
			<Editor/>
			</AutoFormElement>
			</AutoForm>
			<DataGrid id="dataGridMain1" layoutConstraint="center">
			<DataGrid id="dataGridMain1" layoutConstraint="padding:8">
			<ClientEvent name="onRenderRow">if(arg.data.get('id') == '合计'){
			//arg.dom.style.background = "#fcc5c5";
			arg.dom.style.fontWeight = "bold";
			@@ -599,6 +599,8 @@
			<Property name="highlightCurrentRow">false</Property>
			<Property name="hideMode">display</Property>
			<Property name="visible">true</Property>
			<Property name="headerRowHeight">30</Property>
			<Property name="rowHeight">50</Property>
			<RowNumColumn/>
			<DataColumn name="id">
			<Property name="property">id</Property>
			@@ -657,7 +659,7 @@
			<Property name="caption">离库时间</Property>
			</DataColumn>
			</DataGrid>
			<DataGrid id="dataGridMain2" layoutConstraint="center">
			<DataGrid id="dataGridMain2" layoutConstraint="padding:8">
			<ClientEvent name="onRenderRow">if(arg.data.get('id') == '合计'){
			//arg.dom.style.background = "#fcc5c5";
			arg.dom.style.fontWeight = "bold";
			@@ -668,6 +670,8 @@
			<Property name="highlightCurrentRow">false</Property>
			<Property name="visible">false</Property>
			<Property name="hideMode">display</Property>
			<Property name="headerRowHeight">30</Property>
			<Property name="rowHeight">50</Property>
			<RowNumColumn>
			<Property name="caption">序号</Property>
			</RowNumColumn>
			@@ -731,6 +735,15 @@
			<Editor/>
			</DataColumn>
			</DataGrid>
			<ToolBar id="tool" layoutConstraint="bottom">
			<Property name="hideMode">display</Property>
			<Property name="visible">false</Property>
			<Fill/>
			<DataPilot layoutConstraint="right">
			<Property name="itemCodes">pageSize,pages</Property>
			<Property name="dataSet">dsMain</Property>
			</DataPilot>
			</ToolBar>
			</Container>
			</View>
			</ViewConfig>