代码合并修改

sgj

2026-01-17 f0287da5142c604f774096c458dab2156c0fe7c1

 fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml

@@ -81,6 +81,12 @@
      </PropertyDef>
      <PropertyDef name="node">
        <Property></Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;workOrderPR#triggerNode&quot;).getResult()}</Property>
          <Property name="keyProperty">dictValue</Property>
          <Property name="valueProperty">dictLabel</Property>
        </Property>
        <Property name="label">流程环节</Property>
      </PropertyDef>
      <PropertyDef name="createById">
        <Property></Property>
@@ -132,7 +138,7 @@
        <Property name="label">截止时间</Property>
      </PropertyDef>
      <PropertyDef name="scope">
        <Property/>
        <Property></Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtWordProcess">
@@ -478,7 +484,7 @@
              <DataColumn>
                <ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent>
                <Property name="caption">操作</Property>
                <Property name="width">80</Property>
                <Property name="width">160</Property>
                <Property name="align">center</Property>
                <Editor/>
              </DataColumn>
@@ -500,6 +506,11 @@
                <Property name="width">120</Property>
                <Property name="align">center</Property>
                <Property name="name">status</Property>
              </DataColumn>
              <DataColumn name="node">
                <Property name="property">node</Property>
                <Property name="width">120</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="bizType">
                <Property name="property">bizType</Property>
@@ -579,6 +590,11 @@
                <Property name="align">center</Property>
                <Property name="name">status</Property>
              </DataColumn>
              <DataColumn name="node">
                <Property name="property">node</Property>
                <Property name="width">120</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="bizType">
                <Property name="property">bizType</Property>
                <Property name="width">120</Property>