代码合并修改

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>
@@ -131,6 +137,9 @@
        <Property name="dataType">Date</Property>
        <Property name="label">截止时间</Property>
      </PropertyDef>
      <PropertyDef name="scope">
        <Property></Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtWordProcess">
      <Property name="creationType">com.fzzy.work.domain.WorkOrderProcess</Property>
@@ -163,20 +172,26 @@
    </DataType>
  </Model>
  <View layout="padding:10">
    <ClientEvent name="onReady">query= function(){&#xD;
    <ClientEvent name="onReady">view.TAG = 1;&#xD;
query= function(){&#xD;
   var param = view.get(&quot;#dsQuery.data&quot;);&#xD;
   var tabIndex = view.get(&quot;#tabMain.currentIndex&quot;);&#xD;
   param.set(&quot;scope&quot;,&quot;all&quot;);&#xD;
   if(0 == tabIndex){&#xD;
      view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param).flushAsync();&#xD;
   }else{&#xD;
      view.get(&quot;#dsMain2&quot;).set(&quot;parameter&quot;,param).flushAsync();&#xD;
      param.set(&quot;scope&quot;,&quot;self&quot;);&#xD;
   }&#xD;
   view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param).flushAsync();&#xD;
}&#xD;
query();&#xD;
      &#xD;
//宣传操作&#xD;
renderCell1 = function(arg,self){&#xD;
   var tabIndex = view.get(&quot;#tabMain.currentIndex&quot;);&#xD;
   var data = arg.data;&#xD;
   var htm = &quot;&lt;a onClick='audit()' class='a-btn1'>指派&lt;/a>&amp;nbsp;|&amp;nbsp;&lt;a onClick='showDetail()' class='a-btn2'>详细&lt;/a>&quot;;&#xD;
   if(1 == tabIndex){&#xD;
         htm = &quot;&lt;a onClick='showDetail()' class='a-btn2'>详细&lt;/a>&quot;;&#xD;
   }&#xD;
   arg.dom.innerHTML = htm;&#xD;
};&#xD;
&#xD;
@@ -212,8 +227,9 @@
   var tabIndex = view.get(&quot;#tabMain.currentIndex&quot;);&#xD;
   var cur = view.get(&quot;#dsMain.data:#&quot;);&#xD;
   var dialog = view.get(&quot;#dialogMain&quot;);&#xD;
   view.get('^btnTag').set('visible',true);&#xD;
   if(1 == tabIndex){&#xD;
      cur = view.get(&quot;#dsMain2.data:#&quot;);&#xD;
      view.get('^btnTag').set('visible',false);&#xD;
   }&#xD;
   dialog.show();&#xD;
   &#xD;
@@ -229,13 +245,11 @@
   }&#xD;
}&#xD;
//执行审批&#xD;
todo = function(action){&#xD;
todo = function(){&#xD;
   var cur = view.get(&quot;#dsMain.data:#&quot;);&#xD;
   var process = view.get(&quot;#dsProcess.data&quot;);&#xD;
   process.set(&quot;orderId&quot;, cur.get(&quot;id&quot;));&#xD;
   process.set(&quot;action&quot;, action);&#xD;
   process.set(&quot;node&quot;, cur.get(&quot;node&quot;));&#xD;
   &#xD;
   var remark = process.get('remark');&#xD;
   if(!remark){&#xD;
      $notify(&quot;请填写审批意见……&quot;);&#xD;
@@ -243,15 +257,17 @@
   }&#xD;
   view.get(&quot;#ajaxTodo&quot;).set('parameter',process).execute(function(result){&#xD;
      if('200' != result.code){&#xD;
         $alert(result.msg);&#xD;
         $alert(result.message);&#xD;
      }else{&#xD;
         $alert(&quot;执行成功！&quot;);&#xD;
         view.get('#dialogTodo').hide();&#xD;
         query();&#xD;
      }&#xD;
   });&#xD;
}&#xD;
cancelTodo = function(){&#xD;
   var process = view.get(&quot;#dsProcess.data&quot;);&#xD;
   process.set(&quot;action&quot;,null);&#xD;
   process.set('remark',null);&#xD;
   view.get('#dialogTodo').hide();&#xD;
}&#xD;
@@ -260,16 +276,9 @@
    <DataSet id="dsMain">
      <ClientEvent name="onLoadData">$notify(&quot;数据加载完成……&quot;);</ClientEvent>
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">workOrderPR#pageQuery</Property>
      <Property name="dataProvider">workOrderPR#pageQueryByUserType</Property>
      <Property name="pageSize">10</Property>
      <Property name="loadMode">lazy</Property>
    </DataSet>
    <DataSet id="dsMain2">
      <ClientEvent name="onLoadData">$notify(&quot;数据加载完成……&quot;);</ClientEvent>
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">workOrderPR#pageQuery2</Property>
      <Property name="pageSize">10</Property>
      <Property name="loadMode">lazy</Property>
      <Property name="loadMode">manual</Property>
    </DataSet>
    <DataSet id="dsQuery">
      <ClientEvent name="onReady">self.insert({});</ClientEvent>
@@ -454,9 +463,93 @@
    <Container>
      <Property name="className">c-data</Property>
      <TabControl id="tabMain">
        <ClientEvent name="onTabChange">if(view.TAG) query();</ClientEvent>
        <ControlTab>
          <Property name="caption">全部</Property>
          <Property name="caption">我的工单</Property>
          <Property name="iconClass">fa fa-th-large</Property>
          <Property name="width">150</Property>
          <Container>
            <DataGrid layoutConstraint="padding:8">
              <ClientEvent name="onDataRowClick">self.set(&quot;selection&quot;,arg.data);</ClientEvent>
              <Property name="dataSet">dsMain</Property>
              <Property name="readOnly">true</Property>
              <Property name="selectionMode">singleRow</Property>
              <Property name="readOnly">true</Property>
              <Property name="fixedColumnCount">3</Property>
              <RowSelectorColumn/>
              <RowNumColumn>
                <Property name="width">50</Property>
                <Property name="caption">序号</Property>
              </RowNumColumn>
              <DataColumn>
                <ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent>
                <Property name="caption">操作</Property>
                <Property name="width">160</Property>
                <Property name="align">center</Property>
                <Editor/>
              </DataColumn>
              <DataColumn name="id">
                <Property name="property">id</Property>
                <Property name="width">180</Property>
              </DataColumn>
              <DataColumn name="deptId">
                <Property name="property">deptId</Property>
                <Property name="width">250</Property>
              </DataColumn>
              <DataColumn name="title">
                <Property name="property">title</Property>
                <Property name="width">300</Property>
              </DataColumn>
              <DataColumn>
                <ClientEvent name="onRenderCell">renderStatus(arg);</ClientEvent>
                <Property name="property">status</Property>
                <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>
                <Property name="width">120</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="assigneeName">
                <Property name="property">assigneeName</Property>
                <Property name="align">center</Property>
                <Property name="width">150</Property>
              </DataColumn>
              <DataColumn name="receiveTime">
                <Property name="property">receiveTime</Property>
                <Property name="width">150</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="createUserName">
                <Property name="property">createUserName</Property>
                <Property name="align">center</Property>
                <Property name="width">150</Property>
              </DataColumn>
              <DataColumn name="createTime">
                <Property name="property">createTime</Property>
                <Property name="align">center</Property>
                <Property name="width">150</Property>
              </DataColumn>
            </DataGrid>
            <ToolBar layoutConstraint="bottom">
              <Fill/>
              <DataPilot layoutConstraint="right">
                <Property name="itemCodes">pageSize,pages</Property>
                <Property name="dataSet">dsMain</Property>
              </DataPilot>
            </ToolBar>
          </Container>
        </ControlTab>
        <ControlTab>
          <Property name="caption">全部工单</Property>
          <Property name="iconClass">fa fa-history</Property>
          <Property name="width">150</Property>
          <Container>
            <DataGrid layoutConstraint="padding:8">
@@ -497,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>
@@ -528,84 +626,6 @@
              <DataPilot layoutConstraint="right">
                <Property name="itemCodes">pageSize,pages</Property>
                <Property name="dataSet">dsMain</Property>
              </DataPilot>
            </ToolBar>
          </Container>
        </ControlTab>
        <ControlTab>
          <Property name="caption">已结束</Property>
          <Property name="iconClass">fa fa-history</Property>
          <Property name="width">150</Property>
          <Container>
            <DataGrid layoutConstraint="padding:8">
              <ClientEvent name="onDataRowClick">self.set(&quot;selection&quot;,arg.data);</ClientEvent>
              <Property name="dataSet">dsMain2</Property>
              <Property name="readOnly">true</Property>
              <Property name="selectionMode">singleRow</Property>
              <Property name="readOnly">true</Property>
              <Property name="fixedColumnCount">3</Property>
              <RowSelectorColumn/>
              <RowNumColumn>
                <Property name="width">50</Property>
                <Property name="caption">序号</Property>
              </RowNumColumn>
              <DataColumn>
                <ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent>
                <Property name="caption">操作</Property>
                <Property name="width">150</Property>
                <Property name="align">center</Property>
                <Editor/>
              </DataColumn>
              <DataColumn name="id">
                <Property name="property">id</Property>
                <Property name="width">180</Property>
              </DataColumn>
              <DataColumn name="deptId">
                <Property name="property">deptId</Property>
                <Property name="width">250</Property>
              </DataColumn>
              <DataColumn name="title">
                <Property name="property">title</Property>
                <Property name="width">300</Property>
              </DataColumn>
              <DataColumn>
                <ClientEvent name="onRenderCell">renderStatus(arg);</ClientEvent>
                <Property name="property">status</Property>
                <Property name="width">120</Property>
                <Property name="align">center</Property>
                <Property name="name">status</Property>
              </DataColumn>
              <DataColumn name="bizType">
                <Property name="property">bizType</Property>
                <Property name="width">120</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="assigneeName">
                <Property name="property">assigneeName</Property>
                <Property name="align">center</Property>
                <Property name="width">150</Property>
              </DataColumn>
              <DataColumn name="receiveTime">
                <Property name="property">receiveTime</Property>
                <Property name="width">150</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="createUserName">
                <Property name="property">createUserName</Property>
                <Property name="align">center</Property>
                <Property name="width">150</Property>
              </DataColumn>
              <DataColumn name="createTime">
                <Property name="property">createTime</Property>
                <Property name="align">center</Property>
                <Property name="width">150</Property>
              </DataColumn>
            </DataGrid>
            <ToolBar layoutConstraint="bottom">
              <Fill/>
              <DataPilot layoutConstraint="right">
                <Property name="itemCodes">pageSize,pages</Property>
                <Property name="dataSet">dsMain2</Property>
              </DataPilot>
            </ToolBar>
          </Container>
@@ -690,22 +710,34 @@
                <ToolBar>
                  <Fill/>
                  <ToolBarButton>
                    <ClientEvent name="onClick">view.get(&quot;#dialogTodo&quot;).show();&#xD;
</ClientEvent>
                    <Property name="caption">处理</Property>
                    <ClientEvent name="onClick">var process = view.get(&quot;#dsProcess.data&quot;);&#xD;
process.set('action','pass')&#xD;
view.get(&quot;#dialogTodo&quot;).show();</ClientEvent>
                    <Property name="caption">通过</Property>
                    <Property name="width">80</Property>
                    <Property name="exClassName">btn1</Property>
                    <Property name="iconClass">fa fa-check-circle</Property>
                    <Property name="tags">btnTag</Property>
                  </ToolBarButton>
                  <ToolBarButton>
                    <Property name="caption">转交</Property>
                    <Property name="width">80</Property>
                    <Property name="exClassName">btn2</Property>
                    <Property name="iconClass">fa fa-check-circle</Property>
                    <Property name="tags">btnTag</Property>
                  </ToolBarButton>
                  <ToolBarButton>
                    <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
view.get(&quot;#dialogMain&quot;).hide();</ClientEvent>
                    <ClientEvent name="onClick">var process = view.get(&quot;#dsProcess.data&quot;);&#xD;
process.set('action','refuse')&#xD;
view.get(&quot;#dialogTodo&quot;).show();</ClientEvent>
                    <Property name="caption">拒绝</Property>
                    <Property name="width">80</Property>
                    <Property name="exClassName">btn5</Property>
                    <Property name="iconClass">fa fa-check-circle</Property>
                    <Property name="tags">btnTag</Property>
                  </ToolBarButton>
                  <ToolBarButton>
                    <ClientEvent name="onClick">view.get(&quot;#dialogMain&quot;).hide();</ClientEvent>
                    <Property name="caption">关闭</Property>
                    <Property name="width">80</Property>
                    <Property name="exClassName">btn3</Property>
@@ -731,15 +763,6 @@
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="confirmMessage">确定要执行删除么？</Property>
    </AjaxAction>
    <Dialog id="dialogTodo">
      <Property name="width">600</Property>
      <Property name="caption">审批处理</Property>
@@ -747,22 +770,15 @@
      <Property name="iconClass">fa fa-bookmark</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">todo('pass');</ClientEvent>
          <Property name="caption">通过</Property>
          <ClientEvent name="onClick">todo();</ClientEvent>
          <Property name="caption">确定</Property>
          <Property name="iconClass">fa fa-check</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="width">90</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">todo('refuse');</ClientEvent>
          <Property name="caption">拒绝</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="iconClass">fa fa-times</Property>
          <Property name="width">90</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">cancelTodo();</ClientEvent>
          <Property name="caption">取消操作</Property>
          <Property name="caption">取消</Property>
          <Property name="iconClass">fa fa-times</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="width">90</Property>