Merge remote-tracking branch 'origin/master'

sgj

20 小时以前 18127822f3cdb4778fb62ba0304bb8372dada516

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

@@ -159,7 +159,7 @@
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">所属分库</Property>
        <Property name="label">所在库区</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
@@ -628,12 +628,19 @@
          <Property name="align">center</Property>
          <Property name="width">150</Property>
        </DataColumn>
        <DataColumn name="deptId">
          <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
            arg.processDefault = true;</ClientEvent>
          <Property name="property">deptId</Property>
          <Property name="align">center</Property>
          <Property name="width">250</Property>
        </DataColumn>
        <DataColumn name="plateNum">
          <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
arg.processDefault = true;</ClientEvent>
          <Property name="property">plateNum</Property>
          <Property name="align">center</Property>
          <Property name="width">130</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">customerName</Property>
@@ -712,7 +719,7 @@
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="caption">单据信息</Property>
      <Property name="width">1200</Property>
      <Property name="showCaptionBar">false</Property>
      <Property name="closeable">false</Property>
      <Buttons>
        <Button id="btnOK">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -760,6 +767,12 @@
              <AutoFormElement>
                <Property name="name">plateNum</Property>
                <Property name="property">plateNum</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">deptId</Property>
                <Property name="property">deptId</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -823,7 +836,7 @@
                <Property name="trigger">ddNotice</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
              <AutoFormElement>
                <Property name="name">noticeId</Property>
                <Property name="property">noticeId</Property>
                <Editor/>