Merge remote-tracking branch 'origin/master'

jiazx0107

2026-02-08 e7ab049344b954b044fc474992c378fcbbeeba33

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

@@ -366,11 +366,6 @@
   view.get("#btnDel").set("visible",false);
}

if("OUT" == TYPE){
   view.get("#recordWeight").set("caption","出库重量");
}else{
   view.get("#recordWeight").set("caption","入库重量");
}

//默认查询查询提条件
view.get("#dsQuery").insert({
@@ -584,7 +579,7 @@
        </ToolBarButton>
        <ToolBarButton id="btnDel">
          <ClientEvent name="onClick">showAbnormal();</ClientEvent>
          <Property name="caption">异常操作</Property>
          <Property name="caption">作废操作</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="iconClass">fa fa-minus</Property>
          <Property name="width">100</Property>
@@ -612,9 +607,18 @@
        </ToolBarButton>
        <ToolBarButton>
          <Property name="caption">导入EXCEL</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="exClassName">btn2</Property>
          <Property name="iconClass">fa fa-file-excel-o</Property>
          <Property name="action">uploadExcel</Property>
          <Property name="width">120</Property>
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">&#xD;
var url = &quot;/export/download-inout-excel&quot;;&#xD;
window.open(url);&#xD;</ClientEvent>
          <Property name="caption">模板下载</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="iconClass">fa fa-cloud-download</Property>
          <Property name="width">120</Property>
        </ToolBarButton>
      </ToolBar>
@@ -691,15 +695,6 @@
          <Property name="property">settleWeight</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn id="recordWeight">
          <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
arg.processDefault = true;</ClientEvent>
          <Property name="property">recordWeight</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
          <Property name="visible">true</Property>
          <Property name="name">recordWeight</Property>
        </DataColumn>
        <DataColumn name="progress">
          <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
@@ -924,12 +919,6 @@
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">recordWeight</Property>
                <Property name="property">recordWeight</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
@@ -991,14 +980,14 @@
      <Buttons>
        <Button>
          <ClientEvent name="onClick">todoError();</ClientEvent>
          <Property name="caption">异常终止</Property>
          <Property name="caption">确认作废</Property>
          <Property name="iconClass">fa fa-check</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="width">120</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">self.get(&quot;parent&quot;).close();</ClientEvent>
          <Property name="caption">取消操作</Property>
          <Property name="caption">取消</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="iconClass">fa fa-times-circle</Property>
          <Property name="width">120</Property>