From cf3b3fe3f9d46e28ac84f1aa61a3d9754aabf421 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 00:05:13 +0800
Subject: [PATCH] 调整工单审批2
---
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml | 242 ++++++++++++++++++++++++------------------------
1 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
index c7e3aae..08c7be5 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
@@ -131,6 +131,9 @@
<Property name="dataType">Date</Property>
<Property name="label">鎴鏃堕棿</Property>
</PropertyDef>
+ <PropertyDef name="scope">
+ <Property/>
+ </PropertyDef>
</DataType>
<DataType name="dtWordProcess">
<Property name="creationType">com.fzzy.work.domain.WorkOrderProcess</Property>
@@ -163,20 +166,26 @@
</DataType>
</Model>
<View layout="padding:10">
- <ClientEvent name="onReady">query= function(){
+ <ClientEvent name="onReady">view.TAG = 1;
+query= function(){
var param = view.get("#dsQuery.data");
var tabIndex = view.get("#tabMain.currentIndex");
+ param.set("scope","all");
if(0 == tabIndex){
- view.get("#dsMain").set("parameter",param).flushAsync();
- }else{
- view.get("#dsMain2").set("parameter",param).flushAsync();
+ param.set("scope","self");
}
+ view.get("#dsMain").set("parameter",param).flushAsync();
}
+query();

//瀹ｄ紶鎿嶄綔
renderCell1 = function(arg,self){
+ var tabIndex = view.get("#tabMain.currentIndex");
var data = arg.data;
var htm = "<a onClick='audit()' class='a-btn1'>鎸囨淳</a>&nbsp;|&nbsp;<a onClick='showDetail()' class='a-btn2'>璇︾粏</a>";
+ if(1 == tabIndex){
+ htm = "<a onClick='showDetail()' class='a-btn2'>璇︾粏</a>";
+ }
arg.dom.innerHTML = htm;
};

@@ -212,8 +221,9 @@
var tabIndex = view.get("#tabMain.currentIndex");
var cur = view.get("#dsMain.data:#");
var dialog = view.get("#dialogMain");
+ view.get('^btnTag').set('visible',true);
if(1 == tabIndex){
- cur = view.get("#dsMain2.data:#");
+ view.get('^btnTag').set('visible',false);
}
dialog.show();

@@ -229,13 +239,11 @@
}
}
//鎵ц瀹℃壒
-todo = function(action){
+todo = function(){
var cur = view.get("#dsMain.data:#");
var process = view.get("#dsProcess.data");
process.set("orderId", cur.get("id"));
- process.set("action", action);
process.set("node", cur.get("node"));
- 
var remark = process.get('remark');
if(!remark){
$notify("璇峰～鍐欏鎵规剰瑙佲�︹��");
@@ -243,15 +251,17 @@
}
view.get("#ajaxTodo").set('parameter',process).execute(function(result){
if('200' != result.code){
- $alert(result.msg);
+ $alert(result.message);
}else{
$alert("鎵ц鎴愬姛锛�");
view.get('#dialogTodo').hide();
+ query();
}
});
}
cancelTodo = function(){
var process = view.get("#dsProcess.data");
+ process.set("action",null);
process.set('remark',null);
view.get('#dialogTodo').hide();
}
@@ -260,16 +270,9 @@
<DataSet id="dsMain">
<ClientEvent name="onLoadData">$notify("鏁版嵁鍔犺浇瀹屾垚鈥︹��");</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("鏁版嵁鍔犺浇瀹屾垚鈥︹��");</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 +457,88 @@
<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("selection",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">80</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">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">
@@ -528,84 +610,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("selection",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 +694,34 @@
<ToolBar>
<Fill/>
<ToolBarButton>
- <ClientEvent name="onClick">view.get("#dialogTodo").show();
-</ClientEvent>
- <Property name="caption">澶勭悊</Property>
+ <ClientEvent name="onClick">var process = view.get("#dsProcess.data");
+process.set('action','pass')
+view.get("#dialogTodo").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("#dsMain.data:#").cancel();
-view.get("#dialogMain").hide();</ClientEvent>
+ <ClientEvent name="onClick">var process = view.get("#dsProcess.data");
+process.set('action','refuse')
+view.get("#dialogTodo").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("#dialogMain").hide();</ClientEvent>
<Property name="caption">鍏抽棴</Property>
<Property name="width">80</Property>
<Property name="exClassName">btn3</Property>
@@ -731,15 +747,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 +754,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>
--
Gitblit v1.9.3